diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 836b8710..6ad43075 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-Closes #
+<!-- If this resolves an issue: Closes #<n> -->
 
 ## What and why
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 180729a4..2a6b1f2a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,8 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0
+  # Line tables keep test backtraces readable; full debuginfo only adds build time and cache size.
+  CARGO_PROFILE_DEV_DEBUG: line-tables-only
 
 jobs:
   rust:
@@ -25,10 +27,10 @@ jobs:
         os: [macos-latest, ubuntu-22.04, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v5
+      - uses: pnpm/action-setup@v5
         with: { version: 11 }
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with: { node-version: 22, cache: pnpm }
       - uses: dtolnay/rust-toolchain@stable
         with: { components: "clippy, rustfmt" }
@@ -62,7 +64,7 @@ jobs:
     name: Remote server (linux musl)
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with: { targets: x86_64-unknown-linux-musl }
       - uses: Swatinem/rust-cache@v2
@@ -79,7 +81,7 @@ jobs:
     env:
       CARGO_TARGET_DIR: ${{ github.workspace }}/target-plugins
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with: { targets: wasm32-wasip2, components: "clippy, rustfmt" }
       - uses: Swatinem/rust-cache@v2
@@ -100,9 +102,9 @@ jobs:
             cargo test --locked --manifest-path "$dir/Cargo.toml"
             echo "::endgroup::"
           done
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v5
         with: { version: 11 }
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with: { node-version: 22 }
       # Plugin web pages (`web-src/`, their own pnpm projects): typecheck and test.
       - name: Web pages typecheck and test
@@ -126,7 +128,7 @@ jobs:
     name: Cargo deny
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-deny
       - run: cargo deny check
@@ -135,10 +137,10 @@ jobs:
     name: Frontend
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v5
+      - uses: pnpm/action-setup@v5
         with: { version: 11 }
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with: { node-version: 22, cache: pnpm }
       - run: pnpm install --frozen-lockfile
       - run: pnpm typecheck
@@ -154,16 +156,16 @@ jobs:
     # Browsers and their system libraries are preinstalled; keep the tag in step with @playwright/test.
     container: mcr.microsoft.com/playwright:v1.64.1-noble
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v5
+      - uses: pnpm/action-setup@v5
         with: { version: 11 }
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with: { node-version: 22, cache: pnpm }
       - run: pnpm install --frozen-lockfile
       - run: pnpm e2e
         env:
           HOME: /root
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: playwright-report
diff --git a/.github/workflows/language-smoke.yml b/.github/workflows/language-smoke.yml
new file mode 100644
index 00000000..03f80a68
--- /dev/null
+++ b/.github/workflows/language-smoke.yml
@@ -0,0 +1,124 @@
+name: Language smoke
+# Everyday code intelligence (completion, go to definition, Find Usages, hover, diagnostics
+# with a quick fix, an intention, formatting, rename) per language, against the language
+# server the app starts by default: crates/ide-host/tests/language_smoke.rs.
+# Opening the fixture with its build tool and SDK (Maven / Gradle sync, the virtualenv, the
+# JDK): the ignored tests of crates/ide-host/tests/project_smoke.rs.
+# Then running and testing each fixture through the run store and openidea-server
+# (Run, Run tests, the test tree, Rerun Failed Tests): smoke/run.test.ts; and debugging its
+# entry point with the debugger the IDE installs (breakpoint, frames, variables, evaluate,
+# Step Over, Resume): smoke/debug.test.ts.
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+    types: [opened, synchronize, reopened]
+    paths:
+      - "crates/**"
+      - "languages/**"
+      - "fixtures/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - "src/features/run/**"
+      - "src/features/debugger/**"
+      - "src/platform/**"
+      - "smoke/**"
+      - "package.json"
+      - "pnpm-lock.yaml"
+      - ".github/workflows/language-smoke.yml"
+  workflow_dispatch:
+
+concurrency:
+  group: language-smoke-${{ github.ref }}
+  # A new push supersedes a PR's run; on main every merge runs to the end (and saves the cache).
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+env:
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
+  # Pinned so a server release can't fail an unrelated PR; bump them deliberately.
+  VTSLS: 0.3.0
+  TYPESCRIPT: 6.0.3
+  BASEDPYRIGHT: 1.40.2
+  RUFF: 0.17.3
+  GOPLS: v0.24.0
+  JDTLS: 1.63.0-202610191322
+  KOTLIN_LSP: 263.7084.0
+  GRADLE: 8.14.3
+
+jobs:
+  smoke:
+    name: Language smoke (${{ matrix.language }})
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [typescript, python, rust, go, java, kotlin]
+    runs-on: ubuntu-22.04
+    timeout-minutes: 40
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with: { components: "rust-analyzer, rustfmt" }
+      # One build cache for every language; main saves it.
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: language-smoke
+          save-if: ${{ github.ref == 'refs/heads/main' && matrix.language == 'rust' }}
+
+      - uses: pnpm/action-setup@v4
+        with: { version: 11 }
+      - uses: actions/setup-node@v4
+        with: { node-version: 22, cache: pnpm }
+      - if: matrix.language == 'typescript'
+        run: npm install --global "@vtsls/language-server@$VTSLS" "typescript@$TYPESCRIPT"
+
+      - if: matrix.language == 'python'
+        uses: actions/setup-python@v5
+        with: { python-version: "3.12" }
+      - if: matrix.language == 'python'
+        run: pip install "basedpyright==$BASEDPYRIGHT" "ruff==$RUFF"
+
+      - if: matrix.language == 'go'
+        uses: actions/setup-go@v5
+        with: { go-version: "1.27", cache: false }
+      - if: matrix.language == 'go'
+        run: go install "golang.org/x/tools/gopls@$GOPLS"
+
+      - if: matrix.language == 'java' || matrix.language == 'kotlin'
+        uses: actions/setup-java@v4
+        with: { distribution: temurin, java-version: "21" }
+      - if: matrix.language == 'java'
+        run: |
+          mkdir -p "$RUNNER_TEMP/jdtls"
+          curl -fsSL "https://download.eclipse.org/jdtls/milestones/${JDTLS%-*}/jdt-language-server-$JDTLS.tar.gz" \
+            | tar xz -C "$RUNNER_TEMP/jdtls"
+          echo "$RUNNER_TEMP/jdtls/bin" >> "$GITHUB_PATH"
+
+      # The Kotlin fixture has no Gradle wrapper: the server imports it with the Gradle on PATH.
+      - if: matrix.language == 'kotlin'
+        uses: gradle/actions/setup-gradle@v4
+        with: { gradle-version: "${{ env.GRADLE }}" }
+      - if: matrix.language == 'kotlin'
+        run: |
+          mkdir -p "$RUNNER_TEMP/kotlin-lsp" "$RUNNER_TEMP/bin"
+          curl -fsSL "https://download.jetbrains.com/language-server/kotlin-server/$KOTLIN_LSP/kotlin-server-$KOTLIN_LSP.tar.gz" \
+            | tar xz -C "$RUNNER_TEMP/kotlin-lsp" --strip-components=1
+          ln -s "$RUNNER_TEMP/kotlin-lsp/kotlin-lsp.sh" "$RUNNER_TEMP/bin/kotlin-lsp"
+          echo "$RUNNER_TEMP/bin" >> "$GITHUB_PATH"
+
+      - run: cargo test --locked -p ide-host --test language_smoke --no-run
+      - run: cargo test --locked -p ide-host --test language_smoke -- --ignored --exact ${{ matrix.language }}
+      - if: matrix.language == 'java'
+        run: cargo test --locked -p ide-host --test project_smoke -- --ignored --exact maven_sync jdk
+      - if: matrix.language == 'kotlin'
+        run: cargo test --locked -p ide-host --test project_smoke -- --ignored --exact gradle_sync
+      - if: matrix.language == 'python'
+        run: cargo test --locked -p ide-host --test project_smoke -- --ignored --exact python_venv
+
+      - run: pnpm install --frozen-lockfile
+      - run: cargo build --locked -p ide-host --bin openidea-server
+      - run: pnpm smoke smoke/run.test.ts -t "^${{ matrix.language }}$"
+      - run: pnpm smoke smoke/debug.test.ts -t "^${{ matrix.language }}$"
+        # The IDE installs the debugger from GitHub releases: authenticated, against rate limits.
+        env: { GITHUB_TOKEN: "${{ github.token }}" }
diff --git a/.github/workflows/plugins-index.yml b/.github/workflows/plugins-index.yml
new file mode 100644
index 00000000..bbf1d256
--- /dev/null
+++ b/.github/workflows/plugins-index.yml
@@ -0,0 +1,46 @@
+name: Plugin index
+
+# Refreshes the community plugins in the latest release's plugins-index.json
+# (what released apps read) from the registry, l0ng-ai/openidea-plugins. The
+# official plugins, their key and revocations stay as the release wrote them.
+on:
+  schedule:
+    - cron: "17 * * * *"
+  workflow_dispatch:
+  # Sent by the registry when its index changes.
+  repository_dispatch:
+    types: [community-plugins]
+
+permissions:
+  contents: write
+
+concurrency:
+  group: plugins-index
+
+env:
+  COMMUNITY_PLUGINS_INDEX: https://github.com/l0ng-ai/openidea-plugins/releases/download/index/index.json
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge the community index
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+          cd "$RUNNER_TEMP"
+          tag="$(gh release view --repo "$GITHUB_REPOSITORY" --json tagName -q .tagName)"
+          tool=openidea-plugin-linux-x86_64
+          if ! gh release download "$tag" --repo "$GITHUB_REPOSITORY" -p plugins-index.json -p "$tool.gz"; then
+            echo "::notice::$tag has no plugin index or openidea-plugin tool yet"
+            exit 0
+          fi
+          gunzip "$tool.gz" && chmod +x "$tool"
+          cp plugins-index.json before.json
+          "./$tool" merge plugins-index.json "$COMMUNITY_PLUGINS_INDEX" --keep openidea
+          if cmp -s before.json plugins-index.json; then
+            echo "unchanged"
+          else
+            gh release upload "$tag" plugins-index.json --repo "$GITHUB_REPOSITORY" --clobber
+          fi
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index d1a74b7e..02949151 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -18,24 +18,15 @@ jobs:
     if: github.event.pull_request.user.type != 'Bot' && !github.event.pull_request.draft
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         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.');
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3874f17e..1758e67a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,6 +18,7 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0
   TAG: ${{ github.event.inputs.tag || github.ref_name }}
+  COMMUNITY_PLUGINS_INDEX: https://github.com/l0ng-ai/openidea-plugins/releases/download/index/index.json
 
 jobs:
   # Creates (or reuses) one draft release that every platform build uploads into.
@@ -25,8 +26,9 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       release_id: ${{ steps.release.outputs.id }}
+      official_plugin_keys: ${{ steps.plugin-keys.outputs.keys }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with: { ref: "${{ env.TAG }}" }
       - name: Tag matches app version
         run: |
@@ -35,8 +37,22 @@ jobs:
             echo "::error::tag $TAG does not match tauri.conf.json version $app"
             exit 1
           fi
+      # The official plugins' public key (from PLUGIN_SIGNING_KEY, the seed
+      # `openidea-plugin keygen` writes), built into the app: their packages
+      # must carry its signature whatever the marketplace index lists. Without
+      # the secret the app takes the index's word, as development builds do.
+      - id: plugin-keys
+        env:
+          SIGNING_KEY: ${{ secrets.PLUGIN_SIGNING_KEY }}
+        run: |
+          if [ -n "$SIGNING_KEY" ]; then
+            seed="$(printf %s "$SIGNING_KEY" | base64 -d | od -An -tx1 | tr -d ' \n')"
+            key="$(printf '302e020100300506032b657004220420%s' "$seed" | xxd -r -p |
+              openssl pkey -inform DER -pubout -outform DER | tail -c 32 | base64)"
+            echo "keys=$key" >> "$GITHUB_OUTPUT"
+          fi
       - id: release
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const tag = process.env.TAG;
@@ -57,6 +73,8 @@ jobs:
   build:
     needs: create-release
     name: Build (${{ matrix.name }})
+    env:
+      OPENIDEA_OFFICIAL_PLUGIN_KEYS: ${{ needs.create-release.outputs.official_plugin_keys }}
     strategy:
       fail-fast: false
       matrix:
@@ -81,11 +99,11 @@ jobs:
             target: x86_64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with: { ref: "${{ env.TAG }}" }
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v5
         with: { version: 11 }
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with: { node-version: 22, cache: pnpm }
       - uses: dtolnay/rust-toolchain@stable
         with: { targets: "${{ matrix.target }}" }
@@ -155,7 +173,7 @@ jobs:
           - { runner: macos-latest, target: x86_64-apple-darwin, os: macos, arch: x86_64 }
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with: { ref: "${{ env.TAG }}" }
       - uses: dtolnay/rust-toolchain@stable
         with: { targets: "${{ matrix.target }}" }
@@ -184,7 +202,11 @@ jobs:
   # (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.
+  # writes) nothing is published and the release goes on. The index also lists
+  # the community plugins of the registry (COMMUNITY_PLUGINS_INDEX; refreshed
+  # between releases by plugins-index.yml), and the release carries the
+  # openidea-plugin tool for Linux x64, which that workflow and the registry's
+  # checks run.
   plugins:
     needs: create-release
     name: Official plugins
@@ -198,7 +220,7 @@ jobs:
             echo "::warning::PLUGIN_SIGNING_KEY is not set: the official plugins are not published"
             echo "skip=true" >> "$GITHUB_OUTPUT"
           fi
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         if: steps.key.outputs.skip != 'true'
         with: { ref: "${{ env.TAG }}" }
       - uses: dtolnay/rust-toolchain@stable
@@ -207,10 +229,10 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         if: steps.key.outputs.skip != 'true'
         with: { key: release-plugins }
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v5
         if: steps.key.outputs.skip != 'true'
         with: { version: 11 }
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         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.
@@ -237,11 +259,17 @@ jobs:
             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.
+          # The published index's revocations, earlier keys and community plugins 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
+          # Downloads point at this release: older versions kept for older IDEs stay where they were published.
+          "$tool" index "$out" --publisher openidea --name OpenIDEA --key "$key" --out "$out/plugins-index.json" \
+            --download-base "https://github.com/$GITHUB_REPOSITORY/releases/download/$TAG"
+          "$tool" merge "$out/plugins-index.json" "$COMMUNITY_PLUGINS_INDEX" --keep openidea ||
+            echo "::warning::the community plugins were not refreshed"
+          gzip -9 -c "$tool" > "$out/openidea-plugin-linux-x86_64.gz"
+          gh release upload "$TAG" "$out"/*.oiplugin "$out/plugins-index.json" \
+            "$out/openidea-plugin-linux-x86_64.gz" --clobber
 
   # The updater manifest (latest.json), built once from the signed bundles every build uploaded.
   # Fails when a platform is missing, so a release never ships a manifest without it.
@@ -249,7 +277,7 @@ jobs:
     needs: [create-release, build]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         env:
           RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
         with:
@@ -309,7 +337,7 @@ jobs:
     needs: [create-release, build, server, plugins, updater-manifest]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         env:
           RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
         with:
diff --git a/AGENTS.md b/AGENTS.md
index 02a191f1..54cc95ae 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -18,9 +18,12 @@ Visual style: dark, low-contrast greys, one cool accent
 - `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.
+- `crates/ide-host` — the `openidea-server` binary for remote development and the
+  `openidea-plugin` CLI (plugin starter templates live in its `templates.rs`).
+- `wit/` — plugin interface definitions; `plugins/` — sample and bundled plugins.
+  Plugin docs: `plugins/README.md`, `docs/plugins/themes.md`.
+- `java/` — JDT LS extension bundles (`java-usages`, `kotlin-bridge`) and the patched
+  Lombok agent, embedded into the app by `ide-sdk` / `ide-tools`.
 - `e2e/` — Playwright UI tests (`pnpm e2e`). `fixtures/` — sample projects per language
   for manual and automated testing.
 
@@ -46,8 +49,8 @@ Visual style: dark, low-contrast greys, one cool accent
 
 ## 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
+Follow `CONTRIBUTING.md` and `.github/pull_request_template.md`: one problem per PR
+(`Closes #<n>` when it resolves an issue), 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.
 
@@ -64,6 +67,13 @@ Shared agent skills live in `.agents/skills/` (`.claude/skills/` links to them):
   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`.
+- `cargo test -p ide-host --test language_smoke -- --ignored --exact <language>` — code intelligence
+  on `fixtures/` with that language's real server installed (CI: `Language smoke`, pinned versions).
+- `pnpm smoke smoke/run.test.ts -t <language>` — run and test that language's fixture through the
+  run store and a real `openidea-server` (build it first: `cargo build -p ide-host --bin openidea-server`).
+- `pnpm smoke smoke/debug.test.ts -t <language>` — debug that fixture's entry point the same way, with
+  the debugger the IDE installs (on macOS, CodeLLDB and Delve may need Developer Mode:
+  `sudo DevToolsSecurity -enable`).
 - `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
@@ -111,8 +121,8 @@ Several worktrees can be developed and run side by side.
   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.
+- Each worktree's first build is cold (several minutes) and `cargo build` output takes
+  around 9 GB; tests, clippy and incremental builds add more. 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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6d10aacf..6e02bd6b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,8 +16,7 @@ Project layout, coding rules, commands and checks are in [AGENTS.md](AGENTS.md).
 
 ## 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.
+- One problem per PR. If it resolves an issue, link it with `Closes #123`.
 - 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.
@@ -31,5 +30,9 @@ Project layout, coding rules, commands and checks are in [AGENTS.md](AGENTS.md).
 - 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.
+Plugins: pull requests here add or change official plugins (`plugins/official/`)
+and the plugin API. Community plugins live in their authors' repositories and
+are listed through [l0ng-ai/openidea-plugins](https://github.com/l0ng-ai/openidea-plugins);
+see [`plugins/README.md`](plugins/README.md) § 8.1.
+
+A check on each PR adds `needs-info` when the verification section is missing, and removes it once it's filled in.
diff --git a/Cargo.lock b/Cargo.lock
index 42891043..317a7da6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -123,6 +123,17 @@ version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
+[[package]]
+name = "apple-native-keyring-store"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b350bfd03649e07aa05c0a81b3e15934374e585c98204a57e20b9d49f49bb9a"
+dependencies = [
+ "keyring-core",
+ "log",
+ "security-framework",
+]
+
 [[package]]
 name = "arbitrary"
 version = "1.5.0"
@@ -156,6 +167,27 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
+[[package]]
+name = "ashpd"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2f3f79755c74fd155000314eb349864caa787c6592eace6c6882dad873d9c39"
+dependencies = [
+ "enumflags2",
+ "futures-channel",
+ "futures-util",
+ "rand 0.9.5",
+ "raw-window-handle",
+ "serde",
+ "serde_repr",
+ "tokio",
+ "url",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "zbus",
+]
+
 [[package]]
 name = "ast-grep-core"
 version = "0.40.1"
@@ -1600,6 +1632,7 @@ dependencies = [
  "lock_api",
  "once_cell",
  "parking_lot_core",
+ "serde",
 ]
 
 [[package]]
@@ -1795,6 +1828,15 @@ dependencies = [
  "syn 3.0.9",
 ]
 
+[[package]]
+name = "dlib"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
+dependencies = [
+ "libloading",
+]
+
 [[package]]
 name = "dlopen2"
 version = "0.8.2"
@@ -2163,15 +2205,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "file-id"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc6a637b6dc58414714eddd9170ff187ecb0933d4c7024d1abbd23a3cc26e9"
-dependencies = [
- "windows-sys 0.60.2",
-]
-
 [[package]]
 name = "filedescriptor"
 version = "0.8.3"
@@ -4038,7 +4071,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "ide-agent"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dunce",
  "encoding_rs",
@@ -4061,7 +4094,7 @@ dependencies = [
 
 [[package]]
 name = "ide-analysis"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ast-grep-core",
  "ide-core",
@@ -4075,7 +4108,7 @@ dependencies = [
 
 [[package]]
 name = "ide-build"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dirs 6.0.0",
  "dunce",
@@ -4090,7 +4123,7 @@ dependencies = [
 
 [[package]]
 name = "ide-clipboard"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
@@ -4099,7 +4132,7 @@ dependencies = [
 
 [[package]]
 name = "ide-core"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dunce",
  "encoding_rs",
@@ -4116,11 +4149,11 @@ dependencies = [
 
 [[package]]
 name = "ide-coverage"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "ide-run",
- "quick-xml",
+ "quick-xml 0.42.0",
  "serde",
  "serde_json",
  "specta",
@@ -4130,7 +4163,7 @@ dependencies = [
 
 [[package]]
 name = "ide-dap"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "ide-jsonrpc",
@@ -4148,14 +4181,17 @@ dependencies = [
 
 [[package]]
 name = "ide-db"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "bb8",
  "dirs 6.0.0",
  "futures",
  "ide-core",
+ "ide-http",
  "ide-ssh",
  "parking_lot",
+ "reqwest",
+ "rustls",
  "serde",
  "serde_json",
  "specta",
@@ -4166,11 +4202,12 @@ dependencies = [
  "tokio-util",
  "toml 0.9.12+spec-1.1.0",
  "tracing",
+ "uuid",
 ]
 
 [[package]]
 name = "ide-docker"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "serde",
@@ -4183,7 +4220,7 @@ dependencies = [
 
 [[package]]
 name = "ide-extension"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "base64 0.22.1",
  "blake3",
@@ -4203,7 +4240,7 @@ dependencies = [
 
 [[package]]
 name = "ide-fonts"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "objc2-core-foundation",
  "objc2-core-text",
@@ -4215,7 +4252,7 @@ dependencies = [
 
 [[package]]
 name = "ide-github"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "ide-vcs",
@@ -4228,7 +4265,7 @@ dependencies = [
 
 [[package]]
 name = "ide-host"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "base64 0.22.1",
  "criterion",
@@ -4268,8 +4305,11 @@ dependencies = [
  "ide-workspace",
  "ignore",
  "parking_lot",
+ "quick-xml 0.42.0",
+ "regex-syntax",
  "reqwest",
  "rustix",
+ "semver",
  "serde",
  "serde_json",
  "specta",
@@ -4286,7 +4326,7 @@ dependencies = [
 
 [[package]]
 name = "ide-http"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "parking_lot",
@@ -4304,7 +4344,7 @@ dependencies = [
 
 [[package]]
 name = "ide-index"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "blake3",
  "criterion",
@@ -4326,7 +4366,7 @@ dependencies = [
 
 [[package]]
 name = "ide-jsonrpc"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "encoding_rs",
  "futures",
@@ -4334,6 +4374,7 @@ dependencies = [
  "parking_lot",
  "serde",
  "serde_json",
+ "tempfile",
  "thiserror 2.0.21",
  "tokio",
  "tokio-util",
@@ -4342,7 +4383,7 @@ dependencies = [
 
 [[package]]
 name = "ide-language"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "blake3",
  "criterion",
@@ -4398,7 +4439,7 @@ dependencies = [
 
 [[package]]
 name = "ide-lsp"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dunce",
  "futures",
@@ -4424,7 +4465,7 @@ dependencies = [
 
 [[package]]
 name = "ide-notebook"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "futures",
  "ide-core",
@@ -4447,7 +4488,7 @@ dependencies = [
 
 [[package]]
 name = "ide-plugin"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "blake3",
  "ide-core",
@@ -4467,7 +4508,7 @@ dependencies = [
 
 [[package]]
 name = "ide-profiler"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "ide-run",
@@ -4480,7 +4521,7 @@ dependencies = [
 
 [[package]]
 name = "ide-remote"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "globset",
  "ide-core",
@@ -4497,7 +4538,7 @@ dependencies = [
 
 [[package]]
 name = "ide-run"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dunce",
  "encoding_rs",
@@ -4506,7 +4547,7 @@ dependencies = [
  "libc",
  "parking_lot",
  "portable-pty",
- "quick-xml",
+ "quick-xml 0.42.0",
  "serde",
  "serde_json",
  "specta",
@@ -4520,7 +4561,7 @@ dependencies = [
 
 [[package]]
 name = "ide-sdk"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dunce",
  "ide-core",
@@ -4539,7 +4580,7 @@ dependencies = [
 
 [[package]]
 name = "ide-search"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "criterion",
  "globset",
@@ -4559,7 +4600,7 @@ dependencies = [
 
 [[package]]
 name = "ide-spell"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "parking_lot",
@@ -4572,11 +4613,13 @@ dependencies = [
 
 [[package]]
 name = "ide-ssh"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "dirs 6.0.0",
  "flate2",
  "ide-core",
+ "keyring",
+ "keyring-core",
  "parking_lot",
  "russh",
  "russh-config",
@@ -4587,11 +4630,12 @@ dependencies = [
  "tempfile",
  "tokio",
  "tracing",
+ "uuid",
 ]
 
 [[package]]
 name = "ide-syntax"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "ide-language",
@@ -4606,7 +4650,7 @@ dependencies = [
 
 [[package]]
 name = "ide-terminal"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "libc",
@@ -4619,19 +4663,20 @@ dependencies = [
 
 [[package]]
 name = "ide-text"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "criterion",
  "ide-core",
  "proptest",
  "ropey",
  "serde",
+ "similar",
  "specta",
 ]
 
 [[package]]
 name = "ide-tools"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "flate2",
  "hex",
@@ -4652,14 +4697,16 @@ dependencies = [
 
 [[package]]
 name = "ide-vcs"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
+ "blake3",
  "dunce",
  "encoding_rs",
  "gix",
  "ide-core",
  "ignore",
  "libc",
+ "redb",
  "regex-lite",
  "serde",
  "serde_json",
@@ -4671,7 +4718,7 @@ dependencies = [
 
 [[package]]
 name = "ide-vfs"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "chardetng",
  "dunce",
@@ -4680,7 +4727,7 @@ dependencies = [
  "globset",
  "ide-core",
  "ignore",
- "notify-debouncer-full",
+ "notify",
  "parking_lot",
  "serde",
  "serde_json",
@@ -4693,7 +4740,7 @@ dependencies = [
 
 [[package]]
 name = "ide-web"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "ide-core",
  "open",
@@ -4709,7 +4756,7 @@ dependencies = [
 
 [[package]]
 name = "ide-workspace"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "blake3",
  "dunce",
@@ -4727,6 +4774,7 @@ dependencies = [
  "toml 0.9.12+spec-1.1.0",
  "toml_edit 0.25.17+spec-1.1.0",
  "tracing",
+ "uuid",
  "zip",
 ]
 
@@ -5204,6 +5252,33 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "keyring"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2270074a3d26bcac93c1dc5d2845eb4c089e8d761ccf6e0ea266a16004640627"
+dependencies = [
+ "apple-native-keyring-store",
+ "keyring-core",
+ "windows-native-keyring-store",
+ "zbus-secret-service-keyring-store",
+]
+
+[[package]]
+name = "keyring-core"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29fbf4b551298c67925f38cf341a1ada797a75f1837bdf8ae1fc8e2ebc6efb59"
+dependencies = [
+ "chrono",
+ "dashmap",
+ "log",
+ "regex",
+ "ron",
+ "serde",
+ "uuid",
+]
+
 [[package]]
 name = "kqueue"
 version = "1.2.1"
@@ -5626,19 +5701,6 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
-[[package]]
-name = "notify-debouncer-full"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375bd3a138be7bfeff3480e4a623df4cbfb55b79df617c055cd810ba466fa078"
-dependencies = [
- "file-id",
- "log",
- "notify",
- "notify-types",
- "walkdir",
-]
-
 [[package]]
 name = "notify-types"
 version = "2.1.0"
@@ -5667,6 +5729,30 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint 0.4.8",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.5.1"
@@ -5679,6 +5765,15 @@ dependencies = [
  "rand_core 0.10.1",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.2.2"
@@ -5694,6 +5789,27 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-iter"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint 0.4.8",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -6181,7 +6297,7 @@ dependencies = [
 
 [[package]]
 name = "openidea"
-version = "0.1.35"
+version = "0.1.36"
 dependencies = [
  "base64 0.22.1",
  "blake3",
@@ -6582,7 +6698,7 @@ checksum = "65dca778f41c79ebbe8b2b2139fee86f01b766b67130d108c7c2b8ffbd949f77"
 dependencies = [
  "base64 0.23.1",
  "indexmap 2.14.2",
- "quick-xml",
+ "quick-xml 0.42.0",
  "serde",
  "time",
 ]
@@ -6627,6 +6743,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "pollster"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
+
 [[package]]
 name = "poly1305"
 version = "0.9.1"
@@ -6887,6 +7009,15 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-xml"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.42.0"
@@ -7133,6 +7264,7 @@ dependencies = [
  "rustls-platform-verifier",
  "serde",
  "serde_json",
+ "serde_urlencoded",
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
@@ -7163,18 +7295,18 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
 dependencies = [
+ "ashpd",
  "block2 0.6.2",
  "dispatch2",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
  "js-sys",
  "log",
  "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
+ "pollster",
  "raw-window-handle",
+ "urlencoding",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -7195,6 +7327,19 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "ron"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3fe97c18ff24299ea56f802c5693eb34266fb0bc8317f4e101debc8a3ceaf"
+dependencies = [
+ "bitflags 2.13.2",
+ "serde",
+ "serde_derive",
+ "typeid",
+ "unicode-ident",
+]
+
 [[package]]
 name = "ropey"
 version = "1.6.1"
@@ -7261,7 +7406,7 @@ dependencies = [
  "md5",
  "ml-kem",
  "module-lattice",
- "num-bigint",
+ "num-bigint 0.5.1",
  "p256",
  "p384",
  "p521",
@@ -7491,6 +7636,12 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "ryu"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
 [[package]]
 name = "saa"
 version = "5.6.2"
@@ -7586,6 +7737,12 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -7636,6 +7793,25 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "secret-service"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5107b24b91445dd2aa449a258a1807b63240942157292354dc5bfdbeb8bc6db8"
+dependencies = [
+ "aes",
+ "cbc",
+ "futures-util",
+ "getrandom 0.4.3",
+ "hkdf",
+ "hybrid-array",
+ "num",
+ "once_cell",
+ "serde",
+ "sha2 0.11.1",
+ "zbus",
+]
+
 [[package]]
 name = "security-framework"
 version = "3.7.0"
@@ -7795,6 +7971,18 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
 [[package]]
 name = "serde_with"
 version = "3.24.0"
@@ -9112,7 +9300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
  "windows-sys 0.61.2",
@@ -9300,6 +9488,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
+ "tracing",
  "windows-sys 0.61.2",
 ]
 
@@ -10636,6 +10825,66 @@ dependencies = [
  "wasmtime",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073"
+dependencies = [
+ "bitflags 2.13.2",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+dependencies = [
+ "bitflags 2.13.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
+dependencies = [
+ "proc-macro2",
+ "quick-xml 0.41.0",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.106"
@@ -10921,6 +11170,19 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-native-keyring-store"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063426e76fdec7438d56bb777f67e318a84a25c707b07e575cb8b78e10c028f8"
+dependencies = [
+ "byteorder",
+ "keyring-core",
+ "regex",
+ "windows-sys 0.61.2",
+ "zeroize",
+]
+
 [[package]]
 name = "windows-numerics"
 version = "0.3.1"
@@ -11447,6 +11709,7 @@ dependencies = [
  "rustix",
  "serde",
  "serde_repr",
+ "tokio",
  "tracing",
  "uds_windows",
  "uuid",
@@ -11457,6 +11720,17 @@ dependencies = [
  "zvariant",
 ]
 
+[[package]]
+name = "zbus-secret-service-keyring-store"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74801d001b9e7729adb4f1825b67b398185fed424749aa3d8bacf70417137d9a"
+dependencies = [
+ "keyring-core",
+ "secret-service",
+ "zbus",
+]
+
 [[package]]
 name = "zbus_macros"
 version = "5.19.0"
@@ -11662,6 +11936,7 @@ dependencies = [
  "endi",
  "enumflags2",
  "serde",
+ "url",
  "winnow 1.0.4",
  "zcheapstr",
  "zvariant_derive",
diff --git a/Cargo.toml b/Cargo.toml
index a1c42bf2..ea4e1506 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
 exclude = ["sdk", "plugins"]
 
 [workspace.package]
-version = "0.1.35"
+version = "0.1.36"
 edition = "2024"
 rust-version = "1.96"
 license = "Apache-2.0"
@@ -76,7 +76,6 @@ ignore = "0.4"
 base64 = "0.22"
 globset = "0.4"
 notify = "8"
-notify-debouncer-full = "0.6"
 trash = "5"
 blake3 = "1"
 dunce = "1"
@@ -86,6 +85,7 @@ zip = { version = "9", default-features = false, features = ["deflate"] }
 # search, index, language
 grep-searcher = "0.1"
 grep-regex = "0.1"
+regex-syntax = "0.8"
 grep-matcher = "0.1"
 nucleo-matcher = "0.3"
 redb = "4"
@@ -105,6 +105,9 @@ sqlx = { version = "0.9", default-features = false, features = ["runtime-tokio",
 tiberius = { version = "0.13", default-features = false, features = ["tds73", "rustls", "sql-browser-tokio"] }
 bb8 = "0.9"
 uuid = { version = "1", features = ["v4"] }
+# OS credential stores
+keyring = "4.2"
+keyring-core = "1"
 
 # testing
 insta = { version = "1", features = ["yaml"] }
@@ -114,8 +117,14 @@ tempfile = "3"
 [profile.dev]
 # Keep debug builds snappy while giving dependencies decent speed.
 opt-level = 0
+# Full debug info is most of target/. Line tables keep file:line in our backtraces, but a
+# debugger can't show locals; re-enable with `--config profile.dev.debug=true`.
+debug = "line-tables-only"
 [profile.dev.package."*"]
 opt-level = 2
+# Dependency frames keep function names only. Re-enable one with
+# `--config 'profile.dev.package.<crate>.debug=true'`.
+debug = false
 
 [profile.release]
 codegen-units = 1
diff --git a/README.md b/README.md
index 59b4f7c0..0e0ca9dc 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@
   &nbsp;·&nbsp;
   <a href="#benchmark">Benchmark</a>
   &nbsp;·&nbsp;
+  <a href="#plugins">Plugins</a>
+  &nbsp;·&nbsp;
   <a href="https://discord.gg/2Zy4yn7gP">Discord</a>
 </p>
 
@@ -45,6 +47,16 @@ 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.
 
+## Plugins
+
+Plugins add actions, completion, quick fixes, tool windows, custom editors,
+themes, file icons and languages. They run as sandboxed WebAssembly components;
+themes, icon themes and languages need no code at all.
+
+Install them from Settings › Plugins, or start your own with
+`openidea-plugin new` — see [Writing OpenIDEA plugins](plugins/README.md) and
+the [official plugins](plugins/official). The plugin API is still a preview.
+
 ## License
 
 [Apache 2.0](LICENSE). Bundled third-party assets are listed in [`THIRD_PARTY_LICENSES.md`](THIRD_PARTY_LICENSES.md).
diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
index ad504787..2ebfd19a 100644
--- a/THIRD_PARTY_LICENSES.md
+++ b/THIRD_PARTY_LICENSES.md
@@ -2,12 +2,12 @@
 
 ## Project Lombok
 
-`plugins/lombok/lombok-1.18.48-openidea.2.jar` contains Project Lombok v1.18.48 with the Equinox
+`java/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).
+notices are retained in [java/lombok/LICENSE](java/lombok/LICENSE) and inside the jar.
+Source tag, patch commits and build instructions: [java/lombok/README.md](java/lombok/README.md).
 
 ## JetBrains IntelliJ Platform icons
 
@@ -52,6 +52,15 @@ Their original copyright headers and Apache-2.0 licensing are retained.
 
 At render time `src/ui/icons.tsx` may recolour monochrome icons to `currentColor`.
 
+## JetBrains IntelliJ Platform VCS log graph algorithms
+
+`crates/ide-vcs/src/bek.rs` and `src/features/vcs/graph.ts` adapt the Bek ordering,
+graph layout and LinearBek merge linearization algorithms from
+[intellij-community](https://github.com/JetBrains/intellij-community/tree/1d70d5c54302d655758edbd2f808fb8dea8b1764/platform/vcs-log/graph/src/com/intellij/vcs/log/graph)
+(`impl/facade/sort/bek`, `impl/permanent/GraphLayoutBuilder.kt` and
+`linearBek/LinearBekGraphBuilder.java`). Modified from the originals.
+Copyright 2000-2026 JetBrains s.r.o. and contributors. Apache License 2.0 (below).
+
 ## JetBrains IntelliJ Platform diff algorithm
 
 `src/features/vcs/comparison/**` is a TypeScript port of the text comparison of
diff --git a/crates/ide-agent/src/lib.rs b/crates/ide-agent/src/lib.rs
index a65400a6..7116047f 100644
--- a/crates/ide-agent/src/lib.rs
+++ b/crates/ide-agent/src/lib.rs
@@ -58,6 +58,8 @@ pub(crate) const LIMITS_UPDATE: &str = "openidea_limits";
 const MAX_EMBED: u64 = 256 * 1024;
 /// How long a probe waits for the agent to answer `initialize`.
 const PROBE_TIMEOUT: Duration = Duration::from_secs(30);
+/// How long deleting a task waits for its agent to exit before removing the worktree.
+const EXIT_WAIT: Duration = Duration::from_secs(5);
 
 /// The agent tasks of one project.
 pub struct AgentManager {
@@ -839,7 +841,7 @@ impl AgentManager {
     /// 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 live = task.kill();
         let (isolation, cwd, root) = {
             let s = task.state.lock();
             (
@@ -851,6 +853,11 @@ impl AgentManager {
         // A copy of the task (a fork) may work in the same worktree.
         let shared = self.tasks.read().values().any(|t| t.id != id && t.state.lock().task.cwd.0 == cwd);
         if remove_worktree && !shared && isolation == Isolation::Worktree && cwd.exists() {
+            // On Windows the agent's processes lock the folder (their working directory,
+            // open files) until they have exited.
+            if let Some(peer) = live {
+                let _ = tokio::time::timeout(EXIT_WAIT, peer.exited()).await;
+            }
             let worktrees = self.shared.paths.worktrees_dir.clone();
             blocking(move || worktree::remove(&root, &worktrees, &cwd)).await?;
         }
@@ -1605,11 +1612,12 @@ impl Task {
         }
     }
 
-    fn kill(&self) {
+    /// Stops the agent; returns its connection, to wait for its process to exit.
+    fn kill(&self) -> Option<acp::Conn> {
         self.cancel_permissions();
-        if let Some(live) = self.live.lock().take() {
-            live.peer.kill();
-        }
+        let live = self.live.lock().take()?;
+        live.peer.kill();
+        Some(live.peer)
     }
 }
 
diff --git a/crates/ide-agent/src/tests.rs b/crates/ide-agent/src/tests.rs
index e33338a7..e1da00d1 100644
--- a/crates/ide-agent/src/tests.rs
+++ b/crates/ide-agent/src/tests.rs
@@ -1109,3 +1109,114 @@ async fn idle_agents_stop_and_resume_their_session_on_the_next_message() {
     assert!(live(&mgr, &task.id));
     mgr.shutdown();
 }
+
+/// Deleting a task whose agent still runs in the worktree removes both and leaves no
+/// process behind, whether it is waiting for permission or idle without session/load.
+#[tokio::test(flavor = "multi_thread")]
+async fn deleting_a_task_waits_for_its_agent_to_exit_before_removing_the_worktree() {
+    for no_load in [false, true] {
+        delete_running_agent(no_load).await;
+    }
+}
+
+async fn delete_running_agent(no_load: bool) {
+    let tmp = tempfile::tempdir().unwrap();
+    let root = dunce::canonicalize(tmp.path()).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(&root)
+            .output()
+            .unwrap();
+        assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    };
+    git(&["init", "-q", "-b", "main"]);
+    std::fs::write(root.join("file.txt"), "original\n").unwrap();
+    git(&["add", "."]);
+    git(&["commit", "-qm", "initial"]);
+
+    let agent = Arc::new(FakeAgent { no_load, ..FakeAgent::default() });
+    let pids: Arc<Mutex<Vec<u32>>> = Arc::default();
+    let (fake, started) = (agent.clone(), pids.clone());
+    // The fake agent, served on behalf of a real process that exits only when killed.
+    let connector: Connector = Arc::new(move |_spec, cwd, client, _stderr| {
+        #[cfg(unix)]
+        let mut cmd = {
+            let mut cmd = tokio::process::Command::new("sleep");
+            cmd.arg("30");
+            cmd
+        };
+        #[cfg(windows)]
+        let mut cmd = {
+            let mut cmd = tokio::process::Command::new("cmd");
+            cmd.args(["/D", "/C", "echo ready>agent-ready & ping -n 30 127.0.0.1 >nul"]);
+            cmd
+        };
+        ide_core::process::prepare(cmd.as_std_mut());
+        ide_core::process::own_group(cmd.as_std_mut());
+        cmd.current_dir(cwd).kill_on_drop(true);
+        let child = cmd.spawn()?;
+        started.lock().push(child.id().unwrap());
+        let (a, b) = duplex(1 << 20);
+        let (ar, aw) = tokio::io::split(a);
+        let (br, bw) = tokio::io::split(b);
+        // `connect_with_child` frames with Content-Length.
+        fake.servers.lock().push(Peer::connect(br, bw, fake.clone()));
+        Ok(Peer::connect_with_child(ar, aw, client, child))
+    });
+    let mgr = AgentManager::with_connector(
+        AgentPaths {
+            project_root: root.clone(),
+            store_dir: root.join("store"),
+            worktrees_dir: root.join("worktrees"),
+            models_file: root.join("models.json"),
+            custom_agents_dir: None,
+            home_dir: None,
+        },
+        tokio::runtime::Handle::current(),
+        connector,
+    );
+    let task = mgr
+        .create(NewAgentTask {
+            project_root: None,
+            prompt: text(if no_load { "again" } else { "Fix the lexer" }),
+            provider: "claude".into(),
+            config: vec![],
+            isolation: Isolation::Worktree,
+            base: None,
+        })
+        .await
+        .unwrap();
+    wait_for(&mgr, &task.id, if no_load { AgentStatus::Ready } else { AgentStatus::NeedsInput }).await;
+    let pid = *pids.lock().last().expect("the agent was started");
+
+    #[cfg(windows)]
+    {
+        tokio::time::timeout(Duration::from_secs(5), async {
+            while !task.cwd.0.join("agent-ready").exists() {
+                tokio::time::sleep(Duration::from_millis(10)).await;
+            }
+        })
+        .await
+        .unwrap();
+        assert_eq!(
+            std::fs::rename(&task.cwd.0, task.cwd.0.with_extension("moved")).unwrap_err().raw_os_error(),
+            Some(32),
+            "the running agent really locks its worktree"
+        );
+    }
+
+    mgr.delete(&task.id, true).await.unwrap();
+    assert!(!task.cwd.0.exists());
+    // Killed and reaped: not even a zombie is left.
+    #[cfg(unix)]
+    let alive = std::process::Command::new("kill").args(["-0", &pid.to_string()]).status().unwrap().success();
+    #[cfg(windows)]
+    let alive = {
+        let mut cmd = std::process::Command::new("tasklist");
+        ide_core::process::prepare(&mut cmd).args(["/FI", &format!("PID eq {pid}"), "/FO", "CSV", "/NH"]);
+        String::from_utf8_lossy(&cmd.output().unwrap().stdout).contains(&format!("\"{pid}\""))
+    };
+    assert!(!alive, "the agent (pid {pid}) is still running");
+}
diff --git a/crates/ide-agent/src/worktree.rs b/crates/ide-agent/src/worktree.rs
index b0e2f62f..ddd45c41 100644
--- a/crates/ide-agent/src/worktree.rs
+++ b/crates/ide-agent/src/worktree.rs
@@ -5,7 +5,7 @@ use ide_core::{IdeError, IdeResult, IpcPath};
 use ide_vcs::{ChangeKind, Repo};
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
-use std::time::UNIX_EPOCH;
+use std::time::{Duration, UNIX_EPOCH};
 
 pub(crate) struct Created {
     pub path: PathBuf,
@@ -65,7 +65,27 @@ pub(crate) fn remove(project_root: &Path, worktrees_dir: &Path, path: &Path) ->
     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()))
+    retrying(REMOVE_ATTEMPTS, REMOVE_PAUSE, || std::fs::remove_dir_all(path))
+        .map_err(|e| IdeError::internal(format!("{}: {e}", path.display())))
+}
+
+/// On Windows a folder can't be deleted while a process still has a file in it open
+/// (os error 32): an agent's helper that outlived it, an antivirus scan, the search indexer.
+/// Those let go within moments, so removing is retried for a few seconds.
+const REMOVE_ATTEMPTS: u32 = 10;
+const REMOVE_PAUSE: Duration = Duration::from_millis(300);
+
+fn retrying(attempts: u32, pause: Duration, mut op: impl FnMut() -> std::io::Result<()>) -> std::io::Result<()> {
+    for _ in 1..attempts {
+        match op() {
+            Err(e) if e.kind() != std::io::ErrorKind::NotFound => std::thread::sleep(pause),
+            _ => return Ok(()),
+        }
+    }
+    match op() {
+        Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(()),
+        r => r,
+    }
 }
 
 /// Files under `cwd` that differ from `base` (untracked files included), with line counts.
@@ -149,6 +169,54 @@ fn unique_slug(base: &str, taken: impl Fn(&str) -> bool) -> String {
 mod tests {
     use super::*;
 
+    #[test]
+    fn removing_is_retried_while_a_file_is_still_in_use() {
+        use std::io::{Error, ErrorKind};
+        // A sharing violation as Windows reports it (os error 32), a vanished folder, other errors.
+        let in_use = || Error::from_raw_os_error(32);
+        for (fails, outcome) in [(0, true), (3, true), (REMOVE_ATTEMPTS - 1, true), (REMOVE_ATTEMPTS, false)] {
+            let mut calls = 0;
+            let r = retrying(REMOVE_ATTEMPTS, Duration::ZERO, || {
+                calls += 1;
+                if calls <= fails { Err(in_use()) } else { Ok(()) }
+            });
+            assert_eq!(r.is_ok(), outcome, "{fails} failures");
+            assert_eq!(calls, (fails + 1).min(REMOVE_ATTEMPTS));
+        }
+        let mut calls = 0;
+        let gone = retrying(REMOVE_ATTEMPTS, Duration::ZERO, || {
+            calls += 1;
+            if calls == 1 { Err(in_use()) } else { Err(Error::from(ErrorKind::NotFound)) }
+        });
+        assert!(gone.is_ok(), "deleted meanwhile: done");
+        assert_eq!(calls, 2);
+    }
+
+    #[cfg(windows)]
+    #[test]
+    fn removing_waits_for_a_windows_file_lock_to_be_released() {
+        use std::os::windows::fs::OpenOptionsExt;
+        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"]);
+        let worktrees = tmp.path().join("wt");
+        let created = create(&repo, &worktrees, "Locked file", None).unwrap();
+        let file = std::fs::OpenOptions::new().read(true).share_mode(0).open(created.path.join("a.txt")).unwrap();
+        assert_eq!(std::fs::remove_file(created.path.join("a.txt")).unwrap_err().raw_os_error(), Some(32));
+        let release = std::thread::spawn(move || {
+            std::thread::sleep(Duration::from_millis(800));
+            drop(file);
+        });
+        let result = remove(&repo, &worktrees, &created.path);
+        release.join().unwrap();
+        result.unwrap();
+        assert!(!created.path.exists());
+    }
+
     #[test]
     fn slugs_are_branch_safe() {
         assert_eq!(slugify("Fix lexer UTF-16 columns!"), "fix-lexer-utf-16-columns");
diff --git a/crates/ide-build/src/application_update.rs b/crates/ide-build/src/application_update.rs
index cabd8a73..96a7ad0d 100644
--- a/crates/ide-build/src/application_update.rs
+++ b/crates/ide-build/src/application_update.rs
@@ -40,7 +40,7 @@ pub fn plan(root: &Path, model: &BuildModel, module: &Path, cache: &Path) -> Ide
             kind: "maven",
         });
     }
-    if let Some(g) = &model.gradle
+    if let Some(g) = model.gradle_for_module(root, &module)
         && let Some(p) = g.projects.iter().find(|p| root.join(&p.dir) == module)
     {
         let script = cache.join("resources.init.gradle");
@@ -163,11 +163,11 @@ mod tests {
         assert!(maven.args.contains(&"-Dexpression=project.build.outputDirectory".into()));
         assert_eq!(maven.env["JAVA_HOME"], "/jdk");
         model.maven = None;
-        model.gradle = Some(crate::GradleModel {
+        model.gradle = vec![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");
diff --git a/crates/ide-build/src/compile/mod.rs b/crates/ide-build/src/compile/mod.rs
index 603d5b3f..fcfa45f0 100644
--- a/crates/ide-build/src/compile/mod.rs
+++ b/crates/ide-build/src/compile/mod.rs
@@ -147,7 +147,9 @@ fn detect_dir(dir: &Path, model: &BuildModel, root: &Path) -> Option<BuildSystem
     let rel = rel_str(root, dir);
     if model.maven.as_ref().is_some_and(|m| m.projects.iter().any(|p| p.dir == rel)) || has(dir, &["pom.xml"]) {
         Some(BuildSystem::Maven)
-    } else if has(dir, &["build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts"]) {
+    } else if model.gradle_for_module(root, dir).is_some()
+        || has(dir, &["build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts"])
+    {
         Some(BuildSystem::Gradle)
     } else if has(dir, &["Cargo.toml"]) {
         Some(BuildSystem::Cargo)
@@ -162,16 +164,13 @@ 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.
+/// Resolves a workspace-relative or absolute directory with native path separators.
 fn subdir(root: &Path, rel: &str) -> PathBuf {
-    rel.split('/').filter(|part| !part.is_empty()).fold(root.to_path_buf(), |path, part| path.join(part))
+    root.join(rel).components().collect()
 }
 
 fn rel_str(root: &Path, dir: &Path) -> String {
-    dir.strip_prefix(root).map(|r| r.to_string_lossy().replace('\\', "/")).unwrap_or_default()
+    dir.strip_prefix(root).unwrap_or(dir).to_string_lossy().replace('\\', "/")
 }
 
 /// Directories from `file`'s folder up to `root` (inclusive).
@@ -192,7 +191,14 @@ pub fn plan(
     let project_name = root.file_name().map_or_else(|| "project".to_owned(), |n| n.to_string_lossy().into_owned());
     let module_dir = match file {
         Some(f) => {
-            let dir = ancestors_within(root, f)
+            let scope = model
+                .gradle
+                .iter()
+                .flat_map(|g| std::iter::once(root.join(&g.dir)).chain(g.projects.iter().map(|p| root.join(&p.dir))))
+                .filter(|dir| f.starts_with(dir))
+                .max_by_key(|dir| dir.components().count())
+                .unwrap_or_else(|| root.to_path_buf());
+            let dir = ancestors_within(&scope, f)
                 .find(|d| detect_dir(d, model, root).is_some())
                 .ok_or_else(|| IdeError::not_found(format!("{} is not in a module", f.display())))?;
             Some(dir.to_path_buf())
@@ -202,7 +208,7 @@ pub fn plan(
     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((!model.gradle.is_empty()).then_some(BuildSystem::Gradle))
         .or_else(|| model.maven.as_ref().filter(|m| !m.projects.is_empty()).map(|_| BuildSystem::Maven))
         .ok_or_else(|| {
             IdeError::not_found("no supported build system (Maven, Gradle, Cargo, Go, TypeScript, CMake) found")
@@ -270,14 +276,16 @@ fn maven_steps(root: &Path, model: &BuildModel, kind: BuildKind, module: Option<
 }
 
 fn gradle_steps(root: &Path, model: &BuildModel, kind: BuildKind, module: Option<&Path>) -> IdeResult<Vec<BuildStep>> {
-    let fallback;
-    let g = match &model.gradle {
-        Some(g) => g,
-        None => {
-            fallback = crate::gradle::load(root).ok_or_else(|| IdeError::not_found("no Gradle build found"))?;
-            &fallback
-        }
-    };
+    if module.is_none() && !model.gradle.is_empty() {
+        return Ok(model.gradle.iter().flat_map(|g| gradle_step(root, g, kind, None)).collect());
+    }
+    let g = module
+        .and_then(|m| model.gradle_for_module(root, m))
+        .ok_or_else(|| IdeError::not_found("module does not belong to a linked Gradle build"))?;
+    Ok(gradle_step(root, g, kind, module))
+}
+
+fn gradle_step(root: &Path, g: &crate::GradleModel, kind: BuildKind, module: Option<&Path>) -> Vec<BuildStep> {
     let prefix = module
         .and_then(|m| {
             let rel = rel_str(root, m);
@@ -296,7 +304,7 @@ fn gradle_steps(root: &Path, model: &BuildModel, kind: BuildKind, module: Option
     let mut s = BuildStep::new(&g.command, &["--console=plain"], &subdir(root, &g.dir), Format::Gradle);
     s.args.extend(tasks);
     s.env = g.env.clone();
-    Ok(vec![s])
+    vec![s]
 }
 
 fn cargo_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {
@@ -811,6 +819,77 @@ fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<Path
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn independent_gradle_builds_keep_their_launchers_and_task_paths() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path();
+        for dir in ["a", "b"] {
+            std::fs::create_dir_all(root.join(dir).join("app/src/main/java")).unwrap();
+            std::fs::write(root.join(dir).join("settings.gradle"), "include 'app'").unwrap();
+            std::fs::write(root.join(dir).join("app/build.gradle"), "plugins { id 'java' }").unwrap();
+            std::fs::write(root.join(dir).join("gradlew"), "").unwrap();
+        }
+        let settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec!["a".into(), "b".into()]),
+            ..Default::default()
+        };
+        let mut model = crate::load_linked(root, &root.join("cache"), None, &Default::default(), &settings);
+        model.gradle[0].env.insert("JAVA_HOME".into(), "/jdk-a".into());
+        model.gradle[1].env.insert("JAVA_HOME".into(), "/jdk-b".into());
+        let all = super::plan(root, &model, super::BuildKind::Build, None, None).unwrap();
+        assert_eq!(all.steps.len(), 2);
+        assert_eq!(all.steps[0].cwd, root.join("a"));
+        assert_eq!(all.steps[1].cwd, root.join("b"));
+        let module = super::plan(root, &model, super::BuildKind::Rebuild, Some(&root.join("b/app")), None).unwrap();
+        assert_eq!(module.steps.len(), 1);
+        assert_eq!(module.steps[0].program, root.join("b/gradlew").to_string_lossy());
+        assert_eq!(module.steps[0].cwd, root.join("b"));
+        assert_eq!(module.steps[0].env["JAVA_HOME"], "/jdk-b");
+        assert_eq!(module.steps[0].args, ["--console=plain", ":app:clean", ":app:classes", ":app:testClasses"]);
+        // A directly linked build owns its module even when another composite reports it too.
+        let direct = model.gradle[1].projects[0].clone();
+        model.gradle[0].projects.push(direct);
+        assert_eq!(model.gradle_for_module(root, &root.join("b")).unwrap().dir, "b");
+        let mut nested = model.gradle[1].projects[1].clone();
+        nested.path = ":b:app".into();
+        model.gradle[0].projects.push(nested);
+        let nested = super::plan(root, &model, super::BuildKind::Build, Some(&root.join("b/app")), None).unwrap();
+        assert_eq!(nested.steps[0].program, root.join("b/gradlew").to_string_lossy());
+        assert_eq!(nested.steps[0].args, ["--console=plain", ":app:classes", ":app:testClasses"]);
+        model.gradle.clear();
+        assert!(super::plan(root, &model, super::BuildKind::Build, Some(&root.join("b/app")), None).is_err());
+    }
+
+    #[test]
+    fn absolute_linked_roots_build_the_project_and_external_source_module() {
+        let temp = tempfile::tempdir().unwrap();
+        let base = dunce::canonicalize(temp.path()).unwrap();
+        let root = base.join("workspace");
+        let external = base.join("external");
+        std::fs::create_dir(&root).unwrap();
+        std::fs::create_dir_all(external.join("app/src/main/java")).unwrap();
+        std::fs::write(external.join("settings.gradle"), "include 'app'").unwrap();
+        let source = external.join("app/src/main/java/App.java");
+        std::fs::write(&source, "class App {}").unwrap();
+        std::fs::write(external.join("gradlew"), "").unwrap();
+        let settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec![external.to_string_lossy().into_owned()]),
+            ..Default::default()
+        };
+        let mut model = crate::load_linked(&root, &base.join("cache"), None, &Default::default(), &settings);
+        model.gradle[0].env.insert("JAVA_HOME".into(), "/external-jdk".into());
+        let all = super::plan(&root, &model, super::BuildKind::Build, None, None).unwrap();
+        assert_eq!(all.steps[0].cwd, external);
+        assert_eq!(all.steps[0].program, external.join("gradlew").to_string_lossy());
+        let module = super::plan(&root, &model, super::BuildKind::Rebuild, Some(&source), None).unwrap();
+        assert_eq!(module.steps[0].cwd, external);
+        assert_eq!(module.steps[0].env["JAVA_HOME"], "/external-jdk");
+        assert_eq!(module.steps[0].args, ["--console=plain", ":app:clean", ":app:classes", ":app:testClasses"]);
+        let other = base.join("unlinked");
+        std::fs::create_dir(&other).unwrap();
+        std::fs::write(other.join("build.gradle"), "").unwrap();
+        assert!(super::plan(&root, &model, super::BuildKind::Build, Some(&other), None).is_err());
+    }
     use super::*;
 
     /// Launch outputs use the platform separator throughout, so they compare equal to
diff --git a/crates/ide-build/src/gradle.rs b/crates/ide-build/src/gradle.rs
index 2ebf5848..c805f93a 100644
--- a/crates/ide-build/src/gradle.rs
+++ b/crates/ide-build/src/gradle.rs
@@ -435,6 +435,15 @@ pub fn external_roots<'a>(root: &Path, dirs: impl IntoIterator<Item = &'a str>)
 
 pub fn load(root: &Path) -> Option<GradleModel> {
     let dir = build_dir(root)?;
+    load_build(root, dir.strip_prefix(root).unwrap_or(&dir))
+}
+
+/// Loads exactly this build, without searching its child folders.
+pub fn load_build(root: &Path, dir: &Path) -> Option<GradleModel> {
+    let dir = root.join(dir);
+    if !SETTINGS_FILES.iter().chain(BUILD_FILES).any(|name| dir.join(name).is_file()) {
+        return None;
+    }
     let settings = read_first(&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());
@@ -455,6 +464,56 @@ pub fn load(root: &Path) -> Option<GradleModel> {
     Some(GradleModel { dir: rel(root, &dir), projects, java_version, command: wrapper(&dir), ..GradleModel::default() })
 }
 
+/// Validates user-selected build folders and stores a stable, deduplicated identity.
+pub fn normalize_linked_projects(root: &Path, dirs: &[String]) -> ide_core::IdeResult<Vec<String>> {
+    let root = dunce::canonicalize(root)?;
+    let mut out = Vec::new();
+    for dir in dirs {
+        let path = dunce::canonicalize(root.join(dir))?;
+        if !path.is_dir() || !SETTINGS_FILES.iter().chain(BUILD_FILES).any(|name| path.join(name).is_file()) {
+            return Err(ide_core::IdeError::invalid(format!("No Gradle build in {}", path.display())));
+        }
+        let dir = rel(&root, &path);
+        if !out.contains(&dir) {
+            out.push(dir);
+        }
+    }
+    Ok(out)
+}
+
+/// Linked build identities without reading their scripts (also used by index hot paths).
+pub(crate) fn linked_dirs(root: &Path, settings: &ide_core::settings::GradleSettings) -> Vec<String> {
+    match &settings.linked_projects {
+        None => build_dir(root).map(|dir| rel(root, &dir)).into_iter().collect(),
+        Some(dirs) => {
+            let mut out = Vec::new();
+            for dir in dirs {
+                if let Ok(dirs) = normalize_linked_projects(root, std::slice::from_ref(dir)) {
+                    for dir in dirs {
+                        if !out.contains(&dir) {
+                            out.push(dir);
+                        }
+                    }
+                }
+            }
+            out
+        }
+    }
+}
+
+pub fn load_linked(root: &Path, settings: &ide_core::settings::GradleSettings) -> Vec<GradleModel> {
+    linked_dirs(root, settings).iter().filter_map(|dir| load_build(root, Path::new(dir))).collect()
+}
+
+/// A build's task paths are local to it, so sync caches must be local to its identity too.
+pub fn cache_dir(cache: &Path, build_dir: &str) -> PathBuf {
+    if build_dir.is_empty() {
+        return cache.to_path_buf();
+    }
+    let hash = build_dir.bytes().fold(0xcbf29ce484222325u64, |h, b| (h ^ u64::from(b)).wrapping_mul(0x100000001b3));
+    cache.join("gradle").join(format!("{hash:016x}"))
+}
+
 /// `JavaLanguageVersion.of(21)` / `sourceCompatibility = JavaVersion.VERSION_17` in a build script.
 pub fn script_java_version(text: &str) -> Option<u32> {
     let number = |s: &str| -> Option<u32> {
@@ -616,6 +675,41 @@ pub(crate) fn has_war_plugin(script: &str) -> bool {
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn explicit_linkage_preserves_default_discovery_and_can_unlink_every_build() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path();
+        for dir in ["a", "b"] {
+            std::fs::create_dir(root.join(dir)).unwrap();
+            std::fs::write(root.join(dir).join("settings.gradle"), format!("rootProject.name = '{dir}'")).unwrap();
+        }
+        assert_eq!(super::load_linked(root, &Default::default())[0].dir, "a");
+        let mut settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec!["b".into(), "./b".into(), "a".into()]),
+            ..Default::default()
+        };
+        let models = super::load_linked(root, &settings);
+        assert_eq!(models.iter().map(|g| g.dir.as_str()).collect::<Vec<_>>(), ["b", "a"]);
+        settings.linked_projects = Some(vec![]);
+        assert!(super::load_linked(root, &settings).is_empty());
+        assert!(super::normalize_linked_projects(root, &["missing".into()]).is_err());
+        assert!(super::normalize_linked_projects(root, &["".into()]).is_err());
+        assert!(super::load_build(root, root).is_none(), "exact loading never picks a child");
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn linked_directories_deduplicate_symlinks_and_keep_external_builds() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path().join("workspace");
+        let external = temp.path().join("external");
+        std::fs::create_dir(&root).unwrap();
+        std::fs::create_dir(&external).unwrap();
+        std::fs::write(external.join("build.gradle"), "").unwrap();
+        std::os::unix::fs::symlink(&external, root.join("alias")).unwrap();
+        let dirs = super::normalize_linked_projects(&root, &["alias".into(), "../external".into()]).unwrap();
+        assert_eq!(dirs, [external.canonicalize().unwrap().to_string_lossy().to_string()]);
+    }
     #[test]
     fn script_dependencies_read_string_and_map_notations() {
         let script = r#"
diff --git a/crates/ide-build/src/gradle_deps.rs b/crates/ide-build/src/gradle_deps.rs
new file mode 100644
index 00000000..109fea96
--- /dev/null
+++ b/crates/ide-build/src/gradle_deps.rs
@@ -0,0 +1,268 @@
+//! A Gradle project's resolved dependencies for the Dependency Analyzer:
+//! `gradle <project>:dependencies --configuration <name>`, parsed from its tree report.
+
+use crate::gradle;
+use crate::process;
+use crate::sync::{SyncOptions, error_summary};
+use ide_core::{CancellationToken, IdeError, IdeResult};
+use serde::{Deserialize, Serialize};
+use specta::Type;
+use std::path::Path;
+
+/// One line of the report: an occurrence of a dependency where it is requested.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct GradleDependency {
+    /// `group`, empty for a project dependency.
+    pub group: String,
+    /// Artifact name, or the project path (`:core`) of a project dependency.
+    pub name: String,
+    /// The version asked for here; `None` when a platform or constraint supplies it.
+    pub requested: Option<String>,
+    /// The version Gradle selected (`-> 1.2`), when it differs from the request.
+    pub selected: Option<String>,
+    /// A project of the build (`project :core`, or a module substituted by one).
+    pub project: bool,
+    /// `(*)`: listed with its dependencies earlier in the tree.
+    pub repeated: bool,
+    /// `(c)`: a dependency constraint rather than a dependency.
+    pub constraint: bool,
+    /// `(n)` / `FAILED`: not resolved.
+    pub unresolved: bool,
+    pub children: Vec<GradleDependency>,
+}
+
+/// Parses the tree of a `dependencies --configuration` report (lines `+--- g:a:1.0 -> 1.1 (*)`).
+pub fn parse_report(output: &str) -> Vec<GradleDependency> {
+    let mut roots: Vec<GradleDependency> = Vec::new();
+    // Path of child indexes from the roots to the last node of each depth.
+    let mut path: Vec<usize> = Vec::new();
+    for line in output.lines() {
+        let Some((depth, text)) = tree_line(line) else { continue };
+        let node = parse_entry(text);
+        path.truncate(depth);
+        if depth > path.len() {
+            continue; // A line deeper than its parent allows: not part of a well-formed tree.
+        }
+        let siblings = if depth == 0 {
+            &mut roots
+        } else {
+            let mut list = &mut roots;
+            for &i in &path[..depth - 1] {
+                list = &mut list[i].children;
+            }
+            let Some(parent) = list.get_mut(path[depth - 1]) else { continue };
+            &mut parent.children
+        };
+        siblings.push(node);
+        path.push(siblings.len() - 1);
+    }
+    roots
+}
+
+/// `|    \--- g:a:1.0` → (1, "g:a:1.0").
+fn tree_line(line: &str) -> Option<(usize, &str)> {
+    let mut rest = line;
+    let mut depth = 0;
+    loop {
+        if let Some(r) = rest.strip_prefix("+--- ").or_else(|| rest.strip_prefix("\\--- ")) {
+            return Some((depth, r.trim()));
+        }
+        rest = rest.strip_prefix("|    ").or_else(|| rest.strip_prefix("     "))?;
+        depth += 1;
+    }
+}
+
+fn parse_entry(text: &str) -> GradleDependency {
+    let mut d = GradleDependency::default();
+    let mut text = text.trim();
+    loop {
+        if let Some(t) = text.strip_suffix(" (*)") {
+            d.repeated = true;
+            text = t;
+        } else if let Some(t) = text.strip_suffix(" (c)") {
+            d.constraint = true;
+            text = t;
+        } else if let Some(t) = text.strip_suffix(" (n)").or_else(|| text.strip_suffix(" FAILED")) {
+            d.unresolved = true;
+            text = t;
+        } else {
+            break;
+        }
+        text = text.trim_end();
+    }
+    let (left, right) = match text.split_once(" -> ") {
+        Some((l, r)) => (l.trim(), Some(r.trim())),
+        None => (text, None),
+    };
+    if let Some(project) = left.strip_prefix("project ") {
+        d.project = true;
+        d.name = project_path(project);
+    } else {
+        let mut parts = left.splitn(3, ':');
+        d.group = parts.next().unwrap_or_default().to_owned();
+        d.name = parts.next().unwrap_or_default().to_owned();
+        d.requested = parts.next().filter(|v| !v.is_empty()).map(str::to_owned);
+    }
+    if let Some(right) = right {
+        if let Some(project) = right.strip_prefix("project ") {
+            // A module substituted by a project of the build.
+            d.project = true;
+            d.selected = Some(project_path(project));
+        } else {
+            d.selected = Some(right.to_owned());
+        }
+    }
+    d
+}
+
+/// `:core`, or `':core'` as Gradle 9 quotes it.
+fn project_path(text: &str) -> String {
+    let t = text.trim();
+    t.strip_prefix('\'').and_then(|t| t.strip_suffix('\'')).unwrap_or(t).to_owned()
+}
+
+/// Runs the `dependencies` report of `project` (a Gradle path, `:` for the root) for
+/// `configuration` and returns its tree.
+pub fn gradle_dependencies(
+    root: &Path,
+    model: &gradle::GradleModel,
+    options: &SyncOptions,
+    project: &str,
+    configuration: &str,
+    cancel: &CancellationToken,
+) -> IdeResult<Vec<GradleDependency>> {
+    if !configuration.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-') || configuration.is_empty() {
+        return Err(IdeError::invalid(format!("not a configuration name: {configuration}")));
+    }
+    if !project.starts_with(':') || project.chars().any(char::is_whitespace) {
+        return Err(IdeError::invalid(format!("not a Gradle project path: {project}")));
+    }
+    let task = if project == ":" { ":dependencies".to_owned() } else { format!("{project}:dependencies") };
+    let mut args: Vec<String> =
+        vec!["--console=plain".into(), "-q".into(), task, "--configuration".into(), configuration.into()];
+    if options.offline {
+        args.push("--offline".into());
+    }
+    let out = process::run(
+        options.gradle_command.as_deref().unwrap_or(&model.command),
+        &args,
+        &root.join(&model.dir),
+        &options.env,
+        cancel,
+        |_, _| {},
+    )?;
+    if !out.success {
+        return Err(IdeError::unavailable(error_summary(&out.text)));
+    }
+    Ok(parse_report(&out.text))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn dep(group: &str, name: &str, requested: Option<&str>) -> GradleDependency {
+        GradleDependency {
+            group: group.into(),
+            name: name.into(),
+            requested: requested.map(Into::into),
+            ..Default::default()
+        }
+    }
+
+    #[test]
+    fn parses_the_tree_with_selected_versions_and_markers() {
+        let report = "\
+------------------------------------------------------------
+Project ':app'
+------------------------------------------------------------
+
+runtimeClasspath - Runtime classpath of source set 'main'.
++--- org.springframework.boot:spring-boot-starter-web -> 3.2.0
+|    +--- org.springframework.boot:spring-boot-starter:3.2.0
+|    |    \\--- org.yaml:snakeyaml:2.2
+|    \\--- com.fasterxml.jackson.core:jackson-databind:2.15.0 -> 2.15.3 (*)
++--- project ':core'
+|    \\--- com.google.guava:guava:{strictly 32.1.3-jre} -> 32.1.3-jre (c)
++--- org.example:legacy:1.0 -> project :legacy
+\\--- org.missing:gone:9 FAILED
+
+(c) - A dependency constraint, not a dependency. The dependency affected by the constraint occurs elsewhere in the tree.
+(*) - Indicates repeated occurrences of a transitive dependency subtree. Gradle expands transitive dependency subtrees only once per project; repeat occurrences only display the root of the subtree, followed by this annotation.
+";
+        let tree = parse_report(report);
+        assert_eq!(tree.len(), 4);
+        let web = &tree[0];
+        assert_eq!((web.group.as_str(), web.name.as_str()), ("org.springframework.boot", "spring-boot-starter-web"));
+        assert_eq!((web.requested.as_deref(), web.selected.as_deref()), (None, Some("3.2.0")));
+        assert_eq!(web.children.len(), 2);
+        assert_eq!(web.children[0].children, vec![dep("org.yaml", "snakeyaml", Some("2.2"))]);
+        let databind = &web.children[1];
+        assert_eq!((databind.requested.as_deref(), databind.selected.as_deref()), (Some("2.15.0"), Some("2.15.3")));
+        assert!(databind.repeated);
+        let core = &tree[1];
+        assert!(core.project && core.group.is_empty());
+        assert_eq!(core.name, ":core");
+        let guava = &core.children[0];
+        assert!(guava.constraint);
+        assert_eq!(guava.requested.as_deref(), Some("{strictly 32.1.3-jre}"));
+        let legacy = &tree[2];
+        assert!(legacy.project);
+        assert_eq!((legacy.name.as_str(), legacy.selected.as_deref()), ("legacy", Some(":legacy")));
+        assert!(tree[3].unresolved);
+        assert_eq!(tree[3].requested.as_deref(), Some("9"));
+    }
+
+    #[test]
+    fn an_empty_configuration_has_no_dependencies() {
+        assert!(
+            parse_report("compileClasspath - Compile classpath for source set 'main'.\nNo dependencies\n").is_empty()
+        );
+    }
+
+    #[test]
+    fn rejects_names_that_are_not_configurations_or_projects() {
+        let tmp = tempfile::tempdir().unwrap();
+        let options = SyncOptions::default();
+        let cancel = CancellationToken::new();
+        assert!(
+            gradle_dependencies(tmp.path(), &Default::default(), &options, ":", "x --init-script y", &cancel).is_err()
+        );
+        assert!(
+            gradle_dependencies(tmp.path(), &Default::default(), &options, "app", "runtimeClasspath", &cancel).is_err()
+        );
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn runs_the_report_of_the_project_and_configuration() {
+        use std::os::unix::fs::PermissionsExt;
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path();
+        std::fs::write(root.join("settings.gradle"), "include 'app'").unwrap();
+        std::fs::write(root.join("build.gradle"), "").unwrap();
+        let launcher = root.join("fake-gradle");
+        std::fs::write(&launcher, "#!/bin/sh\necho \"$@\" > args\necho '\\--- org.a:b:1.0'\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()),
+            offline: true,
+            ..Default::default()
+        };
+        let tree = gradle_dependencies(
+            root,
+            &gradle::load(root).unwrap(),
+            &options,
+            ":app",
+            "testRuntimeClasspath",
+            &CancellationToken::new(),
+        )
+        .unwrap();
+        assert_eq!(tree, vec![dep("org.a", "b", Some("1.0"))]);
+        assert_eq!(
+            std::fs::read_to_string(root.join("args")).unwrap().trim(),
+            "--console=plain -q :app:dependencies --configuration testRuntimeClasspath --offline"
+        );
+    }
+}
diff --git a/crates/ide-build/src/lib.rs b/crates/ide-build/src/lib.rs
index 7ca4789c..31541854 100644
--- a/crates/ide-build/src/lib.rs
+++ b/crates/ide-build/src/lib.rs
@@ -8,6 +8,7 @@
 pub mod application_update;
 pub mod compile;
 pub mod gradle;
+mod gradle_deps;
 pub mod kotlin_bridge;
 pub mod maven;
 pub mod pom_edit;
@@ -17,8 +18,11 @@ pub mod web;
 mod xml;
 
 pub use gradle::{GradleModel, GradleProject, GradleTask};
+pub use gradle_deps::{GradleDependency, gradle_dependencies};
 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, maven_profiles, save_maven_profiles, sync_gradle, sync_gradle_model, sync_maven,
+};
 
 use serde::{Deserialize, Serialize};
 use specta::Type;
@@ -36,13 +40,31 @@ pub enum BuildTool {
 #[serde(rename_all = "camelCase")]
 pub struct BuildModel {
     pub maven: Option<MavenModel>,
-    pub gradle: Option<GradleModel>,
+    #[serde(default)]
+    pub gradle: Vec<GradleModel>,
+}
+
+impl BuildModel {
+    /// Prefer the deepest linked build owning the module over a composite including it.
+    pub fn gradle_for_module(&self, root: &Path, module: &Path) -> Option<&GradleModel> {
+        let module = root.join(module);
+        self.gradle.iter().filter(|g| g.projects.iter().any(|p| root.join(&p.dir) == module)).min_by_key(|g| {
+            let dir = root.join(&g.dir);
+            std::cmp::Reverse(if module.starts_with(&dir) { dir.components().count() } else { 0 })
+        })
+    }
 }
 
 /// 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())
+    load_linked(
+        root,
+        cache_dir,
+        maven_repo,
+        &ide_core::settings::MavenSettings::default(),
+        &ide_core::settings::GradleSettings::default(),
+    )
 }
 
 /// Loads only linked Maven reactors, retaining an empty model so projects can be re-added.
@@ -51,6 +73,7 @@ pub fn load_linked(
     cache_dir: &Path,
     maven_repo: Option<PathBuf>,
     settings: &ide_core::settings::MavenSettings,
+    gradle_settings: &ide_core::settings::GradleSettings,
 ) -> BuildModel {
     let maven = maven::is_maven_project(root).then(|| {
         let profiles = sync::maven_profiles(cache_dir);
@@ -59,23 +82,50 @@ pub fn load_linked(
         sync::apply_maven_cache(root, cache_dir, &mut m);
         m
     });
-    let gradle = gradle::load(root).map(|mut g| {
-        sync::apply_gradle_cache(root, cache_dir, &mut g);
-        g
-    });
+    let gradle = gradle::load_linked(root, gradle_settings)
+        .into_iter()
+        .map(|mut g| {
+            sync::apply_gradle_cache(root, &gradle::cache_dir(cache_dir, &g.dir), &mut g);
+            g
+        })
+        .collect();
     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()))
+pub fn gradle_external_roots(
+    root: &Path,
+    cache_dir: &Path,
+    settings: &ide_core::settings::GradleSettings,
+) -> Vec<PathBuf> {
+    let builds = gradle::linked_dirs(root, settings);
+    let dirs: Vec<String> = builds
+        .iter()
+        .flat_map(|dir| {
+            std::iter::once(root.join(dir).to_string_lossy().into_owned()).chain(
+                sync::reported_gradle_projects(&gradle::cache_dir(cache_dir, dir))
+                    .iter()
+                    .map(|p| p.dir.clone())
+                    .collect::<Vec<_>>(),
+            )
+        })
+        .collect();
+    gradle::external_roots(root, dirs.iter().map(String::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))
+pub fn gradle_source_roots(
+    root: &Path,
+    cache_dir: &Path,
+    settings: &ide_core::settings::GradleSettings,
+) -> Vec<(PathBuf, gradle::ReportedRoot)> {
+    let reported = gradle::linked_dirs(root, settings)
+        .iter()
+        .flat_map(|dir| sync::reported_gradle_projects(&gradle::cache_dir(cache_dir, dir)).as_ref().clone())
+        .collect::<Vec<_>>();
+    gradle::reported_source_roots(&reported)
 }
 
 /// A library the project depends on, as `groupId:artifactId:version`.
@@ -119,7 +169,7 @@ pub fn dependency_coordinates(root: &Path, model: &BuildModel) -> Vec<Dependency
             });
         }
     }
-    if let Some(g) = &model.gradle {
+    for g in &model.gradle {
         for script in g.projects.iter().filter_map(|p| p.build_file.as_ref()) {
             let Ok(text) = std::fs::read_to_string(root.join(script)) else { continue };
             out.extend(gradle::script_dependencies(&text).into_iter().map(|(group_id, artifact_id, version)| {
@@ -145,6 +195,26 @@ pub fn affects_build(rel: &Path) -> bool {
 mod tests {
     use super::*;
 
+    #[test]
+    fn external_linked_build_is_indexed_before_sync_and_disappears_when_unlinked() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path().join("workspace");
+        let external = temp.path().join("external");
+        std::fs::create_dir(&root).unwrap();
+        std::fs::create_dir(&external).unwrap();
+        std::fs::write(external.join("settings.gradle"), "").unwrap();
+        let mut settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec![external.to_string_lossy().into_owned()]),
+            ..Default::default()
+        };
+        assert_eq!(
+            gradle_external_roots(&root, &temp.path().join("cache"), &settings),
+            [external.canonicalize().unwrap()]
+        );
+        settings.linked_projects = Some(vec![]);
+        assert!(gradle_external_roots(&root, &temp.path().join("cache"), &settings).is_empty());
+    }
+
     #[test]
     fn detects_build_systems_and_build_files() {
         let tmp = tempfile::tempdir().unwrap();
@@ -156,7 +226,7 @@ mod tests {
         std::fs::write(root.join("build.gradle"), "").unwrap();
         let m = load(&root, &cache, None);
         assert_eq!(m.maven.unwrap().projects[0].pom, "svc/pom.xml");
-        assert_eq!(m.gradle.unwrap().projects[0].path, ":");
+        assert_eq!(m.gradle[0].projects[0].path, ":");
         assert!(affects_build(Path::new("a/pom.xml")) && affects_build(Path::new("settings.gradle.kts")));
         assert!(!affects_build(Path::new("src/Main.java")));
     }
@@ -203,7 +273,7 @@ mod tests {
             ],
             ..Default::default()
         };
-        let gradle = gradle::load(root);
+        let gradle = gradle::load(root).into_iter().collect();
         let model = BuildModel { maven: Some(maven), gradle };
         let names: Vec<String> = dependency_coordinates(root, &model)
             .into_iter()
diff --git a/crates/ide-build/src/sync.rs b/crates/ide-build/src/sync.rs
index 407df454..eca3daa4 100644
--- a/crates/ide-build/src/sync.rs
+++ b/crates/ide-build/src/sync.rs
@@ -315,7 +315,10 @@ pub fn sync_maven(
     for (n, top) in model.projects.iter().filter(|p| !p.aggregated).enumerate() {
         let effective = cache_dir.join(format!("effective-pom-{n}.xml"));
         let _ = std::fs::remove_file(&effective);
-        let mut args: Vec<String> = vec!["-B".into(), "-fae".into(), "-Dstyle.color=never".into()];
+        // `-T1` keeps mvnd serial: its default parallel build interleaves the
+        // `dependency:tree` output of concurrent modules, which the sync parses
+        // as one stream. mvn is serial anyway, so this only pins the daemon.
+        let mut args: Vec<String> = vec!["-B".into(), "-fae".into(), "-Dstyle.color=never".into(), "-T1".into()];
         args.extend(options.maven_options.iter().cloned());
         if options.offline {
             args.push("-o".into());
@@ -370,8 +373,25 @@ 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 model = gradle::load(root).ok_or_else(|| IdeError::not_found("no Gradle build in this project"))?;
+    sync_gradle_model(root, cache_dir, &model, options, cancel, progress)
+}
+
+/// Syncs this exact linked build; another build's task paths and cache cannot interfere.
+pub fn sync_gradle_model(
+    root: &Path,
+    cache_dir: &Path,
+    model: &GradleModel,
+    options: &SyncOptions,
+    cancel: &CancellationToken,
+    progress: &dyn Fn(SyncProgress),
+) -> IdeResult<()> {
+    if cancel.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
+    let mut model = model.clone();
+    let cache_dir = gradle::cache_dir(cache_dir, &model.dir);
+    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![
@@ -386,14 +406,24 @@ pub fn sync_gradle(
         args.push("--offline".into());
     }
     progress(SyncProgress { message: "Loading Gradle tasks".into(), fraction: None });
-    let out = run(
+    let out = match run(
         options.gradle_command.as_deref().unwrap_or(&model.command),
         &args,
         &root.join(&model.dir),
         &options.env,
         cancel,
         |_| {},
-    )?;
+    ) {
+        Ok(out) => out,
+        Err(_) if cancel.is_cancelled() => return Err(IdeError::cancelled()),
+        Err(error) if error.kind == ide_core::error::ErrorKind::Unavailable => {
+            Output { success: false, text: error.message }
+        }
+        Err(error) => return Err(error),
+    };
+    if cancel.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
     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);
@@ -404,13 +434,128 @@ pub fn sync_gradle(
         tasks: if out.success { gradle::parse_tasks(&out.text) } else { Vec::new() },
         projects,
     };
-    write_cache(cache_dir, GRADLE_CACHE, &cache)
+    write_cache(&cache_dir, GRADLE_CACHE, &cache)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[cfg(unix)]
+    #[test]
+    fn unavailable_gradle_launchers_are_cached_without_stopping_other_builds() {
+        use std::os::unix::fs::PermissionsExt;
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path();
+        for dir in ["a", "b"] {
+            std::fs::create_dir(root.join(dir)).unwrap();
+            std::fs::write(root.join(dir).join("build.gradle"), "").unwrap();
+        }
+        let wrapper = root.join("b/gradlew");
+        std::fs::write(&wrapper, "#!/bin/sh\nprintf '%s\\n' 'Build tasks' '-----------' 'healthy - ok'\n").unwrap();
+        std::fs::set_permissions(&wrapper, std::fs::Permissions::from_mode(0o755)).unwrap();
+        let settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec!["a".into(), "b".into()]),
+            ..Default::default()
+        };
+        let mut models = gradle::load_linked(root, &settings);
+        models[0].command = root.join("a/missing-gradlew").to_string_lossy().into_owned();
+        let cache = root.join("cache");
+        let run = |model: &GradleModel| {
+            sync_gradle_model(root, &cache, model, &SyncOptions::default(), &CancellationToken::new(), &|_| {})
+        };
+        for model in &models {
+            run(model).unwrap();
+        }
+        let loaded = crate::load_linked(root, &cache, None, &Default::default(), &settings);
+        assert!(loaded.gradle[0].sync_error.as_deref().unwrap().contains("cannot start"));
+        assert!(loaded.gradle[1].sync_error.is_none());
+        assert_eq!(loaded.gradle[1].projects[0].tasks[0].name, "healthy");
+        let bad_wrapper = root.join("a/gradlew");
+        std::fs::write(&bad_wrapper, "#!/bin/sh\nexit 0\n").unwrap();
+        std::fs::set_permissions(&bad_wrapper, std::fs::Permissions::from_mode(0o644)).unwrap();
+        models[0].command = bad_wrapper.to_string_lossy().into_owned();
+        run(&models[0]).unwrap();
+        let loaded = crate::load_linked(root, &cache, None, &Default::default(), &settings);
+        assert!(loaded.gradle[0].sync_error.as_deref().unwrap().contains("cannot start"));
+        assert!(loaded.gradle[1].sync_error.is_none());
+        let blocked_cache = root.join("blocked-cache");
+        std::fs::write(&blocked_cache, "a file cannot contain sync caches").unwrap();
+        assert!(
+            sync_gradle_model(
+                root,
+                &blocked_cache,
+                &models[0],
+                &SyncOptions::default(),
+                &CancellationToken::new(),
+                &|_| {}
+            )
+            .is_err()
+        );
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn independent_syncs_do_not_share_tasks_launchers_environments_or_failures() {
+        use std::os::unix::fs::PermissionsExt;
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path();
+        for dir in ["a", "b"] {
+            let build = root.join(dir);
+            std::fs::create_dir_all(build.join("app")).unwrap();
+            std::fs::write(build.join("settings.gradle"), "include 'app'").unwrap();
+            std::fs::write(build.join("app/build.gradle"), "").unwrap();
+            let report = serde_json::json!({"path": ":app", "dir": build.join("app")});
+            let launcher = build.join("gradlew");
+            std::fs::write(
+                &launcher,
+                format!("#!/bin/sh\npwd > actual-cwd\nprintf '%s' \"$JAVA_HOME\" > actual-env\nprintf '%s\\n' '@openidea-model\t{report}' 'Build tasks' '-----------' 'app:custom{dir} - custom task'\n"),
+            ).unwrap();
+            std::fs::set_permissions(launcher, std::fs::Permissions::from_mode(0o755)).unwrap();
+        }
+        let settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec!["a".into(), "b".into()]),
+            ..Default::default()
+        };
+        let cache = root.join("cache");
+        let models = gradle::load_linked(root, &settings);
+        for model in &models {
+            let options = SyncOptions {
+                env: BTreeMap::from([("JAVA_HOME".into(), format!("/jdk-{}", model.dir))]),
+                ..Default::default()
+            };
+            sync_gradle_model(root, &cache, model, &options, &CancellationToken::new(), &|_| {}).unwrap();
+            assert_eq!(
+                std::fs::read_to_string(root.join(&model.dir).join("actual-env")).unwrap(),
+                format!("/jdk-{}", model.dir)
+            );
+            assert_eq!(
+                std::fs::read_to_string(root.join(&model.dir).join("actual-cwd")).unwrap().trim(),
+                root.join(&model.dir).canonicalize().unwrap().to_string_lossy()
+            );
+        }
+        let load = || crate::load_linked(root, &cache, None, &Default::default(), &settings);
+        let model = load();
+        assert_eq!(model.gradle[0].projects[0].tasks[0].name, "customa");
+        assert_eq!(model.gradle[1].projects[0].tasks[0].name, "customb");
+        assert_ne!(gradle::cache_dir(&cache, "a"), gradle::cache_dir(&cache, "b"));
+        let before = std::fs::read(gradle::cache_dir(&cache, "a").join(GRADLE_CACHE)).unwrap();
+        std::fs::write(root.join("b/gradlew"), "#!/bin/sh\nprintf 'FAILURE: broken b\\n'\nexit 1\n").unwrap();
+        sync_gradle_model(root, &cache, &models[1], &SyncOptions::default(), &CancellationToken::new(), &|_| {})
+            .unwrap();
+        let model = load();
+        assert!(model.gradle[0].sync_error.is_none());
+        assert!(model.gradle[1].sync_error.is_some());
+        assert_eq!(std::fs::read(gradle::cache_dir(&cache, "a").join(GRADLE_CACHE)).unwrap(), before);
+        let cancel = CancellationToken::new();
+        cancel.cancel();
+        assert!(sync_gradle_model(root, &cache, &models[0], &SyncOptions::default(), &cancel, &|_| {}).is_err());
+        assert_eq!(std::fs::read(gradle::cache_dir(&cache, "a").join(GRADLE_CACHE)).unwrap(), before);
+        let unlinked = ide_core::settings::GradleSettings { linked_projects: Some(vec![]), ..Default::default() };
+        assert!(crate::load_linked(root, &cache, None, &Default::default(), &unlinked).gradle.is_empty());
+        assert!(crate::gradle_source_roots(root, &cache, &unlinked).is_empty());
+    }
+
     #[cfg(unix)]
     #[test]
     fn gradle_sync_uses_resolved_command_and_environment() {
@@ -598,7 +743,7 @@ mod tests {
         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]);
+        assert_eq!(crate::gradle_external_roots(&root, &cache_dir, &Default::default()), [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();
@@ -680,4 +825,25 @@ mod tests {
         assert_eq!(error_summary(text), "Failed to execute goal");
         assert_eq!(error_summary("one\nlast line\n\n"), "last line");
     }
+
+    #[cfg(unix)]
+    #[test]
+    fn maven_sync_runs_the_daemon_command_serially() {
+        use std::os::unix::fs::PermissionsExt;
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path().join("p");
+        std::fs::create_dir_all(&root).unwrap();
+        std::fs::write(root.join("pom.xml"), "<project><groupId>g</groupId><artifactId>a</artifactId></project>")
+            .unwrap();
+        let launcher = tmp.path().join("fake-mvnd");
+        std::fs::write(&launcher, "#!/bin/sh\nprintf '%s\\n' \"$@\" > mvnd-args\n").unwrap();
+        std::fs::set_permissions(&launcher, std::fs::Permissions::from_mode(0o755)).unwrap();
+        let options =
+            SyncOptions { maven_command: Some(launcher.to_string_lossy().into_owned()), ..Default::default() };
+        sync_maven(&root, &tmp.path().join("cache"), &options, &CancellationToken::new(), &|_| {}).unwrap();
+        let args = std::fs::read_to_string(root.join("mvnd-args")).unwrap();
+        // `-T1` pins the daemon serial so the dependency trees stay parseable.
+        assert!(args.contains("-T1"), "args: {args}");
+        assert!(args.contains("help:effective-pom"), "args: {args}");
+    }
 }
diff --git a/crates/ide-build/src/web.rs b/crates/ide-build/src/web.rs
index 9f25039a..fbff22b7 100644
--- a/crates/ide-build/src/web.rs
+++ b/crates/ide-build/src/web.rs
@@ -26,12 +26,12 @@ pub fn artifacts(root: &Path, model: &BuildModel) -> Vec<WebArtifact> {
             });
         }
     }
-    if let Some(gradle) = &model.gradle {
+    for gradle in &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),
+                    id: gradle_artifact_id(gradle, &p.path),
                     name: p.name.clone(),
                     module: p.dir.clone(),
                     tool: "gradle".into(),
@@ -42,6 +42,14 @@ pub fn artifacts(root: &Path, model: &BuildModel) -> Vec<WebArtifact> {
     out
 }
 
+fn gradle_artifact_id(build: &crate::GradleModel, path: &str) -> String {
+    if build.dir.is_empty() {
+        format!("gradle:{path}")
+    } else {
+        format!("gradle:{}", serde_json::to_string(&(&build.dir, path)).unwrap())
+    }
+}
+
 pub struct WebBuild {
     pub command: String,
     pub args: Vec<String>,
@@ -150,9 +158,14 @@ pub fn build(root: &Path, model: &BuildModel, id: &str, cache: &Path) -> IdeResu
             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) {
+    if let Some(legacy_path) = id.strip_prefix("gradle:") {
+        let identity = serde_json::from_str::<(String, String)>(legacy_path).ok();
+        let (g, path) = match &identity {
+            Some((dir, path)) => (model.gradle.iter().find(|g| g.dir == *dir), path.as_str()),
+            None => (model.gradle.first(), legacy_path),
+        };
+        let g = g.ok_or_else(|| IdeError::invalid("Choose a Gradle WAR module"))?;
+        if !artifacts(root, model).iter().any(|a| a.id == gradle_artifact_id(g, path)) {
             return Err(IdeError::invalid("Choose a Gradle WAR module"));
         }
         let script = cache.join("war.init.gradle");
@@ -186,6 +199,28 @@ pub fn build(root: &Path, model: &BuildModel, id: &str, cache: &Path) -> IdeResu
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn independent_war_modules_have_distinct_ids_and_build_in_their_own_directory() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path();
+        for dir in ["a", "b"] {
+            std::fs::create_dir(root.join(dir)).unwrap();
+            std::fs::write(root.join(dir).join("build.gradle"), "plugins { id 'war' }").unwrap();
+        }
+        let settings = ide_core::settings::GradleSettings {
+            linked_projects: Some(vec!["a".into(), "b".into()]),
+            ..Default::default()
+        };
+        let model = crate::load_linked(root, &root.join("cache"), None, &Default::default(), &settings);
+        let artifacts = super::artifacts(root, &model);
+        assert_eq!(artifacts.len(), 2);
+        assert_ne!(artifacts[0].id, artifacts[1].id);
+        for (artifact, dir) in artifacts.iter().zip(["a", "b"]) {
+            let plan = super::build(root, &model, &artifact.id, &root.join(format!("cache/{dir}"))).unwrap();
+            assert_eq!(plan.cwd, dir);
+        }
+        assert_eq!(super::build(root, &model, "gradle::", &root.join("legacy")).unwrap().cwd, "a");
+    }
     use super::*;
     #[test]
     fn maven_war_modules_use_resolved_artifact_file() {
diff --git a/crates/ide-core/Cargo.toml b/crates/ide-core/Cargo.toml
index 4f9b43a6..3a4f5f6c 100644
--- a/crates/ide-core/Cargo.toml
+++ b/crates/ide-core/Cargo.toml
@@ -22,4 +22,4 @@ tempfile.workspace = true
 libc = "0.2"
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.61", features = ["Win32_Globalization", "Win32_Security", "Win32_System_Registry", "Win32_Foundation"] }
+windows-sys = { version = "0.61", features = ["Win32_Globalization", "Win32_Security", "Win32_System_Registry", "Win32_Foundation", "Win32_System_Diagnostics_ToolHelp", "Win32_System_Threading"] }
diff --git a/crates/ide-core/src/ignored.rs b/crates/ide-core/src/ignored.rs
index fb6c20a3..efda11ac 100644
--- a/crates/ide-core/src/ignored.rs
+++ b/crates/ide-core/src/ignored.rs
@@ -2,6 +2,18 @@
 //! treats as nonexistent — hidden from the project view and navigation, never
 //! indexed or searched, never offered as unversioned changes.
 
+use std::path::Path;
+
+/// Whether `dir` lies in a Git (or jj) working tree: it or an ancestor holds `.git` / `.jj`.
+///
+/// Walkers pass it to `ignore::WalkBuilder::require_git`: inside a repository, `.gitignore`
+/// rules then stop at a nested repository's root as in git, so an outer repository's
+/// `.gitignore` does not hide a project that is its own repository. A folder outside any
+/// repository still honours its `.gitignore`.
+pub fn inside_git_repo(dir: &Path) -> bool {
+    dir.ancestors().any(|d| d.join(".git").exists() || d.join(".jj").exists())
+}
+
 /// IDEA's default list, plus `.jj` and the Windows shell files.
 pub const DEFAULT_IGNORED_NAMES: &[&str] = &[
     "*.pyc",
@@ -103,4 +115,15 @@ mod tests {
         assert!(m.is_ignored_path("pkg/__pycache__/mod.cpython-312.pyc"));
         assert!(!m.is_ignored_path("src/main.rs"));
     }
+
+    #[test]
+    fn finds_the_repository_at_or_above_a_directory() {
+        let dir = tempfile::tempdir().unwrap();
+        let sub = dir.path().join("a/b");
+        std::fs::create_dir_all(&sub).unwrap();
+        assert!(!inside_git_repo(&sub));
+        std::fs::create_dir(dir.path().join("a/.git")).unwrap();
+        assert!(inside_git_repo(&sub));
+        assert!(inside_git_repo(&dir.path().join("a")));
+    }
 }
diff --git a/crates/ide-core/src/inspection_settings.rs b/crates/ide-core/src/inspection_settings.rs
index f4522a2e..41dfb8f2 100644
--- a/crates/ide-core/src/inspection_settings.rs
+++ b/crates/ide-core/src/inspection_settings.rs
@@ -36,6 +36,23 @@ impl Default for InspectionSettings {
     }
 }
 
+impl InspectionSettings {
+    /// Overrides of the profile in effect; `Default`'s when `profile` names none that exists.
+    pub fn active(&self) -> &BTreeMap<String, InspectionOverride> {
+        let custom = |level: &str, key: &str| match level {
+            "ide" => self.ide_profiles.get(key),
+            "project" => self.project_profiles.get(key),
+            _ => None,
+        };
+        match self.profile.as_str() {
+            "project" => &self.project,
+            id => {
+                id.split_once(':').and_then(|(level, key)| custom(level, key)).map_or(&self.default, |p| &p.overrides)
+            }
+        }
+    }
+}
+
 /// A named profile made with Copy.
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
@@ -111,4 +128,20 @@ mod tests {
         let back: InspectionSettings = serde_json::from_str(&serde_json::to_string(&s).unwrap()).unwrap();
         assert_eq!(back, s);
     }
+
+    #[test]
+    fn active_profile_falls_back_to_default() {
+        let off = |id: &str| {
+            BTreeMap::from([(id.to_owned(), InspectionOverride { enabled: Some(false), ..Default::default() })])
+        };
+        let mut s = InspectionSettings { default: off("a"), project: off("b"), ..Default::default() };
+        s.ide_profiles.insert("strict".into(), CustomInspectionProfile { name: "Strict".into(), overrides: off("c") });
+        assert!(s.active().contains_key("a"));
+        s.profile = "project".into();
+        assert!(s.active().contains_key("b"));
+        s.profile = "ide:strict".into();
+        assert!(s.active().contains_key("c"));
+        s.profile = "project:gone".into();
+        assert!(s.active().contains_key("a"));
+    }
 }
diff --git a/crates/ide-core/src/process.rs b/crates/ide-core/src/process.rs
index 49565b3d..1778d0c0 100644
--- a/crates/ide-core/src/process.rs
+++ b/crates/ide-core/src/process.rs
@@ -43,19 +43,21 @@ pub fn own_group(cmd: &mut Command) -> &mut Command {
 /// 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.
+/// - Windows: `taskkill /T /F`, which walks the tree from the child's process id, then a
+///   wait for what the child started to be gone.
 pub fn kill_tree(child: &mut Child) {
     #[cfg(unix)]
     signal_group(child, libc::SIGKILL);
     #[cfg(windows)]
-    taskkill_tree(child);
+    taskkill_tree_of(child.id());
     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.
+/// process group (spawn it with [`own_group`]) or `taskkill /T /F` and a wait for what the
+/// child started to be gone. 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) {
@@ -65,15 +67,7 @@ pub fn kill_tree_of(pid: u32) {
         }
     }
     #[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();
-    }
+    taskkill_tree_of(pid);
     #[cfg(not(any(unix, windows)))]
     let _ = pid;
 }
@@ -106,15 +100,107 @@ fn signal_group(child: &Child, signal: libc::c_int) {
     }
 }
 
+/// How long killing a tree waits for the processes the child started to be gone.
 #[cfg(windows)]
-fn taskkill_tree(child: &Child) {
+const TREE_EXIT_WAIT: Duration = Duration::from_secs(5);
+
+/// `taskkill /T /F` from `pid`, then waits (up to [`TREE_EXIT_WAIT`]) until what the child
+/// started is gone: termination is asynchronous, and until a process is gone the files it
+/// holds open can't be opened or deleted. The child itself is left to its owner to reap.
+#[cfg(windows)]
+fn taskkill_tree_of(pid: u32) {
+    let started = windows_tree::descendants(pid);
     let mut taskkill = Command::new("taskkill");
     prepare(&mut taskkill)
-        .args(["/T", "/F", "/PID", &child.id().to_string()])
+        .args(["/T", "/F", "/PID", &pid.to_string()])
         .stdin(Stdio::null())
         .stdout(Stdio::null())
         .stderr(Stdio::null());
     let _ = taskkill.status();
+    windows_tree::wait_all(&started, TREE_EXIT_WAIT);
+}
+
+#[cfg(windows)]
+mod windows_tree {
+    use std::collections::HashSet;
+    use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
+    use std::time::{Duration, Instant};
+    use windows_sys::Win32::Foundation::{FILETIME, INVALID_HANDLE_VALUE};
+    use windows_sys::Win32::System::Diagnostics::ToolHelp::{
+        CreateToolhelp32Snapshot, PROCESSENTRY32W, Process32FirstW, Process32NextW, TH32CS_SNAPPROCESS,
+    };
+    use windows_sys::Win32::System::Threading::{
+        GetProcessTimes, OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION, PROCESS_SYNCHRONIZE, WaitForSingleObject,
+    };
+
+    /// Every process `root` started, directly or not, opened so it can be waited for. A
+    /// parent's id is reused once it is gone, so a process counts only if it started after
+    /// its parent.
+    pub(super) fn descendants(root: u32) -> Vec<OwnedHandle> {
+        let Some(root_started) = open(root).as_ref().and_then(started) else { return Vec::new() };
+        let processes = processes();
+        let mut seen = HashSet::from([root]);
+        let mut parents = vec![(root, root_started)];
+        let mut found = Vec::new();
+        while let Some((parent, parent_started)) = parents.pop() {
+            for &(pid, ppid) in &processes {
+                if ppid != parent || !seen.insert(pid) {
+                    continue;
+                }
+                let Some(handle) = open(pid) else { continue };
+                if let Some(at) = started(&handle).filter(|&at| at >= parent_started) {
+                    parents.push((pid, at));
+                    found.push(handle);
+                }
+            }
+        }
+        found
+    }
+
+    pub(super) fn wait_all(processes: &[OwnedHandle], within: Duration) {
+        let until = Instant::now() + within;
+        for process in processes {
+            let left = until.saturating_duration_since(Instant::now());
+            // SAFETY: a live process handle opened with SYNCHRONIZE access.
+            unsafe { WaitForSingleObject(process.as_raw_handle(), left.as_millis().min(u32::MAX as u128 - 1) as u32) };
+        }
+    }
+
+    /// (process id, parent process id) of every running process.
+    fn processes() -> Vec<(u32, u32)> {
+        let mut out = Vec::new();
+        // SAFETY: a snapshot handle owned here and an entry sized as the API requires.
+        unsafe {
+            let snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+            if snapshot.is_null() || snapshot == INVALID_HANDLE_VALUE {
+                return out;
+            }
+            let snapshot = OwnedHandle::from_raw_handle(snapshot);
+            let mut entry = PROCESSENTRY32W { dwSize: size_of::<PROCESSENTRY32W>() as u32, ..Default::default() };
+            let mut more = Process32FirstW(snapshot.as_raw_handle(), &mut entry);
+            while more != 0 {
+                out.push((entry.th32ProcessID, entry.th32ParentProcessID));
+                more = Process32NextW(snapshot.as_raw_handle(), &mut entry);
+            }
+        }
+        out
+    }
+
+    fn open(pid: u32) -> Option<OwnedHandle> {
+        // SAFETY: plain call; a non-null result is a process handle owned by the caller.
+        let handle = unsafe { OpenProcess(PROCESS_SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION, 0, pid) };
+        // SAFETY: as above.
+        (!handle.is_null()).then(|| unsafe { OwnedHandle::from_raw_handle(handle) })
+    }
+
+    /// When the process started, in 100 ns ticks since 1601.
+    fn started(process: &OwnedHandle) -> Option<u64> {
+        let (mut created, mut exited, mut kernel, mut user) =
+            (FILETIME::default(), FILETIME::default(), FILETIME::default(), FILETIME::default());
+        // SAFETY: a live process handle opened with query access; four out-parameters.
+        let ok = unsafe { GetProcessTimes(process.as_raw_handle(), &mut created, &mut exited, &mut kernel, &mut user) };
+        (ok != 0).then(|| (u64::from(created.dwHighDateTime) << 32) | u64::from(created.dwLowDateTime))
+    }
 }
 
 /// Gives `cmd` the host's environment back when the IDE runs from an AppImage. `AppRun` and
@@ -123,12 +209,14 @@ fn taskkill_tree(child: &Child) {
 /// inherits them loads the image's (older) libraries and plugins next to its own, e.g.
 /// `curl: symbol lookup error ... nghttp2_...`. The IDE process keeps its environment
 /// (WebKit and GTK still need it). Then applies the [`set_env_overlay`] variables and
-/// those of a manual HTTP proxy ([`crate::proxy_settings::ProxySettings::child_env`]).
-/// Variables the call site has already set are kept. A no-op outside an AppImage
-/// without an overlay.
+/// those of a manual HTTP proxy ([`crate::proxy_settings::ProxySettings::child_env`]),
+/// and the login shell's variables this process lacks ([`shell_env`]: an app started from
+/// Finder/Dock doesn't have what rc files export, such as `GOPATH`, `JAVA_HOME` or
+/// `MAVEN_OPTS`). Variables the call site has already set are kept.
 pub fn host_env(cmd: &mut Command) -> &mut Command {
     let fixes = child_env_changes();
-    if fixes.is_empty() {
+    let shell: Vec<_> = shell_env().collect();
+    if fixes.is_empty() && shell.is_empty() {
         return cmd;
     }
     let explicit: Vec<OsString> = cmd.get_envs().map(|(k, _)| k.to_owned()).collect();
@@ -138,6 +226,9 @@ pub fn host_env(cmd: &mut Command) -> &mut Command {
             None => cmd.env_remove(key),
         };
     }
+    for (key, value) in shell.into_iter().filter(|(k, _)| !explicit.contains(k)) {
+        cmd.env(key, value);
+    }
     cmd
 }
 
@@ -154,12 +245,13 @@ pub fn host_vars() -> impl Iterator<Item = (OsString, OsString)> {
     apply_changes(std::env::vars_os().collect(), &child_env_changes()).into_iter()
 }
 
-/// [`std::env::var_os`] as a child should see it (see [`host_env`]).
+/// [`std::env::var_os`] as a child should see it (see [`host_env`]), the login shell's value
+/// included when this process lacks the variable.
 pub fn host_var_os(key: impl AsRef<OsStr>) -> Option<OsString> {
     let key = key.as_ref();
     match child_env_changes().into_iter().find(|(k, _)| k == key) {
         Some((_, fixed)) => fixed,
-        None => std::env::var_os(key),
+        None => std::env::var_os(key).or_else(|| shell_env().find(|(k, _)| k == key).map(|(_, v)| v)),
     }
 }
 
@@ -572,6 +664,15 @@ mod tests {
         assert_eq!(get("HOME"), Some(None));
         let shell: Vec<_> = shell_env().map(|(k, _)| k).collect();
         assert_eq!(shell, [OsString::from("OPENIDEA_OVERLAY_B")]);
+        // Every child gets what the login shell exports and the IDE process lacks (a Finder
+        // launch: `GOPATH`, `JAVA_HOME`...), unless the call site sets it.
+        assert_eq!(get("OPENIDEA_OVERLAY_B"), Some(Some("b".into())));
+        let mut own = Command::new("true");
+        own.env("OPENIDEA_OVERLAY_B", "call site");
+        host_env(&mut own);
+        let value = own.get_envs().find(|(n, _)| *n == "OPENIDEA_OVERLAY_B").and_then(|(_, v)| v);
+        assert_eq!(value, Some(OsStr::new("call site")));
+        assert_eq!(host_var_os("OPENIDEA_OVERLAY_B"), Some("b".into()));
         assert_eq!(host_var_os("PATH"), Some("/reloaded".into()));
         assert!(host_vars().all(|(k, _)| k != "HOME"));
         assert!(host_vars().any(|(k, v)| k == "OPENIDEA_OVERLAY_A" && v == "project"));
diff --git a/crates/ide-core/src/settings.rs b/crates/ide-core/src/settings.rs
index 5991a79f..b0b86e6d 100644
--- a/crates/ide-core/src/settings.rs
+++ b/crates/ide-core/src/settings.rs
@@ -351,6 +351,7 @@ pub struct AppearanceSettings {
     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,
+    pub file_icon_theme_options: BTreeMap<String, FileIconThemeOptions>,
     /// IDE zoom in percent (50–300).
     pub zoom: u32,
     /// Apply `ui_font_family` / `ui_font_size` (otherwise the theme's).
@@ -386,6 +387,24 @@ pub struct AppearanceSettings {
 /// Main toolbar entries per side, in order: title widget ids (`project`,
 /// `vcs.branch`…) or `action:<id>`. Widgets in neither list nor `hidden`
 /// (registered later) keep their default place.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(default, rename_all = "camelCase")]
+pub struct FileIconThemeOptions {
+    pub groups: BTreeMap<String, bool>,
+    pub choices: BTreeMap<String, String>,
+    pub hide_files: bool,
+    pub hide_folders: bool,
+    pub hollow_folders: bool,
+    pub hide_ui_icons: bool,
+    pub hide_psi_icons: bool,
+    pub monochrome: Option<String>,
+    pub saturation: Option<u8>,
+    pub opacity: Option<u8>,
+    pub icon_size: Option<u8>,
+    pub row_height: Option<u8>,
+    pub accent: Option<String>,
+}
+
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct MainToolbarSettings {
@@ -406,6 +425,7 @@ impl Default for AppearanceSettings {
             preferred_light_theme: "light".into(),
             preferred_dark_theme: "dark".into(),
             file_icon_theme: String::new(),
+            file_icon_theme_options: BTreeMap::new(),
             zoom: 100,
             use_custom_font: false,
             ui_font_family: "Inter".into(),
@@ -693,6 +713,15 @@ impl Default for PythonSettings {
 pub struct PhpSettings {
     /// `php` CLI executable; empty = the one on `PATH`.
     pub interpreter: String,
+    /// PHP version the language server checks the code against (`7.4`); empty = from
+    /// `composer.json` (`config.platform.php`, else the lowest version `require.php` allows).
+    pub language_level: String,
+    /// Folders outside the project whose code the language server indexes too (a platform a
+    /// module extends); absolute, `~/`, or relative to the project.
+    pub include_paths: Vec<String>,
+    /// Intelephense stub sets loaded on top of its defaults and the `ext-*` entries of
+    /// `composer.json` (`wordpress`).
+    pub stubs: Vec<String>,
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
@@ -799,6 +828,8 @@ pub struct JavaSettings {
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct GradleSettings {
+    /// Linked build directories; absent preserves automatic discovery, empty unlinks all builds.
+    pub linked_projects: Option<Vec<String>>,
     /// Empty = Project JDK; otherwise a JDK home.
     pub jvm: String,
     pub distribution: GradleDistribution,
@@ -841,6 +872,12 @@ pub struct MavenSettings {
     pub user_settings: String,
     /// Local repository (`-Dmaven.repo.local`); empty = from `settings.xml`.
     pub local_repository: String,
+    /// Run Maven through the Maven Daemon (`mvnd`) for faster builds. mvnd embeds
+    /// its own Maven, so `home` and the project's `mvnw` are bypassed when it is on.
+    pub daemon: bool,
+    /// Maven Daemon home (or its `mvnd` executable); empty = `$MVND_HOME`, else
+    /// `mvnd` on `PATH` / common install dirs. Only used when `daemon` is on.
+    pub mvnd_home: String,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
@@ -931,6 +968,36 @@ mod tests {
         assert_eq!(serde_json::from_value::<Settings>(value).unwrap(), settings);
     }
 
+    #[test]
+    fn file_icon_theme_options_default_empty_and_round_trip() {
+        let old: Settings = serde_json::from_str(r#"{"appearance":{"fileIconTheme":"p/t"}}"#).unwrap();
+        assert!(old.appearance.file_icon_theme_options.is_empty());
+        let json = serde_json::json!({"appearance":{"fileIconThemeOptions":{"p/t":{
+            "groups":{"tests":true},"choices":{"arrows":"plusminus"},"hideFiles":true,"hideFolders":false,"hollowFolders":true,"hideUiIcons":true,"hidePsiIcons":false,
+            "monochrome":"#546e7a","saturation":5,"opacity":80,"iconSize":20,"rowHeight":30,"accent":"#009688"}}}});
+        let settings: Settings = serde_json::from_value(json.clone()).unwrap();
+        let options = &settings.appearance.file_icon_theme_options["p/t"];
+        assert!(options.hide_files && options.hollow_folders && !options.hide_folders);
+        assert!(options.hide_ui_icons && !options.hide_psi_icons);
+        assert!(options.groups["tests"]);
+        assert_eq!(options.choices["arrows"], "plusminus");
+        assert_eq!(
+            (options.saturation, options.opacity, options.icon_size, options.row_height),
+            (Some(5), Some(80), Some(20), Some(30))
+        );
+        assert_eq!(options.monochrome.as_deref(), Some("#546e7a"));
+        assert_eq!(options.accent.as_deref(), Some("#009688"));
+        let value = serde_json::to_value(&settings).unwrap();
+        let restored: Settings = serde_json::from_value(value).unwrap();
+        assert_eq!(restored, settings);
+        let plain = serde_json::to_value(FileIconThemeOptions::default()).unwrap();
+        assert_eq!(plain["hideFiles"], false);
+        assert_eq!(plain["hideUiIcons"], false);
+        assert_eq!(plain["hidePsiIcons"], false);
+        assert_eq!(plain["monochrome"], serde_json::Value::Null);
+        assert_eq!(plain["groups"], serde_json::json!({}));
+    }
+
     #[test]
     fn ui_font_fallback_defaults_empty_and_round_trips() {
         let old: Settings = serde_json::from_str(r#"{"appearance":{"useCustomFont":true}}"#).unwrap();
@@ -1042,12 +1109,33 @@ mod maven_linkage_tests {
         assert!(encoded.contains("unlinkedProjects"));
         assert_eq!(serde_json::from_str::<MavenSettings>(&encoded).unwrap(), settings);
     }
+
+    #[test]
+    fn daemon_settings_round_trip() {
+        // Old settings files predate the daemon fields; `serde(default)` keeps them loadable.
+        let old: MavenSettings = serde_json::from_str(r#"{"home":"/opt/maven"}"#).unwrap();
+        assert!(!old.daemon && old.mvnd_home.is_empty());
+        let settings = MavenSettings { daemon: true, mvnd_home: "/opt/mvnd".into(), ..old };
+        let encoded = serde_json::to_string(&settings).unwrap();
+        assert!(encoded.contains("\"daemon\":true") && encoded.contains("mvndHome"));
+        assert_eq!(serde_json::from_str::<MavenSettings>(&encoded).unwrap(), settings);
+    }
 }
 
 #[cfg(test)]
 mod gradle_settings_tests {
     use super::*;
 
+    #[test]
+    fn absent_and_explicitly_empty_gradle_links_remain_distinct() {
+        let automatic: GradleSettings = serde_json::from_str("{}").unwrap();
+        let unlinked: GradleSettings = serde_json::from_str(r#"{"linkedProjects":[]}"#).unwrap();
+        assert_eq!(automatic.linked_projects, None);
+        assert_eq!(unlinked.linked_projects, Some(vec![]));
+        let restored: GradleSettings = serde_json::from_str(&serde_json::to_string(&unlinked).unwrap()).unwrap();
+        assert_eq!(restored.linked_projects, Some(vec![]));
+    }
+
     #[test]
     fn defaults_and_round_trip() {
         let old: JavaSettings = serde_json::from_str(r#"{"jdk":"/jdk"}"#).unwrap();
@@ -1060,6 +1148,7 @@ mod gradle_settings_tests {
                 home: "/gradle".into(),
                 user_home: "/cache/gradle".into(),
                 run_using: GradleRunUsing::Ide,
+                linked_projects: Some(vec!["backend".into(), "../shared".into()]),
             };
             let restored: Settings = serde_json::from_str(&serde_json::to_string(&settings).unwrap()).unwrap();
             assert_eq!(restored.languages.java.gradle, settings.languages.java.gradle);
diff --git a/crates/ide-dap/src/adapter.rs b/crates/ide-dap/src/adapter.rs
index 2f4f88fc..25c44cdd 100644
--- a/crates/ide-dap/src/adapter.rs
+++ b/crates/ide-dap/src/adapter.rs
@@ -72,7 +72,13 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
             "stdio",
             "Install the Kotlin Debug Adapter from Settings > Language Servers",
         ),
-        "debugpy" => cfg("python3", &["-m", "debugpy.adapter"], "stdio", "pip install debugpy"),
+        // Windows installs `python.exe`; `python3.exe` there is at most a Store alias.
+        "debugpy" => cfg(
+            if cfg!(windows) { "python" } else { "python3" },
+            &["-m", "debugpy.adapter"],
+            "stdio",
+            "pip install debugpy",
+        ),
         "js-debug" => cfg(
             "js-debug-adapter",
             // Without a host it listens on `localhost`, which may resolve to ::1 only.
diff --git a/crates/ide-dap/src/lib.rs b/crates/ide-dap/src/lib.rs
index 1be66239..f2790ad5 100644
--- a/crates/ide-dap/src/lib.rs
+++ b/crates/ide-dap/src/lib.rs
@@ -589,11 +589,12 @@ impl DebugManager {
         if let Some(command) = custom_command(&spec.command) {
             spec.command = command;
         }
-        // debugpy: run the adapter with the debuggee's interpreter (venvs carry their own debugpy).
+        // debugpy: run the adapter with the debuggee's interpreter (venvs carry their own debugpy),
+        // or with the launcher's when the debuggee runs through a manager (`uv run python`).
         if config.adapter == "debugpy" {
-            let python = match arguments.get("python") {
-                Some(Value::String(p)) => Some(p.clone()),
-                Some(Value::Array(a)) => a.first().and_then(Value::as_str).map(str::to_owned),
+            let python = match (arguments.get("debugLauncherPython"), arguments.get("python")) {
+                (Some(Value::String(p)), _) | (_, Some(Value::String(p))) => Some(p.clone()),
+                (_, Some(Value::Array(a))) => a.first().and_then(Value::as_str).map(str::to_owned),
                 _ => None,
             };
             if let Some(python) = python {
@@ -651,8 +652,19 @@ impl DebugManager {
         {
             arguments["project"] = json!(real);
         }
-        if config.adapter == "codelldb" && arguments.get("sourceLanguages").is_none() {
-            arguments["sourceLanguages"] = json!(["rust"]);
+        if config.adapter == "codelldb" {
+            if arguments.get("sourceLanguages").is_none() {
+                arguments["sourceLanguages"] = json!(["rust"]);
+            }
+            // The Debug Console and Evaluate Expression take expressions, as with every other
+            // debugger; LLDB commands still run with a leading backtick.
+            match arguments.get_mut("_adapterSettings") {
+                None => arguments["_adapterSettings"] = json!({"consoleMode": "evaluate"}),
+                Some(Value::Object(settings)) => {
+                    settings.entry("consoleMode").or_insert_with(|| json!("evaluate"));
+                }
+                Some(_) => {}
+            }
         }
         let port = debug_server.map(|s| s.port);
         self.start_session(id, owner, config.name, config.adapter, None, config.request, arguments, spec, port).await
diff --git a/crates/ide-dap/src/session.rs b/crates/ide-dap/src/session.rs
index 8ac55b92..f7bc69c3 100644
--- a/crates/ide-dap/src/session.rs
+++ b/crates/ide-dap/src/session.rs
@@ -111,8 +111,8 @@ impl Session {
         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());
+        if self.adapter == "java-debug" || (cfg!(windows) && self.adapter == "netcoredbg") {
+            let native = windows_source_path(&path.to_string_lossy());
             self.resolved_paths.lock().insert(native.clone(), path.to_path_buf());
             return native;
         }
@@ -133,7 +133,11 @@ impl Session {
         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) };
+        let key = if self.adapter == "java-debug" || (cfg!(windows) && self.adapter == "netcoredbg") {
+            windows_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('\\', "/")))
@@ -265,8 +269,8 @@ 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.
+// java-debug and Windows netcoredbg need native separators for source lookup.
+// Keep DAP path mode, but normalize Windows drive and UNC paths.
 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'\\'))
@@ -274,7 +278,7 @@ fn is_windows_source_path(path: &str) -> bool {
         || path.starts_with(r"\\")
 }
 
-fn java_source_path(path: &str) -> PathBuf {
+fn windows_source_path(path: &str) -> PathBuf {
     if is_windows_source_path(path) { PathBuf::from(path.replace('/', r"\")) } else { PathBuf::from(path) }
 }
 
diff --git a/crates/ide-dap/src/tests.rs b/crates/ide-dap/src/tests.rs
index 7f5930b3..1e5647b7 100644
--- a/crates/ide-dap/src/tests.rs
+++ b/crates/ide-dap/src/tests.rs
@@ -698,6 +698,37 @@ async fn js_debug_launch_gets_port_and_workspace_folder() {
     assert_eq!(launch["type"], "pwa-node");
 }
 
+/// CodeLLDB treats console input as LLDB commands unless told otherwise: Evaluate Expression
+/// and the Debug Console send expressions, so its console evaluates them. A launch
+/// configuration that picks a console mode keeps it.
+#[tokio::test]
+async fn codelldb_console_evaluates_expressions() {
+    let launch_with = |extra: Value| async move {
+        let h = harness(Script::default());
+        let config = LaunchConfig {
+            name: "demo".into(),
+            adapter: "codelldb".into(),
+            request: "launch".into(),
+            program: Some("/p/target/debug/demo".into()),
+            args: vec![],
+            cwd: Some("/p".into()),
+            env: BTreeMap::new(),
+            extra_json: Some(extra.to_string()),
+        };
+        h.start(config).await.unwrap();
+        h.request("launch")["arguments"].clone()
+    };
+    let launch = launch_with(json!({})).await;
+    assert_eq!(launch["_adapterSettings"]["consoleMode"], "evaluate");
+    assert_eq!(launch["sourceLanguages"], json!(["rust"]));
+
+    let launch =
+        launch_with(json!({"_adapterSettings": {"consoleMode": "commands", "showDisassembly": "never"}})).await;
+    assert_eq!(launch["_adapterSettings"], json!({"consoleMode": "commands", "showDisassembly": "never"}));
+    let launch = launch_with(json!({"_adapterSettings": {"showDisassembly": "never"}})).await;
+    assert_eq!(launch["_adapterSettings"], json!({"consoleMode": "evaluate", "showDisassembly": "never"}));
+}
+
 /// An adapter that is already listening (java-debug inside jdtls): the client
 /// connects over TCP to the `debugServer` port instead of spawning anything.
 #[tokio::test]
@@ -923,6 +954,7 @@ fn godot_registry(port: u16, command: &str, args: &[&str]) -> Arc<LanguageRegist
         ui_mode: None,
         framework_ui_modes: Vec::new(),
         formatter: None,
+        scratch_template: None,
         tree_sitter: None,
         language_servers: vec![],
         debugger: Some(ide_language::DebuggerConfig {
@@ -1109,6 +1141,23 @@ async fn kotlin_official_release_ten_no_delay_runs() {
     }
 }
 
+#[cfg(windows)]
+#[tokio::test]
+async fn netcoredbg_windows_source_paths_round_trip() {
+    let client = "D:/work/LoginController.cs";
+    let native = r"D:\work\LoginController.cs";
+    let h = harness(Script { source_path: Some(native.into()), ..Script::default() });
+    let path = PathBuf::from(client);
+    h.manager.set_breakpoints(path.clone(), vec![bp(25)]).await.unwrap();
+    let mut cfg = config();
+    cfg.adapter = "netcoredbg".into();
+    let id = h.start(cfg).await.unwrap();
+    assert_eq!(h.request("setBreakpoints")["arguments"]["source"]["path"], native);
+    let frames = h.manager.stack_trace(id, 1).await.unwrap();
+    assert_eq!(frames[0].path.as_deref(), Some(path.as_path()));
+    h.manager.stop(id).await.unwrap();
+}
+
 #[tokio::test]
 async fn java_windows_source_paths_for_launch_and_attach() {
     for request in ["launch", "attach"] {
diff --git a/crates/ide-db/Cargo.toml b/crates/ide-db/Cargo.toml
index 6a5cb440..e72eccf2 100644
--- a/crates/ide-db/Cargo.toml
+++ b/crates/ide-db/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 [dependencies]
 ide-core.workspace = true
 serde.workspace = true
-serde_json.workspace = true
+serde_json = { workspace = true, features = ["raw_value"] }
 specta.workspace = true
 toml.workspace = true
 tokio.workspace = true
@@ -21,7 +21,12 @@ bb8.workspace = true
 tokio-util = { workspace = true, features = ["compat"] }
 dirs.workspace = true
 ide-ssh.workspace = true
+ide-http.workspace = true
+reqwest = { workspace = true, features = ["query"] }
+rustls.workspace = true
+uuid.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tempfile.workspace = true
+ide-ssh = { workspace = true, features = ["testing"] }
diff --git a/crates/ide-db/src/clickhouse.rs b/crates/ide-db/src/clickhouse.rs
new file mode 100644
index 00000000..34e869dc
--- /dev/null
+++ b/crates/ide-db/src/clickhouse.rs
@@ -0,0 +1,844 @@
+use crate::conn::{QueryResult, ResultColumn, Setup};
+use crate::source::{DataSource, DbSslMode, DbTxMode};
+use ide_core::{CancellationToken, IdeError, IdeResult, error::ErrorKind};
+use parking_lot::RwLock;
+use reqwest::{Client, RequestBuilder, StatusCode, Url};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use tokio::sync::Mutex;
+
+#[derive(Clone)]
+pub struct ClickhousePool(Arc<State>);
+
+struct State {
+    client: RwLock<Option<Client>>,
+    endpoint: Url,
+    user: String,
+    password: String,
+    database: String,
+    settings: Vec<(String, String)>,
+    read_only: bool,
+    session_id: String,
+    session: Mutex<bool>,
+    closed: CancellationToken,
+}
+
+/// The response format: a names line, a types line, then one JSON array per row, so rows past
+/// the grid's limit are skipped without being parsed.
+const FORMAT: &str = "JSONCompactEachRowWithNamesAndTypes";
+
+pub(crate) fn transaction_error() -> IdeError {
+    IdeError::invalid("ClickHouse HTTP does not support SQL transactions; use auto-commit and run writes directly")
+}
+
+impl ClickhousePool {
+    pub(crate) async fn connect(source: &DataSource, password: Option<&str>, setup: Setup) -> IdeResult<Self> {
+        if source.options.transaction == DbTxMode::Manual {
+            return Err(transaction_error());
+        }
+        for (name, _) in &setup.params {
+            if reserved_setting(name) {
+                return Err(IdeError::invalid(format!("ClickHouse HTTP manages the {name} setting")));
+            }
+        }
+        let secure = matches!(source.ssl, DbSslMode::Require | DbSslMode::VerifyCa | DbSslMode::VerifyFull);
+        let tls_files = [&source.ssl_ca_file, &source.ssl_cert_file, &source.ssl_key_file];
+        if !secure && tls_files.iter().any(|p| !p.trim().is_empty()) {
+            return Err(IdeError::invalid(
+                "ClickHouse TLS certificate files require an SSL mode of Require, Verify CA, or Verify Full",
+            ));
+        }
+        let host = source.host.trim();
+        if host.is_empty() || host.contains(['/', '@', '?', '#']) {
+            return Err(IdeError::invalid("ClickHouse host must contain only a hostname or IP address"));
+        }
+        let host = if host.contains(':') && !host.starts_with('[') { format!("[{host}]") } else { host.to_owned() };
+        let scheme = if secure { "https" } else { "http" };
+        let port = source.port.unwrap_or(if secure { 8443 } else { 8123 });
+        let endpoint = Url::parse(&format!("{scheme}://{host}:{port}/"))
+            .map_err(|_| IdeError::invalid("invalid ClickHouse HTTP host or port"))?;
+        let timeout = setup.connect_timeout.unwrap_or(Duration::from_secs(30));
+        let _ = rustls::crypto::ring::default_provider().install_default();
+        let mut builder = Client::builder()
+            .connect_timeout(timeout)
+            .pool_max_idle_per_host(4)
+            .redirect(reqwest::redirect::Policy::none())
+            .user_agent(concat!("OpenIDEA/", env!("CARGO_PKG_VERSION")));
+        let ca = source.ssl_ca_file.trim();
+        if !ca.is_empty() {
+            let pem = read_pem(ca, "CA certificate")?;
+            let certificates = reqwest::Certificate::from_pem_bundle(&pem)
+                .map_err(|_| IdeError::invalid("invalid ClickHouse CA certificate PEM"))?;
+            if certificates.is_empty() {
+                return Err(IdeError::invalid("ClickHouse CA certificate PEM contains no certificates"));
+            }
+            builder = builder.tls_certs_only(certificates);
+        }
+        if source.ssl == DbSslMode::VerifyCa {
+            if ca.is_empty() {
+                return Err(IdeError::invalid("ClickHouse Verify CA requires a CA certificate file"));
+            }
+            builder = builder.tls_danger_accept_invalid_hostnames(true);
+        }
+        let cert = source.ssl_cert_file.trim();
+        let key = source.ssl_key_file.trim();
+        if cert.is_empty() != key.is_empty() {
+            return Err(IdeError::invalid("ClickHouse client TLS requires both certificate and key files"));
+        }
+        if !cert.is_empty() {
+            let mut pem = read_pem(cert, "client certificate")?;
+            pem.push(b'\n');
+            pem.extend(read_pem(key, "client key")?);
+            let identity = reqwest::Identity::from_pem(&pem)
+                .map_err(|_| IdeError::invalid("invalid ClickHouse client certificate or key PEM"))?;
+            builder = builder.identity(identity);
+        }
+        let proxy = ide_core::proxy_settings::proxy();
+        let client = ide_http::client::with_proxy(builder, &proxy).build().map_err(http_error)?;
+        let database = if source.options.default_schema.trim().is_empty() {
+            source.database.trim()
+        } else {
+            source.options.default_schema.trim()
+        };
+        let pool = Self(Arc::new(State {
+            client: RwLock::new(Some(client)),
+            endpoint,
+            user: if source.user.is_empty() { "default".into() } else { source.user.clone() },
+            password: password.unwrap_or_default().to_owned(),
+            database: if database.is_empty() { "default".into() } else { database.into() },
+            settings: setup.params,
+            read_only: source.read_only,
+            session_id: uuid::Uuid::new_v4().to_string(),
+            session: Mutex::new(false),
+            closed: CancellationToken::new(),
+        }));
+        let cancel = CancellationToken::new();
+        let initialize = async {
+            pool.execute("SELECT 1", 1, &cancel).await?;
+            for sql in setup.statements {
+                pool.execute(&sql, 0, &cancel).await?;
+            }
+            Ok(pool.clone())
+        };
+        tokio::pin!(initialize);
+        tokio::select! {
+            result = &mut initialize => {
+                if result.is_err() {
+                    pool.close();
+                }
+                result
+            },
+            () = tokio::time::sleep(timeout) => {
+                cancel.cancel();
+                let _ = initialize.await;
+                pool.close();
+                Err(IdeError::new(ErrorKind::TimedOut, "timed out connecting to ClickHouse HTTP"))
+            }
+        }
+    }
+
+    pub fn close(&self) {
+        self.0.closed.cancel();
+        self.0.client.write().take();
+    }
+
+    pub fn is_closed(&self) -> bool {
+        self.0.closed.is_cancelled()
+    }
+
+    fn client(&self) -> IdeResult<Client> {
+        self.0.client.read().clone().ok_or_else(|| IdeError::new(ErrorKind::Io, "ClickHouse connection is closed"))
+    }
+
+    fn request(&self, client: &Client, query_id: &str, max_rows: usize, initialized: bool) -> RequestBuilder {
+        let mut request = client
+            .post(self.0.endpoint.clone())
+            .basic_auth(&self.0.user, Some(&self.0.password))
+            .header(reqwest::header::CONTENT_TYPE, "text/plain; charset=utf-8")
+            .query(&self.0.settings)
+            .query(&[
+                ("session_id", self.0.session_id.clone()),
+                ("session_timeout", "3600".into()),
+                ("query_id", query_id.to_owned()),
+                ("default_format", FORMAT.into()),
+                ("output_format_json_quote_denormals", "1".into()),
+                ("max_result_rows", max_rows.saturating_add(1).to_string()),
+                ("result_overflow_mode", "break".into()),
+            ]);
+        if initialized {
+            request = request.query(&[("session_check", "1")]);
+        } else {
+            request = request.query(&[("database", &self.0.database)]);
+        }
+        if self.0.read_only {
+            request = request.query(&[("readonly", "1")]);
+        }
+        request
+    }
+
+    pub async fn execute(&self, sql: &str, max_rows: usize, cancel: &CancellationToken) -> IdeResult<QueryResult> {
+        if transaction_statement(sql) {
+            return Err(transaction_error());
+        }
+        let mut session = tokio::select! {
+            biased;
+            () = cancel.cancelled() => return Err(IdeError::cancelled()),
+            () = self.0.closed.cancelled() => return Err(IdeError::new(ErrorKind::Io, "ClickHouse connection is closed")),
+            session = self.0.session.lock() => session,
+        };
+        let client = self.client()?;
+        let query_id = uuid::Uuid::new_v4().to_string();
+        let request = self.request(&client, &query_id, max_rows, *session).body(sql.to_owned());
+        let started = Instant::now();
+        let fetch = async {
+            let mut response = request.send().await.map_err(http_error)?;
+            let execution_ms = started.elapsed().as_secs_f64() * 1000.0;
+            let status = response.status();
+            let header = |name: &str| response.headers().get(name).and_then(|v| v.to_str().ok()).map(str::to_owned);
+            let exception_code = header("X-ClickHouse-Exception-Code");
+            let format = header("X-ClickHouse-Format");
+            let affected = header("X-ClickHouse-Summary")
+                .and_then(|v| serde_json::from_str::<serde_json::Value>(&v).ok())
+                .and_then(|v| {
+                    v.get("written_rows")
+                        .and_then(|n| n.as_str().and_then(|n| n.parse::<u64>().ok()).or_else(|| n.as_u64()))
+                });
+            if !status.is_success() || exception_code.as_deref().is_some_and(|code| code != "0") {
+                let body = response.bytes().await.map_err(http_error)?;
+                return Err(self.server_error(status, exception_code.as_deref(), &body));
+            }
+            let (columns, rows, has_more) = if format.as_deref().is_some_and(|f| f != FORMAT) {
+                let body = response.bytes().await.map_err(http_error)?;
+                if !body.iter().all(u8::is_ascii_whitespace) {
+                    return Err(IdeError::invalid(
+                        "ClickHouse result grids need the default output format; remove the query's FORMAT clause",
+                    ));
+                }
+                (Vec::new(), Vec::new(), false)
+            } else {
+                let mut reader = RowReader::new(max_rows);
+                while let Some(chunk) = response.chunk().await.map_err(http_error)? {
+                    reader.push(&chunk)?;
+                }
+                reader.finish().map_err(|error| self.redact_error(error))?
+            };
+            let affected = if columns.is_empty() { affected.map(|n| n as f64) } else { None };
+            Ok(QueryResult {
+                statement: sql.to_owned(),
+                columns,
+                rows,
+                affected,
+                has_more,
+                elapsed_ms: started.elapsed().as_secs_f64() * 1000.0,
+                execution_ms,
+            })
+        };
+        let result = tokio::select! {
+            biased;
+            () = cancel.cancelled() => None,
+            () = self.0.closed.cancelled() => None,
+            result = fetch => Some(result),
+        };
+        match result {
+            Some(result) => {
+                if result.is_ok() {
+                    *session = true;
+                }
+                result
+            }
+            None => {
+                let killed = self.kill(&client, &query_id).await;
+                match killed {
+                    Ok(()) => Err(IdeError::cancelled()),
+                    Err(error) => Err(IdeError::new(
+                        ErrorKind::Cancelled,
+                        format!("cancelled locally; ClickHouse server cancellation failed: {}", error.message),
+                    )),
+                }
+            }
+        }
+    }
+
+    async fn kill(&self, client: &Client, query_id: &str) -> IdeResult<()> {
+        let response = client
+            .post(self.0.endpoint.clone())
+            .basic_auth(&self.0.user, Some(&self.0.password))
+            .timeout(Duration::from_secs(3))
+            .body(format!("KILL QUERY WHERE query_id = '{query_id}' SYNC"))
+            .send()
+            .await
+            .map_err(http_error)?;
+        let status = response.status();
+        let code = response
+            .headers()
+            .get("X-ClickHouse-Exception-Code")
+            .and_then(|value| value.to_str().ok())
+            .map(str::to_owned);
+        let body = response.bytes().await.map_err(http_error)?;
+        if status.is_success() && !code.as_deref().is_some_and(|code| code != "0") && !body.starts_with(b"Code:") {
+            Ok(())
+        } else {
+            Err(self.server_error(status, code.as_deref(), &body))
+        }
+    }
+
+    fn redact_error(&self, mut error: IdeError) -> IdeError {
+        if !self.0.password.is_empty() {
+            error.message = error.message.replace(&self.0.password, "[redacted]");
+        }
+        error
+    }
+
+    fn server_error(&self, status: StatusCode, code: Option<&str>, body: &[u8]) -> IdeError {
+        let message = String::from_utf8_lossy(body);
+        let message: String = exception_text(&message).chars().take(16_384).collect();
+        let auth = matches!(status, StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN)
+            || matches!(code, Some("193" | "194" | "195" | "516" | "497"));
+        let detail = if message.is_empty() { status.canonical_reason().unwrap_or("request failed") } else { &message };
+        let detail = if detail.contains("SESSION_NOT_FOUND") || detail.contains("Session not found") {
+            "ClickHouse HTTP session expired; reconnect to restore session settings"
+        } else {
+            detail
+        };
+        self.redact_error(IdeError::new(
+            if auth { ErrorKind::PermissionDenied } else { ErrorKind::InvalidInput },
+            format!("ClickHouse HTTP {}: {detail}", status.as_u16()),
+        ))
+    }
+}
+
+type DecodedResult = (Vec<ResultColumn>, Vec<Vec<Option<String>>>, bool);
+
+/// Decodes a streamed [`FORMAT`] body. Keeps the first `max_rows` rows; later rows only set
+/// `has_more` and are read past unparsed, so a grid limit bounds memory however large the
+/// block `result_overflow_mode=break` lets the server send. A line that is not a JSON array
+/// starts the exception ClickHouse writes when a query fails mid-stream.
+struct RowReader {
+    max_rows: usize,
+    pending: Vec<u8>,
+    names: Option<Vec<String>>,
+    types: Option<Vec<String>>,
+    rows: Vec<Vec<Option<String>>>,
+    more: bool,
+    exception: Option<String>,
+}
+
+impl RowReader {
+    fn new(max_rows: usize) -> Self {
+        Self { max_rows, pending: Vec::new(), names: None, types: None, rows: Vec::new(), more: false, exception: None }
+    }
+
+    fn push(&mut self, chunk: &[u8]) -> IdeResult<()> {
+        self.pending.extend_from_slice(chunk);
+        let buffer = std::mem::take(&mut self.pending);
+        let mut start = 0;
+        while let Some(end) = buffer[start..].iter().position(|&b| b == b'\n') {
+            self.line(&buffer[start..start + end])?;
+            start += end + 1;
+        }
+        self.pending = buffer[start..].to_vec();
+        Ok(())
+    }
+
+    fn line(&mut self, line: &[u8]) -> IdeResult<()> {
+        if let Some(exception) = &mut self.exception {
+            if exception.len() < 16_384 {
+                exception.push_str(&String::from_utf8_lossy(line));
+                exception.push('\n');
+            }
+            return Ok(());
+        }
+        let text = line.trim_ascii();
+        if text.is_empty() {
+            return Ok(());
+        }
+        if text[0] != b'[' {
+            self.exception = Some(format!("{}\n", String::from_utf8_lossy(line)));
+            return Ok(());
+        }
+        if self.names.is_some() && self.types.is_some() && self.rows.len() >= self.max_rows {
+            self.more = true;
+            return Ok(());
+        }
+        let Ok(values) = serde_json::from_slice::<Vec<Box<serde_json::value::RawValue>>>(text) else {
+            self.exception = Some(format!("{}\n", String::from_utf8_lossy(line)));
+            return Ok(());
+        };
+        let protocol = |message: String| IdeError::new(ErrorKind::Protocol, message);
+        let header = |values: Vec<Box<serde_json::value::RawValue>>| {
+            values
+                .iter()
+                .map(|v| serde_json::from_str::<String>(v.get()))
+                .collect::<Result<Vec<_>, _>>()
+                .map_err(|e| protocol(format!("invalid ClickHouse result header: {e}")))
+        };
+        let Some(names) = &self.names else {
+            self.names = Some(header(values)?);
+            return Ok(());
+        };
+        if self.types.is_none() {
+            self.types = Some(header(values)?);
+            return Ok(());
+        }
+        if values.len() != names.len() {
+            return Err(protocol("ClickHouse result row width does not match its metadata".into()));
+        }
+        let row = values
+            .into_iter()
+            .map(|value| {
+                let text = value.get();
+                if text == "null" {
+                    Ok(None)
+                } else if text.starts_with('"') {
+                    serde_json::from_str::<String>(text).map(Some).map_err(|e| protocol(e.to_string()))
+                } else {
+                    Ok(Some(text.to_owned()))
+                }
+            })
+            .collect::<IdeResult<_>>()?;
+        self.rows.push(row);
+        Ok(())
+    }
+
+    fn finish(mut self) -> IdeResult<DecodedResult> {
+        let rest = std::mem::take(&mut self.pending);
+        self.line(&rest)?;
+        if let Some(exception) = self.exception {
+            return Err(IdeError::invalid(format!("ClickHouse: {}", exception_text(&exception))));
+        }
+        let Some(names) = self.names else { return Ok((Vec::new(), Vec::new(), false)) };
+        let types = self.types.unwrap_or_default();
+        if types.len() != names.len() {
+            return Err(IdeError::new(ErrorKind::Protocol, "ClickHouse result types do not match its columns"));
+        }
+        let columns = names.into_iter().zip(types).map(|(name, type_name)| ResultColumn { name, type_name }).collect();
+        Ok((columns, self.rows, self.more))
+    }
+}
+
+/// The server's message in a failed response: rows already streamed and the
+/// `__exception__` block markers ClickHouse wraps a mid-stream error in are dropped.
+fn exception_text(body: &str) -> &str {
+    let Some(at) = body.find("Code:") else { return body.trim() };
+    let text = &body[at..];
+    match text.find("\n__exception__") {
+        // The line before the closing marker is `<length> <tag>`.
+        Some(end) => text[..end].trim_end().rsplit_once('\n').map_or(text[..end].trim(), |(message, _)| message.trim()),
+        None => text.trim(),
+    }
+}
+
+fn http_error(error: reqwest::Error) -> IdeError {
+    use std::error::Error;
+    let kind = if error.is_timeout() { ErrorKind::TimedOut } else { ErrorKind::Io };
+    let error = error.without_url();
+    let mut message = error.to_string();
+    let mut source = error.source();
+    while let Some(error) = source {
+        let detail = error.to_string();
+        if !message.contains(&detail) {
+            message.push_str(": ");
+            message.push_str(&detail);
+        }
+        source = error.source();
+    }
+    IdeError::new(kind, format!("ClickHouse HTTP: {message}"))
+}
+
+fn read_pem(path: &str, label: &str) -> IdeResult<Vec<u8>> {
+    std::fs::read(ide_ssh::expand(path))
+        .map_err(|error| IdeError::new(ErrorKind::Io, format!("cannot read ClickHouse {label}: {error}")))
+}
+
+fn reserved_setting(name: &str) -> bool {
+    let name = name.to_ascii_lowercase();
+    name.starts_with("output_format_json_")
+        || matches!(
+            name.as_str(),
+            "user"
+                | "password"
+                | "query"
+                | "database"
+                | "session_id"
+                | "session_check"
+                | "session_timeout"
+                | "query_id"
+                | "default_format"
+                | "max_result_rows"
+                | "result_overflow_mode"
+                | "readonly"
+        )
+}
+
+fn transaction_statement(sql: &str) -> bool {
+    let mut sql = sql.trim_start();
+    loop {
+        if let Some(rest) = sql.strip_prefix("--").or_else(|| sql.strip_prefix('#')) {
+            sql = rest.split_once('\n').map_or("", |(_, rest)| rest).trim_start();
+        } else if let Some(rest) = sql.strip_prefix("/*") {
+            sql = rest.split_once("*/").map_or("", |(_, rest)| rest).trim_start();
+        } else {
+            break;
+        }
+    }
+    let mut words = sql.split(|c: char| !c.is_ascii_alphanumeric() && c != '_').filter(|s| !s.is_empty());
+    let first = words.next().unwrap_or_default();
+    ["BEGIN", "COMMIT", "ROLLBACK", "SAVEPOINT", "RELEASE"].iter().any(|s| first.eq_ignore_ascii_case(s))
+        || (first.eq_ignore_ascii_case("START") && words.next().is_some_and(|s| s.eq_ignore_ascii_case("TRANSACTION")))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::conn::Pool;
+    use crate::source::{DbDriver, DbOptions, DbProperty};
+    use tokio::io::{AsyncReadExt, AsyncWriteExt};
+
+    const ONE: &str = "[\"1\"]\n[\"UInt8\"]\n[1]\n";
+
+    async fn read_request(stream: &mut tokio::net::TcpStream) -> String {
+        let mut bytes = Vec::new();
+        let mut buffer = [0; 4096];
+        loop {
+            let count = tokio::time::timeout(Duration::from_secs(5), stream.read(&mut buffer)).await.unwrap().unwrap();
+            assert!(count > 0, "request ended early");
+            bytes.extend_from_slice(&buffer[..count]);
+            if let Some(end) = bytes.windows(4).position(|s| s == b"\r\n\r\n") {
+                let header = String::from_utf8_lossy(&bytes[..end]);
+                let length: usize = header
+                    .lines()
+                    .find_map(|line| {
+                        line.to_ascii_lowercase().strip_prefix("content-length:").map(|v| v.trim().parse().unwrap())
+                    })
+                    .unwrap_or(0);
+                if bytes.len() >= end + 4 + length {
+                    return String::from_utf8(bytes).unwrap();
+                }
+            }
+        }
+    }
+
+    async fn reply(stream: &mut tokio::net::TcpStream, status: &str, headers: &str, body: &str) {
+        let response =
+            format!("HTTP/1.1 {status}\r\nContent-Length: {}\r\nConnection: close\r\n{headers}\r\n{body}", body.len());
+        stream.write_all(response.as_bytes()).await.unwrap();
+    }
+
+    async fn server(
+        responses: Vec<(&'static str, &'static str, &'static str)>,
+    ) -> (u16, tokio::task::JoinHandle<Vec<String>>) {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let port = listener.local_addr().unwrap().port();
+        let task = tokio::spawn(async move {
+            let mut requests = Vec::new();
+            for (status, headers, body) in responses {
+                let (mut stream, _) =
+                    tokio::time::timeout(Duration::from_secs(5), listener.accept()).await.unwrap().unwrap();
+                requests.push(read_request(&mut stream).await);
+                reply(&mut stream, status, headers, body).await;
+            }
+            requests
+        });
+        (port, task)
+    }
+
+    fn source(port: u16) -> DataSource {
+        DataSource { driver: DbDriver::Clickhouse, host: "127.0.0.1".into(), port: Some(port), ..Default::default() }
+    }
+
+    fn decode(body: &[u8], max_rows: usize, chunk: usize) -> IdeResult<DecodedResult> {
+        let mut reader = RowReader::new(max_rows);
+        for part in body.chunks(chunk) {
+            reader.push(part)?;
+        }
+        reader.finish()
+    }
+
+    #[test]
+    fn rows_preserve_precision_nulls_and_strings_across_chunks() {
+        let body = concat!(
+            r#"["n", "d", "v", "v", "v"]"#,
+            "\n",
+            r#"["UInt64", "Decimal(38, 9)", "Nullable(String)", "Nullable(String)", "Nullable(String)"]"#,
+            "\n",
+            r#"[18446744073709551615, 12345678901234567890.123456789, null, "null", "ᴺᵁᴸᴸ"]"#,
+        );
+        for chunk in [1, 7, body.len()] {
+            let (columns, rows, more) = decode(body.as_bytes(), 1, chunk).unwrap();
+            assert_eq!(columns.len(), 5);
+            assert_eq!(columns[1].type_name, "Decimal(38, 9)");
+            assert_eq!(
+                rows[0],
+                vec![
+                    Some("18446744073709551615".into()),
+                    Some("12345678901234567890.123456789".into()),
+                    None,
+                    Some("null".into()),
+                    Some("ᴺᵁᴸᴸ".into()),
+                ]
+            );
+            assert!(!more);
+        }
+        let (columns, rows, more) = decode(b"[\"x\"]\n[\"String\"]\n", 0, 64).unwrap();
+        assert_eq!(columns[0].name, "x");
+        assert!(rows.is_empty() && !more);
+        assert_eq!(decode(b"", 5, 64).unwrap().0.len(), 0);
+        assert!(decode(b"[\"x\"]\n[\"UInt8\"]\n[1, 2]\n", 1, 64).is_err());
+    }
+
+    #[test]
+    fn rows_past_the_limit_are_skipped_but_a_later_exception_still_fails() {
+        let mut body = String::from("[\"n\"]\n[\"UInt64\"]\n");
+        for n in 0..1000 {
+            body.push_str(&format!("[{n}]\n"));
+        }
+        let (_, rows, more) = decode(body.as_bytes(), 2, 4096).unwrap();
+        assert_eq!(rows, vec![vec![Some("0".into())], vec![Some("1".into())]]);
+        assert!(more);
+        body.push_str("\n__exception__\nabcdefgh\nCode: 395. DB::Exception: Value passed to 'throwIf' is non-zero\n");
+        body.push_str("62 abcdefgh\n__exception__\n");
+        let error = decode(body.as_bytes(), 2, 4096).unwrap_err();
+        assert_eq!(error.message, "ClickHouse: Code: 395. DB::Exception: Value passed to 'throwIf' is non-zero");
+        let multiline = "Code: 62. DB::Exception: Syntax error\nat line 2";
+        assert_eq!(exception_text(multiline), multiline);
+    }
+
+    #[tokio::test]
+    async fn http_requests_use_auth_settings_limits_and_a_shared_session() {
+        let (port, requests) = server(vec![
+            ("200 OK", "X-ClickHouse-Format: JSONCompactEachRowWithNamesAndTypes\r\n", ONE),
+            ("200 OK", "", ""),
+            (
+                "200 OK",
+                "X-ClickHouse-Format: JSONCompactEachRowWithNamesAndTypes\r\n",
+                "[\"n\"]\n[\"UInt64\"]\n[\"1\"]\n[\"2\"]\n[\"3\"]\n",
+            ),
+        ])
+        .await;
+        let source = DataSource {
+            user: "reader".into(),
+            read_only: true,
+            options: DbOptions { default_schema: "analytics".into(), time_zone: "UTC".into(), ..Default::default() },
+            properties: vec![DbProperty { name: "max_threads".into(), value: "2".into() }],
+            ..source(port)
+        };
+        let pool = Pool::connect(&source, Some("mock-password"), None).await.unwrap();
+        pool.execute("USE other", 0, &CancellationToken::new()).await.unwrap();
+        let result = pool.execute("SELECT number FROM numbers(3)", 1, &CancellationToken::new()).await.unwrap();
+        assert_eq!(result.rows, vec![vec![Some("1".into())]]);
+        assert!(result.has_more && result.affected.is_none());
+        let requests = requests.await.unwrap();
+        let target = |request: &String| {
+            Url::parse(&format!(
+                "http://localhost{}",
+                request.lines().next().unwrap().split_whitespace().nth(1).unwrap()
+            ))
+            .unwrap()
+        };
+        let urls: Vec<_> = requests.iter().map(target).collect();
+        let value = |url: &Url, key: &str| url.query_pairs().find(|(k, _)| k == key).map(|(_, v)| v.into_owned());
+        assert_eq!(value(&urls[0], "database").as_deref(), Some("analytics"));
+        assert_eq!(value(&urls[1], "database"), None);
+        assert_eq!(value(&urls[1], "session_check").as_deref(), Some("1"));
+        assert_eq!(value(&urls[0], "session_id"), value(&urls[2], "session_id"));
+        assert_ne!(value(&urls[0], "query_id"), value(&urls[2], "query_id"));
+        assert_eq!(value(&urls[2], "max_result_rows").as_deref(), Some("2"));
+        for (request, url) in requests.iter().zip(&urls) {
+            assert!(request.starts_with("POST /?"));
+            assert!(request.contains("Basic cmVhZGVyOm1vY2stcGFzc3dvcmQ="));
+            assert!(!url.as_str().contains("reader") && !url.as_str().contains("mock-password"));
+            assert_eq!(value(url, "readonly").as_deref(), Some("1"));
+            assert_eq!(value(url, "session_timezone").as_deref(), Some("UTC"));
+            assert_eq!(value(url, "max_threads").as_deref(), Some("2"));
+        }
+        assert!(requests[0].ends_with("SELECT 1"));
+        assert!(pool.transaction(&[]).await.is_err());
+        let cancel = CancellationToken::new();
+        cancel.cancel();
+        assert_eq!(pool.execute("SELECT 1", 1, &cancel).await.unwrap_err().kind, ErrorKind::Cancelled);
+        pool.close().await;
+        assert!(pool.is_closed());
+        assert!(pool.execute("SELECT 1", 1, &CancellationToken::new()).await.is_err());
+    }
+
+    #[tokio::test]
+    async fn sequential_queries_reuse_the_http_connection() {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let port = listener.local_addr().unwrap().port();
+        let task = tokio::spawn(async move {
+            let (mut stream, _) = listener.accept().await.unwrap();
+            for _ in 0..2 {
+                read_request(&mut stream).await;
+                let response = format!("HTTP/1.1 200 OK\r\nContent-Length: {}\r\n\r\n{ONE}", ONE.len());
+                stream.write_all(response.as_bytes()).await.unwrap();
+            }
+        });
+        let pool = Pool::connect(&source(port), None, None).await.unwrap();
+        assert_eq!(
+            pool.execute("SELECT 1", 1, &CancellationToken::new()).await.unwrap().rows,
+            vec![vec![Some("1".into())]]
+        );
+        task.await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn server_errors_keep_details_and_hide_passwords() {
+        let (port, requests) = server(vec![(
+            "403 Forbidden",
+            "X-ClickHouse-Exception-Code: 516\r\n",
+            "Code: 516. DB::Exception: bad mock-password",
+        )])
+        .await;
+        let error = match Pool::connect(&source(port), Some("mock-password"), None).await {
+            Ok(_) => panic!("expected login failure"),
+            Err(error) => error,
+        };
+        assert_eq!(error.kind, ErrorKind::PermissionDenied);
+        assert!(error.message.contains("516") && error.message.contains("[redacted]"));
+        assert!(!error.message.contains("mock-password"));
+        requests.await.unwrap();
+        let (port, requests) = server(vec![("200 OK", "", "Code: 241. DB::Exception: memory limit")]).await;
+        let error = match Pool::connect(&source(port), None, None).await {
+            Ok(_) => panic!("expected late query failure"),
+            Err(error) => error,
+        };
+        assert!(error.message.contains("memory limit"));
+        requests.await.unwrap();
+        let (port, requests) = server(vec![(
+            "500 Internal Server Error",
+            "X-ClickHouse-Exception-Code: 395\r\n",
+            "[\"1\"]\n[\"UInt8\"]\n[1]\n\n__exception__\ntag\nCode: 395. DB::Exception: thrown\n32 tag\n__exception__\n",
+        )])
+        .await;
+        let error = match Pool::connect(&source(port), None, None).await {
+            Ok(_) => panic!("expected mid-stream failure"),
+            Err(error) => error,
+        };
+        assert_eq!(error.message, "ClickHouse HTTP 500: Code: 395. DB::Exception: thrown");
+        requests.await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn cancellation_sends_kill_outside_the_busy_session() {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let port = listener.local_addr().unwrap().port();
+        let (started, received) = tokio::sync::oneshot::channel();
+        let server = tokio::spawn(async move {
+            let (mut health, _) = listener.accept().await.unwrap();
+            read_request(&mut health).await;
+            reply(&mut health, "200 OK", "", ONE).await;
+            drop(health);
+            let (mut query, _) = listener.accept().await.unwrap();
+            let request = read_request(&mut query).await;
+            started.send(()).unwrap();
+            let (mut kill, _) = tokio::time::timeout(Duration::from_secs(5), listener.accept()).await.unwrap().unwrap();
+            let kill_request = read_request(&mut kill).await;
+            reply(&mut kill, "200 OK", "", "").await;
+            (request, kill_request)
+        });
+        let pool = Pool::connect(&source(port), None, None).await.unwrap();
+        let cancel = CancellationToken::new();
+        let query = pool.execute("SELECT sleep(30)", 1, &cancel);
+        let cancelled = async {
+            received.await.unwrap();
+            cancel.cancel();
+        };
+        let (result, ()) = tokio::join!(query, cancelled);
+        assert_eq!(result.unwrap_err().kind, ErrorKind::Cancelled);
+        let (query, kill) = server.await.unwrap();
+        let target = query.lines().next().unwrap().split_whitespace().nth(1).unwrap();
+        let url = Url::parse(&format!("http://localhost{target}")).unwrap();
+        let query_id = url.query_pairs().find(|(k, _)| k == "query_id").unwrap().1.into_owned();
+        assert!(kill.ends_with(&format!("KILL QUERY WHERE query_id = '{query_id}' SYNC")));
+        assert!(!kill.contains("session_id="));
+    }
+
+    #[tokio::test]
+    async fn unsupported_settings_and_transactions_fail_before_connecting() {
+        for statement in ["BEGIN", "-- comment\n COMMIT", "/* comment */ ROLLBACK", "START TRANSACTION", "SAVEPOINT s"]
+        {
+            assert!(transaction_statement(statement));
+        }
+        assert!(!transaction_statement("SELECT 'BEGIN'"));
+        let sources = [
+            DataSource { options: DbOptions { transaction: DbTxMode::Manual, ..Default::default() }, ..source(1) },
+            DataSource {
+                properties: vec![DbProperty { name: "statement_cache_capacity".into(), value: "4".into() }],
+                ..source(1)
+            },
+            DataSource { properties: vec![DbProperty { name: "password".into(), value: "x".into() }], ..source(1) },
+            DataSource { ssl_ca_file: "unused.pem".into(), ..source(1) },
+            DataSource { ssl: DbSslMode::VerifyCa, ..source(1) },
+            DataSource { ssl: DbSslMode::Require, ssl_cert_file: "unused.pem".into(), ..source(1) },
+        ];
+        for source in sources {
+            let error = match Pool::connect(&source, None, None).await {
+                Ok(_) => panic!("unsupported settings were accepted"),
+                Err(error) => error,
+            };
+            assert_eq!(error.kind, ErrorKind::InvalidInput);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore = "requires CLICKHOUSE_TEST_HOST, CLICKHOUSE_TEST_USER, and CLICKHOUSE_TEST_PASSWORD"]
+    async fn clickhouse_cloud_transport() {
+        let source = DataSource {
+            driver: DbDriver::Clickhouse,
+            host: std::env::var("CLICKHOUSE_TEST_HOST").expect("CLICKHOUSE_TEST_HOST"),
+            port: Some(std::env::var("CLICKHOUSE_TEST_PORT").ok().and_then(|v| v.parse().ok()).unwrap_or(8443)),
+            user: std::env::var("CLICKHOUSE_TEST_USER").expect("CLICKHOUSE_TEST_USER"),
+            ssl: DbSslMode::Require,
+            options: DbOptions {
+                time_zone: "UTC".into(),
+                startup_script: "SET max_threads = 2".into(),
+                ..Default::default()
+            },
+            properties: vec![DbProperty { name: "max_block_size".into(), value: "50".into() }],
+            ..Default::default()
+        };
+        let password = std::env::var("CLICKHOUSE_TEST_PASSWORD").expect("CLICKHOUSE_TEST_PASSWORD");
+        let pool = Pool::connect(&source, Some(&password), None).await.unwrap();
+        let cancel = CancellationToken::new();
+        let settings = pool
+            .execute("SELECT getSetting('max_threads'), getSetting('max_block_size'), timezone()", 1, &cancel)
+            .await
+            .unwrap();
+        assert_eq!(settings.rows, vec![vec![Some("2".into()), Some("50".into()), Some("UTC".into())]]);
+        let result = pool.execute("SELECT toUInt64('18446744073709551615') AS n, CAST(NULL AS Nullable(String)) AS missing, CAST('ᴺᵁᴸᴸ' AS Nullable(String)) AS text, 'a\\nb' AS lines", 1, &cancel).await.unwrap();
+        assert_eq!(
+            result.rows,
+            vec![vec![Some("18446744073709551615".into()), None, Some("ᴺᵁᴸᴸ".into()), Some("a\nb".into())]]
+        );
+        assert_eq!(result.columns[1].type_name, "Nullable(String)");
+        let limited = pool.execute("SELECT number FROM numbers(100)", 2, &cancel).await.unwrap();
+        assert_eq!(limited.rows.len(), 2);
+        assert!(limited.has_more);
+        let marker = format!("transport_cancel_{}", uuid::Uuid::new_v4().simple());
+        let sql = format!("SELECT sleepEachRow(0.05) FROM numbers(50) /* {marker} */");
+        let stop = CancellationToken::new();
+        let query = pool.execute(&sql, 1, &stop);
+        let cancel_query = async {
+            tokio::time::sleep(Duration::from_millis(500)).await;
+            stop.cancel();
+        };
+        let (cancelled, ()) = tokio::join!(query, cancel_query);
+        let cancelled = cancelled.unwrap_err();
+        assert_eq!(cancelled.kind, ErrorKind::Cancelled);
+        assert_eq!(cancelled.message, "cancelled");
+        let active = pool.execute(&format!("SELECT count() FROM system.processes WHERE position(query, '{marker}') > 0 AND query_id != currentQueryID()"), 1, &cancel).await.unwrap();
+        assert_eq!(active.rows, vec![vec![Some("0".into())]]);
+        let table = format!("transport_test_{}", uuid::Uuid::new_v4().simple());
+        pool.execute(&format!("CREATE TEMPORARY TABLE {table} (n UInt8)"), 0, &cancel).await.unwrap();
+        let continuity = async {
+            pool.execute(&format!("INSERT INTO {table} VALUES (7)"), 0, &cancel).await?;
+            pool.execute(&format!("SELECT n FROM {table}"), 1, &cancel).await
+        }
+        .await;
+        let cleanup = pool.execute(&format!("DROP TEMPORARY TABLE {table}"), 0, &cancel).await;
+        assert_eq!(continuity.unwrap().rows, vec![vec![Some("7".into())]]);
+        cleanup.unwrap();
+        pool.close().await;
+        assert!(pool.is_closed());
+    }
+}
diff --git a/crates/ide-db/src/conn.rs b/crates/ide-db/src/conn.rs
index aa9fd7f4..94bd0134 100644
--- a/crates/ide-db/src/conn.rs
+++ b/crates/ide-db/src/conn.rs
@@ -106,6 +106,7 @@ pub enum Pool {
     Postgres(PgPool),
     Mysql(MySqlPool),
     SqlServer(Bb8Pool<MssqlConnectionManager>),
+    Clickhouse(crate::clickhouse::ClickhousePool),
 }
 
 /// Runs `$body` with `$p` bound to the concrete pool of each driver.
@@ -115,7 +116,7 @@ macro_rules! with_pool {
             Pool::Sqlite($p) => $body,
             Pool::Postgres($p) => $body,
             Pool::Mysql($p) => $body,
-            Pool::SqlServer(_) => unreachable!(),
+            Pool::SqlServer(_) | Pool::Clickhouse(_) => unreachable!(),
         }
     };
 }
@@ -503,6 +504,9 @@ impl Setup {
                 value.parse::<u64>().map_err(|_| IdeError::invalid(format!("{what} must be a whole number: {value}")))
             };
             match (source.driver, name.to_ascii_lowercase().as_str()) {
+                (DbDriver::Clickhouse, "statement_cache_capacity") => {
+                    return Err(IdeError::invalid("ClickHouse HTTP does not support statement caching"));
+                }
                 (_, "statement_cache_capacity") => s.statement_cache = Some(number(&name)? as usize),
                 (_, "connect_timeout") => s.connect_timeout = Some(Duration::from_secs(number(&name)?)),
                 (DbDriver::Postgres, "application_name") => s.application_name = Some(value.to_owned()),
@@ -512,6 +516,9 @@ impl Setup {
                 _ => s.params.push((name, value.to_owned())),
             }
         }
+        if source.driver == DbDriver::Clickhouse && !o.time_zone.trim().is_empty() {
+            s.params.push(("session_timezone".into(), o.time_zone.trim().into()));
+        }
         let script = o.startup_script.trim();
         if !script.is_empty() {
             s.statements.extend(crate::split::split(script, source.driver).into_iter().map(|st| st.text));
@@ -527,6 +534,7 @@ impl Pool {
             Pool::Postgres(_) => DbDriver::Postgres,
             Pool::Mysql(_) => DbDriver::Mysql,
             Pool::SqlServer(_) => DbDriver::SqlServer,
+            Pool::Clickhouse(_) => DbDriver::Clickhouse,
         }
     }
 
@@ -534,6 +542,9 @@ impl Pool {
     pub async fn connect(source: &DataSource, password: Option<&str>, root: Option<&Path>) -> IdeResult<Self> {
         const MAX: u32 = 4;
         let setup = Setup::of(source)?;
+        if source.driver == DbDriver::Clickhouse {
+            return crate::clickhouse::ClickhousePool::connect(source, password, setup).await.map(Pool::Clickhouse);
+        }
         let timeout = setup.connect_timeout.unwrap_or(Duration::from_secs(30));
         let init = Arc::new(setup.statements);
         // Runs the session statements (startup script…) on every new connection.
@@ -695,12 +706,14 @@ impl Pool {
                 conn.query("SELECT 1", &[]).await.map_err(mssql_err)?.into_results().await.map_err(mssql_err)?;
                 Ok(Pool::SqlServer(pool))
             }
+            DbDriver::Clickhouse => unreachable!(),
         }
     }
 
     pub async fn close(&self) {
         match self {
             Pool::SqlServer(_) => {}
+            Pool::Clickhouse(p) => p.close(),
             _ => with_pool!(self, p => p.close().await),
         }
     }
@@ -708,12 +721,16 @@ impl Pool {
     pub fn is_closed(&self) -> bool {
         match self {
             Pool::SqlServer(_) => false,
+            Pool::Clickhouse(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>>>> {
+        if let Pool::Clickhouse(p) = self {
+            return Ok(p.execute(sql, max, &CancellationToken::new()).await?.rows);
+        }
         let fetched: IdeResult<Fetched> = match self {
             Pool::SqlServer(p) => {
                 let mut conn = p.get_owned().await.map_err(mssql_pool_err)?;
@@ -727,6 +744,9 @@ impl Pool {
     /// Runs one statement and keeps at most `max_rows` rows. Cancelling stops
     /// the statement on the server (PostgreSQL, MySQL) and drops the connection.
     pub async fn execute(&self, sql: &str, max_rows: usize, cancel: &CancellationToken) -> IdeResult<QueryResult> {
+        if let Pool::Clickhouse(p) = self {
+            return p.execute(sql, max_rows, cancel).await;
+        }
         let mut conn = Held::acquire(self).await?;
         let r = conn.execute(self, sql, max_rows, cancel).await;
         if cancel.is_cancelled() {
@@ -740,6 +760,7 @@ impl Pool {
     /// row when flagged (table editor submits).
     pub async fn transaction(&self, statements: &[(String, bool)]) -> IdeResult<u64> {
         match self {
+            Pool::Clickhouse(_) => Err(crate::clickhouse::transaction_error()),
             Pool::SqlServer(p) => {
                 let mut conn = p.get_owned().await.map_err(mssql_pool_err)?;
                 let result = async {
@@ -790,6 +811,7 @@ pub enum Held {
     Postgres(PoolConnection<Postgres>),
     Mysql(PoolConnection<MySql>),
     SqlServer(Box<bb8::PooledConnection<'static, MssqlConnectionManager>>),
+    Clickhouse(crate::clickhouse::ClickhousePool),
 }
 
 impl Held {
@@ -799,6 +821,12 @@ impl Held {
             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)?)),
+            Pool::Clickhouse(p) => {
+                if p.is_closed() {
+                    return Err(IdeError::new(ErrorKind::Io, "ClickHouse connection is closed"));
+                }
+                Held::Clickhouse(p.clone())
+            }
         })
     }
 
@@ -806,13 +834,14 @@ impl Held {
     pub async fn command(&mut self, sql: &str) -> IdeResult<()> {
         match self {
             Held::SqlServer(c) => mssql_command(c, sql).await,
+            Held::Clickhouse(_) => Err(crate::clickhouse::transaction_error()),
             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!(),
+                    Held::SqlServer(_) | Held::Clickhouse(_) => unreachable!(),
                 }
                 .map_err(db_err)
             }
@@ -833,6 +862,7 @@ impl Held {
             Held::SqlServer(mut c) => {
                 c.0.take();
             }
+            Held::Clickhouse(_) => {}
         }
     }
 
@@ -845,6 +875,9 @@ impl Held {
         max_rows: usize,
         cancel: &CancellationToken,
     ) -> IdeResult<QueryResult> {
+        if let Held::Clickhouse(c) = self {
+            return c.execute(sql, max_rows, cancel).await;
+        }
         let started = Instant::now();
         // `$id`: the query naming the server process, `$kill`: how another connection stops it.
         macro_rules! run {
@@ -887,6 +920,7 @@ impl Held {
                     () = cancel.cancelled() => return Err(IdeError::cancelled()),
                 }
             }
+            Held::Clickhouse(_) => unreachable!(),
         };
         let (columns, rows, affected, has_more, first) = fetched;
         let elapsed_ms = started.elapsed().as_secs_f64() * 1000.0;
@@ -907,7 +941,7 @@ pub fn begin_statement(driver: DbDriver) -> &'static str {
     match driver {
         DbDriver::Mysql => "START TRANSACTION",
         DbDriver::SqlServer => "BEGIN TRAN",
-        DbDriver::Sqlite | DbDriver::Postgres => "BEGIN",
+        DbDriver::Sqlite | DbDriver::Postgres | DbDriver::Clickhouse => "BEGIN",
     }
 }
 
diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs
index 5f7034c5..71545ecb 100644
--- a/crates/ide-db/src/lib.rs
+++ b/crates/ide-db/src/lib.rs
@@ -2,6 +2,7 @@
 //! execution ([`conn`]), introspection, table data paging / editing ([`sql`])
 //! and statement splitting ([`split`]), for SQLite, PostgreSQL and MySQL/MariaDB.
 
+mod clickhouse;
 pub mod conn;
 pub mod history;
 pub mod plan;
@@ -212,6 +213,8 @@ pub struct DbManager {
     /// App-wide SSH connections and host-key trust.
     ssh: Arc<SshManager>,
     saved_passwords: SecretStore,
+    /// Directory of the global data sources and their saved passwords ([`DbManager::with_global_sources`]).
+    global: Option<(PathBuf, SecretStore)>,
     history: Arc<HistoryStore>,
     /// Records executed statements in the history off the async threads, in order.
     recorder: std::sync::mpsc::Sender<(String, String, f64)>,
@@ -338,6 +341,7 @@ impl DbManager {
         }
         Self {
             saved_passwords: SecretStore::new(passwords, &root),
+            global: None,
             history,
             recorder,
             root,
@@ -350,8 +354,42 @@ impl DbManager {
         }
     }
 
+    /// Also lists the global data sources stored in `dir` (the app data directory).
+    pub fn with_global_sources(mut self, dir: PathBuf) -> Self {
+        let passwords = self.saved_passwords.scoped(&dir);
+        self.global = Some((dir, passwords));
+        self
+    }
+
+    /// The project's data sources, then the global ones (a project one wins on the same id).
     pub fn sources(&self) -> IdeResult<Vec<DataSource>> {
-        source::load(&self.root)
+        let mut all = source::load(&self.root)?;
+        let global: Vec<_> = self.global_sources().into_iter().filter(|g| all.iter().all(|s| s.id != g.id)).collect();
+        all.extend(global);
+        Ok(all)
+    }
+
+    fn global_sources(&self) -> Vec<DataSource> {
+        let Some((dir, _)) = &self.global else { return Vec::new() };
+        source::load_global(dir).unwrap_or_else(|e| {
+            tracing::warn!("global data sources: {}", e.message);
+            Vec::new()
+        })
+    }
+
+    /// Where the saved passwords of data source `id` live: app-wide for a global one.
+    fn saved_for(&self, id: &str) -> &SecretStore {
+        match &self.global {
+            Some((_, store)) if self.global_sources().iter().any(|s| s.id == id) => store,
+            _ => &self.saved_passwords,
+        }
+    }
+
+    fn store_of(&self, source: &DataSource) -> &SecretStore {
+        match &self.global {
+            Some((_, store)) if source.global => store,
+            _ => &self.saved_passwords,
+        }
     }
 
     /// The connection settings of target `target` ([`DataSource::resolved`]), with
@@ -371,18 +409,43 @@ impl DbManager {
     }
 
     /// Saves the data source list; connections of removed or changed sources are closed.
+    /// Global ones (`global`) go to the app-wide list, the others to the project's.
     pub async fn save_sources(&self, sources: Vec<DataSource>) -> IdeResult<()> {
         let old = self.sources().unwrap_or_default();
-        source::save(&self.root, &sources)?;
+        let (global, project): (Vec<_>, Vec<_>) = sources.iter().cloned().partition(|s| s.global);
+        match &self.global {
+            // Rewritten only when it changes: other projects' windows edit the same file.
+            Some((dir, _)) => {
+                if global != old.iter().filter(|s| s.global).cloned().collect::<Vec<_>>() {
+                    source::save_global(dir, &global)?;
+                }
+            }
+            None if !global.is_empty() => return Err(IdeError::invalid("global data sources are not available here")),
+            None => {}
+        }
+        source::save(&self.root, &project)?;
         for o in old {
             match sources.iter().find(|s| s.id == o.id) {
                 Some(n) if *n == o => {}
                 gone_or_changed => {
-                    if gone_or_changed.is_none() {
-                        for k in [o.id.clone(), secrets::ssh_key(&o.id)] {
-                            self.session_passwords.lock().remove(&k);
-                            self.saved_passwords.delete(&k);
+                    let keys = [o.id.clone(), secrets::ssh_key(&o.id)];
+                    match gone_or_changed {
+                        None => {
+                            for k in &keys {
+                                self.session_passwords.lock().remove(k);
+                                self.store_of(&o).delete(k);
+                            }
                         }
+                        // Made global or project-level: its saved passwords move along.
+                        Some(n) if n.global != o.global => {
+                            for k in &keys {
+                                if let Some(p) = self.store_of(&o).get(k) {
+                                    self.store_of(n).set(k, &p)?;
+                                    self.store_of(&o).delete(k);
+                                }
+                            }
+                        }
+                        Some(_) => {}
                     }
                     self.disconnect_source(&o.id).await;
                 }
@@ -394,7 +457,7 @@ impl DbManager {
     /// Remembers `password` for the session, and in the saved passwords when
     /// the data source saves passwords (`None` forgets it).
     pub async fn set_password(&self, id: &str, password: Option<String>, save: bool) -> IdeResult<()> {
-        self.remember(id.to_owned(), password, save).await
+        self.remember(id, id.to_owned(), password, save).await
     }
 
     /// [`DbManager::set_password`] for the SSH password / key passphrase.
@@ -406,10 +469,10 @@ impl DbManager {
             self.ssh.set_secret(&c, secret, save);
             return Ok(());
         }
-        self.remember(secrets::ssh_key(id), secret, save).await
+        self.remember(id, secrets::ssh_key(id), secret, save).await
     }
 
-    async fn remember(&self, key: String, secret: Option<String>, save: bool) -> IdeResult<()> {
+    async fn remember(&self, id: &str, key: String, secret: Option<String>, save: bool) -> IdeResult<()> {
         match &secret {
             Some(p) => {
                 self.session_passwords.lock().insert(key.clone(), p.clone());
@@ -418,10 +481,11 @@ impl DbManager {
                 self.session_passwords.lock().remove(&key);
             }
         }
+        let store = self.saved_for(id);
         let result = match (secret, save) {
-            (Some(p), true) => self.saved_passwords.set(&key, &p),
+            (Some(p), true) => store.set(&key, &p),
             _ => {
-                self.saved_passwords.delete(&key);
+                store.delete(&key);
                 Ok(())
             }
         };
@@ -432,18 +496,18 @@ impl DbManager {
         Ok(())
     }
 
-    async fn secret(&self, key: String, saved: bool) -> Option<String> {
+    async fn secret(&self, source: &DataSource, key: String, saved: bool) -> Option<String> {
         if let Some(p) = self.session_passwords.lock().get(&key) {
             return Some(p.clone());
         }
         if !saved {
             return None;
         }
-        self.saved_passwords.get(&key)
+        self.store_of(source).get(&key)
     }
 
     async fn password(&self, source: &DataSource) -> Option<String> {
-        match self.secret(source.id.clone(), source.driver != DbDriver::Sqlite && source.save_password).await {
+        match self.secret(source, source.id.clone(), source.driver != DbDriver::Sqlite && source.save_password).await {
             Some(p) => Some(p),
             None => source.url_password(),
         }
@@ -499,7 +563,7 @@ impl DbManager {
         let session = if config.is_empty() {
             let secret = match ssh_secret {
                 Some(s) => Some(s),
-                None => self.secret(secrets::ssh_key(&source.id), ssh.save_secret).await,
+                None => self.secret(source, secrets::ssh_key(&source.id), ssh.save_secret).await,
             };
             let target = SshTarget {
                 host: ssh.host.clone(),
@@ -547,12 +611,14 @@ impl DbManager {
         })?;
         let version = match source.driver {
             DbDriver::Sqlite => "SELECT 'SQLite ' || sqlite_version()",
-            DbDriver::Postgres => "SELECT version()",
+            DbDriver::Postgres | DbDriver::Clickhouse => "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()?);
+        let result = pool.rows(version, 1).await;
         pool.close().await;
+        let rows = if source.driver == DbDriver::Clickhouse { result? } else { result.unwrap_or_default() };
+        let v = rows.into_iter().next().and_then(|r| r.into_iter().next().flatten());
         Ok(v.unwrap_or_else(|| "Connected".into()))
     }
 
@@ -701,8 +767,11 @@ impl DbManager {
                 _ => indexes.push(IndexInfo { name, unique: flag(&unique), columns: vec![col] }),
             }
         }
-        let fk_rows =
-            pool.rows(&sql::table_foreign_keys(driver, schema, table), MAX_META_ROWS).await.unwrap_or_default();
+        let fk_rows = if driver == DbDriver::Clickhouse {
+            Vec::new()
+        } else {
+            pool.rows(&sql::table_foreign_keys(driver, schema, table), MAX_META_ROWS).await.unwrap_or_default()
+        };
         let mut foreign_keys = group_foreign_keys(fk_rows, &[]);
         // SQLite keys that reference the primary key implicitly: look it up.
         for k in foreign_keys.iter_mut().filter(|k| k.ref_columns.is_empty()) {
@@ -715,13 +784,15 @@ impl DbManager {
                 .collect();
         }
         foreign_keys.retain(|k| k.columns.len() == k.ref_columns.len());
-        let triggers = pool
-            .rows(&sql::triggers(driver, schema, table), MAX_META_ROWS)
-            .await
-            .unwrap_or_else(|e| {
+        let trigger_rows = if driver == DbDriver::Clickhouse {
+            Vec::new()
+        } else {
+            pool.rows(&sql::triggers(driver, schema, table), MAX_META_ROWS).await.unwrap_or_else(|e| {
                 tracing::warn!("triggers: {}", e.message);
                 Vec::new()
             })
+        };
+        let triggers = trigger_rows
             .into_iter()
             .filter_map(|r| {
                 let mut it = r.into_iter();
@@ -822,6 +893,11 @@ 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::Clickhouse => {
+                let q = format!("SHOW CREATE TABLE {}", sql::qualified(driver, schema, name));
+                let ddl = cells(pool.rows(&q, 1).await?, 0).into_iter().next();
+                ddl.map(|d| format!("{};\n", d.trim_end().trim_end_matches(';'))).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)
@@ -902,10 +978,14 @@ impl DbManager {
             }
         }
         // Foreign keys are a nicety (JOIN completion): a server that refuses the catalog query still completes.
-        let fk_rows = pool.rows(sql::foreign_keys(driver), MAX_META_ROWS).await.unwrap_or_else(|e| {
-            tracing::warn!("foreign keys: {}", e.message);
+        let fk_rows = if driver == DbDriver::Clickhouse {
             Vec::new()
-        });
+        } else {
+            pool.rows(sql::foreign_keys(driver), MAX_META_ROWS).await.unwrap_or_else(|e| {
+                tracing::warn!("foreign keys: {}", e.message);
+                Vec::new()
+            })
+        };
         let foreign_keys = group_foreign_keys(fk_rows, &tables);
         let default_schema = match sql::current_schema(driver) {
             None => "main".to_owned(),
@@ -980,6 +1060,9 @@ impl DbManager {
         let Some(session) = session else {
             return pool.execute(statement, max_rows, cancel).await;
         };
+        if pool.driver() == DbDriver::Clickhouse {
+            return Err(IdeError::invalid("ClickHouse manual transactions are unsupported"));
+        }
         let mut held = session.lock().await;
         if held.is_none() {
             let mut conn = Held::acquire(&pool).await?;
@@ -998,8 +1081,11 @@ impl DbManager {
 
     /// Switches `id` between auto-commit and manual commit. Leaving manual
     /// mode rolls back what was not committed.
-    pub async fn set_manual_commit(&self, id: &str, manual: bool) {
+    pub async fn set_manual_commit(&self, id: &str, manual: bool) -> IdeResult<()> {
         if manual {
+            if self.source(id)?.driver == DbDriver::Clickhouse {
+                return Err(IdeError::invalid("ClickHouse manual transactions are unsupported"));
+            }
             self.sessions.lock().entry(id.to_owned()).or_default();
         } else {
             let session = self.sessions.lock().remove(id);
@@ -1007,10 +1093,14 @@ impl DbManager {
                 end_session(&s).await;
             }
         }
+        Ok(())
     }
 
     /// Commits (or rolls back) the open transaction of a manual-commit data source.
     pub async fn finish_transaction(&self, id: &str, commit: bool) -> IdeResult<()> {
+        if self.source(id).is_ok_and(|s| s.driver == DbDriver::Clickhouse) {
+            return Err(IdeError::invalid("ClickHouse manual transactions are unsupported"));
+        }
         let session = self.sessions.lock().get(id).cloned();
         let Some(session) = session else { return Ok(()) };
         let mut held = session.lock().await;
@@ -1052,6 +1142,9 @@ impl DbManager {
 
     /// Applies the table editor's pending changes in one transaction.
     pub async fn apply_edits(&self, id: &str, schema: &str, table: &str, edits: &[DbRowEdit]) -> IdeResult<u64> {
+        if self.source(id)?.driver == DbDriver::Clickhouse {
+            return Err(IdeError::invalid("ClickHouse table editing is unsupported"));
+        }
         let pool = self.pool(id).await?;
         let driver = pool.driver();
         let statements = edits
@@ -1064,3 +1157,112 @@ impl DbManager {
         pool.transaction(&statements).await
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ide_ssh::secrets::testing::files_containing;
+    use std::path::Path;
+
+    fn manager(dir: &Path) -> DbManager {
+        ide_ssh::secrets::testing::use_memory_store();
+        let data = dir.join("data");
+        let ssh = Arc::new(SshManager::new(data.join("ssh-passwords.json")));
+        DbManager::new(dir.join("project"), data.join("db-passwords.json"), data.join("db-history.json"), ssh)
+    }
+
+    #[tokio::test]
+    async fn saved_passwords_stay_off_disk() {
+        let tmp = tempfile::tempdir().unwrap();
+        manager(tmp.path()).set_password("s1", Some("hunter2-db".into()), true).await.unwrap();
+        manager(tmp.path()).set_ssh_secret("s1", Some("hunter2-tunnel".into()), true).await.unwrap();
+        assert_eq!(files_containing(tmp.path(), "hunter2-db"), Vec::<PathBuf>::new());
+        assert_eq!(files_containing(tmp.path(), "hunter2-tunnel"), Vec::<PathBuf>::new());
+        let reopened = manager(tmp.path());
+        assert_eq!(reopened.secret(&DataSource::default(), "s1".into(), true).await.as_deref(), Some("hunter2-db"));
+        assert_eq!(
+            reopened.secret(&DataSource::default(), secrets::ssh_key("s1"), true).await.as_deref(),
+            Some("hunter2-tunnel")
+        );
+    }
+
+    #[tokio::test]
+    async fn moves_plaintext_passwords_of_older_versions_off_disk() {
+        let tmp = tempfile::tempdir().unwrap();
+        let project = tmp.path().join("project").to_string_lossy().into_owned();
+        let legacy = serde_json::json!({ project: { "s1": "old-db-pw" }, "/other": { "s2": "other-pw" } });
+        std::fs::create_dir_all(tmp.path().join("data")).unwrap();
+        std::fs::write(tmp.path().join("data/db-passwords.json"), legacy.to_string()).unwrap();
+        let m = manager(tmp.path());
+        assert_eq!(m.secret(&DataSource::default(), "s1".into(), true).await.as_deref(), Some("old-db-pw"));
+        assert_eq!(files_containing(tmp.path(), "old-db-pw"), Vec::<PathBuf>::new());
+        assert_eq!(files_containing(tmp.path(), "other-pw"), Vec::<PathBuf>::new());
+        let other = SecretStore::new(tmp.path().join("data/db-passwords.json"), Path::new("/other"));
+        assert_eq!(other.get("s2").as_deref(), Some("other-pw"));
+    }
+
+    #[tokio::test]
+    async fn global_data_sources_are_shared_by_projects_with_their_passwords() {
+        ide_ssh::secrets::testing::use_memory_store();
+        let tmp = tempfile::tempdir().unwrap();
+        let (app, one, two) = (tmp.path().join("app"), tmp.path().join("one"), tmp.path().join("two"));
+        let manager = |root: &std::path::Path| {
+            let ssh = Arc::new(SshManager::new(app.join("ssh-passwords.json")));
+            DbManager::new(root.to_path_buf(), app.join("passwords.json"), app.join("history.json"), ssh)
+                .with_global_sources(app.clone())
+        };
+        let (a, b) = (manager(&one), manager(&two));
+        let source = |id: &str, global: bool| DataSource {
+            id: id.into(),
+            name: id.into(),
+            driver: DbDriver::Postgres,
+            save_password: true,
+            global,
+            ..Default::default()
+        };
+        a.save_sources(vec![source("local", false), source("shared", false)]).await.unwrap();
+        a.set_password("shared", Some("pw".into()), true).await.unwrap();
+        // Made global: listed in the other project too, with its saved password.
+        a.save_sources(vec![source("local", false), source("shared", true)]).await.unwrap();
+        let ids = |m: &DbManager| m.sources().unwrap().into_iter().map(|s| (s.id, s.global)).collect::<Vec<_>>();
+        assert_eq!(ids(&a), [("local".into(), false), ("shared".into(), true)]);
+        assert_eq!(ids(&b), [("shared".into(), true)]);
+        assert_eq!(b.password(&b.source("shared").unwrap()).await.as_deref(), Some("pw"));
+        let project_file = std::fs::read_to_string(one.join(".openidea/data-sources.toml")).unwrap();
+        assert!(!project_file.contains("shared") && !project_file.contains("global"), "{project_file}");
+        assert!(!std::fs::read_to_string(app.join("data-sources.toml")).unwrap().contains("global"));
+        // Made project-level again: gone from the other project, the password stays with it.
+        a.save_sources(vec![source("local", false), source("shared", false)]).await.unwrap();
+        assert!(b.sources().unwrap().is_empty());
+        assert_eq!(a.password(&a.source("shared").unwrap()).await.as_deref(), Some("pw"));
+    }
+
+    #[tokio::test]
+    async fn clickhouse_rejects_manual_transactions_and_table_edits_without_connecting() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path().to_path_buf();
+        let ssh = Arc::new(SshManager::new(root.join("ssh-passwords.json")));
+        let db = DbManager::new(root.clone(), root.join("passwords.json"), root.join("history.json"), ssh);
+        db.save_sources(vec![DataSource {
+            id: "clickhouse".into(),
+            name: "clickhouse".into(),
+            driver: DbDriver::Clickhouse,
+            host: "127.0.0.1".into(),
+            port: Some(1),
+            ..Default::default()
+        }])
+        .await
+        .unwrap();
+        let error = db.set_manual_commit("clickhouse", true).await.unwrap_err();
+        assert!(error.message.contains("manual transactions are unsupported"));
+        assert!(db.sessions.lock().is_empty());
+        for commit in [false, true] {
+            let error = db.finish_transaction("clickhouse", commit).await.unwrap_err();
+            assert!(error.message.contains("manual transactions are unsupported"));
+        }
+        let error = db.apply_edits("clickhouse", "default", "events", &[]).await.unwrap_err();
+        assert!(error.message.contains("table editing is unsupported"));
+        assert!(!db.is_connected("clickhouse"));
+        db.set_manual_commit("clickhouse", false).await.unwrap();
+    }
+}
diff --git a/crates/ide-db/src/plan.rs b/crates/ide-db/src/plan.rs
index af378913..32b217b6 100644
--- a/crates/ide-db/src/plan.rs
+++ b/crates/ide-db/src/plan.rs
@@ -35,6 +35,7 @@ pub fn explain_statement(driver: DbDriver, statement: &str) -> String {
     match driver {
         DbDriver::Sqlite => format!("EXPLAIN QUERY PLAN {s}"),
         DbDriver::Postgres => format!("EXPLAIN (FORMAT JSON) {s}"),
+        DbDriver::Clickhouse => format!("EXPLAIN json = 1 {s}"),
         DbDriver::Mysql => format!("EXPLAIN {s}"),
         DbDriver::SqlServer => format!("SET SHOWPLAN_TEXT ON; {s}"),
     }
@@ -44,7 +45,7 @@ pub fn explain_statement(driver: DbDriver, statement: &str) -> String {
 pub fn parse(driver: DbDriver, result: &QueryResult) -> IdeResult<Vec<PlanNode>> {
     match driver {
         DbDriver::Sqlite => Ok(sqlite(&result.rows)),
-        DbDriver::Postgres => {
+        DbDriver::Postgres | DbDriver::Clickhouse => {
             let text: String =
                 result.rows.iter().filter_map(|r| r.first().cloned().flatten()).collect::<Vec<_>>().join("\n");
             let json: Value = serde_json::from_str(&text).map_err(|e| IdeError::invalid(format!("plan: {e}")))?;
@@ -199,6 +200,7 @@ 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::Clickhouse, " select 1;"), "EXPLAIN json = 1 select 1");
         assert_eq!(explain_statement(DbDriver::SqlServer, "select 1"), "SET SHOWPLAN_TEXT ON; select 1");
     }
 
@@ -254,6 +256,21 @@ mod tests {
         assert_eq!((plan[3].parent, plan[3].operation.as_str()), (Some(2), "Seq Scan"));
     }
 
+    #[test]
+    fn reads_clickhouse_json_plans_and_rejects_invalid_json() {
+        let json = r#"[{"Plan": {"Node Type": "Expression", "Node Id": "Expression_5",
+            "Description": "Project names", "Plans": [
+                {"Node Type": "ReadFromMergeTree", "Node Id": "ReadFromMergeTree_0",
+                 "Description": "default.events"}
+            ]}}]"#;
+        let plan = parse(DbDriver::Clickhouse, &result(&["explain"], vec![vec![Some(json)]])).unwrap();
+        assert_eq!(plan.len(), 2);
+        assert_eq!((plan[0].parent, plan[0].operation.as_str()), (None, "Expression"));
+        assert_eq!((plan[1].parent, plan[1].operation.as_str()), (Some(0), "ReadFromMergeTree"));
+        assert!(plan[1].properties.iter().any(|p| p.name == "Description" && p.value == "default.events"));
+        assert!(parse(DbDriver::Clickhouse, &result(&["explain"], vec![vec![Some("invalid")]])).is_err());
+    }
+
     #[test]
     fn reads_mysql_rows() {
         let r = result(
diff --git a/crates/ide-db/src/secrets.rs b/crates/ide-db/src/secrets.rs
index 8de033f8..9889232a 100644
--- a/crates/ide-db/src/secrets.rs
+++ b/crates/ide-db/src/secrets.rs
@@ -1,20 +1,15 @@
-//! Saved data source passwords, in the app's data directory rather than the OS
-//! credential store (no system prompts). One JSON file for all projects, keyed
-//! by project root, then credential key; owner-only on Unix.
+//! Saved data source passwords, in the OS credential store like the other saved
+//! passwords ([`SecretFile`]). One index file for all projects; each credential is
+//! keyed by project root, then credential key.
 
-use ide_core::{IdeError, IdeResult};
-use parking_lot::Mutex;
+use ide_core::IdeResult;
+use ide_ssh::secrets::SecretFile;
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
-/// Project root → credential key → secret.
-type Contents = BTreeMap<String, BTreeMap<String, String>>;
-
-/// Serialises read-modify-write across the projects sharing the file.
-static LOCK: Mutex<()> = Mutex::new(());
-
 pub struct SecretStore {
     path: PathBuf,
+    file: SecretFile,
     project: String,
 }
 
@@ -23,61 +18,41 @@ pub fn ssh_key(id: &str) -> String {
     format!("{id}#ssh")
 }
 
+fn file_key(project: &str, key: &str) -> String {
+    format!("{project}|{key}")
+}
+
+/// Older versions' file: project root → credential key → secret.
+fn legacy(value: serde_json::Value) -> Option<BTreeMap<String, String>> {
+    let all: BTreeMap<String, BTreeMap<String, String>> = serde_json::from_value(value).ok()?;
+    Some(
+        all.into_iter()
+            .flat_map(|(project, keys)| keys.into_iter().map(move |(k, s)| (file_key(&project, &k), s)))
+            .collect(),
+    )
+}
+
 impl SecretStore {
     pub fn new(path: PathBuf, root: &Path) -> Self {
-        Self { path, project: root.to_string_lossy().into_owned() }
+        let file = SecretFile::with_legacy(path.clone(), legacy);
+        Self { path, file, project: root.to_string_lossy().into_owned() }
+    }
+
+    /// The same file, keyed by `scope` instead (global data sources: the app data directory).
+    pub fn scoped(&self, scope: &Path) -> Self {
+        Self::new(self.path.clone(), scope)
     }
 
     pub fn get(&self, key: &str) -> Option<String> {
-        let _g = LOCK.lock();
-        self.read().remove(&self.project)?.remove(key)
+        self.file.get(&file_key(&self.project, key))
     }
 
     pub fn set(&self, key: &str, secret: &str) -> IdeResult<()> {
-        let _g = LOCK.lock();
-        let mut all = self.read();
-        all.entry(self.project.clone()).or_default().insert(key.to_owned(), secret.to_owned());
-        self.write(&all)
+        self.file.set(&file_key(&self.project, key), secret)
     }
 
     pub fn delete(&self, key: &str) {
-        let _g = LOCK.lock();
-        let mut all = self.read();
-        let Some(project) = all.get_mut(&self.project) else { return };
-        if project.remove(key).is_none() {
-            return;
-        }
-        if project.is_empty() {
-            all.remove(&self.project);
-        }
-        if let Err(e) = self.write(&all) {
-            tracing::warn!("saved passwords: {}", e.message);
-        }
-    }
-
-    fn read(&self) -> Contents {
-        match std::fs::read(&self.path) {
-            Ok(bytes) => serde_json::from_slice(&bytes).unwrap_or_else(|e| {
-                tracing::warn!("saved passwords: {}: {e}", self.path.display());
-                Contents::new()
-            }),
-            Err(_) => Contents::new(),
-        }
-    }
-
-    fn write(&self, all: &Contents) -> IdeResult<()> {
-        let err = |e: std::io::Error| IdeError::unavailable(format!("saved passwords: {e}"));
-        if let Some(dir) = self.path.parent() {
-            std::fs::create_dir_all(dir).map_err(err)?;
-        }
-        let tmp = self.path.with_extension("json.tmp");
-        let mut options = std::fs::OpenOptions::new();
-        options.write(true).create(true).truncate(true);
-        #[cfg(unix)]
-        std::os::unix::fs::OpenOptionsExt::mode(&mut options, 0o600);
-        let bytes = serde_json::to_vec_pretty(all).map_err(|e| IdeError::internal(e.to_string()))?;
-        std::io::Write::write_all(&mut options.open(&tmp).map_err(err)?, &bytes).map_err(err)?;
-        std::fs::rename(&tmp, &self.path).map_err(err)
+        self.file.delete(&file_key(&self.project, key))
     }
 }
 
@@ -87,6 +62,7 @@ mod tests {
 
     #[test]
     fn keeps_projects_apart_and_drops_empty_ones() {
+        ide_ssh::secrets::testing::use_memory_store();
         let tmp = tempfile::tempdir().unwrap();
         let file = tmp.path().join("db-passwords.json");
         let a = SecretStore::new(file.clone(), Path::new("/p/a"));
diff --git a/crates/ide-db/src/source.rs b/crates/ide-db/src/source.rs
index a3590ae6..1acb4ea4 100644
--- a/crates/ide-db/src/source.rs
+++ b/crates/ide-db/src/source.rs
@@ -1,6 +1,7 @@
-//! Data sources: per-project connection settings in `.openidea/data-sources.toml`.
-//! Passwords never go there: saved ones live in [`crate::secrets`], the others
-//! only in memory for the session.
+//! Data sources: per-project connection settings in `.openidea/data-sources.toml`, and
+//! global ones (IDEA's Make Global: listed in every project) in `data-sources.toml` of the
+//! app data directory. Passwords never go there: saved ones live in [`crate::secrets`],
+//! the others only in memory for the session.
 
 use ide_core::{IdeError, IdeResult, IpcPath, project_dir};
 use serde::{Deserialize, Serialize};
@@ -18,6 +19,7 @@ pub enum DbDriver {
     Mysql,
     /// Microsoft SQL Server.
     SqlServer,
+    Clickhouse,
 }
 
 impl DbDriver {
@@ -27,6 +29,7 @@ impl DbDriver {
             DbDriver::Postgres => Some(5432),
             DbDriver::Mysql => Some(3306),
             DbDriver::SqlServer => Some(1433),
+            DbDriver::Clickhouse => Some(8123),
         }
     }
 }
@@ -179,6 +182,9 @@ pub struct DataSource {
     pub options: DbOptions,
     pub introspection: DbIntrospection,
     pub properties: Vec<DbProperty>,
+    /// Stored app-wide and listed in every project. Implied by the file it is read from,
+    /// so not written to it.
+    pub global: bool,
 }
 
 impl Default for DataSource {
@@ -207,6 +213,7 @@ impl Default for DataSource {
             options: DbOptions::default(),
             introspection: DbIntrospection::default(),
             properties: Vec::new(),
+            global: false,
         }
     }
 }
@@ -253,6 +260,7 @@ pub fn scheme_driver(scheme: &str) -> Option<DbDriver> {
         "mysql" | "mariadb" | "tidb" | "singlestore" | "memsql" | "oceanbase" => Some(DbDriver::Mysql),
         "sqlserver" | "mssql" | "mssqlserver" => Some(DbDriver::SqlServer),
         "sqlite" | "sqlite3" => Some(DbDriver::Sqlite),
+        "clickhouse" | "http" | "https" => Some(DbDriver::Clickhouse),
         _ => None,
     }
 }
@@ -260,7 +268,7 @@ pub fn scheme_driver(scheme: &str) -> Option<DbDriver> {
 /// Parses `scheme://[user[:password]@]host[:port][/database][?k=v&…]`, `jdbc:` forms
 /// included, and `sqlite:path`.
 pub fn parse_url(raw: &str) -> IdeResult<ParsedUrl> {
-    let bad = || IdeError::invalid(format!("not a database URL: {raw}"));
+    let bad = || IdeError::invalid("invalid database URL");
     let url = raw.trim();
     let url = url.strip_prefix("jdbc:").or_else(|| url.strip_prefix("JDBC:")).unwrap_or(url);
     let (scheme, rest) = url.split_once(':').ok_or_else(bad)?;
@@ -367,6 +375,15 @@ impl DataSource {
         }
         properties.append(&mut s.properties);
         s.properties = properties;
+        if s.driver == DbDriver::Clickhouse {
+            let raw_url = self.url.trim().to_ascii_lowercase();
+            let url = raw_url.strip_prefix("jdbc:").unwrap_or(&raw_url);
+            if url.starts_with("https://") {
+                s.ssl = DbSslMode::VerifyFull;
+            } else if url.starts_with("http://") {
+                s.ssl = DbSslMode::Disable;
+            }
+        }
         Ok(s)
     }
 
@@ -385,9 +402,32 @@ struct SourcesFile {
     sources: Vec<DataSource>,
 }
 
+/// The project's data sources.
 pub fn load(root: &Path) -> IdeResult<Vec<DataSource>> {
-    let path = project_dir::path(root, FILE);
-    let text = match std::fs::read_to_string(&path) {
+    read(&project_dir::path(root, FILE))
+}
+
+/// Saves the project's data sources.
+pub fn save(root: &Path, sources: &[DataSource]) -> IdeResult<()> {
+    write(&project_dir::path(root, FILE), sources)
+}
+
+/// The global data sources stored in `dir` (the app data directory).
+pub fn load_global(dir: &Path) -> IdeResult<Vec<DataSource>> {
+    let mut sources = read(&dir.join(FILE))?;
+    for s in &mut sources {
+        s.global = true;
+    }
+    Ok(sources)
+}
+
+/// Saves the global data sources in `dir`.
+pub fn save_global(dir: &Path, sources: &[DataSource]) -> IdeResult<()> {
+    write(&dir.join(FILE), sources)
+}
+
+fn read(path: &Path) -> IdeResult<Vec<DataSource>> {
+    let text = match std::fs::read_to_string(path) {
         Ok(t) => t,
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(Vec::new()),
         Err(e) => return Err(e.into()),
@@ -396,19 +436,23 @@ pub fn load(root: &Path) -> IdeResult<Vec<DataSource>> {
     Ok(file.sources)
 }
 
-pub fn save(root: &Path, sources: &[DataSource]) -> IdeResult<()> {
+fn write(path: &Path, sources: &[DataSource]) -> IdeResult<()> {
     for s in sources {
         if s.id.is_empty() || s.name.trim().is_empty() {
             return Err(IdeError::invalid("every data source needs an id and a name"));
         }
     }
-    let path = project_dir::path(root, FILE);
     if let Some(dir) = path.parent() {
         std::fs::create_dir_all(dir)?;
     }
-    let text = toml::to_string_pretty(&SourcesFile { sources: sources.to_vec() })
-        .map_err(|e| IdeError::internal(e.to_string()))?;
-    std::fs::write(path, text)?;
+    let internal = |e: &dyn std::fmt::Display| IdeError::internal(e.to_string());
+    let mut value = toml::Value::try_from(SourcesFile { sources: sources.to_vec() }).map_err(|e| internal(&e))?;
+    if let Some(list) = value.get_mut("data-source").and_then(toml::Value::as_array_mut) {
+        for table in list.iter_mut().filter_map(toml::Value::as_table_mut) {
+            table.remove("global");
+        }
+    }
+    std::fs::write(path, toml::to_string_pretty(&value).map_err(|e| internal(&e))?)?;
     Ok(())
 }
 
@@ -519,4 +563,31 @@ mod tests {
         assert!(DataSource { url: "mysql://h/db".into(), ..s.clone() }.resolved().is_err());
         assert_eq!(DataSource { url_only: false, ..s }.resolved().unwrap().host, "localhost");
     }
+
+    #[test]
+    fn clickhouse_urls_resolve_http_https_and_credentials() {
+        assert_eq!(DbDriver::Clickhouse.default_port(), Some(8123));
+        let source = DataSource {
+            driver: DbDriver::Clickhouse,
+            url_only: true,
+            url: "https://reader:s%40cret@db.example:8443/analytics?max_execution_time=30".into(),
+            ..Default::default()
+        };
+        let resolved = source.resolved().unwrap();
+        assert_eq!(resolved.host, "db.example");
+        assert_eq!(resolved.port, Some(8443));
+        assert_eq!(resolved.database, "analytics");
+        assert_eq!(resolved.user, "reader");
+        assert_eq!(resolved.ssl, DbSslMode::VerifyFull);
+        assert_eq!(source.url_password().as_deref(), Some("s@cret"));
+        assert_eq!(resolved.properties[0].name, "max_execution_time");
+        let http = DataSource { url: "http://localhost/default".into(), ..source.clone() }.resolved().unwrap();
+        assert_eq!(http.ssl, DbSslMode::Disable);
+        let jdbc = DataSource { url: "jdbc:clickhouse://localhost/analytics".into(), ..source.clone() };
+        assert_eq!(jdbc.resolved().unwrap().database, "analytics");
+        let secure = DataSource { url: "https://db.example/default?sslmode=disable".into(), ..source };
+        assert_eq!(secure.resolved().unwrap().ssl, DbSslMode::VerifyFull);
+        let error = parse_url("clickhouse://reader:secret@db.example:invalid/default").unwrap_err();
+        assert!(!error.message.contains("secret"));
+    }
 }
diff --git a/crates/ide-db/src/split.rs b/crates/ide-db/src/split.rs
index e9cdbc84..b2ee3a10 100644
--- a/crates/ide-db/src/split.rs
+++ b/crates/ide-db/src/split.rs
@@ -28,6 +28,7 @@ enum State {
 /// Every statement of `text` that contains more than whitespace and comments.
 pub fn split(text: &str, driver: DbDriver) -> Vec<SqlStatement> {
     let mysql = driver == DbDriver::Mysql;
+    let clickhouse = driver == DbDriver::Clickhouse;
     let chars: Vec<(usize, char)> = text.char_indices().collect();
     // UTF-16 offset of each char index (plus the end).
     let mut u16_at = Vec::with_capacity(chars.len() + 1);
@@ -81,7 +82,7 @@ pub fn split(text: &str, driver: DbDriver) -> Vec<SqlStatement> {
                     state = State::Double;
                     has_code = true;
                 }
-                '`' if mysql => {
+                '`' if mysql || clickhouse => {
                     state = State::Backtick;
                     has_code = true;
                 }
@@ -117,7 +118,7 @@ pub fn split(text: &str, driver: DbDriver) -> Vec<SqlStatement> {
                 _ => {}
             },
             State::Single => {
-                if mysql && c == '\\' {
+                if (mysql || clickhouse) && c == '\\' {
                     i += 1;
                 } else if c == '\'' {
                     if next == Some('\'') {
@@ -128,7 +129,9 @@ pub fn split(text: &str, driver: DbDriver) -> Vec<SqlStatement> {
                 }
             }
             State::Double => {
-                if c == '"' {
+                if clickhouse && c == '\\' {
+                    i += 1;
+                } else if c == '"' {
                     if next == Some('"') {
                         i += 1;
                     } else {
@@ -137,7 +140,9 @@ pub fn split(text: &str, driver: DbDriver) -> Vec<SqlStatement> {
                 }
             }
             State::Backtick => {
-                if c == '`' {
+                if clickhouse && (c == '\\' || (c == '`' && next == Some('`'))) {
+                    i += 1;
+                } else if c == '`' {
                     state = State::Code;
                 }
             }
@@ -224,6 +229,12 @@ mod tests {
         assert_eq!(texts(sql, DbDriver::Mysql), vec!["select `a;b`, 'it\\'s;' from t # x;y", "select 2"]);
     }
 
+    #[test]
+    fn clickhouse_backticks_and_escaped_quotes_keep_statements_intact() {
+        let query = r#"SELECT `a\`;b`, "c\";d", 'it\'s;safe'; SELECT 2"#;
+        assert_eq!(texts(query, DbDriver::Clickhouse), vec![r#"SELECT `a\`;b`, "c\";d", 'it\'s;safe'"#, "SELECT 2"]);
+    }
+
     #[test]
     fn postgres_dollar_quotes() {
         let sql =
diff --git a/crates/ide-db/src/sql.rs b/crates/ide-db/src/sql.rs
index 79d6c1ec..bd281a85 100644
--- a/crates/ide-db/src/sql.rs
+++ b/crates/ide-db/src/sql.rs
@@ -7,6 +7,7 @@ use specta::Type;
 
 pub fn quote_ident(driver: DbDriver, name: &str) -> String {
     match driver {
+        DbDriver::Clickhouse => format!("`{}`", name.replace('\\', "\\\\").replace('`', "\\`")),
         DbDriver::Mysql => format!("`{}`", name.replace('`', "``")),
         DbDriver::SqlServer => format!("[{}]", name.replace(']', "]]")),
         _ => format!("\"{}\"", name.replace('"', "\"\"")),
@@ -15,7 +16,7 @@ pub fn quote_ident(driver: DbDriver, name: &str) -> String {
 
 pub fn quote_literal(driver: DbDriver, value: &str) -> String {
     let mut s = value.replace('\'', "''");
-    if driver == DbDriver::Mysql {
+    if matches!(driver, DbDriver::Mysql | DbDriver::Clickhouse) {
         s = s.replace('\\', "\\\\");
     }
     format!("'{s}'")
@@ -48,6 +49,10 @@ pub const INTERNAL_DATABASES: &[&str] = &["rdsadmin", "azure_maintenance", "azur
 pub fn schemas(driver: DbDriver, system: bool) -> &'static str {
     match driver {
         DbDriver::Sqlite => "SELECT name FROM pragma_database_list WHERE name <> 'temp' ORDER BY seq",
+        DbDriver::Clickhouse if system => "SELECT name FROM system.databases ORDER BY name",
+        DbDriver::Clickhouse => {
+            "SELECT name FROM system.databases WHERE lower(name) NOT IN ('system', 'information_schema') ORDER BY name"
+        }
         DbDriver::Postgres if system => {
             "SELECT schema_name FROM information_schema.schemata \
              WHERE schema_name NOT LIKE 'pg\\_toast%' AND schema_name NOT LIKE 'pg\\_temp%' ORDER BY 1"
@@ -73,6 +78,12 @@ pub fn schemas(driver: DbDriver, system: bool) -> &'static str {
 /// Rows: `name, kind` where kind is `table`, `view` or `materialized view`.
 pub fn tables(driver: DbDriver, schema: &str) -> String {
     match driver {
+        DbDriver::Clickhouse => format!(
+            "SELECT name, CASE engine WHEN 'View' THEN 'view' WHEN 'MaterializedView' THEN 'materialized view' \
+             WHEN 'WindowView' THEN 'view' ELSE 'table' END FROM system.tables \
+             WHERE database = {} AND is_temporary = 0 ORDER BY name",
+            quote_literal(driver, schema)
+        ),
         DbDriver::Sqlite => format!(
             "SELECT name, type FROM {}.sqlite_master WHERE type IN ('table', 'view') \
              AND name NOT LIKE 'sqlite\\_%' ESCAPE '\\' ORDER BY name",
@@ -101,6 +112,12 @@ pub fn tables(driver: DbDriver, schema: &str) -> String {
 pub fn columns(driver: DbDriver, schema: &str, table: &str) -> String {
     let (s, t) = (quote_literal(driver, schema), quote_literal(driver, table));
     match driver {
+        DbDriver::Clickhouse => format!(
+            "SELECT name, type, CASE WHEN startsWith(type, 'Nullable(') \
+             OR startsWith(type, 'LowCardinality(Nullable(') THEN 'YES' ELSE 'NO' END, \
+             if(default_kind = '', NULL, default_expression), is_in_primary_key \
+             FROM system.columns WHERE database = {s} AND table = {t} ORDER BY position"
+        ),
         DbDriver::Sqlite => format!(
             "SELECT name, type, CASE WHEN \"notnull\" = 0 THEN 'YES' ELSE 'NO' END, dflt_value, \
              CASE WHEN pk > 0 THEN 1 ELSE 0 END FROM pragma_table_info({t}, {s}) ORDER BY cid"
@@ -138,6 +155,12 @@ pub fn columns(driver: DbDriver, schema: &str, table: &str) -> String {
 pub fn indexes(driver: DbDriver, schema: &str, table: &str) -> String {
     let (s, t) = (quote_literal(driver, schema), quote_literal(driver, table));
     match driver {
+        DbDriver::Clickhouse => format!(
+            "SELECT * FROM (SELECT 'PRIMARY KEY' AS index_name, 0 AS is_unique, primary_key AS expression \
+             FROM system.tables WHERE database = {s} AND name = {t} AND primary_key != '' \
+             UNION ALL SELECT name, 0, expr FROM system.data_skipping_indices \
+             WHERE database = {s} AND table = {t}) ORDER BY index_name"
+        ),
         DbDriver::Sqlite => format!(
             "SELECT il.name, il.\"unique\", ii.name FROM pragma_index_list({t}, {s}) il \
              JOIN pragma_index_info(il.name, {s}) ii ORDER BY il.name, ii.seqno"
@@ -169,6 +192,15 @@ pub fn indexes(driver: DbDriver, schema: &str, table: &str) -> String {
 /// for SQL completion, grouped by table in column order.
 pub fn completion_columns(driver: DbDriver) -> &'static str {
     match driver {
+        DbDriver::Clickhouse => {
+            "SELECT c.database, c.table, CASE t.engine WHEN 'View' THEN 'view' \
+             WHEN 'MaterializedView' THEN 'materialized view' WHEN 'WindowView' THEN 'view' ELSE 'table' END, \
+             c.name, c.type, CASE WHEN startsWith(c.type, 'Nullable(') \
+             OR startsWith(c.type, 'LowCardinality(Nullable(') THEN 'YES' ELSE 'NO' END, c.is_in_primary_key, 1 \
+             FROM system.columns c JOIN system.tables t ON t.database = c.database AND t.name = c.table \
+             WHERE lower(c.database) NOT IN ('system', 'information_schema') AND t.is_temporary = 0 \
+             ORDER BY c.database, c.table, c.position LIMIT 50000"
+        }
         DbDriver::Sqlite => {
             "SELECT 'main', m.name, m.type, p.name, p.type, CASE WHEN p.\"notnull\" = 0 THEN 'YES' ELSE 'NO' END, \
              CASE WHEN p.pk > 0 THEN 1 ELSE 0 END, \
@@ -221,6 +253,7 @@ pub fn completion_columns(driver: DbDriver) -> &'static str {
 /// when the key references the primary key implicitly.
 pub fn foreign_keys(driver: DbDriver) -> &'static str {
     match driver {
+        DbDriver::Clickhouse => "SELECT '', '', '', '', '', '', '' WHERE 0",
         DbDriver::Sqlite => {
             "SELECT 'main', m.name, f.id, f.\"from\", 'main', f.\"table\", f.\"to\" \
              FROM sqlite_master m JOIN pragma_foreign_key_list(m.name) f \
@@ -258,6 +291,7 @@ pub fn foreign_keys(driver: DbDriver) -> &'static str {
 pub fn table_foreign_keys(driver: DbDriver, schema: &str, table: &str) -> String {
     let (s, t) = (quote_literal(driver, schema), quote_literal(driver, table));
     match driver {
+        DbDriver::Clickhouse => foreign_keys(driver).to_owned(),
         DbDriver::Sqlite => format!(
             "SELECT {s}, {t}, f.id, f.\"from\", {s}, f.\"table\", f.\"to\"              FROM pragma_foreign_key_list({t}, {s}) f ORDER BY f.id, f.seq"
         ),
@@ -276,6 +310,7 @@ pub fn table_foreign_keys(driver: DbDriver, schema: &str, table: &str) -> String
 /// The schema unqualified names resolve to (`None`: always `main`).
 pub fn current_schema(driver: DbDriver) -> Option<&'static str> {
     match driver {
+        DbDriver::Clickhouse => Some("SELECT currentDatabase()"),
         DbDriver::Sqlite => None,
         DbDriver::Postgres => Some("SELECT current_schema()"),
         DbDriver::Mysql => Some("SELECT DATABASE()"),
@@ -362,6 +397,9 @@ fn where_key(driver: DbDriver, key: &[CellValue]) -> String {
 /// The DML statement for `edit`. Values are written as quoted literals, which
 /// every supported database coerces to the column type.
 pub fn edit_statement(driver: DbDriver, schema: &str, table: &str, edit: &DbRowEdit) -> Result<String, String> {
+    if driver == DbDriver::Clickhouse {
+        return Err("ClickHouse table editing is unsupported: primary keys do not uniquely identify rows and edits require transactions".into());
+    }
     let target = qualified(driver, schema, table);
     match edit {
         DbRowEdit::Update { key, values } => {
@@ -450,6 +488,7 @@ pub fn postgres_ddl_indexes(oid: u32) -> String {
 pub fn triggers(driver: DbDriver, schema: &str, table: &str) -> String {
     let (s, t) = (quote_literal(driver, schema), quote_literal(driver, table));
     match driver {
+        DbDriver::Clickhouse => "SELECT '', '', '' WHERE 0".to_owned(),
         DbDriver::Sqlite => format!(
             "SELECT name, sql FROM {}.sqlite_master WHERE type = 'trigger' AND tbl_name = {t} ORDER BY name",
             quote_ident(driver, schema)
@@ -492,7 +531,7 @@ pub fn sqlite_trigger_event(sql: &str) -> (String, String) {
 pub fn routines(driver: DbDriver, schema: &str) -> Option<String> {
     let s = quote_literal(driver, schema);
     match driver {
-        DbDriver::Sqlite => None,
+        DbDriver::Sqlite | DbDriver::Clickhouse => None,
         // Functions of extensions are left out, as in IDEA.
         DbDriver::Postgres => Some(format!(
             "SELECT p.proname, CASE WHEN p.prokind = 'p' THEN 'procedure' ELSE 'function' END, \
@@ -625,6 +664,71 @@ mod tests {
         assert_eq!(quote_literal(DbDriver::Mysql, "it's \\"), "'it''s \\\\'");
     }
 
+    #[test]
+    fn clickhouse_escapes_backslashes_and_delimiters() {
+        let driver = DbDriver::Clickhouse;
+        assert_eq!(quote_literal(driver, r"path\O'Brien"), r"'path\\O''Brien'");
+        assert_eq!(quote_literal(driver, r"\' OR 1 = 1 --"), r"'\\'' OR 1 = 1 --'");
+        assert_eq!(quote_ident(driver, r"a\`b"), r"`a\\\`b`");
+        assert_eq!(qualified(driver, "data base", "event`log"), r"`data base`.`event\`log`");
+    }
+
+    #[test]
+    fn clickhouse_metadata_preserves_types_defaults_and_nonunique_keys() {
+        let driver = DbDriver::Clickhouse;
+        assert_eq!(schemas(driver, true), "SELECT name FROM system.databases ORDER BY name");
+        assert!(schemas(driver, false).contains("lower(name) NOT IN ('system', 'information_schema')"));
+        assert_eq!(current_schema(driver), Some("SELECT currentDatabase()"));
+        let relations = tables(driver, "event's\\db");
+        assert!(relations.contains("WHEN 'MaterializedView' THEN 'materialized view'"));
+        assert!(relations.contains(r"WHERE database = 'event''s\\db' AND is_temporary = 0"));
+        let fields = columns(driver, "default", "events");
+        assert!(fields.starts_with("SELECT name, type, CASE WHEN startsWith(type, 'Nullable(')"));
+        assert!(fields.contains("startsWith(type, 'LowCardinality(Nullable(')"));
+        assert!(fields.contains("if(default_kind = '', NULL, default_expression), is_in_primary_key"));
+        assert!(fields.ends_with("WHERE database = 'default' AND table = 'events' ORDER BY position"));
+        let keys = indexes(driver, "default", "events");
+        assert!(keys.contains("'PRIMARY KEY' AS index_name, 0 AS is_unique, primary_key AS expression"));
+        assert!(keys.contains("SELECT name, 0, expr FROM system.data_skipping_indices"));
+        let completion = completion_columns(driver);
+        assert!(completion.contains("c.is_in_primary_key, 1"));
+        assert!(completion.contains("ORDER BY c.database, c.table, c.position LIMIT 50000"));
+    }
+
+    #[test]
+    fn clickhouse_has_no_foreign_key_trigger_or_schema_routine_catalogs() {
+        let driver = DbDriver::Clickhouse;
+        assert_eq!(foreign_keys(driver), "SELECT '', '', '', '', '', '', '' WHERE 0");
+        assert_eq!(table_foreign_keys(driver, "default", "events"), foreign_keys(driver));
+        assert_eq!(triggers(driver, "default", "events"), "SELECT '', '', '' WHERE 0");
+        assert!(routines(driver, "default").is_none());
+        assert!(sequences(driver, "default").is_none());
+        assert!(object_ddl(driver, "default", crate::DbObjectKind::Trigger, "t").is_none());
+    }
+
+    #[test]
+    fn clickhouse_pages_quote_keys_and_fetch_one_extra_row() {
+        let sort = [SortKey { column: "event`id".into(), descending: true }];
+        assert_eq!(
+            table_page(DbDriver::Clickhouse, "default", "events", Some("WHERE id > 3"), &sort, 50, 25),
+            r"SELECT * FROM `default`.`events` WHERE id > 3 ORDER BY `event\`id` DESC LIMIT 26 OFFSET 50"
+        );
+    }
+
+    #[test]
+    fn clickhouse_keys_never_enable_transactional_table_edits() {
+        let key = vec![cv("id", Some("1"))];
+        for edit in [
+            DbRowEdit::Update { key: key.clone(), values: vec![cv("name", Some("new"))] },
+            DbRowEdit::Delete { key },
+            DbRowEdit::Insert { values: vec![cv("name", Some("new"))] },
+            DbRowEdit::Insert { values: vec![] },
+        ] {
+            let error = edit_statement(DbDriver::Clickhouse, "default", "events", &edit).unwrap_err();
+            assert!(error.contains("primary keys do not uniquely identify rows"));
+        }
+    }
+
     #[test]
     fn pages() {
         let sort = [SortKey { column: "id".into(), descending: true }];
diff --git a/crates/ide-db/tests/clickhouse.rs b/crates/ide-db/tests/clickhouse.rs
new file mode 100644
index 00000000..d19a9ff1
--- /dev/null
+++ b/crates/ide-db/tests/clickhouse.rs
@@ -0,0 +1,136 @@
+use ide_core::{CancellationToken, IdeError, IdeResult};
+use ide_db::{CellValue, DataSource, DbDriver, DbManager, DbRowEdit, DbSslMode, SortKey, sql};
+use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+fn check(condition: bool, message: &str) -> IdeResult<()> {
+    if condition { Ok(()) } else { Err(IdeError::invalid(message)) }
+}
+
+#[tokio::test]
+#[ignore = "requires CLICKHOUSE_TEST_HOST, CLICKHOUSE_TEST_USER, and CLICKHOUSE_TEST_PASSWORD"]
+async fn clickhouse_cloud_manager_catalogs_and_session_table() -> IdeResult<()> {
+    let tmp = tempfile::tempdir()?;
+    let root = tmp.path().to_path_buf();
+    let ssh = Arc::new(ide_ssh::SshManager::new(root.join("ssh-passwords.json")));
+    let db = DbManager::new(root.clone(), root.join("passwords.json"), root.join("history.json"), ssh);
+    let mut source = DataSource {
+        id: "clickhouse".into(),
+        name: "clickhouse".into(),
+        driver: DbDriver::Clickhouse,
+        host: std::env::var("CLICKHOUSE_TEST_HOST").expect("set CLICKHOUSE_TEST_HOST"),
+        port: Some(
+            std::env::var("CLICKHOUSE_TEST_PORT")
+                .map(|value| value.parse().expect("numeric CLICKHOUSE_TEST_PORT"))
+                .unwrap_or(8443),
+        ),
+        user: std::env::var("CLICKHOUSE_TEST_USER").expect("set CLICKHOUSE_TEST_USER"),
+        database: "default".into(),
+        ssl: DbSslMode::VerifyFull,
+        ..Default::default()
+    };
+    source.introspection.show_system = true;
+    let password = std::env::var("CLICKHOUSE_TEST_PASSWORD").expect("set CLICKHOUSE_TEST_PASSWORD");
+    check(!db.test(&source, Some(password.clone()), None).await?.is_empty(), "missing server version")?;
+    db.save_sources(vec![source]).await?;
+    db.set_password("clickhouse", Some(password), false).await?;
+    let cancel = CancellationToken::new();
+    let suffix = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos();
+    let name = format!("manager_test_{}_{suffix}", std::process::id());
+    let table = sql::quote_ident(DbDriver::Clickhouse, &name);
+    db.execute(
+        "clickhouse",
+        &format!(
+            "CREATE TEMPORARY TABLE {table} (id UInt64, label Nullable(String) DEFAULT NULL, \
+             category LowCardinality(Nullable(String)) DEFAULT NULL, items Array(Nullable(UInt8)), \
+             label_size UInt64 ALIAS length(ifNull(label, ''))) ENGINE = Memory"
+        ),
+        0,
+        &cancel,
+    )
+    .await?;
+    let checked: IdeResult<()> = async {
+        db.execute(
+            "clickhouse",
+            &format!("INSERT INTO {table} (id, label, items) VALUES (1, 'first', [1, NULL]), (1, NULL, [])"),
+            0,
+            &cancel,
+        )
+        .await?;
+        let schemas = db.schemas("clickhouse").await?;
+        check(schemas.iter().any(|schema| schema == "default"), "default database missing")?;
+        check(schemas.iter().any(|schema| schema == "system"), "system database missing")?;
+        let tables = db.tables("clickhouse", "system").await?;
+        check(tables.iter().any(|table| table.name == "one"), "system table listing missing one")?;
+        let details = db.table_details("clickhouse", "", &name).await?;
+        check(details.columns.len() == 5, "temporary table columns missing")?;
+        for (name, data_type, nullable) in [
+            ("id", "UInt64", false),
+            ("label", "Nullable(String)", true),
+            ("category", "LowCardinality(Nullable(String))", true),
+            ("items", "Array(Nullable(UInt8))", false),
+        ] {
+            check(
+                details
+                    .columns
+                    .iter()
+                    .any(|column| column.name == name && column.data_type == data_type && column.nullable == nullable),
+                "column type or nullability mismatch",
+            )?;
+        }
+        check(
+            details.columns.iter().any(|column| column.name == "label" && column.default.as_deref() == Some("NULL")),
+            "explicit default expression missing",
+        )?;
+        check(details.indexes.iter().all(|index| !index.unique), "ClickHouse index reported unique")?;
+        check(details.foreign_keys.is_empty() && details.triggers.is_empty(), "unsupported table objects returned")?;
+        let sort = [SortKey { column: "id".into(), descending: false }];
+        let first = db.table_page("clickhouse", "", &name, None, &sort, 0, 1, &cancel).await?;
+        check(first.result.rows.len() == 1 && first.result.has_more, "first page limit failed")?;
+        let second = db.table_page("clickhouse", "", &name, None, &sort, 1, 1, &cancel).await?;
+        check(second.result.rows.len() == 1 && !second.result.has_more, "page offset failed")?;
+        let ddl = db.ddl("clickhouse", "", &name).await?;
+        check(ddl.contains(&name) && ddl.contains("Memory"), "temporary table DDL missing")?;
+        let completion = db.completion("clickhouse").await?;
+        check(completion.default_schema == "default", "completion default database mismatch")?;
+        check(completion.foreign_keys.is_empty(), "completion returned unsupported foreign keys")?;
+        if let Some(table) = completion.tables.first() {
+            let details = db.table_details("clickhouse", &table.schema, &table.name).await?;
+            check(
+                table.columns.iter().all(|column| {
+                    details.columns.iter().any(|field| field.name == column.name && field.data_type == column.data_type)
+                }),
+                "completion columns differ from catalog",
+            )?;
+        }
+        let plan = db.explain("clickhouse", &format!("SELECT id FROM {table}"), &cancel).await?;
+        check(!plan.is_empty(), "query plan missing")?;
+        let value = r"path\O'Brien";
+        let result = db
+            .execute("clickhouse", &format!("SELECT {}", sql::quote_literal(DbDriver::Clickhouse, value)), 1, &cancel)
+            .await?;
+        check(result.rows == vec![vec![Some(value.to_owned())]], "quoted literal changed value")?;
+        let edits = [DbRowEdit::Update {
+            key: vec![CellValue { column: "id".into(), value: Some("1".into()) }],
+            values: vec![CellValue { column: "label".into(), value: Some("changed".into()) }],
+        }];
+        check(
+            db.apply_edits("clickhouse", "", &name, &edits)
+                .await
+                .err()
+                .is_some_and(|error| error.message.contains("table editing is unsupported")),
+            "supplied row key authorized table editing",
+        )?;
+        check(db.set_manual_commit("clickhouse", true).await.is_err(), "manual transactions were accepted")?;
+        for commit in [false, true] {
+            check(db.finish_transaction("clickhouse", commit).await.is_err(), "transaction control was accepted")?;
+        }
+        Ok(())
+    }
+    .await;
+    let cleanup = db.execute("clickhouse", &format!("DROP TEMPORARY TABLE {table}"), 0, &cancel).await;
+    db.disconnect("clickhouse").await;
+    checked?;
+    cleanup?;
+    Ok(())
+}
diff --git a/crates/ide-db/tests/sqlite.rs b/crates/ide-db/tests/sqlite.rs
index f340ee53..b800cd15 100644
--- a/crates/ide-db/tests/sqlite.rs
+++ b/crates/ide-db/tests/sqlite.rs
@@ -197,7 +197,7 @@ async fn count(db: &DbManager) -> String {
 async fn manual_commit_keeps_a_transaction_until_commit_or_rollback() -> IdeResult<()> {
     let (_tmp, db) = setup().await;
     let c = CancellationToken::new();
-    db.set_manual_commit("s1", true).await;
+    db.set_manual_commit("s1", true).await.unwrap();
     db.execute("s1", "INSERT INTO users (name) VALUES ('dee')", 1, &c).await?;
     // The session sees its own change.
     assert_eq!(count(&db).await, "4");
@@ -208,10 +208,10 @@ async fn manual_commit_keeps_a_transaction_until_commit_or_rollback() -> IdeResu
     db.finish_transaction("s1", true).await?;
     // Leaving manual mode rolls back what is still open.
     db.execute("s1", "DELETE FROM users", 1, &c).await?;
-    db.set_manual_commit("s1", false).await;
+    db.set_manual_commit("s1", false).await.unwrap();
     assert_eq!(count(&db).await, "4");
     // Disconnecting with an open transaction does not hang.
-    db.set_manual_commit("s1", true).await;
+    db.set_manual_commit("s1", true).await.unwrap();
     db.execute("s1", "DELETE FROM users", 1, &c).await?;
     db.disconnect("s1").await;
     assert_eq!(count(&db).await, "4");
diff --git a/crates/ide-extension/src/ledger.rs b/crates/ide-extension/src/ledger.rs
index 9bed117b..19128165 100644
--- a/crates/ide-extension/src/ledger.rs
+++ b/crates/ide-extension/src/ledger.rs
@@ -364,7 +364,7 @@ pub fn package_hash(dir: &Path, files: &[PathBuf]) -> std::io::Result<String> {
     sorted.dedup();
     let mut hasher = blake3::Hasher::new();
     for rel in sorted {
-        hasher.update(rel.to_string_lossy().as_bytes());
+        hasher.update(hashed_path(rel).as_bytes());
         hasher.update(&[0]);
         hasher.update_reader(std::fs::File::open(dir.join(rel))?)?;
         hasher.update(&[0]);
@@ -372,6 +372,12 @@ pub fn package_hash(dir: &Path, files: &[PathBuf]) -> std::io::Result<String> {
     Ok(hasher.finalize().to_hex().to_string())
 }
 
+/// A package-relative path as hashed: `/`-separated on every OS, so a package has one digest
+/// (a walked `web\index.html` on Windows is `web/index.html` everywhere else).
+fn hashed_path(rel: &Path) -> String {
+    rel.components().map(|c| c.as_os_str().to_string_lossy()).collect::<Vec<_>>().join("/")
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -480,4 +486,20 @@ mod tests {
         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]);
     }
+
+    #[test]
+    fn hashes_paths_with_forward_slashes_on_every_os() {
+        assert_eq!(hashed_path(Path::new("web/index.html")), "web/index.html");
+        assert_eq!(hashed_path(Path::new("plugin.wasm")), "plugin.wasm");
+        #[cfg(windows)]
+        assert_eq!(hashed_path(Path::new(r"web\index.html")), "web/index.html");
+        let tmp = tempfile::tempdir().unwrap();
+        std::fs::create_dir(tmp.path().join("web")).unwrap();
+        std::fs::write(tmp.path().join("web").join("index.html"), "<p>").unwrap();
+        // A walked path (native separators) hashes like the manifest's `/` spelling.
+        assert_eq!(
+            package_hash(tmp.path(), &[Path::new("web").join("index.html")]).unwrap(),
+            package_hash(tmp.path(), &["web/index.html".into()]).unwrap()
+        );
+    }
 }
diff --git a/crates/ide-extension/src/lib.rs b/crates/ide-extension/src/lib.rs
index 9089067a..fdf63d95 100644
--- a/crates/ide-extension/src/lib.rs
+++ b/crates/ide-extension/src/lib.rs
@@ -27,8 +27,8 @@ 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,
+    ActivationEvent, CATEGORIES, Capabilities, ENGINE_VERSION, EVENT_KINDS, LEGACY_API, MANIFEST_FILE, MAX_CATEGORIES,
+    Manifest, check_relative, engine_compatible, validate_item_id, validate_plugin_id, validate_point_id,
 };
 pub use point::{Commit, Disposable, ExtensionPoint, MAX_PACKAGE_FILE, Package, Placement, Prepared, decode};
 pub use registry::{ContributionInfo, ExtensionRegistry, PreparedSet};
diff --git a/crates/ide-extension/src/manifest.rs b/crates/ide-extension/src/manifest.rs
index 99820d5f..d079cff2 100644
--- a/crates/ide-extension/src/manifest.rs
+++ b/crates/ide-extension/src/manifest.rs
@@ -35,6 +35,11 @@ pub const MANIFEST_FILE: &str = "plugin.toml";
 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";
+/// Marketplace categories, in the order they are shown.
+pub const CATEGORIES: &[&str] =
+    &["languages", "themes", "icon-themes", "linters", "vcs", "ai", "frameworks", "tools", "other"];
+/// Categories a plugin is listed under; later ones are ignored.
+pub const MAX_CATEGORIES: usize = 3;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct Manifest {
@@ -47,6 +52,8 @@ pub struct Manifest {
     pub license: Option<String>,
     /// Release notes of this version (Settings › Plugins › What's New).
     pub change_notes: Option<String>,
+    /// Marketplace categories as declared (see [`Manifest::categories`]).
+    pub declared_categories: Vec<String>,
     /// `engines.openidea` (a semver requirement), or the legacy `openidea-api`.
     pub engine: String,
     /// Written in the 0.1 format.
@@ -166,6 +173,8 @@ struct Raw {
     #[serde(default)]
     change_notes: Option<String>,
     #[serde(default)]
+    categories: Vec<String>,
+    #[serde(default)]
     engines: Option<Engines>,
     /// 0.1 format.
     #[serde(default)]
@@ -243,6 +252,7 @@ impl Manifest {
             homepage: raw.homepage,
             license: raw.license,
             change_notes: raw.change_notes,
+            declared_categories: raw.categories,
             engine,
             legacy,
             wasm: raw.wasm,
@@ -290,6 +300,9 @@ impl Manifest {
                 return Err(format!("duplicate activation event {event}"));
             }
         }
+        for c in &self.declared_categories {
+            validate_item_id(c, "category")?;
+        }
         for (point, decls) in &self.contributes {
             validate_point_id(point)?;
             if !matches!(decls, toml::Value::Array(_) | toml::Value::Table(_)) {
@@ -325,6 +338,39 @@ impl Manifest {
     }
 }
 
+impl Manifest {
+    /// Its marketplace categories, in [`CATEGORIES`] order: the first
+    /// [`MAX_CATEGORIES`] declared that this IDE knows; without any, those its
+    /// contributions imply (themes, icon themes, languages), else `other`.
+    pub fn categories(&self) -> Vec<String> {
+        let pick = |f: &dyn Fn(&str) -> bool| CATEGORIES.iter().filter(|c| f(c)).map(|c| c.to_string()).collect();
+        let mut known: Vec<&str> = Vec::new();
+        for d in &self.declared_categories {
+            if CATEGORIES.contains(&d.as_str()) && !known.contains(&d.as_str()) && known.len() < MAX_CATEGORIES {
+                known.push(d);
+            }
+        }
+        let mut out: Vec<String> = pick(&|c| known.contains(&c));
+        if out.is_empty() {
+            out = pick(&|c| match c {
+                "themes" => self.contributes.contains_key("themes"),
+                "icon-themes" => self.contributes.contains_key("iconThemes"),
+                "languages" => self.contributes.contains_key("languages"),
+                _ => false,
+            });
+        }
+        if out.is_empty() {
+            out.push("other".into());
+        }
+        out
+    }
+
+    /// Declared categories this IDE doesn't know (ignored).
+    pub fn unknown_categories(&self) -> Vec<&str> {
+        self.declared_categories.iter().map(String::as_str).filter(|c| !CATEGORIES.contains(c)).collect()
+    }
+}
+
 /// Whether this host can load a plugin written for `engine`.
 pub fn engine_compatible(engine: &str, legacy: bool) -> bool {
     if legacy {
@@ -417,6 +463,26 @@ mod tests {
         assert!(ActivationEvent::parse("on-event:scheduled").is_err(), "declared with on-schedule");
     }
 
+    #[test]
+    fn categories_are_declared_or_implied() {
+        let head = "id = \"acme.x\"\nname = \"X\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"\n";
+        let m = |rest: &str| Manifest::parse(&format!("{head}{rest}"));
+        // Declared, in the catalogue's order; unknown ones (a newer IDE's) are ignored.
+        let declared = m("categories = [\"tools\", \"vcs\", \"robots\"]\n").unwrap();
+        assert_eq!(declared.categories(), ["vcs", "tools"]);
+        assert_eq!(declared.unknown_categories(), ["robots"]);
+        // None declared: implied by the contributions, else `other`.
+        let theme = m("[[contributes.themes]]\nid = \"t\"\n[[contributes.languages]]\nid = \"l\"\n").unwrap();
+        assert_eq!(theme.categories(), ["languages", "themes"]);
+        let declared_wins = m("categories = [\"tools\"]\n[[contributes.languages]]\nid = \"l\"\n").unwrap();
+        assert_eq!(declared_wins.categories(), ["tools"]);
+        assert_eq!(m("").unwrap().categories(), ["other"]);
+        // At most three: the first ones declared.
+        let many = m("categories = [\"vcs\", \"ai\", \"vcs\", \"tools\", \"themes\"]\n").unwrap();
+        assert_eq!(many.categories(), ["vcs", "ai", "tools"]);
+        assert!(m("categories = [\"Bad Name\"]\n").is_err());
+    }
+
     #[test]
     fn parses_the_02_format() {
         let m = Manifest::parse(FULL).unwrap();
diff --git a/crates/ide-extension/src/package.rs b/crates/ide-extension/src/package.rs
index b8d3988d..f1bc9c04 100644
--- a/crates/ide-extension/src/package.rs
+++ b/crates/ide-extension/src/package.rs
@@ -9,9 +9,19 @@
 //!   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.
+//!   the published plugin versions, 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. A plugin may be
+//!   listed in several versions, each with the plugin API it needs: the IDE
+//!   offers the newest one it can load.
+//! - **Key continuity**: an installed plugin updates silently only to a
+//!   package signed with the same key, or with a key the installed one
+//!   endorsed ([`Endorsement`], a publisher rotating keys); any other signer
+//!   is the user's call. An IDE can pin a publisher to keys it was built with
+//!   ([`Index::pin_publisher`]): the index then can't replace them.
+//! - **Format**: fields are only ever added (IDEs ignore those they don't
+//!   know); `format` grows only for changes older IDEs can't read, and they
+//!   still apply such an index's revocations ([`Index::parse`]).
 
 use crate::MANIFEST_FILE;
 use base64::Engine as _;
@@ -40,6 +50,24 @@ fn signed_message(id: &str, version: &str, digest: &str) -> Vec<u8> {
     format!("openidea-plugin/1\n{id}\n{version}\n{digest}").into_bytes()
 }
 
+fn endorsement_message(publisher: &str, key: &str) -> Vec<u8> {
+    format!("openidea-key/1\n{publisher}\n{key}").into_bytes()
+}
+
+/// Whether `signature` (base64) is `key`'s (base64) Ed25519 signature of
+/// `message`; malformed keys and signatures are errors.
+fn verify_ed25519(key: &str, message: &[u8], signature: &str) -> Result<bool, String> {
+    let key: [u8; 32] = B64
+        .decode(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(signature).ok().and_then(|b| b.try_into().ok()).ok_or_else(|| "signature: malformed".to_owned())?;
+    Ok(key.verify_strict(message, &Signature::from_bytes(&sig)).is_ok())
+}
+
 /// `SIGNATURE.json` of a signed package.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -74,6 +102,12 @@ impl PublisherKey {
         B64.encode(self.0.verifying_key().to_bytes())
     }
 
+    /// Vouches for `publisher`'s new key `key` (base64), the one that follows this one.
+    pub fn endorse(&self, publisher: &str, key: &str) -> Endorsement {
+        let sig = self.0.sign(&endorsement_message(publisher, key));
+        Endorsement { key: self.public_base64(), signature: B64.encode(sig.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 {
@@ -88,19 +122,11 @@ 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())
+        if verify_ed25519(&self.key, &signed_message(id, version, digest), &self.signature)? {
+            Ok(())
+        } else {
+            Err("the signature does not match the package (it was changed after signing)".to_owned())
+        }
     }
 }
 
@@ -242,6 +268,10 @@ pub struct Index {
     pub plugins: Vec<IndexEntry>,
     #[serde(default)]
     pub revoked: Vec<Revocation>,
+    /// The marketplace moved: its index is at this URL (relative to this
+    /// one, or absolute), and the IDE reads that one instead.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub moved: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
@@ -253,7 +283,7 @@ pub struct Publisher {
     pub keys: Vec<KeyEntry>,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
 #[serde(rename_all = "camelCase")]
 pub struct KeyEntry {
     /// Ed25519 public key, base64.
@@ -261,6 +291,27 @@ pub struct KeyEntry {
     /// Packages signed with it are no longer trusted.
     #[serde(default)]
     pub revoked: bool,
+    /// The publisher's earlier key vouching for this one.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub endorsement: Option<Endorsement>,
+}
+
+impl KeyEntry {
+    pub fn new(key: String) -> Self {
+        Self { key, ..Self::default() }
+    }
+}
+
+/// A publisher's earlier key vouching for a newer one: plugins installed from
+/// packages signed with the earlier key update to ones signed with the newer
+/// key without asking the user.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
+#[serde(rename_all = "camelCase")]
+pub struct Endorsement {
+    /// The endorsing key, base64.
+    pub key: String,
+    /// Its Ed25519 signature of `openidea-key/1\n<publisher>\n<endorsed key>`, base64.
+    pub signature: String,
 }
 
 /// A published plugin version.
@@ -281,6 +332,34 @@ pub struct IndexEntry {
     pub digest: String,
     #[serde(default)]
     pub capabilities: Vec<String>,
+    /// The plugin API versions it loads in (a semver requirement): its
+    /// manifest's `engines.openidea` and the API its component was built for.
+    /// Required: an entry without one is offered to no IDE.
+    #[serde(default)]
+    pub engine: String,
+    /// Marketplace categories (`CATEGORIES`); an IDE ignores those it doesn't know.
+    #[serde(default)]
+    pub categories: Vec<String>,
+}
+
+impl IndexEntry {
+    /// Whether this IDE can load the version.
+    pub fn compatible(&self) -> bool {
+        crate::engine_compatible(&self.engine, false)
+    }
+
+    fn semver(&self) -> Option<semver::Version> {
+        semver::Version::parse(&self.version).ok()
+    }
+}
+
+/// `engines.openidea` of a manifest narrowed to the API its component was built
+/// for (`major.minor`, if it has code): the requirement an index lists.
+pub fn engine_requirement(manifest_engine: &str, built_for: Option<&semver::Version>) -> String {
+    match built_for {
+        Some(v) => format!("{manifest_engine}, ^{}.{}", v.major, v.minor),
+        None => manifest_engine.to_owned(),
+    }
 }
 
 /// A plugin (all versions when `versions` is empty) that must not run.
@@ -294,12 +373,71 @@ pub struct Revocation {
 }
 
 impl Index {
+    /// Parses an index. One in a newer format keeps what must reach every IDE —
+    /// revocations, publisher keys (revoked ones) and `moved` — and lists no
+    /// plugins ([`Index::is_newer`]): the IDE needs updating to install from it.
     pub fn parse(text: &str) -> Result<Self, String> {
-        let index: 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));
+        let value: serde_json::Value = serde_json::from_str(text).map_err(|e| format!("index: {e}"))?;
+        let format = value.get("format").and_then(serde_json::Value::as_u64).ok_or("index: `format` is missing")?;
+        if format == u64::from(INDEX_FORMAT) {
+            return serde_json::from_value(value).map_err(|e| format!("index: {e}"));
         }
-        Ok(index)
+        if format < u64::from(INDEX_FORMAT) {
+            return Err(format!("index format {format} is not supported (this IDE reads {INDEX_FORMAT})"));
+        }
+        fn each<T: serde::de::DeserializeOwned>(value: &serde_json::Value, field: &str) -> Vec<T> {
+            let items = value.get(field).and_then(serde_json::Value::as_array);
+            items.into_iter().flatten().filter_map(|v| serde_json::from_value(v.clone()).ok()).collect()
+        }
+        Ok(Index {
+            format: u32::try_from(format).unwrap_or(u32::MAX),
+            publishers: each(&value, "publishers"),
+            plugins: Vec::new(),
+            revoked: each(&value, "revoked"),
+            moved: value.get("moved").and_then(serde_json::Value::as_str).map(str::to_owned),
+        })
+    }
+
+    /// Written in a format newer than this IDE reads: it lists no plugins.
+    pub fn is_newer(&self) -> bool {
+        self.format > INDEX_FORMAT
+    }
+
+    /// The version of each plugin to offer, and whether this IDE can load it:
+    /// the newest it can load, else the newest. Revoked versions are skipped;
+    /// plugins come in the order they are first listed.
+    pub fn offered(&self) -> Vec<(&IndexEntry, bool)> {
+        let mut ids: Vec<&str> = Vec::new();
+        for e in &self.plugins {
+            if !ids.contains(&e.id.as_str()) {
+                ids.push(&e.id);
+            }
+        }
+        ids.into_iter()
+            .filter_map(|id| {
+                let versions: Vec<&IndexEntry> =
+                    self.plugins.iter().filter(|e| e.id == id && self.revocation(id, &e.version).is_none()).collect();
+                let newest = |loadable: bool| {
+                    versions.iter().copied().filter(|e| !loadable || e.compatible()).max_by_key(|e| e.semver())
+                };
+                newest(true).map(|e| (e, true)).or_else(|| newest(false).map(|e| (e, false)))
+            })
+            .collect()
+    }
+
+    /// Drops the versions no IDE would pick: revoked ones, and of each plugin
+    /// all but the newest version per API requirement.
+    pub fn prune_versions(&mut self) {
+        let plugins = std::mem::take(&mut self.plugins);
+        let mut kept: Vec<IndexEntry> = Vec::new();
+        for e in plugins.into_iter().filter(|e| self.revocation(&e.id, &e.version).is_none()) {
+            match kept.iter_mut().find(|k| k.id == e.id && k.engine == e.engine) {
+                Some(k) if e.semver() > k.semver() => *k = e,
+                Some(_) => {}
+                None => kept.push(e),
+            }
+        }
+        self.plugins = kept;
     }
 
     /// The revocation that applies to `id` at `version`.
@@ -335,6 +473,127 @@ impl Index {
         sig.check(id, version, digest)?;
         Ok(publisher.id.clone())
     }
+
+    /// Whether `to` is `from`, or a key of `publisher` that `from` endorsed,
+    /// directly or through keys it endorsed. Endorsements by revoked keys don't
+    /// count: whoever stole a key could vouch for their own.
+    pub fn succeeds(&self, publisher: &str, from: &str, to: &str) -> bool {
+        let keys = self.publishers.iter().find(|p| p.id == publisher).map_or(&[][..], |p| &p.keys[..]);
+        let mut key = to;
+        // Each step moves to an earlier key; more steps than keys is a loop.
+        for _ in 0..=keys.len() {
+            if key == from {
+                return true;
+            }
+            let Some(e) = keys.iter().find(|k| k.key == key).and_then(|k| k.endorsement.as_ref()) else {
+                return false;
+            };
+            let endorser_valid = keys.iter().any(|k| k.key == e.key && !k.revoked);
+            if !endorser_valid || verify_ed25519(&e.key, &endorsement_message(publisher, key), &e.signature) != Ok(true)
+            {
+                return false;
+            }
+            key = &e.key;
+        }
+        false
+    }
+
+    /// Makes `roots` (base64) the keys `publisher` signs with, whatever this
+    /// index says: another key it lists stays only when a root endorsed it (a
+    /// rotation the roots vouched for). Revocations of the keys are kept.
+    pub fn pin_publisher(&mut self, publisher: &str, name: &str, roots: &[String]) {
+        if roots.is_empty() {
+            return;
+        }
+        let i = match self.publishers.iter().position(|p| p.id == publisher) {
+            Some(i) => i,
+            None => {
+                self.publishers.push(Publisher { id: publisher.into(), name: name.into(), keys: Vec::new() });
+                self.publishers.len() - 1
+            }
+        };
+        for root in roots {
+            if !self.publishers[i].keys.iter().any(|k| &k.key == root) {
+                self.publishers[i].keys.push(KeyEntry::new(root.clone()));
+            }
+        }
+        let keys = self.publishers[i].keys.clone();
+        let trusted = keys
+            .into_iter()
+            .filter(|k| roots.iter().any(|r| self.succeeds(publisher, r, &k.key)))
+            .map(|k| if roots.contains(&k.key) { KeyEntry { endorsement: None, ..k } } else { k })
+            .collect();
+        self.publishers[i].keys = trusted;
+    }
+
+    /// Replaces what this index lists for every publisher but `keep` with what
+    /// `other` lists: its publishers, their plugins and their revocations
+    /// (`other`'s downloads should already be absolute). `other` may only
+    /// speak for its own publishers, and none of them may be in `keep`.
+    pub fn include(&mut self, other: Index, keep: &[&str]) -> Result<(), String> {
+        let mut theirs: Vec<&str> = Vec::new();
+        for p in &other.publishers {
+            if !publisher_id_ok(&p.id) {
+                return Err(format!("invalid publisher id {:?}: use a-z, 0-9, '-' and '_'", p.id));
+            }
+            if keep.contains(&p.id.as_str()) {
+                return Err(format!("may not list publisher {:?}", p.id));
+            }
+            if theirs.contains(&p.id.as_str()) {
+                return Err(format!("publisher {:?} is listed twice", p.id));
+            }
+            theirs.push(&p.id);
+        }
+        let owned_by = |id: &str| theirs.iter().any(|p| owns(p, id));
+        for e in &other.plugins {
+            if !theirs.contains(&e.publisher.as_str()) || !owns(&e.publisher, &e.id) {
+                return Err(format!("{}: not a plugin of publisher {:?}", e.id, e.publisher));
+            }
+            if semver::VersionReq::parse(&e.engine).is_err() {
+                return Err(format!("{} {}: `engine` must be the plugin API it needs", e.id, e.version));
+            }
+        }
+        if let Some(r) = other.revoked.iter().find(|r| !owned_by(&r.id)) {
+            return Err(format!("{}: revoked by an index that doesn't publish it", r.id));
+        }
+        let kept = |id: &str| keep.iter().any(|p| owns(p, id));
+        self.publishers.retain(|p| keep.contains(&p.id.as_str()));
+        self.plugins.retain(|e| keep.contains(&e.publisher.as_str()));
+        self.revoked.retain(|r| kept(&r.id));
+        self.publishers.extend(other.publishers);
+        self.plugins.extend(other.plugins);
+        self.revoked.extend(other.revoked);
+        Ok(())
+    }
+}
+
+/// Whether a package signed `new` (`None`: unsigned) may replace an installed
+/// one signed `installed` without asking the user: signed with the same key,
+/// or with one the installed key endorsed (per `index`). An unsigned installed
+/// copy pins nothing.
+pub fn signer_continues(
+    index: Option<&Index>,
+    installed: Option<&PackageSignature>,
+    new: Option<&PackageSignature>,
+) -> bool {
+    match (installed, new) {
+        (None, _) => true,
+        (Some(_), None) => false,
+        (Some(old), Some(new)) => {
+            old.publisher == new.publisher
+                && (old.key == new.key || index.is_some_and(|i| i.succeeds(&new.publisher, &old.key, &new.key)))
+        }
+    }
+}
+
+/// Whether the plugin `id` is in `publisher`'s namespace.
+fn owns(publisher: &str, id: &str) -> bool {
+    id.strip_prefix(publisher).is_some_and(|rest| rest.starts_with('.'))
+}
+
+/// A publisher id is a single segment of a plugin id.
+pub fn publisher_id_ok(id: &str) -> bool {
+    !id.contains('.') && crate::validate_plugin_id(id).is_ok()
 }
 
 #[cfg(test)]
@@ -354,7 +613,7 @@ mod tests {
             publishers: vec![Publisher {
                 id: "acme".into(),
                 name: "ACME".into(),
-                keys: vec![KeyEntry { key: key.public_base64(), revoked: false }],
+                keys: vec![KeyEntry::new(key.public_base64())],
             }],
             plugins: Vec::new(),
             revoked: vec![Revocation {
@@ -362,6 +621,7 @@ mod tests {
                 versions: vec!["1.0.0".into()],
                 reason: "malware".into(),
             }],
+            moved: None,
         }
     }
 
@@ -399,6 +659,138 @@ mod tests {
         assert_eq!(PublisherKey::from_base64(&key.seed_base64()).unwrap().public_base64(), key.public_base64());
     }
 
+    fn entry(id: &str, publisher: &str) -> IndexEntry {
+        IndexEntry {
+            id: id.into(),
+            name: id.into(),
+            version: "1.0.0".into(),
+            description: String::new(),
+            authors: Vec::new(),
+            publisher: publisher.into(),
+            download: format!("https://example.com/{id}.oiplugin"),
+            digest: "d".into(),
+            capabilities: Vec::new(),
+            engine: "^1.0".into(),
+            categories: Vec::new(),
+        }
+    }
+
+    fn version(id: &str, version: &str, engine: &str) -> IndexEntry {
+        IndexEntry { version: version.into(), engine: engine.into(), ..entry(id, "acme") }
+    }
+
+    #[test]
+    fn the_ide_is_offered_the_newest_version_it_can_load() {
+        let host = crate::ENGINE_VERSION;
+        let newer = semver::Version::parse(host).unwrap().major + 1;
+        let mut index = Index {
+            format: INDEX_FORMAT,
+            plugins: vec![
+                version("acme.a", "1.0.0", &format!("^{host}")),
+                version("acme.a", "1.2.0", &format!("^{host}")),
+                version("acme.a", "2.0.0", &format!("^{newer}.0")),
+                version("acme.b", "0.1.0", &format!("^{newer}.0")),
+                version("acme.b", "0.2.0", &format!("^{newer}.1")),
+                version("acme.c", "1.0.0", ""),
+                version("acme.c", "1.1.0", ""),
+            ],
+            revoked: vec![Revocation { id: "acme.c".into(), versions: vec!["1.1.0".into()], reason: "r".into() }],
+            ..Index::default()
+        };
+        let offered = |index: &Index| {
+            index.offered().into_iter().map(|(e, ok)| (e.id.clone(), e.version.clone(), ok)).collect::<Vec<_>>()
+        };
+        let expected = [
+            ("acme.a".to_owned(), "1.2.0".to_owned(), true),
+            ("acme.b".to_owned(), "0.2.0".to_owned(), false),
+            // No `engine`: listed, but no IDE installs it.
+            ("acme.c".to_owned(), "1.0.0".to_owned(), false),
+        ];
+        assert_eq!(offered(&index), expected);
+
+        // Pruning keeps the newest version per requirement, which changes nothing offered.
+        index.prune_versions();
+        let left: Vec<_> = index.plugins.iter().map(|e| format!("{} {}", e.id, e.version)).collect();
+        assert_eq!(left, ["acme.a 1.2.0", "acme.a 2.0.0", "acme.b 0.1.0", "acme.b 0.2.0", "acme.c 1.0.0"]);
+        assert_eq!(offered(&index), expected);
+
+        let built_for = semver::Version::new(1, 3, 0);
+        assert_eq!(engine_requirement("^1.0", Some(&built_for)), "^1.0, ^1.3");
+        assert_eq!(engine_requirement("^1.0", None), "^1.0");
+        assert!(semver::VersionReq::parse(&engine_requirement("^1.0", Some(&built_for))).is_ok());
+    }
+
+    fn publisher(id: &str) -> Publisher {
+        Publisher { id: id.into(), name: id.into(), keys: vec![KeyEntry::new(format!("{id}-key"))] }
+    }
+
+    fn revocation(id: &str) -> Revocation {
+        Revocation { id: id.into(), versions: Vec::new(), reason: "r".into() }
+    }
+
+    #[test]
+    fn including_an_index_replaces_everything_but_the_kept_publishers() {
+        let mut official = Index {
+            format: INDEX_FORMAT,
+            publishers: vec![publisher("openidea"), publisher("gone")],
+            plugins: vec![entry("openidea.a", "openidea"), entry("gone.x", "gone")],
+            revoked: vec![revocation("openidea.old"), revocation("gone.x")],
+            moved: None,
+        };
+        let community = Index {
+            format: INDEX_FORMAT,
+            publishers: vec![publisher("alice")],
+            plugins: vec![entry("alice.arthas", "alice")],
+            revoked: vec![revocation("alice.bad")],
+            moved: None,
+        };
+        official.include(community.clone(), &["openidea"]).unwrap();
+        let ids = |v: &[IndexEntry]| v.iter().map(|e| e.id.clone()).collect::<Vec<_>>();
+        assert_eq!(official.publishers.iter().map(|p| p.id.as_str()).collect::<Vec<_>>(), ["openidea", "alice"]);
+        assert_eq!(ids(&official.plugins), ["openidea.a", "alice.arthas"]);
+        assert_eq!(official.revoked.iter().map(|r| r.id.as_str()).collect::<Vec<_>>(), ["openidea.old", "alice.bad"]);
+
+        // Including again is idempotent.
+        let once = official.clone();
+        official.include(community.clone(), &["openidea"]).unwrap();
+        assert_eq!(official, once);
+    }
+
+    #[test]
+    fn an_included_index_speaks_only_for_its_own_publishers() {
+        let base = Index { format: INDEX_FORMAT, publishers: vec![publisher("openidea")], ..Index::default() };
+        let with = |publishers: Vec<Publisher>, plugins: Vec<IndexEntry>, revoked: Vec<Revocation>| Index {
+            format: INDEX_FORMAT,
+            publishers,
+            plugins,
+            revoked,
+            moved: None,
+        };
+        let cases = [
+            (with(vec![publisher("openidea")], vec![], vec![]), "may not list"),
+            (with(vec![publisher("alice"), publisher("alice")], vec![], vec![]), "listed twice"),
+            (with(vec![publisher("openidea.x")], vec![], vec![]), "invalid publisher"),
+            (with(vec![publisher("alice")], vec![entry("openidea.a", "alice")], vec![]), "not a plugin of"),
+            (with(vec![publisher("alice")], vec![entry("alice.a", "bob")], vec![]), "not a plugin of"),
+            (with(vec![publisher("alice")], vec![entry("alicex.a", "alice")], vec![]), "not a plugin of"),
+            (with(vec![publisher("alice")], vec![], vec![revocation("openidea.a")]), "doesn't publish"),
+            (
+                with(
+                    vec![publisher("alice")],
+                    vec![IndexEntry { engine: String::new(), ..entry("alice.a", "alice") }],
+                    vec![],
+                ),
+                "`engine`",
+            ),
+        ];
+        for (other, error) in cases {
+            let mut index = base.clone();
+            let err = index.include(other, &["openidea"]).unwrap_err();
+            assert!(err.contains(error), "{err}");
+            assert_eq!(index, base);
+        }
+    }
+
     #[test]
     fn unpacking_refuses_paths_leaving_the_package() {
         let tmp = tempfile::tempdir().unwrap();
@@ -413,7 +805,7 @@ mod tests {
         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());
+        assert!(Index::parse(r#"{"format": 2}"#).unwrap().is_newer());
     }
 
     fn zip_of(path: &Path, entries: &[(&str, &str)]) {
@@ -462,4 +854,102 @@ mod tests {
             assert!(err.contains("is not an OpenIDEA plugin"), "{name}: {err}");
         }
     }
+
+    #[test]
+    fn a_newer_index_still_revokes_and_moves() {
+        let newer = format!(
+            r#"{{"format": {}, "plugins": [{{"anything": "new"}}], "shape": "changed",
+                "publishers": [{{"id": "acme", "name": "ACME", "keys": [{{"key": "k1", "revoked": true}}]}}, {{"id": 5}}],
+                "revoked": [{{"id": "acme.bad", "reason": "malware"}}, {{"oops": 1}}],
+                "moved": "https://example.com/next.json"}}"#,
+            INDEX_FORMAT + 1
+        );
+        let index = Index::parse(&newer).unwrap();
+        assert!(index.is_newer());
+        assert!(index.plugins.is_empty() && index.offered().is_empty());
+        assert_eq!(index.revocation("acme.bad", "2.0.0").unwrap().reason, "malware");
+        assert!(index.key_revoked("k1"));
+        assert_eq!(index.moved.as_deref(), Some("https://example.com/next.json"));
+        // Fields this IDE doesn't know are ignored in its own format.
+        let current = format!(r#"{{"format": {INDEX_FORMAT}, "later": true, "plugins": []}}"#);
+        assert!(!Index::parse(&current).unwrap().is_newer());
+        assert!(Index::parse(r#"{"format": 0}"#).unwrap_err().contains("not supported"));
+        assert!(Index::parse(r#"{"plugins": []}"#).is_err());
+    }
+
+    fn keys<'a>(index: &'a mut Index, publisher: &str) -> &'a mut Vec<KeyEntry> {
+        &mut index.publishers.iter_mut().find(|p| p.id == publisher).unwrap().keys
+    }
+
+    #[test]
+    fn rotated_keys_continue_through_endorsements() {
+        let (k1, k2, k3) =
+            (PublisherKey::from_seed([1; 32]), PublisherKey::from_seed([2; 32]), PublisherKey::from_seed([3; 32]));
+        let mut index = index(&k1);
+        let endorsed = |by: &PublisherKey, key: &PublisherKey| KeyEntry {
+            endorsement: Some(by.endorse("acme", &key.public_base64())),
+            ..KeyEntry::new(key.public_base64())
+        };
+        keys(&mut index, "acme").push(endorsed(&k1, &k2));
+        keys(&mut index, "acme").push(endorsed(&k2, &k3));
+        let (p1, p2, p3) = (k1.public_base64(), k2.public_base64(), k3.public_base64());
+        assert!(index.succeeds("acme", &p1, &p1));
+        assert!(index.succeeds("acme", &p1, &p3), "through k2");
+        assert!(!index.succeeds("acme", &p3, &p1), "not backwards");
+        assert!(!index.succeeds("other", &p1, &p2));
+        // An endorsement for another publisher, or by a revoked key, doesn't count.
+        let mut foreign = index.clone();
+        keys(&mut foreign, "acme")[1].endorsement = Some(k1.endorse("evil", &p2));
+        assert!(!foreign.succeeds("acme", &p1, &p2));
+        let mut stolen = index.clone();
+        keys(&mut stolen, "acme")[0].revoked = true;
+        assert!(!stolen.succeeds("acme", &p1, &p2));
+
+        let sig = |key: &PublisherKey| key.sign("acme", "acme.tools", "1.0.0", "d");
+        assert!(signer_continues(Some(&index), Some(&sig(&k1)), Some(&sig(&k3))));
+        assert!(signer_continues(None, Some(&sig(&k1)), Some(&sig(&k1))));
+        assert!(!signer_continues(None, Some(&sig(&k1)), Some(&sig(&k2))), "no index to vouch");
+        let stranger = PublisherKey::from_seed([4; 32]);
+        assert!(!signer_continues(Some(&index), Some(&sig(&k1)), Some(&sig(&stranger))));
+        assert!(!signer_continues(Some(&index), Some(&sig(&k1)), None), "signed, then unsigned");
+        assert!(signer_continues(Some(&index), None, Some(&sig(&stranger))), "unsigned pins nothing");
+    }
+
+    #[test]
+    fn pinned_publishers_keep_their_built_in_keys() {
+        let (root, next, intruder) =
+            (PublisherKey::from_seed([1; 32]), PublisherKey::from_seed([2; 32]), PublisherKey::from_seed([5; 32]));
+        let mut index = index(&intruder);
+        index.publishers[0].id = "openidea".into();
+        keys(&mut index, "openidea").push(KeyEntry {
+            endorsement: Some(root.endorse("openidea", &next.public_base64())),
+            ..KeyEntry::new(next.public_base64())
+        });
+        let roots = [root.public_base64()];
+        let listed = |index: &Index| -> Vec<(String, bool)> {
+            let mut index = index.clone();
+            index.pin_publisher("openidea", "OpenIDEA", &roots);
+            keys(&mut index, "openidea").iter().map(|k| (k.key.clone(), k.revoked)).collect()
+        };
+        // The intruder's key goes, the successor the root endorsed stays, the root is added.
+        assert_eq!(listed(&index), [(next.public_base64(), false), (root.public_base64(), false)]);
+        let mut pinned = index.clone();
+        pinned.pin_publisher("openidea", "OpenIDEA", &roots);
+        let digest = "d";
+        let signed = |k: &PublisherKey| k.sign("openidea", "openidea.tools", "1.0.0", digest);
+        assert!(pinned.verify(&signed(&intruder), "openidea.tools", "1.0.0", digest).is_err());
+        assert!(pinned.verify(&signed(&next), "openidea.tools", "1.0.0", digest).is_ok());
+        // A revoked root stays revoked, and what it endorsed is no longer trusted.
+        keys(&mut index, "openidea").push(KeyEntry { revoked: true, ..KeyEntry::new(root.public_base64()) });
+        assert_eq!(listed(&index), [(root.public_base64(), true)]);
+
+        // A publisher missing from the index is added with its roots.
+        let mut empty = Index { format: INDEX_FORMAT, ..Index::default() };
+        empty.pin_publisher("openidea", "OpenIDEA", &[root.public_base64()]);
+        assert_eq!(empty.verify(&signed(&root), "openidea.tools", "1.0.0", digest).unwrap(), "openidea");
+        // No roots: the index decides.
+        let mut open = index.clone();
+        open.pin_publisher("openidea", "OpenIDEA", &[]);
+        assert_eq!(open, index);
+    }
 }
diff --git a/crates/ide-fonts/src/lib.rs b/crates/ide-fonts/src/lib.rs
index 341febde..e52a9396 100644
--- a/crates/ide-fonts/src/lib.rs
+++ b/crates/ide-fonts/src/lib.rs
@@ -21,6 +21,18 @@ pub struct FontFamily {
     pub monospaced: bool,
 }
 
+/// PANOSE bProportion value 9 means "Monospaced"; DirectWrite's
+/// `IsMonospacedFont` alone misses fonts that only carry this classification.
+const PANOSE_MONOSPACED: u8 = 9;
+
+/// One face counts as monospaced when the font system flags it fixed pitch, its
+/// PANOSE proportion is "Monospaced", or its glyph advances are uniform
+/// (fonts with wrong/missing metadata, e.g. bitmap-style TTFs).
+#[cfg_attr(not(windows), allow(dead_code))]
+fn face_is_mono(is_monospaced_font: bool, panose_proportion: u8, advances_equal: bool) -> bool {
+    is_monospaced_font || panose_proportion == PANOSE_MONOSPACED || advances_equal
+}
+
 type Cache = Mutex<Option<Arc<[FontFamily]>>>;
 
 /// The installed families, sorted case-insensitively, read on first use and
@@ -195,7 +207,9 @@ mod imp {
         // 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 Some(descriptors) = collection.matching_font_descriptors() else {
+                return Vec::new();
+            };
             let mut seen = std::collections::BTreeSet::new();
             descriptors
                 .cast_unchecked::<CTFontDescriptor>()
@@ -271,14 +285,16 @@ mod imp {
 
 #[cfg(windows)]
 mod imp {
+    use std::os::windows::ffi::OsStrExt;
+    use windows::Win32::Graphics::DirectWrite::IDWriteFontFace1;
     use windows::Win32::Graphics::DirectWrite::{
-        DWRITE_FACTORY_TYPE_SHARED, DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_WEIGHT_NORMAL,
-        DWriteCreateFactory, IDWriteFactory, IDWriteFont1, IDWriteLocalizedStrings,
+        DWRITE_FACTORY_TYPE_SHARED, DWriteCreateFactory, IDWriteFactory, IDWriteFactory3, IDWriteFactory5, IDWriteFont,
+        IDWriteFont1, IDWriteFontCollection, IDWriteFontFamily, IDWriteLocalizedStrings,
     };
-    use windows::core::{BOOL, Interface, w};
+    use windows::core::{BOOL, Interface, PCWSTR, w};
 
-    /// The system font collection's families, named in English when the
-    /// family has an English name (what CSS matches), else its first name.
+    /// The installed 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)> {
         // SAFETY: plain DirectWrite COM calls on interfaces we own.
         unsafe { read(refresh) }.unwrap_or_default()
@@ -286,11 +302,85 @@ mod imp {
 
     unsafe fn read(refresh: bool) -> windows::core::Result<Vec<(String, bool)>> {
         let factory: IDWriteFactory = unsafe { DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED) }?;
+        let mut faces = Vec::new();
+        // Windows 10+: the newer collection covers registered per-user fonts.
+        // Exclude downloadable fonts that are not installed on this machine.
+        // Bitmap .FON fonts (e.g. the stock raster Fixedsys) are invisible to
+        // DirectWrite either way: it only reads TrueType/OpenType files.
         let mut collection = None;
-        unsafe { factory.GetSystemFontCollection(&mut collection, refresh) }?;
-        let Some(collection) = collection else {
-            return Ok(Vec::new());
+        if let Ok(factory3) = factory.cast::<IDWriteFactory3>() {
+            let mut local = None;
+            if unsafe { factory3.GetSystemFontCollection(false, &mut local, refresh) }.is_ok() {
+                collection = local.map(Into::into);
+            }
+        }
+        if collection.is_none() {
+            unsafe { factory.GetSystemFontCollection(&mut collection, refresh) }?;
+        }
+        if let Some(collection) = collection {
+            faces.extend(collect(&collection));
+        }
+        // DirectWrite enumerates via the font registry, so font files copied
+        // into the per-user directory without registering (no HKCU entry)
+        // are invisible to the calls above; scan the directory directly.
+        faces.extend(unsafe { user_dir_faces(&factory) });
+        Ok(faces)
+    }
+
+    /// Families from `%LOCALAPPDATA%\Microsoft\Windows\Fonts` files, registered
+    /// or not, via a font set built from the files on disk.
+    unsafe fn user_dir_faces(factory: &IDWriteFactory) -> Vec<(String, bool)> {
+        let Some(local_app_data) = std::env::var_os("LOCALAPPDATA") else {
+            return Vec::new();
         };
+        let dir = std::path::Path::new(&local_app_data).join(r"Microsoft\Windows\Fonts");
+        let Ok(entries) = std::fs::read_dir(&dir) else {
+            return Vec::new();
+        };
+        let files: Vec<_> = entries
+            .filter_map(|e| e.ok())
+            .map(|e| e.path())
+            .filter(|p| {
+                matches!(
+                    p.extension().and_then(|e| e.to_str()).map(|e| e.to_ascii_lowercase()).as_deref(),
+                    Some("ttf" | "otf" | "ttc" | "otc")
+                )
+            })
+            .collect();
+        unsafe { file_faces(factory, &files) }
+    }
+
+    unsafe fn file_faces(factory: &IDWriteFactory, files: &[std::path::PathBuf]) -> Vec<(String, bool)> {
+        if files.is_empty() {
+            return Vec::new();
+        }
+        let Ok(factory3) = factory.cast::<IDWriteFactory3>() else {
+            return Vec::new();
+        };
+        let Ok(factory5) = factory.cast::<IDWriteFactory5>() else {
+            return Vec::new();
+        };
+        let Ok(builder) = (unsafe { factory5.CreateFontSetBuilder() }) else {
+            return Vec::new();
+        };
+        for path in files {
+            let wide: Vec<u16> = path.as_os_str().encode_wide().chain(Some(0)).collect();
+            // SAFETY: wide is a valid NUL-terminated string for the calls.
+            let Ok(file) = (unsafe { factory.CreateFontFileReference(PCWSTR(wide.as_ptr()), None) }) else {
+                continue;
+            };
+            let _ = unsafe { builder.AddFontFile(&file) };
+        }
+        let Ok(set) = (unsafe { builder.CreateFontSet() }) else {
+            return Vec::new();
+        };
+        let Ok(collection) = (unsafe { factory3.CreateFontCollectionFromFontSet(&set) }) else {
+            return Vec::new();
+        };
+        collect(&collection)
+    }
+
+    fn collect(collection: &IDWriteFontCollection) -> Vec<(String, bool)> {
         let mut out = Vec::new();
         for i in 0..unsafe { collection.GetFontFamilyCount() } {
             let Ok(family) = (unsafe { collection.GetFontFamily(i) }) else {
@@ -299,19 +389,120 @@ mod imp {
             let Some(name) = unsafe { family.GetFamilyNames() }.ok().and_then(|n| unsafe { english(&n) }) else {
                 continue;
             };
-            let mono = unsafe {
-                family.GetFirstMatchingFont(
-                    DWRITE_FONT_WEIGHT_NORMAL,
-                    DWRITE_FONT_STRETCH_NORMAL,
-                    DWRITE_FONT_STYLE_NORMAL,
-                )
-            }
-            .ok()
-            .and_then(|f| f.cast::<IDWriteFont1>().ok())
-            .is_some_and(|f| unsafe { f.IsMonospacedFont() }.as_bool());
-            out.push((name, mono));
+            out.push((name, unsafe { family_is_mono(&family) }));
+        }
+        out
+    }
+
+    /// A family is monospaced when any face reports fixed pitch, PANOSE
+    /// proportion 9, or uniform glyph advances; probing every face matches
+    /// `normalize`'s any-face merge (macOS and Linux already flag every face,
+    /// not just the regular one).
+    unsafe fn family_is_mono(family: &IDWriteFontFamily) -> bool {
+        (0..unsafe { family.GetFontCount() }).any(|i| {
+            let Ok(font) = (unsafe { family.GetFont(i) }) else {
+                return false;
+            };
+            if let Ok(font1) = font.cast::<IDWriteFont1>() {
+                let is_monospaced = unsafe { font1.IsMonospacedFont() }.as_bool();
+                // The proportion byte is defined for text/display fonts only.
+                let panose = unsafe { font1.GetPanose().values };
+                let panose_proportion = if panose[0] == 2 { panose[3] } else { 0 };
+                if super::face_is_mono(is_monospaced, panose_proportion, false) {
+                    return true;
+                }
+            }
+            unsafe { advances_equal(&font) }
+        })
+    }
+
+    /// Some monospaced fonts carry no fixed-pitch metadata at all (bitmap-style
+    /// TTFs like Fixedsys Excelsior): compare the advance widths of 'i' and
+    /// 'W'. Dual-width CJK monospace fonts pass too (both half-width).
+    unsafe fn advances_equal(font: &IDWriteFont) -> bool {
+        let Ok(face) = (unsafe { font.CreateFontFace() }) else {
+            return false;
+        };
+        let Ok(face1) = face.cast::<IDWriteFontFace1>() else {
+            return false;
+        };
+        let codepoints = ['i' as u32, 'W' as u32];
+        let mut indices = [0u16; 2];
+        if unsafe { face.GetGlyphIndices(codepoints.as_ptr(), 2, indices.as_mut_ptr()) }.is_err()
+            || indices.contains(&0)
+        {
+            return false;
+        }
+        let mut advances = [0i32; 2];
+        unsafe { face1.GetDesignGlyphAdvances(2, indices.as_ptr(), advances.as_mut_ptr(), false) }.is_ok()
+            && advances[0] > 0
+            && advances[0] == advances[1]
+    }
+
+    #[test]
+    fn glyph_probe_distinguishes_monospace_proportional_and_symbol_fonts() {
+        unsafe {
+            let factory: IDWriteFactory = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED).unwrap();
+            let mut collection = None;
+            factory.GetSystemFontCollection(&mut collection, false).unwrap();
+            let collection = collection.unwrap();
+            for (name, expected) in [
+                ("Consolas", true),
+                ("Arial", false),
+                ("Times New Roman", false),
+                ("Wingdings", false),
+                ("Webdings", false),
+                ("Segoe MDL2 Assets", false),
+            ] {
+                let wide: Vec<_> = name.encode_utf16().chain(Some(0)).collect();
+                let mut index = 0;
+                let mut exists = BOOL(0);
+                collection.FindFamilyName(PCWSTR(wide.as_ptr()), &mut index, &mut exists).unwrap();
+                assert!(exists.as_bool(), "{name} ships with Windows");
+                let family = collection.GetFontFamily(index).unwrap();
+                for i in 0..family.GetFontCount() {
+                    let font = family.GetFont(i).unwrap();
+                    assert_eq!(advances_equal(&font), expected, "{name} face {i}");
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn font_files_include_every_family_in_a_collection() {
+        let path = std::path::PathBuf::from(std::env::var_os("WINDIR").unwrap()).join(r"Fonts\cambria.ttc");
+        unsafe {
+            let factory: IDWriteFactory = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED).unwrap();
+            let faces = file_faces(&factory, &[path]);
+            for name in ["Cambria", "Cambria Math"] {
+                assert!(faces.iter().any(|(family, _)| family == name), "missing {name}: {faces:?}");
+            }
+        }
+    }
+
+    #[test]
+    fn excludes_families_available_only_as_downloads() {
+        use windows::Win32::Graphics::DirectWrite::{DWRITE_E_REMOTEFONT, DWRITE_LOCALITY_LOCAL, IDWriteFont3};
+
+        unsafe {
+            let factory: IDWriteFactory = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED).unwrap();
+            let factory3: IDWriteFactory3 = factory.cast().unwrap();
+            let set = factory3.GetSystemFontSet().unwrap();
+            let collection = factory3.CreateFontCollectionFromFontSet(&set).unwrap();
+            let listed = super::normalize(read(false).unwrap());
+            let user = super::normalize(user_dir_faces(&factory));
+            for i in 0..collection.GetFontFamilyCount() {
+                let family = collection.GetFontFamily(i).unwrap();
+                let name = english(&family.GetFamilyNames().unwrap()).unwrap();
+                let remote_only = (0..family.GetFontCount()).all(|j| match family.GetFont(j) {
+                    Ok(font) => font.cast::<IDWriteFont3>().unwrap().GetLocality() != DWRITE_LOCALITY_LOCAL,
+                    Err(error) => error.code() == DWRITE_E_REMOTEFONT,
+                });
+                if remote_only && !user.iter().any(|f| f.name == name) {
+                    assert!(!listed.iter().any(|f| f.name == name), "{name} is not installed locally");
+                }
+            }
         }
-        Ok(out)
     }
 
     unsafe fn english(names: &IDWriteLocalizedStrings) -> Option<String> {
@@ -476,6 +667,15 @@ mod tests {
         );
     }
 
+    #[test]
+    fn panose_monospaced_proportion_counts_as_mono() {
+        assert!(face_is_mono(true, 0, false));
+        assert!(face_is_mono(false, PANOSE_MONOSPACED, false));
+        assert!(face_is_mono(false, 0, true));
+        assert!(!face_is_mono(false, 0, false));
+        assert!(!face_is_mono(false, 3, false));
+    }
+
     #[test]
     fn fc_list_spacing_marks_monospace() {
         let out = "DejaVu Sans Mono\t100\nDejaVu Sans\t\nNoto Sans Mono CJK SC\t90\nTerminus\t110\nCantarell\nFira\\-Code\tmono\n\t100\n";
diff --git a/crates/ide-host/Cargo.toml b/crates/ide-host/Cargo.toml
index 5f7267d7..a8473b6b 100644
--- a/crates/ide-host/Cargo.toml
+++ b/crates/ide-host/Cargo.toml
@@ -14,6 +14,7 @@ encoding_rs.workspace = true
 ide-core.workspace = true
 ide-text.workspace = true
 ide-vfs.workspace = true
+regex-syntax.workspace = true
 ide-workspace.workspace = true
 ide-language.workspace = true
 ide-index.workspace = true
@@ -45,6 +46,7 @@ ide-extension.workspace = true
 ide-plugin.workspace = true
 ide-tools = { path = "../ide-tools" }
 ide-docker = { path = "../ide-docker" }
+semver = "1"
 serde.workspace = true
 serde_json.workspace = true
 toml.workspace = true
@@ -58,12 +60,13 @@ dunce.workspace = true
 dirs.workspace = true
 uuid.workspace = true
 tempfile.workspace = true
+zip.workspace = true
+quick-xml = "0.42"
 
 [dev-dependencies]
 ide-ssh = { workspace = true, features = ["testing"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-util", "test-util"] }
 criterion = { version = "0.5", default-features = false }
-zip.workspace = true
 
 [target.'cfg(unix)'.dependencies]
 rustix = { version = "1.1", features = ["fs", "process"] }
diff --git a/crates/ide-host/src/bin/openidea-plugin/main.rs b/crates/ide-host/src/bin/openidea-plugin/main.rs
index 99b73630..ef9a7fa7 100644
--- a/crates/ide-host/src/bin/openidea-plugin/main.rs
+++ b/crates/ide-host/src/bin/openidea-plugin/main.rs
@@ -3,13 +3,15 @@
 //! ```text
 //! openidea-plugin new <dir> [--template command|theme|icon-theme|language] [--id ID] [--name NAME] [--sdk PATH]
 //! openidea-plugin build [dir] [--debug]   # cargo → dist/plugin.wasm, then `check`
-//! openidea-plugin check [dir]             # validate the package as the IDE would install it
+//! openidea-plugin check [dir|package]     # validate the package as the IDE would install it
 //! openidea-plugin link [dir]              # load the folder in the IDE without installing it
 //! openidea-plugin unlink [dir]
 //! openidea-plugin links                   # list linked folders
 //! openidea-plugin keygen <key-file>       # a publisher's Ed25519 key
+//! openidea-plugin endorse <new-public-key> --key OLD --publisher ID   # vouch for a new key
 //! openidea-plugin pack [dir] [--key F --publisher ID] [--out FILE]   # <id>-<version>.oiplugin
-//! openidea-plugin index <dir> --publisher ID --name NAME --key F     # marketplace index.json
+//! openidea-plugin index <dir> [--publisher ID --name NAME --key F [--previous-key F]]   # marketplace index.json
+//! openidea-plugin merge <index> <other-index> --keep ID               # list another index's publishers
 //! ```
 //!
 //! `link` writes `links.json` in the IDE's plugins directory
@@ -20,7 +22,7 @@
 mod templates;
 
 use ide_extension::{Manifest, validate_plugin_id};
-use ide_host::plugins::PluginHost;
+use ide_host::plugins::{PluginHost, read_market_url, resolve_market_href};
 use ide_plugin::{Limits, PluginEngine};
 use std::path::{Path, PathBuf};
 use std::process::{Command, ExitCode};
@@ -31,17 +33,31 @@ usage: openidea-plugin <command> [options]
 
 commands:
   new <dir> [--template T] [--id ID] [--name NAME] [--sdk PATH]
-        create a plugin; T = command (default), theme, icon-theme, language
+        create a plugin; T = command (default), theme, icon-theme, language. A Rust
+        plugin depends on the SDK of this tool's release (git); --sdk PATH uses a
+        local sdk/rust/openidea-plugin instead
   build [dir] [--debug]   compile a Rust plugin to dist/plugin.wasm and check it
-  check [dir]             validate the package as the IDE would install it
+  check [dir|package]     validate the package (folder or .oiplugin) as the IDE would install it
   link [dir]              load the folder in the IDE without installing it
   unlink [dir]            stop loading a linked folder
   links                   list linked folders
   keygen <key-file>       create a publisher signing key (keep the file secret)
+  endorse <new-public-key> --key F --publisher ID
+                          print an earlier key's endorsement of a new one (JSON), for an
+                          index the publisher doesn't write with `index --previous-key`
   pack [dir] [--key F --publisher ID] [--out FILE]
                           write <id>-<version>.oiplugin, signed with the key
-  index <dir> --publisher ID --name NAME --key F [--out FILE]
-                          write the marketplace index.json for the packages in dir
+  index <dir> [--publisher ID --name NAME --key F [--previous-key F]] [--out FILE]
+        [--download-base URL]
+                          write the marketplace index.json for the packages in dir: with a
+                          key, register it and list that publisher's plugins (earlier
+                          versions stay for older IDEs); without, list only these packages,
+                          each checked against the index's publishers. A new key replacing
+                          an earlier one is endorsed with --previous-key, so installed
+                          plugins update to it without asking
+  merge <index> <other-index> --keep ID [--out FILE]
+                          replace every publisher but ID in index with those of other-index
+                          (a path or URL), their plugins and revocations
 
 environment:
   OPENIDEA_PLUGINS_DIR    the IDE's plugins directory (default: the app data directory)";
@@ -51,13 +67,15 @@ fn main() -> ExitCode {
     let result = match args.first().map(String::as_str) {
         Some("new") => cmd_new(&args[1..]),
         Some("build") => cmd_build(&args[1..]),
-        Some("check") => dir_arg(&args[1..]).and_then(|d| check(&d)),
+        Some("check") => dir_arg(&args[1..]).and_then(|d| check_path(&d)),
         Some("link") => dir_arg(&args[1..]).and_then(|d| link(&d, true)),
         Some("unlink") => dir_arg(&args[1..]).and_then(|d| link(&d, false)),
         Some("links") => list_links(),
         Some("keygen") => cmd_keygen(&args[1..]),
+        Some("endorse") => cmd_endorse(&args[1..]),
         Some("pack") => cmd_pack(&args[1..]),
         Some("index") => cmd_index(&args[1..]),
+        Some("merge") => cmd_merge(&args[1..]),
         Some("--version" | "-V") => {
             println!("openidea-plugin {} (plugin API {})", env!("CARGO_PKG_VERSION"), ide_extension::ENGINE_VERSION);
             Ok(())
@@ -161,7 +179,7 @@ fn cmd_new(args: &[String]) -> Result<(), String> {
     std::fs::create_dir_all(&dir).map_err(|e| format!("{}: {e}", dir.display()))?;
     let dir = canonical(&dir)?;
     let sdk = match template {
-        templates::Template::Command => Some(sdk_path(a.value("sdk"), &dir)?),
+        templates::Template::Command => Some(sdk_dependency(a.value("sdk"), &dir)?),
         _ => None,
     };
     let vars = templates::Vars { id: &id, name: &name, sdk: sdk.as_deref() };
@@ -216,12 +234,16 @@ fn title_case(s: &str) -> String {
         .join(" ")
 }
 
-/// The SDK dependency path written into a new plugin's Cargo.toml: `--sdk`,
-/// or the SDK of the source tree this tool was built from.
-fn sdk_path(explicit: Option<&str>, plugin_dir: &Path) -> Result<String, String> {
+/// The SDK dependency written into a new plugin's Cargo.toml: by path with `--sdk`, or
+/// when the plugin is inside the source tree this tool was built from; otherwise the
+/// repository at this tool's release tag.
+fn sdk_dependency(explicit: Option<&str>, plugin_dir: &Path) -> Result<String, String> {
     let sdk = match explicit {
         Some(p) => PathBuf::from(p),
-        None => PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR"), "/../../sdk/rust/openidea-plugin")),
+        None => match dunce::canonicalize(concat!(env!("CARGO_MANIFEST_DIR"), "/../..")) {
+            Ok(tree) if plugin_dir.starts_with(&tree) => tree.join("sdk/rust/openidea-plugin"),
+            _ => return Ok(format!("{{ git = \"{REPOSITORY}\", tag = \"v{}\" }}", env!("CARGO_PKG_VERSION"))),
+        },
     };
     let sdk = dunce::canonicalize(&sdk).map_err(|_| {
         format!("the plugin SDK was not found at {}; pass --sdk <path to sdk/rust/openidea-plugin>", sdk.display())
@@ -230,9 +252,11 @@ fn sdk_path(explicit: Option<&str>, plugin_dir: &Path) -> Result<String, String>
         return Err(format!("{} is not the openidea-plugin SDK (no Cargo.toml)", sdk.display()));
     }
     let path = relative(plugin_dir, &sdk).unwrap_or(sdk);
-    Ok(path.to_string_lossy().replace('\\', "/"))
+    Ok(format!("{{ path = \"{}\" }}", path.to_string_lossy().replace('\\', "/")))
 }
 
+const REPOSITORY: &str = "https://github.com/l0ng-ai/openidea";
+
 /// `to` relative to `from` when they share a root (keeps packages in a repo movable).
 fn relative(from: &Path, to: &Path) -> Option<PathBuf> {
     let (f, t): (Vec<_>, Vec<_>) = (from.components().collect(), to.components().collect());
@@ -323,10 +347,21 @@ fn ensure_wasm_target() {
 
 /// Validates `dir` exactly as Install from Disk would, and checks the
 /// component imports only the plugin API.
+/// [`check`] of a folder, or of a package file unpacked as installing would.
+fn check_path(path: &Path) -> Result<(), String> {
+    if !path.is_file() {
+        return check(path);
+    }
+    let tmp = scratch_dir("unpack")?;
+    let dir = tmp.path().join("package");
+    package::unpack(path, &dir).and_then(|_| check(&dir))
+}
+
 fn check(dir: &Path) -> Result<(), String> {
     let dir = canonical(dir)?;
-    let scratch = std::env::temp_dir().join(format!("openidea-plugin-check-{}", std::process::id()));
-    let result = (|| {
+    let tmp = scratch_dir("check")?;
+    let scratch = tmp.path().join("host");
+    (|| {
         let host = PluginHost::new(scratch.clone(), Arc::new(|_: Option<&str>, _| {}), Limits::default())
             .map_err(|e| e.to_string())?;
         let preview = host.preview_install(&dir).map_err(|e| e.to_string())?;
@@ -345,6 +380,17 @@ fn check(dir: &Path) -> Result<(), String> {
         } else {
             println!("  code: none (contributions only)");
         }
+        println!("  categories: {}", manifest.categories().join(", "));
+        for c in manifest.unknown_categories() {
+            println!("  warning: unknown category {c:?} (ignored); use {}", ide_extension::CATEGORIES.join(", "));
+        }
+        if manifest.declared_categories.len() > ide_extension::MAX_CATEGORIES {
+            println!(
+                "  warning: only the first {} known categories are used; {} are declared",
+                ide_extension::MAX_CATEGORIES,
+                manifest.declared_categories.len()
+            );
+        }
         if !manifest.activation.is_empty() {
             let events: Vec<String> = manifest.activation.iter().map(ToString::to_string).collect();
             println!("  activation: {}", events.join(", "));
@@ -361,9 +407,7 @@ fn check(dir: &Path) -> Result<(), String> {
         }
         println!("ok");
         Ok(())
-    })();
-    let _ = std::fs::remove_dir_all(&scratch);
-    result
+    })()
 }
 
 fn human_size(bytes: u64) -> String {
@@ -479,14 +523,31 @@ fn cmd_keygen(args: &[String]) -> Result<(), String> {
     Ok(())
 }
 
+fn cmd_endorse(args: &[String]) -> Result<(), String> {
+    let a = Args::parse(args, &[], &["key", "publisher"])?;
+    let usage = "usage: openidea-plugin endorse <new-public-key> --key <earlier-key-file> --publisher ID";
+    let ([new], Some(key), Some(publisher)) = (a.positional.as_slice(), a.value("key"), a.value("publisher")) else {
+        return Err(usage.into());
+    };
+    if !package::publisher_id_ok(publisher) {
+        return Err(format!("invalid publisher id {publisher:?}"));
+    }
+    let endorsement = read_key(key)?.endorse(publisher, new.trim());
+    println!("{}", serde_json::to_string_pretty(&endorsement).map_err(|e| e.to_string())?);
+    Ok(())
+}
+
+/// A fresh scratch directory, removed when dropped.
+fn scratch_dir(what: &str) -> Result<tempfile::TempDir, String> {
+    tempfile::Builder::new().prefix(&format!("openidea-plugin-{what}-")).tempdir().map_err(|e| e.to_string())
+}
+
 /// A scratch host to list a package's files as the IDE would.
 fn with_scratch_host<T>(f: impl FnOnce(&PluginHost) -> Result<T, String>) -> Result<T, String> {
-    let scratch = std::env::temp_dir().join(format!("openidea-plugin-pack-{}", std::process::id()));
-    let result = PluginHost::new(scratch.clone(), Arc::new(|_: Option<&str>, _| {}), Limits::default())
+    let tmp = scratch_dir("host")?;
+    PluginHost::new(tmp.path().join("host"), Arc::new(|_: Option<&str>, _| {}), Limits::default())
         .map_err(|e| e.to_string())
-        .and_then(|h| f(&h));
-    let _ = std::fs::remove_dir_all(&scratch);
-    result
+        .and_then(|h| f(&h))
 }
 
 fn cmd_pack(args: &[String]) -> Result<(), String> {
@@ -522,29 +583,28 @@ fn cmd_pack(args: &[String]) -> Result<(), String> {
 }
 
 fn cmd_index(args: &[String]) -> Result<(), String> {
-    let a = Args::parse(args, &[], &["publisher", "name", "key", "out"])?;
+    let a = Args::parse(args, &[], &["publisher", "name", "key", "previous-key", "out", "download-base"])?;
     let dir = canonical(&a.dir()?)?;
-    let publisher = a.value("publisher").ok_or("--publisher is required")?;
-    let name = a.value("name").unwrap_or(publisher);
-    let key = read_key(a.value("key").ok_or("--key is required")?)?;
     let out = a.value("out").map(PathBuf::from).unwrap_or_else(|| dir.join("index.json"));
+    let base = a.value("download-base").map(|b| b.trim_end_matches('/'));
     // Revocations and other publishers of an existing index are kept.
     let mut index = match std::fs::read_to_string(&out) {
-        Ok(text) => Index::parse(&text)?,
+        Ok(text) => current_format(Index::parse(&text)?, &out.to_string_lossy())?,
         Err(_) => Index { format: package::INDEX_FORMAT, ..Index::default() },
     };
-    // Earlier keys of the publisher stay listed (packages they signed remain valid until revoked).
-    let current = key.public_base64();
-    let earlier: Vec<KeyEntry> = index
-        .publishers
-        .iter()
-        .filter(|p| p.id == publisher)
-        .flat_map(|p| p.keys.iter().filter(|k| k.key != current).cloned())
-        .collect();
-    index.publishers.retain(|p| p.id != publisher);
-    let keys: Vec<KeyEntry> = std::iter::once(KeyEntry { key: current, revoked: false }).chain(earlier).collect();
-    index.publishers.push(package::Publisher { id: publisher.into(), name: name.into(), keys });
-    index.plugins.clear();
+    let publisher = match (a.value("publisher"), a.value("key")) {
+        (Some(publisher), Some(key)) => {
+            let key = read_key(key)?;
+            let name = a.value("name").unwrap_or(publisher);
+            let previous = a.value("previous-key").map(read_key).transpose()?;
+            index.publishers =
+                register_key(std::mem::take(&mut index.publishers), publisher, name, &key, previous.as_ref())?;
+            Some(publisher)
+        }
+        (None, None) if a.has("previous-key") => return Err("--previous-key goes with --publisher and --key".into()),
+        (None, None) => None,
+        _ => return Err("--publisher and --key go together".into()),
+    };
     let mut packages: Vec<PathBuf> = std::fs::read_dir(&dir)
         .map_err(|e| e.to_string())?
         .flatten()
@@ -552,35 +612,144 @@ fn cmd_index(args: &[String]) -> Result<(), String> {
         .filter(|p| p.extension().is_some_and(|e| e == package::PACKAGE_EXTENSION))
         .collect();
     packages.sort();
+    let engine = PluginEngine::new()?;
+    let mut added: Vec<IndexEntry> = Vec::new();
     for path in packages {
-        let scratch = std::env::temp_dir().join(format!("openidea-plugin-index-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&scratch);
-        let unpacked = package::unpack(&path, &scratch)?;
+        let tmp = scratch_dir("index")?;
+        let scratch = tmp.path().join("package");
         let entry = (|| {
+            let unpacked = package::unpack(&path, &scratch)?;
             let m = Manifest::load(&scratch)?;
             let files = with_scratch_host(|h| h.package_files_of(&scratch).map_err(|e| e.to_string()))?;
             let digest = package::package_digest(&scratch, &files).map_err(|e| e.to_string())?;
-            let sig = unpacked.signature.as_ref().ok_or_else(|| format!("{}: not signed", path.display()))?;
-            sig.check(&m.id, &m.version, &digest).map_err(|e| format!("{}: {e}", path.display()))?;
+            let sig = unpacked.signature.as_ref().ok_or("not signed")?;
+            let signer = index.verify(sig, &m.id, &m.version, &digest)?;
+            if publisher.is_some_and(|p| p != signer) {
+                return Err(format!("signed by {signer}, not {}", publisher.unwrap_or_default()));
+            }
+            if added.iter().any(|e| (&e.id, &e.version) == (&m.id, &m.version)) {
+                return Err(format!("another package of {} {} is in the folder", m.id, m.version));
+            }
+            if m.legacy {
+                return Err("plugin.toml uses the 0.1 format; see plugins/README.md".into());
+            }
+            let built_for = match &m.wasm {
+                Some(wasm) => engine.check_component(&engine.compile(&scratch.join(wasm))?)?,
+                None => None,
+            };
+            let file = path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
             Ok::<_, String>(IndexEntry {
                 id: m.id.clone(),
                 name: m.name.clone(),
                 version: m.version.clone(),
                 description: m.description.clone(),
                 authors: m.authors.clone(),
-                publisher: sig.publisher.clone(),
-                download: path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default(),
+                publisher: signer,
+                download: base.map_or_else(|| file.clone(), |b| format!("{b}/{file}")),
                 digest,
                 capabilities: m.capabilities.all().map(|c| c.to_string()).collect(),
+                engine: package::engine_requirement(&m.engine, built_for.as_ref()),
+                categories: m.categories(),
             })
         })();
-        let _ = std::fs::remove_dir_all(&scratch);
-        let entry = entry?;
-        println!("  {} {}", entry.id, entry.version);
-        index.plugins.push(entry);
+        let entry = entry.map_err(|e| format!("{}: {e}", path.display()))?;
+        println!("  {} {} (plugin API {})", entry.id, entry.version, entry.engine);
+        added.push(entry);
     }
-    let json = serde_json::to_string_pretty(&index).map_err(|e| e.to_string())?;
-    std::fs::write(&out, json).map_err(|e| format!("{}: {e}", out.display()))?;
+    // A publisher's earlier versions of these plugins stay for IDEs that can't load the new
+    // ones (pruned below); plugins no longer in the folder go.
+    index.plugins.retain(|e| match publisher {
+        Some(p) => {
+            e.publisher != p
+                || (added.iter().any(|n| n.id == e.id)
+                    && !added.iter().any(|n| (&n.id, &n.version) == (&e.id, &e.version)))
+        }
+        None => false,
+    });
+    index.plugins.extend(added);
+    index.prune_versions();
+    write_index(&index, &out)
+}
+
+/// `publishers` with `key` as `publisher`'s current key. Earlier keys stay listed
+/// (packages they signed remain valid until revoked); a key new to the
+/// publisher is endorsed by `previous`, one of them, so installed plugins
+/// signed with it update without asking.
+fn register_key(
+    mut publishers: Vec<package::Publisher>,
+    publisher: &str,
+    name: &str,
+    key: &PublisherKey,
+    previous: Option<&PublisherKey>,
+) -> Result<Vec<package::Publisher>, String> {
+    let current = key.public_base64();
+    let earlier: Vec<KeyEntry> = publishers.iter().filter(|p| p.id == publisher).flat_map(|p| p.keys.clone()).collect();
+    let entry = match earlier.iter().find(|k| k.key == current) {
+        Some(listed) => listed.clone(),
+        None => {
+            let endorsement = match previous {
+                Some(prev) => {
+                    let prev_key = prev.public_base64();
+                    if !earlier.iter().any(|k| k.key == prev_key && !k.revoked) {
+                        return Err(format!("--previous-key is not one of {publisher}'s valid keys in the index"));
+                    }
+                    Some(prev.endorse(publisher, &current))
+                }
+                None => {
+                    if earlier.iter().any(|k| !k.revoked) {
+                        println!(
+                            "  warning: {publisher}'s new key is not endorsed (--previous-key): users who installed \
+                             its plugins will be asked to confirm the change when they update"
+                        );
+                    }
+                    None
+                }
+            };
+            KeyEntry { endorsement, ..KeyEntry::new(current.clone()) }
+        }
+    };
+    let keys = std::iter::once(entry).chain(earlier.into_iter().filter(|k| k.key != current)).collect();
+    publishers.retain(|p| p.id != publisher);
+    publishers.push(package::Publisher { id: publisher.into(), name: name.into(), keys });
+    Ok(publishers)
+}
+
+/// `index`, unless a newer `openidea-plugin` wrote it (rewriting it would drop what this one can't read).
+fn current_format(index: Index, file: &str) -> Result<Index, String> {
+    if index.is_newer() {
+        return Err(format!(
+            "{file}: index format {} is newer than this tool writes; update openidea-plugin",
+            index.format
+        ));
+    }
+    Ok(index)
+}
+
+fn cmd_merge(args: &[String]) -> Result<(), String> {
+    let a = Args::parse(args, &[], &["keep", "out"])?;
+    let [base, other] = a.positional.as_slice() else {
+        return Err("usage: openidea-plugin merge <index> <other-index> --keep ID [--out FILE]".into());
+    };
+    let keep = a.value("keep").ok_or("--keep is required")?;
+    let out = a.value("out").unwrap_or(base);
+    let mut index =
+        current_format(Index::parse(&std::fs::read_to_string(base).map_err(|e| format!("{base}: {e}"))?)?, base)?;
+    let bytes = read_market_url(other, 16 << 20)?;
+    let theirs = Index::parse(&String::from_utf8(bytes).map_err(|_| format!("{other}: not UTF-8"))?)?;
+    let mut theirs = current_format(theirs, other)?;
+    // Their downloads are relative to their index, not to ours.
+    for e in &mut theirs.plugins {
+        e.download = resolve_market_href(other, &e.download);
+    }
+    let count = theirs.plugins.len();
+    index.include(theirs, &[keep]).map_err(|e| format!("{other}: {e}"))?;
+    println!("  {count} plugins from {other}");
+    write_index(&index, Path::new(out))
+}
+
+fn write_index(index: &Index, out: &Path) -> Result<(), String> {
+    let json = serde_json::to_string_pretty(index).map_err(|e| e.to_string())?;
+    std::fs::write(out, json).map_err(|e| format!("{}: {e}", out.display()))?;
     println!("-> {} ({} plugins)", out.display(), index.plugins.len());
     Ok(())
 }
@@ -589,6 +758,25 @@ fn cmd_index(args: &[String]) -> Result<(), String> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn a_new_key_is_endorsed_by_the_previous_one() {
+        let (k1, k2, k3) =
+            (PublisherKey::from_seed([1; 32]), PublisherKey::from_seed([2; 32]), PublisherKey::from_seed([3; 32]));
+        let first = register_key(Vec::new(), "acme", "ACME", &k1, None).unwrap();
+        let rotated = register_key(first.clone(), "acme", "ACME", &k2, Some(&k1)).unwrap();
+        let index = Index { format: package::INDEX_FORMAT, publishers: rotated.clone(), ..Index::default() };
+        assert!(index.succeeds("acme", &k1.public_base64(), &k2.public_base64()));
+        assert_eq!(rotated[0].keys.len(), 2, "the earlier key stays listed");
+        // Registering the current key again keeps its endorsement.
+        let again = register_key(rotated.clone(), "acme", "ACME", &k2, None).unwrap();
+        assert_eq!(again, rotated);
+        // Only a key the publisher has can endorse.
+        assert!(register_key(first.clone(), "acme", "ACME", &k2, Some(&k3)).unwrap_err().contains("--previous-key"));
+        // Without one the new key is listed unendorsed.
+        let unendorsed = register_key(first, "acme", "ACME", &k3, None).unwrap();
+        assert!(unendorsed[0].keys[0].endorsement.is_none());
+    }
+
     #[test]
     fn names() {
         assert_eq!(slugify("My Cool_Plugin"), "my-cool-plugin");
@@ -601,13 +789,189 @@ mod tests {
         assert_eq!(relative(Path::new("/x/y"), Path::new("/z")), None);
     }
 
+    #[test]
+    fn new_plugins_depend_on_the_sdk_by_path_only_in_its_source_tree() {
+        let tree = dunce::canonicalize(concat!(env!("CARGO_MANIFEST_DIR"), "/../..")).unwrap();
+        assert_eq!(
+            sdk_dependency(None, &tree.join("plugins/official/new")).unwrap(),
+            "{ path = \"../../../sdk/rust/openidea-plugin\" }"
+        );
+        let outside = dunce::canonicalize(std::env::temp_dir()).unwrap().join("my-plugin");
+        assert_eq!(
+            sdk_dependency(None, &outside).unwrap(),
+            format!("{{ git = \"https://github.com/l0ng-ai/openidea\", tag = \"v{}\" }}", env!("CARGO_PKG_VERSION"))
+        );
+        let sdk = tree.join("sdk/rust/openidea-plugin");
+        assert!(sdk_dependency(Some(sdk.to_str().unwrap()), &outside).unwrap().starts_with("{ path = "));
+        assert!(
+            sdk_dependency(Some(tree.join("wit").to_str().unwrap()), &outside)
+                .unwrap_err()
+                .contains("not the openidea-plugin SDK")
+        );
+    }
+
+    /// A theme package `id` signed by `publisher` with `key`, packed into `out`.
+    fn signed_theme(tmp: &Path, id: &str, publisher: &str, key: &str, out: &Path) {
+        signed_theme_version(tmp, id, "0.1.0", "^1.0", publisher, key, out);
+    }
+
+    fn signed_theme_version(tmp: &Path, id: &str, version: &str, engine: &str, publisher: &str, key: &str, out: &Path) {
+        let src = tmp.join("src").join(format!("{id}-{version}"));
+        let vars = templates::Vars { id, name: id, sdk: None };
+        for (rel, content) in templates::render(templates::Template::Theme, &vars) {
+            let path = src.join(rel);
+            std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+            let content = content
+                .replace("version = \"0.1.0\"", &format!("version = \"{version}\""))
+                .replace("engines.openidea = \"^1.0\"", &format!("engines.openidea = \"{engine}\""));
+            std::fs::write(path, content).unwrap();
+        }
+        std::fs::create_dir_all(out).unwrap();
+        let args = [src.to_str().unwrap(), "--key", key, "--publisher", publisher, "--out"]
+            .into_iter()
+            .map(String::from)
+            .chain([out.join(format!("{id}-{version}.oiplugin")).to_string_lossy().into_owned()])
+            .collect::<Vec<_>>();
+        cmd_pack(&args).unwrap();
+    }
+
+    #[test]
+    fn a_release_keeps_the_versions_older_ides_need() {
+        let tmp = tempfile::tempdir().unwrap();
+        let t = tmp.path();
+        let key = t.join("acme.key");
+        std::fs::write(&key, PublisherKey::from_seed([5; 32]).seed_base64()).unwrap();
+        let key = key.to_string_lossy().into_owned();
+        let index_file = t.join("index.json");
+        let release = |n: usize, packages: &[(&str, &str, &str)]| {
+            let dir = t.join(format!("release-{n}"));
+            for (id, version, engine) in packages {
+                signed_theme_version(t, id, version, engine, "acme", &key, &dir);
+            }
+            let base = format!("https://example.com/download/v{n}");
+            let args = [dir.to_str().unwrap(), "--publisher", "acme", "--key", &key, "--download-base", &base];
+            cmd_index(&strings(&[&args[..], &["--out", index_file.to_str().unwrap()]].concat())).unwrap();
+            let index = Index::parse(&std::fs::read_to_string(&index_file).unwrap()).unwrap();
+            index.plugins.iter().map(|e| format!("{} {} {}", e.id, e.version, e.download)).collect::<Vec<_>>()
+        };
+        release(1, &[("acme.a", "1.0.0", "^1.0"), ("acme.b", "1.0.0", "^1.0")]);
+        // Same requirement: the newer version replaces it; acme.b is gone from the release.
+        assert_eq!(
+            release(2, &[("acme.a", "1.1.0", "^1.0")]),
+            ["acme.a 1.1.0 https://example.com/download/v2/acme.a-1.1.0.oiplugin"]
+        );
+        // Another API requirement: the last version for the earlier one stays, where it was published.
+        assert_eq!(
+            release(3, &[("acme.a", "2.0.0", ">=1.0, <2")]),
+            [
+                "acme.a 1.1.0 https://example.com/download/v2/acme.a-1.1.0.oiplugin",
+                "acme.a 2.0.0 https://example.com/download/v3/acme.a-2.0.0.oiplugin",
+            ]
+        );
+        let index = Index::parse(&std::fs::read_to_string(&index_file).unwrap()).unwrap();
+        assert_eq!(index.offered()[0].0.version, "2.0.0", "the newest this IDE can load");
+    }
+
+    fn strings(args: &[&str]) -> Vec<String> {
+        args.iter().map(|a| a.to_string()).collect()
+    }
+
+    #[test]
+    fn official_and_community_indexes_merge() {
+        let tmp = tempfile::tempdir().unwrap();
+        let t = tmp.path();
+        let mut keys = Vec::new();
+        for (name, seed) in [("openidea", 1), ("alice", 2), ("carol", 3)] {
+            let file = t.join(format!("{name}.key"));
+            let key = PublisherKey::from_seed([seed; 32]);
+            std::fs::write(&file, key.seed_base64()).unwrap();
+            keys.push((file.to_string_lossy().into_owned(), key.public_base64()));
+        }
+        let (official, community) = (t.join("official"), t.join("community"));
+        signed_theme(t, "openidea.night", "openidea", &keys[0].0, &official);
+        signed_theme(t, "alice.dawn", "alice", &keys[1].0, &community);
+        let official_index = official.join("index.json");
+        let community_index = community.join("index.json");
+        let release = strings(&[official.to_str().unwrap(), "--publisher", "openidea", "--key", &keys[0].0]);
+        cmd_index(&release).unwrap();
+
+        // The community index lists its publishers; `index` without a key checks packages against them.
+        let skeleton = Index {
+            format: package::INDEX_FORMAT,
+            publishers: vec![package::Publisher {
+                id: "alice".into(),
+                name: "Alice".into(),
+                keys: vec![KeyEntry::new(keys[1].1.clone())],
+            }],
+            ..Index::default()
+        };
+        write_index(&skeleton, &community_index).unwrap();
+        cmd_index(&strings(&[community.to_str().unwrap()])).unwrap();
+
+        cmd_merge(&strings(&[
+            official_index.to_str().unwrap(),
+            community_index.to_str().unwrap(),
+            "--keep",
+            "openidea",
+        ]))
+        .unwrap();
+        // A release rebuilds the official plugins and keeps the community's.
+        cmd_index(&release).unwrap();
+        let index = Index::parse(&std::fs::read_to_string(&official_index).unwrap()).unwrap();
+        let listed: Vec<_> = index.plugins.iter().map(|e| (e.id.as_str(), e.publisher.as_str())).collect();
+        assert_eq!(listed, [("alice.dawn", "alice"), ("openidea.night", "openidea")]);
+        assert_eq!(index.plugins[1].categories, ["themes"], "implied by the theme");
+        assert_eq!(index.plugins[1].download, "openidea.night-0.1.0.oiplugin");
+        assert!(Path::new(&index.plugins[0].download).is_absolute(), "{}", index.plugins[0].download);
+
+        // A package by a publisher the index doesn't know is refused.
+        signed_theme(t, "carol.noon", "carol", &keys[2].0, &community);
+        let err = cmd_index(&strings(&[community.to_str().unwrap()])).unwrap_err();
+        assert!(err.contains("unknown publisher"), "{err}");
+    }
+
+    /// `cargo test` of a new Rust plugin (its own tests against the mock host) with this SDK.
+    #[test]
+    fn the_command_template_builds_against_the_sdk() {
+        let dir = std::env::temp_dir().join(format!("openidea-plugin-template-build-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        let dir = dunce::canonicalize(&dir).unwrap();
+        let plugin = dir.join("plugin");
+        let sdk = concat!(env!("CARGO_MANIFEST_DIR"), "/../../sdk/rust/openidea-plugin");
+        let sdk = sdk_dependency(Some(sdk), &plugin).unwrap();
+        let vars = templates::Vars { id: "acme.sample", name: "Sample", sdk: Some(&sdk) };
+        for (rel, content) in templates::render(templates::Template::Command, &vars) {
+            let path = plugin.join(rel);
+            std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+            std::fs::write(path, content).unwrap();
+        }
+        // The SDK's lockfile keeps the versions its own CI builds with (the resolver also
+        // looks up the wasm-only dependencies, which may not be downloaded yet).
+        let sdk_lock = concat!(env!("CARGO_MANIFEST_DIR"), "/../../sdk/rust/openidea-plugin/Cargo.lock");
+        std::fs::copy(sdk_lock, plugin.join("Cargo.lock")).unwrap();
+        let out = Command::new(std::env::var("CARGO").unwrap_or_else(|_| "cargo".into()))
+            .args(["test", "--manifest-path"])
+            .arg(plugin.join("Cargo.toml"))
+            .env("CARGO_TARGET_DIR", dir.join("target"))
+            .output()
+            .unwrap();
+        assert!(
+            out.status.success(),
+            "{}{}",
+            String::from_utf8_lossy(&out.stdout),
+            String::from_utf8_lossy(&out.stderr)
+        );
+        std::fs::remove_dir_all(&dir).unwrap();
+    }
+
     #[test]
     fn every_template_is_a_valid_package() {
         for t in templates::Template::ALL {
             let dir =
                 std::env::temp_dir().join(format!("openidea-plugin-template-{}-{}", t.label(), std::process::id()));
             let _ = std::fs::remove_dir_all(&dir);
-            let vars = templates::Vars { id: "acme.sample", name: "Sample", sdk: Some("../sdk") };
+            let vars = templates::Vars { id: "acme.sample", name: "Sample", sdk: Some("{ path = \"../sdk\" }") };
             for (rel, content) in templates::render(t, &vars) {
                 let path = dir.join(rel);
                 std::fs::create_dir_all(path.parent().unwrap()).unwrap();
diff --git a/crates/ide-host/src/bin/openidea-plugin/templates.rs b/crates/ide-host/src/bin/openidea-plugin/templates.rs
index fc23cdd0..44613eea 100644
--- a/crates/ide-host/src/bin/openidea-plugin/templates.rs
+++ b/crates/ide-host/src/bin/openidea-plugin/templates.rs
@@ -32,6 +32,7 @@ impl Template {
 pub struct Vars<'a> {
     pub id: &'a str,
     pub name: &'a str,
+    /// The SDK dependency, as a TOML value (`{ path = "…" }`).
     pub sdk: Option<&'a str>,
 }
 
@@ -82,6 +83,9 @@ name = "__NAME__"
 version = "0.1.0"
 description = "Adds two sample commands."
 authors = []
+# Marketplace categories (up to 3): languages, themes, icon-themes, linters,
+# vcs, ai, frameworks, tools, other.
+categories = ["tools"]
 engines.openidea = "^1.0"
 # Built by `openidea-plugin build`. The code is loaded the first time one of
 # its commands runs; the commands below show in Find Action before that.
@@ -115,7 +119,7 @@ publish = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-openidea-plugin = { path = "__SDK__" }
+openidea-plugin = __SDK__
 
 [profile.release]
 opt-level = "s"
@@ -127,7 +131,7 @@ panic = "abort"
 
 const COMMAND_LIB: &str = r#"//! __NAME__: an OpenIDEA plugin.
 
-use openidea_plugin::{Invocation, NotificationLevel, Plugin, host, register_plugin};
+use openidea_plugin::{Error, Invocation, NotificationLevel, Plugin, host, register_plugin};
 
 #[derive(Default)]
 pub struct Main {
@@ -135,7 +139,7 @@ pub struct Main {
 }
 
 impl Plugin for Main {
-    fn run_command(&mut self, id: &str, ctx: &Invocation, _arg: Option<&str>) -> Result<Option<String>, String> {
+    fn run_command(&mut self, id: &str, ctx: &Invocation, _arg: Option<&str>) -> Result<Option<String>, Error> {
         match id {
             "say-hello" => {
                 // Instance state lasts until the plugin is idle for a while;
@@ -150,7 +154,7 @@ impl Plugin for Main {
                 let text = editor.document()?.text;
                 Ok(Some(format!("{} lines in {}", text.lines().count(), editor.path())))
             }
-            _ => Err(format!("unknown command {id}")),
+            _ => Err(format!("unknown command {id}").into()),
         }
     }
 }
diff --git a/crates/ide-host/src/lib.rs b/crates/ide-host/src/lib.rs
index edaafb43..2685d7bf 100644
--- a/crates/ide-host/src/lib.rs
+++ b/crates/ide-host/src/lib.rs
@@ -25,7 +25,7 @@ use ide_language::{LanguageRegistry, Syntax};
 use ide_run::ProcessManager;
 use ide_terminal::TerminalManager;
 use ide_workspace::SettingsStore;
-use parking_lot::RwLock;
+use parking_lot::{Mutex, RwLock};
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::{Arc, OnceLock};
@@ -74,15 +74,23 @@ pub struct Host {
     pub environment: environment::Environment,
     /// The HTTP proxy's saved password (see `proxy.rs`).
     proxy_password: ide_ssh::secrets::SecretFile,
+    /// The proxy password when it could not be saved (no credential store).
+    proxy_session_password: Mutex<Option<String>>,
     pub(crate) sink_for: SinkFactory,
     owner: fn(&str) -> &str,
     pub runtime: tokio::runtime::Handle,
     /// One project per window, keyed by window label.
     projects: RwLock<HashMap<String, Arc<Project>>>,
+    pub(crate) external_logs: RwLock<HashMap<String, Vec<Arc<ide_vcs::Repo>>>>,
     requests: requests::Requests,
     project_requests: RwLock<HashMap<String, Vec<RequestId>>>,
+    /// Shutdowns of projects closed with [`Host::close_project_detached`].
+    closing: parking_lot::Mutex<Vec<std::thread::JoinHandle<()>>>,
 }
 
+/// How long exit waits for project shutdown before giving up.
+const EXIT_SHUTDOWN_WAIT: std::time::Duration = std::time::Duration::from_secs(10);
+
 impl Host {
     pub fn new(config: HostConfig) -> Self {
         let HostConfig {
@@ -102,6 +110,7 @@ impl Host {
         let host = Self {
             trust: trust::TrustStore::load(&config_dir, &data_dir),
             proxy_password: ide_ssh::secrets::SecretFile::new(data_dir.join("proxy-password.json")),
+            proxy_session_password: Mutex::default(),
             remote: Arc::new(ide_remote::RemoteService::new(ssh.clone(), data_dir.join("remote"))),
             ssh,
             environment: environment::Environment::new(project_environment, local_data_dir.clone()),
@@ -122,8 +131,10 @@ impl Host {
             owner,
             runtime,
             projects: RwLock::default(),
+            external_logs: RwLock::default(),
             requests: Default::default(),
             project_requests: RwLock::default(),
+            closing: Default::default(),
         };
         host.apply_proxy();
         host
@@ -177,45 +188,69 @@ impl Host {
         }
     }
 
+    /// Closes `window`'s project and waits until its language servers, kernels and
+    /// debug sessions have shut down. Never call this on the UI event-loop thread:
+    /// the shutdown runs on the async runtime, whose workers may themselves be
+    /// waiting for the event loop (IPC responses, window queries). Use
+    /// [`Self::close_project_detached`] there.
     pub fn close_project(&self, window: &str) {
-        let project = self.projects.write().remove(window);
-        if let Some(project) = project {
-            if !project.light {
-                self.environment.project_closed();
-            }
-            if let Some(bridge) = &project.kotlin_bridge {
-                bridge.stop();
-            }
-            project.documents.clear_workspace_edit_history();
-            project.agents.shutdown();
-            project.notebooks.stop_admission();
-            // What the closing window started goes with it — the builds and searches it
-            // asked for, its runs, its shells and its debug sessions — and the language
-            // servers finish shutting down before the window is gone, as IDEA closes a
-            // project's processes.
-            for request in self.project_requests.write().remove(self.owner_window(window)).unwrap_or_default() {
-                self.cancel_request(request);
-            }
-            self.processes.kill_project(&project.root);
-            self.terminals.kill_key(self.owner_window(window));
-            self.shutdown_project_workers_blocking(
-                vec![project.notebooks.clone()],
-                project.kotlin_bridge.iter().cloned().collect(),
-                Some(project.lsp.clone()),
-                Some((self.debugger.clone(), window.to_owned())),
-            );
+        if let Some(shutdown) = self.begin_close(window) {
+            self.wait_blocking(shutdown);
         }
     }
 
-    /// Synchronous project/window destruction must finish owned kernel cleanup,
-    /// not enqueue work which can be lost as the desktop runtime exits.
-    fn shutdown_project_workers_blocking(
+    /// Like [`Self::close_project`], but returns once the project is detached from
+    /// the window; its workers finish shutting down in the background, and
+    /// [`Self::shutdown_notebooks_on_exit`] waits for them before the process exits.
+    pub fn close_project_detached(&self, window: &str) {
+        if let Some(shutdown) = self.begin_close(window) {
+            let mut closing = self.closing.lock();
+            closing.retain(|handle| !handle.is_finished());
+            closing.push(shutdown);
+        }
+    }
+
+    /// Detaches the project from `window` and stops what it started, synchronously,
+    /// so the window can open another project at once. Returns the thread that
+    /// finishes shutting down its workers.
+    fn begin_close(&self, window: &str) -> Option<std::thread::JoinHandle<()>> {
+        self.external_logs.write().remove(self.owner_window(window));
+        for request in self.project_requests.write().remove(self.owner_window(window)).unwrap_or_default() {
+            self.cancel_request(request);
+        }
+        let project = self.projects.write().remove(window)?;
+        if !project.light {
+            self.environment.project_closed();
+        }
+        if let Some(bridge) = &project.kotlin_bridge {
+            bridge.stop();
+        }
+        project.documents.clear_workspace_edit_history();
+        project.agents.shutdown();
+        project.notebooks.stop_admission();
+        // What the closing window started goes with it — the builds and searches it
+        // asked for, its runs, its shells and its debug sessions — and its language
+        // servers shut down.
+        self.processes.kill_project(&project.root);
+        self.terminals.kill_key(self.owner_window(window));
+        Some(self.spawn_project_shutdown(
+            vec![project.notebooks.clone()],
+            project.kotlin_bridge.iter().cloned().collect(),
+            Some(project.lsp.clone()),
+            Some((self.debugger.clone(), window.to_owned())),
+        ))
+    }
+
+    /// Project/window destruction must finish owned kernel cleanup, not enqueue
+    /// work which can be lost as the desktop runtime exits: the returned thread is
+    /// joined by the closer or, for a detached close, before exit.
+    fn spawn_project_shutdown(
         &self,
         notebooks: Vec<Arc<notebook::NotebookService>>,
         bridges: Vec<Arc<kotlin_bridge::KotlinBridge>>,
         lsp: Option<Arc<ide_lsp::LspManager>>,
         debug: Option<(Arc<ide_dap::DebugManager>, String)>,
-    ) {
+    ) -> std::thread::JoinHandle<()> {
         for bridge in &bridges {
             bridge.stop();
         }
@@ -223,25 +258,37 @@ impl Host {
             service.stop_admission();
         }
         let runtime = self.runtime.clone();
-        let wait = move || {
-            let worker = std::thread::spawn(move || {
-                runtime.block_on(async move {
-                    for bridge in bridges {
-                        bridge.shutdown().await;
-                    }
-                    for service in notebooks {
-                        service.shutdown().await;
-                    }
-                    if let Some(lsp) = lsp {
-                        lsp.shutdown_all().await;
-                    }
-                    if let Some((debug, key)) = debug {
-                        debug.stop_key(&key).await;
-                    }
-                });
+        std::thread::spawn(move || {
+            runtime.block_on(async move {
+                for bridge in bridges {
+                    bridge.shutdown().await;
+                }
+                for service in notebooks {
+                    service.shutdown().await;
+                }
+                if let Some(lsp) = lsp {
+                    lsp.shutdown_all().await;
+                }
+                if let Some((debug, key)) = debug {
+                    debug.stop_key(&key).await;
+                }
             });
-            if let Err(error) = worker.join() {
-                tracing::error!("notebook shutdown thread failed: {error:?}");
+        })
+    }
+
+    /// Waits for detached closes, so a project opened next never races the
+    /// language servers of one still shutting down (e.g. over a shared workspace).
+    pub(crate) fn wait_detached_closes(&self) {
+        let pending: Vec<_> = self.closing.lock().drain(..).collect();
+        for shutdown in pending {
+            self.wait_blocking(shutdown);
+        }
+    }
+
+    fn wait_blocking(&self, shutdown: std::thread::JoinHandle<()>) {
+        let wait = move || {
+            if let Err(error) = shutdown.join() {
+                tracing::error!("project shutdown thread failed: {error:?}");
             }
         };
         if tokio::runtime::Handle::try_current()
@@ -253,15 +300,32 @@ impl Host {
         }
     }
 
-    /// Called before the desktop runtime exits, including update/restart exits.
+    /// Called before the desktop runtime exits, including update/restart exits, on
+    /// the event-loop thread: waits for detached closes and the open projects'
+    /// kernels, but no longer than [`EXIT_SHUTDOWN_WAIT`], so a runtime worker
+    /// stuck on the event loop cannot keep the process from exiting.
     pub fn shutdown_notebooks_on_exit(&self) {
         let projects = self.projects();
-        self.shutdown_project_workers_blocking(
+        let mut pending: Vec<_> = self.closing.lock().drain(..).collect();
+        pending.push(self.spawn_project_shutdown(
             projects.iter().map(|project| project.notebooks.clone()).collect(),
             projects.iter().filter_map(|project| project.kotlin_bridge.clone()).collect(),
             None,
             None,
-        );
+        ));
+        let deadline = std::time::Instant::now() + EXIT_SHUTDOWN_WAIT;
+        while pending.iter().any(|handle| !handle.is_finished()) {
+            if std::time::Instant::now() >= deadline {
+                tracing::warn!("project shutdown did not finish within {EXIT_SHUTDOWN_WAIT:?}; exiting anyway");
+                return;
+            }
+            std::thread::sleep(std::time::Duration::from_millis(20));
+        }
+        for handle in pending {
+            if let Err(error) = handle.join() {
+                tracing::error!("project shutdown thread failed: {error:?}");
+            }
+        }
     }
 
     /// Called before desktop exit, which may bypass document destructors.
@@ -311,14 +375,20 @@ impl Host {
     }
 
     pub fn begin_project_request(&self, window: &str, id: RequestId) -> CancellationToken {
-        let token = self.begin_request(id);
-        self.project_requests.write().entry(self.owner_window(window).to_owned()).or_default().push(id);
+        let token = self.begin_project_read_request(window, id);
         if self.project(window).is_ok_and(|p| !p.is_trusted()) {
             token.cancel();
         }
         token
     }
 
+    /// Read-only work remains cancellable/disposed with its window in restricted projects.
+    pub fn begin_project_read_request(&self, window: &str, id: RequestId) -> CancellationToken {
+        let token = self.begin_request(id);
+        self.project_requests.write().entry(self.owner_window(window).to_owned()).or_default().push(id);
+        token
+    }
+
     pub fn end_request(&self, id: RequestId) {
         for ids in self.project_requests.write().values_mut() {
             ids.retain(|entry| *entry != id);
diff --git a/crates/ide-host/src/ops/build.rs b/crates/ide-host/src/ops/build.rs
index 472411a3..5d0fb052 100644
--- a/crates/ide-host/src/ops/build.rs
+++ b/crates/ide-host/src/ops/build.rs
@@ -32,6 +32,7 @@ pub fn load(root: &Path, cache: &Path, settings: &Settings) -> BuildModel {
         cache,
         ide_sdk::apply::maven_local_repository(root, settings),
         &settings.languages.java.maven,
+        &settings.languages.java.gradle,
     );
     let jdk = ide_sdk::apply::project_jdk(root, settings);
     if let Some(m) = &mut model.maven {
@@ -45,7 +46,7 @@ pub fn load(root: &Path, cache: &Path, settings: &Settings) -> BuildModel {
             p.options = options.clone();
         }
     }
-    if let Some(g) = &mut model.gradle {
+    for g in &mut model.gradle {
         g.env = ide_sdk::apply::gradle_env(root, settings, java_env(jdk.as_ref(), g.java_version));
         g.command = ide_sdk::apply::gradle_command(root, &root.join(&g.dir), settings).to_string_lossy().into_owned();
     }
@@ -65,11 +66,12 @@ pub fn load(root: &Path, cache: &Path, settings: &Settings) -> BuildModel {
         let hint = m.projects.iter().find_map(|p| missing(p.java_version));
         explain(&mut m.sync_error, hint);
     }
-    if let Some(g) = &mut model.gradle
-        && g.sync_error.is_some()
-    {
-        let hint = if settings.languages.java.gradle.jvm.trim().is_empty() { missing(g.java_version) } else { None };
-        explain(&mut g.sync_error, hint);
+    for g in &mut model.gradle {
+        if g.sync_error.is_some() {
+            let hint =
+                if settings.languages.java.gradle.jvm.trim().is_empty() { missing(g.java_version) } else { None };
+            explain(&mut g.sync_error, hint);
+        }
     }
     model
 }
@@ -94,9 +96,88 @@ pub async fn build_model(host: &Host, window: &str) -> IdeResult<BuildModel> {
     tokio::task::spawn_blocking(move || load(&root, &cache, &settings)).await.map_err(join_err)
 }
 
+fn linked_gradle_paths(
+    root: &Path,
+    settings: &ide_core::settings::GradleSettings,
+    paths: &[String],
+    link: bool,
+) -> IdeResult<Vec<String>> {
+    let existing = settings
+        .linked_projects
+        .clone()
+        .unwrap_or_else(|| ide_build::gradle::load_linked(root, settings).into_iter().map(|g| g.dir).collect());
+    let mut linked = Vec::new();
+    for path in existing {
+        let normalized = ide_build::gradle::normalize_linked_projects(root, std::slice::from_ref(&path))
+            .unwrap_or_else(|_| vec![path]);
+        for path in normalized {
+            if !linked.contains(&path) {
+                linked.push(path);
+            }
+        }
+    }
+    if link {
+        let directories: Vec<String> = paths
+            .iter()
+            .map(|path| {
+                let path = root.join(path);
+                let is_script = path.file_name().and_then(|n| n.to_str()).is_some_and(|name| {
+                    ide_build::gradle::SETTINGS_FILES.contains(&name) || ide_build::gradle::BUILD_FILES.contains(&name)
+                });
+                if is_script && path.is_file() {
+                    path.parent().unwrap_or(root).to_string_lossy().into_owned()
+                } else {
+                    path.to_string_lossy().into_owned()
+                }
+            })
+            .collect();
+        for path in ide_build::gradle::normalize_linked_projects(root, &directories)? {
+            if !linked.contains(&path) {
+                linked.push(path);
+            }
+        }
+    } else {
+        linked.retain(|path| !paths.contains(path));
+    }
+    Ok(linked)
+}
+
+async fn set_gradle_projects(host: &Host, window: &str, paths: Vec<String>, link: bool) -> IdeResult<BuildModel> {
+    host.require_trust(window)?;
+    let project = host.project(window)?;
+    tokio::task::spawn_blocking(move || {
+        if ide_workspace::workspace::Workspace::load(&project.root)?.is_some() {
+            return Err(IdeError::invalid("Open a workspace member as a project to link Gradle builds"));
+        }
+        let linked =
+            linked_gradle_paths(&project.root, &project.settings.effective().languages.java.gradle, &paths, link)?;
+        let key = "languages.java.gradle.linkedProjects";
+        let settings =
+            project.settings.set(ide_workspace::settings::SettingsScope::Project, key, serde_json::json!(linked))?;
+        project.refresh_index_scope();
+        project.lsp.reconfigure_soon();
+        project.sink.emit(IdeEvent::SettingsChanged { key: key.into() });
+        project.sink.emit(IdeEvent::ProjectRootsChanged { root: project.root.clone().into() });
+        Ok::<BuildModel, IdeError>(load(&project.root, &project.build_cache_dir(), &settings))
+    })
+    .await
+    .map_err(join_err)?
+}
+
+/// Links independent builds without changing their Gradle scripts.
+pub async fn gradle_link_projects(host: &Host, window: &str, paths: Vec<String>) -> IdeResult<BuildModel> {
+    set_gradle_projects(host, window, paths, true).await
+}
+
+/// Stops importing the selected independent builds; files and saved run configurations stay intact.
+pub async fn gradle_unlink_projects(host: &Host, window: &str, paths: Vec<String>) -> IdeResult<BuildModel> {
+    set_gradle_projects(host, window, paths, false).await
+}
+
 /// Runs Maven (`help:effective-pom dependency:tree`) or Gradle (`tasks --all`) in the
 /// background, reporting progress on `on_progress`; cancellable with `cancel_request(request)`.
 /// Returns the refreshed model; a failed build is reported in its `syncError`.
+#[allow(clippy::too_many_arguments)]
 pub async fn build_sync(
     host: &Host,
     window: &str,
@@ -104,6 +185,7 @@ pub async fn build_sync(
     request: RequestId,
     offline: bool,
     profiles: Vec<String>,
+    build_dir: Option<String>,
     on_progress: Channel<SyncProgress>,
 ) -> IdeResult<BuildModel> {
     host.require_trust(window)?;
@@ -122,6 +204,8 @@ pub async fn build_sync(
         project.sink.emit(ide_core::IdeEvent::ProjectRootsChanged { root: project.root.clone().into() });
     }
     let token = host.begin_project_request(window, request);
+    let completion_token = token.clone();
+    let original_links = settings.languages.java.gradle.linked_projects.clone();
     let result = tokio::task::spawn_blocking(move || {
         let current = load(&root, &cache, &settings);
         let env = match tool {
@@ -131,7 +215,7 @@ pub async fn build_sync(
                 .and_then(|m| m.projects.iter().find(|p| !p.env.is_empty()))
                 .map(|p| p.env.clone())
                 .unwrap_or_default(),
-            BuildTool::Gradle => current.gradle.as_ref().map(|g| g.env.clone()).unwrap_or_default(),
+            BuildTool::Gradle => BTreeMap::new(),
         };
         let options = SyncOptions {
             offline,
@@ -140,14 +224,31 @@ pub async fn build_sync(
             maven_command: ide_sdk::apply::maven_command(&root, &settings).map(|p| p.to_string_lossy().into_owned()),
             maven_options: ide_sdk::apply::maven_options(&root, &settings),
             maven_settings: settings.languages.java.maven.clone(),
-            gradle_command: current.gradle.as_ref().map(|g| g.command.clone()),
+            gradle_command: None,
         };
         let progress = |p: SyncProgress| {
             let _ = on_progress.send(p);
         };
         match tool {
             BuildTool::Maven => ide_build::sync_maven(&root, &cache, &options, &token, &progress)?,
-            BuildTool::Gradle => ide_build::sync_gradle(&root, &cache, &options, &token, &progress)?,
+            BuildTool::Gradle => {
+                if let Some(dir) = &build_dir
+                    && !current.gradle.iter().any(|g| &g.dir == dir)
+                {
+                    return Err(IdeError::not_found("Gradle project is no longer linked"));
+                }
+                for g in current.gradle.iter().filter(|g| build_dir.as_ref().is_none_or(|dir| dir == &g.dir)) {
+                    if token.is_cancelled() {
+                        return Err(IdeError::cancelled());
+                    }
+                    let options =
+                        SyncOptions { env: g.env.clone(), gradle_command: Some(g.command.clone()), ..options.clone() };
+                    ide_build::sync_gradle_model(&root, &cache, g, &options, &token, &progress)?;
+                }
+                if token.is_cancelled() {
+                    return Err(IdeError::cancelled());
+                }
+            }
         }
         Ok::<BuildModel, IdeError>(load(&root, &cache, &settings))
     })
@@ -155,6 +256,18 @@ pub async fn build_sync(
     .map_err(join_err);
     host.end_request(request);
     let model = result??;
+    if completion_token.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
+    if tool == BuildTool::Gradle && original_links != project.settings.effective().languages.java.gradle.linked_projects
+    {
+        // A late sync must not re-import a build that was unlinked while it ran.
+        return tokio::task::spawn_blocking(move || {
+            load(&project.root, &project.build_cache_dir(), &project.settings.effective())
+        })
+        .await
+        .map_err(join_err);
+    }
     if tool == BuildTool::Gradle {
         // The sync may report project folders outside the project (`includeFlat`): index and list them.
         project.refresh_index_scope();
@@ -238,6 +351,42 @@ pub async fn gradle_published_catalog(
     .map_err(join_err)
 }
 
+/// The resolved dependency tree of the Gradle project `gradle_path` (`:`, `:app`) for
+/// `configuration`, from Gradle's `dependencies` report; cancellable with `cancel_request(request)`.
+pub async fn gradle_dependencies(
+    host: &Host,
+    window: &str,
+    gradle_path: String,
+    configuration: String,
+    offline: bool,
+    request: RequestId,
+    build_dir: Option<String>,
+) -> IdeResult<Vec<ide_build::GradleDependency>> {
+    host.require_trust(window)?;
+    let project = host.project(window)?;
+    let (root, cache, settings) = (project.root.clone(), project.build_cache_dir(), project.settings.effective());
+    let token = host.begin_project_request(window, request);
+    let result = tokio::task::spawn_blocking(move || {
+        let model = load(&root, &cache, &settings);
+        let gradle = model
+            .gradle
+            .iter()
+            .find(|g| build_dir.as_ref().is_none_or(|dir| &g.dir == dir))
+            .ok_or_else(|| IdeError::not_found("Gradle project is no longer linked"))?;
+        let options = SyncOptions {
+            offline,
+            env: gradle.env.clone(),
+            gradle_command: Some(gradle.command.clone()),
+            ..Default::default()
+        };
+        ide_build::gradle_dependencies(&root, gradle, &options, &gradle_path, &configuration, &token)
+    })
+    .await
+    .map_err(join_err);
+    host.end_request(request);
+    result?
+}
+
 /// Where the direct dependency `dependency` of the Maven module `pom` is declared.
 pub async fn maven_dependency_declaration(
     host: &Host,
@@ -352,6 +501,11 @@ pub async fn build_run(
 /// Commands of this module the remote server answers.
 pub(crate) fn register(d: &mut Dispatcher) {
     d.add("build_model", |c| async move { build_model(&c.host, &c.window).await });
+    d.add("gradle_link_projects", |c| async move { gradle_link_projects(&c.host, &c.window, c.arg("paths")?).await });
+    d.add(
+        "gradle_unlink_projects",
+        |c| async move { gradle_unlink_projects(&c.host, &c.window, c.arg("paths")?).await },
+    );
     d.add("build_sync", |c| async move {
         build_sync(
             &c.host,
@@ -360,6 +514,7 @@ pub(crate) fn register(d: &mut Dispatcher) {
             c.arg("request")?,
             c.arg("offline")?,
             c.arg("profiles")?,
+            c.arg("buildDir")?,
             c.sender("onProgress")?,
         )
         .await
@@ -367,6 +522,18 @@ pub(crate) fn register(d: &mut Dispatcher) {
     d.add("gradle_published_catalog", |c| async move {
         gradle_published_catalog(&c.host, &c.window, c.arg("coordinates")?).await
     });
+    d.add("gradle_dependencies", |c| async move {
+        gradle_dependencies(
+            &c.host,
+            &c.window,
+            c.arg("gradlePath")?,
+            c.arg("configuration")?,
+            c.arg("offline")?,
+            c.arg("request")?,
+            c.arg("buildDir")?,
+        )
+        .await
+    });
     d.add("maven_dependency_declaration", |c| async move {
         maven_dependency_declaration(&c.host, &c.window, c.arg("pom")?, c.arg("dependency")?).await
     });
@@ -391,6 +558,48 @@ pub(crate) fn register(d: &mut Dispatcher) {
 mod gradle_settings_tests {
     use super::*;
 
+    #[test]
+    fn linking_retains_the_implicit_build_and_unlinking_all_stays_empty() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = dunce::canonicalize(tmp.path()).unwrap();
+        for name in ["a", "b"] {
+            std::fs::create_dir(root.join(name)).unwrap();
+            std::fs::write(root.join(name).join("settings.gradle"), format!("rootProject.name = '{name}'")).unwrap();
+        }
+        let mut settings = ide_core::settings::GradleSettings::default();
+        let linked = linked_gradle_paths(&root, &settings, &["b/settings.gradle".into()], true).unwrap();
+        assert_eq!(linked, ["a", "b"]);
+        settings.linked_projects = Some(linked);
+        assert_eq!(linked_gradle_paths(&root, &settings, &["b".into()], true).unwrap(), ["a", "b"]);
+        assert!(linked_gradle_paths(&root, &settings, &["missing".into()], true).is_err());
+        settings.linked_projects = Some(vec!["./a".into(), root.join("b").to_string_lossy().into_owned()]);
+        settings.linked_projects = Some(linked_gradle_paths(&root, &settings, &["a".into()], false).unwrap());
+        assert_eq!(settings.linked_projects.as_ref().unwrap(), &["b"]);
+        settings.linked_projects = Some(linked_gradle_paths(&root, &settings, &["b".into()], false).unwrap());
+        assert!(ide_build::gradle::load_linked(&root, &settings).is_empty());
+        assert!(root.join("a/settings.gradle").is_file());
+        assert!(root.join("b/settings.gradle").is_file());
+    }
+
+    #[test]
+    fn settings_resolve_each_linked_builds_own_wrapper() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = dunce::canonicalize(tmp.path()).unwrap();
+        let mut settings = Settings::default();
+        settings.languages.java.gradle.linked_projects = Some(vec!["a".into(), "b".into()]);
+        let executable = if cfg!(windows) { "gradlew.bat" } else { "gradlew" };
+        for dir in ["a", "b"] {
+            std::fs::create_dir(root.join(dir)).unwrap();
+            std::fs::write(root.join(dir).join("build.gradle"), "plugins { id 'java' }").unwrap();
+            std::fs::write(root.join(dir).join(executable), "").unwrap();
+        }
+        let model = load(&root, &root.join("cache"), &settings);
+        assert_eq!(model.gradle.len(), 2);
+        for g in model.gradle {
+            assert_eq!(g.command, root.join(&g.dir).join(executable).to_string_lossy());
+        }
+    }
+
     #[test]
     fn model_for_sync_tasks_and_compile_uses_gradle_settings() {
         let tmp = tempfile::tempdir().unwrap();
@@ -399,13 +608,13 @@ mod gradle_settings_tests {
         let wrapper = root.join(if cfg!(windows) { "gradlew.bat" } else { "gradlew" });
         std::fs::write(&wrapper, "").unwrap();
         let mut settings = Settings::default();
-        let default = load(root, &root.join("cache"), &settings).gradle.unwrap();
+        let default = load(root, &root.join("cache"), &settings).gradle.remove(0);
         assert_eq!(default.command, wrapper.to_string_lossy());
         settings.languages.java.gradle.jvm = "jdk21".into();
         settings.languages.java.gradle.user_home = "user-home".into();
         settings.languages.java.gradle.distribution = ide_core::settings::GradleDistribution::Local;
         settings.languages.java.gradle.home = "gradle-install".into();
-        let model = load(root, &root.join("cache"), &settings).gradle.unwrap();
+        let model = load(root, &root.join("cache"), &settings).gradle.remove(0);
         assert_eq!(
             model.command,
             root.join("gradle-install")
diff --git a/crates/ide-host/src/ops/db.rs b/crates/ide-host/src/ops/db.rs
index 63c8419a..102bf274 100644
--- a/crates/ide-host/src/ops/db.rs
+++ b/crates/ide-host/src/ops/db.rs
@@ -216,8 +216,7 @@ pub async fn connect(host: &Host, window: &str, id: &str) -> IdeResult<()> {
 /// manual mode rolls back what was not committed).
 pub async fn set_manual_commit(host: &Host, window: &str, id: &str, manual: bool) -> IdeResult<()> {
     let db = host.project(window)?.db.clone();
-    db.set_manual_commit(id, manual).await;
-    Ok(())
+    db.set_manual_commit(id, manual).await
 }
 
 /// Commits or rolls back the open transaction of a manual-commit data source.
diff --git a/crates/ide-host/src/ops/doc/commands.rs b/crates/ide-host/src/ops/doc/commands.rs
index e1fab8f9..ddb9c8a6 100644
--- a/crates/ide-host/src/ops/doc/commands.rs
+++ b/crates/ide-host/src/ops/doc/commands.rs
@@ -18,7 +18,7 @@ pub async fn blocking<T: Send + 'static>(f: impl FnOnce() -> IdeResult<T> + Send
 /// editor buffer, so syntax features and language-server requests work in it.
 pub async fn doc_open_virtual(host: &Host, window: &str, uri: String) -> IdeResult<DocumentInfo> {
     let project = host.project(window)?;
-    let vd = project.lsp.virtual_document(&uri).await?;
+    let vd = crate::ops::lsp::lsp_virtual_document(host, window, uri).await?;
     blocking(move || project.documents.open_virtual(&vd.uri, vd.language_id, &vd.text)).await
 }
 
diff --git a/crates/ide-host/src/ops/fs.rs b/crates/ide-host/src/ops/fs.rs
index 0277dfc4..e9807500 100644
--- a/crates/ide-host/src/ops/fs.rs
+++ b/crates/ide-host/src/ops/fs.rs
@@ -137,16 +137,23 @@ pub fn set_writable(host: &Host, window: &str, path: PathBuf, writable: bool) ->
 pub async fn delete(host: &Host, window: &str, path: PathBuf) -> IdeResult<()> {
     let history = host.project(window).ok().map(|p| p.history.clone());
     host.blocking(move || {
+        let paths = ide_workspace::file_ops::deletion_paths(&path)?;
         if let Some(h) = history {
-            h.record_deletion(&path, DELETE_SNAPSHOT_LIMIT);
+            for p in paths {
+                h.record_deletion(&p, DELETE_SNAPSHOT_LIMIT);
+            }
         }
-        ide_vfs::delete(&path)
+        ide_workspace::file_ops::delete(&path)
     })
     .await
 }
 
 pub async fn copy(host: &Host, from: PathBuf, to: PathBuf) -> IdeResult<()> {
-    host.blocking(move || ide_vfs::copy(&from, &to)).await
+    host.blocking(move || ide_workspace::file_ops::copy(&from, &to)).await
+}
+
+pub async fn rename(host: &Host, from: PathBuf, to: PathBuf) -> IdeResult<()> {
+    host.blocking(move || ide_workspace::file_ops::rename(&from, &to)).await
 }
 
 /// Reads a text file without opening it as a document; prefers the unsaved buffer.
diff --git a/crates/ide-host/src/ops/lsp.rs b/crates/ide-host/src/ops/lsp.rs
index f8b27063..2e2402f3 100644
--- a/crates/ide-host/src/ops/lsp.rs
+++ b/crates/ide-host/src/ops/lsp.rs
@@ -76,9 +76,17 @@ async fn plugin_call<T: Send + 'static>(f: impl FnOnce() -> T + Send + 'static)
     tokio::task::spawn_blocking(f).await.ok()
 }
 
-/// Items from plugins carry no server (resolve and commands don't apply).
+/// Items from plugins carry no server: commands don't apply, and a code
+/// action is resolved by the plugin named in its `data` ([`PluginActionRef`]).
 const PLUGIN_SERVER: ServerId = ServerId(0);
 
+/// `data` of a plugin's code action whose edits it computes when picked.
+#[derive(serde::Serialize, serde::Deserialize)]
+struct PluginActionRef {
+    plugin: String,
+    data: String,
+}
+
 /// A plugin's `completion-item.kind` (wit/providers.wit lists them).
 fn plugin_completion_kind(kind: &str) -> Option<CompletionKind> {
     Some(match kind {
@@ -120,14 +128,14 @@ fn plugin_completion(item: ide_plugin::CompletionItem) -> CompletionItem {
         kind,
         documentation: item.documentation.map(|value| Markup { kind: "markdown".into(), value }),
         sort_text: item.sort_text,
-        filter_text: None,
+        filter_text: item.filter_text,
         preselect: false,
         deprecated: false,
         insert_text: item.insert_text,
-        is_snippet: false,
+        is_snippet: item.snippet,
         replace_range: item.replace,
         replace_range_tab: None,
-        additional_edits: Vec::new(),
+        additional_edits: item.additional_edits,
         commit_characters: Vec::new(),
         command: None,
         data: None,
@@ -252,6 +260,9 @@ pub async fn lsp_implementations(
 /// Contents of a read-only language-server document, including JDT library
 /// classes and disk class files. Cached per project.
 pub async fn lsp_virtual_document(host: &Host, window: &str, uri: String) -> IdeResult<VirtualDocument> {
+    if uri.starts_with("git-revision:") {
+        return crate::ops::vcs::revision_virtual_document(host, window, &uri).await;
+    }
     host.project(window)?.lsp.virtual_document(&uri).await
 }
 
@@ -314,7 +325,7 @@ pub async fn lsp_code_actions(
     };
     let plugin_actions: Vec<CodeAction> = plugin_actions
         .into_iter()
-        .map(|(_, a)| plugin_code_action(a))
+        .map(|(plugin, a)| plugin_code_action(&plugin, a))
         .filter(|a| {
             only.is_empty()
                 || a.kind.as_ref().is_some_and(|k| only.iter().any(|o| k == o || k.starts_with(&format!("{o}."))))
@@ -330,24 +341,53 @@ pub async fn lsp_code_actions(
     prepare_actions(project, doc, version, actions).await
 }
 
-fn plugin_code_action(a: ide_plugin::CodeAction) -> CodeAction {
-    let files = a
+fn plugin_code_action(plugin: &str, a: ide_plugin::CodeAction) -> CodeAction {
+    // With `data` and no edits, the plugin computes them when the action is picked.
+    let lazy = a.edits.is_empty() && a.data.is_some();
+    let files: Vec<_> = a
         .edits
         .into_iter()
         .map(|(path, edits)| ide_core::FileEdit::Edit { path: path.into(), edits, version: None })
         .collect();
+    let data = a
+        .data
+        .filter(|_| lazy)
+        .and_then(|data| serde_json::to_value(PluginActionRef { plugin: plugin.to_owned(), data }).ok());
     CodeAction {
         title: a.title,
         kind: a.kind,
         is_preferred: a.preferred,
         disabled_reason: None,
-        edit: Some(WorkspaceEdit { files, preconditions: Vec::new() }),
+        edit: (!lazy).then(|| WorkspaceEdit { files, preconditions: Vec::new() }),
         command: None,
-        data: None,
+        data,
         server: PLUGIN_SERVER,
     }
 }
 
+/// A code action resolved by whoever offered it: its language server, or
+/// the plugin its `data` names.
+async fn resolve_action(host: &Host, window: &str, doc: DocId, action: CodeAction) -> IdeResult<CodeAction> {
+    if action.server != PLUGIN_SERVER {
+        return host.project(window)?.lsp.resolve_code_action(doc, action).await;
+    }
+    let Some(r) = action.data.clone().and_then(|d| serde_json::from_value::<PluginActionRef>(d).ok()) else {
+        return Ok(action);
+    };
+    let (plugins, d) = plugin_providers(host, window, doc, ProviderKind::CodeActions)
+        .ok_or_else(|| ide_core::IdeError::unavailable("the plugin that offered this action is gone"))?;
+    let pending = ide_plugin::CodeAction {
+        title: action.title.clone(),
+        kind: action.kind.clone(),
+        preferred: action.is_preferred,
+        edits: Vec::new(),
+        data: Some(r.data),
+    };
+    let plugin = r.plugin.clone();
+    let resolved = blocking(move || plugins.resolve_code_action(&plugin, &d, pending)).await?;
+    Ok(plugin_code_action(&r.plugin, ide_plugin::CodeAction { data: None, ..resolved }))
+}
+
 /// Cancellable code actions with the kinds the servers advertise (Refactor This, refactoring availability).
 pub async fn lsp_code_action_query(
     host: &Host,
@@ -381,7 +421,7 @@ pub async fn lsp_resolve_code_action(
     let project = host.project(window)?;
     let documents = project.documents.clone();
     let version = blocking(move || documents.version(doc)).await?;
-    let action = project.lsp.resolve_code_action(doc, action).await?;
+    let action = resolve_action(host, window, doc, action).await?;
     Ok(prepare_actions(project, doc, version, vec![action]).await?.remove(0))
 }
 
@@ -391,7 +431,7 @@ pub async fn lsp_apply_code_action(host: &Host, window: &str, doc: DocId, action
     let action = if action.edit.is_none() && action.command.is_none() {
         let documents = project.documents.clone();
         let version = blocking(move || documents.version(doc)).await?;
-        let action = project.lsp.resolve_code_action(doc, action).await?;
+        let action = resolve_action(host, window, doc, action).await?;
         prepare_actions(project.clone(), doc, version, vec![action]).await?.remove(0)
     } else {
         action
@@ -401,17 +441,85 @@ pub async fn lsp_apply_code_action(host: &Host, window: &str, doc: DocId, action
         let edit = edit.clone();
         blocking(move || apply_edit(&documents, &edit)).await?;
     }
-    if let Some(command) = action.command {
+    if let Some(command) = action.command
+        && !(action.edit.is_some() && is_client_follow_up(&project, doc, None, &command).await)
+    {
         project.lsp.execute_command(doc, command).await?;
     }
     Ok(())
 }
 
+/// A command after a code action's edit that no server provides: what other editors'
+/// extensions do once the edit is applied (vtsls' `_typescript.didOrganizeImports`). The edit
+/// is the action; there is nothing to run.
+async fn is_client_follow_up(
+    project: &crate::project::Project,
+    doc: DocId,
+    server: Option<ide_core::ServerId>,
+    command: &Command,
+) -> bool {
+    let provided = project.lsp.provides_command(doc, server, &command.command).await;
+    if !provided {
+        tracing::debug!("skipping `{}` after the code action's edit: no server provides it", command.command);
+    }
+    !provided
+}
+
 pub async fn lsp_prepare_rename(host: &Host, window: &str, doc: DocId, pos: Pos) -> IdeResult<Option<Range>> {
     host.project(window)?.lsp.prepare_rename(doc, pos).await
 }
 
 /// Computes the rename edit without applying it, so the UI can preview conflicts.
+/// The class at `pos` and the members a class-hierarchy refactoring can move.
+pub async fn lsp_hierarchy_members(
+    host: &Host,
+    window: &str,
+    request: RequestId,
+    doc: DocId,
+    pos: Pos,
+    kind: HierarchyRefactoring,
+) -> IdeResult<HierarchyMembers> {
+    let project = host.project(window)?;
+    let cancel = host.begin_request(request);
+    let result = project.lsp.hierarchy_members(doc, pos, kind, cancel).await;
+    host.end_request(request);
+    result
+}
+
+/// Checks a class-hierarchy refactoring and computes its edit without applying it.
+#[allow(clippy::too_many_arguments)]
+pub async fn lsp_hierarchy_refactor(
+    host: &Host,
+    window: &str,
+    request: RequestId,
+    doc: DocId,
+    pos: Pos,
+    kind: HierarchyRefactoring,
+    target: Option<String>,
+    choices: Vec<HierarchyChoice>,
+) -> IdeResult<HierarchyRefactored> {
+    let project = host.project(window)?;
+    let documents = project.documents.clone();
+    let version = blocking(move || documents.version(doc)).await?;
+    let cancel = host.begin_request(request);
+    let result = project.lsp.hierarchy_refactor(doc, pos, kind, target, choices, cancel).await;
+    host.end_request(request);
+    let mut refactored = result?;
+    blocking(move || {
+        if project.documents.version(doc)? != version {
+            return Err(ide_core::IdeError::new(
+                ide_core::error::ErrorKind::OutOfSync,
+                "document changed while computing the refactoring; request it again",
+            ));
+        }
+        if let Some(edit) = &mut refactored.edit {
+            project.documents.prepare_workspace_edit(edit)?;
+        }
+        Ok(refactored)
+    })
+    .await
+}
+
 pub async fn lsp_rename(
     host: &Host,
     window: &str,
@@ -589,6 +697,7 @@ pub async fn lsp_execute_code_action(
         if cancel.is_cancelled() {
             return Err(ide_core::IdeError::cancelled());
         }
+        let edited = action.edit.is_some();
         if let Some(edit) = action.edit {
             let documents = project.documents.clone();
             tokio::task::spawn_blocking(move || apply_edit(&documents, &edit))
@@ -596,6 +705,9 @@ pub async fn lsp_execute_code_action(
                 .map_err(|e| ide_core::IdeError::internal(e.to_string()))??;
         }
         match action.command {
+            Some(command) if edited && is_client_follow_up(&project, doc, Some(action.server), &command).await => {
+                Ok(Vec::new())
+            }
             Some(command) => project
                 .lsp
                 .execute_action_command(doc, action.server, command, answers, cancel)
@@ -676,6 +788,22 @@ pub(crate) fn register(d: &mut Dispatcher) {
     d.add("lsp_rename", |c| async move {
         lsp_rename(&c.host, &c.window, c.arg("request")?, c.arg("doc")?, c.arg("pos")?, c.arg("newName")?).await
     });
+    d.add("lsp_hierarchy_members", |c| async move {
+        lsp_hierarchy_members(&c.host, &c.window, c.arg("request")?, c.arg("doc")?, c.arg("pos")?, c.arg("kind")?).await
+    });
+    d.add("lsp_hierarchy_refactor", |c| async move {
+        lsp_hierarchy_refactor(
+            &c.host,
+            &c.window,
+            c.arg("request")?,
+            c.arg("doc")?,
+            c.arg("pos")?,
+            c.arg("kind")?,
+            c.arg("target")?,
+            c.arg("choices")?,
+        )
+        .await
+    });
     d.add("lsp_format", |c| async move {
         lsp_format(&c.host, &c.window, c.arg("doc")?, c.arg("range")?, c.arg("options")?).await
     });
@@ -735,6 +863,25 @@ pub(crate) fn register(d: &mut Dispatcher) {
 mod tests {
     use super::*;
 
+    #[test]
+    fn a_plugin_action_with_data_and_no_edits_is_resolved_by_its_plugin() {
+        let action = |edits: Vec<(std::path::PathBuf, Vec<TextEdit>)>, data: Option<&str>| ide_plugin::CodeAction {
+            title: "Fix".into(),
+            kind: None,
+            preferred: false,
+            edits,
+            data: data.map(str::to_owned),
+        };
+        let lazy = plugin_code_action("acme.x", action(Vec::new(), Some("ref")));
+        assert!(lazy.edit.is_none());
+        let r: PluginActionRef = serde_json::from_value(lazy.data.unwrap()).unwrap();
+        assert_eq!((r.plugin.as_str(), r.data.as_str()), ("acme.x", "ref"));
+        // With edits, `data` is the plugin's business: applied as is.
+        let edit = TextEdit { range: Range::default(), new_text: "x".into() };
+        let eager = plugin_code_action("acme.x", action(vec![("/a".into(), vec![edit])], Some("ref")));
+        assert!(eager.edit.is_some() && eager.data.is_none());
+    }
+
     #[test]
     fn every_completion_kind_the_plugin_api_documents_is_understood() {
         let wit = include_str!("../../../../wit/providers.wit");
diff --git a/crates/ide-host/src/ops/nav.rs b/crates/ide-host/src/ops/nav.rs
index 5a4c3b32..646e3ab8 100644
--- a/crates/ide-host/src/ops/nav.rs
+++ b/crates/ide-host/src/ops/nav.rs
@@ -3,7 +3,7 @@ use crate::Host;
 use crate::Project;
 use crate::rpc::Dispatcher;
 use ide_core::{DocId, IdeResult, IpcPath, Location, Pos};
-use ide_index::{FileMatch, IndexStatus, SymbolFilter, SymbolMatch};
+use ide_index::{ExtensionCount, FileMatch, IndexStatus, SymbolFilter, SymbolMatch};
 use ide_language::{FileReference, WebReference};
 use ide_workspace::file_refs::{self, PathCompletion};
 use serde::{Deserialize, Serialize};
@@ -32,10 +32,19 @@ pub fn index_status(host: &Host, window: &str) -> IdeResult<IndexStatus> {
     Ok(host.project(window)?.index.status())
 }
 
+/// The project's file extensions, most common first.
+pub fn index_file_extensions(host: &Host, window: &str) -> IdeResult<Vec<ExtensionCount>> {
+    Ok(host.project(window)?.index.file_extensions())
+}
+
 pub fn find_files(host: &Host, window: &str, query: String, limit: u32) -> IdeResult<Vec<FileMatch>> {
     Ok(host.project(window)?.index.find_files(&query, limit as usize))
 }
 
+pub fn find_dirs(host: &Host, window: &str, query: String, limit: u32) -> IdeResult<Vec<FileMatch>> {
+    Ok(host.project(window)?.index.find_dirs(&query, limit as usize))
+}
+
 pub fn find_symbols(
     host: &Host,
     window: &str,
@@ -156,7 +165,9 @@ pub async fn web_unresolved_references(host: &Host, window: &str, doc: DocId) ->
 /// Commands of this module the remote server answers.
 pub(crate) fn register(d: &mut Dispatcher) {
     d.add("index_status", |c| async move { index_status(&c.host, &c.window) });
+    d.add("index_file_extensions", |c| async move { index_file_extensions(&c.host, &c.window) });
     d.add("find_files", |c| async move { find_files(&c.host, &c.window, c.arg("query")?, c.arg("limit")?) });
+    d.add("find_dirs", |c| async move { find_dirs(&c.host, &c.window, c.arg("query")?, c.arg("limit")?) });
     d.add("find_symbols", |c| async move {
         find_symbols(&c.host, &c.window, c.arg("query")?, c.arg("filter")?, c.arg("limit")?)
     });
diff --git a/crates/ide-host/src/ops/project.rs b/crates/ide-host/src/ops/project.rs
index e6632c1d..f739d95c 100644
--- a/crates/ide-host/src/ops/project.rs
+++ b/crates/ide-host/src/ops/project.rs
@@ -17,6 +17,8 @@ pub struct ProjectInfo {
     pub settings: Settings,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub workspace: Option<ide_workspace::workspace::Workspace>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub unity: Option<ide_workspace::unity::UnityProjectInfo>,
 }
 
 pub fn info(project: &Project) -> ProjectInfo {
@@ -33,6 +35,7 @@ pub fn info(project: &Project) -> ProjectInfo {
         settings,
         root: project.root.clone().into(),
         workspace: ide_workspace::workspace::Workspace::load(&project.root).ok().flatten(),
+        unity: ide_workspace::unity::detect(&project.root),
     }
 }
 
@@ -172,7 +175,12 @@ pub fn set_settings(
         host.apply_proxy();
     }
     // A new interpreter / toolchain / server executable restarts the language servers it affects.
-    let code_style = key == "editor" || key == "editor.codeStyle" || key.starts_with("editor.codeStyle.");
+    // So do inspections that are compiler options (`ide-sdk` `configure_java_compiler`).
+    let code_style = key == "editor"
+        || key == "editor.codeStyle"
+        || key.starts_with("editor.codeStyle.")
+        || key == "inspections"
+        || key.starts_with("inspections.");
     let toolchain = ["languages", "tools", "languageServers", "projectStructure"]
         .iter()
         .any(|k| key == *k || key.starts_with(&format!("{k}.")));
@@ -188,7 +196,8 @@ pub fn set_settings(
     }
     let roots_changed = key == "projectStructure"
         || key.starts_with("projectStructure.")
-        || "languages.java.maven.unlinkedProjects".starts_with(key);
+        || "languages.java.maven.unlinkedProjects".starts_with(key)
+        || "languages.java.gradle.linkedProjects".starts_with(key);
     // Content roots and excludes (files.exclude, ignored names, excluded folders) reach the
     // index and the watchers without reopening the project (the rescan runs in the background).
     if roots_changed || key == "files" || key.starts_with("files.") {
diff --git a/crates/ide-host/src/ops/run.rs b/crates/ide-host/src/ops/run.rs
index ae24f9f8..a71a8da5 100644
--- a/crates/ide-host/src/ops/run.rs
+++ b/crates/ide-host/src/ops/run.rs
@@ -155,6 +155,9 @@ pub async fn start(host: &Host, window: &str, config: RunConfig, on_output: Emit
     let (root, settings) = settings_for(host, &project, &config)?;
     let root = &root;
     // Configurations made in the UI name bare tools (`godot`) that may live outside PATH.
+    // Maven re-applies too: a config listed before a settings change (daemon toggle,
+    // Maven home) keeps the launcher that was current then; re-resolving at launch is
+    // what makes the setting take effect without reopening the project.
     let mut config = config;
     if config.kind == "maven" {
         ide_sdk::apply::prepare_maven_run(&mut config, root, &settings);
diff --git a/crates/ide-host/src/ops/run/commands.rs b/crates/ide-host/src/ops/run/commands.rs
index 6d2ba830..b1a6c867 100644
--- a/crates/ide-host/src/ops/run/commands.rs
+++ b/crates/ide-host/src/ops/run/commands.rs
@@ -142,6 +142,21 @@ pub async fn run_gradle_jvm_args_script(_host: &Host, _window: &str, jvm_args: V
     .map_err(|e| IdeError::internal(e.to_string()))?
 }
 
+/// Writes one of the IDE's Gradle init scripts (`text`; the file is named `<name>-<hash>`) on
+/// the machine that runs the build, for `--init-script`, and returns its path.
+pub async fn run_gradle_init_script(_host: &Host, _window: &str, name: String, text: String) -> IdeResult<String> {
+    if name.is_empty() || !name.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') {
+        return Err(IdeError::invalid(format!("invalid init script name {name:?}")));
+    }
+    tokio::task::spawn_blocking(move || {
+        ide_run::gradle_jvm::write_script(&ide_run::gradle_jvm::default_dir(), &name, &text)
+            .map(|p| p.to_string_lossy().into_owned())
+            .map_err(|e| IdeError::internal(format!("cannot write the Gradle init script: {e}")))
+    })
+    .await
+    .map_err(|e| IdeError::internal(e.to_string()))?
+}
+
 /// Results from the JUnit XML reports (Surefire, Failsafe, Gradle) of the module at
 /// `module` (relative to the project root) written since `since_ms` (Unix epoch, ms).
 pub async fn run_test_reports(
@@ -308,6 +323,9 @@ pub(crate) fn register(d: &mut Dispatcher) {
     d.add("run_gradle_jvm_args_script", |c| async move {
         run_gradle_jvm_args_script(&c.host, &c.window, c.arg("jvmArgs")?).await
     });
+    d.add("run_gradle_init_script", |c| async move {
+        run_gradle_init_script(&c.host, &c.window, c.arg("name")?, c.arg("text")?).await
+    });
     d.add("run_test_reports", |c| async move {
         run_test_reports(&c.host, &c.window, c.arg("module")?, c.arg("sinceMs")?).await
     });
diff --git a/crates/ide-host/src/ops/sdk.rs b/crates/ide-host/src/ops/sdk.rs
index 2db3148d..535426d8 100644
--- a/crates/ide-host/src/ops/sdk.rs
+++ b/crates/ide-host/src/ops/sdk.rs
@@ -34,6 +34,42 @@ pub fn sdk_python_effective(host: &Host, window: &str) -> IdeResult<Option<ide_c
     Ok(ide_sdk::apply::python_interpreter(&project.root, &project.settings.effective()).map(Into::into))
 }
 
+/// The PHP language level of the project `path` belongs to (a workspace member, by path, as
+/// the language server configuration picks it).
+#[derive(Clone, Debug, serde::Serialize, specta::Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PhpLanguageLevels {
+    /// The one Intelephense checks against; `None`: its default.
+    pub effective: Option<ide_sdk::php::PhpLanguageLevel>,
+    /// The one Auto picks, from `composer.json`.
+    pub auto: Option<ide_sdk::php::PhpLanguageLevel>,
+    /// The workspace member `path` belongs to: its own settings choose the level, not the
+    /// workspace's. `None`: the opened project.
+    pub member: Option<ide_core::IpcPath>,
+}
+
+pub async fn sdk_php_language_level(host: &Host, window: &str, path: PathBuf) -> IdeResult<PhpLanguageLevels> {
+    let project = host.project(window)?;
+    let (project_root, project_settings) = (project.root.clone(), project.settings.effective());
+    let config_dir = host.config_dir.clone();
+    tokio::task::spawn_blocking(move || {
+        let member = ide_workspace::workspace::Workspace::load(&project_root).ok().flatten().and_then(|w| {
+            w.projects.into_iter().filter(|p| path.starts_with(p)).max_by_key(|p| p.components().count())
+        });
+        let (root, settings) = match &member {
+            Some(member) => (member, ide_workspace::SettingsStore::load(&config_dir, Some(member)).effective()),
+            None => (&project_root, project_settings),
+        };
+        PhpLanguageLevels {
+            effective: ide_sdk::php::language_level(root, &settings),
+            auto: ide_sdk::php::composer_level(root),
+            member: member.map(ide_core::IpcPath),
+        }
+    })
+    .await
+    .map_err(join_err)
+}
+
 /// SDK / library source folders shown under "External Libraries" in the Project view,
 /// with the Maven / Gradle dependency jars of the build model.
 pub async fn sdk_project_libraries(host: &Host, window: &str) -> IdeResult<Vec<ide_sdk::libraries::LibraryGroup>> {
@@ -144,6 +180,10 @@ pub async fn sdk_python_pip(
 pub(crate) fn register(d: &mut Dispatcher) {
     d.add("sdk_detect", |c| async move { sdk_detect(&c.host, &c.window, c.arg("kind")?).await });
     d.add("sdk_python_effective", |c| async move { sdk_python_effective(&c.host, &c.window) });
+    d.add(
+        "sdk_php_language_level",
+        |c| async move { sdk_php_language_level(&c.host, &c.window, c.arg("path")?).await },
+    );
     d.add("sdk_project_libraries", |c| async move { sdk_project_libraries(&c.host, &c.window).await });
     d.add("sdk_locate_tools", |c| async move {
         sdk_locate_tools(&c.host, &c.window, c.arg("names")?, c.arg("near")?).await
diff --git a/crates/ide-host/src/ops/vcs/commands.rs b/crates/ide-host/src/ops/vcs/commands.rs
index 1ed60e50..4075dd9d 100644
--- a/crates/ide-host/src/ops/vcs/commands.rs
+++ b/crates/ide-host/src/ops/vcs/commands.rs
@@ -12,6 +12,76 @@ use std::path::{Path, PathBuf};
 
 use crate::apply_git_executable;
 
+/// Read-only repository access also works in a standalone log window.
+struct LogAccess {
+    project: Option<std::sync::Arc<Project>>,
+    external: Option<std::sync::Arc<Repo>>,
+    cache: PathBuf,
+}
+
+/// Immutable Git objects exposed through the editor's ordinary read-only VFS.
+pub async fn revision_virtual_document(
+    host: &Host,
+    window: &str,
+    uri: &str,
+) -> IdeResult<ide_lsp::types::VirtualDocument> {
+    #[derive(Deserialize)]
+    struct Target {
+        repo: PathBuf,
+        revision: String,
+        path: PathBuf,
+    }
+    let encoded = uri
+        .strip_prefix("git-revision:")
+        .and_then(|s| s.split('/').next())
+        .ok_or_else(|| ide_core::IdeError::invalid("invalid Git revision URI"))?;
+    if encoded.len() > 32768 || encoded.len() % 2 != 0 || !encoded.bytes().all(|b| b.is_ascii_hexdigit()) {
+        return Err(ide_core::IdeError::invalid("invalid Git revision URI"));
+    }
+    let bytes = (0..encoded.len())
+        .step_by(2)
+        .map(|i| {
+            u8::from_str_radix(&encoded[i..i + 2], 16)
+                .map_err(|_| ide_core::IdeError::invalid("invalid Git revision URI"))
+        })
+        .collect::<IdeResult<Vec<_>>>()?;
+    let target: Target = serde_json::from_slice(&bytes).map_err(|e| ide_core::IdeError::invalid(e.to_string()))?;
+    let path = target.repo.join(&target.path);
+    let text = vcs_file_at(host, window, path, Some(target.revision.clone()))
+        .await?
+        .ok_or_else(|| ide_core::IdeError::not_found("file is absent at this revision"))?;
+    Ok(ide_lsp::types::VirtualDocument {
+        uri: uri.into(),
+        language_id: host.languages.detect(&target.path, text.lines().next()),
+        text,
+        title: target.path.file_name().unwrap_or_default().to_string_lossy().into_owned(),
+        description: Some(format!("{} · {}", target.repo.display(), target.revision)),
+        decompiled: false,
+    })
+}
+impl LogAccess {
+    fn new(host: &Host, window: &str, at: Option<&Path>) -> Self {
+        let project = host.project(window).ok();
+        let external = host
+            .external_logs
+            .read()
+            .get(host.owner_window(window))
+            .and_then(|rs| rs.iter().find(|r| Some(r.root()) == at).cloned())
+            .filter(|repo| project.as_ref().is_none_or(|p| p.repos().at_root(repo.root()).is_none()));
+        Self { project, external, cache: host.local_data_dir.join("cache/git-log") }
+    }
+    fn with_log_repo_at<T>(&self, at: Option<&Path>, f: impl FnOnce(&Repo) -> IdeResult<T>) -> IdeResult<T> {
+        if let Some(repo) = &self.external {
+            repo.enable_log_index(&self.cache);
+            return f(repo);
+        }
+        self.project
+            .as_ref()
+            .ok_or_else(|| ide_core::IdeError::unavailable("external Git log is not open"))?
+            .with_log_repo_at(at, f)
+    }
+}
+
 /// A repository of the project (IDEA's VCS root).
 #[derive(Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
@@ -182,8 +252,8 @@ pub fn vcs_roots(host: &Host, window: &str) -> IdeResult<Vec<VcsRoot>> {
 }
 
 pub async fn vcs_branch_info(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<BranchInfo> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.branch_info())).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.branch_info())).await
 }
 
 /// Gutter change markers for a file, computed against its current (unsaved) text.
@@ -197,9 +267,21 @@ pub async fn vcs_line_hunks(host: &Host, window: &str, path: PathBuf) -> IdeResu
 }
 
 pub async fn vcs_file_at(host: &Host, window: &str, path: PathBuf, rev: Option<String>) -> IdeResult<Option<String>> {
-    let project = host.project(window)?;
+    let project = host.project(window).ok();
+    let external = host.external_logs.read().get(host.owner_window(window)).and_then(|rs| {
+        rs.iter().filter(|r| path.starts_with(r.root())).max_by_key(|r| r.root().components().count()).cloned()
+    });
     blocking(move || {
-        project.with_repo_of(&path, |r| r.file_at(&path, rev.as_deref(), project.vcs_encoding(&path, rev.as_deref())?))
+        if let Some(project) = project {
+            return project.with_log_repo_of(&path, |r| {
+                r.file_at(&path, rev.as_deref(), project.vcs_encoding(&path, rev.as_deref())?)
+            });
+        }
+        external.ok_or_else(|| ide_core::IdeError::unavailable("external Git log is not open"))?.file_at(
+            &path,
+            rev.as_deref(),
+            encoding_rs::UTF_8,
+        )
     })
     .await
 }
@@ -222,9 +304,148 @@ pub async fn vcs_blame(
     .await
 }
 
-pub async fn vcs_log(host: &Host, window: &str, repo: Option<PathBuf>, query: LogQuery) -> IdeResult<Vec<Commit>> {
+/// History for Selection: the commits that changed `lines` (0-based, inclusive) of the
+/// editor's text of `path`. Cancellable.
+pub async fn vcs_block_history(
+    host: &Host,
+    window: &str,
+    request: RequestId,
+    path: PathBuf,
+    text: Option<String>,
+    lines: (u32, u32),
+) -> IdeResult<BlockHistory> {
     let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.log(&query))).await
+    let cancel = host.begin_request(request);
+    let result = blocking(move || {
+        let text = text.or_else(|| project.documents.text_of(&path));
+        project.with_repo_of(&path, |r| {
+            r.block_history(&path, text.as_deref(), lines, project.vcs_encoding(&path, None)?, &cancel)
+        })
+    })
+    .await;
+    host.end_request(request);
+    result
+}
+
+pub async fn vcs_log(host: &Host, window: &str, repo: Option<PathBuf>, query: LogQuery) -> IdeResult<Vec<Commit>> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    let request = query.request;
+    let cancel =
+        request.map_or_else(ide_core::CancellationToken::new, |id| host.begin_project_read_request(window, id));
+    let result = blocking(move || {
+        project.with_log_repo_at(repo.as_deref(), |r| {
+            r.enable_log_index(&project.cache);
+            r.log_cancellable(&query, &cancel)
+        })
+    })
+    .await;
+    if let Some(id) = request {
+        host.end_request(id);
+    }
+    result
+}
+
+pub async fn vcs_log_refs(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+) -> IdeResult<std::collections::BTreeMap<String, String>> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.log_refs())).await
+}
+
+pub async fn vcs_log_users(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<Vec<String>> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.log_users())).await
+}
+
+pub async fn vcs_open_external_log(host: &Host, window: &str, path: PathBuf) -> IdeResult<ide_core::IpcPath> {
+    let path = dunce::canonicalize(path)?;
+    let repo = Repo::discover(&path)?.ok_or_else(|| ide_core::IdeError::unavailable("folder is not a Git worktree"))?;
+    let root = repo.root().to_path_buf();
+    repo.set_execution_allowed(false);
+    repo.enable_log_index(&host.local_data_dir.join("cache/git-log"));
+    if let Ok(project) = host.project(window) {
+        project.open_external_log(&root)?;
+    }
+    let mut logs = host.external_logs.write();
+    let roots = logs.entry(host.owner_window(window).to_string()).or_default();
+    if !roots.iter().any(|r| r.root() == root) {
+        roots.push(std::sync::Arc::new(repo));
+    }
+    Ok(root.into())
+}
+
+pub async fn vcs_log_details(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+    revision: String,
+) -> IdeResult<LogDetails> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.log_details(&revision))).await
+}
+
+pub async fn vcs_log_details_batch(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+    revisions: Vec<String>,
+    request: RequestId,
+) -> IdeResult<Vec<LogDetails>> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    let cancel = host.begin_project_read_request(window, request);
+    let result = blocking(move || {
+        project.with_log_repo_at(repo.as_deref(), |r| {
+            revisions.iter().map(|id| r.log_details_cancellable(id, &cancel)).collect()
+        })
+    })
+    .await;
+    host.end_request(request);
+    result
+}
+
+pub async fn vcs_log_index(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+    request: Option<RequestId>,
+) -> IdeResult<LogIndexProgress> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    let cancel =
+        request.map_or_else(ide_core::CancellationToken::new, |id| host.begin_project_read_request(window, id));
+    let result = blocking(move || {
+        project.with_log_repo_at(repo.as_deref(), |r| {
+            r.enable_log_index(&project.cache);
+            if request.is_some() { r.index_log(&cancel) } else { Ok(r.log_index_progress()) }
+        })
+    })
+    .await;
+    if let Some(request) = request {
+        host.end_request(request);
+    }
+    result
+}
+
+pub async fn vcs_revision_children(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+    revision: String,
+    directory: String,
+) -> IdeResult<Vec<String>> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.revision_children(&revision, &directory))).await
+}
+
+pub async fn vcs_revision_files(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+    revision: String,
+) -> IdeResult<Vec<String>> {
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.revision_files(&revision))).await
 }
 
 pub async fn vcs_commit_files(
@@ -233,8 +454,8 @@ pub async fn vcs_commit_files(
     repo: Option<PathBuf>,
     commit: String,
 ) -> IdeResult<Vec<ChangedFile>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.commit_files(&commit))).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.commit_files(&commit))).await
 }
 
 /// Combined changes of several commits, `commits` oldest first.
@@ -244,13 +465,13 @@ pub async fn vcs_commits_changes(
     repo: Option<PathBuf>,
     commits: Vec<String>,
 ) -> IdeResult<Vec<RevisionChange>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.commits_changes(&commits))).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.commits_changes(&commits))).await
 }
 
 pub async fn vcs_branches(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<Vec<Branch>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.branches())).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.branches())).await
 }
 
 pub async fn vcs_stashes(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<Vec<Stash>> {
@@ -605,8 +826,8 @@ pub async fn vcs_config_get(
     repo: Option<PathBuf>,
     key: String,
 ) -> IdeResult<Option<String>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.config_get(&key))).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.config_get(&key))).await
 }
 
 /// Local history operation that may take a while (hooks, large checkouts); git's
@@ -667,8 +888,8 @@ pub async fn vcs_create_tag(
 }
 
 pub async fn vcs_tags(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<Vec<String>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.tags())).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.tags())).await
 }
 
 /// Merge dialog: merges `branches` into the current branch.
@@ -704,8 +925,8 @@ pub async fn vcs_rebase_with(
 }
 
 pub async fn vcs_remotes(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<Vec<Remote>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.remotes())).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.remotes())).await
 }
 
 pub async fn vcs_edit_remote(host: &Host, window: &str, repo: Option<PathBuf>, edit: RemoteEdit) -> IdeResult<()> {
@@ -792,8 +1013,8 @@ pub async fn vcs_diff_with_worktree(
     repo: Option<PathBuf>,
     rev: String,
 ) -> IdeResult<Vec<ChangedFile>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.diff_with_worktree(&rev))).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.diff_with_worktree(&rev))).await
 }
 
 /// Files that differ between two revisions (the "N files updated" of Update Project).
@@ -804,8 +1025,8 @@ pub async fn vcs_diff_revisions(
     from: String,
     to: String,
 ) -> IdeResult<Vec<ChangedFile>> {
-    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.diff_revisions(&from, &to))).await
+    let project = LogAccess::new(host, window, repo.as_deref());
+    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.diff_revisions(&from, &to))).await
 }
 
 /// The best common ancestor of `a` and `b` (`git merge-base`), if any: the New Pull
@@ -987,7 +1208,30 @@ pub(crate) fn register(d: &mut Dispatcher) {
     d.add("vcs_blame", |c| async move {
         vcs_blame(&c.host, &c.window, c.arg("path")?, c.arg("text")?, c.arg("revision")?).await
     });
+    d.add("vcs_block_history", |c| async move {
+        let (request, path, text, lines) = (c.arg("request")?, c.arg("path")?, c.arg("text")?, c.arg("lines")?);
+        vcs_block_history(&c.host, &c.window, request, path, text, lines).await
+    });
     d.add("vcs_log", |c| async move { vcs_log(&c.host, &c.window, c.arg("repo")?, c.arg("query")?).await });
+    d.add("vcs_log_refs", |c| async move { vcs_log_refs(&c.host, &c.window, c.arg("repo")?).await });
+    d.add("vcs_log_users", |c| async move { vcs_log_users(&c.host, &c.window, c.arg("repo")?).await });
+    d.add("vcs_open_external_log", |c| async move { vcs_open_external_log(&c.host, &c.window, c.arg("path")?).await });
+    d.add("vcs_log_details", |c| async move {
+        vcs_log_details(&c.host, &c.window, c.arg("repo")?, c.arg("revision")?).await
+    });
+    d.add("vcs_log_details_batch", |c| async move {
+        vcs_log_details_batch(&c.host, &c.window, c.arg("repo")?, c.arg("revisions")?, c.arg("request")?).await
+    });
+    d.add(
+        "vcs_log_index",
+        |c| async move { vcs_log_index(&c.host, &c.window, c.arg("repo")?, c.arg("request")?).await },
+    );
+    d.add("vcs_revision_children", |c| async move {
+        vcs_revision_children(&c.host, &c.window, c.arg("repo")?, c.arg("revision")?, c.arg("directory")?).await
+    });
+    d.add("vcs_revision_files", |c| async move {
+        vcs_revision_files(&c.host, &c.window, c.arg("repo")?, c.arg("revision")?).await
+    });
     d.add("vcs_commit_files", |c| async move {
         vcs_commit_files(&c.host, &c.window, c.arg("repo")?, c.arg("commit")?).await
     });
diff --git a/crates/ide-host/src/plugins/api.rs b/crates/ide-host/src/plugins/api.rs
index d1f8f1a1..1b1c997e 100644
--- a/crates/ide-host/src/plugins/api.rs
+++ b/crates/ide-host/src/plugins/api.rs
@@ -667,6 +667,17 @@ impl HostApi for PluginApi {
         Ok(())
     }
 
+    fn open_location(&self, client: Option<&str>, path: &Path, line: u32, column: u32) -> Result<(), HostError> {
+        let event = PluginEvent::OpenLocation {
+            plugin_id: self.id().to_owned(),
+            path: path.to_path_buf().into(),
+            line,
+            column,
+        };
+        self.shared.sink.emit(client, event);
+        Ok(())
+    }
+
     fn setting(&self, root: Option<&Path>, key: &str) -> Option<String> {
         let schema: Vec<super::ui_points::SettingSchema> = self
             .shared
diff --git a/crates/ide-host/src/plugins/icon_extensions.rs b/crates/ide-host/src/plugins/icon_extensions.rs
new file mode 100644
index 00000000..fc970b6b
--- /dev/null
+++ b/crates/ide-host/src/plugins/icon_extensions.rs
@@ -0,0 +1,207 @@
+use super::icon_patterns::validate_pattern;
+use ide_extension::validate_item_id;
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, BTreeSet};
+use std::path::PathBuf;
+
+const MAX_GROUPS: usize = 64;
+const MAX_CHOICES: usize = 16;
+const MAX_CHOICE_OPTIONS: usize = 16;
+const MAX_NAME_LEN: usize = 255;
+pub(super) const DARK_SUFFIX: &str = "_dark";
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+pub(super) enum IconDefinition {
+    Path(PathBuf),
+    Variants(IconVariants),
+}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+pub(super) struct IconVariants {
+    light: PathBuf,
+    #[serde(default)]
+    dark: Option<PathBuf>,
+}
+
+impl IconDefinition {
+    pub(super) fn light(&self) -> &PathBuf {
+        match self {
+            IconDefinition::Path(p) => p,
+            IconDefinition::Variants(v) => &v.light,
+        }
+    }
+
+    pub(super) fn dark(&self) -> Option<&PathBuf> {
+        match self {
+            IconDefinition::Path(_) => None,
+            IconDefinition::Variants(v) => v.dark.as_ref(),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Default, PartialEq, Eq, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(super) enum Target {
+    #[default]
+    File,
+    Folder,
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+pub(super) struct Pattern {
+    pattern: String,
+    icon: String,
+    #[serde(default)]
+    target: Target,
+    #[serde(default)]
+    path: bool,
+    #[serde(default)]
+    ignore_case: bool,
+    #[serde(default)]
+    group: Option<String>,
+    #[serde(default)]
+    open_icon: Option<String>,
+}
+
+fn enabled_by_default() -> bool {
+    true
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub(super) struct Group {
+    pub(super) id: String,
+    name: String,
+    #[serde(default = "enabled_by_default")]
+    enabled: bool,
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub(super) struct ChoiceOption {
+    pub(super) id: String,
+    pub(super) name: String,
+    #[serde(default)]
+    overrides: BTreeMap<String, String>,
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub(super) struct Choice {
+    pub(super) id: String,
+    pub(super) name: String,
+    pub(super) default: String,
+    pub(super) options: Vec<ChoiceOption>,
+}
+
+#[derive(Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(super) struct Extensions {
+    #[serde(default)]
+    pub(super) patterns: Vec<Pattern>,
+    #[serde(default)]
+    pub(super) overrides: BTreeMap<String, String>,
+    #[serde(default)]
+    pub(super) groups: Vec<Group>,
+    #[serde(default)]
+    pub(super) choices: Vec<Choice>,
+    #[serde(default)]
+    pub(super) accent: bool,
+}
+
+pub(super) fn check_icon_id(id: &str) -> Result<(), String> {
+    validate_item_id(id, "icon id")?;
+    if id.ends_with(DARK_SUFFIX) {
+        return Err(format!("icon id {id:?}: the {DARK_SUFFIX:?} suffix is reserved for dark variants"));
+    }
+    Ok(())
+}
+
+fn check_named(id: &str, name: &str, what: &str) -> Result<(), String> {
+    validate_item_id(id, what)?;
+    if name.trim().is_empty() || name.len() > MAX_NAME_LEN {
+        return Err(format!("{what} {id:?}: name must have 1 to {MAX_NAME_LEN} characters"));
+    }
+    Ok(())
+}
+
+fn check_unique<'a>(ids: impl Iterator<Item = &'a String>, what: &str) -> Result<(), String> {
+    let mut seen = BTreeSet::new();
+    match ids.into_iter().find(|id| !seen.insert(*id)) {
+        Some(id) => Err(format!("duplicate {what} {id:?}")),
+        None => Ok(()),
+    }
+}
+
+impl Extensions {
+    pub(super) fn mappings(&self) -> usize {
+        let chosen: usize = self.choices.iter().flat_map(|c| &c.options).map(|o| o.overrides.len()).sum();
+        self.patterns.len() + self.overrides.len() + chosen
+    }
+
+    pub(super) fn validate(&self, check_ref: &dyn Fn(&str, &str) -> Result<(), String>) -> Result<(), String> {
+        self.validate_groups()?;
+        for p in &self.patterns {
+            validate_pattern(&p.pattern)?;
+            check_ref(&p.icon, "patterns")?;
+            if let Some(group) = &p.group
+                && !self.groups.iter().any(|g| &g.id == group)
+            {
+                return Err(format!("pattern {:?}: unknown group {group:?}", p.pattern));
+            }
+            if let Some(open) = &p.open_icon {
+                if p.target != Target::Folder {
+                    return Err(format!("pattern {:?}: openIcon is only for folder patterns", p.pattern));
+                }
+                check_ref(open, "patterns")?;
+            }
+        }
+        check_overrides(&self.overrides, check_ref, "overrides")?;
+        for choice in &self.choices {
+            for option in &choice.options {
+                check_overrides(&option.overrides, check_ref, "choices")?;
+            }
+        }
+        Ok(())
+    }
+
+    fn validate_groups(&self) -> Result<(), String> {
+        if self.groups.len() > MAX_GROUPS || self.choices.len() > MAX_CHOICES {
+            return Err(format!("too many groups or choices (max {MAX_GROUPS} and {MAX_CHOICES})"));
+        }
+        for g in &self.groups {
+            check_named(&g.id, &g.name, "group")?;
+        }
+        check_unique(self.groups.iter().map(|g| &g.id), "group")?;
+        check_unique(self.choices.iter().map(|c| &c.id), "choice")?;
+        for choice in &self.choices {
+            check_named(&choice.id, &choice.name, "choice")?;
+            if choice.options.is_empty() || choice.options.len() > MAX_CHOICE_OPTIONS {
+                return Err(format!("choice {:?}: expected 1 to {MAX_CHOICE_OPTIONS} options", choice.id));
+            }
+            for option in &choice.options {
+                check_named(&option.id, &option.name, "choice option")?;
+            }
+            check_unique(choice.options.iter().map(|o| &o.id), "choice option")?;
+            if !choice.options.iter().any(|o| o.id == choice.default) {
+                return Err(format!("choice {:?}: default {:?} is not one of its options", choice.id, choice.default));
+            }
+        }
+        Ok(())
+    }
+}
+
+fn check_overrides(
+    overrides: &BTreeMap<String, String>,
+    check_ref: &dyn Fn(&str, &str) -> Result<(), String>,
+    what: &str,
+) -> Result<(), String> {
+    for (name, icon) in overrides {
+        validate_item_id(name, "overridden icon name")?;
+        check_ref(icon, what)?;
+    }
+    Ok(())
+}
diff --git a/crates/ide-host/src/plugins/icon_patterns.rs b/crates/ide-host/src/plugins/icon_patterns.rs
new file mode 100644
index 00000000..ef631e99
--- /dev/null
+++ b/crates/ide-host/src/plugins/icon_patterns.rs
@@ -0,0 +1,105 @@
+use regex_syntax::hir::{Hir, HirKind};
+
+pub(crate) const MAX_PATTERN_LEN: usize = 512;
+const NAME_LEN: u64 = 256;
+const MAX_COST: u64 = 4 * NAME_LEN * NAME_LEN;
+
+const UNSUPPORTED: &[(&str, &str)] = &[
+    ("\\A", "\\A"),
+    ("\\z", "\\z"),
+    ("\\Z", "\\Z"),
+    ("\\p", "\\p"),
+    ("\\P", "\\P"),
+    ("[[:", "a POSIX class"),
+    ("&&", "class intersection"),
+    ("~~", "class symmetric difference"),
+];
+
+pub(crate) fn validate_pattern(pattern: &str) -> Result<(), String> {
+    if pattern.len() > MAX_PATTERN_LEN {
+        return Err(format!("pattern {pattern:?} is too long (max {MAX_PATTERN_LEN})"));
+    }
+    if let Some(construct) = unsupported_construct(pattern) {
+        return Err(format!("pattern {pattern:?}: {construct} is not supported"));
+    }
+    let hir = regex_syntax::Parser::new().parse(pattern).map_err(|e| format!("invalid pattern {pattern:?}: {e}"))?;
+    match cost(&hir) {
+        Err(why) => Err(format!("pattern {pattern:?}: {why} is not supported")),
+        Ok(c) if c > MAX_COST => Err(format!("pattern {pattern:?} is too complex: too many ways to match one name")),
+        Ok(_) => Ok(()),
+    }
+}
+
+fn unsupported_construct(pattern: &str) -> Option<&'static str> {
+    if pattern.match_indices("(?").any(|(at, _)| !pattern[at + 2..].starts_with(':')) {
+        return Some("an inline flag, lookaround or named group");
+    }
+    UNSUPPORTED.iter().find(|(needle, _)| pattern.contains(needle)).map(|(_, what)| *what)
+}
+
+fn cost(hir: &Hir) -> Result<u64, &'static str> {
+    match hir.kind() {
+        HirKind::Empty | HirKind::Literal(_) | HirKind::Class(_) | HirKind::Look(_) => Ok(1),
+        HirKind::Capture(c) => cost(&c.sub),
+        HirKind::Concat(items) => items.iter().try_fold(1u64, |acc, h| Ok(acc.saturating_mul(cost(h)?))),
+        HirKind::Alternation(items) => items.iter().try_fold(0u64, |acc, h| Ok(acc.saturating_add(cost(h)?))),
+        HirKind::Repetition(r) => match r.max {
+            None if matches!(r.sub.kind(), HirKind::Literal(_) | HirKind::Class(_)) => Ok(NAME_LEN),
+            None => Err("a repeated group (`(…)*`, `(…)+`)"),
+            Some(max) => Ok(cost(&r.sub)?.saturating_add(1).saturating_pow(max)),
+        },
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn err(pattern: &str) -> String {
+        validate_pattern(pattern).unwrap_err()
+    }
+
+    #[test]
+    fn accepts_typical_file_name_patterns() {
+        for pattern in [
+            r"^(architecture|ARCHITECTURE)(\.(md|rst|txt))?$",
+            r"(main|workflow|ci|release|build|config)\.ya?ml$",
+            r"^[a-z]+\.d\.ts$",
+            r"^\.?eslintrc(\.(js|cjs|json|ya?ml))?$",
+            r"^.*\.config\.[cm]?[jt]s$",
+            r"^.*-(test|spec)\..*$",
+            r"^[0-9]{4}-[0-9]{2}\.log$",
+        ] {
+            assert!(validate_pattern(pattern).is_ok(), "{pattern}: {:?}", validate_pattern(pattern));
+        }
+    }
+
+    #[test]
+    fn rejects_patterns_that_backtrack_catastrophically() {
+        assert!(err(r"(a+)+$").contains("repeated group"));
+        assert!(err(r"(?:a*)*").contains("repeated group"));
+        assert!(err(r"^(\w|\w\w)*!$").contains("repeated group"));
+        assert!(err(r"^(a|aa)+$").contains("repeated group"));
+        assert!(err(r"^.*.*.*x$").contains("too complex"));
+        assert!(err(r"^(a?){30}a{30}$").contains("too complex"));
+        assert!(err(&format!("^{}b$", "(a|aa)".repeat(20))).contains("too complex"));
+        assert!(err(r"x{0,40}").contains("too complex"));
+    }
+
+    #[test]
+    fn rejects_constructs_javascript_reads_differently() {
+        assert!(err(r"(?i)readme").contains("not supported"));
+        assert!(err(r"(?P<n>a)").contains("not supported"));
+        assert!(err(r"\Areadme").contains("not supported"));
+        assert!(err(r"readme\z").contains("not supported"));
+        assert!(err(r"\p{L}").contains("not supported"));
+        assert!(err(r"[[:alpha:]]").contains("not supported"));
+        assert!(err(r"[a-z&&[^x]]").contains("not supported"));
+    }
+
+    #[test]
+    fn rejects_invalid_and_oversized_patterns() {
+        assert!(err("(").contains("invalid pattern"));
+        assert!(err(&"a".repeat(MAX_PATTERN_LEN + 1)).contains("too long"));
+    }
+}
diff --git a/crates/ide-host/src/plugins/icon_settings.rs b/crates/ide-host/src/plugins/icon_settings.rs
new file mode 100644
index 00000000..b1cbbf45
--- /dev/null
+++ b/crates/ide-host/src/plugins/icon_settings.rs
@@ -0,0 +1,185 @@
+use super::icon_extensions::Extensions;
+use serde::{Deserialize, Serialize};
+
+const MAX_SECTIONS: usize = 16;
+const MAX_ITEMS: usize = 32;
+const MAX_TEXT_LEN: usize = 255;
+const MAX_HINT_LEN: usize = 512;
+const MAX_COLUMNS: u8 = 4;
+
+#[derive(Clone, Copy, PartialEq, Eq, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(super) enum SettingOption {
+    HideFiles,
+    HideFolders,
+    HideUiIcons,
+    HidePsiIcons,
+    HollowFolders,
+    Groups,
+    Choice,
+    Accent,
+    Monochrome,
+    Saturation,
+    Opacity,
+    IconSize,
+    RowHeight,
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(untagged)]
+pub(super) enum SettingDefault {
+    Number(u8),
+    Color(String),
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+pub(super) struct SettingItem {
+    option: SettingOption,
+    #[serde(default)]
+    label: Option<String>,
+    #[serde(default)]
+    hint: Option<String>,
+    #[serde(default)]
+    invert: bool,
+    #[serde(default)]
+    choice: Option<String>,
+    #[serde(default)]
+    columns: Option<u8>,
+    #[serde(default)]
+    default: Option<SettingDefault>,
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub(super) struct SettingsSection {
+    title: String,
+    items: Vec<SettingItem>,
+}
+
+#[derive(Serialize)]
+struct ChoiceSummary<'a> {
+    id: &'a str,
+    name: &'a str,
+    default: &'a str,
+    options: Vec<OptionSummary<'a>>,
+}
+
+#[derive(Serialize)]
+struct OptionSummary<'a> {
+    id: &'a str,
+    name: &'a str,
+}
+
+fn check_text(text: &str, max: usize, what: &str) -> Result<(), String> {
+    if text.trim().is_empty() || text.len() > max {
+        return Err(format!("settings: {what} must have 1 to {max} characters"));
+    }
+    Ok(())
+}
+
+fn range(option: SettingOption) -> Option<(u8, u8)> {
+    match option {
+        SettingOption::Saturation => Some((0, 20)),
+        SettingOption::Opacity => Some((10, 100)),
+        SettingOption::IconSize => Some((12, 32)),
+        SettingOption::RowHeight => Some((16, 48)),
+        _ => None,
+    }
+}
+
+fn is_color(text: &str) -> bool {
+    text.len() == 7 && text.starts_with('#') && text[1..].chars().all(|c| c.is_ascii_hexdigit())
+}
+
+fn is_flag(option: SettingOption) -> bool {
+    matches!(
+        option,
+        SettingOption::HideFiles
+            | SettingOption::HideFolders
+            | SettingOption::HideUiIcons
+            | SettingOption::HidePsiIcons
+            | SettingOption::HollowFolders
+    )
+}
+
+impl SettingItem {
+    fn validate(&self, ext: &Extensions) -> Result<(), String> {
+        let named = !matches!(self.option, SettingOption::Groups | SettingOption::Choice);
+        match &self.label {
+            Some(label) => check_text(label, MAX_TEXT_LEN, "label")?,
+            None if named => return Err("settings: label is required".into()),
+            None => {}
+        }
+        if let Some(hint) = &self.hint {
+            check_text(hint, MAX_HINT_LEN, "hint")?;
+        }
+        if self.invert && !is_flag(self.option) {
+            return Err("settings: invert is only for on/off options".into());
+        }
+        if self.columns.is_some_and(|c| c == 0 || c > MAX_COLUMNS)
+            || (self.columns.is_some() && self.option != SettingOption::Groups)
+        {
+            return Err(format!("settings: columns are 1 to {MAX_COLUMNS}, for groups only"));
+        }
+        match (self.option, &self.choice) {
+            (SettingOption::Choice, Some(id)) if !ext.choices.iter().any(|c| &c.id == id) => {
+                return Err(format!("settings: unknown choice {id:?}"));
+            }
+            (SettingOption::Choice, None) => return Err("settings: choice items name their choice".into()),
+            (SettingOption::Choice, Some(_)) | (_, None) => {}
+            (_, Some(_)) => return Err("settings: only choice items name a choice".into()),
+        }
+        if self.option == SettingOption::Accent && !ext.accent {
+            return Err("settings: the accent option needs \"accent\": true".into());
+        }
+        self.validate_default()
+    }
+
+    fn validate_default(&self) -> Result<(), String> {
+        let colored = matches!(self.option, SettingOption::Accent | SettingOption::Monochrome);
+        match (range(self.option), &self.default) {
+            (Some((min, max)), Some(SettingDefault::Number(n))) if (min..=max).contains(n) => Ok(()),
+            (Some((min, max)), _) => Err(format!("settings: a default from {min} to {max} is required")),
+            (None, Some(SettingDefault::Color(c))) if colored && is_color(c) => Ok(()),
+            (None, _) if colored => Err("settings: a #rrggbb default is required".into()),
+            (None, None) => Ok(()),
+            (None, Some(_)) => Err("settings: this option takes no default".into()),
+        }
+    }
+}
+
+pub(super) fn validate(sections: &[SettingsSection], ext: &Extensions) -> Result<(), String> {
+    if sections.len() > MAX_SECTIONS {
+        return Err(format!("settings: more than {MAX_SECTIONS} sections"));
+    }
+    for section in sections {
+        check_text(&section.title, MAX_TEXT_LEN, "title")?;
+        if section.items.len() > MAX_ITEMS {
+            return Err(format!("settings: more than {MAX_ITEMS} items in {:?}", section.title));
+        }
+        for item in &section.items {
+            item.validate(ext)?;
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn summary(sections: &[SettingsSection], ext: &Extensions) -> serde_json::Value {
+    let choices: Vec<ChoiceSummary> = ext
+        .choices
+        .iter()
+        .map(|c| ChoiceSummary {
+            id: &c.id,
+            name: &c.name,
+            default: &c.default,
+            options: c.options.iter().map(|o| OptionSummary { id: &o.id, name: &o.name }).collect(),
+        })
+        .collect();
+    serde_json::json!({
+        "groups": ext.groups,
+        "choices": choices,
+        "accent": ext.accent,
+        "settings": sections,
+    })
+}
diff --git a/crates/ide-host/src/plugins/icons.rs b/crates/ide-host/src/plugins/icons.rs
index 729bf626..60b1ac2e 100644
--- a/crates/ide-host/src/plugins/icons.rs
+++ b/crates/ide-host/src/plugins/icons.rs
@@ -24,6 +24,8 @@
 //! asset; the client fetches the mapping and the icons only when the theme is
 //! selected, so installed icon themes cost nothing at start-up.
 
+use super::icon_extensions::{Choice, DARK_SUFFIX, Extensions, Group, IconDefinition, Pattern, check_icon_id};
+use super::icon_settings::{self, SettingsSection};
 use ide_extension::{Package, UiDecl, check_relative, decode, validate_item_id};
 use serde::Deserialize;
 use std::collections::{BTreeMap, BTreeSet};
@@ -45,7 +47,7 @@ struct Decl {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 struct ThemeFile {
-    icon_definitions: BTreeMap<String, PathBuf>,
+    icon_definitions: BTreeMap<String, IconDefinition>,
     #[serde(default)]
     file: Option<String>,
     #[serde(default)]
@@ -53,11 +55,25 @@ struct ThemeFile {
     #[serde(default)]
     folder_expanded: Option<String>,
     #[serde(default)]
+    folder_open: Option<String>,
+    #[serde(default)]
     file_extensions: BTreeMap<String, String>,
     #[serde(default)]
     file_names: BTreeMap<String, String>,
     #[serde(default)]
     folder_names: BTreeMap<String, String>,
+    #[serde(default)]
+    patterns: Vec<Pattern>,
+    #[serde(default)]
+    overrides: BTreeMap<String, String>,
+    #[serde(default)]
+    groups: Vec<Group>,
+    #[serde(default)]
+    choices: Vec<Choice>,
+    #[serde(default)]
+    accent: bool,
+    #[serde(default)]
+    settings: Vec<SettingsSection>,
 }
 
 /// Asset id of a theme's mapping (JSON).
@@ -65,6 +81,10 @@ pub fn map_asset(theme: &str) -> String {
     format!("iconTheme/{theme}/map")
 }
 
+pub fn settings_asset(theme: &str) -> String {
+    format!("iconTheme/{theme}/settings")
+}
+
 /// Asset id prefix of a theme's SVGs (`…/svg/<icon id>`).
 pub fn svg_prefix(theme: &str) -> String {
     format!("iconTheme/{theme}/svg/")
@@ -87,12 +107,20 @@ pub(super) fn icon_theme(pkg: &Package, decl: toml::Value) -> Result<UiDecl, Str
         return Err(format!("icon theme {:?} has an empty label", d.id));
     }
     let src = pkg.read_text(&d.path)?;
-    let theme: ThemeFile = serde_json::from_str(&src).map_err(|e| format!("{}: {e}", d.path.display()))?;
+    let mut theme: ThemeFile = serde_json::from_str(&src).map_err(|e| format!("{}: {e}", d.path.display()))?;
+    let extensions = Extensions {
+        patterns: std::mem::take(&mut theme.patterns),
+        overrides: std::mem::take(&mut theme.overrides),
+        groups: std::mem::take(&mut theme.groups),
+        choices: std::mem::take(&mut theme.choices),
+        accent: theme.accent,
+    };
     let at = |what: &str| format!("{} ({what})", d.path.display());
     if theme.icon_definitions.len() > MAX_ICONS {
         return Err(format!("{}: more than {MAX_ICONS} icons", d.path.display()));
     }
-    let mappings = theme.file_extensions.len() + theme.file_names.len() + theme.folder_names.len();
+    let mappings =
+        theme.file_extensions.len() + theme.file_names.len() + theme.folder_names.len() + extensions.mappings();
     if mappings > MAX_MAPPINGS {
         return Err(format!("{}: more than {MAX_MAPPINGS} mappings", d.path.display()));
     }
@@ -100,7 +128,17 @@ pub(super) fn icon_theme(pkg: &Package, decl: toml::Value) -> Result<UiDecl, Str
     let check_ref = |icon: &str, what: &str| -> Result<(), String> {
         if defined.contains(icon) { Ok(()) } else { Err(format!("{}: unknown icon {icon:?}", at(what))) }
     };
-    for (what, icon) in [("file", &theme.file), ("folder", &theme.folder), ("folderExpanded", &theme.folder_expanded)] {
+    for icon in theme.icon_definitions.keys() {
+        check_icon_id(icon)?;
+    }
+    extensions.validate(&check_ref)?;
+    icon_settings::validate(&theme.settings, &extensions).map_err(|e| format!("{}: {e}", d.path.display()))?;
+    for (what, icon) in [
+        ("file", &theme.file),
+        ("folder", &theme.folder),
+        ("folderExpanded", &theme.folder_expanded),
+        ("folderOpen", &theme.folder_open),
+    ] {
         if let Some(icon) = icon {
             check_ref(icon, what)?;
         }
@@ -125,20 +163,31 @@ pub(super) fn icon_theme(pkg: &Package, decl: toml::Value) -> Result<UiDecl, Str
 
     let mut assets = Vec::with_capacity(theme.icon_definitions.len() + 1);
     let mut files = vec![d.path.clone()];
-    for (icon, path) in &theme.icon_definitions {
-        validate_item_id(icon, "icon id")?;
-        let clean = read_icon(pkg, path)?;
-        assets.push((format!("{}{icon}", svg_prefix(&d.id)), clean));
-        files.push(path.clone());
+    for (icon, def) in &theme.icon_definitions {
+        let dark = def.dark().map(|path| (path, DARK_SUFFIX));
+        for (path, suffix) in std::iter::once((def.light(), "")).chain(dark) {
+            let clean = read_icon(pkg, path)?;
+            assets.push((format!("{}{icon}{suffix}", svg_prefix(&d.id)), clean));
+            files.push(path.clone());
+        }
     }
     let map = serde_json::json!({
         "file": theme.file,
         "folder": theme.folder,
         "folderExpanded": theme.folder_expanded,
+        "folderOpen": theme.folder_open,
         "fileExtensions": file_extensions,
         "fileNames": file_names,
         "folderNames": folder_names,
+        "patterns": extensions.patterns,
+        "overrides": extensions.overrides,
+        "groups": extensions.groups,
+        "choices": extensions.choices,
+        "accent": extensions.accent,
     });
+    if !theme.settings.is_empty() {
+        assets.push((settings_asset(&d.id), icon_settings::summary(&theme.settings, &extensions).to_string()));
+    }
     assets.push((map_asset(&d.id), map.to_string()));
     let json = serde_json::json!({ "id": d.id, "label": d.label, "icons": theme.icon_definitions.len() });
     let mut out = UiDecl::new(d.id.clone(), d.label, json);
@@ -612,4 +661,184 @@ mod tests {
         assert!(icon_theme(&pkg, decl("evil.json")).unwrap_err().contains("evil.svg"));
         assert!(icon_theme(&pkg, decl("../x.json")).is_err());
     }
+
+    const SVG: &str = r#"<svg viewBox="0 0 16 16"><path d="M0 0h16v16z"/></svg>"#;
+
+    fn theme_package(theme: &str) -> (tempfile::TempDir, Package) {
+        let tmp = tempfile::tempdir().unwrap();
+        let dir = tmp.path();
+        std::fs::create_dir_all(dir.join("icons")).unwrap();
+        for icon in ["file", "folder", "folder-src", "folder-src-open", "rust", "rust-dark", "tests", "arrow"] {
+            std::fs::write(dir.join(format!("icons/{icon}.svg")), SVG).unwrap();
+        }
+        std::fs::write(dir.join("theme.json"), theme).unwrap();
+        let manifest = ide_extension::Manifest::parse(
+            "id = \"p\"\nname = \"P\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"",
+        )
+        .unwrap();
+        let pkg = Package::new(manifest, dir.to_path_buf());
+        (tmp, pkg)
+    }
+
+    fn load(theme: &str) -> Result<UiDecl, String> {
+        let (_tmp, pkg) = theme_package(theme);
+        let mut t = toml::Table::new();
+        t.insert("id".into(), "m".into());
+        t.insert("label".into(), "M".into());
+        t.insert("path".into(), "theme.json".into());
+        icon_theme(&pkg, toml::Value::Table(t))
+    }
+
+    fn with(extra: &str) -> String {
+        format!(
+            r#"{{"iconDefinitions":{{"file":"icons/file.svg","folder":"icons/folder.svg",
+                "folder-src":"icons/folder-src.svg","folder-src-open":"icons/folder-src-open.svg",
+                "rust":{{"light":"icons/rust.svg","dark":"icons/rust-dark.svg"}},
+                "tests":"icons/tests.svg","arrow":"icons/arrow.svg"}},
+                "file":"file","folder":"folder"{extra}}}"#
+        )
+    }
+
+    const EXTENSIONS: &str = r#","patterns":[
+        {"pattern":"^.*\\.rs$","icon":"rust","ignoreCase":true},
+        {"pattern":"/tests?/","icon":"tests","path":true,"group":"tests"},
+        {"pattern":"^src$","icon":"folder-src","target":"folder","openIcon":"folder-src-open"}],
+        "overrides":{"chevron-right":"arrow","symbol-class":"rust"},
+        "groups":[{"id":"tests","name":"Tests","enabled":false}],
+        "choices":[{"id":"arrows","name":"Arrows","default":"plain","options":[
+            {"id":"plain","name":"Default"},{"id":"material","name":"Material","overrides":{"chevron-down":"arrow"}}]}],
+        "accent":true,"folderOpen":"folder-src-open""#;
+
+    fn map_of(d: &UiDecl) -> serde_json::Value {
+        serde_json::from_str(&d.assets.iter().find(|(k, _)| *k == map_asset("m")).unwrap().1).unwrap()
+    }
+
+    #[test]
+    fn theme_extensions_reach_the_mapping() {
+        let d = load(&with(EXTENSIONS)).unwrap();
+        let map = map_of(&d);
+        assert_eq!(
+            map["patterns"],
+            serde_json::json!([
+                {"pattern":"^.*\\.rs$","icon":"rust","target":"file","path":false,"ignoreCase":true,"group":null,"openIcon":null},
+                {"pattern":"/tests?/","icon":"tests","target":"file","path":true,"ignoreCase":false,"group":"tests","openIcon":null},
+                {"pattern":"^src$","icon":"folder-src","target":"folder","path":false,"ignoreCase":false,"group":null,"openIcon":"folder-src-open"}
+            ])
+        );
+        assert_eq!(map["overrides"], serde_json::json!({"chevron-right":"arrow","symbol-class":"rust"}));
+        assert_eq!(map["groups"], serde_json::json!([{"id":"tests","name":"Tests","enabled":false}]));
+        assert_eq!(map["choices"][0]["default"], "plain");
+        assert_eq!(map["choices"][0]["options"][1]["overrides"], serde_json::json!({"chevron-down":"arrow"}));
+        assert_eq!(map["choices"][0]["options"][0]["overrides"], serde_json::json!({}));
+        assert_eq!(map["accent"], true);
+        assert_eq!(map["folderOpen"], "folder-src-open");
+        assert_eq!(d.json["icons"], 7);
+        assert!(d.assets.iter().any(|(k, _)| *k == format!("{}rust", svg_prefix("m"))));
+        assert!(d.assets.iter().any(|(k, _)| *k == format!("{}rust_dark", svg_prefix("m"))));
+        assert!(d.files.iter().any(|f| f.ends_with("icons/rust-dark.svg")));
+    }
+
+    #[test]
+    fn themes_without_extensions_keep_their_mapping() {
+        let map = map_of(&load(&with("")).unwrap());
+        assert_eq!(map["patterns"], serde_json::json!([]));
+        assert_eq!(map["overrides"], serde_json::json!({}));
+        assert_eq!(map["groups"], serde_json::json!([]));
+        assert_eq!(map["choices"], serde_json::json!([]));
+        assert_eq!(map["accent"], false);
+    }
+
+    #[test]
+    fn theme_extensions_are_validated() {
+        let cases = [
+            (r#","patterns":[{"pattern":"x","icon":"nope"}]"#, "unknown icon"),
+            (r#","patterns":[{"pattern":"(a+)+$","icon":"rust"}]"#, "repeated group"),
+            (r#","patterns":[{"pattern":"(","icon":"rust"}]"#, "invalid pattern"),
+            (r#","patterns":[{"pattern":"x","icon":"rust","group":"nope"}]"#, "unknown group"),
+            (r#","patterns":[{"pattern":"x","icon":"rust","openIcon":"tests"}]"#, "openIcon"),
+            (r#","patterns":[{"pattern":"x","icon":"folder","target":"folder","openIcon":"nope"}]"#, "unknown icon"),
+            (r#","patterns":[{"pattern":"x","icon":"rust","priority":1}]"#, "unknown field"),
+            (r#","overrides":{"chevron-right":"nope"}"#, "unknown icon"),
+            (r#","folderOpen":"nope""#, "unknown icon"),
+            (r#","overrides":{"Chevron":"rust"}"#, "invalid overridden icon"),
+            (r#","groups":[{"id":"a","name":" "}]"#, "name"),
+            (r#","groups":[{"id":"a","name":"A"},{"id":"a","name":"B"}]"#, "duplicate"),
+            (r#","choices":[{"id":"c","name":"C","default":"x","options":[{"id":"y","name":"Y"}]}]"#, "default"),
+            (r#","choices":[{"id":"c","name":"C","default":"y","options":[]}]"#, "options"),
+            (
+                r#","choices":[{"id":"c","name":"C","default":"y","options":[{"id":"y","name":"Y","overrides":{"a":"nope"}}]}]"#,
+                "unknown icon",
+            ),
+        ];
+        for (extra, needle) in cases {
+            let err = load(&with(extra)).err().unwrap_or_else(|| panic!("accepted: {extra}"));
+            assert!(err.contains(needle), "{extra}: {err}");
+        }
+        let dark_id = r#"{"iconDefinitions":{"x_dark":"icons/rust.svg"}}"#;
+        assert!(load(dark_id).unwrap_err().contains("_dark"));
+    }
+
+    const SETTINGS: &str = r##","settings":[
+        {"title":"Toggle","items":[
+            {"option":"hideFiles","label":"Enable file icons","hint":"Files","invert":true},
+            {"option":"hollowFolders","label":"Hollow"}]},
+        {"title":"Packs","items":[{"option":"groups","columns":2}]},
+        {"title":"Other","items":[
+            {"option":"choice","choice":"arrows"},
+            {"option":"accent","label":"Accent","default":"#009688"},
+            {"option":"saturation","label":"Saturation","default":10}]}]"##;
+
+    fn settings_of(d: &UiDecl) -> Option<serde_json::Value> {
+        d.assets.iter().find(|(k, _)| *k == settings_asset("m")).map(|(_, v)| serde_json::from_str(v).unwrap())
+    }
+
+    #[test]
+    fn theme_settings_get_their_own_asset() {
+        let d = load(&with(&format!("{EXTENSIONS}{SETTINGS}"))).unwrap();
+        let s = settings_of(&d).unwrap();
+        assert_eq!(s["accent"], true);
+        assert_eq!(s["groups"], serde_json::json!([{"id":"tests","name":"Tests","enabled":false}]));
+        assert_eq!(
+            s["choices"],
+            serde_json::json!([{"id":"arrows","name":"Arrows","default":"plain","options":[
+                {"id":"plain","name":"Default"},{"id":"material","name":"Material"}]}])
+        );
+        assert_eq!(s["settings"][0]["title"], "Toggle");
+        assert_eq!(
+            s["settings"][0]["items"][0],
+            serde_json::json!({"option":"hideFiles","label":"Enable file icons","hint":"Files","invert":true,
+                "choice":null,"columns":null,"default":null})
+        );
+        assert_eq!(s["settings"][2]["items"][1]["default"], "#009688");
+        assert_eq!(s["settings"][2]["items"][2]["default"], 10);
+        assert!(settings_of(&load(&with(EXTENSIONS)).unwrap()).is_none());
+    }
+
+    #[test]
+    fn theme_settings_are_validated() {
+        let section = |items: &str| with(&format!(r#"{EXTENSIONS},"settings":[{{"title":"T","items":[{items}]}}]"#));
+        let cases = [
+            (section(r#"{"option":"nope","label":"X"}"#), "unknown variant"),
+            (section(r#"{"option":"hideFiles"}"#), "label"),
+            (section(r#"{"option":"hideFiles","label":" "}"#), "label"),
+            (section(r#"{"option":"choice","choice":"nope"}"#), "unknown choice"),
+            (section(r#"{"option":"choice"}"#), "choice"),
+            (section(r#"{"option":"groups","columns":9}"#), "columns"),
+            (section(r#"{"option":"saturation","label":"S"}"#), "default"),
+            (section(r#"{"option":"saturation","label":"S","default":50}"#), "default"),
+            (section(r##"{"option":"opacity","label":"O","default":"#000000"}"##), "default"),
+            (section(r#"{"option":"monochrome","label":"M","default":"red"}"#), "default"),
+            (section(r#"{"option":"saturation","label":"S","default":5,"invert":true}"#), "invert"),
+            (section(r#"{"option":"hideFiles","label":"F","extra":1}"#), "unknown field"),
+            (with(&format!(r#"{EXTENSIONS},"settings":[{{"title":"","items":[]}}]"#)), "title"),
+            (
+                with(r##","settings":[{"title":"T","items":[{"option":"accent","label":"A","default":"#000000"}]}]"##),
+                "accent",
+            ),
+        ];
+        for (theme, needle) in cases {
+            let err = load(&theme).err().unwrap_or_else(|| panic!("accepted: {theme}"));
+            assert!(err.contains(needle), "{theme}: {err}");
+        }
+    }
 }
diff --git a/crates/ide-host/src/plugins/intellij.rs b/crates/ide-host/src/plugins/intellij.rs
new file mode 100644
index 00000000..3ccc62fa
--- /dev/null
+++ b/crates/ide-host/src/plugins/intellij.rs
@@ -0,0 +1,874 @@
+//! IntelliJ theme plugins, read for import as OpenIDEA theme plugins: a
+//! Marketplace download (a `.jar`, or a `.zip` holding the plugin's
+//! `lib/*.jar`), an installed plugin's folder or a loose `.theme.json`; and the
+//! theme plugins of the JetBrains IDEs on this machine, with the theme each IDE
+//! is set to (`options/laf.xml`).
+//!
+//! Nothing is converted here: the UI maps IntelliJ keys onto design tokens
+//! (`src/features/plugins/intellijTheme.ts`, shared with `pnpm
+//! theme:import-intellij`) and [`super::PluginHost::stage_package`] writes the
+//! result for the install page, which validates it like any package.
+
+use ide_core::{IdeError, IdeResult, IpcPath};
+use quick_xml::{Reader, XmlVersion, events::Event};
+use serde::{Deserialize, Serialize};
+use specta::Type;
+use std::ffi::OsString;
+use std::io::{Cursor, Read, Seek};
+use std::path::{Path, PathBuf};
+
+/// A descriptor, theme or editor scheme larger than this is not one.
+const MAX_FILE: u64 = 4 << 20;
+/// A plugin jar read into memory from a Marketplace zip.
+const MAX_JAR: u64 = 64 << 20;
+/// Jars of one plugin looked into.
+const MAX_JARS: usize = 64;
+/// All the jars read into memory from one Marketplace zip.
+const MAX_NESTED: u64 = 256 << 20;
+/// Descriptors read for one plugin: `plugin.xml` and those it includes.
+const MAX_DESCRIPTORS: usize = 64;
+const PLUGIN_XML: &str = "META-INF/plugin.xml";
+
+/// A theme plugin's themes, as read from its files.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct IntellijThemeSource {
+    /// The plugin's `<name>`, or the theme's for a loose file.
+    pub name: String,
+    pub plugin_id: Option<String>,
+    pub version: Option<String>,
+    pub vendor: Option<String>,
+    pub themes: Vec<IntellijThemeFile>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct IntellijThemeFile {
+    /// The `themeProvider` id (what `laf.xml` names), or the file name without `.theme.json`.
+    pub id: String,
+    /// The `.theme.json`, comments removed.
+    pub theme: String,
+    /// The editor scheme (`.icls` XML) its `editorScheme` names, when the plugin has it.
+    pub editor_scheme: Option<String>,
+}
+
+/// A theme of a plugin installed in a JetBrains IDE.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct InstalledIntellijTheme {
+    /// The IDE and its version: `IntelliJ IDEA 2025.2`.
+    pub ide: String,
+    /// The plugin's name.
+    pub plugin: String,
+    /// What to import: the plugin's folder or jar.
+    pub path: IpcPath,
+    pub theme_id: String,
+    pub theme_name: String,
+    pub dark: bool,
+    /// The IDE is set to this theme.
+    pub active: bool,
+}
+
+/// Reads the themes of an IntelliJ theme plugin (a `.jar`, a Marketplace
+/// `.zip`, an installed plugin's folder) or of a `.theme.json`.
+pub fn read_source(path: &Path) -> IdeResult<IntellijThemeSource> {
+    read(path).map_err(IdeError::invalid)
+}
+
+/// The theme plugins of the JetBrains IDEs (and Android Studio) of this user,
+/// the themes their IDEs are set to first.
+pub fn installed_themes() -> Vec<InstalledIntellijTheme> {
+    let Some(home) = dirs::home_dir() else { return Vec::new() };
+    let layout = if cfg!(target_os = "macos") {
+        Layout::Mac
+    } else if cfg!(windows) {
+        Layout::Windows
+    } else {
+        Layout::Xdg
+    };
+    find_installed(&ide_dirs(layout, &home, |key| std::env::var_os(key)))
+}
+
+fn read(path: &Path) -> Result<IntellijThemeSource, String> {
+    if path.extension().is_some_and(|e| e.eq_ignore_ascii_case("json")) {
+        return loose_theme(path);
+    }
+    let mut jars = plugin_jars(path)?;
+    let plugin = descriptor(&mut jars)?;
+    let shown = || path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
+    if plugin.themes.is_empty() {
+        return Err(format!("{} is not a theme plugin: its plugin.xml declares no themeProvider", shown()));
+    }
+    let mut themes = Vec::new();
+    let mut problem = None;
+    for (id, theme_path) in &plugin.themes {
+        match plugin_theme(&mut jars, id, theme_path) {
+            Ok(theme) => themes.push(theme),
+            Err(e) => problem = problem.or(Some(e)),
+        }
+    }
+    if themes.is_empty() {
+        return Err(problem.unwrap_or_else(|| format!("{} has no readable theme", shown())));
+    }
+    Ok(IntellijThemeSource {
+        name: plugin.name.unwrap_or_else(shown),
+        plugin_id: plugin.id,
+        version: plugin.version,
+        vendor: plugin.vendor,
+        themes,
+    })
+}
+
+fn plugin_theme(jars: &mut [Jar], id: &str, path: &str) -> Result<IntellijThemeFile, String> {
+    let bytes = find(jars, entry_name(path), MAX_FILE)?.ok_or_else(|| format!("{path} is missing from the plugin"))?;
+    let (theme, fields) = theme_json(&bytes).map_err(|e| format!("{path}: {e}"))?;
+    let editor_scheme = match string_field(&fields, "editorScheme") {
+        Some(scheme) => find(jars, entry_name(scheme), MAX_FILE)?.map(|b| text(&b)),
+        None => None,
+    };
+    Ok(IntellijThemeFile { id: id.to_owned(), theme, editor_scheme })
+}
+
+/// A `.theme.json` with the editor scheme beside it (its `editorScheme` names a path in the plugin's jar).
+fn loose_theme(path: &Path) -> Result<IntellijThemeSource, String> {
+    let (theme, fields) = theme_json(&read_file(path)?).map_err(|e| format!("{}: {e}", path.display()))?;
+    // Any JSON object parses: an IntelliJ theme has UI colours or an editor scheme.
+    let scheme_ref = string_field(&fields, "editorScheme");
+    if !fields.get("ui").is_some_and(serde_json::Value::is_object) && scheme_ref.is_none() {
+        return Err(format!("{} is not an IntelliJ theme: it has no \"ui\" or \"editorScheme\"", path.display()));
+    }
+    let editor_scheme = scheme_ref
+        .and_then(|p| Path::new(p).file_name().map(|n| path.with_file_name(n)))
+        .filter(|p| p.is_file())
+        .map(|p| read_file(&p).map(|b| text(&b)))
+        .transpose()?;
+    let file = path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
+    let id = file.strip_suffix(".theme.json").or_else(|| file.strip_suffix(".json")).unwrap_or(&file).to_owned();
+    Ok(IntellijThemeSource {
+        name: string_field(&fields, "name").map_or_else(|| id.clone(), str::to_owned),
+        plugin_id: None,
+        version: None,
+        vendor: string_field(&fields, "author").map(str::to_owned),
+        themes: vec![IntellijThemeFile { id, theme, editor_scheme }],
+    })
+}
+
+type JsonObject = serde_json::Map<String, serde_json::Value>;
+
+/// The theme JSON, comments removed, and its fields, if it is an object.
+fn theme_json(bytes: &[u8]) -> Result<(String, JsonObject), String> {
+    let json = super::theme::strip_json_comments(&text(bytes));
+    match serde_json::from_str::<serde_json::Value>(&json) {
+        Ok(serde_json::Value::Object(fields)) => Ok((json, fields)),
+        Ok(_) => Err("not a theme: expected a JSON object".into()),
+        Err(e) => Err(format!("invalid theme JSON: {e}")),
+    }
+}
+
+fn string_field<'a>(fields: &'a JsonObject, key: &str) -> Option<&'a str> {
+    fields.get(key)?.as_str().filter(|s| !s.trim().is_empty())
+}
+
+/// `/themes/x.theme.json` → `themes/x.theme.json`.
+fn entry_name(path: &str) -> &str {
+    path.trim().trim_start_matches('/')
+}
+
+fn text(bytes: &[u8]) -> String {
+    let bytes = bytes.strip_prefix(b"\xEF\xBB\xBF").unwrap_or(bytes);
+    String::from_utf8_lossy(bytes).into_owned()
+}
+
+fn read_file(path: &Path) -> Result<Vec<u8>, String> {
+    let shown = |e: std::io::Error| format!("{}: {e}", path.display());
+    let file = std::fs::File::open(path).map_err(shown)?;
+    let mut buf = Vec::new();
+    file.take(MAX_FILE + 1).read_to_end(&mut buf).map_err(shown)?;
+    if buf.len() as u64 > MAX_FILE {
+        return Err(format!("{} is too large for a theme", path.display()));
+    }
+    Ok(buf)
+}
+
+trait ReadSeek: Read + Seek {}
+impl<T: Read + Seek> ReadSeek for T {}
+type Jar = zip::ZipArchive<Box<dyn ReadSeek>>;
+
+fn open_jar(path: &Path) -> Result<Jar, String> {
+    let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?;
+    let reader: Box<dyn ReadSeek> = Box::new(std::io::BufReader::new(file));
+    zip::ZipArchive::new(reader).map_err(|e| format!("{} is not a jar or zip file ({e})", path.display()))
+}
+
+/// The jars of the plugin at `path`: a jar, a Marketplace zip (`<plugin>/lib/*.jar`)
+/// or an installed plugin's folder (`lib/*.jar`).
+fn plugin_jars(path: &Path) -> Result<Vec<Jar>, String> {
+    let not_plugin = || format!("{} is not an IntelliJ plugin: no {PLUGIN_XML} and no lib/*.jar", path.display());
+    if path.is_dir() {
+        let mut found: Vec<PathBuf> = [path.join("lib"), path.join("lib").join("modules")]
+            .iter()
+            .flat_map(|dir| std::fs::read_dir(dir).into_iter().flatten().flatten())
+            .map(|e| e.path())
+            .filter(|p| p.is_file() && is_jar(p))
+            .collect();
+        found.sort();
+        let jars: Vec<Jar> = found.iter().take(MAX_JARS).filter_map(|p| open_jar(p).ok()).collect();
+        return if jars.is_empty() { Err(not_plugin()) } else { Ok(jars) };
+    }
+    let mut archive = open_jar(path)?;
+    if archive.index_for_name(PLUGIN_XML).is_some() {
+        return Ok(vec![archive]);
+    }
+    let jars = nested_jars(&mut archive, MAX_JAR, MAX_NESTED);
+    if jars.is_empty() { Err(not_plugin()) } else { Ok(jars) }
+}
+
+/// The `lib` jars of a Marketplace zip, smallest first (a theme's own jar is small)
+/// while they fit `max_total`; library jars too large or not jars at all are skipped.
+fn nested_jars(archive: &mut Jar, max_jar: u64, max_total: u64) -> Vec<Jar> {
+    let mut nested: Vec<(u64, String)> = entry_names(archive)
+        .into_iter()
+        .filter(|n| is_lib_jar(n))
+        .filter_map(|n| Some((archive.by_name(&n).ok()?.size(), n)))
+        .filter(|(size, _)| *size <= max_jar)
+        .collect();
+    nested.sort();
+    let (mut jars, mut loaded) = (Vec::new(), 0u64);
+    for (size, name) in nested.into_iter().take(MAX_JARS) {
+        if loaded.saturating_add(size) > max_total {
+            break;
+        }
+        let Ok(Some(bytes)) = read_entry(archive, &name, max_jar) else { continue };
+        loaded += size;
+        let reader: Box<dyn ReadSeek> = Box::new(Cursor::new(bytes));
+        if let Ok(jar) = zip::ZipArchive::new(reader) {
+            jars.push(jar);
+        }
+    }
+    jars
+}
+
+fn entry_names(jar: &Jar) -> Vec<String> {
+    jar.file_names().filter_map(Result::ok).map(|n| n.into_owned()).collect()
+}
+
+fn is_jar(path: &Path) -> bool {
+    path.extension().is_some_and(|e| e.eq_ignore_ascii_case("jar"))
+}
+
+/// `lib/x.jar`, `<plugin>/lib/x.jar` or `<plugin>/lib/modules/x.jar` in a Marketplace zip.
+fn is_lib_jar(name: &str) -> bool {
+    let parts: Vec<&str> = name.split('/').collect();
+    let n = parts.len();
+    name.to_ascii_lowercase().ends_with(".jar")
+        && (2..=4).contains(&n)
+        && (parts[n - 2] == "lib" || (n >= 3 && parts[n - 2] == "modules" && parts[n - 3] == "lib"))
+}
+
+fn read_entry(jar: &mut Jar, name: &str, max: u64) -> Result<Option<Vec<u8>>, String> {
+    let Ok(file) = jar.by_name(name) else { return Ok(None) };
+    if file.is_dir() {
+        return Ok(None);
+    }
+    if file.size() > max {
+        return Err(format!("{name} is too large"));
+    }
+    let mut buf = Vec::with_capacity(file.size() as usize);
+    file.take(max.saturating_add(1)).read_to_end(&mut buf).map_err(|e| format!("{name}: {e}"))?;
+    if buf.len() as u64 > max {
+        return Err(format!("{name} is too large"));
+    }
+    Ok(Some(buf))
+}
+
+fn find(jars: &mut [Jar], name: &str, max: u64) -> Result<Option<Vec<u8>>, String> {
+    for jar in jars.iter_mut() {
+        if let Some(bytes) = read_entry(jar, name, max)? {
+            return Ok(Some(bytes));
+        }
+    }
+    Ok(None)
+}
+
+/// What the plugin's descriptors say: `<idea-plugin>`'s `id`, `name`, `version`,
+/// `vendor`, and its `themeProvider`s (id, path in the jar).
+#[derive(Debug, Default, PartialEq)]
+struct Descriptor {
+    id: Option<String>,
+    name: Option<String>,
+    version: Option<String>,
+    vendor: Option<String>,
+    themes: Vec<(String, String)>,
+}
+
+/// Reads `META-INF/plugin.xml` and the descriptors it includes (`<xi:include href>`), in any jar.
+fn descriptor(jars: &mut [Jar]) -> Result<Descriptor, String> {
+    let main = find(jars, PLUGIN_XML, MAX_FILE)
+        .ok()
+        .flatten()
+        .ok_or_else(|| format!("not an IntelliJ plugin: no {PLUGIN_XML}"))?;
+    let mut out = Descriptor::default();
+    let mut includes = Vec::new();
+    parse_descriptor(&text(&main), true, &mut out, &mut includes).map_err(|e| format!("{PLUGIN_XML}: {e}"))?;
+    let mut read = std::collections::HashSet::from([PLUGIN_XML.to_owned()]);
+    while let Some(href) = includes.pop() {
+        let name = include_entry(&href);
+        if read.len() >= MAX_DESCRIPTORS || !read.insert(name.clone()) {
+            continue;
+        }
+        let Ok(Some(bytes)) = find(jars, &name, MAX_FILE) else { continue };
+        let _ = parse_descriptor(&text(&bytes), false, &mut out, &mut includes);
+    }
+    let mut seen = std::collections::HashSet::new();
+    out.themes.retain(|(id, _)| seen.insert(id.clone()));
+    Ok(out)
+}
+
+/// An `<xi:include href>` as a jar entry: `/META-INF/x.xml` from the jar's root, `x.xml` beside plugin.xml.
+fn include_entry(href: &str) -> String {
+    let href = href.trim();
+    href.strip_prefix('/').map_or_else(|| format!("META-INF/{href}"), str::to_owned)
+}
+
+fn parse_descriptor(xml: &str, main: bool, out: &mut Descriptor, includes: &mut Vec<String>) -> Result<(), String> {
+    let mut reader = Reader::from_str(xml);
+    let mut stack: Vec<String> = Vec::new();
+    let mut text = String::new();
+    loop {
+        let event = reader.read_event().map_err(|e| e.to_string())?;
+        match event {
+            Event::Start(ref tag) | Event::Empty(ref tag) => {
+                let name = tag.local_name().as_ref().to_owned();
+                if name == "include" {
+                    let href = tag.attributes().flatten().find(|a| a.key.local_name().as_ref() == "href");
+                    if let Some(href) = href.and_then(|a| a.normalized_value(XmlVersion::Implicit1_0).ok()) {
+                        includes.push(href.into_owned());
+                    }
+                }
+                if name == "themeProvider" {
+                    let (mut id, mut path) = (None, None);
+                    for a in tag.attributes() {
+                        let a = a.map_err(|e| e.to_string())?;
+                        let value = a.normalized_value(XmlVersion::Implicit1_0).map_err(|e| e.to_string())?;
+                        match a.key.local_name().as_ref() {
+                            "id" => id = Some(value.trim().to_owned()),
+                            "path" => path = Some(value.trim().to_owned()),
+                            _ => {}
+                        }
+                    }
+                    if let (Some(id), Some(path)) = (id, path)
+                        && !id.is_empty()
+                        && !path.is_empty()
+                    {
+                        out.themes.push((id, path));
+                    }
+                }
+                if matches!(event, Event::Start(_)) {
+                    stack.push(name);
+                    text.clear();
+                }
+            }
+            Event::Text(t) => text.push_str(&t.xml_content(XmlVersion::Implicit1_0)),
+            Event::CData(t) => text.push_str(t.as_ref()),
+            Event::GeneralRef(r) => {
+                let name = r.as_ref();
+                let escaped = format!("&{name};");
+                text.push_str(&quick_xml::escape::unescape(&escaped).map_err(|e| e.to_string())?);
+            }
+            Event::End(_) => {
+                let name = stack.pop().ok_or("unbalanced element")?;
+                // Direct children of <idea-plugin>.
+                if main && stack.len() == 1 && stack[0] == "idea-plugin" {
+                    let value = text.trim();
+                    let slot = match name.as_str() {
+                        "id" => Some(&mut out.id),
+                        "name" => Some(&mut out.name),
+                        "version" => Some(&mut out.version),
+                        "vendor" => Some(&mut out.vendor),
+                        _ => None,
+                    };
+                    if let Some(slot) = slot
+                        && slot.is_none()
+                        && !value.is_empty()
+                    {
+                        *slot = Some(value.to_owned());
+                    }
+                }
+                text.clear();
+            }
+            Event::Eof => return if stack.is_empty() { Ok(()) } else { Err("unclosed element".into()) },
+            _ => {}
+        }
+    }
+}
+
+/// Where an OS keeps the IDEs' settings and plugins.
+#[derive(Clone, Copy, Debug)]
+enum Layout {
+    /// `~/Library/Application Support/<vendor>/<IDE>`, plugins in its `plugins/`.
+    Mac,
+    /// `%APPDATA%\<vendor>\<IDE>`, plugins in its `plugins\`.
+    Windows,
+    /// `$XDG_CONFIG_HOME/<vendor>/<IDE>`, plugins in `$XDG_DATA_HOME/<vendor>/<IDE>`.
+    Xdg,
+}
+
+#[derive(Debug, PartialEq)]
+struct IdeDir {
+    label: String,
+    product: String,
+    version: (u32, u32),
+    config: PathBuf,
+    plugins: PathBuf,
+}
+
+/// The settings folders of JetBrains IDEs and Android Studio (2020.1 and later), newest first.
+fn ide_dirs(layout: Layout, home: &Path, env: impl Fn(&str) -> Option<OsString>) -> Vec<IdeDir> {
+    let var = |key: &str| env(key).filter(|v| !v.is_empty()).map(PathBuf::from);
+    let (config_root, data_root) = match layout {
+        Layout::Mac => {
+            let root = home.join("Library").join("Application Support");
+            (root.clone(), root)
+        }
+        Layout::Windows => {
+            let root = var("APPDATA").unwrap_or_else(|| home.join("AppData").join("Roaming"));
+            (root.clone(), root)
+        }
+        Layout::Xdg => (
+            var("XDG_CONFIG_HOME").unwrap_or_else(|| home.join(".config")),
+            var("XDG_DATA_HOME").unwrap_or_else(|| home.join(".local").join("share")),
+        ),
+    };
+    let mut out = Vec::new();
+    for vendor in ["JetBrains", "Google"] {
+        for entry in std::fs::read_dir(config_root.join(vendor)).into_iter().flatten().flatten() {
+            let name = entry.file_name().to_string_lossy().into_owned();
+            let Some((product, version, shown)) = product_dir(&name) else { continue };
+            let config = entry.path();
+            if !config.is_dir() {
+                continue;
+            }
+            let plugins = match layout {
+                Layout::Xdg => data_root.join(vendor).join(&name),
+                Layout::Mac | Layout::Windows => config.join("plugins"),
+            };
+            out.push(IdeDir {
+                label: format!("{} {shown}", product_label(product)),
+                product: product.to_owned(),
+                version,
+                config,
+                plugins,
+            });
+        }
+    }
+    out.sort_by(|a, b| b.version.cmp(&a.version).then_with(|| a.label.cmp(&b.label)));
+    out
+}
+
+/// `IntelliJIdea2025.2` → (`IntelliJIdea`, (2025, 2), `2025.2`).
+fn product_dir(name: &str) -> Option<(&str, (u32, u32), &str)> {
+    let at = name.find(|c: char| c.is_ascii_digit())?;
+    let (product, version) = name.split_at(at);
+    if product.is_empty() || !product.chars().all(|c| c.is_ascii_alphabetic()) {
+        return None;
+    }
+    let (year, minor) = version.split_once('.')?;
+    let ok = |s: &str| !s.is_empty() && s.len() <= 4 && s.chars().all(|c| c.is_ascii_digit());
+    if year.len() != 4 || !ok(year) || !ok(minor) {
+        return None;
+    }
+    Some((product, (year.parse().ok()?, minor.parse().ok()?), version))
+}
+
+fn product_label(product: &str) -> &str {
+    match product {
+        "IntelliJIdea" => "IntelliJ IDEA",
+        "IdeaIC" => "IntelliJ IDEA Community Edition",
+        "PyCharmCE" => "PyCharm Community Edition",
+        "AndroidStudio" => "Android Studio",
+        "AndroidStudioPreview" => "Android Studio Preview",
+        other => other,
+    }
+}
+
+/// The theme ids `options/laf.xml` selects: the current one, and with "Sync with OS" the preferred light and dark.
+fn active_theme_ids(config: &Path) -> Vec<String> {
+    let Ok(bytes) = read_file(&config.join("options").join("laf.xml")) else { return Vec::new() };
+    let xml = text(&bytes);
+    let mut reader = Reader::from_str(&xml);
+    let (mut ids, mut preferred, mut autodetect) = (Vec::new(), Vec::new(), false);
+    loop {
+        match reader.read_event() {
+            Ok(Event::Start(tag) | Event::Empty(tag)) => {
+                let attr = |key: &str| {
+                    tag.attributes()
+                        .flatten()
+                        .find(|a| a.key.as_ref() == key)
+                        .and_then(|a| a.normalized_value(XmlVersion::Implicit1_0).ok().map(|v| v.trim().to_owned()))
+                };
+                match tag.local_name().as_ref() {
+                    "component" if attr("name").as_deref() == Some("LafManager") => {
+                        autodetect = attr("autodetect").as_deref() == Some("true");
+                    }
+                    "laf" => ids.extend(attr("themeId")),
+                    "preferred-light-laf" | "preferred-dark-laf" => preferred.extend(attr("themeId")),
+                    _ => {}
+                }
+            }
+            Ok(Event::Eof) | Err(_) => break,
+            _ => {}
+        }
+    }
+    if autodetect {
+        ids.extend(preferred);
+    }
+    ids.retain(|id| !id.is_empty());
+    ids
+}
+
+fn find_installed(ides: &[IdeDir]) -> Vec<InstalledIntellijTheme> {
+    let mut out = Vec::new();
+    for ide in ides {
+        let active = active_theme_ids(&ide.config);
+        let mut plugins: Vec<PathBuf> = std::fs::read_dir(&ide.plugins)
+            .into_iter()
+            .flatten()
+            .flatten()
+            .map(|e| e.path())
+            .filter(|p| p.is_dir() || (p.is_file() && is_jar(p)))
+            .collect();
+        plugins.sort();
+        for plugin in plugins {
+            let Ok(mut jars) = plugin_jars(&plugin) else { continue };
+            let Ok(found) = descriptor(&mut jars) else { continue };
+            for (id, path) in &found.themes {
+                let Ok(Some(bytes)) = find(&mut jars, entry_name(path), MAX_FILE) else { continue };
+                let Ok((_, fields)) = theme_json(&bytes) else { continue };
+                let file = || plugin.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
+                out.push(InstalledIntellijTheme {
+                    ide: ide.label.clone(),
+                    plugin: found.name.clone().unwrap_or_else(file),
+                    path: plugin.clone().into(),
+                    theme_id: id.clone(),
+                    theme_name: string_field(&fields, "name").unwrap_or(id).to_owned(),
+                    dark: fields.get("dark").and_then(serde_json::Value::as_bool).unwrap_or(true),
+                    active: active.contains(id),
+                });
+            }
+        }
+    }
+    // Stable: the IDEs' order (newest first) within each group.
+    out.sort_by_key(|t| !t.active);
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io::Write;
+
+    const PLUGIN: &str = r#"<idea-plugin>
+  <id>com.example.deepsea</id>
+  <name>Deep Sea &amp; Friends</name>
+  <version>2.3</version>
+  <vendor email="a@example.com">Someone</vendor>
+  <description><![CDATA[<b>Dark</b> themes]]></description>
+  <depends>com.intellij.modules.platform</depends>
+  <extensions defaultExtensionNs="com.intellij">
+    <themeProvider id="deep-sea-id" path="/themes/DeepSea.theme.json"/>
+    <themeProvider id="shallow-id" path="themes/Shallow.theme.json" />
+  </extensions>
+</idea-plugin>"#;
+
+    const DEEP: &str = r##"{
+  // comment
+  "name": "Deep Sea",
+  "dark": true,
+  "editorScheme": "/themes/DeepSea.xml",
+  "ui": { "*": { "background": "#101820" } }
+}"##;
+    const SHALLOW: &str = r#"{ "name": "Shallow", "dark": false, "ui": {} }"#;
+    const SCHEME: &str = r#"<scheme name="Deep Sea" version="142" parent_scheme="Darcula"/>"#;
+
+    fn jar_bytes(entries: &[(&str, &[u8])]) -> Vec<u8> {
+        let mut zip = zip::ZipWriter::new(Cursor::new(Vec::new()));
+        for (name, data) in entries {
+            zip.start_file(*name, zip::write::SimpleFileOptions::default()).unwrap();
+            zip.write_all(data).unwrap();
+        }
+        zip.finish().unwrap().into_inner()
+    }
+
+    fn theme_jar() -> Vec<u8> {
+        jar_bytes(&[
+            ("META-INF/MANIFEST.MF", b"Manifest-Version: 1.0\n"),
+            (PLUGIN_XML, PLUGIN.as_bytes()),
+            ("themes/DeepSea.theme.json", DEEP.as_bytes()),
+            ("themes/DeepSea.xml", SCHEME.as_bytes()),
+            ("themes/Shallow.theme.json", SHALLOW.as_bytes()),
+        ])
+    }
+
+    fn write(path: &Path, bytes: &[u8]) {
+        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+        std::fs::write(path, bytes).unwrap();
+    }
+
+    fn expected_source() -> IntellijThemeSource {
+        IntellijThemeSource {
+            name: "Deep Sea & Friends".into(),
+            plugin_id: Some("com.example.deepsea".into()),
+            version: Some("2.3".into()),
+            vendor: Some("Someone".into()),
+            themes: vec![
+                IntellijThemeFile {
+                    id: "deep-sea-id".into(),
+                    theme: super::super::theme::strip_json_comments(DEEP),
+                    editor_scheme: Some(SCHEME.into()),
+                },
+                IntellijThemeFile { id: "shallow-id".into(), theme: SHALLOW.into(), editor_scheme: None },
+            ],
+        }
+    }
+
+    #[test]
+    fn reads_a_theme_jar_with_its_editor_scheme() {
+        let tmp = tempfile::tempdir().unwrap();
+        let jar = tmp.path().join("deep-sea.jar");
+        write(&jar, &theme_jar());
+        let source = read_source(&jar).unwrap();
+        assert_eq!(source, expected_source());
+        assert!(!source.themes[0].theme.contains("comment"));
+    }
+
+    #[test]
+    fn reads_a_marketplace_zip_and_an_installed_folder() {
+        let tmp = tempfile::tempdir().unwrap();
+        let other = jar_bytes(&[("META-INF/MANIFEST.MF", b"x"), ("a/B.class", b"\xCA\xFE")]);
+        let zip = tmp.path().join("DeepSea-2.3.zip");
+        write(&zip, &jar_bytes(&[("DeepSea/lib/a-util.jar", &other), ("DeepSea/lib/deep-sea.jar", &theme_jar())]));
+        assert_eq!(read_source(&zip).unwrap(), expected_source());
+
+        let dir = tmp.path().join("plugins").join("DeepSea");
+        write(&dir.join("lib").join("deep-sea.jar"), &theme_jar());
+        write(&dir.join("lib").join("a-util.jar"), &other);
+        assert_eq!(read_source(&dir).unwrap(), expected_source());
+    }
+
+    #[test]
+    fn skips_library_jars_it_cannot_or_need_not_read() {
+        let tmp = tempfile::tempdir().unwrap();
+        // Stored, not deflated: as large in the zip as its content.
+        let mut big = zip::ZipWriter::new(Cursor::new(Vec::new()));
+        let stored = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+        big.start_file("lib/Data.class", stored).unwrap();
+        big.write_all(&[b'x'; 8192]).unwrap();
+        let big = big.finish().unwrap().into_inner();
+        let zip = tmp.path().join("DeepSea.zip");
+        write(
+            &zip,
+            &jar_bytes(&[
+                ("DeepSea/lib/a-broken.jar", b"not a jar"),
+                ("DeepSea/lib/b-big.jar", &big),
+                ("DeepSea/lib/deep-sea.jar", &theme_jar()),
+            ]),
+        );
+        assert_eq!(read_source(&zip).unwrap(), expected_source());
+
+        // The broken jar is skipped; a jar over the size limit, or past the total
+        // (smallest first), is not read, while the theme's small jar still is.
+        let mut archive = open_jar(&zip).unwrap();
+        let theme_len = theme_jar().len() as u64;
+        assert_eq!(nested_jars(&mut archive, u64::MAX, u64::MAX).len(), 2);
+        let one = nested_jars(&mut archive, theme_len + 64, u64::MAX);
+        assert_eq!(one.len(), 1);
+        assert!(one[0].index_for_name(PLUGIN_XML).is_some());
+        assert_eq!(nested_jars(&mut archive, u64::MAX, theme_len + 64).len(), 1);
+        assert!(nested_jars(&mut archive, 8, u64::MAX).is_empty());
+    }
+
+    #[test]
+    fn reads_a_loose_theme_json_with_the_scheme_beside_it() {
+        let tmp = tempfile::tempdir().unwrap();
+        let theme = tmp.path().join("DeepSea.theme.json");
+        write(&theme, DEEP.as_bytes());
+        write(&tmp.path().join("DeepSea.xml"), SCHEME.as_bytes());
+        let source = read_source(&theme).unwrap();
+        assert_eq!(source.name, "Deep Sea");
+        assert_eq!(source.themes.len(), 1);
+        assert_eq!(source.themes[0].id, "DeepSea");
+        assert_eq!(source.themes[0].editor_scheme.as_deref(), Some(SCHEME));
+
+        std::fs::remove_file(tmp.path().join("DeepSea.xml")).unwrap();
+        assert_eq!(read_source(&theme).unwrap().themes[0].editor_scheme, None);
+    }
+
+    #[test]
+    fn says_what_is_wrong_with_other_files() {
+        let tmp = tempfile::tempdir().unwrap();
+        let not_zip = tmp.path().join("notes.jar");
+        write(&not_zip, b"hello");
+        assert!(read_source(&not_zip).unwrap_err().message.contains("not a jar or zip"));
+
+        let other_plugin = tmp.path().join("tools.jar");
+        let xml = "<idea-plugin><name>Tools</name><actions/></idea-plugin>";
+        write(&other_plugin, &jar_bytes(&[(PLUGIN_XML, xml.as_bytes())]));
+        assert!(read_source(&other_plugin).unwrap_err().message.contains("not a theme plugin"));
+
+        let package = tmp.path().join("package.zip");
+        write(&package, &jar_bytes(&[("plugin.toml", b"id = \"x\"")]));
+        assert!(read_source(&package).unwrap_err().message.contains("not an IntelliJ plugin"));
+
+        let other = tmp.path().join("package.json");
+        write(&other, br#"{ "name": "app", "version": "1.0.0" }"#);
+        assert!(read_source(&other).unwrap_err().message.contains("is not an IntelliJ theme"));
+
+        let broken = tmp.path().join("broken.theme.json");
+        write(&broken, b"{ \"name\": ");
+        assert!(read_source(&broken).unwrap_err().message.contains("invalid theme JSON"));
+
+        let missing = tmp.path().join("missing.jar");
+        let xml = r#"<idea-plugin><name>M</name><themeProvider id="m" path="/m.theme.json"/></idea-plugin>"#;
+        write(&missing, &jar_bytes(&[(PLUGIN_XML, xml.as_bytes())]));
+        assert!(read_source(&missing).unwrap_err().message.contains("/m.theme.json is missing"));
+    }
+
+    #[test]
+    fn finds_theme_providers_in_included_descriptors() {
+        let tmp = tempfile::tempdir().unwrap();
+        let jar = tmp.path().join("split.jar");
+        let main = r#"<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude"><name>Split</name>
+            <xi:include href="/META-INF/themes.xml"/></idea-plugin>"#;
+        let part = r#"<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude"><extensions defaultExtensionNs="com.intellij">
+            <themeProvider id="s" path="/s.theme.json"/></extensions><name>Not this</name>
+            <xi:include href="more.xml"/><xi:include href="/META-INF/themes.xml"/></idea-plugin>"#;
+        let more = r#"<idea-plugin><themeProvider id="m" path="/m.theme.json"/></idea-plugin>"#;
+        let unrelated = r#"<idea-plugin><themeProvider id="x" path="/x.theme.json"/></idea-plugin>"#;
+        write(
+            &jar,
+            &jar_bytes(&[
+                ("META-INF/themes.xml", part.as_bytes()),
+                ("META-INF/more.xml", more.as_bytes()),
+                ("META-INF/unrelated.xml", unrelated.as_bytes()),
+                (PLUGIN_XML, main.as_bytes()),
+                ("s.theme.json", br#"{"name":"S"}"#),
+                ("m.theme.json", br#"{"name":"M"}"#),
+                ("x.theme.json", br#"{"name":"X"}"#),
+            ]),
+        );
+        let source = read_source(&jar).unwrap();
+        assert_eq!(source.name, "Split");
+        // Only what plugin.xml includes (relative or from the root, once each) counts.
+        assert_eq!(source.themes.iter().map(|t| t.id.as_str()).collect::<Vec<_>>(), ["s", "m"]);
+    }
+
+    #[test]
+    fn parses_ide_folder_names() {
+        assert_eq!(product_dir("IntelliJIdea2025.2"), Some(("IntelliJIdea", (2025, 2), "2025.2")));
+        assert_eq!(product_dir("PyCharmCE2023.10"), Some(("PyCharmCE", (2023, 10), "2023.10")));
+        assert_eq!(product_dir("AndroidStudio2024.3"), Some(("AndroidStudio", (2024, 3), "2024.3")));
+        for name in
+            ["Toolbox", "consentOptions", "IntelliJIdea2025", "Idea-2025.1", "2025.1", "Rider25.1", "Go Land2025.1"]
+        {
+            assert_eq!(product_dir(name), None, "{name}");
+        }
+    }
+
+    #[test]
+    fn locates_the_settings_and_plugins_of_each_os() {
+        let tmp = tempfile::tempdir().unwrap();
+        let home = tmp.path();
+        let mk = |p: PathBuf| {
+            std::fs::create_dir_all(&p).unwrap();
+            p
+        };
+        let mac = mk(home.join("Library/Application Support/JetBrains/IntelliJIdea2025.2"));
+        mk(home.join("Library/Application Support/JetBrains/Toolbox"));
+        let dirs = ide_dirs(Layout::Mac, home, |_| None);
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].label, "IntelliJ IDEA 2025.2");
+        assert_eq!((dirs[0].config.clone(), dirs[0].plugins.clone()), (mac.clone(), mac.join("plugins")));
+
+        let appdata = mk(home.join("Roaming"));
+        let win = mk(appdata.join("JetBrains/PyCharm2024.3"));
+        let studio = mk(appdata.join("Google/AndroidStudio2025.1"));
+        let env = |k: &str| (k == "APPDATA").then(|| appdata.clone().into_os_string());
+        let dirs = ide_dirs(Layout::Windows, home, env);
+        assert_eq!(
+            dirs.iter().map(|d| d.label.as_str()).collect::<Vec<_>>(),
+            ["Android Studio 2025.1", "PyCharm 2024.3"]
+        );
+        assert_eq!(dirs[1].plugins, win.join("plugins"));
+        assert_eq!(dirs[0].config, studio);
+
+        let config = mk(home.join(".config/JetBrains/IdeaIC2024.1"));
+        mk(home.join(".config/JetBrains/GoLand2025.2"));
+        let dirs = ide_dirs(Layout::Xdg, home, |_| None);
+        assert_eq!(dirs.iter().map(|d| d.product.as_str()).collect::<Vec<_>>(), ["GoLand", "IdeaIC"]);
+        assert_eq!(dirs[1].label, "IntelliJ IDEA Community Edition 2024.1");
+        assert_eq!(dirs[1].config, config);
+        assert_eq!(dirs[1].plugins, home.join(".local/share/JetBrains/IdeaIC2024.1"));
+
+        let xdg_data = home.join("data");
+        let env = |k: &str| (k == "XDG_DATA_HOME").then(|| xdg_data.clone().into_os_string());
+        assert_eq!(ide_dirs(Layout::Xdg, home, env)[1].plugins, xdg_data.join("JetBrains/IdeaIC2024.1"));
+    }
+
+    #[test]
+    fn reads_the_selected_theme_from_laf_xml() {
+        let tmp = tempfile::tempdir().unwrap();
+        let laf = tmp.path().join("options/laf.xml");
+        write(
+            &laf,
+            br#"<application>
+  <component name="LafManager">
+    <laf class-name="com.intellij.ide.ui.laf.UIThemeBasedLookAndFeelInfo" themeId="deep-sea-id" />
+    <preferred-light-laf themeId="shallow-id" />
+  </component>
+</application>"#,
+        );
+        assert_eq!(active_theme_ids(tmp.path()), ["deep-sea-id"]);
+        let synced = std::fs::read_to_string(&laf)
+            .unwrap()
+            .replace(r#"name="LafManager""#, r#"name="LafManager" autodetect="true""#);
+        write(&laf, synced.as_bytes());
+        assert_eq!(active_theme_ids(tmp.path()), ["deep-sea-id", "shallow-id"]);
+        assert!(active_theme_ids(&tmp.path().join("missing")).is_empty());
+    }
+
+    #[test]
+    fn lists_installed_theme_plugins_the_ides_current_first() {
+        let tmp = tempfile::tempdir().unwrap();
+        let config = tmp.path().join("IntelliJIdea2025.2");
+        let plugins = config.join("plugins");
+        write(&plugins.join("DeepSea/lib/deep-sea.jar"), &theme_jar());
+        write(
+            &plugins.join("Tools/lib/tools.jar"),
+            &jar_bytes(&[(PLUGIN_XML, b"<idea-plugin><name>T</name></idea-plugin>")]),
+        );
+        write(&plugins.join("broken.jar"), b"not a jar");
+        write(
+            &config.join("options/laf.xml"),
+            br#"<application><component name="LafManager"><laf themeId="shallow-id"/></component></application>"#,
+        );
+        let ide = IdeDir {
+            label: "IntelliJ IDEA 2025.2".into(),
+            product: "IntelliJIdea".into(),
+            version: (2025, 2),
+            config: config.clone(),
+            plugins: plugins.clone(),
+        };
+        let found = find_installed(&[ide]);
+        let theme = |id: &str, name: &str, dark: bool, active: bool| InstalledIntellijTheme {
+            ide: "IntelliJ IDEA 2025.2".into(),
+            plugin: "Deep Sea & Friends".into(),
+            path: plugins.join("DeepSea").into(),
+            theme_id: id.into(),
+            theme_name: name.into(),
+            dark,
+            active,
+        };
+        assert_eq!(found, [theme("shallow-id", "Shallow", false, true), theme("deep-sea-id", "Deep Sea", true, false)]);
+        assert!(find_installed(&[]).is_empty());
+    }
+}
diff --git a/crates/ide-host/src/plugins/market.rs b/crates/ide-host/src/plugins/market.rs
index a9e045c1..fdf2e514 100644
--- a/crates/ide-host/src/plugins/market.rs
+++ b/crates/ide-host/src/plugins/market.rs
@@ -3,11 +3,14 @@
 //! plugins, and revocations. The host keeps the last index it read
 //! (`market-index.json`), checks signatures against it, and disables what it
 //! revokes — at start-up and on every refresh (the desktop refreshes daily).
+//! Release builds pin the official publisher to the keys they were built
+//! with, so no index can sign `openidea.*` plugins with another key.
 
-use super::{PluginHost, PluginSource, PluginStatus};
+use super::{PackageFile, PluginEvent, PluginHost, PluginSource, PluginStatus, PluginUpdate, install};
 use ide_core::{IdeError, IdeResult};
-use ide_extension::Manifest;
 use ide_extension::package::{self, Index, IndexEntry, PackageSignature, SIGNATURE_FILE};
+use ide_extension::{MANIFEST_FILE, Manifest};
+use semver::Version;
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};
 
@@ -15,11 +18,18 @@ use std::path::{Path, PathBuf};
 /// the app, next to the signed packages of the official plugins.
 pub const OFFICIAL_INDEX: &str = "https://github.com/l0ng-ai/openidea/releases/latest/download/plugins-index.json";
 
+/// The publisher of the official plugins.
+pub const OFFICIAL_PUBLISHER: &str = "openidea";
+
 /// The last index read, in the plugins directory.
 pub const INDEX_FILE: &str = "market-index.json";
 const DOWNLOADS: &str = ".downloads";
 const MAX_INDEX: usize = 16 << 20;
 const MAX_PACKAGE: usize = 256 << 20;
+const MAX_STAGED_FILES: usize = 256;
+const MAX_STAGED_BYTES: usize = 16 << 20;
+/// `moved` links followed before giving up (a loop, or a misconfiguration).
+const MAX_MOVES: usize = 3;
 
 /// A marketplace entry with what is installed.
 #[derive(Clone, Debug, Serialize, Deserialize, specta::Type)]
@@ -29,6 +39,32 @@ pub struct MarketPlugin {
     pub entry: IndexEntry,
     /// Installed version, if any.
     pub installed: Option<String>,
+    /// Whether this IDE can load `entry` (the newest version it can, else the newest).
+    pub compatible: bool,
+}
+
+impl MarketPlugin {
+    /// A version this IDE can load, newer than the one installed.
+    pub fn is_update(&self) -> bool {
+        let newer = |installed: &String| match (Version::parse(&self.entry.version), Version::parse(installed)) {
+            (Ok(offered), Ok(installed)) => offered > installed,
+            _ => false,
+        };
+        self.compatible && self.installed.as_ref().is_some_and(newer)
+    }
+}
+
+/// The official publisher's keys this IDE was built with
+/// (`OPENIDEA_OFFICIAL_PLUGIN_KEYS`: base64, comma-separated). Development
+/// builds have none: the index decides.
+pub(super) fn built_in_official_keys() -> Vec<String> {
+    let keys = option_env!("OPENIDEA_OFFICIAL_PLUGIN_KEYS").unwrap_or_default();
+    keys.split(',').map(str::trim).filter(|k| !k.is_empty()).map(str::to_owned).collect()
+}
+
+fn pinned(mut index: Index, official_keys: &[String]) -> Index {
+    index.pin_publisher(OFFICIAL_PUBLISHER, "OpenIDEA", official_keys);
+    index
 }
 
 /// Reads `url`: `http(s)://…`, `file://…` or a local path.
@@ -56,6 +92,33 @@ pub fn read_url(url: &str, max: usize) -> Result<Vec<u8>, String> {
     Ok(bytes)
 }
 
+/// The index at `url`, following `moved`, with downloads made absolute against
+/// where it was read from.
+fn read_index(url: &str) -> IdeResult<Index> {
+    let mut url = url.to_owned();
+    for _ in 0..=MAX_MOVES {
+        let bytes = read_url(&url, MAX_INDEX).map_err(IdeError::unavailable)?;
+        let text = String::from_utf8(bytes).map_err(|_| IdeError::invalid("the index is not UTF-8"))?;
+        let mut index = Index::parse(&text).map_err(IdeError::invalid)?;
+        match index.moved.take().filter(|m| !m.trim().is_empty()) {
+            Some(next) => {
+                let next = resolve(&url, &next);
+                if url.starts_with("https://") && !next.starts_with("https://") {
+                    return Err(IdeError::invalid(format!("the marketplace moved to {next}, which isn't https")));
+                }
+                url = next;
+            }
+            None => {
+                for e in &mut index.plugins {
+                    e.download = resolve(&url, &e.download);
+                }
+                return Ok(index);
+            }
+        }
+    }
+    Err(IdeError::unavailable(format!("the marketplace index moved more than {MAX_MOVES} times")))
+}
+
 /// `href` relative to the index at `base`: a URL, or a local path (with the
 /// platform's separators, e.g. `C:\\market\\index.json`).
 pub fn resolve(base: &str, href: &str) -> String {
@@ -75,9 +138,16 @@ pub fn resolve(base: &str, href: &str) -> String {
 }
 
 impl PluginHost {
-    pub(super) fn load_market_index(dir: &Path) -> Option<Index> {
+    pub(super) fn load_market_index(dir: &Path, official_keys: &[String]) -> Option<Index> {
         let text = std::fs::read_to_string(dir.join(INDEX_FILE)).ok()?;
-        Index::parse(&text).map_err(|e| tracing::warn!("{INDEX_FILE}: {e}")).ok()
+        let index = Index::parse(&text).map_err(|e| tracing::warn!("{INDEX_FILE}: {e}")).ok()?;
+        Some(pinned(index, official_keys))
+    }
+
+    /// Pins the official publisher to `keys` (base64) instead of the built-in
+    /// ones, from the next index read.
+    pub fn set_official_keys(&self, keys: Vec<String>) {
+        *self.official_keys.write() = keys;
     }
 
     /// The marketplace index URL: the user's, else the default (none: no marketplace).
@@ -95,14 +165,26 @@ impl PluginHost {
         self.save_state();
     }
 
-    /// Reads the index again, keeps it, and applies its revocations.
+    /// The marketplace's plugins: read again when `refresh`, else the last index
+    /// read. Reads it when none has been read yet (first run, nothing cached).
+    pub fn market_listing(&self, refresh: bool) -> IdeResult<Vec<MarketPlugin>> {
+        if refresh || (self.market.read().is_none() && self.market_url().is_some()) {
+            self.refresh_market()
+        } else {
+            Ok(self.market_plugins())
+        }
+    }
+
+    /// Reads the index again, keeps it, and applies its revocations. Announces
+    /// updates of installed plugins it hasn't announced yet.
     pub fn refresh_market(&self) -> IdeResult<Vec<MarketPlugin>> {
         let url = self.market_url().ok_or_else(|| IdeError::unavailable("no plugin marketplace is configured"))?;
-        let bytes = read_url(&url, MAX_INDEX).map_err(IdeError::unavailable)?;
-        let text = String::from_utf8(bytes).map_err(|_| IdeError::invalid("the index is not UTF-8"))?;
-        let index = Index::parse(&text).map_err(IdeError::invalid)?;
-        let _ = std::fs::write(self.plugins_dir.join(INDEX_FILE), &text);
-        *self.market.write() = Some(index);
+        let index = read_index(&url)?;
+        if let Ok(json) = serde_json::to_string(&index) {
+            let _ = std::fs::write(self.plugins_dir.join(INDEX_FILE), json);
+        }
+        let newer = index.is_newer().then_some(index.format);
+        *self.market.write() = Some(pinned(index, &self.official_keys.read()));
         // Trust may have changed: who signed what, what is revoked.
         let installed: Vec<_> =
             self.plugins.read().values().filter(|p| p.source == PluginSource::Installed).cloned().collect();
@@ -111,7 +193,41 @@ impl PluginHost {
             plugin.meta.lock().publisher = publisher;
         }
         self.apply_revocations();
-        Ok(self.market_plugins())
+        if let Some(format) = newer {
+            return Err(IdeError::unavailable(format!(
+                "the marketplace needs a newer OpenIDEA (index format {format}); its revocations still apply"
+            )));
+        }
+        let plugins = self.market_plugins();
+        self.announce_updates(&plugins);
+        Ok(plugins)
+    }
+
+    /// Tells the windows about updates once per set of versions: a later
+    /// refresh offering the same ones says nothing.
+    fn announce_updates(&self, plugins: &[MarketPlugin]) {
+        let updates: Vec<PluginUpdate> = plugins
+            .iter()
+            .filter(|p| p.is_update())
+            .map(|p| PluginUpdate {
+                id: p.entry.id.clone(),
+                name: p.entry.name.clone(),
+                version: p.entry.version.clone(),
+            })
+            .collect();
+        let key: Vec<String> = updates.iter().map(|u| format!("{}@{}", u.id, u.version)).collect();
+        if std::mem::replace(&mut *self.announced_updates.lock(), key.clone()) != key && !updates.is_empty() {
+            self.emit(None, PluginEvent::UpdatesAvailable { updates });
+        }
+    }
+
+    /// Whether the package in `src` would replace the installed `id`'s copy
+    /// with one signed by another key than that copy, without that key's
+    /// endorsement: the user confirms the change of signer.
+    pub(super) fn signer_changed(&self, id: &str, src: &Path) -> bool {
+        let Some(current) = install::active_dir(&self.plugins_dir.join(id)) else { return false };
+        let market = self.market.read();
+        !package::signer_continues(market.as_ref(), read_signature(&current).as_ref(), read_signature(src).as_ref())
     }
 
     /// The plugins of the last index read.
@@ -119,16 +235,14 @@ impl PluginHost {
         let Some(index) = self.market.read().clone() else { return Vec::new() };
         let plugins = self.plugins.read();
         index
-            .plugins
-            .iter()
-            .filter(|e| index.revocation(&e.id, &e.version).is_none())
-            .cloned()
-            .map(|entry| {
+            .offered()
+            .into_iter()
+            .map(|(entry, compatible)| {
                 let installed = plugins
                     .get(&entry.id)
                     .filter(|p| p.source == PluginSource::Installed)
                     .map(|p| p.manifest().version.clone());
-                MarketPlugin { entry, installed }
+                MarketPlugin { entry: entry.clone(), installed, compatible }
             })
             .collect()
     }
@@ -139,12 +253,18 @@ impl PluginHost {
     pub fn download_market_plugin(&self, id: &str) -> IdeResult<PathBuf> {
         let url = self.market_url().ok_or_else(|| IdeError::unavailable("no plugin marketplace is configured"))?;
         let index = self.market.read().clone().ok_or_else(|| IdeError::unavailable("refresh the marketplace first"))?;
-        let entry = index
-            .plugins
-            .iter()
-            .find(|e| e.id == id)
-            .cloned()
+        let (entry, compatible) = index
+            .offered()
+            .into_iter()
+            .find(|(e, _)| e.id == id)
+            .map(|(e, ok)| (e.clone(), ok))
             .ok_or_else(|| IdeError::not_found(format!("{id} is not in the marketplace")))?;
+        if !compatible {
+            return Err(IdeError::unavailable(format!(
+                "{} {} needs plugin API {}: update OpenIDEA",
+                entry.name, entry.version, entry.engine
+            )));
+        }
         let bytes = read_url(&resolve(&url, &entry.download), MAX_PACKAGE).map_err(IdeError::unavailable)?;
         let downloads = self.plugins_dir.join(DOWNLOADS);
         std::fs::create_dir_all(&downloads)?;
@@ -182,6 +302,45 @@ impl PluginHost {
         Ok(dir)
     }
 
+    /// Writes a package the UI generated (an imported IntelliJ theme) into a
+    /// folder next to the downloads, named after `name` (its plugin id); returns the folder.
+    /// The install page validates it like any other package.
+    pub fn stage_package(&self, name: &str, files: &[PackageFile]) -> IdeResult<PathBuf> {
+        ide_extension::validate_item_id(name, "package name").map_err(IdeError::invalid)?;
+        if !files.iter().any(|f| f.path == MANIFEST_FILE) {
+            return Err(IdeError::invalid(format!("a package needs a {MANIFEST_FILE}")));
+        }
+        let total: usize = files.iter().map(|f| f.text.len()).sum();
+        if files.len() > MAX_STAGED_FILES || total > MAX_STAGED_BYTES {
+            return Err(IdeError::invalid("the package is too large"));
+        }
+        let mut seen = std::collections::HashSet::new();
+        for f in files {
+            let valid = !f.path.is_empty()
+                && f.path.len() <= 255
+                && f.path.split('/').all(|part| {
+                    !matches!(part, "" | "." | "..") && !part.contains(['\\', ':', '\0']) && !part.starts_with('.')
+                });
+            if !valid {
+                return Err(IdeError::invalid(format!("invalid package path {:?}", f.path)));
+            }
+            if !seen.insert(f.path.to_ascii_lowercase()) {
+                return Err(IdeError::invalid(format!("{} is in the package twice", f.path)));
+            }
+        }
+        // One folder per package, replaced by the next import of it: they don't pile up.
+        let dir = self.plugins_dir.join(DOWNLOADS).join(format!("{name}-generated"));
+        let _ = std::fs::remove_dir_all(&dir);
+        for f in files {
+            let path = dir.join(&f.path);
+            if let Some(parent) = path.parent() {
+                std::fs::create_dir_all(parent)?;
+            }
+            std::fs::write(&path, &f.text)?;
+        }
+        Ok(dir)
+    }
+
     /// Files of the package in `dir` (what its declarations reference, and
     /// the component): what a package file holds besides the manifest.
     pub fn package_files_of(&self, dir: &Path) -> IdeResult<Vec<PathBuf>> {
diff --git a/crates/ide-host/src/plugins/mod.rs b/crates/ide-host/src/plugins/mod.rs
index bc0beba1..0b82a935 100644
--- a/crates/ide-host/src/plugins/mod.rs
+++ b/crates/ide-host/src/plugins/mod.rs
@@ -16,8 +16,12 @@
 //! projects) and folders linked with `openidea-plugin link` (`links.json`).
 
 mod api;
+mod icon_extensions;
+mod icon_patterns;
+mod icon_settings;
 mod icons;
 mod install;
+pub mod intellij;
 mod market;
 mod points;
 mod providers;
@@ -32,7 +36,10 @@ pub mod web;
 
 pub use api::{FileSecretStore, HostWorkspace, PluginWorkspace, SecretStore};
 pub use icons::{map_asset as icon_theme_map_asset, sanitize_svg, svg_prefix as icon_theme_svg_prefix};
-pub use market::{INDEX_FILE as MARKET_INDEX_FILE, MarketPlugin, OFFICIAL_INDEX as OFFICIAL_MARKET_INDEX};
+pub use market::{
+    INDEX_FILE as MARKET_INDEX_FILE, MarketPlugin, OFFICIAL_INDEX as OFFICIAL_MARKET_INDEX, OFFICIAL_PUBLISHER,
+    read_url as read_market_url, resolve as resolve_market_href,
+};
 pub use points::{COMMANDS, CommandDecl, register_builtin_points};
 pub(crate) use providers::editor_providers as editor_providers_for;
 pub use providers::{ProviderKind, set_editor_providers};
@@ -238,12 +245,16 @@ pub struct Consent {
     /// Optional capabilities the user accepted (`net:crates.io`, …). Required
     /// ones are implied by consenting at all.
     pub optional: Vec<String>,
+    /// The user accepted a package signed by another key than the installed
+    /// copy ([`InstallPreview::signer_changed`]).
+    #[serde(default)]
+    pub signer_change: bool,
 }
 
 impl Consent {
     /// Accept everything the plugin asks for (tests, trusted official plugins).
     pub fn all() -> Self {
-        Self { optional: vec!["*".into()] }
+        Self { optional: vec!["*".into()], signer_change: true }
     }
 
     fn accepts(&self, cap: &Capability) -> bool {
@@ -270,6 +281,14 @@ pub struct InstallPreview {
     pub unsigned: bool,
     /// The verified publisher.
     pub publisher: Option<String>,
+    /// Replaces an installed copy signed with another key, which didn't
+    /// endorse this package's (or this one is unsigned): the user confirms it
+    /// ([`Consent::signer_change`]).
+    pub signer_changed: bool,
+    /// Something to confirm: a first install, an unsigned package, another
+    /// signer, or capabilities the installed version wasn't granted or
+    /// refused. Without, an update installs with the grants it has.
+    pub needs_consent: bool,
 }
 
 type ProjectPolicy = Arc<dyn Fn(&Path) -> bool + Send + Sync>;
@@ -316,6 +335,10 @@ pub struct PluginHost {
     pins: Arc<RwLock<HashMap<(String, String), ProgramPin>>>,
     /// The last marketplace index read: trust root for signatures, revocations.
     market: RwLock<Option<ide_extension::package::Index>>,
+    /// The official publisher's keys the index is pinned to (none: as listed).
+    official_keys: RwLock<Vec<String>>,
+    /// `id@version` of the updates last announced.
+    announced_updates: Mutex<Vec<String>>,
     /// The marketplace used while the user has set none (the app's official one).
     default_market_url: RwLock<Option<String>>,
     /// Updates not confirmed yet (the new version hasn't started once): what
@@ -354,9 +377,12 @@ impl PluginHost {
             policy_pins.read().get(&(plugin.to_owned(), cap.to_string())).cloned()
         }));
         let shared = api::Shared::new(sink.clone(), plugins_dir.join(".data"), pins.clone(), ui.clone());
-        let market = RwLock::new(Self::load_market_index(&plugins_dir));
+        let official_keys = market::built_in_official_keys();
+        let market = RwLock::new(Self::load_market_index(&plugins_dir, &official_keys));
         let host = Self {
             market,
+            official_keys: RwLock::new(official_keys),
+            announced_updates: Mutex::default(),
             default_market_url: RwLock::new(None),
             updates: Mutex::default(),
             project_policy: RwLock::new(Arc::new(|_| false)),
@@ -699,14 +725,27 @@ impl PluginHost {
         }
         let publisher = self.verified_publisher(src);
         let m = &pkg.manifest;
+        let replaces = self.plugins.read().get(&m.id).map(|p| p.manifest().version.clone());
+        // An update shows what the installed version was granted.
+        let grant = replaces
+            .as_ref()
+            .and_then(|_| self.ledger.lock().get(&Subject::Installed(m.id.clone())).cloned())
+            .filter(|g| g.confirmed);
+        let granted = |c: &Capability| grant.as_ref().is_some_and(|g| g.has(c));
         let mut capabilities: Vec<CapabilityInfo> =
-            m.capabilities.all().map(|c| CapabilityInfo::new(c, m.capabilities.is_optional(c), false)).collect();
+            m.capabilities.all().map(|c| CapabilityInfo::new(c, m.capabilities.is_optional(c), granted(c))).collect();
         for extra in &set.capabilities {
             if !m.declares(extra) {
-                capabilities.push(CapabilityInfo::new(extra, true, false));
+                capabilities.push(CapabilityInfo::new(extra, true, granted(extra)));
             }
         }
         capabilities.sort_by(|a, b| b.risk.cmp(&a.risk).then(a.id.cmp(&b.id)));
+        let signer_changed = self.signer_changed(&m.id, src);
+        let answered = |c: &CapabilityInfo| {
+            c.granted || (c.optional && grant.as_ref().is_some_and(|g| g.declined.contains(&c.id)))
+        };
+        let needs_consent =
+            grant.is_none() || publisher.is_none() || signer_changed || !capabilities.iter().all(answered);
         Ok(InstallPreview {
             id: m.id.clone(),
             name: m.name.clone(),
@@ -717,9 +756,11 @@ impl PluginHost {
             capabilities,
             contributions: counts(m),
             warnings: set.warnings.clone(),
-            replaces: self.plugins.read().get(&m.id).map(|p| p.manifest().version.clone()),
+            replaces,
             unsigned: publisher.is_none(),
             publisher,
+            signer_changed,
+            needs_consent,
         })
     }
 
@@ -742,6 +783,11 @@ impl PluginHost {
         if let Some(problem) = self.signature_problem(src) {
             return Err(IdeError::invalid(format!("refusing {id}: {problem}")));
         }
+        if !consent.signer_change && self.signer_changed(&id, src) {
+            return Err(IdeError::invalid(format!(
+                "refusing {id}: it is signed by another key than the installed version; confirm the change of signer"
+            )));
+        }
         let version = pkg.manifest.version.clone();
         if let Some(r) = self.market.read().as_ref().and_then(|i| i.revocation(&id, &version)) {
             return Err(IdeError::invalid(format!("{id} {version} was revoked: {}", r.reason)));
@@ -2207,6 +2253,7 @@ fn placeholder_manifest(dir: &Path) -> Manifest {
         homepage: None,
         license: None,
         change_notes: None,
+        declared_categories: Vec::new(),
         engine: ide_extension::ENGINE_VERSION.into(),
         legacy: false,
         wasm: None,
diff --git a/crates/ide-host/src/plugins/providers.rs b/crates/ide-host/src/plugins/providers.rs
index d60b806a..b37c12e1 100644
--- a/crates/ide-host/src/plugins/providers.rs
+++ b/crates/ide-host/src/plugins/providers.rs
@@ -292,6 +292,21 @@ impl PluginHost {
         .collect()
     }
 
+    /// The edits of an action `plugin_id` returned with `data`, now that the
+    /// user picked it: a call with the command budget, not the edit path's.
+    pub fn resolve_code_action(
+        &self,
+        plugin_id: &str,
+        doc: &ProviderDocument,
+        action: CodeAction,
+    ) -> ide_core::IdeResult<CodeAction> {
+        let d = Arc::new(doc.clone());
+        let timeout = self.limits.timeout;
+        self.code_call(plugin_id, ide_plugin::Invocation::default(), "resolving the code action", move |rt, _| {
+            rt.resolve_code_action(&d, &action, timeout)
+        })
+    }
+
     pub fn provide_definition(&self, doc: &ProviderDocument, at: ide_core::Pos) -> Vec<Location> {
         let d = Arc::new(doc.clone());
         self.edit_calls(ProviderKind::Definition, &doc.language, move |rt, timeout| {
diff --git a/crates/ide-host/src/plugins/remote_host.rs b/crates/ide-host/src/plugins/remote_host.rs
index 71be9116..9c869023 100644
--- a/crates/ide-host/src/plugins/remote_host.rs
+++ b/crates/ide-host/src/plugins/remote_host.rs
@@ -114,6 +114,7 @@ pub fn forwarded(event: &PluginEvent) -> bool {
             | PluginEvent::ViewChanged { .. }
             | PluginEvent::ViewMessage { .. }
             | PluginEvent::OpenTerminal { .. }
+            | PluginEvent::OpenLocation { .. }
     )
 }
 
@@ -272,7 +273,8 @@ impl RemotePlugins {
                 report.failed.push(format!("{}: invalid plugin id", pkg.id));
                 continue;
             }
-            let consent = Consent { optional: pkg.granted.clone() };
+            // The desktop asked the user, change of signer included.
+            let consent = Consent { optional: pkg.granted.clone(), signer_change: true };
             if self.current_digest(&pkg.id).as_deref() == Some(pkg.digest.as_str()) {
                 if let Err(e) = self.follow_grants(&pkg, &consent) {
                     report.failed.push(format!("{}: {e}", pkg.id));
diff --git a/crates/ide-host/src/plugins/theme.rs b/crates/ide-host/src/plugins/theme.rs
index e4f38ff5..7b4fd88b 100644
--- a/crates/ide-host/src/plugins/theme.rs
+++ b/crates/ide-host/src/plugins/theme.rs
@@ -134,7 +134,7 @@ impl ExtensionPoint for ThemesPoint {
 
 /// Blanks out `//` and `/* */` comments outside strings, keeping newlines so
 /// parse errors still point at the right line.
-fn strip_json_comments(src: &str) -> String {
+pub(super) fn strip_json_comments(src: &str) -> String {
     let mut out = String::with_capacity(src.len());
     let mut chars = src.chars().peekable();
     let (mut in_str, mut escaped) = (false, false);
diff --git a/crates/ide-host/src/plugins/types.rs b/crates/ide-host/src/plugins/types.rs
index c9cac430..bd5e197c 100644
--- a/crates/ide-host/src/plugins/types.rs
+++ b/crates/ide-host/src/plugins/types.rs
@@ -138,12 +138,24 @@ pub struct PluginsSnapshot {
     pub ui: Vec<UiContribution>,
 }
 
+/// A newer version of an installed plugin in the marketplace.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PluginUpdate {
+    pub id: String,
+    pub name: String,
+    pub version: String,
+}
+
 /// Backend → UI notifications (Tauri event `ide://plugin`).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(tag = "type", rename_all = "camelCase")]
 pub enum PluginEvent {
     /// Plugins, their status or their contributions changed: re-fetch `plugin_list`.
     CommandsChanged,
+    /// The marketplace offers newer versions of installed plugins (announced
+    /// once per set of versions).
+    UpdatesAvailable { updates: Vec<PluginUpdate> },
     #[serde(rename_all = "camelCase")]
     Notification { plugin_id: String, level: NotificationLevel, title: String, body: String },
     /// A plugin's status bar item was set (`item`) or removed.
@@ -180,6 +192,8 @@ pub enum PluginEvent {
         args: Vec<String>,
         cwd: ide_core::IpcPath,
     },
+    #[serde(rename_all = "camelCase")]
+    OpenLocation { plugin_id: String, path: ide_core::IpcPath, line: u32, column: u32 },
     /// Plugin languages, or the servers they may start, changed: re-fetch
     /// `languages` (the host re-detects open documents: [`crate::Host::plugin_languages_changed`]).
     LanguagesChanged,
@@ -212,6 +226,14 @@ impl PluginEditor {
     }
 }
 
+/// A text file of a package the UI generated, at its `/`-separated path in the package.
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PackageFile {
+    pub path: String,
+    pub text: String,
+}
+
 /// A plugin's status bar item.
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
diff --git a/crates/ide-host/src/plugins/ui_points.rs b/crates/ide-host/src/plugins/ui_points.rs
index 3b5e3d14..135ddd7d 100644
--- a/crates/ide-host/src/plugins/ui_points.rs
+++ b/crates/ide-host/src/plugins/ui_points.rs
@@ -378,9 +378,19 @@ pub(super) fn view(pkg: &Package, decl: toml::Value) -> Result<UiDecl, String> {
     }
     let mut out = UiDecl::new(d.id.clone(), d.title.clone(), json(&d)?);
     out.files = files;
+    if let Some(icon) = d.icon.as_deref().filter(|i| i.ends_with(".svg")) {
+        let path = std::path::PathBuf::from(icon);
+        let svg = super::icons::read_icon(pkg, &path)?;
+        out.assets.push((view_icon_asset(&d.id), svg));
+        out.files.push(path);
+    }
     Ok(out)
 }
 
+pub fn view_icon_asset(id: &str) -> String {
+    format!("viewIcon/{id}")
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 struct CustomEditorDecl {
diff --git a/crates/ide-host/src/project.rs b/crates/ide-host/src/project.rs
index e63e8db8..0c5e9648 100644
--- a/crates/ide-host/src/project.rs
+++ b/crates/ide-host/src/project.rs
@@ -34,6 +34,8 @@ pub struct Project {
     pub lsp: Arc<LspManager>,
     /// Git repositories: the one containing the project root and those nested below it.
     pub repos: Arc<RwLock<Repos>>,
+    /// Explicitly opened external logs remain read-only and outside project indexing.
+    pub(crate) external_log_repos: RwLock<Vec<Arc<Repo>>>,
     /// Incrementally maintained syntax trees of the open documents.
     pub syntax: Arc<SyntaxCache>,
     /// Tree-sitter structure queries (LSP fallback) over `syntax`.
@@ -56,6 +58,9 @@ pub struct Project {
     pub(crate) watcher: Watcher,
     /// Watchers of the Project Structure content roots outside the project folder.
     pub(crate) content_watchers: Mutex<Vec<(PathBuf, Watcher)>>,
+    /// Watchers of folders outside the project that language servers registered file
+    /// watchers for (a virtualenv elsewhere, a path dependency).
+    lsp_watchers: Mutex<Vec<(PathBuf, Watcher)>>,
     pub(crate) _scratch_watcher: Option<Watcher>,
     /// A LightEdit window's loose files ([`Host::open_light`]): global settings only,
     /// nothing indexed, no language servers, repositories or project services.
@@ -83,6 +88,7 @@ impl Host {
             return Ok(current);
         }
         self.close_project(window);
+        self.wait_detached_closes();
         let sink: SharedSink = (self.sink_for)(window);
         // Before anything the project starts: its children get the project's environment.
         let trusted = Arc::new(AtomicBool::new(self.trust.trusted(&root)?));
@@ -204,6 +210,7 @@ impl Host {
                         cfg.launch_error = Some(e);
                         None
                     });
+                    ide_sdk::apply::configure_java_compiler(cfg, &data_dir, &effective.inspections);
                     ide_sdk::java::configure_jdtls(
                         cfg,
                         server_root,
@@ -218,9 +225,16 @@ impl Host {
                     ide_sdk::jdtls::launch_directly(cfg);
                 }
                 ide_sdk::apply::server_protocol_overrides(cfg, &effective);
+                // After the overrides: the PHP version they may set decides the storage.
+                ide_sdk::php::configure_intelephense_storage(cfg, &data_dir);
                 if cfg.name == "jdtls" {
                     let (excluded_poms, build_files) = jdtls_maven_import(root, &effective);
                     ide_sdk::apply::configure_maven_import(cfg, root, &excluded_poms, build_files.as_deref());
+                    ide_sdk::apply::configure_gradle_import(
+                        cfg,
+                        effective.languages.java.gradle.linked_projects.as_deref(),
+                        build_files.as_deref(),
+                    );
                 }
             }));
         }
@@ -302,12 +316,16 @@ impl Host {
                 sink.clone(),
                 Box::new(move |batch| {
                     let changed: Vec<PathBuf> = batch.created.iter().chain(&batch.modified).cloned().collect();
-                    index.update(&changed, &batch.removed);
+                    let (ignored, ignored_gone) = ignored_changes(batch);
+                    index.update(&[&changed[..], &ignored].concat(), &[&batch.removed[..], &ignored_gone].concat());
                     kotlin_bridge.files_changed(changed.iter().chain(&batch.removed));
                     lsp.project_files_changed(batch.created.iter().chain(&batch.removed));
-                    lsp.watched_files_changed(&batch.created, &batch.modified, &batch.removed);
+                    lsp.watched_files_changed(&batch.created, &batch.modified, &batch.removed, &batch.excluded_dirs);
+                    if composer_changed(&root, changed.iter().chain(&batch.removed)) {
+                        lsp.reconfigure_soon();
+                    }
                     // Atomic saves by external tools surface as `created`.
-                    documents.on_disk_changed(&changed);
+                    documents.on_disk_changed(&[&changed[..], &ignored].concat());
                     // A framework's root marker (`angular.json`) created or deleted: its
                     // templates gain or lose their mode. Markers in `node_modules` only
                     // count here when the folder isn't excluded (it is by default).
@@ -411,7 +429,16 @@ impl Host {
         let content_watchers = extra_roots
             .iter()
             .filter_map(|r| {
-                let w = content_root_watcher(r, &excludes, &sink, &index, &documents, &history, Some(&kotlin_bridge))?;
+                let w = content_root_watcher(
+                    r,
+                    &excludes,
+                    &sink,
+                    &index,
+                    &documents,
+                    &history,
+                    &lsp,
+                    Some(&kotlin_bridge),
+                )?;
                 Some((r.clone(), w))
             })
             .collect();
@@ -444,6 +471,7 @@ impl Host {
             index,
             lsp,
             repos,
+            external_log_repos: RwLock::default(),
             structure: Arc::new(StructureService::new(syntax.clone())),
             syntax,
             detected_roots,
@@ -458,6 +486,7 @@ impl Host {
             kotlin_bridge: Some(kotlin_bridge),
             watcher,
             content_watchers: Mutex::new(content_watchers),
+            lsp_watchers: Mutex::new(Vec::new()),
             _scratch_watcher: scratch_watcher,
             light: false,
         });
@@ -467,6 +496,14 @@ impl Host {
                 weak.upgrade().map(|p| p.reference_candidates(q, cancel)).unwrap_or_default()
             }));
         }
+        {
+            let weak = Arc::downgrade(&project);
+            project.lsp.set_file_watch_roots_hook(Box::new(move |roots| {
+                if let Some(p) = weak.upgrade() {
+                    p.watch_for_language_servers(roots);
+                }
+            }));
+        }
         {
             let weak = Arc::downgrade(&project);
             project.lsp.set_project_excludes_hook(Box::new(move || {
@@ -489,12 +526,15 @@ impl Host {
         root: &Path,
         project_key: &str,
     ) -> (Arc<ide_db::DbManager>, Arc<ide_http::History>, Arc<ide_agent::AgentManager>) {
-        let db = Arc::new(ide_db::DbManager::new(
-            root.to_path_buf(),
-            self.data_dir.join("db-passwords.json"),
-            self.data_dir.join("db-history.json"),
-            self.ssh.clone(),
-        ));
+        let db = Arc::new(
+            ide_db::DbManager::new(
+                root.to_path_buf(),
+                self.data_dir.join("db-passwords.json"),
+                self.data_dir.join("db-history.json"),
+                self.ssh.clone(),
+            )
+            .with_global_sources(self.data_dir.clone()),
+        );
         let http_history = Arc::new(ide_http::History::new(self.data_dir.join("http-history").join(project_key)));
         let agents = Arc::new(ide_agent::AgentManager::new(
             ide_agent::AgentPaths {
@@ -536,6 +576,7 @@ impl Host {
             return Ok(current);
         }
         self.close_project(window);
+        self.wait_detached_closes();
         let sink: SharedSink = (self.sink_for)(window);
         let settings = Arc::new(SettingsStore::load(&self.config_dir, None));
         let effective = settings.effective();
@@ -568,6 +609,7 @@ impl Host {
             index,
             lsp,
             repos: Arc::default(),
+            external_log_repos: RwLock::default(),
             structure: Arc::new(StructureService::new(syntax.clone())),
             syntax,
             detected_roots: Arc::default(),
@@ -582,6 +624,7 @@ impl Host {
             kotlin_bridge: None,
             watcher,
             content_watchers: Mutex::new(Vec::new()),
+            lsp_watchers: Mutex::new(Vec::new()),
             _scratch_watcher: None,
             light: true,
             root: dir,
@@ -664,7 +707,14 @@ fn scan_repositories(
     build_cache: &Path,
 ) {
     let ignored = settings.effective().ignored_names();
-    let skip = |p: &Path| p.file_name().is_some_and(|n| ignored.is_ignored_name(&n.to_string_lossy()));
+    let skip = |p: &Path| {
+        p.file_name().is_some_and(|n| {
+            let name = n.to_string_lossy();
+            ignored.is_ignored_name(&name)
+                || (ide_workspace::unity::GENERATED_DIRS.contains(&name.as_ref())
+                    && p.parent().is_some_and(ide_workspace::unity::is_project))
+        })
+    };
     let mut roots = vec![root.to_path_buf()];
     roots.extend(content_roots(&settings.effective(), root, build_cache));
     match Repos::discover_roots(&roots, &skip) {
@@ -711,6 +761,51 @@ impl Project {
         }
     }
 
+    pub fn open_external_log(&self, path: &Path) -> IdeResult<PathBuf> {
+        let root = dunce::canonicalize(path)?;
+        let repo = Repo::discover(&root)?.ok_or_else(|| IdeError::unavailable("folder is not a Git worktree"))?;
+        let root = repo.root().to_path_buf();
+        repo.set_execution_allowed(false);
+        let mut external = self.external_log_repos.write();
+        if !external.iter().any(|r| r.root() == root) {
+            external.push(Arc::new(repo));
+        }
+        Ok(root)
+    }
+
+    /// Log read operations may also use an explicitly opened external worktree.
+    /// Mutations continue to use `with_repo_at` and cannot reach these repositories.
+    pub fn with_log_repo_at<T>(&self, at: Option<&Path>, f: impl FnOnce(&Repo) -> IdeResult<T>) -> IdeResult<T> {
+        if let Some(path) = at
+            && self.repos().at_root(path).is_none()
+        {
+            let repo = self
+                .external_log_repos
+                .read()
+                .iter()
+                .find(|r| r.root() == path)
+                .cloned()
+                .ok_or_else(|| IdeError::unavailable("external Git log is not open"))?;
+            return f(&repo);
+        }
+        self.with_repo_at(at, f)
+    }
+
+    pub fn with_log_repo_of<T>(&self, path: &Path, f: impl FnOnce(&Repo) -> IdeResult<T>) -> IdeResult<T> {
+        if self.repos().for_path(path).is_some() {
+            return self.with_repo_of(path, f);
+        }
+        let repo = self
+            .external_log_repos
+            .read()
+            .iter()
+            .filter(|r| path.starts_with(r.root()))
+            .max_by_key(|r| r.root().components().count())
+            .cloned()
+            .ok_or_else(|| IdeError::unavailable("path is not in an open Git log"))?;
+        f(&repo)
+    }
+
     /// Runs `f` with the repository `path` (a file or folder) belongs to.
     pub fn with_repo_of<T>(&self, path: &Path, f: impl FnOnce(&Repo) -> IdeResult<T>) -> IdeResult<T> {
         match self.repos().for_path(path) {
@@ -786,8 +881,14 @@ impl Project {
 
     /// Effective source / test / resource / excluded roots (detected + Project Structure marks).
     pub fn roots(&self) -> ProjectRoots {
-        let detected = with_gradle_roots(&self.root, &self.build_cache_dir(), &self.detected_roots.read());
-        linked_roots(&self.root, &self.settings.effective(), &detected)
+        let settings = self.settings.effective();
+        let detected = with_gradle_roots(
+            &self.root,
+            &self.build_cache_dir(),
+            &settings.languages.java.gradle,
+            &self.detected_roots.read(),
+        );
+        linked_roots(&self.root, &settings, &detected)
     }
 
     /// Where the Maven / Gradle tool windows cache what the build tools reported.
@@ -816,7 +917,8 @@ impl Project {
 
     /// Project files of `q.languages` under `q.root` containing `q.word` as a whole
     /// word (unsaved buffers included; excluded roots, ignored names and
-    /// `.gitignore`d files skipped): the files a references search opens on its server.
+    /// `.gitignore`d folders skipped, while `.gitignore`d files elsewhere count, as
+    /// in IDEA's project scope): the files a references search opens on its server.
     pub fn reference_candidates(
         &self,
         q: &ide_lsp::CandidateQuery,
@@ -894,6 +996,7 @@ impl Project {
                 &self.index,
                 &self.documents,
                 &self.history,
+                &self.lsp,
                 self.kotlin_bridge.as_ref(),
             ) {
                 watchers.push((r, w));
@@ -925,7 +1028,7 @@ impl Project {
             return encoding_rs::Encoding::for_label(loaded.encoding.as_bytes())
                 .ok_or_else(|| ide_core::IdeError::invalid("unknown file encoding"));
         }
-        let bytes = self.with_repo_of(path, |r| r.file_bytes_at(path, rev))?.unwrap_or_default();
+        let bytes = self.with_log_repo_of(path, |r| r.file_bytes_at(path, rev))?.unwrap_or_default();
         Ok(ide_vfs::detect_encoding(&bytes, fallback))
     }
 
@@ -948,6 +1051,11 @@ const HISTORY_BATCH_LIMIT: usize = 500;
 
 /// Local History for changes made outside the IDE (other tools, VCS, deletions).
 /// Contents equal to the last snapshot (e.g. the IDE's own saves) are skipped.
+/// The batch's ignored files (`.env`), split into those still on disk and those removed.
+fn ignored_changes(batch: &ide_vfs::FsBatch) -> (Vec<PathBuf>, Vec<PathBuf>) {
+    batch.ignored.iter().cloned().partition(|p| p.symlink_metadata().is_ok())
+}
+
 fn record_external_changes(history: &LocalHistory, changed: &[PathBuf], removed: &[PathBuf]) {
     for path in changed.iter().take(HISTORY_BATCH_LIMIT) {
         if let Err(e) = history.record_file(path, "External change", false) {
@@ -981,7 +1089,7 @@ fn content_roots(settings: &ide_core::settings::Settings, root: &Path, build_cac
     }
     let mut out: Vec<PathBuf> = Vec::new();
     let user = settings.project_structure.content_roots.iter().map(|r| PathBuf::from(r.trim()));
-    for p in user.chain(ide_build::gradle_external_roots(root, build_cache)) {
+    for p in user.chain(ide_build::gradle_external_roots(root, build_cache, &settings.languages.java.gradle)) {
         if p.is_absolute() && p.is_dir() && !p.starts_with(root) && !out.contains(&p) {
             out.push(p);
         }
@@ -991,6 +1099,31 @@ fn content_roots(settings: &ide_core::settings::Settings, root: &Path, build_cac
 
 /// Watches a content root outside the project: the index, open documents and
 /// Local History follow its changes like the project folder's.
+impl Project {
+    /// Watches `roots` (outside the project) for the language servers that asked to.
+    fn watch_for_language_servers(&self, roots: Vec<PathBuf>) {
+        let mut watchers = self.lsp_watchers.lock();
+        watchers.retain(|(r, _)| roots.contains(r));
+        for root in roots {
+            if watchers.iter().any(|(r, _)| *r == root) || !root.is_dir() {
+                continue;
+            }
+            let lsp = Arc::downgrade(&self.lsp);
+            let on_change = Box::new(move |batch: &ide_vfs::FsBatch| {
+                if let Some(lsp) = lsp.upgrade() {
+                    lsp.watched_files_changed(&batch.created, &batch.modified, &batch.removed, &batch.excluded_dirs);
+                }
+            });
+            // Not project files: nothing else hears of them.
+            match Watcher::start(&root, Vec::new(), Arc::new(ide_core::NullSink), on_change) {
+                Ok(w) => watchers.push((root, w)),
+                Err(e) => tracing::warn!("language server watcher {}: {e}", root.display()),
+            }
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
 fn content_root_watcher(
     dir: &Path,
     excludes: &[String],
@@ -998,21 +1131,28 @@ fn content_root_watcher(
     index: &Arc<ProjectIndex>,
     documents: &Arc<Documents>,
     history: &Arc<LocalHistory>,
+    lsp: &Arc<LspManager>,
     kotlin_bridge: Option<&Arc<crate::kotlin_bridge::KotlinBridge>>,
 ) -> Option<Watcher> {
     let kotlin_bridge = kotlin_bridge.cloned();
-    let (index, documents, history) = (index.clone(), documents.clone(), history.clone());
+    let (index, documents, history, lsp) = (index.clone(), documents.clone(), history.clone(), lsp.clone());
+    let root = dir.to_path_buf();
     Watcher::start(
         dir,
         excludes.to_vec(),
         sink.clone(),
         Box::new(move |batch| {
             let changed: Vec<PathBuf> = batch.created.iter().chain(&batch.modified).cloned().collect();
-            index.update(&changed, &batch.removed);
+            let (ignored, ignored_gone) = ignored_changes(batch);
+            index.update(&[&changed[..], &ignored].concat(), &[&batch.removed[..], &ignored_gone].concat());
+            // A workspace member's PHP language level follows its own composer.json.
+            if composer_changed(&root, changed.iter().chain(&batch.removed)) {
+                lsp.reconfigure_soon();
+            }
             if let Some(bridge) = &kotlin_bridge {
                 bridge.files_changed(changed.iter().chain(&batch.removed));
             }
-            documents.on_disk_changed(&changed);
+            documents.on_disk_changed(&[&changed[..], &ignored].concat());
             record_external_changes(&history, &changed, &batch.removed);
         }),
     )
@@ -1020,6 +1160,13 @@ fn content_root_watcher(
     .ok()
 }
 
+/// Whether the `composer.json` of `root` is among `paths`: the PHP language level follows it
+/// (`ide_sdk::php`).
+fn composer_changed<'a>(root: &Path, mut paths: impl Iterator<Item = &'a PathBuf>) -> bool {
+    let composer = root.join("composer.json");
+    paths.any(|p| *p == composer)
+}
+
 /// Where agent tasks create their worktrees: next to the project, `<parent>/<name>.worktrees`,
 /// so they sit on the project's drive and outside its tree (not indexed, watched or shown in
 /// its git status); `fallback` for a project at a filesystem root.
@@ -1046,31 +1193,93 @@ pub(crate) fn jdtls_maven_import(
     settings: &ide_core::settings::Settings,
 ) -> (Vec<PathBuf>, Option<Vec<String>>) {
     let maven = &settings.languages.java.maven;
-    if maven.unlinked_projects.is_empty() {
+    let gradle = &settings.languages.java.gradle;
+    if maven.unlinked_projects.is_empty() && gradle.linked_projects.is_none() {
         return (Vec::new(), None);
     }
     let model = ide_build::maven::load(root);
     let unlinked = ide_build::maven::UnlinkedProjects::from_model(&model, maven);
     let excluded = unlinked.poms().map(PathBuf::from).collect();
-    let build_files = unlinked.import_poms(&model).map(|poms| {
-        let gradle = ide_build::gradle::load(root).and_then(|g| {
+    let poms = unlinked.import_poms(&model).or_else(|| {
+        gradle.linked_projects.as_ref().map(|_| {
+            model
+                .projects
+                .iter()
+                .filter(|p| !p.aggregated && !unlinked.contains(&p.pom))
+                .map(|p| p.pom.clone())
+                .collect()
+        })
+    });
+    let build_files = poms.map(|poms| {
+        let gradle = ide_build::gradle::load_linked(root, gradle).into_iter().filter_map(|g| {
             let dir = root.join(&g.dir);
             let names = ide_build::gradle::SETTINGS_FILES.iter().chain(ide_build::gradle::BUILD_FILES);
             names.map(|n| dir.join(n)).find(|f| f.is_file())
         });
-        poms.iter().map(|pom| root.join(pom)).chain(gradle).map(|f| ide_lsp::path_to_uri_string(&f)).collect()
+        let eclipse = if settings.languages.java.gradle.linked_projects.is_some() {
+            independent_eclipse_projects(root)
+        } else {
+            Vec::new()
+        };
+        poms.iter()
+            .map(|pom| root.join(pom))
+            .chain(gradle)
+            .chain(eclipse)
+            .map(|f| ide_lsp::path_to_uri_string(&f))
+            .collect()
     });
     (excluded, build_files)
 }
 
+/// Explicit Gradle imports must retain Eclipse projects without re-importing generated build metadata.
+fn independent_eclipse_projects(root: &Path) -> Vec<PathBuf> {
+    let managed = |dir: &Path| {
+        std::iter::once("pom.xml")
+            .chain(ide_build::gradle::SETTINGS_FILES.iter().copied())
+            .chain(ide_build::gradle::BUILD_FILES.iter().copied())
+            .any(|name| dir.join(name).is_file())
+    };
+    if managed(root) {
+        return Vec::new();
+    }
+    let walker = ignore::WalkBuilder::new(root)
+        .standard_filters(false)
+        .filter_entry(move |entry| {
+            if !entry.file_type().is_some_and(|kind| kind.is_dir()) {
+                return false;
+            }
+            if entry.depth() > 0
+                && (entry.file_name().to_string_lossy().starts_with('.')
+                    || matches!(
+                        entry.file_name().to_str(),
+                        Some("node_modules" | "target" | "build" | "dist" | "out" | "bin" | "vendor")
+                    )
+                    || entry.path().parent().is_some_and(|parent| parent.join(".project").is_file()))
+            {
+                return false;
+            }
+            !managed(entry.path())
+        })
+        .build();
+    let mut projects: Vec<_> =
+        walker.flatten().map(|entry| entry.path().join(".project")).filter(|path| path.is_file()).collect();
+    projects.sort();
+    projects
+}
+
 /// The detected roots with the last Gradle sync's source sets first: Gradle evaluated what
 /// static detection guesses. Folders outside the project keep their absolute path, which
 /// `normalize` turns into the same form the UI compares (`Users/me/svc/src/main/java`).
-fn with_gradle_roots(root: &Path, build_cache: &Path, detected: &[SourceFolder]) -> Vec<SourceFolder> {
+fn with_gradle_roots(
+    root: &Path,
+    build_cache: &Path,
+    settings: &ide_core::settings::GradleSettings,
+    detected: &[SourceFolder],
+) -> Vec<SourceFolder> {
     use ide_build::gradle::ReportedRoot;
     use ide_workspace::roots::RootKind;
     let mut out: Vec<SourceFolder> = Vec::new();
-    for (dir, kind) in ide_build::gradle_source_roots(build_cache) {
+    for (dir, kind) in ide_build::gradle_source_roots(root, build_cache, settings) {
         if !dir.is_dir() {
             continue;
         }
@@ -1240,6 +1449,37 @@ pub fn apply_git_executable(settings: &ide_core::settings::Settings) {
 
 #[cfg(test)]
 mod maven_linkage_tests {
+    #[test]
+    fn explicit_gradle_links_preserve_independent_eclipse_projects() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path();
+        for dir in
+            ["linked", "unlinked", "eclipse", "nested/eclipse", "unlinked/subproject", "maven", "build/generated"]
+        {
+            std::fs::create_dir_all(root.join(dir)).unwrap();
+            std::fs::write(root.join(dir).join(".project"), "<projectDescription/>").unwrap();
+        }
+        for dir in ["linked", "unlinked"] {
+            std::fs::write(root.join(dir).join("settings.gradle"), "").unwrap();
+        }
+        std::fs::write(root.join("maven/pom.xml"), "<project/>").unwrap();
+        let mut settings = ide_core::settings::Settings::default();
+        settings.languages.java.gradle.linked_projects = Some(vec!["linked".into()]);
+        let (_, files) = super::jdtls_maven_import(root, &settings);
+        let files = files.unwrap();
+        let uri = |path: &str| ide_lsp::path_to_uri_string(&root.join(path));
+        assert!(files.contains(&uri("linked/settings.gradle")));
+        assert!(files.contains(&uri("maven/pom.xml")));
+        assert!(files.contains(&uri("eclipse/.project")));
+        assert!(files.contains(&uri("nested/eclipse/.project")));
+        assert!(!files.iter().any(|path| path.contains("unlinked") || path.contains("build/generated")));
+        assert!(!files.contains(&uri("linked/.project")));
+        assert!(!files.contains(&uri("maven/.project")));
+        settings.languages.java.gradle.linked_projects = Some(vec![]);
+        let (_, files) = super::jdtls_maven_import(root, &settings);
+        assert_eq!(files.unwrap(), [uri("maven/pom.xml"), uri("eclipse/.project"), uri("nested/eclipse/.project")]);
+    }
+
     #[test]
     fn jdtls_imports_the_linked_modules_and_the_gradle_build_once_a_reactor_module_is_unlinked() {
         let tmp = tempfile::tempdir().unwrap();
@@ -1337,7 +1577,8 @@ mod gradle_roots_tests {
         std::fs::write(cache.join("gradle.json"), json.to_string()).unwrap();
         let guessed = SourceFolder { path: "src/it/java".into(), kind: RootKind::Source, detected_from: None };
         let other = SourceFolder { path: "web".into(), kind: RootKind::Source, detected_from: None };
-        let out = with_gradle_roots(&root, &cache, &[guessed, other.clone()]);
+        std::fs::write(root.join("build.gradle"), "").unwrap();
+        let out = with_gradle_roots(&root, &cache, &Default::default(), &[guessed, other.clone()]);
         let abs = |p: PathBuf| ide_workspace::roots::normalize(&s(p));
         let got: Vec<(String, RootKind)> = out.iter().map(|f| (f.path.clone(), f.kind)).collect();
         assert_eq!(
@@ -1436,3 +1677,21 @@ mod agent_worktree_tests {
         assert_eq!(agent_worktrees_dir(Path::new("/"), fallback), fallback());
     }
 }
+
+#[cfg(test)]
+mod composer_tests {
+    use super::composer_changed;
+    use std::path::{Path, PathBuf};
+
+    #[test]
+    fn only_the_roots_own_composer_json_counts() {
+        let root = Path::new("/work/app");
+        let changed = |paths: &[&str]| {
+            let paths: Vec<PathBuf> = paths.iter().map(|p| root.join(p)).collect();
+            composer_changed(root, paths.iter())
+        };
+        assert!(changed(&["src/a.php", "composer.json"]));
+        assert!(!changed(&["composer.lock", "vendor/acme/lib/composer.json", "packages/b/composer.json"]));
+        assert!(!changed(&[]));
+    }
+}
diff --git a/crates/ide-host/src/proxy.rs b/crates/ide-host/src/proxy.rs
index 1ce2ed02..6644d250 100644
--- a/crates/ide-host/src/proxy.rs
+++ b/crates/ide-host/src/proxy.rs
@@ -1,6 +1,7 @@
 //! System Settings › HTTP Proxy on the host: the global settings made current for
 //! connections and child processes, the password kept in the saved passwords
-//! (owner-only `proxy-password.json`) instead of `settings.toml`.
+//! (the OS credential store) instead of `settings.toml`, or for the session
+//! when there is no credential store.
 
 use crate::Host;
 use ide_core::IdeResult;
@@ -12,7 +13,9 @@ impl Host {
     /// `settings` with the saved proxy password filled in, as the Settings dialog edits it.
     pub fn with_proxy_password(&self, mut settings: Settings) -> Settings {
         // A password typed into settings.toml by hand counts too, unless one was saved.
-        if let Some(password) = self.proxy_password.get(PASSWORD_KEY) {
+        let session = || self.proxy_session_password.lock().clone();
+        // The session copy is the latest write that could not be saved.
+        if let Some(password) = session().or_else(|| self.proxy_password.get(PASSWORD_KEY)) {
             settings.proxy.password = password;
         }
         settings
@@ -40,11 +43,70 @@ impl Host {
             _ => return Ok(Some(value)),
         };
         if let Some(password) = password {
-            match password.as_str().filter(|p| !p.is_empty()) {
-                Some(p) => self.proxy_password.set(PASSWORD_KEY, p)?,
+            let password = password.as_str().filter(|p| !p.is_empty());
+            let mut session = self.proxy_session_password.lock();
+            *session = None;
+            match password {
+                Some(p) => {
+                    if let Err(e) = self.proxy_password.set(PASSWORD_KEY, p) {
+                        tracing::warn!("the HTTP proxy password is kept for this session only: {}", e.message);
+                        *session = Some(p.to_owned());
+                    }
+                }
                 None => self.proxy_password.delete(PASSWORD_KEY),
             }
         }
         Ok((key != "proxy.password").then_some(value))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ide_ssh::secrets::{SecretFile, StoreError, StoreResult, Vault};
+    use std::sync::Arc;
+
+    /// A machine without a credential store (a headless Linux host).
+    struct NoStore;
+
+    impl Vault for NoStore {
+        fn available(&self) -> bool {
+            false
+        }
+        fn get(&self, _: &str, _: &str) -> StoreResult<String> {
+            Err(StoreError::NoDefaultStore)
+        }
+        fn set(&self, _: &str, _: &str, _: &str) -> StoreResult<()> {
+            Err(StoreError::NoDefaultStore)
+        }
+        fn delete(&self, _: &str, _: &str) -> StoreResult<()> {
+            Err(StoreError::NoDefaultStore)
+        }
+    }
+
+    #[tokio::test]
+    async fn without_a_credential_store_the_password_lasts_the_session() {
+        let tmp = tempfile::tempdir().unwrap();
+        let mut host = Host::new(crate::HostConfig {
+            config_dir: tmp.path().join("config"),
+            data_dir: tmp.path().join("data"),
+            local_data_dir: tmp.path().join("data"),
+            languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+            syntax: Arc::default(),
+            sink_for: Box::new(|_| Arc::new(ide_core::NullSink)),
+            owner: |w| w,
+            runtime: tokio::runtime::Handle::current(),
+            project_environment: false,
+        });
+        let path = tmp.path().join("data/proxy-password.json");
+        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+        std::fs::write(&path, r#"{"httpProxy": "old"}"#).unwrap();
+        host.proxy_password = SecretFile::with_vault(path, |v| serde_json::from_value(v).ok(), Arc::new(NoStore));
+
+        let left = host.take_proxy_password("proxy.password", serde_json::json!("s3cret")).unwrap();
+        assert_eq!(left, None);
+        assert_eq!(host.with_proxy_password(Settings::default()).proxy.password, "s3cret");
+        host.take_proxy_password("proxy.password", serde_json::json!("")).unwrap();
+        assert_eq!(host.with_proxy_password(Settings::default()).proxy.password, "");
+    }
+}
diff --git a/crates/ide-host/src/rpc.rs b/crates/ide-host/src/rpc.rs
index 034c40fb..fafe557a 100644
--- a/crates/ide-host/src/rpc.rs
+++ b/crates/ide-host/src/rpc.rs
@@ -188,7 +188,7 @@ impl Dispatcher {
             ops::fs::create_file_bytes(&c.host, c.arg("path")?, c.arg("data")?).await
         })
         .add("fs_create_dir", |c| async move { ide_vfs::create_dir(&c.arg::<PathBuf>("path")?) })
-        .add("fs_rename", |c| async move { ide_vfs::rename(&c.arg::<PathBuf>("from")?, &c.arg::<PathBuf>("to")?) })
+        .add("fs_rename", |c| async move { ops::fs::rename(&c.host, c.arg("from")?, c.arg("to")?).await })
         .add("fs_set_writable", |c| async move {
             ops::fs::set_writable(&c.host, &c.window, c.arg("path")?, c.arg("writable")?)
         })
diff --git a/crates/ide-host/src/shell_env.rs b/crates/ide-host/src/shell_env.rs
index 6d2aa62c..d9f7e3b1 100644
--- a/crates/ide-host/src/shell_env.rs
+++ b/crates/ide-host/src/shell_env.rs
@@ -177,6 +177,10 @@ pub(crate) fn read_login_env(shell: &str, timeout: std::time::Duration) -> Optio
             }
         }
     }
+    // Nor what the last read found that this process lacks: children get it, the shell must not.
+    for (k, _) in ide_core::process::shell_env() {
+        cmd.env_remove(k);
+    }
     ide_core::process::prepare(&mut cmd);
     let mut child = cmd
         .args(["-ilc", &format!("printf '{MARK}'; /usr/bin/env -0; printf '{MARK}'")])
@@ -257,6 +261,14 @@ mod tests {
         std::fs::write(&rc, "export OPENIDEA_TEST_RC='two words'\n").unwrap();
         let second = read_login_env(&shell, Duration::from_secs(10)).unwrap();
         assert_eq!(get(&second, "OPENIDEA_TEST_RC").as_deref(), Some("two words"));
+
+        // What a read found goes to children, not into the next read: an rc file that no
+        // longer exports a variable drops it.
+        ide_core::process::set_shell_env(second);
+        std::fs::write(&rc, "export OPENIDEA_TEST_SEEN=\"${OPENIDEA_TEST_RC:-unset}\"\n").unwrap();
+        let third = read_login_env(&shell, Duration::from_secs(10)).unwrap();
+        assert_eq!(get(&third, "OPENIDEA_TEST_RC"), None);
+        assert_eq!(get(&third, "OPENIDEA_TEST_SEEN").as_deref(), Some("unset"));
     }
 
     #[test]
diff --git a/crates/ide-host/src/trust.rs b/crates/ide-host/src/trust.rs
index ea9b9604..2ddd6859 100644
--- a/crates/ide-host/src/trust.rs
+++ b/crates/ide-host/src/trust.rs
@@ -222,10 +222,12 @@ pub fn restricted_command_allowed(cmd: &str) -> bool {
             | "project_current"
             | "project_roots"
             | "index_status"
+            | "index_file_extensions"
             | "jvm_file_presentations"
             | "deploy_coverage"
             | "deploy_test_connection"
             | "find_files"
+            | "find_dirs"
             | "find_symbols"
             | "mark_recent"
             | "remove_recent"
@@ -274,6 +276,15 @@ pub fn restricted_command_allowed(cmd: &str) -> bool {
             | "plugin_set_theme_frame"
             | "plugin_catalog"
             | "plugin_assets"
+            | "plugin_market"
+            | "plugin_market_url"
+            | "plugin_set_market_url"
+            | "plugin_market_download"
+            | "plugin_unpack_package"
+            | "plugin_stage_package"
+            | "plugin_preview_install"
+            | "plugin_read_intellij_theme"
+            | "plugin_installed_intellij_themes"
             | "notebook_open"
             | "notebook_get"
             | "notebook_edit"
@@ -295,7 +306,16 @@ pub fn restricted_command_allowed(cmd: &str) -> bool {
             | "vcs_line_hunks"
             | "vcs_file_at"
             | "vcs_blame"
+            | "vcs_block_history"
             | "vcs_log"
+            | "vcs_log_refs"
+            | "vcs_log_users"
+            | "vcs_log_details"
+            | "vcs_log_details_batch"
+            | "vcs_log_index"
+            | "vcs_revision_children"
+            | "vcs_revision_files"
+            | "vcs_open_external_log"
             | "vcs_commit_files"
             | "vcs_commits_changes"
             | "vcs_branches"
@@ -319,12 +339,31 @@ pub fn restricted_command_allowed(cmd: &str) -> bool {
     ) || cmd.starts_with("plugin:")
 }
 
+/// Commands that change which plugin code runs: allowed where no project is open (the
+/// welcome screen), otherwise only in a trusted project.
+pub fn projectless_command_allowed(cmd: &str) -> bool {
+    matches!(
+        cmd,
+        "plugin_install_dir"
+            | "plugin_uninstall"
+            | "plugin_set_enabled"
+            | "plugin_grant"
+            | "plugin_set_capability"
+            | "plugin_roll_back"
+            | "plugin_reload"
+    )
+}
+
 impl crate::Host {
     pub fn authorize_command(&self, window: &str, command: &str) -> IdeResult<()> {
         if restricted_command_allowed(command) {
             return Ok(());
         }
-        self.project(window)?.require_trust()
+        match self.project(window) {
+            Ok(project) => project.require_trust(),
+            Err(_) if projectless_command_allowed(command) => Ok(()),
+            Err(error) => Err(error),
+        }
     }
 }
 
diff --git a/crates/ide-host/tests/close_project.rs b/crates/ide-host/tests/close_project.rs
index e0b07cd1..3da5acbd 100644
--- a/crates/ide-host/tests/close_project.rs
+++ b/crates/ide-host/tests/close_project.rs
@@ -5,6 +5,7 @@
 use ide_core::NullSink;
 use ide_host::{Host, HostConfig, ops};
 use std::sync::Arc;
+use std::time::{Duration, Instant};
 
 fn options(root: &std::path::Path) -> ide_terminal::TerminalOptions {
     ide_terminal::TerminalOptions {
@@ -52,3 +53,53 @@ fn closing_a_project_closes_its_terminals_and_keeps_other_windows() {
         host.terminals.kill_key("other");
     });
 }
+
+/// The desktop closes a project on the event-loop thread while runtime workers may be
+/// blocked waiting for that thread (IPC responses, window queries): closing must not
+/// wait for workers that need the runtime, and exit still waits for them once free.
+#[test]
+fn detached_close_returns_while_runtime_workers_wait_for_the_closing_thread() {
+    let tmp = tempfile::tempdir().unwrap();
+    let root = dunce::canonicalize(tmp.path()).unwrap().join("project");
+    std::fs::create_dir_all(&root).unwrap();
+    let runtime = tokio::runtime::Builder::new_multi_thread().worker_threads(1).enable_all().build().unwrap();
+    let _guard = runtime.enter();
+    let host = Arc::new(Host::new(HostConfig {
+        config_dir: tmp.path().join("config"),
+        data_dir: tmp.path().join("data"),
+        local_data_dir: tmp.path().join("data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(NullSink)),
+        owner: |w| w,
+        runtime: runtime.handle().clone(),
+        project_environment: false,
+    }));
+    host.trust.decide(&root, true, false).unwrap();
+    host.open_project("main", &root).unwrap();
+
+    // Occupy the only runtime worker until "the event loop" answers.
+    let (started_tx, started_rx) = std::sync::mpsc::channel();
+    let (release_tx, release_rx) = std::sync::mpsc::channel::<()>();
+    runtime.spawn(async move {
+        started_tx.send(()).unwrap();
+        let _ = release_rx.recv();
+    });
+    started_rx.recv().unwrap();
+
+    let (closed_tx, closed_rx) = std::sync::mpsc::channel();
+    let closer = host.clone();
+    std::thread::spawn(move || {
+        closer.close_project_detached("main");
+        let _ = closed_tx.send(());
+    });
+    let returned = closed_rx.recv_timeout(Duration::from_secs(5));
+    release_tx.send(()).unwrap();
+    assert!(returned.is_ok(), "closing waited for a runtime worker that waits for the closing thread");
+    assert!(host.project("main").is_err(), "the window no longer has the project");
+    host.open_project("main", &root).expect("the window opens a project once the close has finished");
+
+    let started = Instant::now();
+    host.shutdown_notebooks_on_exit();
+    assert!(started.elapsed() < Duration::from_secs(5), "exit joined the finished close instead of timing out");
+}
diff --git a/crates/ide-host/tests/distribution.rs b/crates/ide-host/tests/distribution.rs
index 540073a5..38002f36 100644
--- a/crates/ide-host/tests/distribution.rs
+++ b/crates/ide-host/tests/distribution.rs
@@ -131,25 +131,44 @@ fn installs_from_before_versioning_keep_working_and_move_on_update() {
 
 /// `hello` as `acme.hello` at `version`, packed and signed with `key`.
 fn signed_hello(dir: &Path, version: &str, key: &PublisherKey, host: &PluginHost) -> (PathBuf, IndexEntry) {
-    let src = variant(&repo().join("crates/ide-plugin/tests/fixtures/hello"), dir, &format!("src-{version}"), |t| {
-        t.replace("id = \"hello\"", "id = \"acme.hello\"")
-            .replace("version = \"0.3.0\"", &format!("version = \"{version}\""))
-    });
+    signed(dir, "acme", version, key, host, |t| t.to_owned())
+}
+
+/// `hello` as `<publisher>.hello` at `version`, its manifest changed by
+/// `edit`, packed and signed with `key`.
+fn signed(
+    dir: &Path,
+    publisher: &str,
+    version: &str,
+    key: &PublisherKey,
+    host: &PluginHost,
+    edit: impl Fn(&str) -> String,
+) -> (PathBuf, IndexEntry) {
+    let id = format!("{publisher}.hello");
+    let src =
+        variant(&repo().join("crates/ide-plugin/tests/fixtures/hello"), dir, &format!("src-{id}-{version}"), |t| {
+            edit(
+                &t.replace("id = \"hello\"", &format!("id = \"{id}\""))
+                    .replace("version = \"0.3.0\"", &format!("version = \"{version}\"")),
+            )
+        });
     let files = host.package_files_of(&src).unwrap();
     let digest = package::package_digest(&src, &files).unwrap();
-    let sig = key.sign("acme", "acme.hello", version, &digest);
-    let out = dir.join(format!("acme.hello-{version}.oiplugin"));
+    let sig = key.sign(publisher, &id, version, &digest);
+    let out = dir.join(format!("{id}-{version}.oiplugin"));
     package::pack(&src, &files, &out, Some(&sig)).unwrap();
     let entry = IndexEntry {
-        id: "acme.hello".into(),
+        id: id.clone(),
         name: "Hello".into(),
         version: version.into(),
         description: String::new(),
         authors: vec![],
-        publisher: "acme".into(),
+        publisher: publisher.into(),
         download: out.file_name().unwrap().to_string_lossy().into_owned(),
         digest,
         capabilities: vec![],
+        engine: "^1.0".into(),
+        categories: vec!["tools".into()],
     };
     (out, entry)
 }
@@ -166,16 +185,39 @@ fn write_index(
         publishers: vec![Publisher {
             id: "acme".into(),
             name: "ACME".into(),
-            keys: vec![KeyEntry { key: key.public_base64(), revoked: key_revoked }],
+            keys: vec![KeyEntry { revoked: key_revoked, ..KeyEntry::new(key.public_base64()) }],
         }],
         plugins,
         revoked,
+        moved: None,
     };
     let path = dir.join("index.json");
     std::fs::write(&path, serde_json::to_string(&index).unwrap()).unwrap();
     path.to_string_lossy().into_owned()
 }
 
+/// First run: nothing cached yet, so listing the marketplace reads its index
+/// instead of showing an empty one; later listings use the index read.
+#[test]
+fn the_first_marketplace_listing_reads_the_index() {
+    let f = fixture();
+    assert!(f.host.market_listing(false).unwrap().is_empty(), "no marketplace configured");
+
+    let market = f.work.join("market");
+    std::fs::create_dir_all(&market).unwrap();
+    let key = PublisherKey::from_seed([3; 32]);
+    let (_, entry) = signed_hello(&market, "1.0.0", &key, &f.host);
+    let url = write_index(&market, &key, vec![entry], vec![], false);
+    f.host.set_market_url(Some(url.clone()));
+
+    let listed = f.host.market_listing(false).unwrap();
+    assert_eq!(listed.iter().map(|p| p.entry.id.as_str()).collect::<Vec<_>>(), ["acme.hello"]);
+
+    std::fs::remove_file(&url).unwrap();
+    assert_eq!(f.host.market_listing(false).unwrap().len(), 1, "the index read is kept");
+    assert!(f.host.market_listing(true).is_err(), "refresh reads the index again");
+}
+
 #[test]
 fn signed_marketplace_plugins_install_and_revocations_disable_them() {
     let f = fixture();
@@ -260,3 +302,210 @@ fn package_files_install_from_disk_unsigned() {
     let info = f.host.install_from_dir(&dir, &Consent::all()).unwrap();
     assert_eq!((info.status, info.publisher), (PluginStatus::Inactive, None));
 }
+
+#[test]
+fn the_marketplace_offers_the_newest_version_this_ide_can_load() {
+    let f = fixture();
+    let market = f.work.join("market");
+    std::fs::create_dir_all(&market).unwrap();
+    let key = PublisherKey::from_seed([3; 32]);
+    let (_, old) = signed_hello(&market, "1.0.0", &key, &f.host);
+    let (_, new) = signed_hello(&market, "2.0.0", &key, &f.host);
+    let next_major = ide_extension::ENGINE_VERSION.split('.').next().unwrap().parse::<u64>().unwrap() + 1;
+    let new = IndexEntry { engine: format!("^{next_major}.0"), ..new };
+    f.host.set_market_url(Some(write_index(&market, &key, vec![old.clone(), new.clone()], vec![], false)));
+
+    let listed = f.host.refresh_market().unwrap();
+    assert_eq!((listed.len(), listed[0].entry.version.as_str(), listed[0].compatible), (1, "1.0.0", true));
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    assert_eq!(f.host.preview_install(&dir).unwrap().version, "1.0.0");
+
+    // Only a version for a newer IDE: shown as such, not downloaded.
+    write_index(&market, &key, vec![new], vec![], false);
+    let listed = f.host.refresh_market().unwrap();
+    assert_eq!((listed[0].entry.version.as_str(), listed[0].compatible), ("2.0.0", false));
+    let err = f.host.download_market_plugin("acme.hello").unwrap_err();
+    assert!(err.message.contains("update OpenIDEA"), "{}", err.message);
+}
+
+#[test]
+fn a_moved_marketplace_is_read_where_it_moved_to() {
+    let f = fixture();
+    let market = f.work.join("market");
+    std::fs::create_dir_all(&market).unwrap();
+    let key = PublisherKey::from_seed([3; 32]);
+    let (_, entry) = signed_hello(&market, "1.0.0", &key, &f.host);
+    write_index(&market, &key, vec![entry], vec![], false);
+    // The old address points at the new one; downloads resolve against where the index is.
+    let old = f.work.join("old");
+    std::fs::create_dir_all(&old).unwrap();
+    std::fs::write(old.join("index.json"), r#"{"format": 1, "moved": "../market/index.json"}"#).unwrap();
+    f.host.set_market_url(Some(old.join("index.json").to_string_lossy().into_owned()));
+
+    let listed = f.host.refresh_market().unwrap();
+    assert_eq!(listed[0].entry.id, "acme.hello");
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    assert_eq!(f.host.preview_install(&dir).unwrap().version, "1.0.0");
+
+    // A loop gives up.
+    std::fs::write(old.join("index.json"), r#"{"format": 1, "moved": "index.json"}"#).unwrap();
+    let err = f.host.refresh_market().unwrap_err();
+    assert!(err.message.contains("moved more than"), "{}", err.message);
+}
+
+/// `dir/index.json` listing `publishers` and `plugins`; its path.
+fn index_of(dir: &Path, publishers: Vec<Publisher>, plugins: Vec<IndexEntry>) -> String {
+    let index = Index { format: package::INDEX_FORMAT, publishers, plugins, ..Index::default() };
+    let path = dir.join("index.json");
+    std::fs::write(&path, serde_json::to_string(&index).unwrap()).unwrap();
+    path.to_string_lossy().into_owned()
+}
+
+fn publisher(id: &str, keys: Vec<KeyEntry>) -> Publisher {
+    Publisher { id: id.into(), name: id.into(), keys }
+}
+
+fn updates_announced(events: &Events) -> Vec<Vec<String>> {
+    events
+        .lock()
+        .iter()
+        .filter_map(|e| match e {
+            PluginEvent::UpdatesAvailable { updates } => {
+                Some(updates.iter().map(|u| format!("{} {}", u.id, u.version)).collect())
+            }
+            _ => None,
+        })
+        .collect()
+}
+
+/// What the install page sends for an update it doesn't need to show: the grants the installed version has.
+fn as_granted(preview: &InstallPreview) -> Consent {
+    let optional = preview.capabilities.iter().filter(|c| c.optional && c.granted).map(|c| c.id.clone()).collect();
+    Consent { optional, signer_change: false }
+}
+
+#[test]
+fn updates_keep_their_signer_and_need_no_consent_when_nothing_is_new() {
+    let f = fixture();
+    let market = f.work.join("market");
+    std::fs::create_dir_all(&market).unwrap();
+    let (k1, k2, k3) =
+        (PublisherKey::from_seed([1; 32]), PublisherKey::from_seed([2; 32]), PublisherKey::from_seed([3; 32]));
+    let same = |t: &str| t.to_owned();
+    let (_, v1) = signed(&market, "acme", "1.0.0", &k1, &f.host, same);
+    f.host.set_market_url(Some(index_of(
+        &market,
+        vec![publisher("acme", vec![KeyEntry::new(k1.public_base64())])],
+        vec![v1.clone()],
+    )));
+    f.host.refresh_market().unwrap();
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    let first = f.host.preview_install(&dir).unwrap();
+    assert!(first.needs_consent && !first.signer_changed, "a first install is confirmed");
+    f.host.install_from_dir(&dir, &Consent::default()).unwrap();
+    assert!(updates_announced(&f.events).is_empty());
+
+    // 1.1.0, same key and needs: announced once, installed with the grants it has.
+    let (_, v11) = signed(&market, "acme", "1.1.0", &k1, &f.host, same);
+    let keys1 = vec![KeyEntry::new(k1.public_base64())];
+    index_of(&market, vec![publisher("acme", keys1.clone())], vec![v1.clone(), v11.clone()]);
+    f.host.refresh_market().unwrap();
+    f.host.refresh_market().unwrap();
+    assert_eq!(updates_announced(&f.events), [["acme.hello 1.1.0"]], "once per set of versions");
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    let preview = f.host.preview_install(&dir).unwrap();
+    assert_eq!(preview.replaces.as_deref(), Some("1.0.0"));
+    assert!(!preview.needs_consent && !preview.signer_changed);
+    assert!(preview.capabilities.iter().all(|c| c.granted), "shows what the installed version was granted");
+    f.host.install_from_dir(&dir, &as_granted(&preview)).unwrap();
+    assert!(f.host.market_plugins().iter().all(|p| !p.is_update()));
+
+    // 1.2.0 asks for something new: the user is asked.
+    let (_, v12) = signed(&market, "acme", "1.2.0", &k1, &f.host, |t| {
+        t.replace(
+            "required = [\"editor.read\", \"editor.write\"]",
+            "required = [\"editor.read\", \"editor.write\"]\noptional = [\"net:example.com\"]",
+        )
+    });
+    index_of(&market, vec![publisher("acme", keys1.clone())], vec![v12.clone()]);
+    f.host.refresh_market().unwrap();
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    let preview = f.host.preview_install(&dir).unwrap();
+    assert!(preview.needs_consent && !preview.signer_changed);
+    f.host.install_from_dir(&dir, &Consent::default()).unwrap();
+
+    // 1.3.0 signed with a key the installed one didn't endorse: another signer, the user's call.
+    let (_, v13) = signed(&market, "acme", "1.3.0", &k2, &f.host, same);
+    let keys12 = vec![KeyEntry::new(k1.public_base64()), KeyEntry::new(k2.public_base64())];
+    index_of(&market, vec![publisher("acme", keys12)], vec![v13]);
+    f.host.refresh_market().unwrap();
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    let preview = f.host.preview_install(&dir).unwrap();
+    assert!(preview.signer_changed && preview.needs_consent);
+    let err = f.host.install_from_dir(&dir, &as_granted(&preview)).unwrap_err();
+    assert!(err.message.contains("another key"), "{}", err.message);
+    assert_eq!(f.host.info_of("acme.hello").unwrap().version, "1.2.0", "nothing changed");
+    f.host.install_from_dir(&dir, &Consent { signer_change: true, ..as_granted(&preview) }).unwrap();
+
+    // 1.4.0 signed with k3, which k2 endorsed: a rotation the installed signer vouched for.
+    let (_, v14) = signed(&market, "acme", "1.4.0", &k3, &f.host, same);
+    let keys = vec![
+        KeyEntry { endorsement: Some(k2.endorse("acme", &k3.public_base64())), ..KeyEntry::new(k3.public_base64()) },
+        KeyEntry::new(k2.public_base64()),
+    ];
+    index_of(&market, vec![publisher("acme", keys)], vec![v14]);
+    f.host.refresh_market().unwrap();
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    let preview = f.host.preview_install(&dir).unwrap();
+    assert!(!preview.signer_changed && !preview.needs_consent);
+    f.host.install_from_dir(&dir, &as_granted(&preview)).unwrap();
+    assert_eq!(f.host.info_of("acme.hello").unwrap().version, "1.4.0");
+}
+
+#[test]
+fn an_index_in_a_newer_format_still_revokes() {
+    let f = fixture();
+    let market = f.work.join("market");
+    std::fs::create_dir_all(&market).unwrap();
+    let key = PublisherKey::from_seed([3; 32]);
+    let (_, entry) = signed_hello(&market, "1.0.0", &key, &f.host);
+    f.host.set_market_url(Some(write_index(&market, &key, vec![entry], vec![], false)));
+    f.host.refresh_market().unwrap();
+    let dir = f.host.download_market_plugin("acme.hello").unwrap();
+    f.host.install_from_dir(&dir, &Consent::all()).unwrap();
+
+    let newer = format!(
+        r#"{{"format": {}, "plugins": "a shape this IDE can't read",
+            "revoked": [{{"id": "acme.hello", "reason": "steals tokens"}}]}}"#,
+        package::INDEX_FORMAT + 1
+    );
+    std::fs::write(market.join("index.json"), newer).unwrap();
+    let err = f.host.refresh_market().unwrap_err();
+    assert!(err.message.contains("newer OpenIDEA"), "{}", err.message);
+    let info = f.host.info_of("acme.hello").unwrap();
+    assert_eq!((info.status, info.error.as_deref()), (PluginStatus::Failed, Some("revoked: steals tokens")));
+    assert!(f.host.market_plugins().is_empty());
+}
+
+#[test]
+fn official_plugins_need_the_key_this_ide_was_built_with() {
+    let f = fixture();
+    let market = f.work.join("market");
+    std::fs::create_dir_all(&market).unwrap();
+    let (root, intruder) = (PublisherKey::from_seed([1; 32]), PublisherKey::from_seed([6; 32]));
+    f.host.set_official_keys(vec![root.public_base64()]);
+    // The index lists the intruder's key for the official publisher.
+    let (_, forged) = signed(&market, OFFICIAL_PUBLISHER, "1.0.0", &intruder, &f.host, |t| t.to_owned());
+    let keys = vec![KeyEntry::new(intruder.public_base64())];
+    f.host.set_market_url(Some(index_of(&market, vec![publisher(OFFICIAL_PUBLISHER, keys.clone())], vec![forged])));
+    f.host.refresh_market().unwrap();
+    let err = f.host.download_market_plugin("openidea.hello").unwrap_err();
+    assert!(err.message.contains("trusted publisher"), "{}", err.message);
+
+    // Signed with the built-in key it installs, whatever keys the index lists.
+    let (_, genuine) = signed(&market, OFFICIAL_PUBLISHER, "1.0.1", &root, &f.host, |t| t.to_owned());
+    index_of(&market, vec![publisher(OFFICIAL_PUBLISHER, keys)], vec![genuine]);
+    f.host.refresh_market().unwrap();
+    let dir = f.host.download_market_plugin("openidea.hello").unwrap();
+    assert_eq!(f.host.preview_install(&dir).unwrap().publisher.as_deref(), Some(OFFICIAL_PUBLISHER));
+}
diff --git a/crates/ide-host/tests/external_log.rs b/crates/ide-host/tests/external_log.rs
new file mode 100644
index 00000000..83d58f04
--- /dev/null
+++ b/crates/ide-host/tests/external_log.rs
@@ -0,0 +1,115 @@
+//! Explicit external logs allow history reads without adding a writable project root.
+use ide_core::NullSink;
+use ide_host::{Host, HostConfig, ops::vcs};
+use std::{path::Path, process::Command, sync::Arc};
+
+fn git(root: &Path, args: &[&str]) -> String {
+    let output = Command::new("git")
+        .current_dir(root)
+        .args(["-c", "user.name=Test", "-c", "user.email=test@example.com", "-c", "commit.gpgsign=false"])
+        .args(args)
+        .output()
+        .unwrap();
+    assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
+    String::from_utf8(output.stdout).unwrap().trim().to_owned()
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn external_history_is_readable_and_never_becomes_a_write_target() {
+    let temp = tempfile::tempdir().unwrap();
+    let base = dunce::canonicalize(temp.path()).unwrap();
+    let root = base.join("project");
+    let external = base.join("external");
+    std::fs::create_dir_all(&root).unwrap();
+    std::fs::create_dir_all(&external).unwrap();
+    git(&external, &["init", "-b", "main"]);
+    let deleted = external.join("deleted.txt");
+    std::fs::write(&deleted, "historical content\n").unwrap();
+    git(&external, &["add", "."]);
+    git(&external, &["commit", "-m", "initial"]);
+    let first = git(&external, &["rev-parse", "HEAD"]);
+    git(&external, &["rm", "deleted.txt"]);
+    git(&external, &["commit", "-m", "delete"]);
+    let head = git(&external, &["rev-parse", "HEAD"]);
+    let host = Host::new(HostConfig {
+        config_dir: base.join("config"),
+        data_dir: base.join("data"),
+        local_data_dir: base.join("data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(NullSink)),
+        owner: |w| w,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    });
+    // A standalone editor needs no project, indexer, or writable VCS root.
+    vcs::vcs_open_external_log(&host, "standalone", external.clone()).await.unwrap();
+    let standalone = vcs::vcs_log(&host, "standalone", Some(external.clone()), Default::default()).await.unwrap();
+    assert_eq!(standalone[0].id, head);
+    let details = vcs::vcs_log_details_batch(
+        &host,
+        "standalone",
+        Some(external.clone()),
+        vec![head.clone(), first.clone()],
+        ide_core::RequestId(987),
+    )
+    .await
+    .unwrap();
+    assert!(details.iter().all(|d| d.signature == "N"));
+    assert_eq!(
+        vcs::vcs_revision_children(&host, "standalone", Some(external.clone()), first.clone(), String::new())
+            .await
+            .unwrap(),
+        vec!["deleted.txt"]
+    );
+    assert!(host.project("standalone").is_err());
+    host.trust.decide(&external, false, false).unwrap();
+    let restricted = host.open_project("restricted", &external).unwrap();
+    assert!(!restricted.is_trusted());
+    vcs::vcs_open_external_log(&host, "restricted", external.clone()).await.unwrap();
+    let restricted_log = vcs::vcs_log(
+        &host,
+        "restricted",
+        Some(external.clone()),
+        ide_vcs::LogQuery { request: Some(ide_core::RequestId(988)), summary_only: true, ..Default::default() },
+    )
+    .await
+    .unwrap();
+    assert_eq!(restricted_log[0].id, head);
+    assert_eq!(
+        vcs::vcs_log_details_batch(
+            &host,
+            "restricted",
+            Some(external.clone()),
+            vec![head.clone()],
+            ide_core::RequestId(989)
+        )
+        .await
+        .unwrap()[0]
+            .signature,
+        "N"
+    );
+    host.close_project("restricted");
+    let payload =
+        serde_json::to_vec(&serde_json::json!({ "repo": external, "revision": first, "path": "deleted.txt" })).unwrap();
+    let hex = payload.iter().map(|b| format!("{b:02x}")).collect::<String>();
+    let document =
+        vcs::revision_virtual_document(&host, "standalone", &format!("git-revision:{hex}/deleted.txt")).await.unwrap();
+    assert_eq!(document.text, "historical content\n");
+    host.trust.decide(&root, true, false).unwrap();
+    let project = host.open_project("main", &root).unwrap();
+    assert!(vcs::vcs_log(&host, "main", Some(external.clone()), Default::default()).await.is_err());
+    vcs::vcs_open_external_log(&host, "main", external.clone()).await.unwrap();
+    let log = vcs::vcs_log(&host, "main", Some(external.clone()), Default::default()).await.unwrap();
+    assert_eq!(log.iter().map(|c| c.id.as_str()).collect::<Vec<_>>(), vec![head.as_str(), first.as_str()]);
+    assert_eq!(
+        vcs::vcs_file_at(&host, "main", deleted.clone(), Some(first.clone())).await.unwrap().as_deref(),
+        Some("historical content\n")
+    );
+    assert!(project.repos().at_root(&external).is_none());
+    assert!(vcs::vcs_checkout(&host, "main", Some(external.clone()), first.clone(), false, None).await.is_err());
+    assert!(vcs::vcs_apply_patch(&host, "main", Some(external.clone()), String::new()).await.is_err());
+    assert_eq!(git(&external, &["rev-parse", "HEAD"]), head);
+    assert!(!deleted.exists());
+    host.close_project("main");
+}
diff --git a/crates/ide-host/tests/gradle_linkage.rs b/crates/ide-host/tests/gradle_linkage.rs
new file mode 100644
index 00000000..d53c41f4
--- /dev/null
+++ b/crates/ide-host/tests/gradle_linkage.rs
@@ -0,0 +1,49 @@
+use ide_core::NullSink;
+use ide_host::{Host, HostConfig, ops};
+use std::sync::Arc;
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn links_are_validated_persisted_and_unlinked_without_removing_files() {
+    let temp = tempfile::tempdir().unwrap();
+    let base = dunce::canonicalize(temp.path()).unwrap();
+    let root = base.join("workspace");
+    for dir in [root.join("a"), root.join("b"), base.join("external")] {
+        std::fs::create_dir_all(&dir).unwrap();
+        std::fs::write(dir.join("settings.gradle"), "rootProject.name = 'same-name'").unwrap();
+    }
+    let config = base.join("config");
+    let host = Host::new(HostConfig {
+        config_dir: config.clone(),
+        data_dir: base.join("data"),
+        local_data_dir: base.join("local"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(NullSink)),
+        owner: |window| window,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    });
+    host.open_project("main", &root).unwrap();
+    assert!(ops::build::gradle_link_projects(&host, "main", vec!["b".into()]).await.is_err());
+    host.set_project_trust(&root, true, false).await.unwrap();
+    let model = ops::build::gradle_link_projects(&host, "main", vec!["b/settings.gradle".into()]).await.unwrap();
+    assert_eq!(model.gradle.iter().map(|g| g.dir.as_str()).collect::<Vec<_>>(), ["a", "b"]);
+    let saved =
+        || ide_workspace::SettingsStore::load(&config, Some(&root)).effective().languages.java.gradle.linked_projects;
+    assert_eq!(saved(), Some(vec!["a".into(), "b".into()]));
+    assert!(ops::build::gradle_link_projects(&host, "main", vec!["missing".into()]).await.is_err());
+    assert_eq!(saved(), Some(vec!["a".into(), "b".into()]));
+    let outside = base.join("external").to_string_lossy().into_owned();
+    let model = ops::build::gradle_link_projects(&host, "main", vec![outside.clone()]).await.unwrap();
+    assert_eq!(model.gradle.len(), 3);
+    let model = ops::build::gradle_unlink_projects(&host, "main", vec!["a".into(), "b".into(), outside]).await.unwrap();
+    assert!(model.gradle.is_empty());
+    assert_eq!(saved(), Some(vec![]));
+    for dir in [root.join("a"), root.join("b"), base.join("external")] {
+        assert!(dir.join("settings.gradle").is_file());
+    }
+    let model = ops::build::gradle_link_projects(&host, "main", vec!["b".into()]).await.unwrap();
+    assert_eq!(model.gradle.len(), 1);
+    assert_eq!(model.gradle[0].dir, "b");
+    host.shutdown().await;
+}
diff --git a/crates/ide-host/tests/language_smoke.rs b/crates/ide-host/tests/language_smoke.rs
new file mode 100644
index 00000000..8e32b39e
--- /dev/null
+++ b/crates/ide-host/tests/language_smoke.rs
@@ -0,0 +1,994 @@
+//! Language smoke tests: the everyday code intelligence of each language — completion, go to
+//! definition, Find Usages, hover, diagnostics with a quick fix, an intention, rename,
+//! formatting, parameter info, the Structure view, auto-import, Optimize Imports and moving a
+//! file — on its `fixtures/` project, through the `ops` the app's commands call and the
+//! language server the app starts by default.
+//!
+//! `#[ignore]`d because they need the servers installed. CI's `Language smoke` job installs
+//! pinned versions and runs one language per job:
+//! `cargo test -p ide-host --test language_smoke -- --ignored --exact <language>`.
+
+use ide_core::{ChangeSet, DocId, IdeEvent, Pos, Range, RequestId, TextChange};
+use ide_host::{Host, HostConfig, ops};
+use ide_lsp::types::{FormatOptions, GotoKind};
+use std::collections::BTreeSet;
+use std::future::Future;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex};
+use std::time::{Duration, Instant};
+
+const WINDOW: &str = "main";
+
+/// `word` on the first line of `file` that contains `line`.
+#[derive(Clone, Copy, Debug)]
+struct At {
+    file: &'static str,
+    line: &'static str,
+    word: &'static str,
+}
+
+const fn at(file: &'static str, line: &'static str, word: &'static str) -> At {
+    At { file, line, word }
+}
+
+/// A line typed after the first line of `file` containing `after`.
+#[derive(Clone, Copy, Debug)]
+struct Typed {
+    file: &'static str,
+    after: &'static str,
+    text: &'static str,
+}
+
+const fn typed(file: &'static str, after: &'static str, text: &'static str) -> Typed {
+    Typed { file, after, text }
+}
+
+/// One language's checklist. Every check names what it looks for, so a failure says which
+/// operation broke.
+struct Checks {
+    fixture: &'static str,
+    /// Files written into the project copy before it opens.
+    files: &'static [(&'static str, &'static str)],
+    /// How long the first answer may take (project import and indexing).
+    warm_up: Duration,
+    /// Go to definition from the first spot lands on the second.
+    definition: (At, At),
+    /// Find Usages of the symbol lists usages in these files.
+    references: (At, &'static [&'static str]),
+    /// Hover shows this text.
+    hover: (At, &'static str),
+    /// Completion at the end of the typed line offers this item.
+    completion: (Typed, &'static str),
+    /// The typed line is reported with this diagnostic; the quick fix with this title makes the
+    /// file contain the last text.
+    quick_fix: QuickFix,
+    /// With the word selected, this intention is offered with an edit or command.
+    intention: (At, &'static str),
+    /// Formatting turns the typed line into the expected one.
+    format: (Typed, &'static str),
+    indent: Indent,
+    /// Renaming the symbol to the new name edits these files.
+    rename: (At, &'static str, &'static [&'static str]),
+    /// Parameter info in a call being typed: a signature naming this parameter.
+    signature: (Typed, &'static str),
+    /// The Structure view of a file: these symbols, at any depth.
+    outline: (&'static str, &'static [&'static str]),
+    /// Completing a name the file doesn't import yet also imports it.
+    auto_import: AutoImport,
+    /// Optimize Imports, with an import typed after a line.
+    organize_imports: Option<(Typed, Imports)>,
+    /// Moving a file updates its references: (file, new path, a file that then contains this).
+    file_move: Option<(&'static str, &'static str, &'static str, &'static str)>,
+}
+
+#[derive(Clone, Copy, Debug)]
+struct AutoImport {
+    /// The line typed, ending in the start of the name.
+    typed: Typed,
+    /// The completion item.
+    label: &'static str,
+    /// What the item's import adds to the file.
+    result: &'static str,
+}
+
+/// What Optimize Imports does with the typed import.
+#[derive(Clone, Copy, Debug)]
+enum Imports {
+    /// Removes it (unused).
+    Removed,
+    /// Sorts it before this line.
+    Before(&'static str),
+}
+
+#[derive(Clone, Copy, Debug)]
+struct QuickFix {
+    typed: Typed,
+    diagnostic: &'static str,
+    title: &'static str,
+    result: &'static str,
+}
+
+/// The editor's indentation, sent with a format request.
+#[derive(Clone, Copy, Debug)]
+enum Indent {
+    Spaces(u32),
+    Tabs,
+}
+
+type Events = Arc<Mutex<Vec<IdeEvent>>>;
+
+struct Smoke {
+    language: &'static str,
+    host: Arc<Host>,
+    root: PathBuf,
+    events: Events,
+    warm_up: Duration,
+    _tmp: tempfile::TempDir,
+}
+
+fn fixture_dir(name: &str) -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR")).join("../../fixtures").join(name)
+}
+
+fn copy_dir(from: &Path, to: &Path) {
+    std::fs::create_dir_all(to).unwrap();
+    for entry in std::fs::read_dir(from).unwrap() {
+        let entry = entry.unwrap();
+        let name = entry.file_name();
+        if matches!(name.to_str(), Some("node_modules" | "target" | "build" | ".gradle" | ".venv")) {
+            continue;
+        }
+        let target = to.join(&name);
+        if entry.file_type().unwrap().is_dir() {
+            copy_dir(&entry.path(), &target);
+        } else {
+            std::fs::copy(entry.path(), target).unwrap();
+        }
+    }
+}
+
+fn utf16_len(s: &str) -> u32 {
+    s.encode_utf16().count() as u32
+}
+
+/// The 0-based line index and text of the first line containing `needle`.
+fn find_line<'a>(text: &'a str, needle: &str, what: &str) -> (u32, &'a str) {
+    text.lines()
+        .enumerate()
+        .find(|(_, l)| l.contains(needle))
+        .map(|(i, l)| (i as u32, l))
+        .unwrap_or_else(|| panic!("{what}: no line containing {needle:?}"))
+}
+
+/// The byte offset of `word` in `line`, not as part of a longer identifier (`parse` in `parser::parse`).
+fn find_word(line: &str, word: &str) -> Option<usize> {
+    let ident = |c: char| c.is_alphanumeric() || c == '_';
+    line.match_indices(word).map(|(i, _)| i).find(|&i| {
+        let before = line[..i].chars().next_back();
+        let after = line[i + word.len()..].chars().next();
+        !(word.starts_with(ident) && before.is_some_and(ident)) && !(word.ends_with(ident) && after.is_some_and(ident))
+    })
+}
+
+impl Smoke {
+    async fn start(language: &'static str, checks: &Checks) -> Self {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = dunce::canonicalize(tmp.path()).unwrap().join(checks.fixture);
+        copy_dir(&fixture_dir(checks.fixture), &root);
+        for (path, text) in checks.files {
+            let path = root.join(path);
+            std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+            std::fs::write(path, text).unwrap();
+        }
+        let events: Events = Arc::default();
+        let app = tmp.path().join("app");
+        let host = Arc::new(Host::new(HostConfig {
+            config_dir: app.join("config"),
+            data_dir: app.join("data"),
+            local_data_dir: app.join("data"),
+            languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+            syntax: Arc::default(),
+            sink_for: Box::new({
+                let events = events.clone();
+                move |_| {
+                    let events = events.clone();
+                    Arc::new(move |e: IdeEvent| events.lock().unwrap().push(e))
+                }
+            }),
+            owner: |w| w,
+            runtime: tokio::runtime::Handle::current(),
+            project_environment: false,
+        }));
+        host.trust.decide(&root, true, false).unwrap();
+        host.open_project(WINDOW, &root).unwrap();
+        Smoke { language, host, root, events, warm_up: checks.warm_up, _tmp: tmp }
+    }
+
+    fn fail(&self, check: &str, message: impl std::fmt::Display) -> ! {
+        let servers = ops::lsp::lsp_servers(&self.host, WINDOW).unwrap_or_default();
+        let servers: Vec<String> = servers.iter().map(|s| format!("{} ({:?})", s.name, s.status)).collect();
+        panic!("{} — {check}: {message}\nservers: {servers:?}", self.language)
+    }
+
+    /// Retries `f` until it succeeds (servers answer emptily while importing and indexing); on
+    /// timeout, fails with its last answer.
+    async fn retry<T, D: std::fmt::Debug, F: Future<Output = Result<T, D>>>(
+        &self,
+        check: &str,
+        timeout: Duration,
+        mut f: impl FnMut() -> F,
+    ) -> T {
+        let deadline = Instant::now() + timeout;
+        loop {
+            let last = match f().await {
+                Ok(v) => return v,
+                Err(last) => last,
+            };
+            if Instant::now() > deadline {
+                self.fail(check, format_args!("timed out after {timeout:?}; last answer: {last:?}"));
+            }
+            tokio::time::sleep(Duration::from_millis(500)).await;
+        }
+    }
+
+    async fn doc(&self, file: &str) -> (DocId, String) {
+        let info = ops::doc::open(&self.host, WINDOW, self.root.join(file)).await.unwrap();
+        let info = ops::doc::snapshot(&self.host, WINDOW, info.id).await.unwrap();
+        (info.id, info.text)
+    }
+
+    async fn locate(&self, at: At) -> (DocId, Pos) {
+        let (doc, text) = self.doc(at.file).await;
+        let (line, content) = find_line(&text, at.line, at.file);
+        let col = find_word(content, at.word).unwrap_or_else(|| panic!("{at:?}: word not on the line"));
+        (doc, Pos::new(line, utf16_len(&content[..col])))
+    }
+
+    async fn word_range(&self, at: At) -> (DocId, Range) {
+        let (doc, start) = self.locate(at).await;
+        (doc, Range::new(start, Pos::new(start.line, start.col + utf16_len(at.word))))
+    }
+
+    /// Types a new line; returns the position at its end and the text before it.
+    async fn type_line(&self, t: Typed) -> (DocId, Pos, String) {
+        let (doc, text) = self.doc(t.file).await;
+        let (line, content) = find_line(&text, t.after, t.file);
+        let line_start: usize = text.lines().take(line as usize).map(|l| l.len() + 1).sum();
+        let end = utf16_len(&text[..line_start + content.len()]);
+        self.replace(doc, end, end, &format!("\n{}", t.text)).await;
+        let col = utf16_len(t.text);
+        (doc, Pos::new(line + 1, col), text)
+    }
+
+    async fn replace(&self, doc: DocId, from: u32, to: u32, insert: &str) {
+        let version = ops::doc::snapshot(&self.host, WINDOW, doc).await.unwrap().version;
+        let changes = ChangeSet { changes: vec![TextChange { from, to, insert: insert.into() }] };
+        ops::doc::edit(&self.host, WINDOW, doc, version, changes).unwrap();
+    }
+
+    async fn restore(&self, doc: DocId, text: &str) {
+        let current = ops::doc::snapshot(&self.host, WINDOW, doc).await.unwrap().text;
+        self.replace(doc, 0, utf16_len(&current), text).await;
+    }
+
+    fn path(&self, file: &str) -> PathBuf {
+        self.root.join(file)
+    }
+
+    fn files<P: AsRef<Path>>(&self, paths: impl IntoIterator<Item = P>) -> BTreeSet<String> {
+        paths
+            .into_iter()
+            .filter_map(|p| {
+                let p = p.as_ref().strip_prefix(&self.root).ok()?;
+                Some(p.to_string_lossy().replace('\\', "/"))
+            })
+            .collect()
+    }
+
+    async fn definition(&self, from: At, to: At) {
+        let (doc, pos) = self.locate(from).await;
+        let (_, target) = self.locate(to).await;
+        let want = self.path(to.file);
+        self.retry("go to definition", self.warm_up, || async {
+            let found = ops::lsp::lsp_goto(&self.host, WINDOW, doc, pos, GotoKind::Definition).await;
+            match &found {
+                Ok(locs) if locs.iter().any(|l| *l.path == *want && l.range.start.line == target.line) => Ok(()),
+                _ => Err(found),
+            }
+        })
+        .await;
+    }
+
+    async fn references(&self, of: At, files: &[&str]) {
+        let (doc, pos) = self.locate(of).await;
+        let want: BTreeSet<String> = files.iter().map(|f| f.to_string()).collect();
+        self.retry("find usages", self.warm_up, || async {
+            let found = ops::lsp::lsp_references(&self.host, WINDOW, RequestId(1), doc, pos, true, true).await;
+            match &found {
+                Ok(r) if want.is_subset(&self.files(r.locations.iter().map(|l| l.path.clone()))) => Ok(()),
+                _ => Err(found.map(|r| self.files(r.locations.into_iter().map(|l| l.path)))),
+            }
+        })
+        .await;
+    }
+
+    async fn hover(&self, over: At, shows: &str) {
+        let (doc, pos) = self.locate(over).await;
+        self.retry("hover", self.warm_up, || async {
+            let found = ops::lsp::lsp_hover(&self.host, WINDOW, RequestId(2), doc, pos).await;
+            match &found {
+                Ok(Some(h)) if h.contents.value.contains(shows) => Ok(()),
+                _ => Err(found.map(|h| h.map(|h| h.contents.value))),
+            }
+        })
+        .await;
+    }
+
+    async fn completion(&self, line: Typed, offers: &str) {
+        let (doc, pos, before) = self.type_line(line).await;
+        let trigger = line.text.ends_with('.').then(|| ".".to_string());
+        self.retry("completion", self.warm_up, || async {
+            let found = ops::lsp::lsp_completion(&self.host, WINDOW, RequestId(3), doc, pos, trigger.clone()).await;
+            match &found {
+                Ok(list)
+                    if list.items.iter().any(|i| i.label == offers || i.filter_text.as_deref() == Some(offers)) =>
+                {
+                    Ok(())
+                }
+                _ => Err(found.map(|l| l.items.into_iter().take(30).map(|i| i.label).collect::<Vec<_>>())),
+            }
+        })
+        .await;
+        self.restore(doc, &before).await;
+    }
+
+    async fn diagnostic(&self, file: &str, message: &str) -> Range {
+        let path = self.path(file);
+        self.retry("diagnostics", self.warm_up, || async {
+            let events = self.events.lock().unwrap();
+            let latest = events.iter().rev().filter_map(|e| match e {
+                IdeEvent::Diagnostics { path: p, items, source } if **p == *path => Some((source, items)),
+                _ => None,
+            });
+            let mut seen = Vec::new();
+            for (source, items) in latest {
+                if let Some(d) = items.iter().find(|d| d.message.contains(message)) {
+                    return Ok(d.range);
+                }
+                seen.push(format!("{source}: {:?}", items.iter().map(|d| &d.message).collect::<Vec<_>>()));
+            }
+            Err(seen.into_iter().take(4).collect::<Vec<_>>())
+        })
+        .await
+    }
+
+    /// The code actions over `range` (all kinds, as the ⌥⏎ popup asks), the one titled `title`.
+    async fn action(&self, check: &str, doc: DocId, range: Range, title: &str) -> ide_lsp::types::CodeAction {
+        let action = self
+            .retry(check, self.warm_up, || async {
+                let found = ops::lsp::lsp_code_actions(&self.host, WINDOW, doc, range, vec![]).await;
+                match found.as_ref().ok().and_then(|a| a.iter().find(|a| a.title.contains(title))) {
+                    Some(action) => Ok(action.clone()),
+                    None => Err(found.map(|a| a.into_iter().map(|a| a.title).collect::<Vec<_>>())),
+                }
+            })
+            .await;
+        if action.edit.is_some() || action.command.is_some() {
+            return action;
+        }
+        ops::lsp::lsp_resolve_code_action(&self.host, WINDOW, doc, action)
+            .await
+            .unwrap_or_else(|e| self.fail(check, format_args!("resolving {title:?}: {e}")))
+    }
+
+    async fn quick_fix(&self, fix: QuickFix) {
+        let (doc, _, before) = self.type_line(fix.typed).await;
+        assert!(!before.contains(fix.result), "{fix:?}: the file already contains the result");
+        let range = self.diagnostic(fix.typed.file, fix.diagnostic).await;
+        let action = self.action("quick fix", doc, range, fix.title).await;
+        ops::lsp::lsp_execute_code_action(&self.host, WINDOW, RequestId(4), doc, action, vec![])
+            .await
+            .unwrap_or_else(|e| self.fail("quick fix", format_args!("applying {:?}: {e}", fix.title)));
+        self.retry("quick fix", Duration::from_secs(10), || async {
+            let text = self.doc(fix.typed.file).await.1;
+            if text.contains(fix.result) { Ok(()) } else { Err(text) }
+        })
+        .await;
+        self.restore(doc, &before).await;
+    }
+
+    async fn intention(&self, on: At, title: &str) {
+        let (doc, range) = self.word_range(on).await;
+        let action = self.action("intention", doc, range, title).await;
+        let edits = action.edit.as_ref().is_some_and(|e| !e.files.is_empty());
+        if !edits && action.command.is_none() {
+            self.fail("intention", format_args!("{title:?} has neither an edit nor a command: {action:?}"));
+        }
+    }
+
+    async fn format(&self, line: Typed, indent: Indent, formatted: &str) {
+        let (doc, _, before) = self.type_line(line).await;
+        assert!(!before.lines().any(|l| l == formatted), "{line:?}: the file already has {formatted:?}");
+        let (tab_size, insert_spaces) = match indent {
+            Indent::Spaces(n) => (n, true),
+            Indent::Tabs => (4, false),
+        };
+        let options = FormatOptions { tab_size, insert_spaces, on_save: false, tool: None };
+        let text = self
+            .retry("format", self.warm_up, || async {
+                let edits = ops::lsp::lsp_format(&self.host, WINDOW, doc, None, options.clone()).await;
+                let text = self.doc(line.file).await.1;
+                let mut document = ide_text::Document::new(&text);
+                match &edits {
+                    Ok(edits) if !edits.is_empty() && document.apply_edits(edits).is_ok() => Ok(document.text()),
+                    _ => Err(edits),
+                }
+            })
+            .await;
+        if !text.lines().any(|l| l == formatted) {
+            self.fail("format", format_args!("no line {formatted:?} in:\n{text}"));
+        }
+        self.restore(doc, &before).await;
+    }
+
+    async fn rename(&self, symbol: At, to: &str, files: &[&str]) {
+        let (doc, pos) = self.locate(symbol).await;
+        let prepared = ops::lsp::lsp_prepare_rename(&self.host, WINDOW, doc, pos).await;
+        if !matches!(prepared, Ok(Some(_))) {
+            self.fail("rename", format_args!("prepare rename: {prepared:?}"));
+        }
+        let renamed = ops::lsp::lsp_rename(&self.host, WINDOW, RequestId(5), doc, pos, to.into())
+            .await
+            .unwrap_or_else(|e| self.fail("rename", e));
+        let edited = self.files(renamed.edit.files.iter().filter_map(|f| match f {
+            ide_core::FileEdit::Edit { path, .. } => Some(path.clone()),
+            _ => None,
+        }));
+        let want: BTreeSet<String> = files.iter().map(|f| f.to_string()).collect();
+        if !want.is_subset(&edited) {
+            self.fail("rename", format_args!("edits {edited:?}, expected at least {want:?}: {:?}", renamed.edit));
+        }
+        let mut before = Vec::new();
+        for file in files {
+            before.push(self.doc(file).await.1.matches(to).count());
+        }
+        ops::lsp::apply_workspace_edit(&self.host, WINDOW, renamed.edit)
+            .await
+            .unwrap_or_else(|e| self.fail("rename", format_args!("applying the edit: {e}")));
+        for (file, before) in files.iter().zip(before) {
+            if self.doc(file).await.1.matches(to).count() <= before {
+                self.fail("rename", format_args!("{file} has no new {to:?} after the rename"));
+            }
+        }
+    }
+
+    async fn signature(&self, call: Typed, parameter: &str) {
+        let (doc, pos, before) = self.type_line(call).await;
+        self.retry("parameter info", self.warm_up, || async {
+            let found = ops::lsp::lsp_signature_help(&self.host, WINDOW, doc, pos).await;
+            match &found {
+                Ok(Some(h)) if h.signatures.iter().any(|s| s.label.contains(parameter)) => Ok(()),
+                _ => Err(found.map(|h| h.map(|h| h.signatures.into_iter().map(|s| s.label).collect::<Vec<_>>()))),
+            }
+        })
+        .await;
+        self.restore(doc, &before).await;
+    }
+
+    async fn outline(&self, file: &str, symbols: &[&str]) {
+        let (doc, _) = self.doc(file).await;
+        fn names(items: &[ide_core::OutlineItem], out: &mut BTreeSet<String>) {
+            for item in items {
+                out.insert(item.name.clone());
+                names(&item.children, out);
+            }
+        }
+        self.retry("structure", self.warm_up, || async {
+            let found = ops::doc::doc_outline(&self.host, WINDOW, doc).await;
+            let mut shown = BTreeSet::new();
+            if let Ok(items) = &found {
+                names(items, &mut shown);
+            }
+            if symbols.iter().all(|s| shown.contains(*s)) { Ok(()) } else { Err(shown) }
+        })
+        .await;
+    }
+
+    async fn auto_import(&self, a: AutoImport) {
+        let (doc, pos, before) = self.type_line(a.typed).await;
+        assert!(!before.contains(a.result), "{a:?}: the file already contains the result");
+        self.retry("auto-import completion", self.warm_up, || async {
+            let list = ops::lsp::lsp_completion(&self.host, WINDOW, RequestId(6), doc, pos, None).await;
+            let items = match &list {
+                Ok(l) => l.items.iter().filter(|i| i.label == a.label).cloned().collect::<Vec<_>>(),
+                Err(e) => return Err(format!("{e}")),
+            };
+            let text = self.doc(a.typed.file).await.1;
+            let mut imports = Vec::new();
+            for item in items {
+                // Servers compute the import when the item is resolved (on selection).
+                let item = if item.additional_edits.is_empty() {
+                    ops::lsp::lsp_resolve_completion(&self.host, WINDOW, doc, item.clone()).await.unwrap_or(item)
+                } else {
+                    item
+                };
+                let mut document = ide_text::Document::new(&text);
+                if document.apply_edits(&item.additional_edits).is_ok() && document.text().contains(a.result) {
+                    return Ok(());
+                }
+                // Or accepting it runs a server command that edits the file (kotlin-lsp).
+                if let Some(command) = item.command.clone() {
+                    let ran = ops::lsp::lsp_execute_command(&self.host, WINDOW, doc, command).await;
+                    let text = self.doc(a.typed.file).await.1;
+                    if ran.is_ok() && text.contains(a.result) {
+                        return Ok(());
+                    }
+                }
+                imports.push(format!("{:?} {:?}", item.additional_edits, item.command));
+            }
+            let labels: Vec<String> = list.map(|l| l.items.into_iter().take(20).map(|i| i.label).collect()).unwrap();
+            Err(format!("{:?} items' imports: {imports:?}; items: {labels:?}", a.label))
+        })
+        .await;
+        self.restore(doc, &before).await;
+    }
+
+    async fn organize_imports(&self, import: Typed, expect: Imports) {
+        let (doc, _, before) = self.type_line(import).await;
+        let typed = import.text.trim();
+        let organized = |text: &str| match expect {
+            Imports::Removed => !text.lines().any(|l| l.trim() == typed),
+            Imports::Before(line) => {
+                let at = |needle: &str| text.lines().position(|l| l.trim() == needle);
+                matches!((at(typed), at(line)), (Some(a), Some(b)) if a < b)
+            }
+        };
+        self.retry("optimize imports", self.warm_up, || async {
+            let text = self.doc(import.file).await.1;
+            // The whole file, as Optimize Imports asks (positions past the end fail on jdtls).
+            let last = text.split('\n').count() as u32 - 1;
+            let whole = Range::new(Pos::new(0, 0), Pos::new(last, utf16_len(text.rsplit('\n').next().unwrap_or(""))));
+            let kind = "source.organizeImports".to_string();
+            let found = ops::lsp::lsp_code_actions(&self.host, WINDOW, doc, whole, vec![kind.clone()]).await;
+            let actions: Vec<_> = match &found {
+                Ok(a) => a.iter().filter(|a| a.kind.as_ref().is_some_and(|k| k.starts_with(&kind))).cloned().collect(),
+                Err(e) => return Err(format!("{e}")),
+            };
+            let Some(action) = actions.iter().find(|a| a.is_preferred).or(actions.first()).cloned() else {
+                return Err(format!(
+                    "no {kind} action: {:?}",
+                    found.map(|a| a.into_iter().map(|a| a.title).collect::<Vec<_>>())
+                ));
+            };
+            ops::lsp::lsp_apply_code_action(&self.host, WINDOW, doc, action).await.map_err(|e| e.to_string())?;
+            let text = self.doc(import.file).await.1;
+            if organized(&text) { Ok(()) } else { Err(text) }
+        })
+        .await;
+        self.restore(doc, &before).await;
+    }
+
+    async fn file_move(&self, from: &str, to: &str, referencing: &str, result: &str) {
+        // The servers know the referencing file (opened, as in an editor).
+        let _ = self.doc(referencing).await;
+        let moves = vec![ide_workspace::FileMove { from: self.path(from).into(), to: self.path(to).into() }];
+        let edit = self
+            .retry("move file", self.warm_up, || async {
+                let found =
+                    ops::refactor::refactor_file_move_edits(&self.host, WINDOW, RequestId(7), moves.clone()).await;
+                let want = self.path(referencing);
+                match &found {
+                    Ok(e)
+                        if e.edit
+                            .files
+                            .iter()
+                            .any(|f| matches!(f, ide_core::FileEdit::Edit { path, .. } if **path == *want)) =>
+                    {
+                        Ok(e.edit.clone())
+                    }
+                    _ => Err(found),
+                }
+            })
+            .await;
+        ops::refactor::refactor_move_files(&self.host, WINDOW, moves, edit, "Move".into())
+            .await
+            .unwrap_or_else(|e| self.fail("move file", e));
+        if !self.path(to).is_file() {
+            self.fail("move file", format_args!("{to} doesn't exist after the move"));
+        }
+        let text = self.doc(referencing).await.1;
+        if !text.contains(result) {
+            self.fail("move file", format_args!("{referencing} has no {result:?} after the move:\n{text}"));
+        }
+    }
+
+    async fn run(&self, c: &Checks) {
+        self.definition(c.definition.0, c.definition.1).await;
+        self.references(c.references.0, c.references.1).await;
+        self.hover(c.hover.0, c.hover.1).await;
+        self.completion(c.completion.0, c.completion.1).await;
+        self.quick_fix(c.quick_fix).await;
+        self.intention(c.intention.0, c.intention.1).await;
+        self.format(c.format.0, c.indent, c.format.1).await;
+        self.signature(c.signature.0, c.signature.1).await;
+        self.outline(c.outline.0, c.outline.1).await;
+        self.auto_import(c.auto_import).await;
+        if let Some((import, expect)) = c.organize_imports {
+            self.organize_imports(import, expect).await;
+        }
+        self.rename(c.rename.0, c.rename.1, c.rename.2).await;
+        // Last: it moves a file the other checks use.
+        if let Some((from, to, referencing, result)) = c.file_move {
+            self.file_move(from, to, referencing, result).await;
+        }
+        let shutdown = self.host.project(WINDOW).unwrap().lsp.clone();
+        let _ = tokio::time::timeout(Duration::from_secs(20), shutdown.shutdown_all()).await;
+    }
+}
+
+async fn smoke(language: &'static str, checks: Checks) {
+    let smoke = Smoke::start(language, &checks).await;
+    smoke.run(&checks).await;
+}
+
+const TYPESCRIPT: Checks = Checks {
+    fixture: "ts-app",
+    files: &[],
+    warm_up: Duration::from_secs(120),
+    definition: (
+        at("src/index.ts", "Total: ${formatMoney(total)}", "formatMoney"),
+        at("src/money.ts", "export function formatMoney", "formatMoney"),
+    ),
+    references: (at("src/money.ts", "export function formatMoney", "formatMoney"), &["src/index.ts", "src/money.ts"]),
+    hover: (at("src/index.ts", "price: cents(8999)", "cents"), "cents(value: number): Cents"),
+    completion: (typed("src/index.ts", "const total = cart.total();", "  cart."), "applyDiscount"),
+    quick_fix: QuickFix {
+        typed: typed("src/index.ts", "const total = cart.total();", "  console.log(addMoney(total, total));"),
+        diagnostic: "Cannot find name 'addMoney'",
+        title: "import from \"./money.ts\"",
+        result: "import { addMoney, cents, formatMoney } from \"./money.ts\";",
+    },
+    intention: (at("src/index.ts", "const total = cart.total();", "cart.total()"), "Extract to constant"),
+    format: (
+        typed("src/index.ts", "const total = cart.total();", "  const  shown={total,count:cart.count}"),
+        "  const shown = { total, count: cart.count }",
+    ),
+    indent: Indent::Spaces(2),
+    rename: (
+        // From a usage in another file: the declaration is renamed too, not aliased in the import.
+        at("src/index.ts", "Total: ${formatMoney(total)}", "formatMoney"),
+        "formatPrice",
+        &["src/index.ts", "src/money.ts"],
+    ),
+    signature: (typed("src/index.ts", "const total = cart.total();", "  cart.add("), "product"),
+    outline: ("src/cart.ts", &["Cart", "add", "total"]),
+    auto_import: AutoImport {
+        typed: typed("src/index.ts", "const total = cart.total();", "  addMon"),
+        label: "addMoney",
+        result: "addMoney",
+    },
+    organize_imports: Some((
+        typed(
+            "src/index.ts",
+            "import { cents, formatMoney } from \"./money.ts\";",
+            "import { readFileSync } from \"node:fs\";",
+        ),
+        Imports::Removed,
+    )),
+    file_move: Some(("src/money.ts", "src/lib/money.ts", "src/index.ts", "\"./lib/money.ts\"")),
+};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "language smoke: needs vtsls"]
+async fn typescript() {
+    smoke("typescript", TYPESCRIPT).await;
+}
+
+const PYTHON: Checks = Checks {
+    fixture: "python-app",
+    // Ruff (lint, quick fixes, formatting) starts in projects configured for it.
+    files: &[("ruff.toml", "")],
+    warm_up: Duration::from_secs(120),
+    definition: (
+        at("src/tasks/cli.py", "tasks = TaskList()", "TaskList"),
+        at("src/tasks/models.py", "class TaskList:", "TaskList"),
+    ),
+    references: (
+        at("src/tasks/models.py", "class TaskList:", "TaskList"),
+        &["src/tasks/cli.py", "src/tasks/models.py"],
+    ),
+    hover: (at("src/tasks/cli.py", "tasks.add(\"Write release notes\"", "add"), "def add("),
+    completion: (typed("src/tasks/cli.py", "tasks = build_demo()", "    tasks."), "pending"),
+    quick_fix: QuickFix {
+        typed: typed("src/tasks/cli.py", "tasks = build_demo()", "    print(Task)"),
+        diagnostic: "\"Task\" is not defined",
+        title: "from .models import Task",
+        result: "from .models import Priority, Task, TaskList",
+    },
+    // basedpyright has no refactorings; Ruff's fixes are the Python intentions.
+    intention: (at("src/tasks/models.py", "import os", "os"), "Remove unused import"),
+    format: (
+        typed("src/tasks/cli.py", "tasks = build_demo()", "    shown2 = {'a':1,'b':  2}"),
+        "    shown2 = {\"a\": 1, \"b\": 2}",
+    ),
+    indent: Indent::Spaces(4),
+    rename: (
+        at("src/tasks/models.py", "class TaskList:", "TaskList"),
+        "TaskBoard",
+        &["src/tasks/cli.py", "src/tasks/models.py"],
+    ),
+    signature: (typed("src/tasks/cli.py", "tasks = build_demo()", "    tasks.add("), "title"),
+    outline: ("src/tasks/models.py", &["Priority", "Task", "TaskList", "pending"]),
+    auto_import: AutoImport {
+        typed: typed("src/tasks/cli.py", "tasks = build_demo()", "    stamp = datetim"),
+        label: "datetime",
+        result: "import datetime",
+    },
+    organize_imports: Some((
+        typed("src/tasks/models.py", "from enum import IntEnum", "import abc"),
+        Imports::Before("import os"),
+    )),
+    // basedpyright has no `workspace/willRenameFiles`.
+    file_move: None,
+};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "language smoke: needs basedpyright and ruff"]
+async fn python() {
+    smoke("python", PYTHON).await;
+}
+
+const RUST: Checks = Checks {
+    fixture: "rust-app",
+    files: &[],
+    warm_up: Duration::from_secs(180),
+    definition: (
+        at("src/main.rs", "match parser::parse(SAMPLE)", "parse"),
+        at("src/parser.rs", "pub fn parse(text: &str)", "parse"),
+    ),
+    references: (at("src/parser.rs", "pub fn parse(text: &str)", "parse"), &["src/main.rs", "src/parser.rs"]),
+    hover: (at("src/main.rs", "inventory.take(&Sku", "take"), "pub fn take("),
+    completion: (typed("src/main.rs", "let mut inventory = Inventory::new();", "    inventory."), "low_stock"),
+    quick_fix: QuickFix {
+        // rust-analyzer's own analysis, pulled as the file changes (no save, no `cargo check`).
+        typed: typed(
+            "src/main.rs",
+            "let mut inventory = Inventory::new();",
+            "    let _blank = parser::ParseError { line: 1 };",
+        ),
+        diagnostic: "missing structure fields",
+        title: "Fill struct fields",
+        result: "ParseError { line: 1, message",
+    },
+    intention: (at("src/main.rs", "match parser::parse(SAMPLE)", "parser::parse(SAMPLE)"), "Extract into variable"),
+    format: (
+        typed("src/main.rs", "let mut inventory = Inventory::new();", "    let  _spaced=( 1,2 );"),
+        "    let _spaced = (1, 2);",
+    ),
+    indent: Indent::Spaces(4),
+    rename: (at("src/parser.rs", "pub fn parse(text: &str)", "parse"), "parse_all", &["src/main.rs", "src/parser.rs"]),
+    signature: (typed("src/main.rs", "let mut inventory = Inventory::new();", "    inventory.take("), "sku"),
+    outline: ("src/lib.rs", &["Inventory", "Item", "take"]),
+    auto_import: AutoImport {
+        typed: typed("src/main.rs", "let mut inventory = Inventory::new();", "    let _seen = HashSe"),
+        label: "HashSet",
+        result: "use std::collections::HashSet;",
+    },
+    // rust-analyzer has no `source.organizeImports`.
+    organize_imports: None,
+    file_move: Some(("src/parser.rs", "src/csv.rs", "src/lib.rs", "pub mod csv;")),
+};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "language smoke: needs rust-analyzer"]
+async fn rust() {
+    smoke("rust", RUST).await;
+}
+
+const GO: Checks = Checks {
+    fixture: "go-app",
+    files: &[],
+    warm_up: Duration::from_secs(180),
+    definition: (
+        at("cmd/server/main.go", "s := store.New()", "New"),
+        at("internal/store/store.go", "func New() *Store", "New"),
+    ),
+    references: (
+        at("internal/store/store.go", "func New() *Store", "New"),
+        &["cmd/server/main.go", "internal/store/store.go"],
+    ),
+    hover: (
+        at("cmd/server/main.go", "writeJSON(w, s.Search(", "Search"),
+        "func (s *store.Store) Search(q string) []store.Note",
+    ),
+    completion: (typed("cmd/server/main.go", "s := store.New()", "\ts."), "Create"),
+    quick_fix: QuickFix {
+        typed: typed("cmd/server/main.go", "s := store.New()", "\tfmt.Println(s)"),
+        diagnostic: "undefined: fmt",
+        title: "\"fmt\"",
+        result: "\t\"fmt\"",
+    },
+    intention: (at("cmd/server/main.go", "s := store.New()", "store.New()"), "Extract"),
+    format: (typed("cmd/server/main.go", "s := store.New()", "\t_ =  []int{1,2}"), "\t_ = []int{1, 2}"),
+    indent: Indent::Tabs,
+    rename: (
+        at("internal/store/store.go", "func New() *Store", "New"),
+        "Open",
+        &["cmd/server/main.go", "internal/store/store.go"],
+    ),
+    signature: (typed("cmd/server/main.go", "s := store.New()", "\ts.Create("), "title"),
+    outline: ("internal/store/store.go", &["Store", "New", "(*Store).Create"]),
+    auto_import: AutoImport {
+        typed: typed("cmd/server/main.go", "s := store.New()", "\t_ = strings.ToUpp"),
+        label: "ToUpper",
+        result: "\t\"strings\"",
+    },
+    organize_imports: Some((typed("cmd/server/main.go", "\"strconv\"", "\t\"sort\""), Imports::Removed)),
+    // gopls renames packages, not files: moving a Go file changes no references.
+    file_move: None,
+};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "language smoke: needs gopls"]
+async fn go() {
+    smoke("go", GO).await;
+}
+
+const JAVA: Checks = Checks {
+    fixture: "java-app",
+    files: &[],
+    warm_up: Duration::from_secs(300),
+    definition: (
+        at("src/main/java/com/example/orders/App.java", "book.place(\"alice\", \"Mechanical", "place"),
+        at("src/main/java/com/example/orders/OrderBook.java", "public Order place(", "place"),
+    ),
+    references: (
+        at("src/main/java/com/example/orders/OrderBook.java", "public Order place(", "place"),
+        &["src/main/java/com/example/orders/App.java", "src/test/java/com/example/orders/OrderBookTest.java"],
+    ),
+    hover: (
+        at("src/main/java/com/example/orders/App.java", "long revenue = book.revenueCents()", "revenueCents"),
+        "long com.example.orders.OrderBook.revenueCents()",
+    ),
+    completion: (
+        typed("src/main/java/com/example/orders/App.java", "long revenue = book.revenueCents();", "        book."),
+        "largest",
+    ),
+    quick_fix: QuickFix {
+        typed: typed(
+            "src/main/java/com/example/orders/App.java",
+            "long revenue = book.revenueCents();",
+            "        List<Order> all = book.byCustomer(\"alice\");",
+        ),
+        diagnostic: "List cannot be resolved to a type",
+        title: "Import 'List' (java.util)",
+        result: "import java.util.List;",
+    },
+    intention: (
+        at("src/main/java/com/example/orders/App.java", "long revenue = book.revenueCents();", "book.revenueCents()"),
+        "Extract to local variable",
+    ),
+    format: (
+        typed(
+            "src/main/java/com/example/orders/App.java",
+            "long revenue = book.revenueCents();",
+            "        long  doubled=revenue*2;",
+        ),
+        "        long doubled = revenue * 2;",
+    ),
+    indent: Indent::Spaces(4),
+    rename: (
+        at("src/main/java/com/example/orders/OrderBook.java", "public Order place(", "place"),
+        "submit",
+        &["src/main/java/com/example/orders/App.java", "src/main/java/com/example/orders/OrderBook.java"],
+    ),
+    signature: (
+        typed(
+            "src/main/java/com/example/orders/App.java",
+            "long revenue = book.revenueCents();",
+            "        book.place(",
+        ),
+        "customer",
+    ),
+    outline: (
+        "src/main/java/com/example/orders/OrderBook.java",
+        &["OrderBook", "place(String, String, int, long)", "revenueCents()"],
+    ),
+    auto_import: AutoImport {
+        typed: typed(
+            "src/main/java/com/example/orders/App.java",
+            "long revenue = book.revenueCents();",
+            "        ArrayLis",
+        ),
+        label: "ArrayList",
+        result: "import java.util.ArrayList;",
+    },
+    organize_imports: Some((
+        typed("src/main/java/com/example/orders/OrderBook.java", "import java.util.Optional;", "import java.util.Map;"),
+        Imports::Removed,
+    )),
+    file_move: Some((
+        "src/main/java/com/example/orders/OrderBook.java",
+        "src/main/java/com/example/orders/Ledger.java",
+        "src/main/java/com/example/orders/App.java",
+        "Ledger book",
+    )),
+};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "language smoke: needs jdtls and JDK 21"]
+async fn java() {
+    smoke("java", JAVA).await;
+}
+
+const KOTLIN: Checks = Checks {
+    fixture: "kotlin-gradle",
+    files: &[],
+    warm_up: Duration::from_secs(420),
+    definition: (
+        at("src/main/kotlin/com/example/library/App.kt", "val library = Library()", "Library"),
+        at("src/main/kotlin/com/example/library/Library.kt", "class Library(", "Library"),
+    ),
+    references: (
+        at("src/main/kotlin/com/example/library/Library.kt", "fun search(query: String)", "search"),
+        &["src/main/kotlin/com/example/library/App.kt", "src/main/kotlin/com/example/library/Library.kt"],
+    ),
+    hover: (
+        at("src/main/kotlin/com/example/library/App.kt", "library.search(\"java\")", "search"),
+        "fun search(query: String): List<Book>",
+    ),
+    completion: (
+        typed("src/main/kotlin/com/example/library/App.kt", "val library = Library()", "    library."),
+        "lend",
+    ),
+    quick_fix: QuickFix {
+        typed: typed(
+            "src/main/kotlin/com/example/library/App.kt",
+            "val library = Library()",
+            "    val stamp = LocalDateTime.now()",
+        ),
+        diagnostic: "Unresolved reference",
+        title: "Import",
+        result: "import java.time.LocalDateTime",
+    },
+    intention: (
+        at("src/main/kotlin/com/example/library/Library.kt", "fun giveBack(isbn: String): Boolean", "giveBack"),
+        "block body",
+    ),
+    format: (
+        typed("src/main/kotlin/com/example/library/App.kt", "val library = Library()", "    val  pair=listOf(1,2)"),
+        "    val pair = listOf(1, 2)",
+    ),
+    indent: Indent::Spaces(4),
+    rename: (
+        at("src/main/kotlin/com/example/library/Library.kt", "fun search(query: String)", "search"),
+        "find",
+        &["src/main/kotlin/com/example/library/App.kt", "src/main/kotlin/com/example/library/Library.kt"],
+    ),
+    signature: (
+        typed("src/main/kotlin/com/example/library/App.kt", "val library = Library()", "    library.lend("),
+        "isbn",
+    ),
+    outline: ("src/main/kotlin/com/example/library/Library.kt", &["Library", "lend", "search"]),
+    auto_import: AutoImport {
+        typed: typed(
+            "src/main/kotlin/com/example/library/App.kt",
+            "val library = Library()",
+            "    val stamp = LocalDateTi",
+        ),
+        label: "LocalDateTime",
+        result: "import java.time.LocalDateTime",
+    },
+    organize_imports: Some((
+        typed("src/main/kotlin/com/example/library/App.kt", "import java.time.LocalDate", "import java.util.UUID"),
+        Imports::Removed,
+    )),
+    // kotlin-lsp has no `workspace/willRenameFiles`.
+    file_move: None,
+};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "language smoke: needs kotlin-lsp, a JDK and Gradle"]
+async fn kotlin() {
+    smoke("kotlin", KOTLIN).await;
+}
diff --git a/crates/ide-host/tests/plugins.rs b/crates/ide-host/tests/plugins.rs
index b052cd72..299ece22 100644
--- a/crates/ide-host/tests/plugins.rs
+++ b/crates/ide-host/tests/plugins.rs
@@ -123,6 +123,19 @@ fn misbehave_pkg() -> PathBuf {
     repo().join("crates/ide-plugin/tests/fixtures/misbehave")
 }
 
+/// Whether `f` holds within 5 s. A call a slow runner keeps waiting behind
+/// another (or behind a new instance starting) holds once it caught up.
+fn eventually(mut f: impl FnMut() -> bool) -> bool {
+    let until = Instant::now() + Duration::from_secs(5);
+    while !f() {
+        if Instant::now() > until {
+            return false;
+        }
+        std::thread::sleep(Duration::from_millis(20));
+    }
+    true
+}
+
 /// A theme package with a light and a dark theme, plus licence files, in `dir`.
 fn write_theme_pair(dir: &Path) {
     std::fs::create_dir_all(dir.join("t")).unwrap();
@@ -397,11 +410,11 @@ fn crashes_restart_with_backoff_until_the_circuit_opens() {
     let info = f.host.info_of("misbehave").unwrap();
     assert_eq!((info.status, info.stats.activations, info.error), (PluginStatus::Active, 2, None));
 
-    // Three in a row: stopped for the session, with growing waits between.
+    // Three in a row: stopped for the session, backing off between them (the wait
+    // doubles: `Limits::backoff`, tested where it is defined; wall-clock waits on CI
+    // are too noisy to compare).
     f.take_events();
-    let mut waits = Vec::new();
-    for _ in 0..3 {
-        let started = Instant::now();
+    for crash in 0..3 {
         let err = loop {
             match f.run("misbehave", "panic", None) {
                 Err(e) if e.contains("restarts in") => std::thread::sleep(Duration::from_millis(20)),
@@ -409,9 +422,10 @@ fn crashes_restart_with_backoff_until_the_circuit_opens() {
             }
         };
         assert!(err.contains("crashed"), "{err}");
-        waits.push(started.elapsed());
+        if crash < 2 {
+            assert!(f.run("misbehave", "echo", None).unwrap_err().contains("restarts in"), "backing off");
+        }
     }
-    assert!(waits[2] >= backoff * 2 && waits[2] > waits[1], "{waits:?}");
     let info = f.host.info_of("misbehave").unwrap();
     assert_eq!(info.status, PluginStatus::Failed);
     assert!(info.error.as_deref().is_some_and(|e| e.contains("3 times in a row")), "{:?}", info.error);
@@ -479,12 +493,15 @@ fn running_calls_can_be_cancelled() {
         let f = f.clone();
         std::thread::spawn(move || f.run("misbehave", "spin", None))
     };
-    std::thread::sleep(Duration::from_millis(100));
-    let started = Instant::now();
-    f.host.cancel("misbehave");
+    // A cancel before the call runs (the instance may still be starting) does nothing: repeat it.
+    let until = Instant::now() + Duration::from_secs(5);
+    while !spinning.is_finished() {
+        assert!(Instant::now() < until, "the running call wasn't interrupted");
+        f.host.cancel("misbehave");
+        std::thread::sleep(Duration::from_millis(20));
+    }
     let err = spinning.join().unwrap().unwrap_err();
     assert!(err.contains("was cancelled"), "{err}");
-    assert!(started.elapsed() < Duration::from_secs(1));
     assert_eq!(f.run("misbehave", "echo", Some("x")).unwrap().as_deref(), Some("x"), "no backoff");
     let stats = f.host.info_of("misbehave").unwrap().stats;
     assert_eq!((stats.crashes, stats.activations), (0, 2));
@@ -526,16 +543,22 @@ fn edit_path_calls_have_soft_and_hard_deadlines() {
     let provider = host.syntax_provider();
     let mis = LanguageId::new("mis");
 
-    let tokens = provider.highlights(&mis, "fast").unwrap();
+    // The first call starts the instance, which may take longer than the soft deadline.
+    let mut tokens = None;
+    assert!(eventually(|| {
+        tokens = provider.highlights(&mis, "fast");
+        tokens.is_some()
+    }));
+    let tokens = tokens.unwrap();
     assert_eq!((tokens[0].start, tokens[0].end, tokens[0].kind.as_str()), (0, 4, "keyword"));
 
     // Slower than the soft deadline: dropped (however late this thread gets
     // to look), but the instance lives on.
     assert!(provider.highlights(&mis, "sleep:150").is_none());
-    std::thread::sleep(Duration::from_millis(150));
-    assert!(provider.highlights(&mis, "fast").is_some());
+    assert!(eventually(|| provider.highlights(&mis, "fast").is_some()));
     let info = host.info_of("misbehave").unwrap();
-    assert_eq!((info.stats.slow_calls, info.stats.crashes, info.stats.activations), (1, 0, 1));
+    assert!(info.stats.slow_calls >= 1, "{:?}", info.stats);
+    assert_eq!((info.stats.crashes, info.stats.activations), (0, 1));
 
     // Past the hard deadline: interrupted; the next call gets a new instance.
     assert!(provider.highlights(&mis, "spin").is_none());
@@ -544,7 +567,8 @@ fn edit_path_calls_have_soft_and_hard_deadlines() {
     let info = host.info_of("misbehave").unwrap();
     assert_eq!(info.stats.crashes, 1, "{:?}", info.error);
     assert!(info.error.as_deref().is_some_and(|e| e.contains("timed out after 400ms")), "{:?}", info.error);
-    assert!(provider.highlights(&mis, "fast").is_some());
+    // The new instance may take longer to start than the soft deadline on a slow runner.
+    assert!(eventually(|| provider.highlights(&mis, "fast").is_some()));
     assert_eq!(host.info_of("misbehave").unwrap().stats.activations, 2);
 }
 
@@ -553,9 +577,10 @@ fn edit_path_calls_have_soft_and_hard_deadlines() {
 #[test]
 fn providers_of_several_plugins_run_concurrently() {
     let tmp = tempfile::tempdir().unwrap();
+    // A budget no runner misses, so only the overlap is measured.
     let limits = Limits {
-        edit_soft: Duration::from_millis(300),
-        edit_hard: Duration::from_secs(2),
+        edit_soft: Duration::from_secs(5),
+        edit_hard: Duration::from_secs(10),
         fuel: u64::MAX,
         ..Limits::default()
     };
@@ -584,16 +609,17 @@ fn providers_of_several_plugins_run_concurrently() {
         text: text.into(),
     };
     let at = ide_core::Pos::new(0, 0);
-    // Activation is not what is measured.
-    assert_eq!(host.provide_completion(&doc("fast"), at, None).len(), 2);
+    // Activation is not what is measured: a first call that starts an instance
+    // can run past the edit-path budget, and its answer is dropped.
+    assert!(eventually(|| host.provide_completion(&doc("fast"), at, None).len() == 2));
 
     let started = Instant::now();
-    let items = host.provide_completion(&doc("sleep:200"), at, None);
+    let items = host.provide_completion(&doc("sleep:500"), at, None);
     let elapsed = started.elapsed();
     let mut from: Vec<&str> = items.iter().map(|(p, _)| p.as_str()).collect();
     from.sort();
     assert_eq!(from, ["slow-a", "slow-b"], "both within the budget");
-    assert!(elapsed < Duration::from_millis(350), "one after the other would take 400ms: {elapsed:?}");
+    assert!(elapsed < Duration::from_millis(950), "one after the other would take 1000ms: {elapsed:?}");
     assert_eq!(host.info_of("slow-b").unwrap().stats.slow_calls, 0);
 }
 
@@ -613,7 +639,7 @@ fn idle_instances_are_reclaimed_and_schedules_reactivate() {
     assert_eq!(f.host.instances(), 0);
     let info = f.host.info_of("misbehave").unwrap();
     assert_eq!((info.status, info.stats.reclaims), (PluginStatus::Inactive, 1));
-    assert_eq!(f.command_titles("misbehave").len(), 8, "contributions stay");
+    assert_eq!(f.command_titles("misbehave").len(), 10, "contributions stay");
     assert_eq!(f.run("misbehave", "echo", Some("y")).unwrap().as_deref(), Some("y"));
     assert_eq!(f.host.info_of("misbehave").unwrap().stats.activations, 2);
 
@@ -1651,22 +1677,21 @@ fn official_ai_completion_cancels_superseded_requests() {
     };
     let at = ide_core::Pos::new(1, 4);
     let host = Arc::new(f);
-    // A slow request, superseded 200 ms later by the next keystroke's.
+    // A slow request, superseded by the next keystroke's once the server has it
+    // (starting the instance comes first, and takes longer on a slow runner).
     let first = ide_core::CancellationToken::new();
     let slow = {
         let (host, doc, first) = (host.clone(), doc.clone(), first.clone());
-        std::thread::spawn(move || {
-            let started = Instant::now();
-            let r = host.host.provide_inline_completion(&doc, at, &first);
-            (r, started.elapsed())
-        })
+        std::thread::spawn(move || (host.host.provide_inline_completion(&doc, at, &first), Instant::now()))
     };
-    std::thread::sleep(Duration::from_millis(200));
+    assert!(eventually(|| seen.lock().len() == 1), "the first request reaches the server");
+    let cancelled = Instant::now();
     first.cancel();
     let started = Instant::now();
     let second = host.host.provide_inline_completion(&doc, at, &ide_core::CancellationToken::new());
     let took = started.elapsed();
-    let (old, old_took) = slow.join().unwrap();
+    let (old, old_done) = slow.join().unwrap();
+    let old_took = old_done.saturating_duration_since(cancelled);
     assert!(old.is_none(), "the superseded request yields nothing");
     assert!(old_took < Duration::from_secs(1), "cancelled, not waited out: {old_took:?}");
     assert_eq!(second.map(|(_, s)| s.insert_text).as_deref(), Some("a + b"));
@@ -1844,7 +1869,12 @@ fn official_mybatis_navigates_between_interface_and_xml() {
     assert_eq!((target.path, target.range.start), (xml_path.clone(), ide_core::Pos::new(1, 14)));
 
     let xdoc = doc(&xml_path, "xml", xml);
-    let to_java = f.host.provide_definition(&xdoc, ide_core::Pos::new(1, 16));
+    // Reads the interface from disk: on a slow machine that too can run past the budget.
+    let mut to_java = Vec::new();
+    assert!(eventually(|| {
+        to_java = f.host.provide_definition(&xdoc, ide_core::Pos::new(1, 16));
+        !to_java.is_empty()
+    }));
     assert_eq!(
         to_java.iter().map(|l| (l.path.clone(), l.range.start)).collect::<Vec<_>>(),
         [(java_path.clone(), ide_core::Pos::new(3, 9))]
@@ -2015,6 +2045,83 @@ fn pinned_programs_fill_views_and_open_terminals() {
     assert_eq!(args, ["follow", "build", "--lines=5"]);
 }
 
+#[test]
+fn views_open_project_files_at_a_line() {
+    let f = fixture(Limits::default());
+    let info = f.install(&sample("jobs"));
+    assert_eq!(info.status, PluginStatus::Inactive, "{:?}", info.error);
+    std::fs::write(f.project.join("jobs.log"), "build\ndeploy\nfailed\n").unwrap();
+    let press = |button: &str| {
+        f.take_events();
+        let result = f.host.view_event("jobs", "jobs", ide_plugin::ViewEvent::Button { id: button.into() }, f.inv());
+        let opened = f.take_events().into_iter().find_map(|(client, e)| match e {
+            PluginEvent::OpenLocation { path, line, column, .. } => Some((client, path.0, line, column)),
+            _ => None,
+        });
+        (result, opened)
+    };
+
+    let (result, opened) = press("log");
+    assert!(result.is_ok(), "{result:?}");
+    let (client, path, line, column) = opened.expect("a location");
+    assert_eq!((client.as_deref(), line, column), (Some("main"), 2, 4));
+    assert_eq!(path.canonicalize().unwrap(), f.project.join("jobs.log").canonicalize().unwrap());
+
+    let (result, opened) = press("outside");
+    assert!(result.is_err(), "a path outside the project is refused");
+    assert!(opened.is_none());
+
+    f.host.set_capability("jobs", "project.read", false).unwrap();
+    let (result, opened) = press("log");
+    assert!(result.unwrap_err().message.contains("project.read"), "needs project.read");
+    assert!(opened.is_none());
+}
+
+#[test]
+fn views_can_use_an_svg_icon_from_the_package() {
+    let f = fixture(Limits::default());
+    let tmp = tempfile::tempdir().unwrap();
+    let clean = r##"<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><rect width="16" height="16" fill="#08f"/></svg>"##;
+    let package = |dir: &str, icon: &str, svg: &str| {
+        let pkg = tmp.path().join(dir);
+        for (path, text) in [("panel/index.html", "<p>panel</p>"), ("icons/panel.svg", svg)] {
+            std::fs::create_dir_all(pkg.join(path).parent().unwrap()).unwrap();
+            std::fs::write(pkg.join(path), text).unwrap();
+        }
+        std::fs::write(
+            pkg.join("plugin.toml"),
+            format!(
+                r#"id = "panel-icon"
+name = "Panel Icon"
+version = "1.0.0"
+engines.openidea = "^1.0"
+
+[[contributes.views]]
+id = "panel"
+title = "Panel"
+icon = "{icon}"
+location = "bottom"
+web = "panel/index.html"
+"#
+            ),
+        )
+        .unwrap();
+        pkg
+    };
+
+    assert!(f.host.install_from_dir(&package("missing", "icons/missing.svg", clean), &Consent::all()).is_err());
+    let scripted = clean.replace("<rect", "<script>alert(1)</script><rect");
+    assert!(f.host.install_from_dir(&package("scripted", "icons/panel.svg", &scripted), &Consent::all()).is_err());
+
+    let info = f.install(&package("clean", "icons/panel.svg", clean));
+    assert!(info.error.is_none(), "{:?}", info.error);
+    let view = f.host.ui_items("views").into_iter().find(|v| v.key == "panel").expect("the view");
+    assert_eq!(view.decl["icon"].as_str(), Some("icons/panel.svg"));
+    let assets = f.host.assets("panel-icon", "viewIcon/panel").unwrap();
+    assert_eq!(assets.len(), 1);
+    assert!(assets[0].1.contains("<rect"));
+}
+
 /// A plugin with web views and no code: its pages and their files are
 /// installed with it and served only from the declared directories, while
 /// it is enabled and only for the installed version; file icons and
@@ -2309,6 +2416,57 @@ fn a_zipped_plugin_folder_installs_like_the_folder() {
     assert!(err.contains("is not an OpenIDEA plugin"), "{err}");
 }
 
+/// What the UI writes for an imported IntelliJ theme goes through the install page.
+#[test]
+fn a_generated_package_is_staged_for_the_install_page() {
+    let f = fixture(Limits::default());
+    let file = |path: &str, text: &str| PackageFile { path: path.into(), text: text.into() };
+    let manifest = r#"id = "intellij.deep-sea"
+name = "Deep Sea"
+version = "2.3.0"
+engines.openidea = "^1.0"
+
+[[contributes.themes]]
+path = "themes/deep-sea.theme.json"
+editor-scheme = "themes/deep-sea.scheme.json"
+"#;
+    let files = [
+        file("plugin.toml", manifest),
+        file(
+            "themes/deep-sea.theme.json",
+            r##"{"id":"deep-sea","name":"Deep Sea","kind":"dark","tokens":{"--bg-app":"#101820"}}"##,
+        ),
+        file("themes/deep-sea.scheme.json", r##"{"name":"Deep Sea","tokens":{"--syn-keyword":"#cc7832"}}"##),
+    ];
+    let dir = f.host.stage_package("intellij.deep-sea", &files).unwrap();
+    let preview = f.host.preview_install(&dir).unwrap();
+    assert_eq!((preview.id.as_str(), preview.has_code, preview.unsigned), ("intellij.deep-sea", false, true));
+    assert!(preview.capabilities.is_empty());
+    f.install(&dir);
+    let active = f.host.set_theme(Some(("intellij.deep-sea", "deep-sea"))).unwrap().unwrap();
+    assert_eq!(active.theme.tokens["--bg-app"], "#101820");
+    assert_eq!(active.theme.tokens["--syn-keyword"], "#cc7832");
+
+    // Staging the same package again starts from an empty folder; importing it again replaces it.
+    assert_eq!(f.host.stage_package("intellij.deep-sea", &files[..1]).unwrap(), dir);
+    assert!(!dir.join("themes").exists());
+    let mut changed = files.clone();
+    changed[2] = file("themes/deep-sea.scheme.json", r##"{"tokens":{"--syn-keyword":"#ff8800"}}"##);
+    f.install(&f.host.stage_package("intellij.deep-sea", &changed).unwrap());
+    let active = f.host.set_theme(Some(("intellij.deep-sea", "deep-sea"))).unwrap().unwrap();
+    assert_eq!(active.theme.tokens["--syn-keyword"], "#ff8800");
+
+    for bad in ["../x", "/abs", "a//b", r"a\b", "C:x", ".hidden", "a/./b", ""] {
+        let err = f.host.stage_package("p", &[file("plugin.toml", manifest), file(bad, "x")]).unwrap_err().message;
+        assert!(err.contains("invalid package path"), "{bad:?}: {err}");
+    }
+    let err = f.host.stage_package("p", &[file("x.json", "{}")]).unwrap_err().message;
+    assert!(err.contains("needs a plugin.toml"), "{err}");
+    let err = f.host.stage_package("p", &[file("plugin.toml", ""), file("PLUGIN.toml", "")]).unwrap_err().message;
+    assert!(err.contains("twice"), "{err}");
+    assert!(f.host.stage_package("../p", &files).is_err());
+}
+
 /// Secrets live outside the plugin's directory (the OS keychain on the
 /// desktop): uninstalling the plugin deletes the ones it declares.
 #[test]
@@ -2337,3 +2495,61 @@ fn uninstalling_deletes_the_plugins_secrets() {
     f.host.uninstall("openidea.ai-completion").unwrap();
     assert!(keychain.0.lock().is_empty(), "{:?}", keychain.0.lock().keys().collect::<Vec<_>>());
 }
+
+/// Plugin API 1.0 leaves room to grow: event kinds are names, and the editor
+/// providers carry snippets, imports, lazily computed quick fixes and tagged
+/// problems.
+#[test]
+fn completion_quick_fixes_problems_and_event_kinds_of_api_1() {
+    let f = fixture(Limits::default());
+    let pkg = f._tmp.path().join("misbehave-providers");
+    copy_dir(&misbehave_pkg(), &pkg);
+    let manifest = std::fs::read_to_string(pkg.join("plugin.toml")).unwrap();
+    std::fs::write(
+        pkg.join("plugin.toml"),
+        format!("{manifest}\n[[contributes.providers]]\nkinds = [\"completion\", \"code-actions\"]\nlanguages = [\"text\"]\n"),
+    )
+    .unwrap();
+    f.install(&pkg);
+    let doc = |text: &str| ide_plugin::ProviderDocument {
+        path: f.project.join("a.txt"),
+        language: "text".into(),
+        version: 1,
+        text: text.into(),
+    };
+    let at = ide_core::Pos::new(0, 0);
+
+    // The first call starts the instance, which may take longer than the edit-path budget.
+    let mut items = Vec::new();
+    assert!(eventually(|| {
+        items = f.host.provide_completion(&doc("rich"), at, None);
+        !items.is_empty()
+    }));
+    let item = &items[0].1;
+    assert_eq!(
+        (item.insert_text.as_str(), item.snippet, item.filter_text.as_deref()),
+        ("f(${1:x})$0", true, Some("fun"))
+    );
+    assert_eq!(item.additional_edits[0].new_text, "use f;\n");
+
+    // Offered without edits; computed when picked.
+    let actions = f.host.provide_code_actions(&doc("lazy"), ide_core::Range::default());
+    let (plugin, action) = actions.into_iter().next().expect("offered");
+    assert!(action.edits.is_empty() && action.data.as_deref() == Some("fix"));
+    let resolved = f.host.resolve_code_action(&plugin, &doc("lazy"), action.clone()).unwrap();
+    assert_eq!(resolved.edits[0].1[0].new_text, "fixed ");
+    let foreign = ide_plugin::CodeAction { data: Some("other".into()), ..action };
+    assert!(f.host.resolve_code_action(&plugin, &doc("lazy"), foreign).is_err());
+
+    // A kind this IDE doesn't know is refused, not a trap.
+    let err = f.host.run_command("misbehave", "subscribe", Some("file-deleted"), f.inv()).unwrap_err();
+    assert!(err.message.contains("no event kind"), "{}", err.message);
+    let err = f.host.run_command("misbehave", "subscribe", Some("file-saved"), f.inv()).unwrap_err();
+    assert!(err.message.contains("events"), "known, but not granted: {}", err.message);
+
+    // Tags the IDE knows, the tool that found it.
+    let path = f.project.join("a.txt");
+    f.host.run_command("misbehave", "diagnose", Some(&path.to_string_lossy()), f.inv()).unwrap();
+    let d = f.workspace.diagnostics.lock().get(&("misbehave".into(), path)).cloned().unwrap();
+    assert_eq!((d[0].unnecessary, d[0].deprecated, d[0].source.as_deref()), (true, false, Some("lint")));
+}
diff --git a/crates/ide-host/tests/project_smoke.rs b/crates/ide-host/tests/project_smoke.rs
new file mode 100644
index 00000000..9ed4cd4f
--- /dev/null
+++ b/crates/ide-host/tests/project_smoke.rs
@@ -0,0 +1,289 @@
+//! Opening each `fixtures/` project the way the app does, through the `ops` its commands call:
+//! the source and test roots detected from its build file, the index (files and symbols),
+//! Search Everywhere / Go to Class / Go to Symbol answered from it and kept current as files
+//! come and go, and the Maven / Gradle model.
+//!
+//! The `#[ignore]`d tests run Maven, Gradle, python3 and a JDK 21 (CI's `Language smoke`
+//! java, kotlin and python jobs):
+//! `cargo test -p ide-host --test project_smoke -- --ignored`.
+
+use ide_host::{Host, HostConfig, ops};
+use ide_index::SymbolFilter;
+use ide_workspace::roots::RootKind;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+
+const WINDOW: &str = "main";
+
+struct Fixture {
+    dir: &'static str,
+    /// Detected roots: (project-relative path, kind).
+    roots: &'static [(&'static str, RootKind)],
+    /// Search Everywhere › Files: (query, file found).
+    file: (&'static str, &'static str),
+    /// Go to Class: (name, file declaring it).
+    class: (&'static str, &'static str),
+    /// Go to Symbol: (name, file declaring it).
+    symbol: (&'static str, &'static str),
+    /// A file created while the project is open: (path, text declaring the class `FreshWidget`).
+    added: (&'static str, &'static str),
+}
+
+struct Opened {
+    host: Arc<Host>,
+    root: PathBuf,
+    _tmp: tempfile::TempDir,
+}
+
+fn copy_dir(from: &Path, to: &Path) {
+    std::fs::create_dir_all(to).unwrap();
+    for entry in std::fs::read_dir(from).unwrap().flatten() {
+        let (src, dst) = (entry.path(), to.join(entry.file_name()));
+        if entry.file_type().unwrap().is_dir() {
+            copy_dir(&src, &dst);
+        } else {
+            std::fs::copy(&src, &dst).unwrap();
+        }
+    }
+}
+
+async fn open(fixture: &str) -> Opened {
+    let tmp = tempfile::tempdir().unwrap();
+    let root = dunce::canonicalize(tmp.path()).unwrap().join(fixture);
+    copy_dir(&Path::new(env!("CARGO_MANIFEST_DIR")).join("../../fixtures").join(fixture), &root);
+    let app = tmp.path().join("app");
+    let host = Arc::new(Host::new(HostConfig {
+        config_dir: app.join("config"),
+        data_dir: app.join("data"),
+        local_data_dir: app.join("data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(|_| {})),
+        owner: |w| w,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    }));
+    host.trust.decide(&root, true, false).unwrap();
+    ops::project::open(&host, WINDOW, &root).await.unwrap();
+    Opened { host, root, _tmp: tmp }
+}
+
+/// Polls `check` until it holds; fails with its last answer.
+async fn until<T: std::fmt::Debug>(what: &str, timeout: Duration, mut check: impl FnMut() -> Result<(), T>) {
+    let deadline = Instant::now() + timeout;
+    loop {
+        match check() {
+            Ok(()) => return,
+            Err(last) if Instant::now() > deadline => panic!("{what}: timed out after {timeout:?}; last: {last:?}"),
+            Err(_) => tokio::time::sleep(Duration::from_millis(100)).await,
+        }
+    }
+}
+
+impl Opened {
+    fn files(&self, query: &str) -> Vec<String> {
+        let found = ops::nav::find_files(&self.host, WINDOW, query.into(), 20).unwrap();
+        found.into_iter().map(|f| f.rel_path).collect()
+    }
+
+    fn symbols(&self, query: &str, filter: SymbolFilter) -> Vec<(String, String)> {
+        let found = ops::nav::find_symbols(&self.host, WINDOW, query.into(), filter, 20).unwrap();
+        found.into_iter().map(|s| (s.name, s.rel_path)).collect()
+    }
+
+    fn has_symbol(&self, name: &str, file: &str, filter: SymbolFilter) -> Result<(), Vec<(String, String)>> {
+        let found = self.symbols(name, filter);
+        if found.iter().any(|(n, f)| n == name && f == file) { Ok(()) } else { Err(found) }
+    }
+}
+
+async fn smoke(f: Fixture) {
+    let p = open(f.dir).await;
+    until("indexing", Duration::from_secs(30), || {
+        let s = ops::nav::index_status(&p.host, WINDOW).unwrap();
+        if !s.indexing && s.files > 0 && s.symbols > 0 { Ok(()) } else { Err(s) }
+    })
+    .await;
+
+    let roots = ops::project::roots(&p.host, WINDOW).unwrap().roots;
+    for (path, kind) in f.roots {
+        assert!(
+            roots.iter().any(|r| r.path == *path && r.kind == *kind),
+            "{}: no {kind:?} root {path:?} in {roots:?}",
+            f.dir
+        );
+    }
+
+    let files = p.files(f.file.0);
+    assert!(files.iter().any(|r| r == f.file.1), "{}: files for {:?}: {files:?}", f.dir, f.file.0);
+    if let Err(found) = p.has_symbol(f.class.0, f.class.1, SymbolFilter::Types) {
+        panic!("{}: Go to Class {:?}: {found:?}", f.dir, f.class.0);
+    }
+    if let Err(found) = p.has_symbol(f.symbol.0, f.symbol.1, SymbolFilter::All) {
+        panic!("{}: Go to Symbol {:?}: {found:?}", f.dir, f.symbol.0);
+    }
+
+    // The index follows the file system while the project is open.
+    let (added, text) = f.added;
+    std::fs::write(p.root.join(added), text).unwrap();
+    until("a new file's class", Duration::from_secs(20), || p.has_symbol("FreshWidget", added, SymbolFilter::Types))
+        .await;
+    std::fs::remove_file(p.root.join(added)).unwrap();
+    until("a deleted file's class", Duration::from_secs(20), || {
+        let found = p.symbols("FreshWidget", SymbolFilter::Types);
+        if found.is_empty() { Ok(()) } else { Err(found) }
+    })
+    .await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn rust_app() {
+    smoke(Fixture {
+        dir: "rust-app",
+        roots: &[("src", RootKind::Source), ("tests", RootKind::Test)],
+        file: ("pars", "src/parser.rs"),
+        class: ("Inventory", "src/lib.rs"),
+        symbol: ("low_stock", "src/lib.rs"),
+        added: ("src/fresh.rs", "pub struct FreshWidget;\n"),
+    })
+    .await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn ts_app() {
+    smoke(Fixture {
+        dir: "ts-app",
+        roots: &[("src", RootKind::Source), ("tests", RootKind::Test)],
+        file: ("cart", "src/cart.ts"),
+        class: ("Cart", "src/cart.ts"),
+        symbol: ("formatMoney", "src/money.ts"),
+        added: ("src/fresh.ts", "export class FreshWidget {}\n"),
+    })
+    .await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn python_app() {
+    smoke(Fixture {
+        dir: "python-app",
+        roots: &[("src", RootKind::Source), ("tests", RootKind::Test)],
+        file: ("models", "src/tasks/models.py"),
+        class: ("TaskList", "src/tasks/models.py"),
+        symbol: ("build_demo", "src/tasks/cli.py"),
+        added: ("src/tasks/fresh.py", "class FreshWidget:\n    pass\n"),
+    })
+    .await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn go_app() {
+    smoke(Fixture {
+        dir: "go-app",
+        roots: &[("", RootKind::Source)],
+        file: ("store", "internal/store/store.go"),
+        class: ("Store", "internal/store/store.go"),
+        symbol: ("writeJSON", "cmd/server/main.go"),
+        added: ("internal/store/fresh.go", "package store\n\ntype FreshWidget struct{}\n"),
+    })
+    .await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn java_app() {
+    smoke(Fixture {
+        dir: "java-app",
+        roots: &[("src/main/java", RootKind::Source), ("src/test/java", RootKind::Test)],
+        file: ("OrderBook", "src/main/java/com/example/orders/OrderBook.java"),
+        class: ("OrderBook", "src/main/java/com/example/orders/OrderBook.java"),
+        symbol: ("revenueCents", "src/main/java/com/example/orders/OrderBook.java"),
+        added: (
+            "src/main/java/com/example/orders/FreshWidget.java",
+            "package com.example.orders;\n\npublic class FreshWidget {}\n",
+        ),
+    })
+    .await;
+    let p = open("java-app").await;
+    let model = ops::build::build_model(&p.host, WINDOW).await.unwrap();
+    let maven = model.maven.expect("a Maven model");
+    assert_eq!(maven.projects.iter().map(|m| m.artifact_id.as_str()).collect::<Vec<_>>(), ["openidea-fixture-orders"]);
+    assert!(maven.projects[0].dependencies.iter().any(|d| d.artifact_id == "junit-jupiter"), "{maven:?}");
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn kotlin_gradle() {
+    smoke(Fixture {
+        dir: "kotlin-gradle",
+        roots: &[("src/main/kotlin", RootKind::Source), ("src/test/kotlin", RootKind::Test)],
+        file: ("Library", "src/main/kotlin/com/example/library/Library.kt"),
+        class: ("Library", "src/main/kotlin/com/example/library/Library.kt"),
+        symbol: ("giveBack", "src/main/kotlin/com/example/library/Library.kt"),
+        added: ("src/main/kotlin/com/example/library/Fresh.kt", "package com.example.library\n\nclass FreshWidget\n"),
+    })
+    .await;
+    let p = open("kotlin-gradle").await;
+    let model = ops::build::build_model(&p.host, WINDOW).await.unwrap();
+    assert_eq!(model.gradle.len(), 1, "one independent Gradle build");
+    let gradle = &model.gradle[0];
+    assert_eq!(gradle.projects.iter().map(|g| g.name.as_str()).collect::<Vec<_>>(), ["openidea-fixture-library"]);
+}
+
+/// Maven / Gradle sync (Reload in the build tool window): the build's own model.
+async fn sync(fixture: &str, tool: ide_build::BuildTool) -> ide_build::BuildModel {
+    let p = open(fixture).await;
+    let progress = ops::Channel::new(|_: ide_build::SyncProgress| {});
+    let model = ops::build::build_sync(&p.host, WINDOW, tool, ide_core::RequestId(1), false, vec![], None, progress)
+        .await
+        .unwrap();
+    // The cached sync is what the next open shows.
+    let reloaded = ops::build::build_model(&p.host, WINDOW).await.unwrap();
+    assert_eq!(reloaded, model);
+    model
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "project smoke: needs Maven and a JDK"]
+async fn maven_sync() {
+    let maven = sync("java-app", ide_build::BuildTool::Maven).await.maven.unwrap();
+    assert_eq!(maven.sync_error, None);
+    assert!(maven.synced_at.is_some());
+    let junit = maven.projects[0].dependencies.iter().find(|d| d.artifact_id == "junit-jupiter").unwrap();
+    // The resolved tree, not only the declaration.
+    assert!(!junit.children.is_empty(), "{junit:?}");
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "project smoke: needs Gradle and a JDK"]
+async fn gradle_sync() {
+    let model = sync("kotlin-gradle", ide_build::BuildTool::Gradle).await;
+    assert_eq!(model.gradle.len(), 1, "one independent Gradle build");
+    let gradle = &model.gradle[0];
+    assert_eq!(gradle.sync_error, None);
+    assert!(gradle.synced_at.is_some());
+    let tasks: Vec<&str> = gradle.projects[0].tasks.iter().map(|t| t.name.as_str()).collect();
+    // The build's own tasks: the application and Kotlin plugins' too.
+    for task in ["run", "compileKotlin", "test"] {
+        assert!(tasks.contains(&task), "no {task} in {tasks:?}");
+    }
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "project smoke: needs python3"]
+async fn python_venv() {
+    let p = open("python-app").await;
+    let made = std::process::Command::new("python3").args(["-m", "venv", ".venv"]).current_dir(&p.root).status();
+    assert!(made.unwrap().success());
+    // The project's virtualenv: listed first, and the interpreter the project uses.
+    let found = ops::sdk::sdk_detect(&p.host, WINDOW, ide_sdk::SdkKind::Python).await.unwrap();
+    assert_eq!(found.first().map(|s| s.source.as_str()), Some("venv"), "{found:?}");
+    let effective = ops::sdk::sdk_python_effective(&p.host, WINDOW).unwrap().expect("an interpreter");
+    assert!(effective.starts_with(p.root.join(".venv")), "{effective:?}");
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[ignore = "project smoke: needs JDK 21"]
+async fn jdk() {
+    let p = open("java-app").await;
+    let found = ops::sdk::sdk_detect(&p.host, WINDOW, ide_sdk::SdkKind::Jdk).await.unwrap();
+    assert!(found.iter().any(|s| s.version.as_deref().is_some_and(|v| v.starts_with("21"))), "{found:?}");
+}
diff --git a/crates/ide-host/tests/proxy.rs b/crates/ide-host/tests/proxy.rs
index cf74d5dd..91fbb42d 100644
--- a/crates/ide-host/tests/proxy.rs
+++ b/crates/ide-host/tests/proxy.rs
@@ -43,6 +43,7 @@ fn walk(dir: &std::path::Path) -> Vec<std::path::PathBuf> {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn manual_proxy_applies_and_the_password_is_saved_apart() {
+    ide_ssh::secrets::testing::use_memory_store();
     let tmp = tempfile::tempdir().unwrap();
     let host = host(tmp.path());
     assert_eq!(proxy().mode, ProxyMode::Auto);
@@ -61,7 +62,7 @@ async fn manual_proxy_applies_and_the_password_is_saved_apart() {
 
     assert!(!settings_files(tmp.path()).contains("s3cret"), "no password in settings.toml");
     let saved = std::fs::read_to_string(tmp.path().join("data/proxy-password.json")).unwrap();
-    assert!(saved.contains("s3cret"));
+    assert!(!saved.contains("s3cret"), "the password is in the credential store, not on disk: {saved}");
     assert_eq!(ops::project::settings(&host, "main").proxy.password, "s3cret");
 
     // A whole-table write keeps the password out of the file too; an empty one forgets it.
diff --git a/crates/ide-host/tests/rpc.rs b/crates/ide-host/tests/rpc.rs
index fa055108..6e546095 100644
--- a/crates/ide-host/tests/rpc.rs
+++ b/crates/ide-host/tests/rpc.rs
@@ -228,7 +228,9 @@ async fn serves_projects_files_documents_search_and_runs() {
     // Real project-host ignore writes travel through the remote command dispatcher.
     assert!(Dispatcher::standard().commands().contains(&"vcs_add_to_ignore"));
     let ignore_root = dunce::canonicalize(&project).unwrap();
-    for (name, destination) in [("shared.tmp", "gitignore"), ("private.tmp", "localExclude")] {
+    // Not `.tmp`: a machine's global excludes file (often `*.tmp`) already
+    // ignores those, so the backend never writes the entry anywhere.
+    for (name, destination) in [("shared.ignore-me", "gitignore"), ("private.ignore-me", "localExclude")] {
         let path = ignore_root.join(name);
         std::fs::write(&path, "temporary").unwrap();
         invoke(&peer, "vcs_add_to_ignore", json!({ "paths": [path], "destination": destination })).await.unwrap();
@@ -237,9 +239,9 @@ async fn serves_projects_files_documents_search_and_runs() {
         assert_eq!(entry["ignored"], true);
         assert_eq!(entry["excluded"], false);
     }
-    assert!(std::fs::read_to_string(project.join(".gitignore")).unwrap().contains("/shared.tmp"));
-    assert!(std::fs::read_to_string(project.join(".git/info/exclude")).unwrap().contains("/private.tmp"));
-    let outside = tmp.path().join("outside.tmp");
+    assert!(std::fs::read_to_string(project.join(".gitignore")).unwrap().contains("/shared.ignore-me"));
+    assert!(std::fs::read_to_string(project.join(".git/info/exclude")).unwrap().contains("/private.ignore-me"));
+    let outside = tmp.path().join("outside.ignore-me");
     std::fs::write(&outside, "keep").unwrap();
     assert!(
         invoke(&peer, "vcs_add_to_ignore", json!({ "paths": [outside], "destination": "gitignore" })).await.is_err()
diff --git a/crates/ide-host/tests/run_configs.rs b/crates/ide-host/tests/run_configs.rs
index c45bccda..dbec2bc7 100644
--- a/crates/ide-host/tests/run_configs.rs
+++ b/crates/ide-host/tests/run_configs.rs
@@ -141,3 +141,19 @@ async fn workspace_cmake_before_launch_tasks_resolve_in_the_member() {
         assert!(configs.iter().any(|c| c.id == task.target && c.cwd == build.cwd));
     }
 }
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn gradle_init_scripts_are_written_by_the_host_that_runs_the_build() {
+    let tmp = tempfile::tempdir().unwrap();
+    let host = host(tmp.path());
+    let text = "allprojects { }\n".to_string();
+    let path =
+        ops::run::run_gradle_init_script(&host, "main", "openidea-gradle-tests".into(), text.clone()).await.unwrap();
+    assert!(path.contains("openidea-gradle-tests-"), "{path}");
+    assert_eq!(std::fs::read_to_string(&path).unwrap(), text);
+    let again = ops::run::run_gradle_init_script(&host, "main", "openidea-gradle-tests".into(), text).await.unwrap();
+    assert_eq!(again, path);
+    // A name is not a path.
+    let escaped = ops::run::run_gradle_init_script(&host, "main", "../escape".into(), String::new()).await;
+    assert!(escaped.is_err(), "{escaped:?}");
+}
diff --git a/crates/ide-host/tests/trust.rs b/crates/ide-host/tests/trust.rs
index eb2868ad..b50d5abc 100644
--- a/crates/ide-host/tests/trust.rs
+++ b/crates/ide-host/tests/trust.rs
@@ -58,6 +58,11 @@ async fn application_commands_work_in_restricted_projects_and_without_a_project(
         "vcs_write_patch",
         "remote_bootstrap_list",
         "deploy_test_connection",
+        "plugin_market",
+        "plugin_market_url",
+        "plugin_set_market_url",
+        "plugin_market_download",
+        "plugin_preview_install",
     ] {
         assert!(ide_host::trust::restricted_command_allowed(command), "{command}");
         for window in ["main", "welcome"] {
@@ -72,8 +77,6 @@ async fn application_commands_work_in_restricted_projects_and_without_a_project(
         "tools_list",
         "tools_install",
         "tools_uninstall",
-        "plugin_install_dir",
-        "plugin_reload",
         "vcs_git_version",
         "docker_compose_op",
         "db_execute",
@@ -93,6 +96,12 @@ async fn application_commands_work_in_restricted_projects_and_without_a_project(
             assert!(host.authorize_command(window, command).is_err(), "{window}: {command}");
         }
     }
+    // Plugin installs run plugin code: from the welcome screen, but not in an untrusted project.
+    for command in ["plugin_install_dir", "plugin_uninstall", "plugin_set_enabled", "plugin_reload"] {
+        assert!(!ide_host::trust::restricted_command_allowed(command), "{command}");
+        assert!(host.authorize_command("main", command).is_err(), "{command}");
+        assert!(host.authorize_command("welcome", command).is_ok(), "{command}");
+    }
     // These requests validate the vendor before any network access, independently of project trust.
     for window in ["main", "welcome"] {
         let error = ide_host::ops::tools::jdk_download_releases(
@@ -240,6 +249,7 @@ async fn malicious_project_stays_editable_then_starts_in_place_after_trust() {
             ide_core::RequestId(472),
             false,
             vec![],
+            None,
             ops::Channel::new(|_| {}),
         )
     };
diff --git a/crates/ide-host/tests/unity.rs b/crates/ide-host/tests/unity.rs
new file mode 100644
index 00000000..f38fdbdd
--- /dev/null
+++ b/crates/ide-host/tests/unity.rs
@@ -0,0 +1,100 @@
+use ide_core::{NullSink, RequestId};
+use ide_host::{Host, HostConfig, ops};
+use std::{sync::Arc, time::Duration};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn opens_unity_without_generated_solutions_and_excludes_caches_from_the_index() {
+    let temp = tempfile::tempdir().unwrap();
+    let base = dunce::canonicalize(temp.path()).unwrap();
+    let root = base.join("Game");
+    for name in ["Assets/Scripts", "Packages", "ProjectSettings", "Library/PackageCache", "Temp", "Logs"] {
+        std::fs::create_dir_all(root.join(name)).unwrap();
+    }
+    std::fs::write(root.join("ProjectSettings/ProjectVersion.txt"), "m_EditorVersion: 6000.0.62f1\n").unwrap();
+    std::fs::write(root.join("Assets/Scripts/Player.cs"), "class Player {}\n").unwrap();
+    std::fs::write(root.join("Packages/manifest.json"), "{}\n").unwrap();
+    std::fs::write(root.join("Library/PackageCache/Cached.cs"), "class Cached {}\n").unwrap();
+    std::fs::write(root.join("Temp/Temporary.cs"), "class Temporary {}\n").unwrap();
+    std::fs::write(root.join("Logs/Editor.log"), "log\n").unwrap();
+    let host = Host::new(HostConfig {
+        config_dir: base.join("config"),
+        data_dir: base.join("data"),
+        local_data_dir: base.join("data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(NullSink)),
+        owner: |w| w,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    });
+    let project = host.open_project("main", &root).unwrap();
+    let info = ops::project::info(&project);
+    assert_eq!(info.name, "Game");
+    let unity = info.unity.unwrap();
+    assert_eq!(unity.editor_version.as_deref(), Some("6000.0.62f1"));
+    assert!(unity.projects.is_empty() && unity.solutions.is_empty());
+    assert!(project.index.wait_idle(Duration::from_secs(20)));
+    assert_eq!(project.index.find_files("Player.cs", 100).len(), 1);
+    for name in ["Cached.cs", "Temporary.cs", "Editor.log"] {
+        assert!(project.index.find_files(name, 100).is_empty(), "indexed generated file {name}");
+    }
+    let hits = Arc::new(std::sync::Mutex::new(Vec::new()));
+    let out = hits.clone();
+    let query = serde_json::from_value(serde_json::json!({
+        "pattern": "class", "isRegex": false, "caseSensitive": false, "wholeWord": false,
+        "include": [], "exclude": [], "scope": { "kind": "project" }, "maxMatches": 100,
+    }))
+    .unwrap();
+    ops::search::start(
+        &host,
+        "main",
+        RequestId::next(),
+        query,
+        Arc::new(move |event| {
+            if let ops::search::SearchEvent::File { file } = event {
+                out.lock().unwrap().push(file.rel_path);
+            }
+        }),
+    )
+    .await
+    .unwrap();
+    assert_eq!(*hits.lock().unwrap(), ["Assets/Scripts/Player.cs"]);
+    let listing = ops::fs::read_dir(&host, "main", root.clone()).await.unwrap();
+    assert!(listing.iter().any(|e| e.name == "Library" && e.excluded));
+    assert!(project.exclude_globs().contains(&"/Obj".to_owned()));
+
+    // Project metadata refreshes without reopening when Unity generates its solution.
+    std::fs::write(root.join("Game.sln"), "").unwrap();
+    std::fs::write(root.join("Assembly-CSharp.csproj"), "").unwrap();
+    let unity = ops::project::info(&project).unity.unwrap();
+    assert_eq!(unity.solutions, ["Game.sln"]);
+    assert_eq!(unity.projects, ["Assembly-CSharp.csproj"]);
+
+    // Desktop commands and remote RPC share these host operations.
+    let original = root.join("Assets/Scripts/Player.cs");
+    let renamed = root.join("Assets/Scripts/Hero.cs");
+    let copied = root.join("Assets/Scripts/HeroCopy.cs");
+    let meta = |path: &std::path::Path| -> std::path::PathBuf {
+        let mut name = path.as_os_str().to_os_string();
+        name.push(".meta");
+        name.into()
+    };
+    let original_metadata = "fileFormatVersion: 2\nguid: 11111111111111111111111111111111\n";
+    std::fs::write(meta(&original), original_metadata).unwrap();
+    ops::fs::rename(&host, original.clone(), renamed.clone()).await.unwrap();
+    assert!(!original.exists() && !meta(&original).exists());
+    assert_eq!(std::fs::read_to_string(meta(&renamed)).unwrap(), original_metadata);
+    ops::fs::copy(&host, renamed.clone(), copied.clone()).await.unwrap();
+    assert!(copied.exists());
+    assert_ne!(std::fs::read_to_string(meta(&copied)).unwrap(), original_metadata);
+    assert_eq!(std::fs::read_to_string(meta(&renamed)).unwrap(), original_metadata);
+    host.close_project("main");
+
+    let ordinary = base.join("ConsoleApp");
+    std::fs::create_dir(&ordinary).unwrap();
+    std::fs::write(ordinary.join("App.csproj"), "").unwrap();
+    let project = host.open_project("main", &ordinary).unwrap();
+    assert!(ops::project::info(&project).unity.is_none());
+    assert!(!project.exclude_globs().contains(&"/Library".to_owned()));
+    host.close_project("main");
+}
diff --git a/crates/ide-host/tests/vcs_flow.rs b/crates/ide-host/tests/vcs_flow.rs
new file mode 100644
index 00000000..031b628d
--- /dev/null
+++ b/crates/ide-host/tests/vcs_flow.rs
@@ -0,0 +1,209 @@
+//! A day with Git on a `fixtures/` project, through the `ops` the app's commands call: an edit
+//! marked in the gutter, Local Changes and its diff, a commit in the log, a branch, a stash, and
+//! a merge that conflicts, resolved and committed. Open documents follow every step.
+
+use ide_core::DocId;
+use ide_host::{Host, HostConfig, ops};
+use ide_vcs::{ChangeKind, CommitOptions, FileStatus, HunkKind, LogQuery};
+use std::path::{Path, PathBuf};
+use std::process::Command;
+use std::sync::Arc;
+use std::time::Duration;
+
+const WINDOW: &str = "main";
+/// The line every branch changes, in `src/lib.rs`.
+const LINE: &str = "pub fn format_price(cents: u64) -> String {";
+
+fn git(root: &Path, args: &[&str]) -> String {
+    let out = Command::new("git").current_dir(root).args(args).output().unwrap();
+    assert!(out.status.success(), "git {args:?}: {}", String::from_utf8_lossy(&out.stderr));
+    String::from_utf8(out.stdout).unwrap()
+}
+
+fn copy_dir(from: &Path, to: &Path) {
+    std::fs::create_dir_all(to).unwrap();
+    for entry in std::fs::read_dir(from).unwrap().flatten() {
+        let (src, dst) = (entry.path(), to.join(entry.file_name()));
+        if entry.file_type().unwrap().is_dir() {
+            copy_dir(&src, &dst);
+        } else {
+            std::fs::copy(&src, &dst).unwrap();
+        }
+    }
+}
+
+struct Flow {
+    host: Arc<Host>,
+    root: PathBuf,
+    _tmp: tempfile::TempDir,
+}
+
+impl Flow {
+    async fn new(fixture: &str) -> Self {
+        let tmp = tempfile::tempdir().unwrap();
+        let base = dunce::canonicalize(tmp.path()).unwrap();
+        let root = base.join(fixture);
+        copy_dir(&Path::new(env!("CARGO_MANIFEST_DIR")).join("../../fixtures").join(fixture), &root);
+        git(&root, &["init", "-q", "-b", "main"]);
+        for (key, value) in [
+            ("user.name", "Test"),
+            ("user.email", "test@example.com"),
+            ("commit.gpgsign", "false"),
+            ("core.autocrlf", "false"),
+        ] {
+            git(&root, &["config", key, value]);
+        }
+        git(&root, &["add", "-A"]);
+        git(&root, &["commit", "-q", "-m", "Initial commit"]);
+        let host = Arc::new(Host::new(HostConfig {
+            config_dir: base.join("config"),
+            data_dir: base.join("data"),
+            local_data_dir: base.join("data"),
+            languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+            syntax: Arc::default(),
+            sink_for: Box::new(|_| Arc::new(|_| {})),
+            owner: |w| w,
+            runtime: tokio::runtime::Handle::current(),
+            project_environment: false,
+        }));
+        host.trust.decide(&root, true, false).unwrap();
+        let project = ops::project::open(&host, WINDOW, &root).await.unwrap();
+        for _ in 0..500 {
+            if !project.repos().is_empty() {
+                break;
+            }
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+        Flow { host, root, _tmp: tmp }
+    }
+
+    async fn open(&self, file: &str) -> DocId {
+        ops::doc::open(&self.host, WINDOW, self.root.join(file)).await.unwrap().id
+    }
+
+    async fn text(&self, doc: DocId) -> String {
+        ops::doc::snapshot(&self.host, WINDOW, doc).await.unwrap().text
+    }
+
+    /// Types `with` over `LINE` in the editor (unsaved).
+    async fn edit_line(&self, doc: DocId, with: &str) {
+        let text = self.text(doc).await;
+        let current = text.lines().find(|l| l.starts_with("pub fn format_price")).unwrap().to_owned();
+        let project = self.host.project(WINDOW).unwrap();
+        project.documents.replace_all(doc, &text.replacen(&current, with, 1)).unwrap();
+    }
+
+    async fn save(&self, doc: DocId) {
+        ops::doc::save(&self.host, WINDOW, doc).await.unwrap();
+    }
+
+    async fn status(&self) -> Vec<FileStatus> {
+        ops::vcs::status(&self.host, WINDOW).await.unwrap()
+    }
+
+    async fn commit(&self, files: &[&str], message: &str) -> String {
+        let paths = files.iter().map(|f| self.root.join(f)).collect();
+        ops::vcs::vcs_stage(&self.host, WINDOW, paths).await.unwrap();
+        let options = CommitOptions { run_hooks: true, ..Default::default() };
+        ops::vcs::vcs_commit(&self.host, WINDOW, None, message.into(), options).await.unwrap()
+    }
+
+    async fn head(&self) -> ide_vcs::Commit {
+        let log = ops::vcs::vcs_log(&self.host, WINDOW, None, LogQuery::default()).await.unwrap();
+        log.into_iter().next().expect("a commit")
+    }
+}
+
+fn changed<'a>(status: &'a [FileStatus], file: &str) -> Option<&'a FileStatus> {
+    status.iter().find(|s| s.rel_path == file)
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn change_commit_branch_stash_and_merge_a_conflict() {
+    let f = Flow::new("rust-app").await;
+    let lib_path = f.root.join("src/lib.rs");
+    let lib = f.open("src/lib.rs").await;
+    let original = f.text(lib).await;
+    let line = original.lines().position(|l| l == LINE).expect("the fixture's line") as u32;
+
+    // An edit in the editor: a modified line in the gutter, against HEAD, before saving.
+    let base = "pub fn format_price(cents: u64) -> String { // base";
+    f.edit_line(lib, base).await;
+    let hunks = ops::vcs::vcs_line_hunks(&f.host, WINDOW, lib_path.clone()).await.unwrap();
+    assert!(
+        matches!(&hunks[..], [h] if h.kind == HunkKind::Modified && h.start == line && h.old_text.contains(LINE)),
+        "{hunks:?}"
+    );
+    assert!(f.status().await.is_empty(), "nothing saved yet");
+
+    // Saved: Local Changes lists it, and its diff shows the edit.
+    f.save(lib).await;
+    let status = f.status().await;
+    assert_eq!(changed(&status, "src/lib.rs").and_then(|s| s.unstaged), Some(ChangeKind::Modified), "{status:?}");
+    let diff = ops::vcs::vcs_diff_text(&f.host, WINDOW, lib_path.clone(), false).await.unwrap();
+    assert!(diff.contains(&format!("-{LINE}")) && diff.contains(&format!("+{base}")), "{diff}");
+
+    // Commit: the log's head; nothing left to commit; no gutter marks.
+    let id = f.commit(&["src/lib.rs"], "Mark the base").await;
+    let head = f.head().await;
+    assert_eq!((head.id.as_str(), head.summary.as_str()), (id.as_str(), "Mark the base"));
+    assert!(f.status().await.is_empty());
+    assert!(ops::vcs::vcs_line_hunks(&f.host, WINDOW, lib_path.clone()).await.unwrap().is_empty());
+
+    // A branch changes the line its way.
+    ops::vcs::vcs_create_branch(&f.host, WINDOW, None, "feature".into(), None, true).await.unwrap();
+    let theirs = "pub fn format_price(cents: u64) -> String { // feature";
+    f.edit_line(lib, theirs).await;
+    f.save(lib).await;
+    f.commit(&["src/lib.rs"], "Feature's change").await;
+    let branches = ops::vcs::vcs_branches(&f.host, WINDOW, None).await.unwrap();
+    assert!(branches.iter().any(|b| b.name == "feature" && b.current), "{branches:?}");
+
+    // Back on main, the open file shows main's text.
+    ops::vcs::vcs_checkout(&f.host, WINDOW, None, "main".into(), false, None).await.unwrap();
+    assert!(f.text(lib).await.contains(base));
+
+    // Stash: work in progress put aside and brought back.
+    let main_rs = f.open("src/main.rs").await;
+    let wip = format!("{}// work in progress\n", f.text(main_rs).await);
+    f.host.project(WINDOW).unwrap().documents.replace_all(main_rs, &wip).unwrap();
+    f.save(main_rs).await;
+    ops::vcs::vcs_stash_push(&f.host, WINDOW, None, Some("wip".into()), false, false).await.unwrap();
+    assert!(f.status().await.is_empty());
+    assert!(!f.text(main_rs).await.contains("work in progress"));
+    let stashes = ops::vcs::vcs_stashes(&f.host, WINDOW, None).await.unwrap();
+    assert!(matches!(&stashes[..], [s] if s.message.contains("wip")), "{stashes:?}");
+    ops::vcs::vcs_stash_apply(&f.host, WINDOW, None, 0, true, false, None).await.unwrap();
+    assert_eq!(f.text(main_rs).await, wip);
+    assert!(ops::vcs::vcs_stashes(&f.host, WINDOW, None).await.unwrap().is_empty());
+    ops::vcs::vcs_discard(&f.host, WINDOW, vec![f.root.join("src/main.rs")]).await.unwrap();
+    assert!(f.status().await.is_empty());
+
+    // Main changes the same line: merging the branch conflicts.
+    let ours = "pub fn format_price(cents: u64) -> String { // main";
+    f.edit_line(lib, ours).await;
+    f.save(lib).await;
+    f.commit(&["src/lib.rs"], "Main's change").await;
+    let merged = ops::vcs::vcs_merge(&f.host, WINDOW, None, "feature".into()).await;
+    let status = f.status().await;
+    let conflicted = changed(&status, "src/lib.rs").map(|s| (s.staged, s.unstaged));
+    assert!(
+        matches!(conflicted, Some((Some(ChangeKind::Conflicted), _) | (_, Some(ChangeKind::Conflicted)))),
+        "merge: {merged:?}; status: {status:?}"
+    );
+    // The open file shows the conflict as Git left it.
+    assert!(f.text(lib).await.contains("<<<<<<<"), "{}", f.text(lib).await);
+    let versions = ops::vcs::vcs_conflict_versions(&f.host, WINDOW, lib_path.clone()).await.unwrap();
+    let has = |side: &Option<String>, line: &str| side.as_deref().is_some_and(|t| t.contains(line));
+    assert!(has(&versions.base, base) && has(&versions.ours, ours) && has(&versions.theirs, theirs), "{versions:?}");
+
+    // Resolved (Accept Theirs) and committed: a merge commit, nothing left.
+    let resolved = versions.theirs.clone().unwrap();
+    f.host.project(WINDOW).unwrap().documents.replace_all(lib, &resolved).unwrap();
+    f.save(lib).await;
+    f.commit(&["src/lib.rs"], "Merge feature").await;
+    let head = f.head().await;
+    assert_eq!(head.parents.len(), 2, "{head:?}");
+    assert!(f.status().await.is_empty());
+    assert_eq!(std::fs::read_to_string(&lib_path).unwrap(), resolved);
+}
diff --git a/crates/ide-host/tests/workspace_edits.rs b/crates/ide-host/tests/workspace_edits.rs
index 7bdc5c57..2994603d 100644
--- a/crates/ide-host/tests/workspace_edits.rs
+++ b/crates/ide-host/tests/workspace_edits.rs
@@ -175,3 +175,66 @@ async fn contended_version_reads_do_not_block_the_async_worker() {
         assert!(watchdog.join().unwrap(), "request {request_kind} blocked the only async worker");
     }
 }
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn code_actions_skip_a_command_no_server_provides_after_their_edit() {
+    use ide_lsp::types::{CodeAction, Command};
+    let tmp = tempfile::tempdir().unwrap();
+    let file = tmp.path().join("imports.txt");
+    std::fs::write(&file, "unused\nused\n").unwrap();
+    let host = Host::new(HostConfig {
+        config_dir: tmp.path().join("config"),
+        data_dir: tmp.path().join("data"),
+        local_data_dir: tmp.path().join("local-data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(|_| {})),
+        owner: |window| window,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    });
+    host.open_light("main", &file).unwrap();
+    let info = ops::doc::open(&host, "main", file.clone()).await.unwrap();
+    // Optimize Imports as vtsls offers it: the edit, then a command its client runs itself.
+    let action = |edit: bool| CodeAction {
+        title: "Organize Imports".into(),
+        kind: Some("source.organizeImports".into()),
+        is_preferred: false,
+        disabled_reason: None,
+        edit: edit.then(|| {
+            serde_json::from_value(json!({ "files": [{ "kind": "edit", "path": file, "edits": [
+                { "range": { "start": { "line": 0, "col": 0 }, "end": { "line": 1, "col": 0 } }, "new_text": "" }
+            ] }] }))
+            .unwrap()
+        }),
+        command: Some(Command {
+            title: String::new(),
+            command: "_typescript.didOrganizeImports".into(),
+            arguments: vec![],
+        }),
+        data: None,
+        server: ide_core::ServerId(1),
+    };
+    let follow_up = action(true).command.unwrap();
+    let asked = ops::lsp::lsp_resolve_command(
+        &host,
+        "main",
+        ide_core::RequestId(1),
+        info.id,
+        ide_core::ServerId(1),
+        follow_up,
+        vec![],
+    )
+    .await;
+    assert!(matches!(asked, Ok(None)), "{asked:?}");
+    ops::lsp::lsp_execute_code_action(&host, "main", ide_core::RequestId(2), info.id, action(true), vec![])
+        .await
+        .unwrap();
+    assert_eq!(ops::doc::snapshot(&host, "main", info.id).await.unwrap().text, "used\n");
+    ops::lsp::lsp_apply_code_action(&host, "main", info.id, action(true)).await.unwrap();
+    assert_eq!(ops::doc::snapshot(&host, "main", info.id).await.unwrap().text, "");
+    // Without an edit the command is the action: it still can't run.
+    let ran =
+        ops::lsp::lsp_execute_code_action(&host, "main", ide_core::RequestId(3), info.id, action(false), vec![]).await;
+    assert!(ran.is_err(), "{ran:?}");
+}
diff --git a/crates/ide-host/tests/workspaces.rs b/crates/ide-host/tests/workspaces.rs
index cfa22542..1b86eeca 100644
--- a/crates/ide-host/tests/workspaces.rs
+++ b/crates/ide-host/tests/workspaces.rs
@@ -114,3 +114,54 @@ async fn linked_projects_share_navigation_but_keep_files_repositories_and_run_di
     assert_eq!(automatic.index.find_files("same.txt", 100).len(), 1);
     host.close_project("main");
 }
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn php_language_level_follows_the_member_of_the_file() {
+    use ide_sdk::php::{PhpLanguageLevel, PhpLevelSource};
+    let temp = tempfile::tempdir().unwrap();
+    let base = dunce::canonicalize(temp.path()).unwrap();
+    let (api, legacy) = (base.join("api"), base.join("legacy"));
+    for (member, composer) in [
+        (&api, r#"{"require": {"php": "^7.4"}}"#),
+        (&legacy, r#"{"require": {"php": "^7.4"}, "config": {"platform": {"php": "8.0.5"}}}"#),
+    ] {
+        std::fs::create_dir(member).unwrap();
+        std::fs::write(member.join("composer.json"), composer).unwrap();
+    }
+    let root = base.join("workspace");
+    Workspace::save(&root, "PHP", vec![api.clone(), legacy.clone()], true).unwrap();
+    std::fs::write(root.join("composer.json"), r#"{"require": {"php": "^8.2"}}"#).unwrap();
+    let config_dir = base.join("config");
+    ide_workspace::SettingsStore::load(&config_dir, Some(&legacy))
+        .set(ide_workspace::SettingsScope::Project, "languages.php.languageLevel", "8.3".into())
+        .unwrap();
+    let host = Host::new(HostConfig {
+        config_dir,
+        data_dir: base.join("data"),
+        local_data_dir: base.join("data"),
+        languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+        syntax: Arc::default(),
+        sink_for: Box::new(|_| Arc::new(NullSink)),
+        owner: |w| w,
+        runtime: tokio::runtime::Handle::current(),
+        project_environment: false,
+    });
+    host.trust.decide(&root, true, false).unwrap();
+    host.open_project("main", &root).unwrap();
+    let found = |version: &str, source| Some(PhpLanguageLevel { version: version.into(), source });
+    let level = async |path: std::path::PathBuf| ops::sdk::sdk_php_language_level(&host, "main", path).await.unwrap();
+
+    let level_of_api = level(api.join("src/Invoice.php")).await;
+    assert_eq!(level_of_api.effective, found("7.4.0", PhpLevelSource::Require));
+    assert_eq!(level_of_api.auto, level_of_api.effective);
+    assert_eq!(level_of_api.member.as_deref(), Some(api.as_path()));
+    // The member's own settings, not the workspace's.
+    let level_of_legacy = level(legacy.join("index.php")).await;
+    assert_eq!(level_of_legacy.effective, found("8.3.0", PhpLevelSource::Settings));
+    assert_eq!(level_of_legacy.auto, found("8.0.5", PhpLevelSource::Platform));
+    // Outside every member: the workspace's own.
+    let level_elsewhere = level(base.join("elsewhere.php")).await;
+    assert_eq!(level_elsewhere.effective, found("8.2.0", PhpLevelSource::Require));
+    assert_eq!(level_elsewhere.member, None);
+    host.close_project("main");
+}
diff --git a/crates/ide-index/benches/index.rs b/crates/ide-index/benches/index.rs
index d888e2c4..efe17337 100644
--- a/crates/ide-index/benches/index.rs
+++ b/crates/ide-index/benches/index.rs
@@ -14,6 +14,9 @@ fn bench(c: &mut Criterion) {
     for q in ["ordcon", "src/user", "PaymentService", "zzzz", "a"] {
         g.bench_function(format!("find_files/{q}"), |b| b.iter(|| black_box(index.find_files(q, 50).len())));
     }
+    for q in ["util", "src/ui", "a"] {
+        g.bench_function(format!("find_dirs/{q}"), |b| b.iter(|| black_box(index.find_dirs(q, 50).len())));
+    }
     for q in ["OCo", "invoiceRepo", "renderView", "q"] {
         g.bench_function(format!("find_symbols/{q}"), |b| {
             b.iter(|| black_box(index.find_symbols(q, SymbolFilter::All, 50).len()))
diff --git a/crates/ide-index/src/data.rs b/crates/ide-index/src/data.rs
index 59115430..1bda8c24 100644
--- a/crates/ide-index/src/data.rs
+++ b/crates/ide-index/src/data.rs
@@ -40,6 +40,8 @@ pub(crate) struct FileRecord {
     pub size: u64,
     pub hash: [u8; 32],
     pub symbols: Vec<StoredSymbol>,
+    /// Matched by an ignore file: listed by name only (no hash, no symbols).
+    pub ignored: bool,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -72,6 +74,7 @@ pub(crate) struct FileEntry {
     pub size: u64,
     pub hash: [u8; 32],
     pub symbols: Box<[Sym]>,
+    pub ignored: bool,
 }
 
 impl FileEntry {
@@ -100,6 +103,7 @@ impl FileEntry {
             size: record.size,
             hash: record.hash,
             symbols,
+            ignored: record.ignored,
         }
     }
 
@@ -126,14 +130,23 @@ impl FileEntry {
                     range: s.range,
                 })
                 .collect(),
+            ignored: self.ignored,
         }
     }
+
+    /// Whether the entry is out of date for `found` on disk.
+    pub(crate) fn stale_for(&self, found: &crate::filter::Found) -> bool {
+        self.mtime != found.mtime || self.size != found.size || self.ignored != found.ignored
+    }
 }
 
 #[derive(Default)]
 pub(crate) struct IndexData {
     pub files: Vec<Option<FileEntry>>,
     by_path: HashMap<PathBuf, u32>,
+    /// Every folder holding an indexed file at any depth, keyed by its `rel` with a
+    /// trailing `/`: its absolute path and the number of files below it.
+    pub dirs: HashMap<Box<str>, (PathBuf, u32)>,
     free: Vec<u32>,
     pub file_count: u32,
     pub symbol_count: u32,
@@ -167,6 +180,11 @@ impl IndexData {
             }
         };
         let path = self.files[slot as usize].as_ref().map(|e| e.path.clone()).unwrap_or_default();
+        if let Some(e) = &self.files[slot as usize] {
+            for (rel, abs) in ancestors(e) {
+                self.dirs.entry(rel.into()).or_insert_with(|| (abs.to_owned(), 0)).1 += 1;
+            }
+        }
         self.by_path.insert(path, slot);
         self.file_count += 1;
         self.symbol_count += symbols;
@@ -176,6 +194,14 @@ impl IndexData {
         let slot = self.by_path.remove(path)?;
         let old = self.files[slot as usize].take()?;
         self.free.push(slot);
+        for (rel, _) in ancestors(&old) {
+            if let Some(d) = self.dirs.get_mut(rel) {
+                d.1 -= 1;
+                if d.1 == 0 {
+                    self.dirs.remove(rel);
+                }
+            }
+        }
         self.file_count -= 1;
         self.symbol_count -= old.symbols.len() as u32;
         Some(old)
@@ -197,6 +223,7 @@ impl IndexData {
         self.files.shrink_to_fit();
         self.free.shrink_to_fit();
         self.by_path.shrink_to_fit();
+        self.dirs.shrink_to_fit();
     }
 
     pub(crate) fn paths(&self) -> impl Iterator<Item = &PathBuf> {
@@ -204,6 +231,19 @@ impl IndexData {
     }
 }
 
+/// The folders holding `e` (`rel` with a trailing `/`, absolute path), innermost first.
+fn ancestors(e: &FileEntry) -> impl Iterator<Item = (&str, &Path)> {
+    let mut rel = e.dir();
+    let mut abs = e.path.parent();
+    std::iter::from_fn(move || {
+        let path = abs.filter(|_| !rel.is_empty())?;
+        let here = rel;
+        rel = rel[..rel.len() - 1].rfind('/').map_or("", |i| &rel[..=i]);
+        abs = path.parent();
+        Some((here, path))
+    })
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -223,6 +263,23 @@ mod tests {
         FileEntry::new(PathBuf::from("/r").join(path), path.to_owned(), record)
     }
 
+    #[test]
+    fn dirs_follow_inserts_and_removals() {
+        let mut d = IndexData::default();
+        d.insert(entry("a/b/c.rs", 0));
+        d.insert(entry("a/d.rs", 0));
+        d.insert(entry("a/d.rs", 0));
+        d.insert(entry("top.rs", 0));
+        let mut dirs: Vec<_> = d.dirs.iter().map(|(k, v)| (k.to_string(), v.1)).collect();
+        dirs.sort();
+        assert_eq!(dirs, [("a/".into(), 2), ("a/b/".into(), 1)]);
+        assert_eq!(d.dirs["a/b/"].0, PathBuf::from("/r/a/b"));
+        d.remove(Path::new("/r/a/b/c.rs"));
+        assert!(!d.dirs.contains_key("a/b/"));
+        d.remove_tree(Path::new("/r/a"));
+        assert!(d.dirs.is_empty());
+    }
+
     #[test]
     fn insert_replace_remove_keep_counts() {
         let mut d = IndexData::default();
diff --git a/crates/ide-index/src/filter.rs b/crates/ide-index/src/filter.rs
index b826df87..bae11d65 100644
--- a/crates/ide-index/src/filter.rs
+++ b/crates/ide-index/src/filter.rs
@@ -1,10 +1,16 @@
 //! Which paths belong in the index: `.gitignore`/`.ignore` rules (via the
 //! `ignore` crate) plus the user's `files.exclude` globs, below the project root
 //! and the extra content roots (Project Structure).
+//!
+//! Like IDEA, ignored directories are left out entirely, while ignored files in
+//! the remaining directories (`.env`) are listed by name only, so Go to File finds
+//! them but their symbols stay out of the index.
 
 use globset::{GlobBuilder, GlobSet, GlobSetBuilder};
 use ignore::gitignore::{Gitignore, GitignoreBuilder};
 use ignore::{WalkBuilder, WalkState};
+use std::collections::HashMap;
+use std::collections::hash_map::Entry;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc;
@@ -57,11 +63,25 @@ fn rel_string(rel: &Path) -> String {
     out
 }
 
+/// Whether `path` below `root` matches the exclude globs.
+fn glob_excluded(excludes: &GlobSet, root: &Path, path: &Path) -> bool {
+    match path.strip_prefix(root) {
+        Ok(rel) if !rel.as_os_str().is_empty() => {
+            let rel = rel.to_string_lossy();
+            let rel = if std::path::MAIN_SEPARATOR == '/' { rel } else { rel.replace('\\', "/").into() };
+            excludes.is_match(rel.as_ref())
+        }
+        _ => false,
+    }
+}
+
 #[derive(Clone, Debug)]
 pub(crate) struct Found {
     pub path: PathBuf,
     pub mtime: u64,
     pub size: u64,
+    /// Matched by an ignore file: listed by name only.
+    pub ignored: bool,
 }
 
 pub(crate) fn mtime_of(meta: &std::fs::Metadata) -> u64 {
@@ -177,8 +197,9 @@ impl PathFilter {
         ALWAYS_SKIP.contains(&name)
     }
 
-    /// Whether a path reported by the watcher should be ignored (outside the
-    /// root, inside an excluded/ignored directory, or ignored itself).
+    /// Whether a path reported by the watcher should be left out (outside the
+    /// root, excluded, or an ignored directory or inside one). Ignored files
+    /// elsewhere stay in, listed by name only.
     pub(crate) fn is_excluded(&self, path: &Path, is_dir: bool) -> bool {
         let Some((base, _, gitignore)) = self.base_of(path) else { return true };
         let rel = path.strip_prefix(base).map(rel_string).unwrap_or_default();
@@ -198,16 +219,27 @@ impl PathFilter {
                 return true;
             }
         }
-        gitignore.matched_path_or_any_parents(path, is_dir).is_ignore()
+        let dir = if is_dir { Some(path) } else { path.parent().filter(|p| *p != base) };
+        dir.is_some_and(|d| gitignore.matched_path_or_any_parents(d, true).is_ignore())
     }
 
     /// All indexable files at or below `dir`, walked in parallel.
     /// Stops early (returning what was found so far) once `cancel` is set.
     pub(crate) fn walk(&self, dir: &Path, cancel: &AtomicBool) -> Vec<Found> {
+        self.walk_to(dir, None, cancel)
+    }
+
+    /// The indexable files directly in `dir`, classified by the same rules as [`Self::walk`].
+    pub(crate) fn list_dir(&self, dir: &Path) -> Vec<Found> {
+        self.walk_to(dir, Some(1), &AtomicBool::new(false))
+    }
+
+    fn walk_to(&self, dir: &Path, max_depth: Option<usize>, cancel: &AtomicBool) -> Vec<Found> {
         let (tx, rx) = mpsc::channel::<Vec<Found>>();
         let Some((root, _, _)) = self.base_of(dir) else { return Vec::new() };
         let root = root.to_path_buf();
         let excludes = self.excludes.clone();
+        let (walk_root, walk_excludes) = (root.clone(), excludes.clone());
         let walker = WalkBuilder::new(dir)
             .hidden(false)
             .parents(true)
@@ -215,43 +247,65 @@ impl PathFilter {
             .git_ignore(true)
             .git_global(true)
             .git_exclude(true)
-            .require_git(false)
+            .require_git(ide_core::ignored::inside_git_repo(dir))
             .follow_links(false)
+            .max_depth(max_depth)
             .filter_entry(move |e| {
                 let name = e.file_name().to_string_lossy();
-                if Self::skip_name(&name) {
-                    return false;
-                }
-                match e.path().strip_prefix(&root) {
-                    Ok(rel) if !rel.as_os_str().is_empty() => {
-                        let rel = rel.to_string_lossy();
-                        let rel = if std::path::MAIN_SEPARATOR == '/' { rel } else { rel.replace('\\', "/").into() };
-                        !excludes.is_match(rel.as_ref())
-                    }
-                    _ => true,
-                }
+                !Self::skip_name(&name) && !glob_excluded(&walk_excludes, &walk_root, e.path())
             })
             .build_parallel();
         walker.run(|| {
+            let (root, excludes) = (&root, &excludes);
             let mut batch = Batch { tx: tx.clone(), items: Vec::with_capacity(256) };
             Box::new(move |entry| {
                 if cancel.load(Ordering::Relaxed) {
                     return WalkState::Quit;
                 }
                 let Ok(entry) = entry else { return WalkState::Continue };
-                if entry.file_type().is_some_and(|t| t.is_file())
+                let Some(file_type) = entry.file_type() else { return WalkState::Continue };
+                if file_type.is_dir() && max_depth.is_none_or(|max| entry.depth() < max) {
+                    // The walker drops ignored files unseen: list every file of a
+                    // walked directory; those the walker doesn't report are ignored.
+                    let Ok(children) = std::fs::read_dir(entry.path()) else { return WalkState::Continue };
+                    for child in children.flatten() {
+                        let path = child.path();
+                        if child.file_type().is_ok_and(|t| t.is_file())
+                            && !Self::skip_name(&child.file_name().to_string_lossy())
+                            && !glob_excluded(excludes, root, &path)
+                            && let Ok(meta) = child.metadata()
+                        {
+                            batch.items.push(Found { path, mtime: mtime_of(&meta), size: meta.len(), ignored: true });
+                        }
+                    }
+                } else if file_type.is_file()
                     && let Ok(meta) = entry.metadata()
                 {
-                    batch.items.push(Found { path: entry.into_path(), mtime: mtime_of(&meta), size: meta.len() });
-                    if batch.items.len() >= 256 && batch.tx.send(std::mem::take(&mut batch.items)).is_err() {
-                        return WalkState::Quit;
-                    }
+                    batch.items.push(Found {
+                        path: entry.into_path(),
+                        mtime: mtime_of(&meta),
+                        size: meta.len(),
+                        ignored: false,
+                    });
+                }
+                if batch.items.len() >= 256 && batch.tx.send(std::mem::take(&mut batch.items)).is_err() {
+                    return WalkState::Quit;
                 }
                 WalkState::Continue
             })
         });
         drop(tx);
-        rx.into_iter().flatten().collect()
+        // Each file comes once from its directory listing and, unless ignored, once from the walker.
+        let mut by_path: HashMap<PathBuf, Found> = HashMap::new();
+        for f in rx.into_iter().flatten() {
+            match by_path.entry(f.path.clone()) {
+                Entry::Occupied(mut e) => e.get_mut().ignored &= f.ignored,
+                Entry::Vacant(e) => {
+                    e.insert(f);
+                }
+            }
+        }
+        by_path.into_values().collect()
     }
 }
 
@@ -311,6 +365,103 @@ mod tests {
         assert!(!filter.is_excluded(&root.join("src/new.rs"), false));
     }
 
+    #[test]
+    fn ignored_files_are_listed_but_ignored_directories_are_not() {
+        let dir = tempfile::tempdir().unwrap();
+        let root = dunce::canonicalize(dir.path()).unwrap();
+        for f in [
+            ".env",
+            "src/a.rs",
+            "src/debug.log",
+            "src/local/secrets.json",
+            "pkg/.gitignore",
+            "pkg/gen.rs",
+            "pkg/keep.rs",
+            "build/out.rs",
+            "build/nested/deep.rs",
+            "logs/app.log",
+            "node_modules/x/.env",
+            "src/.DS_Store",
+            "src/.git",
+        ] {
+            touch(&root, f);
+        }
+        std::fs::write(
+            root.join(".gitignore"),
+            ".env
+*.log
+build/
+logs/
+src/local/
+",
+        )
+        .unwrap();
+        std::fs::write(
+            root.join("pkg/.gitignore"),
+            "gen.rs
+",
+        )
+        .unwrap();
+        let filter = PathFilter::new(&root, &vec![].into(), &["**/node_modules".into(), "**/.DS_Store".into()]);
+        let mut found: Vec<(String, bool)> = filter
+            .walk(&root, &AtomicBool::new(false))
+            .iter()
+            .filter_map(|f| Some((filter.rel(&f.path)?, f.ignored)))
+            .collect();
+        found.sort();
+        let expected = [
+            (".env", true),
+            (".gitignore", false),
+            ("pkg/.gitignore", false),
+            ("pkg/gen.rs", true),
+            ("pkg/keep.rs", false),
+            ("src/a.rs", false),
+            ("src/debug.log", true),
+        ];
+        assert_eq!(found, expected.map(|(p, i)| (p.to_owned(), i)));
+
+        // One directory at a time (watcher updates): same classification, no descent.
+        let mut listed: Vec<(String, bool)> =
+            filter.list_dir(&root.join("pkg")).iter().filter_map(|f| Some((filter.rel(&f.path)?, f.ignored))).collect();
+        listed.sort();
+        let expected = [("pkg/.gitignore", false), ("pkg/gen.rs", true), ("pkg/keep.rs", false)];
+        assert_eq!(listed, expected.map(|(p, i)| (p.to_owned(), i)));
+        let top: Vec<String> = filter.list_dir(&root).iter().filter_map(|f| filter.rel(&f.path)).collect();
+        assert!(top.iter().all(|p| !p.contains('/')), "{top:?}");
+
+        for (rel, excluded) in [
+            (".env", false),
+            ("src/new.log", false),
+            ("src/new.rs", false),
+            ("build/x.rs", true),
+            ("logs/app.log", true),
+            ("src/local/x.json", true),
+        ] {
+            assert_eq!(filter.is_excluded(&root.join(rel), false), excluded, "{rel}");
+        }
+        assert!(filter.is_excluded(&root.join("build"), true));
+        assert!(!filter.is_excluded(&root.join("src"), true));
+    }
+
+    #[test]
+    fn a_nested_repository_is_not_hidden_by_the_outer_repositorys_gitignore() {
+        let dir = tempfile::tempdir().unwrap();
+        let base = dunce::canonicalize(dir.path()).unwrap();
+        for f in ["projects/nested/src/a.rs", "projects/nested/out/x.rs"] {
+            touch(&base, f);
+        }
+        std::fs::create_dir(base.join(".git")).unwrap();
+        std::fs::create_dir(base.join("projects/nested/.git")).unwrap();
+        std::fs::write(base.join("projects/.gitignore"), "*\n!.gitignore\n").unwrap();
+        std::fs::write(base.join("projects/nested/.gitignore"), "out/\n").unwrap();
+        let root = base.join("projects/nested");
+        let filter = PathFilter::new(&root, &vec![].into(), &[]);
+        let mut found: Vec<String> =
+            filter.walk(&root, &AtomicBool::new(false)).iter().filter_map(|f| filter.rel(&f.path)).collect();
+        found.sort();
+        assert_eq!(found, [".gitignore", "src/a.rs"]);
+    }
+
     #[test]
     fn extra_content_roots_are_walked_and_prefixed() {
         let dir = tempfile::tempdir().unwrap();
diff --git a/crates/ide-index/src/lib.rs b/crates/ide-index/src/lib.rs
index 88923dec..711373fe 100644
--- a/crates/ide-index/src/lib.rs
+++ b/crates/ide-index/src/lib.rs
@@ -8,6 +8,7 @@ use ide_language::{LanguageRegistry, Syntax};
 use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
 use specta::Type;
+use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::atomic::Ordering;
@@ -64,6 +65,14 @@ pub struct IndexStatus {
     pub symbols: u32,
 }
 
+/// How many indexed files share an extension (lower case, without the dot).
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct ExtensionCount {
+    pub extension: String,
+    pub files: u32,
+}
+
 pub struct ProjectIndex {
     shared: Arc<Shared>,
     worker: Mutex<Option<JoinHandle<()>>>,
@@ -159,6 +168,27 @@ impl ProjectIndex {
         }
     }
 
+    /// The extensions of the indexed files, most common first: the project's file
+    /// types, for suggestions such as Find in Files' file masks. Dotfiles
+    /// (`.gitignore`) have no extension.
+    pub fn file_extensions(&self) -> Vec<ExtensionCount> {
+        let d = self.shared.data.read();
+        let mut counts: HashMap<String, u32> = HashMap::new();
+        for file in d.files.iter().flatten() {
+            let name = &file.rel[file.name_start as usize..];
+            if let Some((stem, extension)) = name.rsplit_once('.')
+                && !stem.is_empty()
+                && !extension.is_empty()
+            {
+                *counts.entry(extension.to_ascii_lowercase()).or_default() += 1;
+            }
+        }
+        let mut out: Vec<ExtensionCount> =
+            counts.into_iter().map(|(extension, files)| ExtensionCount { extension, files }).collect();
+        out.sort_by(|a, b| b.files.cmp(&a.files).then_with(|| a.extension.cmp(&b.extension)));
+        out
+    }
+
     /// Fuzzy file search. IDEA-like ranking: file-name matches beat directory
     /// matches; `/` in the query matches path segments; recently opened files boost.
     pub fn find_files(&self, query: &str, limit: usize) -> Vec<FileMatch> {
@@ -167,6 +197,11 @@ impl ProjectIndex {
         matching::find_files(&d, &matching::Recents { paths: &recent }, query, limit)
     }
 
+    /// Fuzzy search for folders that hold indexed files; `rel_path` ends in `/`.
+    pub fn find_dirs(&self, query: &str, limit: usize) -> Vec<FileMatch> {
+        matching::find_dirs(&self.shared.data.read(), query, limit)
+    }
+
     /// Fuzzy symbol search; CamelHump aware (`OCo` → `OrderController`).
     pub fn find_symbols(&self, query: &str, filter: SymbolFilter, limit: usize) -> Vec<SymbolMatch> {
         let recent = self.shared.recent.lock().clone();
@@ -366,6 +401,10 @@ pub mod bench_support {
             matching::find_files(&self.data, &matching::Recents { paths: &self.recent }, query, limit)
         }
 
+        pub fn find_dirs(&self, query: &str, limit: usize) -> Vec<FileMatch> {
+            matching::find_dirs(&self.data, query, limit)
+        }
+
         pub fn find_symbols(&self, query: &str, filter: SymbolFilter, limit: usize) -> Vec<SymbolMatch> {
             matching::find_symbols(&self.data, &matching::Recents { paths: &self.recent }, query, filter, limit)
         }
diff --git a/crates/ide-index/src/matching.rs b/crates/ide-index/src/matching.rs
index bea3f3c5..dcb9b383 100644
--- a/crates/ide-index/src/matching.rs
+++ b/crates/ide-index/src/matching.rs
@@ -12,7 +12,7 @@ use nucleo_matcher::{Config, Matcher, Utf32Str, Utf32String};
 use rayon::prelude::*;
 use std::cell::RefCell;
 use std::cmp::Ordering;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 const TIER_NAME: u32 = 1 << 20;
 const EXACT: u32 = 4000;
@@ -251,6 +251,76 @@ pub(crate) fn find_files(data: &IndexData, recents: &Recents, query: &str, limit
         .collect()
 }
 
+/// Fuzzy folder search over the folders holding indexed files: folder-name matches beat
+/// path matches; `/` in the query matches the whole path. `rel_path` ends in `/`.
+pub(crate) fn find_dirs(data: &IndexData, query: &str, limit: usize) -> Vec<FileMatch> {
+    let q = normalize_file_query(query);
+    if limit == 0 || q.is_empty() {
+        return Vec::new();
+    }
+    let by_path = q.contains('/');
+    let needle = Needle::new(q.trim_end_matches('/'));
+    // (score, rel without the trailing `/`, char offset of the name when it matched by name)
+    let score = |m: &mut Matcher, buf: &mut Vec<char>, rel: &str| -> Option<(u32, Option<u32>)> {
+        let trimmed = &rel[..rel.len() - 1];
+        let start = trimmed.rfind('/').map_or(0, |i| i + 1);
+        let name = &trimmed[start..];
+        if !by_path
+            && needle.mask & char_mask(name) == needle.mask
+            && let Some(s) = needle.score(m, name, buf)
+        {
+            return Some((TIER_NAME + s * 4 + needle.name_boost(name), Some(trimmed[..start].chars().count() as u32)));
+        }
+        if needle.mask & char_mask(trimmed) != needle.mask {
+            return None;
+        }
+        needle.score(m, trimmed, buf).map(|s| (s, None))
+    };
+    let mut best: Vec<(u32, &str, &Path, Option<u32>)> = data
+        .dirs
+        .par_iter()
+        .filter_map(|(rel, (path, _))| {
+            let mut buf = Vec::new();
+            with_matcher(|m| score(m, &mut buf, rel)).map(|(s, at)| (s, &**rel, path.as_path(), at))
+        })
+        .collect();
+    let order = |a: &(u32, &str, &Path, Option<u32>), b: &(u32, &str, &Path, Option<u32>)| {
+        b.0.cmp(&a.0).then_with(|| a.1.len().cmp(&b.1.len())).then_with(|| a.1.cmp(b.1))
+    };
+    if best.len() > limit {
+        best.select_nth_unstable_by(limit, order);
+        best.truncate(limit);
+    }
+    // Match indices and the CamelHump bonus `find_files` gives, so equal matches rank alike.
+    let mut out: Vec<FileMatch> = with_matcher(|m| {
+        let (mut buf, mut idx) = (Vec::new(), Vec::new());
+        best.into_iter()
+            .map(|(score, rel, path, name_at)| {
+                let trimmed = &rel[..rel.len() - 1];
+                let (bonus, indices) = match name_at {
+                    Some(at) => {
+                        let name = &trimmed[trimmed.rfind('/').map_or(0, |i| i + 1)..];
+                        needle.indices(m, name, &mut buf, &mut idx);
+                        (hump_bonus(name, &idx), idx.iter().map(|i| i + at).collect())
+                    }
+                    None => {
+                        needle.indices(m, trimmed, &mut buf, &mut idx);
+                        (hump_bonus(trimmed, &idx), idx.clone())
+                    }
+                };
+                FileMatch { path: path.to_path_buf().into(), rel_path: rel.to_owned(), score: score + bonus, indices }
+            })
+            .collect()
+    });
+    out.sort_by(|a, b| {
+        b.score
+            .cmp(&a.score)
+            .then_with(|| a.rel_path.len().cmp(&b.rel_path.len()))
+            .then_with(|| a.rel_path.cmp(&b.rel_path))
+    });
+    out
+}
+
 fn file(data: &IndexData, slot: u32) -> &FileEntry {
     data.files[slot as usize].as_ref().expect("candidate slots are live")
 }
diff --git a/crates/ide-index/src/store.rs b/crates/ide-index/src/store.rs
index 7419c709..f32dac55 100644
--- a/crates/ide-index/src/store.rs
+++ b/crates/ide-index/src/store.rs
@@ -8,7 +8,7 @@ use std::path::Path;
 const FILES: TableDefinition<&str, &[u8]> = TableDefinition::new("files");
 const META: TableDefinition<&str, &[u8]> = TableDefinition::new("meta");
 /// Bump when [`FileRecord`] or its encoding changes.
-const SCHEMA: &str = "openidea-index-2";
+const SCHEMA: &str = "openidea-index-3";
 
 type Result<T> = std::result::Result<T, String>;
 
diff --git a/crates/ide-index/src/tests.rs b/crates/ide-index/src/tests.rs
index 97ba3c7c..d8dadee2 100644
--- a/crates/ide-index/src/tests.rs
+++ b/crates/ide-index/src/tests.rs
@@ -111,6 +111,28 @@ fn indexes_files_and_symbols_honouring_excludes() {
     assert_eq!(m.path, fx.root.join("src/main.rs"));
 }
 
+#[test]
+fn counts_file_extensions_most_common_first() {
+    let fx = Fixture::new(&[
+        ("src/a.rs", "fn a() {}\n"),
+        ("src/b.RS", "fn b() {}\n"),
+        ("src/lib.rs", "fn c() {}\n"),
+        ("Cargo.toml", "[package]\n"),
+        ("README.md", "# r\n"),
+        ("docs/guide.md", "# g\n"),
+        (".gitignore", "target\n"),
+        ("Makefile", "all:\n"),
+        ("target/debug/gen.rs", "fn generated() {}\n"),
+    ]);
+    let idx = fx.open();
+    let counts: Vec<(String, u32)> = idx.file_extensions().into_iter().map(|c| (c.extension, c.files)).collect();
+    assert_eq!(
+        counts,
+        [("rs".into(), 3), ("md".into(), 2), ("toml".into(), 1)],
+        "case-folded, excluded folders and extension-less files left out"
+    );
+}
+
 #[test]
 fn file_ranking_is_idea_like() {
     let fx = sample();
@@ -138,6 +160,23 @@ fn file_ranking_is_idea_like() {
     assert_eq!(shown.to_lowercase(), "uibtn");
 }
 
+#[test]
+fn find_dirs_ranks_folder_names() {
+    let f = sample();
+    let idx = f.open();
+    let dirs = |q: &str| idx.find_dirs(q, 20).into_iter().map(|m| m.rel_path).collect::<Vec<_>>();
+    assert_eq!(dirs("order"), ["src/order/"]);
+    assert_eq!(dirs("src")[0], "src/");
+    assert!(dirs("src").contains(&"src/ui/".to_owned()), "{:?}", dirs("src"));
+    assert_eq!(dirs("src/ui/"), ["src/ui/"]);
+    assert!(dirs("").is_empty());
+    assert!(dirs("main").is_empty());
+
+    let m = &idx.find_dirs("ui", 1)[0];
+    assert_eq!(m.path.0, f.root.join("src/ui"));
+    assert_eq!(m.indices, vec![4, 5]);
+}
+
 #[test]
 fn shorter_paths_win_ties_and_recent_files_boost() {
     let fx = Fixture::new(&[("a/b/c/util.rs", ""), ("x/util.rs", ""), ("y/util.rs", "")]);
@@ -276,6 +315,56 @@ fn binary_and_huge_files_are_listed_without_symbols() {
     assert_eq!(idx.status().symbols, 0);
 }
 
+#[test]
+fn go_to_file_finds_ignored_files_but_not_their_symbols() {
+    let fx = Fixture::new(&[
+        (".gitignore", ".env\n*.local.ts\ndist/\n"),
+        (".env", "SECRET=1\n"),
+        ("src/app.ts", "export function app() {}\n"),
+        ("src/config.local.ts", "export function localOnly() {}\n"),
+        ("dist/bundle.js", "function bundled() {}\n"),
+    ]);
+    let idx = fx.open();
+    assert_eq!(files(&idx, ".env"), vec![".env"], "the reported case: a git-ignored root file");
+    assert_eq!(files(&idx, "config.local"), vec!["src/config.local.ts"]);
+    assert!(files(&idx, "bundle").is_empty(), "ignored directories stay out");
+    assert!(symbols(&idx, "localOnly", SymbolFilter::All).is_empty(), "ignored files are listed by name only");
+    assert_eq!(symbols(&idx, "app", SymbolFilter::All), vec!["app"]);
+
+    // Watcher updates keep the distinction.
+    let fresh = fx.write("src/fresh.local.ts", "export function freshLocal() {}\n");
+    let bundled = fx.write("dist/more.js", "function more() {}\n");
+    idx.update(&[fresh, bundled], &[]);
+    assert!(idx.wait_idle(WAIT));
+    assert_eq!(files(&idx, "fresh.local"), vec!["src/fresh.local.ts"]);
+    assert!(symbols(&idx, "freshLocal", SymbolFilter::All).is_empty());
+    assert!(files(&idx, "more.js").is_empty());
+
+    // Nested ignore files apply to watcher updates as they do to the scan.
+    fx.write("pkg/.gitignore", "gen.ts\n");
+    let generated = fx.write("pkg/gen.ts", "export function generatedThing() {}\n");
+    let kept = fx.write("pkg/kept.ts", "export function keptThing() {}\n");
+    idx.update(&[generated, kept], &[]);
+    assert!(idx.wait_idle(WAIT));
+    assert_eq!(files(&idx, "pkg/gen"), vec!["pkg/gen.ts"]);
+    assert!(symbols(&idx, "generatedThing", SymbolFilter::All).is_empty());
+    assert_eq!(symbols(&idx, "keptThing", SymbolFilter::All), vec!["keptThing"]);
+    drop(idx);
+
+    // No longer ignored: the next scan parses it although its mtime is unchanged.
+    std::fs::write(fx.root.join(".gitignore"), ".env\ndist/\n").unwrap();
+    let idx = fx.open();
+    assert_eq!(symbols(&idx, "localOnly", SymbolFilter::All), vec!["localOnly"]);
+    assert_eq!(files(&idx, ".env"), vec![".env"]);
+    drop(idx);
+
+    // Ignored again: its symbols are dropped.
+    std::fs::write(fx.root.join(".gitignore"), "*.local.ts\n").unwrap();
+    let idx = fx.open();
+    assert!(symbols(&idx, "localOnly", SymbolFilter::All).is_empty());
+    assert_eq!(files(&idx, "bundle"), vec!["dist/bundle.js"]);
+}
+
 #[test]
 fn second_window_on_same_project_works_in_memory() {
     let fx = sample();
diff --git a/crates/ide-index/src/worker.rs b/crates/ide-index/src/worker.rs
index a6947271..3928edd4 100644
--- a/crates/ide-index/src/worker.rs
+++ b/crates/ide-index/src/worker.rs
@@ -2,13 +2,13 @@
 //! updates queued by the watcher.
 
 use crate::data::{FileEntry, FileRecord, IndexData, StoredSymbol};
-use crate::filter::{Found, PathFilter, mtime_of};
+use crate::filter::{Found, PathFilter};
 use crate::store::Store;
 use ide_core::{IdeEvent, SharedSink, TaskId};
 use ide_language::{LanguageRegistry, Syntax};
 use parking_lot::{Condvar, Mutex, RwLock};
 use rayon::prelude::*;
-use std::collections::{HashSet, VecDeque};
+use std::collections::{HashMap, HashSet, VecDeque};
 use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -233,10 +233,7 @@ impl Shared {
         let seen: HashSet<&Path> = found.iter().map(|f| f.path.as_path()).collect();
         let (todo, stale): (Vec<&Found>, Vec<PathBuf>) = {
             let d = self.data.read();
-            let todo = found
-                .iter()
-                .filter(|f| d.get(&f.path).is_none_or(|e| e.mtime != f.mtime || e.size != f.size))
-                .collect();
+            let todo = found.iter().filter(|f| d.get(&f.path).is_none_or(|e| e.stale_for(f))).collect();
             let stale = d.paths().filter(|p| !seen.contains(p.as_path())).cloned().collect();
             (todo, stale)
         };
@@ -311,6 +308,7 @@ impl Shared {
                         let mut rec = d.get(&f.path)?.record();
                         rec.mtime = f.mtime;
                         rec.size = f.size;
+                        rec.ignored = f.ignored;
                         Some((rel, rec, f.path.clone()))
                     }
                     Extracted::New(rec) => Some((rel, rec, f.path.clone())),
@@ -342,8 +340,8 @@ impl Shared {
     }
 
     fn extract(&self, f: &Found, prev_hash: Option<[u8; 32]>) -> Extracted {
-        let mut rec = FileRecord { mtime: f.mtime, size: f.size, ..Default::default() };
-        if f.size > MAX_SYMBOL_FILE {
+        let mut rec = FileRecord { mtime: f.mtime, size: f.size, ignored: f.ignored, ..Default::default() };
+        if f.ignored || f.size > MAX_SYMBOL_FILE {
             return Extracted::New(rec);
         }
         let mut bytes = Vec::with_capacity(f.size as usize);
@@ -420,6 +418,7 @@ impl Shared {
 
         let mut files: Vec<Found> = Vec::new();
         let mut seen = HashSet::new();
+        let mut by_dir: HashMap<PathBuf, HashSet<PathBuf>> = HashMap::new();
         for path in changed {
             if !seen.insert(path.clone()) {
                 continue;
@@ -430,16 +429,19 @@ impl Shared {
             }
             if meta.is_dir() {
                 files.extend(filter.walk(&path, &self.cancelled));
-            } else if meta.is_file() {
-                files.push(Found { mtime: mtime_of(&meta), size: meta.len(), path });
+            } else if meta.is_file()
+                && let Some(dir) = path.parent()
+            {
+                by_dir.entry(dir.to_owned()).or_default().insert(path);
             }
         }
+        // Listing the folder applies every ignore file (nested, global) to tell ignored files apart.
+        for (dir, wanted) in by_dir {
+            files.extend(filter.list_dir(&dir).into_iter().filter(|f| wanted.contains(&f.path)));
+        }
         let files: Vec<Found> = {
             let d = self.data.read();
-            files
-                .into_iter()
-                .filter(|f| d.get(&f.path).is_none_or(|e| e.mtime != f.mtime || e.size != f.size))
-                .collect()
+            files.into_iter().filter(|f| d.get(&f.path).is_none_or(|e| e.stale_for(f))).collect()
         };
         if !files.is_empty() {
             touched = true;
@@ -457,7 +459,7 @@ impl Shared {
                     .filter(|p| before.detect(p, None) != self.languages.detect(p, None))
                     .filter_map(|p| {
                         let e = d.get(p)?;
-                        Some(Found { path: p.clone(), mtime: e.mtime, size: e.size })
+                        Some(Found { path: p.clone(), mtime: e.mtime, size: e.size, ignored: e.ignored })
                     })
                     .collect()
             };
diff --git a/crates/ide-jsonrpc/Cargo.toml b/crates/ide-jsonrpc/Cargo.toml
index 615d1f81..4161989a 100644
--- a/crates/ide-jsonrpc/Cargo.toml
+++ b/crates/ide-jsonrpc/Cargo.toml
@@ -16,3 +16,6 @@ parking_lot.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 encoding_rs.workspace = true
+
+[dev-dependencies]
+tempfile.workspace = true
diff --git a/crates/ide-jsonrpc/src/lib.rs b/crates/ide-jsonrpc/src/lib.rs
index c04331ad..f78646ce 100644
--- a/crates/ide-jsonrpc/src/lib.rs
+++ b/crates/ide-jsonrpc/src/lib.rs
@@ -216,6 +216,9 @@ pub trait Handler: Send + Sync + 'static {
     fn on_request_with_data(&self, method: &str, params: Value) -> Result<Value, (i64, String, Option<Value>)> {
         self.on_request(method, params).map_err(|(code, message)| (code, message, None))
     }
+
+    /// Called once the response to a `method` request is queued: what it sends follows the response.
+    fn after_response(&self, _method: &str) {}
 }
 
 /// A [`Handler`] that ignores notifications and rejects requests.
@@ -243,6 +246,9 @@ struct Inner {
     pid: Option<u32>,
     /// Fired when the reader task has stopped (EOF, error or kill).
     reader_done: CancellationToken,
+    /// Fired once the child process has exited and been reaped (after [`Peer::kill`],
+    /// also what it started); at once when there is no child.
+    exited: CancellationToken,
 }
 
 impl Inner {
@@ -432,6 +438,7 @@ impl Peer {
                     (child.wait().await.ok(), true)
                 }
             };
+            inner.exited.cancel();
             if !killed {
                 // Bounded: a grandchild may keep the pipes open.
                 let drained = async {
@@ -510,7 +517,11 @@ impl Peer {
             kill: CancellationToken::new(),
             pid,
             reader_done: CancellationToken::new(),
+            exited: CancellationToken::new(),
         });
+        if pid.is_none() {
+            inner.exited.cancel();
+        }
 
         // Writer: a single task drains the queue so messages never interleave.
         {
@@ -704,6 +715,13 @@ impl Peer {
         self.inner.close_transport();
         self.inner.kill.cancel();
     }
+
+    /// Resolves once the child process is gone: exited on its own, or killed with what it
+    /// started and reaped. [`closed`](Self::closed) can come earlier, at EOF. Until then the
+    /// child may still hold files open, which on Windows can't be deleted.
+    pub async fn exited(&self) {
+        self.inner.exited.cancelled().await;
+    }
 }
 
 /// Removes the pending entry and tells the remote side to stop when a request
@@ -740,7 +758,8 @@ enum Incoming {
 
 async fn handle_request(inner: Arc<Inner>, handler: Arc<dyn Handler>, id: Value, method: String, params: Value) {
     let m = method.clone();
-    let result = tokio::task::spawn_blocking(move || handler.on_request_with_data(&m, params)).await;
+    let h = handler.clone();
+    let result = tokio::task::spawn_blocking(move || h.on_request_with_data(&m, params)).await;
     let reply = match result {
         Ok(Ok(result)) => json!({ "jsonrpc": "2.0", "id": id, "result": result }),
         Ok(Err((code, message, data))) => {
@@ -755,7 +774,9 @@ async fn handle_request(inner: Arc<Inner>, handler: Arc<dyn Handler>, id: Value,
             "error": { "code": codes::INTERNAL_ERROR, "message": format!("handler for {method} panicked") }
         }),
     };
-    let _ = inner.send_value(&reply);
+    if inner.send_value(&reply).is_ok() {
+        handler.after_response(&method);
+    }
 }
 
 fn dispatch(inner: &Arc<Inner>, notif_tx: &std::sync::mpsc::Sender<Incoming>, body: &[u8]) {
diff --git a/crates/ide-jsonrpc/src/tests.rs b/crates/ide-jsonrpc/src/tests.rs
index 7db0823f..9efee601 100644
--- a/crates/ide-jsonrpc/src/tests.rs
+++ b/crates/ide-jsonrpc/src/tests.rs
@@ -251,6 +251,34 @@ async fn server_to_client_request() {
     assert!(matches!(err, RpcError::Server { code: codes::METHOD_NOT_FOUND, .. }));
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn after_response_messages_follow_the_response() {
+    #[derive(Default)]
+    struct Client(std::sync::OnceLock<Peer>);
+    impl Handler for Client {
+        fn on_notification(&self, _: &str, _: Value) {}
+        fn on_request(&self, _: &str, _: Value) -> Result<Value, (i64, String)> {
+            Ok(json!("answer"))
+        }
+        fn after_response(&self, method: &str) {
+            self.0.get().unwrap().notify("after", method).unwrap();
+        }
+    }
+    let client = Arc::new(Client::default());
+    let (client_io, server_io) = duplex(64 * 1024);
+    let (cr, cw) = tokio::io::split(client_io);
+    assert!(client.0.set(Peer::connect(cr, cw, client.clone())).is_ok());
+    let (sr, mut sw) = tokio::io::split(server_io);
+    let request = br#"{"jsonrpc":"2.0","id":1,"method":"workspace/configuration","params":{}}"#;
+    framing::write_message(&mut sw, request).await.unwrap();
+    let mut reader = tokio::io::BufReader::new(sr);
+    let mut next = async || -> Value {
+        serde_json::from_slice(&framing::read_message(&mut reader).await.unwrap().unwrap()).unwrap()
+    };
+    assert_eq!(next().await, json!({ "jsonrpc": "2.0", "id": 1, "result": "answer" }));
+    assert_eq!(next().await, json!({ "jsonrpc": "2.0", "method": "after", "params": "workspace/configuration" }));
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn requests_start_after_the_notifications_before_them() {
     // `seen` answers with the notifications handled so far; handling one is slow.
@@ -413,6 +441,65 @@ async fn kill_terminates_process() {
     tokio::time::timeout(Duration::from_secs(5), peer.closed()).await.unwrap();
 }
 
+#[cfg(unix)]
+#[tokio::test(flavor = "multi_thread")]
+async fn exited_resolves_once_the_killed_process_is_reaped() {
+    let peer =
+        Peer::spawn("sleep", &["30".into()], &std::env::temp_dir(), &[], Arc::new(NoopHandler), Box::new(|_| {}))
+            .unwrap();
+    let pid = peer.pid().unwrap().to_string();
+    let exited = tokio::time::timeout(Duration::from_millis(200), peer.exited()).await;
+    assert!(exited.is_err(), "running until killed");
+    peer.kill();
+    tokio::time::timeout(Duration::from_secs(5), peer.exited()).await.unwrap();
+    let alive = std::process::Command::new("kill").args(["-0", &pid]).status().unwrap().success();
+    assert!(!alive, "reaped, not even a zombie");
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn exited_resolves_at_once_without_a_process() {
+    let (client, _server) = pair(Arc::new(NoopHandler), Arc::new(Recorder::default()));
+    tokio::time::timeout(Duration::from_secs(1), client.exited()).await.unwrap();
+}
+
+#[cfg(windows)]
+#[tokio::test(flavor = "multi_thread")]
+async fn exited_waits_for_a_windows_descendant_to_release_its_file() {
+    use std::os::windows::fs::OpenOptionsExt;
+    let tmp = tempfile::tempdir().unwrap();
+    std::fs::write(
+        tmp.path().join("hold.ps1"),
+        "$f=[IO.File]::Open('locked.txt','Create','ReadWrite','None'); [IO.File]::WriteAllText('ready.txt','ready'); Start-Sleep 30",
+    )
+    .unwrap();
+    let peer = Peer::spawn(
+        "cmd",
+        &[
+            "/D".into(),
+            "/C".into(),
+            "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File hold.ps1".into(),
+        ],
+        tmp.path(),
+        &[],
+        Arc::new(NoopHandler),
+        Box::new(|_| {}),
+    )
+    .unwrap();
+    tokio::time::timeout(Duration::from_secs(10), async {
+        while !tmp.path().join("ready.txt").exists() {
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+    })
+    .await
+    .unwrap();
+    let open = || std::fs::OpenOptions::new().read(true).share_mode(0).open(tmp.path().join("locked.txt"));
+    assert_eq!(open().unwrap_err().raw_os_error(), Some(32));
+    assert!(tokio::time::timeout(Duration::from_millis(200), peer.exited()).await.is_err());
+    peer.kill();
+    tokio::time::timeout(Duration::from_secs(5), peer.exited()).await.unwrap();
+    drop(open().expect("exited must wait for the descendant's file handle to close"));
+}
+
 /// A launcher that prints in the system code page and exits before speaking the
 /// protocol: `jdtls.bat` on a Chinese Windows when its Python step fails, then
 /// `pause` prints `请按任意键继续. . .` in GBK on stdout.
diff --git a/crates/ide-language/src/lib.rs b/crates/ide-language/src/lib.rs
index 7054d781..8d606d3d 100644
--- a/crates/ide-language/src/lib.rs
+++ b/crates/ide-language/src/lib.rs
@@ -60,6 +60,9 @@ pub struct LanguageConfig {
     /// External formatter used when no language server can format, or selected in settings.
     #[serde(default)]
     pub formatter: Option<FormatterConfig>,
+    /// Content of a new scratch file; `$END$` marks where the caret goes.
+    #[serde(default)]
+    pub scratch_template: Option<String>,
 }
 
 /// An external formatting tool and its language-specific parser.
@@ -152,6 +155,11 @@ pub struct LanguageServerConfig {
     /// Register source files with tsserver when no project configuration exists.
     #[serde(default)]
     pub tsserver_project: bool,
+    /// Re-sends the open documents (unchanged) once `workspace/configuration` is answered:
+    /// the server (Intelephense) applies some settings, such as the PHP version, only when
+    /// it parses a document.
+    #[serde(default)]
+    pub resync_on_configuration: bool,
     /// Set on plugin languages: start exactly this approved program.
     #[serde(skip)]
     pub pinned: Option<ProgramPin>,
@@ -242,6 +250,10 @@ pub struct LanguageInfo {
     #[serde(default)]
     #[specta(optional)]
     pub first_line: Option<String>,
+    /// Content of a new scratch file; `$END$` marks where the caret goes.
+    #[serde(default)]
+    #[specta(optional)]
+    pub scratch_template: Option<String>,
 }
 
 impl From<&LanguageConfig> for LanguageInfo {
@@ -258,6 +270,7 @@ impl From<&LanguageConfig> for LanguageInfo {
             language_servers: c.language_servers.iter().map(|s| s.name.clone()).collect(),
             filenames: c.filenames.clone(),
             first_line: c.first_line.clone(),
+            scratch_template: c.scratch_template.clone(),
         }
     }
 }
diff --git a/crates/ide-language/src/registry.rs b/crates/ide-language/src/registry.rs
index 83264595..aff9d7de 100644
--- a/crates/ide-language/src/registry.rs
+++ b/crates/ide-language/src/registry.rs
@@ -772,6 +772,10 @@ mod tests {
                     assert!(addr.parse::<std::net::SocketAddr>().is_ok(), "{name}: bad connect address {addr}");
                 }
             }
+            if let Some(t) = &cfg.scratch_template {
+                assert_eq!(t.matches("$END$").count(), 1, "{name}: scratch-template needs one $END$");
+                assert!(!cfg.extensions.is_empty(), "{name}: scratch-template without an extension");
+            }
             for ext in &cfg.extensions {
                 assert_eq!(ext, &ext.to_ascii_lowercase(), "{name}: extensions must be lower case");
                 assert!(!ext.starts_with('.'), "{name}: extension {ext} must not start with a dot");
diff --git a/crates/ide-lsp/src/caps.rs b/crates/ide-lsp/src/caps.rs
index a20296ef..ad84f59e 100644
--- a/crates/ide-lsp/src/caps.rs
+++ b/crates/ide-lsp/src/caps.rs
@@ -37,7 +37,7 @@ pub fn client_capabilities() -> Value {
             "fileOperations": { "dynamicRegistration": true, "willRename": true, "didRename": true },
             "configuration": true,
             "didChangeConfiguration": { "dynamicRegistration": false },
-            "didChangeWatchedFiles": { "dynamicRegistration": false, "relativePatternSupport": false },
+            "didChangeWatchedFiles": { "dynamicRegistration": true, "relativePatternSupport": true },
             "symbol": {
                 "dynamicRegistration": false,
                 "symbolKind": { "valueSet": symbol_kinds },
@@ -48,7 +48,7 @@ pub fn client_capabilities() -> Value {
             "semanticTokens": { "refreshSupport": true },
             "codeLens": { "refreshSupport": true },
             "inlayHint": { "refreshSupport": true },
-            "diagnostics": { "refreshSupport": false },
+            "diagnostics": { "refreshSupport": true },
             "textDocumentContent": { "dynamicRegistration": true }
         },
         "textDocument": {
@@ -130,6 +130,7 @@ pub fn client_capabilities() -> Value {
                 "prepareSupportDefaultBehavior": 1,
                 "honorsChangeAnnotations": false
             },
+            "diagnostic": { "dynamicRegistration": false, "relatedDocumentSupport": false },
             "publishDiagnostics": {
                 "relatedInformation": true,
                 "tagSupport": { "valueSet": [1, 2] },
diff --git a/crates/ide-lsp/src/external_project.rs b/crates/ide-lsp/src/external_project.rs
index cb9393c9..b00900a4 100644
--- a/crates/ide-lsp/src/external_project.rs
+++ b/crates/ide-lsp/src/external_project.rs
@@ -59,7 +59,7 @@ fn source_files(root: &Path, exclude_root: &Path, excludes: Vec<String>, limit:
     }
     let Ok(ignores) = ignores.build() else { return Vec::new() };
     let mut walk = ignore::WalkBuilder::new(root);
-    walk.require_git(false).follow_links(false).filter_entry(move |entry| {
+    walk.require_git(ide_core::ignored::inside_git_repo(root)).follow_links(false).filter_entry(move |entry| {
         if entry.depth() == 0 {
             return true;
         }
diff --git a/crates/ide-lsp/src/file_watch.rs b/crates/ide-lsp/src/file_watch.rs
new file mode 100644
index 00000000..6ec5290e
--- /dev/null
+++ b/crates/ide-lsp/src/file_watch.rs
@@ -0,0 +1,150 @@
+//! `workspace/didChangeWatchedFiles` registrations: which changes on disk a
+//! server asked to hear of (its globs, relative patterns and change kinds).
+
+use crate::uri;
+use globset::{GlobBuilder, GlobMatcher};
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::path::{Path, PathBuf};
+
+/// `FileChangeType`.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Change {
+    Created = 1,
+    Changed = 2,
+    Deleted = 3,
+}
+
+impl Change {
+    /// The `WatchKind` bit.
+    fn kind_bit(self) -> u64 {
+        match self {
+            Self::Created => 1,
+            Self::Changed => 2,
+            Self::Deleted => 4,
+        }
+    }
+}
+
+struct Watcher {
+    /// Relative pattern's base; `None` for a plain glob, matched below the server's root.
+    base: Option<PathBuf>,
+    /// A plain glob that is an absolute path pattern.
+    absolute: bool,
+    glob: GlobMatcher,
+    kind: u64,
+}
+
+/// A server's registrations, by registration id.
+#[derive(Default)]
+pub struct FileWatchers(BTreeMap<String, Vec<Watcher>>);
+
+impl FileWatchers {
+    pub fn register(&mut self, id: &str, options: Option<&Value>) {
+        let watchers = options
+            .and_then(|o| o.get("watchers"))
+            .and_then(Value::as_array)
+            .into_iter()
+            .flatten()
+            .filter_map(parse)
+            .collect();
+        self.0.insert(id.to_owned(), watchers);
+    }
+
+    pub fn unregister(&mut self, id: &str) {
+        self.0.remove(id);
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Whether a server rooted at `root` wants to hear of `change` to `path`.
+    pub fn wants(&self, root: &Path, path: &Path, change: Change) -> bool {
+        self.0.values().flatten().any(|w| {
+            if w.kind & change.kind_bit() == 0 {
+                return false;
+            }
+            match &w.base {
+                Some(base) => path.strip_prefix(base).is_ok_and(|rel| w.glob.is_match(rel)),
+                None if w.absolute => w.glob.is_match(path),
+                None => path.strip_prefix(root).is_ok_and(|rel| w.glob.is_match(rel)),
+            }
+        })
+    }
+
+    /// Bases of relative patterns, which may lie outside the project (a virtualenv's
+    /// `site-packages`, a path dependency): the client watches them for the server.
+    pub fn bases(&self) -> impl Iterator<Item = &Path> {
+        self.0.values().flatten().filter_map(|w| w.base.as_deref())
+    }
+}
+
+fn parse(watcher: &Value) -> Option<Watcher> {
+    let kind = watcher.get("kind").and_then(Value::as_u64).unwrap_or(7);
+    let (base, pattern) = match watcher.get("globPattern")? {
+        Value::String(p) => (None, p.as_str()),
+        relative => {
+            let base = relative.get("baseUri")?;
+            // A `WorkspaceFolder` or a URI.
+            let base = base.get("uri").unwrap_or(base).as_str()?;
+            let base = uri::uri_to_path(base)?;
+            // Changes are reported for canonical paths (`/tmp` is `/private/tmp` on macOS).
+            (Some(dunce::canonicalize(&base).unwrap_or(base)), relative.get("pattern")?.as_str()?)
+        }
+    };
+    let glob = GlobBuilder::new(pattern).literal_separator(true).build().ok()?.compile_matcher();
+    let absolute = base.is_none() && Path::new(pattern).is_absolute();
+    Some(Watcher { base, absolute, glob, kind })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    fn watchers(list: Value) -> FileWatchers {
+        let mut w = FileWatchers::default();
+        w.register("1", Some(&json!({ "watchers": list })));
+        w
+    }
+
+    #[test]
+    fn matches_globs_relative_patterns_and_kinds() {
+        let root = Path::new("/p");
+        let venv = uri::path_to_uri(Path::new("/opt/venv/lib/site-packages"));
+        let w = watchers(json!([
+            { "globPattern": "**/*.{go,mod,sum}" },
+            { "globPattern": "**/pyrightconfig.json", "kind": 2 },
+            { "globPattern": { "baseUri": venv, "pattern": "**" } },
+            { "globPattern": { "baseUri": { "uri": uri::path_to_uri(Path::new("/shared")), "name": "s" }, "pattern": "*.toml" } },
+        ]));
+        let cases = [
+            ("/p/go.mod", Change::Changed, true),
+            ("/p/sub/main.go", Change::Created, true),
+            ("/elsewhere/main.go", Change::Created, false),
+            ("/p/pyrightconfig.json", Change::Changed, true),
+            ("/p/pyrightconfig.json", Change::Created, false),
+            ("/opt/venv/lib/site-packages/idna/__init__.py", Change::Created, true),
+            ("/opt/venv/lib/site-packages", Change::Deleted, true),
+            ("/shared/Cargo.toml", Change::Changed, true),
+            ("/shared/nested/Cargo.toml", Change::Changed, false),
+            ("/p/readme.md", Change::Changed, false),
+        ];
+        for (path, change, expected) in cases {
+            assert_eq!(w.wants(root, Path::new(path), change), expected, "{path} {change:?}");
+        }
+        let mut bases: Vec<_> = w.bases().collect();
+        bases.sort();
+        assert_eq!(bases, [Path::new("/opt/venv/lib/site-packages"), Path::new("/shared")]);
+    }
+
+    #[test]
+    fn unregistering_drops_the_watchers() {
+        let mut w = watchers(json!([{ "globPattern": "**" }]));
+        assert!(w.wants(Path::new("/p"), Path::new("/p/a"), Change::Created));
+        w.unregister("1");
+        assert!(w.is_empty());
+        assert!(!w.wants(Path::new("/p"), Path::new("/p/a"), Change::Created));
+    }
+}
diff --git a/crates/ide-lsp/src/handler.rs b/crates/ide-lsp/src/handler.rs
index 006e4d09..1c89fd9c 100644
--- a/crates/ide-lsp/src/handler.rs
+++ b/crates/ide-lsp/src/handler.rs
@@ -130,15 +130,8 @@ impl ClientHandler {
         {
             return;
         }
-        let conv = mgr.conv(self.encoding());
-        let items = params
-            .diagnostics
-            .iter()
-            .cloned()
-            .map(|d| convert::diagnostic(&conv, &path, d, &self.server.name))
-            .collect();
-        self.server.set_diagnostics(path.clone(), params.diagnostics);
-        mgr.sink().emit(IdeEvent::Diagnostics { path: path.into(), source: self.server.name.clone(), items });
+        let shown = self.server.set_diagnostics(path.clone(), params.diagnostics);
+        mgr.emit_diagnostics(&self.server, path, shown, self.encoding());
     }
 
     fn show_message(&self, mgr: &LspManager, params: &Value) {
@@ -206,19 +199,33 @@ impl ClientHandler {
         Ok(reply)
     }
 
-    fn registration(&self, params: &Value, register: bool) {
-        let Some(run) = self.server.running_gen(self.generation) else { return };
+    fn registration(&self, mgr: &LspManager, params: &Value, register: bool) {
+        let Some(run) = self.server.initialized_gen(self.generation) else { return };
         let key = if register { "registrations" } else { "unregisterations" };
         let list = params.get(key).or_else(|| params.get("unregistrations")).and_then(Value::as_array);
         let mut caps = run.caps.write();
+        let mut watchers_changed = false;
         for reg in list.into_iter().flatten() {
             let Some(method) = reg.get("method").and_then(Value::as_str) else { continue };
-            if register {
+            if method == "workspace/didChangeWatchedFiles" {
+                let id = reg.get("id").and_then(Value::as_str).unwrap_or_default();
+                let mut watchers = run.watchers.write();
+                if register {
+                    watchers.register(id, reg.get("registerOptions"));
+                } else {
+                    watchers.unregister(id);
+                }
+                watchers_changed = true;
+            } else if register {
                 caps.register(method, reg.get("registerOptions"));
             } else {
                 caps.unregister(method);
             }
         }
+        drop(caps);
+        if watchers_changed {
+            mgr.file_watch_roots_changed();
+        }
     }
 }
 
@@ -278,11 +285,11 @@ impl Handler for ClientHandler {
             "workspace/configuration" => Ok(self.configuration(&params)),
             "workspace/workspaceFolders" => Ok(mgr.workspace_folders(&self.server)),
             "client/registerCapability" => {
-                self.registration(&params, true);
+                self.registration(&mgr, &params, true);
                 Ok(Value::Null)
             }
             "client/unregisterCapability" => {
-                self.registration(&params, false);
+                self.registration(&mgr, &params, false);
                 Ok(Value::Null)
             }
             "workspace/applyEdit" => self.apply_edit(&mgr, params),
@@ -295,10 +302,23 @@ impl Handler for ClientHandler {
                 mgr.sink().emit(IdeEvent::LspRefresh { server: self.server.id, kind });
                 Ok(Value::Null)
             }
-            "workspace/diagnostic/refresh" | "workspace/inlineValue/refresh" => Ok(Value::Null),
+            "workspace/diagnostic/refresh" => {
+                mgr.refresh_pulled_diagnostics(&self.server);
+                Ok(Value::Null)
+            }
+            "workspace/inlineValue/refresh" => Ok(Value::Null),
             other => Err((codes::METHOD_NOT_FOUND, format!("unsupported method {other}"))),
         }
     }
+
+    fn after_response(&self, method: &str) {
+        if method == "workspace/configuration"
+            && self.server.config.resync_on_configuration
+            && let Some(mgr) = self.mgr.upgrade()
+        {
+            mgr.resync_documents(&self.server, self.generation);
+        }
+    }
 }
 
 /// What `workspace/configuration` sections are looked up in: the server's
diff --git a/crates/ide-lsp/src/inspect.rs b/crates/ide-lsp/src/inspect.rs
index 19c4e580..e8509425 100644
--- a/crates/ide-lsp/src/inspect.rs
+++ b/crates/ide-lsp/src/inspect.rs
@@ -6,8 +6,6 @@
 //! (`textDocument/diagnostic`). The others are waited on: the first
 //! `publishDiagnostics` for the file after it was opened, then a short quiet
 //! period so follow-up publishes (syntax first, semantics later) are caught.
-//! The client never advertises pull support, so servers keep pushing for the
-//! editor as before.
 
 use crate::convert;
 use crate::server::Server;
diff --git a/crates/ide-lsp/src/jdtls.rs b/crates/ide-lsp/src/jdtls.rs
index 5852f53e..360dfa96 100644
--- a/crates/ide-lsp/src/jdtls.rs
+++ b/crates/ide-lsp/src/jdtls.rs
@@ -20,6 +20,7 @@ const SERVER: &str = "jdtls";
 
 pub(crate) mod configuration;
 mod formatter;
+mod hierarchy;
 pub(crate) mod reserved_names;
 pub use formatter::configure_formatter;
 /// First start imports the Maven / Gradle model, which can take minutes.
diff --git a/crates/ide-lsp/src/jdtls/hierarchy.rs b/crates/ide-lsp/src/jdtls/hierarchy.rs
new file mode 100644
index 00000000..55430784
--- /dev/null
+++ b/crates/ide-lsp/src/jdtls/hierarchy.rs
@@ -0,0 +1,101 @@
+//! Pull Members Up / Push Members Down through the app-owned JDT extension
+//! (`java/java-usages`). The server checks the move and computes the edit; the UI
+//! shows its problems and applies the edit itself.
+use super::COMMAND_TIMEOUT;
+use crate::types::{HierarchyChoice, HierarchyMembers, HierarchyRefactored, HierarchyRefactoring, RefactoringProblem};
+use crate::{DocSnap, LspManager, Target, convert};
+use ide_core::{CancellationToken, DocId, IdeError, IdeResult, Pos};
+use serde::Deserialize;
+use serde::de::DeserializeOwned;
+use serde_json::{Value, json};
+
+const MEMBERS: &str = "openidea.java.hierarchy.members";
+const REFACTOR: &str = "openidea.java.hierarchy.refactor";
+
+/// The extension's answer: a result, or why the position can't be refactored.
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum Answer<T> {
+    Refused { refused: String },
+    Ok(T),
+}
+
+impl<T> Answer<T> {
+    fn into_result(self) -> IdeResult<T> {
+        match self {
+            Answer::Refused { refused } => Err(IdeError::invalid(refused)),
+            Answer::Ok(value) => Ok(value),
+        }
+    }
+}
+
+#[derive(Deserialize)]
+struct Refactored {
+    problems: Vec<RefactoringProblem>,
+    edit: Option<lsp_types::WorkspaceEdit>,
+}
+
+fn feature(kind: HierarchyRefactoring) -> &'static str {
+    match kind {
+        HierarchyRefactoring::PullUp => "Pull Members Up",
+        HierarchyRefactoring::PushDown => "Push Members Down",
+    }
+}
+
+impl LspManager {
+    async fn hierarchy_command<R: DeserializeOwned>(
+        &self,
+        doc: DocId,
+        pos: Pos,
+        kind: HierarchyRefactoring,
+        command: &str,
+        extra: &[Value],
+        cancel: &CancellationToken,
+    ) -> IdeResult<(R, DocSnap, Target)> {
+        let (snap, mut targets) =
+            self.doc_targets(doc, feature(kind), |c| c.commands().iter().any(|c| c == command)).await?;
+        let t = targets.swap_remove(0);
+        let at = snap.position(&t, pos);
+        let mut arguments = vec![json!(snap.uri), json!(at.line), json!(at.character), json!(kind)];
+        arguments.extend_from_slice(extra);
+        let params = json!({ "command": command, "arguments": arguments });
+        let answer: Answer<R> =
+            self.call(&t, "workspace/executeCommand", params, Some(cancel), COMMAND_TIMEOUT).await?;
+        if cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
+        Ok((answer.into_result()?, snap, t))
+    }
+
+    /// The class at `pos` and its movable members; an invalid-input error says why there are none.
+    pub async fn hierarchy_members(
+        &self,
+        doc: DocId,
+        pos: Pos,
+        kind: HierarchyRefactoring,
+        cancel: CancellationToken,
+    ) -> IdeResult<HierarchyMembers> {
+        let (members, _, _) = self.hierarchy_command(doc, pos, kind, MEMBERS, &[], &cancel).await?;
+        Ok(members)
+    }
+
+    /// Checks moving `choices` (to `target`, for pull up) and computes the edit without applying it.
+    pub async fn hierarchy_refactor(
+        &self,
+        doc: DocId,
+        pos: Pos,
+        kind: HierarchyRefactoring,
+        target: Option<String>,
+        choices: Vec<HierarchyChoice>,
+        cancel: CancellationToken,
+    ) -> IdeResult<HierarchyRefactored> {
+        let choices: Vec<Value> = choices.iter().map(|c| json!({ "id": c.id, "abstract": c.make_abstract })).collect();
+        let (refactored, _, t): (Refactored, _, _) =
+            self.hierarchy_command(doc, pos, kind, REFACTOR, &[json!(target), json!(choices)], &cancel).await?;
+        let conv = self.conv(t.enc());
+        Ok(HierarchyRefactored {
+            problems: refactored.problems,
+            edit: refactored.edit.map(|e| convert::workspace_edit(&conv, e)),
+        })
+    }
+}
diff --git a/crates/ide-lsp/src/lib.rs b/crates/ide-lsp/src/lib.rs
index 252b66bf..2ace34ad 100644
--- a/crates/ide-lsp/src/lib.rs
+++ b/crates/ide-lsp/src/lib.rs
@@ -12,15 +12,18 @@ mod clang_tidy;
 mod convert;
 mod external_project;
 mod file_ops;
+mod file_watch;
 mod handler;
 mod inspect;
 pub mod jdtls;
 mod launch;
 mod library_source;
+mod pull;
 mod scope;
 mod server;
 mod tcp;
 mod text;
+mod ts_file_moves;
 mod tsserver_bridge;
 pub mod types;
 mod uri;
@@ -160,6 +163,9 @@ impl DocSnap {
     }
 }
 
+/// Receives the folders outside the project that servers want watched.
+pub type WatchRootsFn = dyn Fn(Vec<PathBuf>) + Send + Sync;
+
 pub struct LspManager {
     me: Weak<LspManager>,
     project_root: PathBuf,
@@ -177,6 +183,7 @@ pub struct LspManager {
     servers_hook: RwLock<Option<Arc<ServersFn>>>,
     candidates_hook: RwLock<Option<Arc<CandidateFn>>>,
     excludes_hook: RwLock<Option<Arc<external_project::ExcludesFn>>>,
+    watch_roots_hook: RwLock<Option<Arc<WatchRootsFn>>>,
     shutting_down: AtomicBool,
     execution_allowed: AtomicBool,
     java_usages_warned: AtomicBool,
@@ -336,6 +343,7 @@ impl LspManager {
             servers_hook: RwLock::new(None),
             candidates_hook: RwLock::new(None),
             excludes_hook: RwLock::new(None),
+            watch_roots_hook: RwLock::new(None),
             shutting_down: AtomicBool::new(false),
             execution_allowed: AtomicBool::new(true),
             java_usages_warned: AtomicBool::new(false),
@@ -426,6 +434,7 @@ impl LspManager {
         let wanted: Vec<(DocId, Vec<Arc<Server>>)> =
             open.into_iter().map(|(id, language, path)| (id, self.servers_for(&language, &path))).collect();
         let mut start = Vec::new();
+        let mut opened = Vec::new();
         {
             let mut docs = self.docs.lock();
             for (id, servers) in wanted {
@@ -440,6 +449,7 @@ impl LspManager {
                             user_did_open(server, &run, &d.path, &d.uri, d.did_open_params());
                         }
                         attached.opened_gen = Some(run.generation);
+                        opened.push((id, server.clone()));
                     }
                     d.servers.push(attached);
                     if !start.iter().any(|s: &Arc<Server>| s.id == server.id) {
@@ -450,6 +460,9 @@ impl LspManager {
                 d.servers.sort_by_key(|a| servers.iter().position(|s| s.id == a.server.id).unwrap_or(usize::MAX));
             }
         }
+        for (doc, server) in opened {
+            self.schedule_pull(doc, Some(&server), Duration::ZERO);
+        }
         for server in &start {
             self.ensure_started(server);
         }
@@ -587,6 +600,9 @@ impl LspManager {
                 return;
             }
         };
+        let run =
+            Running { generation, peer: peer.clone(), caps: Arc::new(RwLock::new(caps)), watchers: Default::default() };
+        server.set_initializing(Some(run.clone()));
         if let Err(e) = peer.notify("initialized", json!({})) {
             tracing::warn!("{}: {e}", server.name);
         }
@@ -598,29 +614,34 @@ impl LspManager {
         {
             tracing::debug!("{}: didChangeConfiguration: {e}", server.name);
         }
-        let run = Running { generation, peer: peer.clone(), caps: Arc::new(RwLock::new(caps)) };
 
         self.refresh_external_project(&server, &run).await;
 
         // Publish readiness and (re)open attached documents atomically w.r.t. did_change.
+        let mut reopened = Vec::new();
         {
             let mut docs = self.docs.lock();
             if !server.mark_ready(generation, run.clone()) {
                 drop(docs);
+                server.set_initializing(None);
                 peer.kill();
                 return;
             }
             let open_close = run.caps.read().open_close;
-            for d in docs.values_mut() {
+            for (id, d) in docs.iter_mut() {
                 let params = d.did_open_params();
                 for a in d.servers.iter_mut().filter(|a| a.server.id == server.id && a.opened_gen != Some(generation)) {
                     if open_close && let Err(e) = peer.notify("textDocument/didOpen", params.clone()) {
                         tracing::debug!("{}: didOpen: {e}", server.name);
                     }
                     a.opened_gen = Some(generation);
+                    reopened.push(*id);
                 }
             }
         }
+        for doc in reopened {
+            self.schedule_pull(doc, Some(&server), Duration::ZERO);
+        }
         self.check_clang_tidy(&server).await;
         server.refresh_busy_status(&self.sink);
         server.announce_ready(generation);
@@ -644,6 +665,7 @@ impl LspManager {
             None => return, // superseded instance
         };
         self.clear_server_state(&server);
+        self.file_watch_roots_changed();
         if intentional {
             server.announce_down();
             return;
@@ -843,6 +865,7 @@ impl LspManager {
             }
             docs.insert(doc, state);
         }
+        self.schedule_pull(doc, None, Duration::ZERO);
         for s in &servers {
             self.ensure_started(s);
             if s.running().is_some()
@@ -920,6 +943,30 @@ impl LspManager {
                 tracing::debug!("{}: didChange: {e}", server.name);
             }
         }
+        drop(docs);
+        self.schedule_pull(doc, None, pull::AFTER_EDIT);
+    }
+
+    /// Sends the documents open on instance `generation` of `server` again, as a `didChange`
+    /// with their unchanged text, so the server parses them with the settings it just read.
+    pub(crate) fn resync_documents(&self, server: &Server, generation: u64) {
+        let Some(run) = server.running_gen(generation) else { return };
+        if run.caps.read().sync == SyncKind::None {
+            return;
+        }
+        let docs = self.docs.lock();
+        for d in docs.values() {
+            if !d.servers.iter().any(|a| a.server.id == server.id && a.opened_gen == Some(generation)) {
+                continue;
+            }
+            let params = json!({
+                "textDocument": { "uri": d.uri, "version": d.version },
+                "contentChanges": [{ "text": d.text.as_str() }],
+            });
+            if let Err(e) = run.peer.notify("textDocument/didChange", params) {
+                tracing::debug!("{}: didChange: {e}", server.name);
+            }
+        }
     }
 
     pub fn did_save(&self, doc: DocId, text: &str) {
@@ -942,11 +989,15 @@ impl LspManager {
                 tracing::debug!("{}: didSave: {e}", a.server.name);
             }
         }
+        drop(docs);
+        self.schedule_pull(doc, None, Duration::ZERO);
+        self.pull_dependents(doc);
     }
 
     pub fn did_close(&self, doc: DocId) {
         let Some(d) = self.docs.lock().remove(&doc) else { return };
         for a in &d.servers {
+            self.forget_pulled(&a.server, &d.path, a.server.running().as_ref());
             let Some(run) = a.server.running() else { continue };
             if a.opened_gen == Some(run.generation)
                 && run.caps.read().open_close
@@ -1642,6 +1693,20 @@ impl LspManager {
         Ok(())
     }
 
+    /// Whether a server of `doc` (`server`, when given) provides the command `name`. Code actions
+    /// can carry commands other editors' extensions run themselves after the edit (vtsls'
+    /// `_typescript.didOrganizeImports`): no server provides those.
+    pub async fn provides_command(&self, doc: DocId, server: Option<ide_core::ServerId>, name: &str) -> bool {
+        let servers = match self.snapshot(doc) {
+            Ok(snap) => snap.servers,
+            Err(_) => self.servers.lock().clone(),
+        };
+        self.ready_targets(&servers, |c| c.commands().iter().any(|c| c == name))
+            .await
+            .iter()
+            .any(|t| server.is_none_or(|s| t.server.id == s))
+    }
+
     async fn command_target(&self, doc: DocId, server: ide_core::ServerId, name: &str) -> IdeResult<Target> {
         let snap = self.snapshot(doc)?;
         self.ready_targets(&snap.servers, |c| c.commands().iter().any(|c| c == name))
@@ -1660,6 +1725,10 @@ impl LspManager {
         answers: Vec<FormAnswer>,
         cancel: CancellationToken,
     ) -> IdeResult<Option<CommandForm>> {
+        // Nothing to ask for a command its server doesn't provide (executing it decides).
+        if !self.provides_command(doc, Some(server), &command.command).await {
+            return Ok(None);
+        }
         let t = self.command_target(doc, server, &command.command).await?;
         let interactive = t.server.name == "gopls"
             && t.caps()
@@ -1942,7 +2011,30 @@ impl LspManager {
             servers.iter().zip(ready).filter_map(|(s, run)| Some(Target { server: s.clone(), run: run? })).collect();
         let mut out = FileRenameEdits::default();
         for t in targets {
-            let Some(params) = Self::file_op_params(&t, "willRename", &moves) else { continue };
+            let Some(params) = Self::file_op_params(&t, "willRename", &moves) else {
+                if t.server.config.tsserver_project && t.caps().commands().iter().any(|c| c == ts_file_moves::COMMAND) {
+                    out.servers.push(t.server.name.clone());
+                    let opened = self.open_for_file_op(&t, &moves);
+                    for (from, to, _) in &moves {
+                        let r: IdeResult<Value> = self
+                            .call(
+                                &t,
+                                "workspace/executeCommand",
+                                ts_file_moves::request(from, to),
+                                Some(&cancel),
+                                LONG_TIMEOUT,
+                            )
+                            .await;
+                        match r {
+                            Ok(result) => out.edit.files.extend(ts_file_moves::edit(&result).files),
+                            Err(e) if e.kind == ErrorKind::Cancelled && cancel.is_cancelled() => return Err(e),
+                            Err(e) => out.errors.push(e.message),
+                        }
+                    }
+                    drop(opened);
+                }
+                continue;
+            };
             out.servers.push(t.server.name.clone());
             let opened = self.open_for_file_op(&t, &moves);
             let r: IdeResult<Option<lsp::WorkspaceEdit>> =
@@ -1973,29 +2065,78 @@ impl LspManager {
         }
     }
 
-    /// Files that changed on disk, outside the editor too (a checkout, another tool): each running
-    /// server hears of those of its languages under its root through `workspace/didChangeWatchedFiles`.
-    /// Without it jdtls's incremental build never sees them, so a launch runs stale classes.
-    pub fn watched_files_changed(&self, created: &[PathBuf], modified: &[PathBuf], removed: &[PathBuf]) {
+    /// Files that changed on disk, outside the editor too (a checkout, another tool), sent to
+    /// running servers through `workspace/didChangeWatchedFiles`. A server that registered file
+    /// watchers hears of what they match, including `excluded_dirs` (folders in excluded or
+    /// ignored trees whose entries came or went, reported as created): a package installed
+    /// into `.venv` or a `go.mod` rewritten by `go get` is picked up without a restart. Other
+    /// servers hear of their languages' files under their root; without it jdtls's incremental
+    /// build never sees them, so a launch runs stale classes.
+    pub fn watched_files_changed(
+        &self,
+        created: &[PathBuf],
+        modified: &[PathBuf],
+        removed: &[PathBuf],
+        excluded_dirs: &[PathBuf],
+    ) {
+        use file_watch::Change;
         let servers: Vec<Arc<Server>> = self.servers.lock().clone();
         for s in servers {
             let Some(run) = s.running() else { continue };
-            let languages = s.languages();
-            let changes: Vec<Value> = [(created, 1), (modified, 2), (removed, 3)]
+            let all = [(created, Change::Created), (modified, Change::Changed), (removed, Change::Deleted)]
                 .into_iter()
-                .flat_map(|(paths, kind)| paths.iter().map(move |p| (p, kind)))
-                .filter(|(p, _)| p.starts_with(&s.root) && languages.contains(&self.languages.detect(p, None)))
-                .map(|(p, kind)| json!({ "uri": uri::path_to_uri(p), "type": kind }))
-                .collect();
+                .flat_map(|(paths, change)| paths.iter().map(move |p| (p, change)));
+            let watchers = run.watchers.read();
+            let changes: Vec<(&PathBuf, Change)> = if watchers.is_empty() {
+                let languages = s.languages();
+                all.filter(|(p, _)| p.starts_with(&s.root) && languages.contains(&self.languages.detect(p, None)))
+                    .collect()
+            } else {
+                all.chain(excluded_dirs.iter().map(|p| (p, Change::Created)))
+                    .filter(|(p, change)| watchers.wants(&s.root, p, *change))
+                    .collect()
+            };
+            drop(watchers);
             if changes.is_empty() {
                 continue;
             }
+            let changes: Vec<Value> =
+                changes.iter().map(|(p, c)| json!({ "uri": uri::path_to_uri(p), "type": *c as u8 })).collect();
             if let Err(e) = run.peer.notify("workspace/didChangeWatchedFiles", json!({ "changes": changes })) {
                 tracing::debug!("{}: didChangeWatchedFiles: {e}", s.name);
             }
         }
     }
 
+    /// Called with the folders outside the project that servers registered file watchers
+    /// for (a virtualenv elsewhere, a path dependency), whenever they change. Changes
+    /// below them go to [`Self::watched_files_changed`].
+    pub fn set_file_watch_roots_hook(&self, hook: Box<WatchRootsFn>) {
+        *self.watch_roots_hook.write() = Some(Arc::from(hook));
+        self.file_watch_roots_changed();
+    }
+
+    pub(crate) fn file_watch_roots_changed(&self) {
+        let Some(hook) = self.watch_roots_hook.read().clone() else { return };
+        let servers: Vec<Arc<Server>> = self.servers.lock().clone();
+        let mut roots: Vec<PathBuf> = Vec::new();
+        for run in servers.iter().filter_map(|s| s.instance()) {
+            roots.extend(
+                run.watchers.read().bases().filter(|b| !b.starts_with(&self.project_root)).map(Path::to_path_buf),
+            );
+        }
+        roots.sort();
+        roots.dedup();
+        // Sorted, so a folder's subfolders follow it.
+        let mut outer: Vec<PathBuf> = Vec::new();
+        for r in roots {
+            if !outer.last().is_some_and(|o| r.starts_with(o)) {
+                outer.push(r);
+            }
+        }
+        hook(outer);
+    }
+
     /// Checks initialized capabilities, including dynamic registrations, before choosing a formatter.
     pub async fn can_format(&self, doc: DocId) -> IdeResult<bool> {
         let snap = self.snapshot(doc)?;
@@ -2451,6 +2592,12 @@ impl LspManager {
         }
     }
 
+    /// [`Self::reconfigure`] on the manager's runtime, for callers outside one (file watchers).
+    pub fn reconfigure_soon(self: &Arc<Self>) {
+        let me = self.clone();
+        self.runtime.spawn(async move { me.reconfigure().await });
+    }
+
     pub async fn reconfigure(&self) {
         if !self.execution_allowed.load(Ordering::Acquire) {
             let servers = self.servers.lock().clone();
diff --git a/crates/ide-lsp/src/pull.rs b/crates/ide-lsp/src/pull.rs
new file mode 100644
index 00000000..63016c0e
--- /dev/null
+++ b/crates/ide-lsp/src/pull.rs
@@ -0,0 +1,192 @@
+//! Pull diagnostics (`textDocument/diagnostic`). Servers that provide them may stop pushing
+//! their own analysis to a client that can pull (rust-analyzer pushes only `cargo check`
+//! then): the editor pulls an open file's diagnostics when it opens, after edits and saves,
+//! and when the server asks for a refresh. Pulled diagnostics are kept apart from pushed ones
+//! and shown together.
+
+use crate::server::{Running, Server};
+use crate::{LspManager, convert};
+use ide_core::{DocId, IdeEvent};
+use ide_jsonrpc::RpcError;
+use lsp_types as lsp;
+use serde_json::{Value, json};
+use std::path::PathBuf;
+use std::sync::Arc;
+use std::time::Duration;
+
+/// How long typing must pause before a changed file is pulled again.
+pub(crate) const AFTER_EDIT: Duration = Duration::from_millis(300);
+const TIMEOUT: Duration = Duration::from_secs(30);
+/// Retries of a pull the server cancelled (`ServerCancelled`, e.g. while indexing).
+const RETRIES: u32 = 20;
+
+struct PullTarget {
+    server: Arc<Server>,
+    run: Running,
+    path: PathBuf,
+    uri: lsp::Uri,
+}
+
+fn provides_pull(run: &Running) -> bool {
+    let caps = run.caps.read();
+    caps.restriction.diagnostics() && caps.has("diagnosticProvider")
+}
+
+fn inter_file(run: &Running) -> bool {
+    run.caps.read().raw.pointer("/diagnosticProvider/interFileDependencies").and_then(Value::as_bool) == Some(true)
+}
+
+impl LspManager {
+    /// Pulls `doc`'s diagnostics from its servers that provide them (`only`: from that one)
+    /// after `delay`; a later pull of the same file supersedes it.
+    pub(crate) fn schedule_pull(&self, doc: DocId, only: Option<&Server>, delay: Duration) {
+        let targets: Vec<PullTarget> = {
+            let docs = self.docs.lock();
+            let Some(d) = docs.get(&doc) else { return };
+            d.servers
+                .iter()
+                .filter(|a| only.is_none_or(|s| s.id == a.server.id))
+                .filter_map(|a| {
+                    let run = a.server.running()?;
+                    (a.opened_gen == Some(run.generation) && provides_pull(&run)).then(|| PullTarget {
+                        server: a.server.clone(),
+                        run,
+                        path: d.path.clone(),
+                        uri: d.uri.clone(),
+                    })
+                })
+                .collect()
+        };
+        for t in targets {
+            if t.server.suppresses_diagnostics(&t.path) {
+                continue;
+            }
+            let pull = t.server.next_pull(&t.path);
+            let me = self.me.clone();
+            self.runtime.spawn(async move {
+                tokio::time::sleep(delay).await;
+                if let Some(me) = me.upgrade() {
+                    me.pull(t, pull).await;
+                }
+            });
+        }
+    }
+
+    /// Pulls every open file of `server` again (`workspace/diagnostic/refresh`).
+    pub(crate) fn refresh_pulled_diagnostics(&self, server: &Server) {
+        let docs: Vec<DocId> = self
+            .docs
+            .lock()
+            .iter()
+            .filter(|(_, d)| d.servers.iter().any(|a| a.server.id == server.id))
+            .map(|(id, _)| *id)
+            .collect();
+        for doc in docs {
+            self.schedule_pull(doc, Some(server), Duration::ZERO);
+        }
+    }
+
+    /// After `doc` was saved: servers whose diagnostics depend on other files pull those
+    /// open files too.
+    pub(crate) fn pull_dependents(&self, doc: DocId) {
+        let docs = self.docs.lock();
+        let Some(d) = docs.get(&doc) else { return };
+        let servers: Vec<Arc<Server>> = d
+            .servers
+            .iter()
+            .filter(|a| a.server.running().is_some_and(|run| provides_pull(&run) && inter_file(&run)))
+            .map(|a| a.server.clone())
+            .collect();
+        let others: Vec<(DocId, Vec<Arc<Server>>)> = docs
+            .iter()
+            .filter(|(id, _)| **id != doc)
+            .map(|(id, o)| {
+                (*id, servers.iter().filter(|s| o.servers.iter().any(|a| a.server.id == s.id)).cloned().collect())
+            })
+            .collect();
+        drop(docs);
+        for (other, servers) in others {
+            for server in servers {
+                self.schedule_pull(other, Some(&server), Duration::ZERO);
+            }
+        }
+    }
+
+    /// Drops what was pulled for a closed file and shows what remains.
+    pub(crate) fn forget_pulled(&self, server: &Server, path: &std::path::Path, run: Option<&Running>) {
+        if let Some(shown) = server.clear_pulled(path) {
+            let enc = run.map(|r| r.caps.read().encoding).unwrap_or_default();
+            self.emit_diagnostics(server, path.to_owned(), shown, enc);
+        }
+    }
+
+    async fn pull(&self, t: PullTarget, pull: u64) {
+        let mut attempt = 0;
+        loop {
+            if !t.server.is_latest_pull(&t.path, pull) {
+                return;
+            }
+            let mut params = json!({ "textDocument": { "uri": t.uri } });
+            if let Some(id) = t.server.pulled_result_id(&t.path) {
+                params["previousResultId"] = json!(id);
+            }
+            if let Some(identifier) = t.run.caps.read().raw.pointer("/diagnosticProvider/identifier") {
+                params["identifier"] = identifier.clone();
+            }
+            let request = t.run.peer.request::<Value, Value>("textDocument/diagnostic", params, None);
+            let report = match tokio::time::timeout(TIMEOUT, request).await {
+                Ok(Ok(report)) => report,
+                // This request has no cancellation of its own: the server cancelled it
+                // (`ServerCancelled` while busy, which asks to be asked again).
+                Ok(Err(RpcError::Cancelled)) if attempt < RETRIES => {
+                    attempt += 1;
+                    tokio::time::sleep(Duration::from_millis(250 * u64::from(attempt.min(8)))).await;
+                    continue;
+                }
+                Ok(Err(e)) => {
+                    tracing::debug!("{}: textDocument/diagnostic: {e}", t.server.name);
+                    return;
+                }
+                Err(_) => {
+                    tracing::debug!("{}: textDocument/diagnostic timed out", t.server.name);
+                    return;
+                }
+            };
+            // A newer pull, a closed file or a restarted server makes this report stale.
+            if !t.server.is_latest_pull(&t.path, pull)
+                || t.server.running().is_none_or(|r| r.generation != t.run.generation)
+                || !self.docs.lock().values().any(|d| d.path == t.path)
+            {
+                return;
+            }
+            let result_id = report.get("resultId").and_then(Value::as_str).map(str::to_owned);
+            let items = match report.get("kind").and_then(Value::as_str) {
+                Some("unchanged") => None,
+                _ => match serde_json::from_value(report.get("items").cloned().unwrap_or(json!([]))) {
+                    Ok(items) => Some(items),
+                    Err(e) => {
+                        tracing::debug!("{}: bad textDocument/diagnostic report: {e}", t.server.name);
+                        return;
+                    }
+                },
+            };
+            let shown = t.server.set_pulled(t.path.clone(), result_id, items);
+            let enc = t.run.caps.read().encoding;
+            self.emit_diagnostics(&t.server, t.path, shown, enc);
+            return;
+        }
+    }
+
+    /// Shows `items` as `server`'s diagnostics for `path`.
+    pub(crate) fn emit_diagnostics(
+        &self,
+        server: &Server,
+        path: PathBuf,
+        items: Vec<lsp::Diagnostic>,
+        enc: crate::text::Encoding,
+    ) {
+        let conv = self.conv(enc);
+        let items = items.into_iter().map(|d| convert::diagnostic(&conv, &path, d, &server.name)).collect();
+        self.sink.emit(IdeEvent::Diagnostics { path: path.into(), source: server.name.clone(), items });
+    }
+}
diff --git a/crates/ide-lsp/src/server.rs b/crates/ide-lsp/src/server.rs
index f15a893e..6d57b887 100644
--- a/crates/ide-lsp/src/server.rs
+++ b/crates/ide-lsp/src/server.rs
@@ -27,6 +27,8 @@ pub struct Running {
     pub generation: u64,
     pub peer: Peer,
     pub caps: Arc<RwLock<ServerCaps>>,
+    /// `workspace/didChangeWatchedFiles` registrations.
+    pub watchers: Arc<RwLock<crate::file_watch::FileWatchers>>,
 }
 
 pub enum Conn {
@@ -82,6 +84,9 @@ pub struct Server {
     pub resolved_binary: RwLock<Option<PathBuf>>,
     languages: Mutex<Vec<LanguageId>>,
     state: Mutex<State>,
+    /// The instance being initialized, from `initialized` until ready: registrations
+    /// sent right after `initialized` must not be lost.
+    initializing: Mutex<Option<Running>>,
     /// Fired when the instance being started is abandoned (stop / restart while starting).
     start_cancel: Mutex<CancellationToken>,
     phase: watch::Sender<Phase>,
@@ -92,7 +97,13 @@ pub struct Server {
     started: Mutex<Option<Instant>>,
     stderr: Mutex<VecDeque<String>>,
     pub progress: Mutex<HashMap<String, Progress>>,
+    /// What the editor shows per path: the pushed and the pulled diagnostics together.
     diagnostics: Mutex<HashMap<PathBuf, Vec<lsp::Diagnostic>>>,
+    /// `publishDiagnostics` per path.
+    pushed: Mutex<HashMap<PathBuf, Vec<lsp::Diagnostic>>>,
+    /// `textDocument/diagnostic` reports per path, and the latest pull asked for each.
+    pulled: Mutex<HashMap<PathBuf, Pulled>>,
+    pulls: Mutex<HashMap<PathBuf, u64>>,
     /// When diagnostics were last published per path (empty lists included).
     published: Mutex<HashMap<PathBuf, Instant>>,
     /// Woken on every `publishDiagnostics` (Inspect Code waits on it).
@@ -118,6 +129,7 @@ impl Server {
             resolved_binary: RwLock::new(None),
             languages: Mutex::new(vec![language]),
             state: Mutex::new(State { generation: 0, conn: Conn::Idle }),
+            initializing: Mutex::new(None),
             start_cancel: Mutex::new(CancellationToken::new()),
             phase: watch::channel(Phase::Down).0,
             status: Mutex::new((ServerStatus::Stopped, None)),
@@ -126,6 +138,9 @@ impl Server {
             stderr: Mutex::new(VecDeque::new()),
             progress: Mutex::new(HashMap::new()),
             diagnostics: Mutex::new(HashMap::new()),
+            pushed: Mutex::new(HashMap::new()),
+            pulled: Mutex::new(HashMap::new()),
+            pulls: Mutex::new(HashMap::new()),
             published: Mutex::new(HashMap::new()),
             published_notify: Notify::new(),
             idle_notify: Notify::new(),
@@ -210,6 +225,8 @@ impl Server {
             return false;
         }
         st.conn = Conn::Ready(run);
+        drop(st);
+        self.set_initializing(None);
         true
     }
 
@@ -234,6 +251,20 @@ impl Server {
         }
     }
 
+    /// The instance told `initialized`, ready or not.
+    pub fn instance(&self) -> Option<Running> {
+        self.running().or_else(|| self.initializing.lock().clone())
+    }
+
+    /// Generation `generation` once it was told `initialized`, ready or not.
+    pub fn initialized_gen(&self, generation: u64) -> Option<Running> {
+        self.instance().filter(|r| r.generation == generation)
+    }
+
+    pub fn set_initializing(&self, run: Option<Running>) {
+        *self.initializing.lock() = run;
+    }
+
     /// The running instance if it is still generation `generation`.
     pub fn running_gen(&self, generation: u64) -> Option<Running> {
         self.running().filter(|r| r.generation == generation)
@@ -471,17 +502,71 @@ impl Server {
         self.progress.lock().drain().map(|(_, p)| (p.task, p.title)).collect()
     }
 
-    pub fn set_diagnostics(&self, path: PathBuf, items: Vec<lsp::Diagnostic>) {
+    /// Records the diagnostics the server pushed for `path`; returns what the file now shows.
+    pub fn set_diagnostics(&self, path: PathBuf, items: Vec<lsp::Diagnostic>) -> Vec<lsp::Diagnostic> {
+        set_or_remove(&mut self.pushed.lock(), path.clone(), items);
+        self.combine(path)
+    }
+
+    /// Records a pulled report for `path` (`None` items: unchanged since `result_id`'s
+    /// predecessor); returns what the file now shows.
+    pub fn set_pulled(
+        &self,
+        path: PathBuf,
+        result_id: Option<String>,
+        items: Option<Vec<lsp::Diagnostic>>,
+    ) -> Vec<lsp::Diagnostic> {
+        {
+            let mut pulled = self.pulled.lock();
+            let entry = pulled.entry(path.clone()).or_default();
+            entry.result_id = result_id;
+            if let Some(items) = items {
+                entry.items = items;
+            }
+        }
+        self.combine(path)
+    }
+
+    /// Forgets the pulled report of a closed file; `None` when there was none.
+    pub fn clear_pulled(&self, path: &Path) -> Option<Vec<lsp::Diagnostic>> {
+        self.pulls.lock().remove(path);
+        self.pulled.lock().remove(path)?;
+        Some(self.combine(path.to_owned()))
+    }
+
+    /// The `resultId` of the last report pulled for `path`.
+    pub fn pulled_result_id(&self, path: &Path) -> Option<String> {
+        self.pulled.lock().get(path).and_then(|p| p.result_id.clone())
+    }
+
+    /// Starts a pull for `path`, superseding earlier ones; see [`Server::is_latest_pull`].
+    pub fn next_pull(&self, path: &Path) -> u64 {
+        static NEXT: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
+        let id = NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+        self.pulls.lock().insert(path.to_owned(), id);
+        id
+    }
+
+    pub fn is_latest_pull(&self, path: &Path, id: u64) -> bool {
+        self.pulls.lock().get(path) == Some(&id)
+    }
+
+    fn combine(&self, path: PathBuf) -> Vec<lsp::Diagnostic> {
+        let mut items = self.pushed.lock().get(&path).cloned().unwrap_or_default();
+        if let Some(pulled) = self.pulled.lock().get(&path) {
+            for d in &pulled.items {
+                if !items.contains(d) {
+                    items.push(d.clone());
+                }
+            }
+        }
         {
             let mut d = self.diagnostics.lock();
             self.published.lock().insert(path.clone(), Instant::now());
-            if items.is_empty() {
-                d.remove(&path);
-            } else {
-                d.insert(path, items);
-            }
+            set_or_remove(&mut d, path, items.clone());
         }
         self.published_notify.notify_waiters();
+        items
     }
 
     /// When diagnostics for `path` were last published by this server.
@@ -506,10 +591,28 @@ impl Server {
 
     pub fn take_diagnostic_paths(&self) -> Vec<PathBuf> {
         self.published.lock().clear();
+        self.pushed.lock().clear();
+        self.pulled.lock().clear();
+        self.pulls.lock().clear();
         self.diagnostics.lock().drain().map(|(p, _)| p).collect()
     }
 }
 
+/// A file's last `textDocument/diagnostic` report.
+#[derive(Default)]
+struct Pulled {
+    result_id: Option<String>,
+    items: Vec<lsp::Diagnostic>,
+}
+
+fn set_or_remove(map: &mut HashMap<PathBuf, Vec<lsp::Diagnostic>>, path: PathBuf, items: Vec<lsp::Diagnostic>) {
+    if items.is_empty() {
+        map.remove(&path);
+    } else {
+        map.insert(path, items);
+    }
+}
+
 /// The last `n` stderr lines, led by the exception headline: Node.js / Python /
 /// JVM crashes print the error first and a stack after it, so a plain tail
 /// shows frames without saying what went wrong.
diff --git a/crates/ide-lsp/src/ts_file_moves.rs b/crates/ide-lsp/src/ts_file_moves.rs
new file mode 100644
index 00000000..d46ed7c3
--- /dev/null
+++ b/crates/ide-lsp/src/ts_file_moves.rs
@@ -0,0 +1,89 @@
+//! Reference updates for moved files from vtsls, which has no `workspace/willRenameFiles`:
+//! it updates imports itself after `didRenameFiles`, behind a prompt the client answers. The
+//! IDE asks tsserver for the same edits up front (`getEditsForFileRename`, through
+//! `typescript.tsserverRequest`), so they join the move's preview and undo, and the server's
+//! own update is off (`updateImportsOnFileMove.enabled = "never"` in `languages/*.toml`).
+
+use ide_core::{FileEdit, Pos, Range, TextEdit, WorkspaceEdit};
+use serde::Deserialize;
+use serde_json::{Value, json};
+use std::path::PathBuf;
+
+pub(crate) const COMMAND: &str = "typescript.tsserverRequest";
+
+/// The `typescript.tsserverRequest` arguments asking for the edits of moving `from` to `to`.
+pub(crate) fn request(from: &std::path::Path, to: &std::path::Path) -> Value {
+    json!({
+        "command": COMMAND,
+        "arguments": ["getEditsForFileRename", { "oldFilePath": from, "newFilePath": to }],
+    })
+}
+
+#[derive(Deserialize)]
+struct Location {
+    line: u32,
+    offset: u32,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct Change {
+    start: Location,
+    end: Location,
+    new_text: String,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct FileChanges {
+    file_name: PathBuf,
+    text_changes: Vec<Change>,
+}
+
+/// tsserver's `FileCodeEdits[]` (the command's `body`; 1-based lines and UTF-16 offsets) as an edit.
+pub(crate) fn edit(result: &Value) -> WorkspaceEdit {
+    let body = result.get("body").unwrap_or(result);
+    let files: Vec<FileChanges> = serde_json::from_value(body.clone()).unwrap_or_default();
+    let pos = |l: &Location| Pos::new(l.line.saturating_sub(1), l.offset.saturating_sub(1));
+    WorkspaceEdit {
+        files: files
+            .into_iter()
+            .filter(|f| !f.text_changes.is_empty())
+            .map(|f| FileEdit::Edit {
+                path: f.file_name.into(),
+                edits: f
+                    .text_changes
+                    .into_iter()
+                    .map(|c| TextEdit { range: Range::new(pos(&c.start), pos(&c.end)), new_text: c.new_text })
+                    .collect(),
+                version: None,
+            })
+            .collect(),
+        preconditions: Vec::new(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn converts_tsserver_file_code_edits() {
+        let result = json!({ "success": true, "body": [
+            { "fileName": "/p/src/index.ts", "textChanges": [
+                { "start": { "line": 2, "offset": 31 }, "end": { "line": 2, "offset": 41 }, "newText": "./lib/money.ts" }
+            ] },
+            { "fileName": "/p/src/unchanged.ts", "textChanges": [] }
+        ] });
+        let edit = edit(&result);
+        assert_eq!(edit.files.len(), 1);
+        let FileEdit::Edit { path, edits, version } = &edit.files[0] else { panic!("{edit:?}") };
+        assert_eq!(**path, *std::path::Path::new("/p/src/index.ts"));
+        assert_eq!(
+            edits,
+            &[TextEdit { range: Range::new(Pos::new(1, 30), Pos::new(1, 40)), new_text: "./lib/money.ts".into() }]
+        );
+        assert!(version.is_none());
+        assert!(super::edit(&json!({ "success": false })).files.is_empty());
+    }
+}
diff --git a/crates/ide-lsp/src/types.rs b/crates/ide-lsp/src/types.rs
index 047aabf4..d2bdd5ff 100644
--- a/crates/ide-lsp/src/types.rs
+++ b/crates/ide-lsp/src/types.rs
@@ -389,6 +389,87 @@ pub struct Renamed {
     pub incomplete: Option<ReferencesIncomplete>,
 }
 
+/// IDEA's class-hierarchy refactorings.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum HierarchyRefactoring {
+    PullUp,
+    PushDown,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct HierarchyClass {
+    /// Server-owned identity, passed back as the pull-up destination.
+    pub id: String,
+    pub name: String,
+    pub qualified_name: String,
+    pub interface: bool,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum HierarchyMemberKind {
+    Field,
+    Method,
+    Type,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct HierarchyMember {
+    pub id: String,
+    /// `name(Params) : Type`, as the server renders it.
+    pub label: String,
+    pub kind: HierarchyMemberKind,
+    /// The member at the caret.
+    pub selected: bool,
+    /// Can be declared abstract in the destination (pull up) or kept abstract (push down).
+    pub abstractable: bool,
+}
+
+/// The class at a position and what can move: pull-up destinations, or the subclasses
+/// members are pushed into.
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct HierarchyMembers {
+    pub class_name: String,
+    pub targets: Vec<HierarchyClass>,
+    pub members: Vec<HierarchyMember>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct HierarchyChoice {
+    pub id: String,
+    pub make_abstract: bool,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum ProblemSeverity {
+    Info,
+    Warning,
+    Error,
+    /// The refactoring can't run at all; there is no edit.
+    Fatal,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct RefactoringProblem {
+    pub severity: ProblemSeverity,
+    pub message: String,
+}
+
+/// A checked refactoring: what the server found, and the edit unless a problem is fatal.
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct HierarchyRefactored {
+    pub problems: Vec<RefactoringProblem>,
+    pub edit: Option<WorkspaceEdit>,
+}
+
 #[derive(Clone, Debug, Default, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct CallHierarchy {
diff --git a/crates/ide-lsp/tests/mock_server.rs b/crates/ide-lsp/tests/mock_server.rs
index 93d9d370..274e1ba7 100644
--- a/crates/ide-lsp/tests/mock_server.rs
+++ b/crates/ide-lsp/tests/mock_server.rs
@@ -31,6 +31,8 @@ struct MockState {
     errors: Mutex<HashMap<String, (i64, String)>>,
     /// Computes a response from the request and the open documents (before `responses`).
     responder: Mutex<Option<Responder>>,
+    /// Holds the handling of notifications of this method until the gate opens.
+    held: Mutex<Option<(String, Arc<Gate>)>>,
     peer: Mutex<Option<Peer>>,
 }
 
@@ -74,6 +76,12 @@ struct MockHandler(Arc<MockState>);
 impl Handler for MockHandler {
     fn on_notification(&self, method: &str, params: Value) {
         let s = &self.0;
+        let held = s.held.lock().clone();
+        if let Some((m, gate)) = held
+            && m == method
+        {
+            gate.hold();
+        }
         // Held throughout: a test that sees the effect (a document, the peer gone) also sees the record.
         let mut log = s.notifications.lock();
         let uri = params["textDocument"]["uri"].as_str().unwrap_or_default().to_owned();
@@ -230,6 +238,7 @@ fn server_cfg(name: &str) -> LanguageServerConfig {
         max_java: None,
         launch_error: None,
         tsserver_project: false,
+        resync_on_configuration: false,
         pinned: None,
     }
 }
@@ -269,6 +278,7 @@ fn harness_configured(
         ui_mode: None,
         framework_ui_modes: Vec::new(),
         formatter: None,
+        scratch_template: None,
         tree_sitter: None,
         language_servers: servers
             .iter()
@@ -419,6 +429,7 @@ async fn files_changed_on_disk_reach_the_servers_of_their_language() {
         &[created.clone(), other],
         &[modified.clone(), outside],
         std::slice::from_ref(&removed),
+        &[h.root.join(".venv/lib/site-packages")],
     );
     eventually(|| !s.notified("workspace/didChangeWatchedFiles").is_empty()).await;
     assert_eq!(
@@ -430,12 +441,81 @@ async fn files_changed_on_disk_reach_the_servers_of_their_language() {
         ])
     );
     // Nothing of its languages: no notification.
-    h.mgr.watched_files_changed(&[h.root.join("b.txt")], &[], &[]);
+    h.mgr.watched_files_changed(&[h.root.join("b.txt")], &[], &[], &[]);
     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
     assert_eq!(s.notified("workspace/didChangeWatchedFiles").len(), 1);
     h.mgr.shutdown_all().await;
 }
 
+/// A server that registers file watchers hears of what they match, inside excluded folders
+/// too (`uv add` into `.venv`, `go get` rewriting `go.mod`); folders outside the project
+/// that relative patterns name are reported for watching; unregistered, it falls back to
+/// its languages' files.
+#[tokio::test(flavor = "multi_thread")]
+async fn registered_file_watchers_choose_the_changes_a_server_hears_of() {
+    let h = harness(&[("mock", incremental_caps())]);
+    let roots = Arc::new(Mutex::new(Vec::<Vec<PathBuf>>::new()));
+    {
+        let roots = roots.clone();
+        h.mgr.set_file_watch_roots_hook(Box::new(move |r| roots.lock().push(r)));
+    }
+    h.open("a.mk", "x");
+    h.wait_status("mock", ServerStatus::Ready).await;
+    let s = h.launcher.state("mock");
+    let outside = tempfile::tempdir().unwrap();
+    let outside = dunce::canonicalize(outside.path()).unwrap();
+    let external = outside.join("venv/lib/site-packages");
+    s.peer()
+        .request::<_, Value>(
+            "client/registerCapability",
+            json!({ "registrations": [{ "id": "w", "method": "workspace/didChangeWatchedFiles", "registerOptions": { "watchers": [
+                { "globPattern": "**/*.{mk,mod}" },
+                { "globPattern": "**/pyrightconfig.json", "kind": 2 },
+                { "globPattern": "**/site-packages/**" },
+                { "globPattern": { "baseUri": uri_of(&external), "pattern": "**" } },
+                { "globPattern": { "baseUri": uri_of(&h.root.join("sub")), "pattern": "**" } },
+            ] } }] }),
+            None,
+        )
+        .await
+        .unwrap();
+    assert_eq!(roots.lock().last(), Some(&vec![external.clone()]), "only folders outside the project");
+
+    let sp = h.root.join(".venv/lib/python3.14/site-packages");
+    let notified = || s.notified("workspace/didChangeWatchedFiles");
+    h.mgr.watched_files_changed(
+        &[h.root.join("go.mod"), h.root.join("notes.txt"), h.root.join("pyrightconfig.json")],
+        &[h.root.join("pyrightconfig.json"), external.join("idna/core.py")],
+        &[h.root.join("old.mk")],
+        &[sp.join("idna"), h.root.join("node_modules/x")],
+    );
+    eventually(|| !notified().is_empty()).await;
+    assert_eq!(
+        notified()[0]["changes"],
+        json!([
+            { "uri": uri_of(&h.root.join("go.mod")), "type": 1 },
+            { "uri": uri_of(&h.root.join("pyrightconfig.json")), "type": 2 },
+            { "uri": uri_of(&external.join("idna/core.py")), "type": 2 },
+            { "uri": uri_of(&h.root.join("old.mk")), "type": 3 },
+            { "uri": uri_of(&sp.join("idna")), "type": 1 },
+        ])
+    );
+
+    s.peer()
+        .request::<_, Value>(
+            "client/unregisterCapability",
+            json!({ "unregisterations": [{ "id": "w", "method": "workspace/didChangeWatchedFiles" }] }),
+            None,
+        )
+        .await
+        .unwrap();
+    assert_eq!(roots.lock().last(), Some(&vec![]));
+    h.mgr.watched_files_changed(&[h.root.join("go.mod"), h.root.join("b.mk")], &[], &[], &[sp.join("idna")]);
+    eventually(|| notified().len() == 2).await;
+    assert_eq!(notified()[1]["changes"], json!([{ "uri": uri_of(&h.root.join("b.mk")), "type": 1 }]));
+    h.mgr.shutdown_all().await;
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn initialize_and_incremental_sync() {
     let h = harness(&[("mock", incremental_caps())]);
@@ -697,6 +777,113 @@ async fn diagnostics_become_events_and_feed_code_actions() {
     assert_eq!(err.kind, ide_core::error::ErrorKind::Unavailable);
 }
 
+/// The diagnostics shown last for `path` by `source`, as their messages.
+fn shown(h: &Harness, path: &Path, source: &str) -> Option<Vec<String>> {
+    h.events.lock().iter().rev().find_map(|e| match e {
+        IdeEvent::Diagnostics { path: p, source: s, items } if **p == *path && s == source => {
+            Some(items.iter().map(|d| d.message.clone()).collect())
+        }
+        _ => None,
+    })
+}
+
+/// Reports a "bad" diagnostic per line containing `bad`, as `textDocument/diagnostic`; answers
+/// `unchanged` when the text is what `previousResultId` was computed from.
+fn pull_responder() -> Responder {
+    Arc::new(|s: &MockState, method: &str, params: &Value| {
+        if method != "textDocument/diagnostic" {
+            return None;
+        }
+        let text = s.docs.lock().get(params["textDocument"]["uri"].as_str()?).cloned()?;
+        let id = format!("{}", text.len() * 31 + text.matches("bad").count());
+        if params["previousResultId"].as_str() == Some(id.as_str()) {
+            return Some(json!({ "kind": "unchanged", "resultId": id }));
+        }
+        let items: Vec<Value> = text
+            .lines()
+            .enumerate()
+            .filter(|(_, l)| l.contains("bad"))
+            .map(|(i, _)| {
+                json!({ "range": {"start":{"line":i,"character":0},"end":{"line":i,"character":3}},
+                        "severity": 1, "message": "bad" })
+            })
+            .collect();
+        Some(json!({ "kind": "full", "resultId": id, "items": items }))
+    })
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn pulled_diagnostics_follow_edits_and_join_pushed_ones() {
+    let mut pull_caps = incremental_caps();
+    pull_caps["diagnosticProvider"] = json!({ "interFileDependencies": false, "workspaceDiagnostics": false });
+    let h = harness(&[("mock", pull_caps), ("push", incremental_caps())]);
+    let s = h.launcher.state("mock");
+    *s.responder.lock() = Some(pull_responder());
+    let (doc, path) = h.open("a.mk", "ok\nbad\n");
+    h.wait_status("mock", ServerStatus::Ready).await;
+    h.wait_status("push", ServerStatus::Ready).await;
+    assert!(s.requested("initialize")[0]["capabilities"]["textDocument"]["diagnostic"].is_object());
+    eventually(|| shown(&h, &path, "mock") == Some(vec!["bad".into()])).await;
+    assert!(h.launcher.state("push").requested("textDocument/diagnostic").is_empty(), "it pulls from providers only");
+
+    // What the server still pushes (rust-analyzer: `cargo check`) shows next to what was pulled.
+    let pushed = json!({ "range": {"start":{"line":0,"character":0},"end":{"line":0,"character":2}},
+                         "severity": 2, "message": "pushed" });
+    s.peer()
+        .notify("textDocument/publishDiagnostics", json!({ "uri": uri_of(&path), "diagnostics": [pushed] }))
+        .unwrap();
+    eventually(|| shown(&h, &path, "mock") == Some(vec!["pushed".into(), "bad".into()])).await;
+
+    // Edits are pulled again once typing pauses.
+    h.mgr.did_change(doc, 2, &[change(rng(0, 0, 0, 0), "bad\n")], &|| unreachable!());
+    eventually(|| shown(&h, &path, "mock") == Some(vec!["pushed".into(), "bad".into(), "bad".into()])).await;
+    // Pulled diagnostics are code actions' context like pushed ones.
+    let _ = h.mgr.code_actions(doc, rng(2, 1, 2, 1), vec![]).await;
+    let ctx = &s.requested("textDocument/codeAction")[0]["context"]["diagnostics"];
+    assert_eq!(ctx.as_array().unwrap().iter().map(|d| d["message"].as_str().unwrap()).collect::<Vec<_>>(), ["bad"]);
+
+    // Saving unchanged text asks with the last result id; `unchanged` keeps what is shown.
+    let pulls = s.requested("textDocument/diagnostic").len();
+    h.mgr.did_save(doc, "bad\nok\nbad\n");
+    eventually(|| s.requested("textDocument/diagnostic").len() > pulls).await;
+    let last = s.requested("textDocument/diagnostic").last().cloned().unwrap();
+    assert!(last["previousResultId"].is_string());
+    tokio::time::sleep(Duration::from_millis(100)).await;
+    assert_eq!(shown(&h, &path, "mock"), Some(vec!["pushed".into(), "bad".into(), "bad".into()]));
+
+    // Closing drops what was pulled; the pushed diagnostics stay the server's to clear.
+    h.mgr.did_close(doc);
+    eventually(|| shown(&h, &path, "mock") == Some(vec!["pushed".into()])).await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn a_cancelled_pull_is_retried_and_a_refresh_pulls_again() {
+    let mut caps = incremental_caps();
+    caps["diagnosticProvider"] = json!({ "interFileDependencies": false, "workspaceDiagnostics": false });
+    let h = harness(&[("mock", caps)]);
+    let s = h.launcher.state("mock");
+    *s.responder.lock() = Some(pull_responder());
+    // Busy indexing: the server cancels and asks to be asked again.
+    s.errors.lock().insert("textDocument/diagnostic".into(), (-32802, "indexing".into()));
+    let (_doc, path) = h.open("a.mk", "bad\n");
+    h.wait_status("mock", ServerStatus::Ready).await;
+    eventually(|| s.requested("textDocument/diagnostic").len() >= 2).await;
+    assert_eq!(shown(&h, &path, "mock"), None);
+    s.errors.lock().clear();
+    eventually(|| shown(&h, &path, "mock") == Some(vec!["bad".into()])).await;
+
+    // `workspace/diagnostic/refresh` (e.g. after a project reload) pulls open files again.
+    *s.responder.lock() = Some(Arc::new(|_: &MockState, method: &str, _: &Value| {
+        (method == "textDocument/diagnostic").then(|| {
+            json!({ "kind": "full", "items": [
+            { "range": {"start":{"line":0,"character":0},"end":{"line":0,"character":3}}, "message": "reloaded" } ] })
+        })
+    }));
+    let refreshed: Value = s.peer().request("workspace/diagnostic/refresh", Value::Null, None).await.unwrap();
+    assert_eq!(refreshed, Value::Null);
+    eventually(|| shown(&h, &path, "mock") == Some(vec!["reloaded".into()])).await;
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn apply_edit_hook_and_server_requests() {
     let h = harness(&[("mock", incremental_caps())]);
@@ -1040,6 +1227,54 @@ async fn preparation_refreshes_config_and_survives_unchanged_settings() {
     assert_eq!(h.launcher.state("mock").launches.load(Ordering::SeqCst), 1);
 }
 
+/// Intelephense applies the PHP version only to documents it parses after reading its
+/// configuration: once that is answered, servers that opt in get their open documents again.
+#[tokio::test(flavor = "multi_thread")]
+async fn configuration_answer_resyncs_open_documents_of_opted_in_servers() {
+    let h = harness_configured("mock", "mk", &[("mock", incremental_caps()), ("extra", incremental_caps())], |cfg| {
+        cfg.resync_on_configuration = cfg.name == "mock"
+    });
+    let (doc, path) = h.open("a.mk", "enum A {}");
+    let uri = uri_of(&path);
+    let (s, extra) = (h.launcher.state("mock"), h.launcher.state("extra"));
+    h.wait_status("mock", ServerStatus::Ready).await;
+    h.wait_status("extra", ServerStatus::Ready).await;
+    eventually(|| s.docs.lock().contains_key(&uri) && extra.docs.lock().contains_key(&uri)).await;
+    h.mgr.did_change(doc, 2, &[change(rng(0, 9, 0, 9), "\n")], &|| unreachable!());
+    eventually(|| s.notified("textDocument/didChange").len() == 1).await;
+
+    let items = |section: &str| json!({ "items": [{ "section": section }] });
+    let options = json!([{ "flag": true, "nested": { "deep": 1 } }]);
+    let answer: Value = extra.peer().request("workspace/configuration", items("extra"), None).await.unwrap();
+    assert_eq!(answer, options);
+    // The mock handles what arrives in order, answers included: a re-sync sent before the
+    // answer would hold it back here.
+    let gate = Arc::new(Gate::default());
+    *s.held.lock() = Some(("textDocument/didChange".into(), gate.clone()));
+    let peer = s.peer();
+    let request = peer.request::<_, Value>("workspace/configuration", items("mock"), None);
+    let answer = tokio::time::timeout(Duration::from_secs(10), request).await.expect("re-sync sent before the answer");
+    assert_eq!(answer.unwrap(), options);
+    eventually(|| gate.entered()).await;
+    assert_eq!(s.notified("textDocument/didChange").len(), 1);
+    gate.open();
+    eventually(|| s.notified("textDocument/didChange").len() == 2).await;
+    assert_eq!(
+        s.notified("textDocument/didChange")[1],
+        json!({ "textDocument": { "uri": uri, "version": 2 }, "contentChanges": [{ "text": "enum A {}\n" }] })
+    );
+    assert_eq!(s.docs.lock()[&uri], "enum A {}\n");
+
+    // A notification sent after both answers reaches the servers after anything they triggered.
+    h.mgr.did_save(doc, "enum A {}\n");
+    eventually(|| extra.notified("textDocument/didSave").len() == 1 && s.notified("textDocument/didSave").len() == 1)
+        .await;
+    assert_eq!(s.notified("textDocument/didChange").len(), 2, "one re-sync per answer");
+    let methods: Vec<String> = extra.notifications.lock().iter().map(|(m, _)| m.clone()).collect();
+    assert_eq!(methods, ["initialized", "textDocument/didOpen", "textDocument/didChange", "textDocument/didSave"]);
+    assert_eq!(s.launches.load(Ordering::SeqCst), 1);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn settings_changes_reach_servers_without_restarts() {
     let h = harness(&[("mock", incremental_caps()), ("extra", incremental_caps())]);
@@ -2101,6 +2336,41 @@ async fn will_and_did_rename_files_honour_filters() {
     );
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn will_rename_files_asks_tsserver_when_the_server_has_no_file_operations() {
+    // vtsls: no `willRename` filters, but tsserver's `getEditsForFileRename` through its command.
+    let mut caps = incremental_caps();
+    caps["executeCommandProvider"] = json!({ "commands": ["typescript.tsserverRequest"] });
+    let h = harness_configured("typescript", "ts", &[("vtsls", caps)], |cfg| cfg.tsserver_project = true);
+    let money = h.root.join("money.ts");
+    let index = h.root.join("index.ts");
+    std::fs::write(&money, "export const one = 1;\n").unwrap();
+    std::fs::write(&index, "import { one } from \"./money\";\n").unwrap();
+    let s = h.launcher.state("vtsls");
+    *s.responder.lock() = Some(Arc::new(move |_, method, p| {
+        (method == "workspace/executeCommand" && p["arguments"][0] == "getEditsForFileRename").then(|| {
+            json!({ "success": true, "body": [{ "fileName": p["arguments"][1]["oldFilePath"].as_str().unwrap().replace("money.ts", "index.ts"),
+                "textChanges": [{ "start": { "line": 1, "offset": 22 }, "end": { "line": 1, "offset": 29 }, "newText": "./lib/money" }] }] })
+        })
+    }));
+    let to = h.root.join("lib/money.ts");
+    let result =
+        h.mgr.will_rename_files(&[(money.clone(), to.clone())], ide_core::CancellationToken::new()).await.unwrap();
+    assert_eq!(result.servers, vec!["vtsls".to_owned()]);
+    assert!(result.errors.is_empty(), "{:?}", result.errors);
+    match &result.edit.files[..] {
+        [FileEdit::Edit { path, edits, version: None }] => {
+            assert_eq!(path, &index);
+            assert_eq!(edits[0].range, rng(0, 21, 0, 28));
+            assert_eq!(edits[0].new_text, "./lib/money");
+        }
+        other => panic!("unexpected edit {other:?}"),
+    }
+    let asked = s.requested("workspace/executeCommand");
+    let asked = asked.iter().find(|r| r["arguments"][0] == "getEditsForFileRename").unwrap();
+    assert_eq!(asked["arguments"][1], json!({ "oldFilePath": money, "newFilePath": to }));
+}
+
 // ------------------------------------------------------------------ inspect code
 
 struct InspectTestHost {
@@ -3338,3 +3608,90 @@ async fn jdtls_import_failure_names_reserved_device_files_on_windows() {
     }
     let _ = std::fs::remove_file(&nul);
 }
+
+/// Pull Members Up / Push Members Down: the extension's answers, refusals and edits.
+#[tokio::test(flavor = "multi_thread")]
+async fn java_hierarchy_refactorings_use_the_extension_commands() {
+    let mut caps = incremental_caps();
+    caps["executeCommandProvider"] =
+        json!({"commands": ["openidea.java.hierarchy.members", "openidea.java.hierarchy.refactor"]});
+    let h = harness_for("java", "java", &[("jdtls", caps)], &[]);
+    let s = h.launcher.state("jdtls");
+    *s.responder.lock() = Some(Arc::new(|_, method, params| {
+        if method != "workspace/executeCommand" {
+            return None;
+        }
+        let args = params["arguments"].as_array().unwrap();
+        let uri = args[0].clone();
+        Some(match (params["command"].as_str().unwrap(), args[1].as_u64().unwrap()) {
+            (_, 9) => json!({"refused": "Type has no super types."}),
+            ("openidea.java.hierarchy.members", _) => json!({
+                "className": "Dog",
+                "targets": [{"id": "=p/src<{Animal.java[Animal", "name": "Animal", "qualifiedName": "Animal", "interface": false}],
+                "members": [{"id": "=p/src<{Dog.java[Dog~bark", "label": "bark() : String", "kind": "method", "selected": true, "abstractable": true}],
+            }),
+            _ => json!({
+                "problems": [{"severity": "warning", "message": "The visibility of field 'tail' will be changed to package."}],
+                "edit": {"changes": {uri.as_str().unwrap(): [
+                    {"range": {"start": {"line": 0, "character": 0}, "end": {"line": 0, "character": 5}}, "newText": "class"}
+                ]}},
+            }),
+        })
+    }));
+    let text =
+        format!("class Dog extends Animal {{ String bark() {{ return \"\"; }} }}{}class Lonely {{}}", "\n".repeat(9));
+    let (doc, path) = h.open("Dog.java", &text);
+    h.wait_status("jdtls", ServerStatus::Ready).await;
+    eventually(|| s.docs.lock().len() == 1).await;
+
+    let info =
+        h.mgr.hierarchy_members(doc, Pos::new(0, 35), HierarchyRefactoring::PullUp, Default::default()).await.unwrap();
+    assert_eq!(info.class_name, "Dog");
+    assert_eq!(info.targets[0].name, "Animal");
+    assert!(info.members[0].selected && info.members[0].abstractable);
+    assert_eq!(info.members[0].kind, HierarchyMemberKind::Method);
+    let sent = s.requested("workspace/executeCommand");
+    assert_eq!(sent[0]["arguments"], json!([uri_of(&path), 0, 35, "pullUp"]));
+
+    let choices = vec![HierarchyChoice { id: info.members[0].id.clone(), make_abstract: true }];
+    let done = h
+        .mgr
+        .hierarchy_refactor(
+            doc,
+            Pos::new(0, 35),
+            HierarchyRefactoring::PushDown,
+            Some(info.targets[0].id.clone()),
+            choices,
+            Default::default(),
+        )
+        .await
+        .unwrap();
+    assert_eq!(done.problems[0].severity, ProblemSeverity::Warning);
+    let edit = done.edit.unwrap();
+    assert!(matches!(&edit.files[..], [FileEdit::Edit { path: p, edits, .. }] if p == &path && edits.len() == 1));
+    let sent = s.requested("workspace/executeCommand");
+    assert_eq!(
+        sent[1]["arguments"],
+        json!([uri_of(&path), 0, 35, "pushDown", "=p/src<{Animal.java[Animal",
+            [{"id": "=p/src<{Dog.java[Dog~bark", "abstract": true}]])
+    );
+
+    let refused = h.mgr.hierarchy_members(doc, Pos::new(9, 0), HierarchyRefactoring::PullUp, Default::default()).await;
+    let e = refused.unwrap_err();
+    assert_eq!(e.kind, ide_core::error::ErrorKind::InvalidInput);
+    assert_eq!(e.message, "Type has no super types.");
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn hierarchy_refactorings_name_the_servers_without_them() {
+    let h = harness(&[("plain", incremental_caps())]);
+    let (doc, _) = h.open("a.mk", "class A {}");
+    h.wait_status("plain", ServerStatus::Ready).await;
+    let e = h
+        .mgr
+        .hierarchy_members(doc, Pos::new(0, 6), HierarchyRefactoring::PullUp, Default::default())
+        .await
+        .unwrap_err();
+    assert_eq!(e.kind, ide_core::error::ErrorKind::Unavailable);
+    assert_eq!(e.message, "plain doesn't support Pull Members Up");
+}
diff --git a/crates/ide-lsp/tests/real_servers.rs b/crates/ide-lsp/tests/real_servers.rs
index 35fa3314..589b7414 100644
--- a/crates/ide-lsp/tests/real_servers.rs
+++ b/crates/ide-lsp/tests/real_servers.rs
@@ -56,6 +56,7 @@ fn lang(id: &str, ext: &str, server: LanguageServerConfig) -> LanguageConfig {
         ui_mode: None,
         framework_ui_modes: Vec::new(),
         formatter: None,
+        scratch_template: None,
         tree_sitter: None,
         language_servers: vec![server],
         debugger: None,
@@ -134,6 +135,7 @@ async fn missing_binary_is_reported_with_install_hint() {
         max_java: None,
         launch_error: None,
         tsserver_project: false,
+        resync_on_configuration: false,
         pinned: None,
     };
     let (mgr, events) = manager(dir.path(), LanguageRegistry::from_configs(vec![lang("nope", "nope", server)]));
@@ -403,6 +405,7 @@ async fn typescript_language_server_end_to_end() {
         max_java: None,
         launch_error: None,
         tsserver_project: false,
+        resync_on_configuration: false,
         pinned: None,
     };
     let (mgr, events) = manager(&root, LanguageRegistry::from_configs(vec![lang("typescript", "ts", server)]));
@@ -452,6 +455,7 @@ fn npm_server(tools: &Path, name: &str, bin: &str, init: Option<serde_json::Valu
         max_java: None,
         launch_error: None,
         tsserver_project: false,
+        resync_on_configuration: false,
         pinned: None,
     }
 }
diff --git a/crates/ide-plugin/src/runtime.rs b/crates/ide-plugin/src/runtime.rs
index fdb48019..55c38e33 100644
--- a/crates/ide-plugin/src/runtime.rs
+++ b/crates/ide-plugin/src/runtime.rs
@@ -105,6 +105,7 @@ pub trait HostApi: Send + Sync {
         args: Vec<String>,
         cwd: Option<&Path>,
     ) -> Result<(), HostError>;
+    fn open_location(&self, client: Option<&str>, path: &Path, line: u32, column: u32) -> Result<(), HostError>;
     /// A setting of the plugin as JSON (project over global over the schema default).
     fn setting(&self, root: Option<&Path>, key: &str) -> Option<String>;
 }
@@ -467,7 +468,6 @@ const MAX_SYNTAX_ITEMS: usize = 200_000;
 const MAX_BATCH: usize = 1000;
 
 fn event_to_wit(e: WorkbenchEvent) -> wit_events::Event {
-    use crate::types::ActionSource as S;
     match e {
         WorkbenchEvent::FileOpened(p) => wit_events::Event::FileOpened(p),
         WorkbenchEvent::FileSaved(p) => wit_events::Event::FileSaved(p),
@@ -477,14 +477,7 @@ fn event_to_wit(e: WorkbenchEvent) -> wit_events::Event {
         WorkbenchEvent::ActionPerformed(a) => wit_events::Event::ActionPerformed(wit_events::ActionPerformed {
             action: a.action,
             title: a.title,
-            source: match a.source {
-                S::Keyboard => wit_events::ActionSource::Keyboard,
-                S::Menu => wit_events::ActionSource::Menu,
-                S::Toolbar => wit_events::ActionSource::Toolbar,
-                S::ContextMenu => wit_events::ActionSource::ContextMenu,
-                S::Search => wit_events::ActionSource::Search,
-                S::Other => wit_events::ActionSource::Other,
-            },
+            source: a.source.name().to_owned(),
             shortcut: a.shortcut,
         }),
     }
@@ -670,9 +663,17 @@ impl Runtime {
                 detail: i.detail.map(|d| clip(d, MAX_TITLE)),
                 kind: i.kind.map(|k| clip(k, 32)),
                 insert_text: clip(i.insert_text, 64 << 10),
+                snippet: i.snippet,
                 replace: i.replace.map(range_from_wit),
                 sort_text: i.sort_text.map(|t| clip(t, 64)),
+                filter_text: i.filter_text.map(|t| clip(t, MAX_TITLE)),
                 documentation: i.documentation.map(|d| clip(d, 16 << 10)),
+                additional_edits: i
+                    .additional_edits
+                    .into_iter()
+                    .take(MAX_ADDITIONAL_EDITS)
+                    .map(edit_from_wit)
+                    .collect(),
             })
             .collect())
     }
@@ -699,27 +700,20 @@ impl Runtime {
     ) -> Result<Vec<CodeAction>, CallError> {
         let d = doc_to_wit(doc);
         let actions = self.provider_call(timeout, |p, s| p.call_code_actions(s, &d, range_to_wit(selection)))?;
-        Ok(actions
-            .into_iter()
-            .take(MAX_PROVIDER_ITEMS)
-            .map(|a| CodeAction {
-                title: clip(a.title, MAX_TITLE),
-                kind: a.kind.map(|k| clip(k, 64)),
-                preferred: a.preferred,
-                edits: a
-                    .edits
-                    .into_iter()
-                    .map(|f| {
-                        let edits = f
-                            .edits
-                            .into_iter()
-                            .map(|e| ide_core::TextEdit { range: range_from_wit(e.range), new_text: e.text })
-                            .collect();
-                        (std::path::PathBuf::from(f.path), edits)
-                    })
-                    .collect(),
-            })
-            .collect())
+        Ok(actions.into_iter().take(MAX_PROVIDER_ITEMS).map(code_action_from_wit).collect())
+    }
+
+    /// The edits of an action `provide_code_actions` returned with `data`.
+    pub fn resolve_code_action(
+        &mut self,
+        doc: &ProviderDocument,
+        action: &CodeAction,
+        timeout: Duration,
+    ) -> Result<CodeAction, CallError> {
+        let d = doc_to_wit(doc);
+        let a = code_action_to_wit(action);
+        let resolved = self.provider_call(timeout, |p, s| p.call_resolve_code_action(s, &d, &a))?;
+        resolved.map(code_action_from_wit).map_err(|e| CallError::Guest(e.into()))
     }
 
     pub fn provide_definition(
@@ -968,6 +962,47 @@ const MAX_VIEW_ITEMS: usize = 20_000;
 const MAX_CELL: usize = 64 << 10;
 const MAX_HTML: usize = 4 << 20;
 
+/// Most additional edits of a completion item.
+const MAX_ADDITIONAL_EDITS: usize = 100;
+
+fn edit_from_wit(e: wit_types::TextEdit) -> ide_core::TextEdit {
+    ide_core::TextEdit { range: range_from_wit(e.range), new_text: e.text }
+}
+
+fn code_action_from_wit(a: wit_prov::CodeAction) -> CodeAction {
+    CodeAction {
+        title: clip(a.title, MAX_TITLE),
+        kind: a.kind.map(|k| clip(k, 64)),
+        preferred: a.preferred,
+        edits: a
+            .edits
+            .into_iter()
+            .map(|f| (std::path::PathBuf::from(f.path), f.edits.into_iter().map(edit_from_wit).collect()))
+            .collect(),
+        data: a.data.map(|d| clip(d, 64 << 10)),
+    }
+}
+
+fn code_action_to_wit(a: &CodeAction) -> wit_prov::CodeAction {
+    wit_prov::CodeAction {
+        title: a.title.clone(),
+        kind: a.kind.clone(),
+        preferred: a.preferred,
+        edits: a
+            .edits
+            .iter()
+            .map(|(path, edits)| wit_prov::FileEdit {
+                path: path.to_string_lossy().into_owned(),
+                edits: edits
+                    .iter()
+                    .map(|e| wit_types::TextEdit { range: range_to_wit(e.range), text: e.new_text.clone() })
+                    .collect(),
+            })
+            .collect(),
+        data: a.data.clone(),
+    }
+}
+
 fn opt_clip(s: Option<String>, max: usize) -> Option<String> {
     s.map(|s| clip(s, max))
 }
@@ -975,6 +1010,9 @@ fn opt_clip(s: Option<String>, max: usize) -> Option<String> {
 fn view_from_wit(v: wit_vt::View) -> View {
     let body = match v.body {
         wit_vt::Body::Message(m) => ViewBody::Message(clip(m, 16 << 10)),
+        wit_vt::Body::Other(e) => {
+            ViewBody::Message(format!("This view needs a newer version of OpenIDEA ({}).", clip(e.kind, 64)))
+        }
         wit_vt::Body::Tree(items) => ViewBody::Tree(
             items
                 .into_iter()
@@ -1006,10 +1044,8 @@ fn view_from_wit(v: wit_vt::View) -> View {
             fields
                 .into_iter()
                 .take(MAX_VIEW_ITEMS)
-                .map(|f| ViewField {
-                    key: clip(f.key, 128),
-                    label: clip(f.label, MAX_TITLE),
-                    value: match f.value {
+                .filter_map(|f| {
+                    let value = match f.value {
                         wit_vt::FieldValue::Text(t) => FieldValue::Text(clip(t, MAX_CELL)),
                         wit_vt::FieldValue::Multiline(t) => FieldValue::Multiline(clip(t, 1 << 20)),
                         wit_vt::FieldValue::Checkbox(b) => FieldValue::Checkbox(b),
@@ -1017,7 +1053,10 @@ fn view_from_wit(v: wit_vt::View) -> View {
                             options: options.into_iter().take(1000).map(|o| clip(o, MAX_TITLE)).collect(),
                             selected: clip(selected, MAX_TITLE),
                         },
-                    },
+                        // A field type of a newer API: left out.
+                        wit_vt::FieldValue::Other(_) => return None,
+                    };
+                    Some(ViewField { key: clip(f.key, 128), label: clip(f.label, MAX_TITLE), value })
                 })
                 .collect(),
         ),
@@ -1067,3 +1106,26 @@ fn event_to_wit_view(e: ViewEvent) -> wit_vt::ViewEvent {
         ViewEvent::Message { text } => W::Message(text),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn ext(kind: &str) -> wit_types::Extension {
+        wit_types::Extension { kind: kind.into(), data: "{}".into() }
+    }
+
+    #[test]
+    fn bodies_and_fields_of_a_newer_api_degrade() {
+        let view = |body| wit_vt::View { toolbar: Vec::new(), body, status: None };
+        let shown = view_from_wit(view(wit_vt::Body::Other(ext("markdown"))));
+        assert_eq!(shown.body, ViewBody::Message("This view needs a newer version of OpenIDEA (markdown).".into()));
+        let field = |key: &str, value| wit_vt::Field { key: key.into(), label: key.into(), value };
+        let form = view_from_wit(view(wit_vt::Body::Form(vec![
+            field("color", wit_vt::FieldValue::Other(ext("color"))),
+            field("name", wit_vt::FieldValue::Text("n".into())),
+        ])));
+        let ViewBody::Form(fields) = form.body else { panic!("a form") };
+        assert_eq!(fields.iter().map(|f| f.key.as_str()).collect::<Vec<_>>(), ["name"], "unknown fields are left out");
+    }
+}
diff --git a/crates/ide-plugin/src/types.rs b/crates/ide-plugin/src/types.rs
index 9b4dfed0..b1d7b215 100644
--- a/crates/ide-plugin/src/types.rs
+++ b/crates/ide-plugin/src/types.rs
@@ -126,6 +126,20 @@ pub enum ActionSource {
     Other,
 }
 
+impl ActionSource {
+    /// As plugins see it.
+    pub fn name(self) -> &'static str {
+        match self {
+            Self::Keyboard => "keyboard",
+            Self::Menu => "menu",
+            Self::Toolbar => "toolbar",
+            Self::ContextMenu => "context-menu",
+            Self::Search => "search",
+            Self::Other => "other",
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct ActionPerformed {
@@ -303,6 +317,16 @@ pub fn net_host(url: &str) -> Result<String, String> {
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn the_restart_backoff_doubles_up_to_a_minute() {
+        let limits = Limits { restart_backoff: Duration::from_millis(150), ..Limits::default() };
+        let waits: Vec<u128> = (1..=4).map(|n| limits.backoff(n).as_millis()).collect();
+        assert_eq!(waits, [150, 300, 600, 1200]);
+        assert_eq!(limits.backoff(30), Duration::from_millis(150 * 64), "the factor stops growing");
+        let long = Limits { restart_backoff: Duration::from_secs(10), ..Limits::default() };
+        assert_eq!(long.backoff(5), Duration::from_secs(60));
+    }
+
     use super::*;
 
     #[test]
@@ -338,9 +362,14 @@ pub struct CompletionItem {
     /// WIT `completion-kind` name (`method`, `keyword`, …).
     pub kind: Option<String>,
     pub insert_text: String,
+    /// `insert_text` has tab stops and placeholders.
+    pub snippet: bool,
     pub replace: Option<ide_core::Range>,
     pub sort_text: Option<String>,
+    pub filter_text: Option<String>,
     pub documentation: Option<String>,
+    /// Applied with the item elsewhere in the document (an import).
+    pub additional_edits: Vec<ide_core::TextEdit>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -355,6 +384,8 @@ pub struct CodeAction {
     pub kind: Option<String>,
     pub preferred: bool,
     pub edits: Vec<(PathBuf, Vec<ide_core::TextEdit>)>,
+    /// The plugin's reference: the edits come from `resolve_code_action`.
+    pub data: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/crates/ide-plugin/src/wit_host.rs b/crates/ide-plugin/src/wit_host.rs
index 265f992a..bcd53cc8 100644
--- a/crates/ide-plugin/src/wit_host.rs
+++ b/crates/ide-plugin/src/wit_host.rs
@@ -440,20 +440,11 @@ impl vcs::Host for StoreData {
     }
 }
 
-fn kind_from_wit(k: events::EventKind) -> EventKind {
-    match k {
-        events::EventKind::FileOpened => EventKind::FileOpened,
-        events::EventKind::FileSaved => EventKind::FileSaved,
-        events::EventKind::EditorFocused => EventKind::EditorFocused,
-        events::EventKind::ActionPerformed => EventKind::ActionPerformed,
-        events::EventKind::VcsChanged => EventKind::VcsChanged,
-        events::EventKind::Scheduled => EventKind::Scheduled,
-    }
-}
-
 impl events::Host for StoreData {
-    fn subscribe(&mut self, kind: events::EventKind) -> Fallible<()> {
-        let kind = kind_from_wit(kind);
+    fn subscribe(&mut self, kind: String) -> Fallible<()> {
+        let Some(kind) = EventKind::parse(&kind) else {
+            return Ok(Err(wit::Error::Invalid(format!("no event kind {kind:?} in this OpenIDEA"))));
+        };
         if let Some(cap) = kind.capability()
             && let Err(e) = self.require(cap)
         {
@@ -463,8 +454,10 @@ impl events::Host for StoreData {
         Ok(Ok(()))
     }
 
-    fn unsubscribe(&mut self, kind: events::EventKind) -> wasmtime::Result<()> {
-        self.host.subscribe(kind_from_wit(kind), false);
+    fn unsubscribe(&mut self, kind: String) -> wasmtime::Result<()> {
+        if let Some(kind) = EventKind::parse(&kind) {
+            self.host.subscribe(kind, false);
+        }
         Ok(())
     }
 }
@@ -542,10 +535,10 @@ impl diagnostics::Host for StoreData {
                     diagnostics::Severity::Hint => ide_core::Severity::Hint,
                 },
                 message: clip(d.message, 4096),
-                source: Some(source.clone()),
+                source: Some(d.source.map_or_else(|| source.clone(), |s| clip(s, 128))),
                 code: d.code.map(|c| clip(c, 128)),
-                unnecessary: false,
-                deprecated: false,
+                unnecessary: d.tags.iter().any(|t| t == "unnecessary"),
+                deprecated: d.tags.iter().any(|t| t == "deprecated"),
                 server: Some(source.clone()),
             })
             .collect();
@@ -647,6 +640,21 @@ impl views::Host for StoreData {
         let title = clip(title, crate::runtime::MAX_TITLE);
         Ok(self.host.open_terminal(client.as_deref(), title, &program, args, cwd.as_deref()).map_err(to_wit))
     }
+
+    fn open_location(&mut self, path: String, line: u32, column: u32) -> Fallible<()> {
+        if let Err(e) = self.require(Capability::ProjectRead) {
+            return Ok(Err(e));
+        }
+        let Some(root) = self.invocation.workspace_root.clone() else {
+            return Ok(Err(wit::Error::Invalid("no project is open in this window".into())));
+        };
+        let real = match sandbox::resolve_in_root(&root, &path) {
+            Ok(real) => real,
+            Err(e) => return Ok(Err(wit::Error::Invalid(e))),
+        };
+        let client = self.invocation.client.clone();
+        Ok(self.host.open_location(client.as_deref(), &real, line, column).map_err(to_wit))
+    }
 }
 
 impl settings::Host for StoreData {
diff --git a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm
index b0c8caee..368de83b 100644
Binary files a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm differ
diff --git a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources
index 2edfa822..f811c07c 100644
--- a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources
+++ b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources
@@ -1 +1 @@
-86dfe70a30ab1f7955a16e96c1b32c8be663456b871cc4d3bed7dc6052c062da
+1f7402e2b1b4602e4073eb61837c3dc8840f9a4f7275d800dbd6fcf6ce5e40c3
diff --git a/crates/ide-plugin/tests/fixtures/hello/src/lib.rs b/crates/ide-plugin/tests/fixtures/hello/src/lib.rs
index 26f75410..414c223e 100644
--- a/crates/ide-plugin/tests/fixtures/hello/src/lib.rs
+++ b/crates/ide-plugin/tests/fixtures/hello/src/lib.rs
@@ -1,5 +1,5 @@
 //! Sample OpenIDEA plugin, written with the `openidea-plugin` SDK.
-//! Build with `openidea-plugin build plugins/hello` (see plugins/README.md).
+//! Build with `openidea-plugin build crates/ide-plugin/tests/fixtures/hello` (see plugins/README.md).
 
 use openidea_plugin::views::{Body, Button, TreeItem, View, ViewEvent, Viewport, Views};
 use openidea_plugin::{Context, Error, Invocation, LogLevel, NotificationLevel, Plugin, host, register_plugin};
diff --git a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm
index aaa324d9..0899f53e 100644
Binary files a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm differ
diff --git a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources
index 61e1857b..3a0de87f 100644
--- a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources
+++ b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources
@@ -1 +1 @@
-0dacb82ac35c1f132dc66e85dbf0663b729f818279d3b32cd06403e502fbf880
+4f6cd5b5e0c12e7dcbccf66a6ad97276bf968bc3ad26f0fd08e1f7765cbfee14
diff --git a/crates/ide-plugin/tests/fixtures/jobs/plugin.toml b/crates/ide-plugin/tests/fixtures/jobs/plugin.toml
index 8a3d2c89..8fc68206 100644
--- a/crates/ide-plugin/tests/fixtures/jobs/plugin.toml
+++ b/crates/ide-plugin/tests/fixtures/jobs/plugin.toml
@@ -12,6 +12,7 @@ activation = ["on-view:jobs", "on-command:*"]
 
 [capabilities]
 required = ["process:jobs"]
+optional = ["project.read"]
 
 [[contributes.views]]
 id = "jobs"
diff --git a/crates/ide-plugin/tests/fixtures/jobs/src/lib.rs b/crates/ide-plugin/tests/fixtures/jobs/src/lib.rs
index b6686393..fe28d779 100644
--- a/crates/ide-plugin/tests/fixtures/jobs/src/lib.rs
+++ b/crates/ide-plugin/tests/fixtures/jobs/src/lib.rs
@@ -64,6 +64,8 @@ impl Views for Jobs {
                 return self.follow();
             }
             ViewEvent::Button(b) if b == "follow" => return self.follow(),
+            ViewEvent::Button(b) if b == "log" => return host::open_location("jobs.log", 2, 4),
+            ViewEvent::Button(b) if b == "outside" => return host::open_location("../outside.log", 0, 0),
             _ => return Ok(()),
         }
         host::refresh_view(VIEW);
diff --git a/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm
index d6018357..37db117e 100644
Binary files a/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm differ
diff --git a/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources
index 1c5ed64f..f95fc1ae 100644
--- a/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources
+++ b/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources
@@ -1 +1 @@
-0ad2e4c6977a576b7eb27fc1e535fd056dd9da64bdfe6cfda9ca9f57537d0384
+3d4dd1b6365c7fbafdd3c1f99f4405e5ee40fc5e56c97da960adfe7af2e7edb8
diff --git a/crates/ide-plugin/tests/fixtures/misbehave/plugin.toml b/crates/ide-plugin/tests/fixtures/misbehave/plugin.toml
index 29dba7d6..1eae84d2 100644
--- a/crates/ide-plugin/tests/fixtures/misbehave/plugin.toml
+++ b/crates/ide-plugin/tests/fixtures/misbehave/plugin.toml
@@ -40,3 +40,11 @@ title = "insert"
 [[contributes.commands]]
 id = "cancel"
 title = "cancel"
+
+[[contributes.commands]]
+id = "subscribe"
+title = "subscribe"
+
+[[contributes.commands]]
+id = "diagnose"
+title = "diagnose"
diff --git a/crates/ide-plugin/tests/fixtures/misbehave/src/lib.rs b/crates/ide-plugin/tests/fixtures/misbehave/src/lib.rs
index cd6d6511..890bf845 100644
--- a/crates/ide-plugin/tests/fixtures/misbehave/src/lib.rs
+++ b/crates/ide-plugin/tests/fixtures/misbehave/src/lib.rs
@@ -14,7 +14,9 @@ wit_bindgen::generate!({
     generate_all,
 });
 
-use exports::openidea::plugin::providers::{self, CodeAction, CompletionItem, Document, InlineSuggestion, LineMarker};
+use exports::openidea::plugin::providers::{
+    self, CodeAction, CompletionItem, Document, FileEdit, InlineSuggestion, LineMarker,
+};
 use exports::openidea::plugin::syntax_provider::{self, Fold, Symbol, Token};
 use exports::openidea::plugin::{commands, event_handler, lifecycle};
 use openidea::plugin::{invocation::Invocation, types};
@@ -67,6 +69,23 @@ impl commands::Guest for Misbehave {
             }
             // The user gave up: not the plugin failing.
             "cancel" => Err(types::Error::Cancelled),
+            // Event kinds are names: one this IDE doesn't know is refused.
+            "subscribe" => openidea::plugin::events::subscribe(&arg.unwrap_or_default()).map(|()| None),
+            // Tagged problems from another tool on the line 0 of `arg`.
+            "diagnose" => {
+                use openidea::plugin::diagnostics::{self, Diagnostic, Severity};
+                let start = types::Position { line: 0, character: 0 };
+                let d = Diagnostic {
+                    range: types::Range { start, end: start },
+                    severity: Severity::Warning,
+                    message: "unused".into(),
+                    code: None,
+                    source: Some("lint".into()),
+                    tags: vec!["unnecessary".into(), "glowing".into()],
+                    related: Vec::new(),
+                };
+                diagnostics::publish(&arg.unwrap_or_default(), &[d]).map(|()| None)
+            }
             other => Err(types::Error::NotFound(format!("command {other}"))),
         }
     }
@@ -113,14 +132,24 @@ impl syntax_provider::Guest for Misbehave {
 impl providers::Guest for Misbehave {
     fn completion(doc: Document, _at: types::Position, _trigger: Option<String>) -> Vec<CompletionItem> {
         behave(&doc.text);
+        // `rich`: a snippet that also adds an import.
+        let rich = doc.text == "rich";
+        let start = types::Position { line: 0, character: 0 };
         vec![CompletionItem {
             label: doc.path.clone(),
             detail: None,
             kind: Some("keyword".into()),
-            insert_text: doc.path,
+            insert_text: if rich { "f(${1:x})$0".into() } else { doc.path },
+            snippet: rich,
             replace: None,
             sort_text: None,
+            filter_text: rich.then(|| "fun".into()),
             documentation: None,
+            additional_edits: if rich {
+                vec![types::TextEdit { range: types::Range { start, end: start }, text: "use f;\n".into() }]
+            } else {
+                Vec::new()
+            },
         }]
     }
 
@@ -128,8 +157,27 @@ impl providers::Guest for Misbehave {
         None
     }
 
-    fn code_actions(_doc: Document, _selection: types::Range) -> Vec<CodeAction> {
-        Vec::new()
+    /// `lazy`: one action whose edits come from `resolve-code-action`.
+    fn code_actions(doc: Document, _selection: types::Range) -> Vec<CodeAction> {
+        if doc.text != "lazy" {
+            return Vec::new();
+        }
+        vec![CodeAction {
+            title: "Fix later".into(),
+            kind: Some("quickfix".into()),
+            preferred: false,
+            edits: Vec::new(),
+            data: Some("fix".into()),
+        }]
+    }
+
+    fn resolve_code_action(doc: Document, action: CodeAction) -> Result<CodeAction, types::Error> {
+        if action.data.as_deref() != Some("fix") {
+            return Err(types::Error::Invalid("not one of mine".into()));
+        }
+        let start = types::Position { line: 0, character: 0 };
+        let edit = types::TextEdit { range: types::Range { start, end: start }, text: "fixed ".into() };
+        Ok(CodeAction { edits: vec![FileEdit { path: doc.path, edits: vec![edit] }], ..action })
     }
 
     fn definition(_doc: Document, _at: types::Position) -> Vec<types::Location> {
diff --git a/crates/ide-remote/src/mapping.rs b/crates/ide-remote/src/mapping.rs
index c8a2c36c..ce814b1c 100644
--- a/crates/ide-remote/src/mapping.rs
+++ b/crates/ide-remote/src/mapping.rs
@@ -143,7 +143,10 @@ impl Mappings {
         }
         let (l, rest, _) = best?;
         // A `..` from the server must not leave the local folder.
-        if rest.split('/').any(|s| s == ".." || s == ".") {
+        if rest.split('/').filter(|s| !s.is_empty()).any(|s| {
+            let mut components = Path::new(s).components();
+            !matches!(components.next(), Some(Component::Normal(_))) || components.next().is_some()
+        }) {
             return None;
         }
         Some(rest.split('/').filter(|s| !s.is_empty()).fold(l.clone(), |p, s| p.join(s)))
@@ -307,6 +310,43 @@ mod tests {
         assert_eq!(local_folder("/src/", &root), Some(root.join("src")));
     }
 
+    #[cfg(windows)]
+    #[test]
+    fn native_anchors_never_replace_the_project_relative_fallback() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path().join("project");
+        let inside = root.join("src");
+        let outside = tmp.path().join("outside");
+        let missing = tmp.path().join("missing");
+        std::fs::create_dir_all(&inside).unwrap();
+        std::fs::create_dir(&outside).unwrap();
+        for slash in ["\\", "/"] {
+            let spelling = |path: &Path| path.to_string_lossy().replace('\\', slash);
+            assert_eq!(local_folder(&spelling(&inside), &root), Some(inside.clone()));
+            assert_eq!(local_folder(&spelling(&outside), &root), None);
+            assert_eq!(local_folder(&spelling(&missing), &root), Some(root.join(posix(&missing))));
+            assert_eq!(local_folder(&format!("{slash}src{slash}"), &root), Some(inside.clone()));
+        }
+    }
+
+    #[test]
+    fn remote_paths_cannot_replace_or_leave_a_local_mapping() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path();
+        let m = Mappings::new(&server(vec![]), root, "/srv");
+        for remote in ["/srv/../outside", "/srv/./file"] {
+            assert_eq!(m.local(remote), None, "{remote}");
+        }
+        #[cfg(windows)]
+        for remote in
+            ["/srv/..\\outside", "/srv/C:\\outside", "/srv/\\outside", "/srv/dir\\..\\outside", "/srv/C:/outside"]
+        {
+            assert_eq!(m.local(remote), None, "{remote}");
+        }
+        assert_eq!(m.local("/srv/dir/file"), Some(root.join("dir/file")));
+        assert_eq!(m.local("/srv"), Some(root.to_path_buf()));
+    }
+
     #[cfg(unix)]
     #[test]
     fn absolute_symlink_inside_project_resolves_to_the_project_spelling() {
diff --git a/crates/ide-sdk/src/apply.rs b/crates/ide-sdk/src/apply.rs
index a496a433..11888554 100644
--- a/crates/ide-sdk/src/apply.rs
+++ b/crates/ide-sdk/src/apply.rs
@@ -5,7 +5,7 @@ use crate::discover::{project_venv_python, workspace_tsdk};
 use crate::exec::{path_with, search_path};
 use crate::{angular, godot, pinned, vue};
 use crate::{bin_dir, exe, venv_of};
-use ide_core::settings::{LanguageServerSettings, Settings};
+use ide_core::settings::{InspectionLevel, InspectionSettings, LanguageServerSettings, Settings};
 use ide_core::version_managers::Tool;
 use ide_language::{LanguageConfig, LanguageServerConfig};
 use ide_run::RunConfig;
@@ -123,8 +123,21 @@ fn not_a_jdk(p: &Path) -> String {
 
 /// `mvn` of the configured Maven home (`languages.java.maven.home`): the
 /// executable itself, `<home>/bin/mvn` or `<bin>/mvn`; else of the Maven the project
-/// pins for mise / asdf when it has no Maven wrapper.
+/// pins for mise / asdf when it has no Maven wrapper. With `maven.daemon` on, the
+/// Maven Daemon (`mvnd`) replaces all of that — it embeds its own Maven — unless
+/// it is not installed or the project JDK is older than the Java 17 its daemon
+/// needs, in which case the build stays on mvn (with a logged warning).
 pub fn maven_command(root: &Path, s: &Settings) -> Option<PathBuf> {
+    if s.languages.java.maven.daemon {
+        match mvnd_command(root, s) {
+            // No project JDK at all lets mvnd pick its own Java, which may still be new enough.
+            Some(mvnd) if project_jdk(root, s).is_none_or(|j| j.major >= 17) => return Some(mvnd),
+            Some(_) => tracing::warn!(
+                "Maven daemon: the project JDK is older than the Java 17 its daemon needs; building with mvn"
+            ),
+            None => tracing::warn!("Maven daemon is enabled but mvnd was not found; building with mvn"),
+        }
+    }
     let name = if cfg!(windows) { "mvn.cmd" } else { "mvn" };
     let Some(p) = setting_path(root, &s.languages.java.maven.home) else {
         if root.join("mvnw").is_file() || root.join("mvnw.cmd").is_file() {
@@ -141,6 +154,41 @@ pub fn maven_command(root: &Path, s: &Settings) -> Option<PathBuf> {
     found
 }
 
+/// The `mvnd` executable when the Maven Daemon is enabled: the configured home
+/// (`languages.java.maven.mvndHome`, the executable itself or `<home>/bin/mvnd`),
+/// else `$MVND_HOME`, else `mvnd` on `PATH`, else the common Homebrew / sdkman
+/// locations. `None` = not found; the caller falls back to `mvn`.
+pub fn mvnd_command(root: &Path, s: &Settings) -> Option<PathBuf> {
+    let name = if cfg!(windows) { "mvnd.cmd" } else { "mvnd" };
+    if let Some(p) = setting_path(root, &s.languages.java.maven.mvnd_home) {
+        let found = [p.clone(), p.join("bin").join(name), p.join(name)].into_iter().find(|c| c.is_file());
+        if found.is_none() {
+            tracing::warn!("Maven Daemon home {} has no {name}", p.display());
+        }
+        return found;
+    }
+    if let Some(home) = std::env::var_os("MVND_HOME").map(PathBuf::from) {
+        let found = [home.join("bin").join(name), home.join(name)].into_iter().find(|c| c.is_file());
+        if found.is_none() {
+            tracing::warn!("MVND_HOME {} has no {name}", home.display());
+        }
+        return found;
+    }
+    if let Some(found) = crate::exec::which(name) {
+        return Some(found);
+    }
+    if let Some(home) = crate::home_dir() {
+        let sdkman = home.join(".sdkman/candidates/mvnd/current");
+        let candidates = [
+            sdkman.join("bin").join(name),
+            PathBuf::from("/opt/homebrew/opt/mvnd").join("bin").join(name),
+            PathBuf::from("/usr/local/opt/mvnd").join("bin").join(name),
+        ];
+        return candidates.into_iter().find(|c| c.is_file());
+    }
+    None
+}
+
 /// Project launcher policy for sync and tool-window tasks.
 pub fn gradle_command(root: &Path, build_dir: &Path, s: &Settings) -> PathBuf {
     resolve_gradle_command(root, build_dir, s, true)
@@ -301,7 +349,7 @@ pub fn tsdk(root: &Path, s: &Settings) -> Option<PathBuf> {
 
 const PYTHON_SERVERS: [&str; 7] = ["basedpyright", "pyright", "ty", "pyrefly", "pylsp", "jedi-language-server", "ruff"];
 
-fn merge(base: &mut Value, layer: Value) {
+pub(crate) fn merge(base: &mut Value, layer: Value) {
     match (base, layer) {
         (Value::Object(base), Value::Object(layer)) => {
             for (k, v) in layer {
@@ -381,6 +429,36 @@ pub fn configure_maven_import(
     }
 }
 
+/// Explicit Gradle links constrain discovery and isolate JDT's persisted import state.
+pub fn configure_gradle_import(
+    cfg: &mut LanguageServerConfig,
+    linked: Option<&[String]>,
+    build_files: Option<&[String]>,
+) {
+    let Some(linked) = linked.filter(|_| cfg.name == "jdtls") else { return };
+    merge_init_options(
+        cfg,
+        json!({
+            "settings": {"java": {"import": {"gradle": {"enabled": !linked.is_empty()}}}},
+            "projectConfigurations": build_files.unwrap_or_default()
+        }),
+    );
+    if let Some(settings) = &mut cfg.settings {
+        merge(settings, json!({"java": {"import": {"gradle": {"enabled": !linked.is_empty()}}}}));
+    }
+    if let Some(index) = cfg.args.iter().position(|arg| arg == "-data")
+        && let Some(workspace) = cfg.args.get_mut(index + 1)
+    {
+        let mut hash = 0xcbf29ce484222325u64;
+        for dir in linked {
+            for byte in dir.bytes().chain([0]) {
+                hash = (hash ^ u64::from(byte)).wrapping_mul(0x100000001b3);
+            }
+        }
+        *workspace = format!("{workspace}-gradle-{hash:016x}");
+    }
+}
+
 pub(crate) fn merge_init_options(cfg: &mut LanguageServerConfig, layer: Value) {
     let mut current =
         cfg.initialization_options.as_ref().and_then(|v| serde_json::to_value(v).ok()).unwrap_or_else(|| json!({}));
@@ -394,15 +472,41 @@ pub(crate) fn merge_init_options(cfg: &mut LanguageServerConfig, layer: Value) {
     }
 }
 
+/// Editor › Inspections › Java: "Serializable class without 'serialVersionUID'" (off by default,
+/// as in IntelliJ IDEA). ECJ reports it, so it is a compiler option rather than a filter.
+pub const SERIAL_VERSION_INSPECTION: &str = "java:missing-serial-version";
+
+/// ECJ's level for a missing `serialVersionUID`, from the inspection profile in effect.
+fn missing_serial_version(inspections: &InspectionSettings) -> Option<&'static str> {
+    let o = inspections.active().get(SERIAL_VERSION_INSPECTION)?;
+    if o.enabled != Some(true) {
+        return None;
+    }
+    Some(match o.severity {
+        Some(InspectionLevel::Error) => "error",
+        None | Some(InspectionLevel::Warning) => "warning",
+        Some(_) => "info",
+    })
+}
+
 /// Workspace compiler defaults; Eclipse project preferences still take precedence.
-pub(crate) fn configure_java_compiler(cfg: &mut LanguageServerConfig, data_dir: &Path) {
-    let file = data_dir.join("lsp/jdtls/compiler-defaults.prefs");
+/// Each variant has its own file, so changing an inspection restarts the server with it.
+pub fn configure_java_compiler(cfg: &mut LanguageServerConfig, data_dir: &Path, inspections: &InspectionSettings) {
     const DEFAULTS: &str = "org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning\n\
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning\n";
+    let serial = missing_serial_version(inspections);
+    let (name, content) = match serial {
+        None => ("compiler-defaults.prefs".to_owned(), DEFAULTS.to_owned()),
+        Some(level) => (
+            format!("compiler-defaults-serial-{level}.prefs"),
+            format!("{DEFAULTS}org.eclipse.jdt.core.compiler.problem.missingSerialVersion={level}\n"),
+        ),
+    };
+    let file = data_dir.join("lsp/jdtls").join(name);
     let write = || -> ide_core::IdeResult<()> {
         std::fs::create_dir_all(file.parent().expect("compiler preferences directory"))?;
-        if std::fs::read_to_string(&file).ok().as_deref() != Some(DEFAULTS) {
-            ide_vfs::write_atomic(&file, DEFAULTS.as_bytes())?;
+        if std::fs::read_to_string(&file).ok().as_deref() != Some(content.as_str()) {
+            ide_vfs::write_atomic(&file, content.as_bytes())?;
         }
         Ok(())
     };
@@ -562,6 +666,22 @@ pub fn configure_server(cfg: &mut LanguageServerConfig, root: &Path, server_root
         configure_vue_typescript(cfg, root, server_root, s);
     }
 
+    // Intelephense reads it as `intelephense.environment.phpVersion` (`workspace/configuration`).
+    if name == "intelephense"
+        && let Some(level) = crate::php::language_level(root, s)
+    {
+        merge_init_options(cfg, json!({ "environment": { "phpVersion": level.version } }));
+    }
+    if name == "intelephense" {
+        if let Some(stubs) = crate::php::intelephense_stubs(root, s) {
+            merge_init_options(cfg, json!({ "stubs": stubs }));
+        }
+        let include_paths = crate::php::include_paths(root, s);
+        if !include_paths.is_empty() {
+            merge_init_options(cfg, json!({ "environment": { "includePaths": include_paths } }));
+        }
+    }
+
     // Node-based servers (`#!/usr/bin/env node`) run on the selected Node.js.
     if let Some(dir) = node_dir(root, s) {
         path_dirs.push(dir);
@@ -628,6 +748,7 @@ fn custom_server(name: &str, ls: &LanguageServerSettings) -> LanguageServerConfi
         max_java: None,
         launch_error: None,
         tsserver_project: false,
+        resync_on_configuration: false,
         pinned: None,
     }
 }
@@ -1030,13 +1151,50 @@ mod java_compiler_tests {
         serde_json::to_value(cfg.initialization_options.as_ref().unwrap()).unwrap()
     }
 
+    #[test]
+    fn serial_version_inspection_sets_the_compiler_option() {
+        let tmp = tempfile::tempdir().unwrap();
+        let url = |inspections: &InspectionSettings| {
+            let mut cfg = custom_server("jdtls", &LanguageServerSettings::default());
+            configure_java_compiler(&mut cfg, tmp.path(), inspections);
+            options(&cfg).pointer("/settings/java/settings/url").unwrap().as_str().unwrap().to_owned()
+        };
+        let set = |o: ide_core::settings::InspectionOverride| {
+            let mut s = InspectionSettings::default();
+            s.default.insert(SERIAL_VERSION_INSPECTION.into(), o);
+            s
+        };
+        let off = url(&InspectionSettings::default());
+        assert!(!std::fs::read_to_string(&off).unwrap().contains("missingSerialVersion"));
+        let on = url(&set(ide_core::settings::InspectionOverride { enabled: Some(true), ..Default::default() }));
+        assert_ne!(on, off, "a new file, so the server restarts with it");
+        assert!(std::fs::read_to_string(&on).unwrap().ends_with("compiler.problem.missingSerialVersion=warning\n"));
+        let error = url(&set(ide_core::settings::InspectionOverride {
+            enabled: Some(true),
+            severity: Some(InspectionLevel::Error),
+            ..Default::default()
+        }));
+        assert!(std::fs::read_to_string(error).unwrap().ends_with("missingSerialVersion=error\n"));
+        let weak = url(&set(ide_core::settings::InspectionOverride {
+            enabled: Some(true),
+            severity: Some(InspectionLevel::WeakWarning),
+            ..Default::default()
+        }));
+        assert!(std::fs::read_to_string(weak).unwrap().ends_with("missingSerialVersion=info\n"));
+        let severity_only = url(&set(ide_core::settings::InspectionOverride {
+            severity: Some(InspectionLevel::Error),
+            ..Default::default()
+        }));
+        assert_eq!(severity_only, off, "off by default");
+    }
+
     #[test]
     fn compiler_defaults_live_in_the_cache_and_preserve_other_options() {
         let tmp = tempfile::tempdir().unwrap();
         let cache = tmp.path().join("cache with spaces 测试");
         let mut cfg = custom_server("jdtls", &LanguageServerSettings::default());
         merge_init_options(&mut cfg, json!({"settings": {"java": {"format": {"tabSize": 4}}}}));
-        configure_java_compiler(&mut cfg, &cache);
+        configure_java_compiler(&mut cfg, &cache, &InspectionSettings::default());
         let options = options(&cfg);
         let path = PathBuf::from(options.pointer("/settings/java/settings/url").unwrap().as_str().unwrap());
         assert!(path.starts_with(&cache));
@@ -1047,7 +1205,7 @@ mod java_compiler_tests {
         }
         assert_eq!(options.pointer("/settings/java/format/tabSize"), Some(&json!(4)));
         let modified = std::fs::metadata(&path).unwrap().modified().unwrap();
-        configure_java_compiler(&mut cfg, &cache);
+        configure_java_compiler(&mut cfg, &cache, &InspectionSettings::default());
         assert_eq!(std::fs::metadata(path).unwrap().modified().unwrap(), modified);
         assert_eq!(self::options(&cfg), options);
     }
@@ -1057,7 +1215,7 @@ mod java_compiler_tests {
         let tmp = tempfile::tempdir().unwrap();
         let mut cfg = custom_server("jdtls", &LanguageServerSettings::default());
         merge_init_options(&mut cfg, json!({"settings": {"java": {"settings": {"url": "own.prefs"}}}}));
-        configure_java_compiler(&mut cfg, tmp.path());
+        configure_java_compiler(&mut cfg, tmp.path(), &InspectionSettings::default());
         assert_eq!(options(&cfg).pointer("/settings/java/settings/url"), Some(&json!("own.prefs")));
 
         for settings in [
@@ -1090,6 +1248,25 @@ mod java_compiler_tests {
 mod maven_linkage_tests {
     use super::*;
 
+    #[test]
+    fn explicit_gradle_links_scope_jdt_import_and_unlink_all_disables_gradle() {
+        let mut cfg = custom_server("jdtls", &LanguageServerSettings::default());
+        cfg.args = vec!["-data".into(), "/cache/jdtls".into()];
+        let files = ["file:///p/a/settings.gradle".to_owned(), "file:///p/maven/pom.xml".to_owned()];
+        configure_gradle_import(&mut cfg, Some(&["a".into()]), Some(&files));
+        let options = serde_json::to_value(&cfg.initialization_options).unwrap();
+        assert_eq!(options["projectConfigurations"], json!(files));
+        assert_eq!(options.pointer("/settings/java/import/gradle/enabled"), Some(&json!(true)));
+        assert!(cfg.args[1].starts_with("/cache/jdtls-gradle-"));
+        let linked_cache = cfg.args[1].clone();
+        cfg.args[1] = "/cache/jdtls".into();
+        configure_gradle_import(&mut cfg, Some(&[]), Some(&files[1..]));
+        let options = serde_json::to_value(&cfg.initialization_options).unwrap();
+        assert_eq!(options["projectConfigurations"], json!(&files[1..]));
+        assert_eq!(options.pointer("/settings/java/import/gradle/enabled"), Some(&json!(false)));
+        assert_ne!(linked_cache, cfg.args[1]);
+    }
+
     #[test]
     fn import_excludes_unlinked_modules_and_changes_persistent_workspace() {
         let tmp = tempfile::tempdir().unwrap();
diff --git a/crates/ide-sdk/src/discover.rs b/crates/ide-sdk/src/discover.rs
index c0de0540..e18b2dae 100644
--- a/crates/ide-sdk/src/discover.rs
+++ b/crates/ide-sdk/src/discover.rs
@@ -659,6 +659,10 @@ mod maven_path_tests {
 
     impl Subst {
         fn new(target: &Path) -> Self {
+            // Tests run in parallel and may race for the same free letter; only a drive that
+            // shows this target's marker is ours.
+            let marker = format!("{}.subst", target.file_name().unwrap().to_string_lossy());
+            std::fs::write(target.join(&marker), "").unwrap();
             for letter in (b'D'..=b'Z').rev() {
                 let name = format!("{}:", char::from(letter));
                 let root = PathBuf::from(format!("{name}\\"));
@@ -666,7 +670,7 @@ mod maven_path_tests {
                     continue;
                 }
                 let output = Command::new("subst").arg(&name).arg(target).output().unwrap();
-                if output.status.success() {
+                if output.status.success() && root.join(&marker).exists() {
                     return Self { name, root };
                 }
             }
diff --git a/crates/ide-sdk/src/java.rs b/crates/ide-sdk/src/java.rs
index 05f89fc9..6de7d667 100644
--- a/crates/ide-sdk/src/java.rs
+++ b/crates/ide-sdk/src/java.rs
@@ -369,7 +369,6 @@ pub fn configure_jdtls(
     if cfg.name != "jdtls" {
         return;
     }
-    crate::apply::configure_java_compiler(cfg, data_dir);
     // A Lombok agent from the user's JVM arguments wins.
     let own_agent = crate::lombok::agent_in_args(cfg.args.iter().map(String::as_str));
     let agent = own_agent.as_deref().or(lombok);
@@ -1128,7 +1127,7 @@ mod tests {
 /// The same jar supplies the JDT command and the private Maven output redirector.
 pub fn kotlin_bridge_bundle(data_dir: &Path) -> Option<PathBuf> {
     let extension = data_dir.join("kotlin-bridge-1.0.0.jar");
-    let bytes = include_bytes!("../../../plugins/kotlin-bridge/openidea-kotlin-bridge.jar");
+    let bytes = include_bytes!("../../../java/kotlin-bridge/openidea-kotlin-bridge.jar");
     if std::fs::read(&extension).is_ok_and(|old| old == bytes) {
         return Some(extension);
     }
@@ -1170,8 +1169,8 @@ mod kotlin_bridge_bundle_tests {
 
 /// Installs the app-owned JDT LS command bundle, falling back to ordinary LSP on IO failure.
 pub fn usages_bundle(data_dir: &Path) -> Option<PathBuf> {
-    let extension = data_dir.join("java-usages-1.2.1.jar");
-    let bytes = include_bytes!("../../../plugins/java-usages/openidea-java-usages.jar");
+    let extension = data_dir.join("java-usages-1.3.0.jar");
+    let bytes = include_bytes!("../../../java/java-usages/openidea-java-usages.jar");
     if std::fs::read(&extension).is_ok_and(|old| old == bytes) {
         clean_usages_bundles(data_dir, &extension);
         return Some(extension);
@@ -1256,10 +1255,7 @@ mod usages_bundle_tests {
     fn installs_the_exact_bundle_and_reuses_it() {
         let dir = tempfile::tempdir().unwrap();
         let jar = super::usages_bundle(dir.path()).unwrap();
-        assert_eq!(
-            std::fs::read(&jar).unwrap(),
-            include_bytes!("../../../plugins/java-usages/openidea-java-usages.jar")
-        );
+        assert_eq!(std::fs::read(&jar).unwrap(), include_bytes!("../../../java/java-usages/openidea-java-usages.jar"));
         assert_eq!(super::usages_bundle(dir.path()), Some(jar));
         assert_eq!(std::fs::read_dir(dir.path()).unwrap().count(), 1);
     }
diff --git a/crates/ide-sdk/src/lib.rs b/crates/ide-sdk/src/lib.rs
index ac8c34eb..35d52417 100644
--- a/crates/ide-sdk/src/lib.rs
+++ b/crates/ide-sdk/src/lib.rs
@@ -18,6 +18,7 @@ pub mod locate;
 pub mod lombok;
 pub mod maven_profiles;
 mod npm;
+pub mod php;
 pub mod pinned;
 pub mod python;
 pub mod ruby;
diff --git a/crates/ide-sdk/src/lombok.rs b/crates/ide-sdk/src/lombok.rs
index 8b292d48..3a4b4192 100644
--- a/crates/ide-sdk/src/lombok.rs
+++ b/crates/ide-sdk/src/lombok.rs
@@ -246,7 +246,7 @@ fn sources_import_lombok(root: &Path) -> bool {
     // Imports precede the first type, after at most a license header.
     const HEAD: u64 = 8 * 1024;
     let mut walker = ignore::WalkBuilder::new(root);
-    walker.require_git(false).follow_links(false).filter_entry(|e| {
+    walker.require_git(ide_core::ignored::inside_git_repo(root)).follow_links(false).filter_entry(|e| {
         e.depth() == 0
             || !e.file_type().is_some_and(|t| t.is_dir())
             || !OUTPUT_DIRS.contains(&e.file_name().to_string_lossy().as_ref())
diff --git a/crates/ide-sdk/src/php.rs b/crates/ide-sdk/src/php.rs
new file mode 100644
index 00000000..4e1bc6c4
--- /dev/null
+++ b/crates/ide-sdk/src/php.rs
@@ -0,0 +1,376 @@
+//! The PHP language level: the one chosen in Settings › PHP, else the one the root
+//! `composer.json` declares (`config.platform.php`, else the lowest version `require.php` allows);
+//! the Intelephense storage that goes with it; and the stub sets and include paths Intelephense indexes.
+
+use crate::apply::{merge, merge_init_options, setting_path};
+use ide_core::settings::Settings;
+use ide_language::LanguageServerConfig;
+use serde_json::{Value, json};
+use std::path::Path;
+
+/// A PHP version and where it comes from.
+#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, specta::Type)]
+#[serde(rename_all = "camelCase")]
+pub struct PhpLanguageLevel {
+    /// `X.Y.Z`.
+    pub version: String,
+    pub source: PhpLevelSource,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize, specta::Type)]
+#[serde(rename_all = "camelCase")]
+pub enum PhpLevelSource {
+    /// `languages.php.languageLevel`.
+    Settings,
+    /// `config.platform.php` of `composer.json`.
+    Platform,
+    /// The lowest version `require.php` of `composer.json` allows.
+    Require,
+}
+
+/// The project's PHP version: the one chosen in the settings, else [`composer_level`];
+/// `None` when neither names one.
+pub fn language_level(root: &Path, s: &Settings) -> Option<PhpLanguageLevel> {
+    let explicit = s.languages.php.language_level.trim();
+    if !explicit.is_empty() {
+        return version(explicit).map(|v| PhpLanguageLevel::new(v, PhpLevelSource::Settings));
+    }
+    composer_level(root)
+}
+
+/// The PHP version the root `composer.json` declares (the setting's Auto):
+/// `config.platform.php`, else the lowest version `require.php` allows.
+pub fn composer_level(root: &Path) -> Option<PhpLanguageLevel> {
+    let text = std::fs::read_to_string(root.join("composer.json")).ok()?;
+    let composer: Value = serde_json::from_str(&text).ok()?;
+    if let Some(platform) = composer.pointer("/config/platform/php").and_then(Value::as_str).and_then(version) {
+        return Some(PhpLanguageLevel::new(platform, PhpLevelSource::Platform));
+    }
+    lowest_allowed(composer.pointer("/require/php")?.as_str()?)
+        .map(|v| PhpLanguageLevel::new(v, PhpLevelSource::Require))
+}
+
+/// Gives each PHP version its own Intelephense workspace storage (below `data_dir`).
+/// Intelephense keeps the built-in functions of the version a workspace was first indexed
+/// with in that storage, and reuses them after the version changes. Without a version, or
+/// with a `storagePath` of the user's, the server keeps its own storage.
+pub fn configure_intelephense_storage(cfg: &mut LanguageServerConfig, data_dir: &Path) {
+    if cfg.name != "intelephense" {
+        return;
+    }
+    let mut options =
+        cfg.initialization_options.as_ref().and_then(|v| serde_json::to_value(v).ok()).unwrap_or(Value::Null);
+    if options.get("storagePath").is_some() {
+        return;
+    }
+    // The version Intelephense reads: `workspace/configuration` is answered from the
+    // settings merged over the initialization options (`ide_lsp::handler::all_settings`).
+    if let Some(settings) = &cfg.settings {
+        merge(&mut options, settings.clone());
+    }
+    let section = options.pointer("/settings/intelephense").unwrap_or(&options);
+    let version = section.pointer("/environment/phpVersion").and_then(Value::as_str);
+    let Some(version) = version.filter(|v| !v.is_empty() && v.chars().all(|c| c.is_ascii_digit() || c == '.')) else {
+        return;
+    };
+    let storage = data_dir.join("lsp").join("intelephense").join(version);
+    merge_init_options(cfg, json!({ "storagePath": storage.to_string_lossy() }));
+}
+
+/// The stub sets Intelephense loads when `stubs` is not set (Intelephense 1.18.5). Setting
+/// `stubs` replaces them, so additions are sent together with these.
+#[rustfmt::skip]
+const DEFAULT_STUBS: &[&str] = &[
+    "apache", "bcmath", "bz2", "calendar", "com_dotnet", "Core", "ctype", "curl", "date", "dba", "dom", "enchant",
+    "exif", "fileinfo", "filter", "fpm", "ftp", "gd", "hash", "iconv", "imap", "intl", "json", "ldap", "libxml",
+    "mbstring", "mcrypt", "mssql", "mysqli", "oci8", "odbc", "openssl", "pcntl", "pcre", "PDO", "pgsql", "Phar",
+    "posix", "pspell", "random", "readline", "Reflection", "regex", "session", "shmop", "SimpleXML", "snmp", "soap",
+    "sockets", "sodium", "SPL", "sqlite3", "standard", "superglobals", "sybase", "sysvmsg", "sysvsem", "sysvshm",
+    "tidy", "tokenizer", "uri", "xml", "xmlreader", "xmlrpc", "xmlwriter", "Zend OPcache", "zip", "zlib",
+];
+
+/// Stub sets outside the defaults whose names are not lower case; the rest are the lower-case
+/// extension name.
+const MIXED_CASE_STUBS: &[&str] =
+    &["Ev", "FFI", "LuaSandbox", "Parle", "SQLite", "SaxonC", "SplType", "ZendCache", "ZendDebugger", "ZendUtils"];
+
+/// `Zend OPcache`, `zend-opcache` and `zend_opcache` name the same stubs.
+fn stub_key(name: &str) -> String {
+    name.chars().filter(char::is_ascii_alphanumeric).map(|c| c.to_ascii_lowercase()).collect()
+}
+
+/// The `stubs` Intelephense loads: its defaults plus a stub set for each `ext-*` that the root
+/// `composer.json` requires (`require`, `require-dev`) and those in Settings › PHP. `None` when
+/// that adds nothing to the defaults, so the server keeps its own.
+pub fn intelephense_stubs(root: &Path, s: &Settings) -> Option<Vec<String>> {
+    let composer: Option<Value> =
+        std::fs::read_to_string(root.join("composer.json")).ok().and_then(|t| serde_json::from_str(&t).ok());
+    let extensions = ["require", "require-dev"]
+        .into_iter()
+        .filter_map(|section| composer.as_ref()?.get(section)?.as_object())
+        .flat_map(|deps| deps.keys())
+        .filter_map(|dep| dep.strip_prefix("ext-"))
+        .map(|ext| {
+            let key = stub_key(ext);
+            MIXED_CASE_STUBS
+                .iter()
+                .find(|stub| stub_key(stub) == key)
+                .map_or(ext.to_ascii_lowercase(), |s| s.to_string())
+        });
+    let configured = s.languages.php.stubs.iter().map(|stub| stub.trim().to_owned());
+    let mut stubs: Vec<String> = DEFAULT_STUBS.iter().map(|s| s.to_string()).collect();
+    let mut known: std::collections::HashSet<String> = stubs.iter().map(|s| stub_key(s)).collect();
+    for stub in extensions.chain(configured) {
+        if !stub.is_empty() && known.insert(stub_key(&stub)) {
+            stubs.push(stub);
+        }
+    }
+    (stubs.len() > DEFAULT_STUBS.len()).then_some(stubs)
+}
+
+/// The folders in Settings › PHP › Include paths, resolved against the project.
+pub fn include_paths(root: &Path, s: &Settings) -> Vec<String> {
+    s.languages
+        .php
+        .include_paths
+        .iter()
+        .filter_map(|p| setting_path(root, p))
+        .map(|p| p.to_string_lossy().into_owned())
+        .collect()
+}
+
+type Version = (u32, u32, u32);
+
+impl PhpLanguageLevel {
+    fn new((major, minor, patch): Version, source: PhpLevelSource) -> Self {
+        Self { version: format!("{major}.{minor}.{patch}"), source }
+    }
+}
+
+/// `7`, `7.4`, `v7.4.3`, `8.1.*`, `7.4.0-dev`: missing parts are 0.
+fn version(s: &str) -> Option<Version> {
+    let s = s.trim().trim_start_matches(['v', 'V']);
+    let mut parts = s.split('.').map(|p| {
+        let digits: &str = &p[..p.find(|c: char| !c.is_ascii_digit()).unwrap_or(p.len())];
+        digits.parse::<u32>().ok()
+    });
+    let major = parts.next()??;
+    let minor = parts.next().flatten().unwrap_or(0);
+    let patch = parts.next().flatten().unwrap_or(0);
+    Some((major, minor, patch))
+}
+
+/// The lowest version a Composer constraint allows: the lowest lower bound of its
+/// `||` alternatives. `None` when an alternative has no lower bound (`*`, `<8.0`).
+fn lowest_allowed(constraint: &str) -> Option<Version> {
+    let bounds: Option<Vec<Version>> =
+        constraint.split('|').filter(|alt| !alt.trim().is_empty()).map(lower_bound).collect();
+    bounds?.into_iter().min()
+}
+
+/// The lower bound of constraints that must all hold (`>=7.2 <8.4`, `^7.4, !=7.4.1`,
+/// `7.2 - 8.0`): the highest of their lower bounds.
+fn lower_bound(alternative: &str) -> Option<Version> {
+    // A hyphen range: its first version.
+    let alternative = alternative.split(" - ").next().unwrap_or(alternative);
+    let mut tokens: Vec<String> = Vec::new();
+    for token in alternative.split([' ', ',']).filter(|t| !t.is_empty()) {
+        // `>= 7.2`: the operator and its version.
+        match tokens.last_mut() {
+            Some(op) if op.chars().all(|c| "<>=!~^".contains(c)) => op.push_str(token),
+            _ => tokens.push(token.to_owned()),
+        }
+    }
+    tokens
+        .iter()
+        .filter_map(|t| {
+            let t = t.split('@').next().unwrap_or(t);
+            if t.starts_with('<') || t.starts_with("!=") {
+                return None;
+            }
+            version(t.trim_start_matches(['>', '=', '^', '~']))
+        })
+        .max()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn level(composer: Option<&str>, explicit: &str) -> Option<String> {
+        levels(composer, explicit).0.map(|l| l.version)
+    }
+
+    /// The effective level and the composer one.
+    fn levels(composer: Option<&str>, explicit: &str) -> (Option<PhpLanguageLevel>, Option<PhpLanguageLevel>) {
+        let tmp = tempfile::tempdir().unwrap();
+        if let Some(composer) = composer {
+            std::fs::write(tmp.path().join("composer.json"), composer).unwrap();
+        }
+        let mut s = Settings::default();
+        s.languages.php.language_level = explicit.into();
+        (language_level(tmp.path(), &s), composer_level(tmp.path()))
+    }
+
+    fn required(constraint: &str) -> Option<String> {
+        level(Some(&serde_json::json!({ "require": { "php": constraint } }).to_string()), "")
+    }
+
+    #[test]
+    fn lowest_version_require_php_allows() {
+        assert_eq!(required("^7.4 || ^8.0").as_deref(), Some("7.4.0"));
+        assert_eq!(required("^8.0 || ^7.4").as_deref(), Some("7.4.0"));
+        assert_eq!(required(">=7.2 <8.4").as_deref(), Some("7.2.0"));
+        assert_eq!(required(">= 7.2, < 8.4").as_deref(), Some("7.2.0"));
+        assert_eq!(required("8.1.*").as_deref(), Some("8.1.0"));
+        assert_eq!(required("~7.4.3").as_deref(), Some("7.4.3"));
+        assert_eq!(required("7.2 - 8.0").as_deref(), Some("7.2.0"));
+        assert_eq!(required("^7.3|^8.0").as_deref(), Some("7.3.0"));
+        assert_eq!(required(">=8.1@dev").as_deref(), Some("8.1.0"));
+        assert_eq!(required("8").as_deref(), Some("8.0.0"));
+    }
+
+    #[test]
+    fn no_lower_bound_gives_nothing() {
+        for constraint in ["*", "<8.0", "", "^7.4 || *", "dev-main"] {
+            assert_eq!(required(constraint), None, "{constraint}");
+        }
+    }
+
+    #[test]
+    fn platform_overrides_require() {
+        let composer = r#"{"require": {"php": "^8.2"}, "config": {"platform": {"php": "7.2.34"}}}"#;
+        assert_eq!(level(Some(composer), "").as_deref(), Some("7.2.34"));
+    }
+
+    #[test]
+    fn no_requirement_gives_nothing() {
+        assert_eq!(level(None, ""), None);
+        assert_eq!(level(Some(r#"{"require": {"ext-json": "*"}}"#), ""), None);
+        assert_eq!(level(Some("not json"), ""), None);
+    }
+
+    #[test]
+    fn each_php_version_gets_its_own_intelephense_storage() {
+        let data = Path::new("/data");
+        let server = |name: &str, options: Value| {
+            let mut cfg: LanguageServerConfig =
+                toml::from_str(&format!("name = \"{name}\"\ncommand = \"{name}\"")).unwrap();
+            if !options.is_null() {
+                merge_init_options(&mut cfg, options);
+            }
+            cfg
+        };
+        let options = |cfg: &LanguageServerConfig| serde_json::to_value(&cfg.initialization_options).unwrap();
+
+        let mut cfg = server("intelephense", json!({"environment": {"phpVersion": "7.4.0"}, "clearCache": false}));
+        configure_intelephense_storage(&mut cfg, data);
+        let storage = data.join("lsp").join("intelephense").join("7.4.0");
+        assert_eq!(
+            options(&cfg),
+            json!({"environment": {"phpVersion": "7.4.0"}, "clearCache": false, "storagePath": storage.to_string_lossy()})
+        );
+
+        // The version Intelephense reads wins: Settings > Language Servers `settings` over the options.
+        let storage_of = |init: Value, settings: Value| {
+            let mut cfg = server("intelephense", init);
+            cfg.settings = Some(settings);
+            configure_intelephense_storage(&mut cfg, data);
+            options(&cfg)["storagePath"].clone()
+        };
+        let path = |v: &str| json!(data.join("lsp").join("intelephense").join(v).to_string_lossy());
+        let init = json!({"environment": {"phpVersion": "7.4.0"}});
+        assert_eq!(storage_of(init.clone(), json!({"environment": {"phpVersion": "8.3.0"}})), path("8.3.0"));
+        assert_eq!(storage_of(init, json!({"other": 1})), path("7.4.0"));
+        let nested = json!({"settings": {"intelephense": {"environment": {"phpVersion": "8.0.0"}}}});
+        assert_eq!(storage_of(Value::Null, nested), path("8.0.0"));
+
+        // No version, the user's own storage, not a version, another server: unchanged.
+        for unchanged in [
+            server("intelephense", Value::Null),
+            server("intelephense", json!({"environment": {"includePaths": []}})),
+            server("intelephense", json!({"environment": {"phpVersion": "8.1.0"}, "storagePath": "/mine"})),
+            server("intelephense", json!({"environment": {"phpVersion": "../8.1"}})),
+            server("phpactor", json!({"environment": {"phpVersion": "8.1.0"}})),
+        ] {
+            let mut cfg = unchanged.clone();
+            configure_intelephense_storage(&mut cfg, data);
+            assert_eq!(cfg, unchanged);
+        }
+    }
+
+    fn stubs(composer: Option<Value>, configured: &[&str]) -> Option<Vec<String>> {
+        let tmp = tempfile::tempdir().unwrap();
+        if let Some(composer) = composer {
+            std::fs::write(tmp.path().join("composer.json"), composer.to_string()).unwrap();
+        }
+        let mut s = Settings::default();
+        s.languages.php.stubs = configured.iter().map(|s| s.to_string()).collect();
+        intelephense_stubs(tmp.path(), &s)
+    }
+
+    fn added(stubs: Option<Vec<String>>) -> Vec<String> {
+        let stubs = stubs.expect("stubs");
+        assert_eq!(stubs[..DEFAULT_STUBS.len()], DEFAULT_STUBS.iter().map(|s| s.to_string()).collect::<Vec<_>>());
+        stubs[DEFAULT_STUBS.len()..].to_vec()
+    }
+
+    #[test]
+    fn required_extensions_and_configured_stubs_follow_the_defaults() {
+        let composer = json!({
+            "require": {"php": "^8.1", "ext-redis": "*", "ext-json": "*", "monolog/monolog": "^3"},
+            "require-dev": {"ext-Imagick": "*", "ext-ffi": "*", "ext-redis": "*"}
+        });
+        assert_eq!(
+            added(stubs(Some(composer), &[" wordpress ", "Redis", ""])),
+            ["redis", "imagick", "FFI", "wordpress"]
+        );
+        assert_eq!(added(stubs(None, &["wordpress"])), ["wordpress"]);
+    }
+
+    #[test]
+    fn nothing_beyond_the_defaults_sends_nothing() {
+        assert_eq!(stubs(None, &[]), None);
+        assert_eq!(stubs(Some(json!({"require": {"php": "^8.1"}})), &[]), None);
+        // Default stub sets under their extension names: `ext-pdo`, `ext-zend-opcache`, `ext-simplexml`.
+        let defaults =
+            json!({"require": {"ext-pdo": "*", "ext-zend-opcache": "*", "ext-simplexml": "*", "ext-json": "*"}});
+        assert_eq!(stubs(Some(defaults), &["SPL", "core"]), None);
+        assert_eq!(stubs(Some(json!("not an object")), &[]), None);
+    }
+
+    #[test]
+    fn include_paths_resolve_against_the_project() {
+        let root = Path::new("/work/module");
+        let mut s = Settings::default();
+        s.languages.php.include_paths = vec!["../platform".into(), "/opt/prestashop".into(), " ".into()];
+        assert_eq!(
+            include_paths(root, &s),
+            [root.join("../platform").to_string_lossy().into_owned(), "/opt/prestashop".to_string()]
+        );
+    }
+
+    #[test]
+    fn each_level_names_its_source() {
+        let found = |version: &str, source| Some(PhpLanguageLevel { version: version.into(), source });
+        let require = r#"{"require": {"php": "^7.4"}}"#;
+        let platform = r#"{"require": {"php": "^7.4"}, "config": {"platform": {"php": "8.2.1"}}}"#;
+
+        let require_level = found("7.4.0", PhpLevelSource::Require);
+        assert_eq!(levels(Some(require), ""), (require_level.clone(), require_level.clone()));
+        let platform_level = found("8.2.1", PhpLevelSource::Platform);
+        assert_eq!(levels(Some(platform), ""), (platform_level.clone(), platform_level));
+        // An explicit level: the composer one is still what Auto would pick.
+        assert_eq!(levels(Some(require), "8.1"), (found("8.1.0", PhpLevelSource::Settings), require_level));
+        assert_eq!(levels(None, "8.1"), (found("8.1.0", PhpLevelSource::Settings), None));
+        assert_eq!(levels(None, ""), (None, None));
+        assert_eq!(levels(Some(r#"{"require": {"php": "*"}}"#), ""), (None, None));
+    }
+
+    #[test]
+    fn explicit_level_wins() {
+        let composer = r#"{"require": {"php": "^7.4"}, "config": {"platform": {"php": "7.4.33"}}}"#;
+        assert_eq!(level(Some(composer), "8.1").as_deref(), Some("8.1.0"));
+        assert_eq!(level(None, " 5.6 ").as_deref(), Some("5.6.0"));
+    }
+}
diff --git a/crates/ide-sdk/src/tests.rs b/crates/ide-sdk/src/tests.rs
index 4a61ad1d..7a8bd103 100644
--- a/crates/ide-sdk/src/tests.rs
+++ b/crates/ide-sdk/src/tests.rs
@@ -38,6 +38,7 @@ fn server(name: &str) -> LanguageServerConfig {
         max_java: None,
         launch_error: None,
         tsserver_project: false,
+        resync_on_configuration: false,
         pinned: None,
     }
 }
@@ -1293,6 +1294,61 @@ fn php_sources_and_selected_interpreter() {
     assert!(configs[3].env.get("PATH").is_none_or(|p| !p.contains("php82")));
 }
 
+#[test]
+fn intelephense_gets_the_php_language_level() {
+    use serde_json::json;
+    let tmp = tempfile::tempdir().unwrap();
+    let configured = |name: &str, s: &Settings| {
+        let mut cfg = server(name);
+        configure_server(&mut cfg, tmp.path(), tmp.path(), s);
+        cfg
+    };
+    let options = |cfg: LanguageServerConfig| serde_json::to_value(cfg.initialization_options).unwrap();
+
+    // Nothing to resolve: the options stay as they were (the rest depends on the machine's tools).
+    assert_eq!(configured("intelephense", &Settings::default()).initialization_options, None);
+
+    std::fs::write(tmp.path().join("composer.json"), r#"{"require": {"php": "^7.4 || ^8.0"}}"#).unwrap();
+    assert_eq!(
+        options(configured("intelephense", &Settings::default())),
+        json!({"environment": {"phpVersion": "7.4.0"}})
+    );
+    for other in ["phpactor", "basedpyright", "vtsls"] {
+        assert_eq!(options(configured(other, &Settings::default())).get("environment"), None, "{other}");
+    }
+
+    let mut s = Settings::default();
+    s.languages.php.language_level = "8.1".into();
+    let mut cfg = server("intelephense");
+    cfg.initialization_options = Some(toml::Value::try_from(json!({"clearCache": true})).unwrap());
+    configure_server(&mut cfg, tmp.path(), tmp.path(), &s);
+    assert_eq!(options(cfg), json!({"clearCache": true, "environment": {"phpVersion": "8.1.0"}}));
+}
+
+#[test]
+fn intelephense_gets_the_required_stubs_and_include_paths() {
+    use serde_json::json;
+    let tmp = tempfile::tempdir().unwrap();
+    std::fs::write(tmp.path().join("composer.json"), r#"{"require": {"php": "^8.1", "ext-redis": "*"}}"#).unwrap();
+    let mut s = Settings::default();
+    s.languages.php.stubs = vec!["wordpress".into()];
+    s.languages.php.include_paths = vec!["../platform".into()];
+    let mut cfg = server("intelephense");
+    configure_server(&mut cfg, tmp.path(), tmp.path(), &s);
+    let options = serde_json::to_value(cfg.initialization_options).unwrap();
+    let stubs: Vec<&str> = options["stubs"].as_array().unwrap().iter().filter_map(|v| v.as_str()).collect();
+    assert_eq!(stubs.len(), 70);
+    assert_eq!((stubs[0], &stubs[68..]), ("apache", &["redis", "wordpress"][..]));
+    assert_eq!(
+        options["environment"],
+        json!({"phpVersion": "8.1.0", "includePaths": [tmp.path().join("../platform").to_string_lossy()]})
+    );
+
+    let mut other = server("phpactor");
+    configure_server(&mut other, tmp.path(), tmp.path(), &s);
+    assert_eq!(other.initialization_options, None);
+}
+
 #[test]
 fn go_constraints_change_only_protocol_settings() {
     use serde_json::json;
diff --git a/crates/ide-sdk/tests/version_managers.rs b/crates/ide-sdk/tests/version_managers.rs
index 4fbd3bd5..d60a790d 100644
--- a/crates/ide-sdk/tests/version_managers.rs
+++ b/crates/ide-sdk/tests/version_managers.rs
@@ -35,13 +35,15 @@ fn mise_and_asdf_installs_are_detected_and_pinned_versions_used() {
     let tmp = dunce::canonicalize(tmp.path()).unwrap();
     let mise = tmp.join("mise");
     let asdf = tmp.join("asdf");
-    // SAFETY: the only test in this binary; nothing else reads the environment yet.
+    // SAFETY: the only test in this binary that writes the environment; the daemon
+    // tests below read it, so they run after this one's fixtures are in place.
     unsafe {
         std::env::set_var("HOME", tmp.join("home"));
         std::env::set_var("MISE_DATA_DIR", &mise);
         std::env::set_var("ASDF_DATA_DIR", &asdf);
         std::env::set_var("MISE_GLOBAL_CONFIG_FILE", tmp.join("no-global.toml"));
         std::env::remove_var("JAVA_HOME");
+        std::env::remove_var("MVND_HOME");
     }
 
     let installs = mise.join("installs");
@@ -131,11 +133,99 @@ fn mise_and_asdf_installs_are_detected_and_pinned_versions_used() {
     ide_sdk::apply::apply_to_run_configs(&mut plain, &project, &s);
     assert_eq!(plain[0].command, installs.join("gradle/8.7/bin/gradle").to_string_lossy());
 
+    // The Maven daemon replaces the pinned Maven when it is on and installed; the
+    // project JDK (21, from mise.toml) can host its JVM.
+    let mut daemon = s.clone();
+    daemon.languages.java.maven.daemon = true;
+    daemon.languages.java.maven.mvnd_home = tmp.join("missing/mvnd").to_string_lossy().into_owned();
+    assert_eq!(
+        ide_sdk::apply::maven_command(&project, &daemon),
+        Some(maven.join("bin/mvn")),
+        "a dead-end mvnd home falls back to the pinned Maven"
+    );
+    let mvnd = tmp.join("mvnd");
+    script(&mvnd.join("bin/mvnd"), "mvnd 1.0-m7");
+    daemon.languages.java.maven.mvnd_home = mvnd.to_string_lossy().into_owned();
+    assert_eq!(
+        ide_sdk::apply::maven_command(&project, &daemon),
+        Some(mvnd.join("bin/mvnd")),
+        "a bare home resolves to <home>/bin/mvnd"
+    );
+    // The executable itself, like `maven.home`, also works.
+    daemon.languages.java.maven.mvnd_home = mvnd.join("bin/mvnd").to_string_lossy().into_owned();
+    assert_eq!(ide_sdk::apply::maven_command(&project, &daemon), Some(mvnd.join("bin/mvnd")));
+
     // The project's Maven wrapper keeps precedence over a pinned Maven.
     script(&project.join("mvnw"), "");
     assert_eq!(ide_sdk::apply::maven_command(&project, &s), None);
+    // ...but not over the daemon.
+    assert_eq!(ide_sdk::apply::maven_command(&project, &daemon), Some(mvnd.join("bin/mvnd")));
 
     // A version the project pins but that isn't installed: nothing is made up.
     write(&project.join("mise.toml"), "[tools]\njava = '25'\n");
     assert_eq!(ide_sdk::apply::project_jdk(&project, &s), None);
 }
+
+#[test]
+fn maven_daemon_run_configs_follow_the_setting_and_the_jdk() {
+    let tmp = tempfile::tempdir().unwrap();
+    let tmp = dunce::canonicalize(tmp.path()).unwrap();
+    let project = tmp.join("project");
+    write(&project.join("pom.xml"), "<project/>");
+    let mvnd = tmp.join("mvnd");
+    script(&mvnd.join("bin/mvnd"), "mvnd 1.0-m7");
+    let mvn = tmp.join("mvn");
+    script(&mvn.join("bin/mvn"), "Apache Maven 3.9.6");
+    let mvnd_path = mvnd.join("bin/mvnd").to_string_lossy().into_owned();
+    let mvn_path = mvn.join("bin/mvn").to_string_lossy().into_owned();
+
+    let mut s = Settings::default();
+    s.languages.java.maven.daemon = true;
+    s.languages.java.maven.mvnd_home = mvnd_path.clone();
+    s.languages.java.maven.home = mvn_path.clone();
+
+    let run = |command: &str, detected: bool| RunConfig {
+        id: "maven:x".into(),
+        name: "x".into(),
+        kind: "maven".into(),
+        command: command.into(),
+        args: vec!["package".into()],
+        cwd: None,
+        env: BTreeMap::new(),
+        detected,
+        is_test: false,
+        debug_adapter: None,
+        allow_parallel: false,
+        extras: Default::default(),
+    };
+
+    // No project JDK: the daemon may pick its own, so it stays on mvnd.
+    let mut configs = [run("mvn", true), run("mvn", false)];
+    ide_sdk::apply::apply_to_run_configs(&mut configs, &project, &s);
+    assert_eq!(configs[0].command, mvnd_path, "detected config runs the daemon");
+    assert_eq!(configs[1].command, mvnd_path, "saved `mvn` config is pointed at the daemon");
+
+    // A launcher the user wrote into a configuration is theirs: an absolute path
+    // or a bare `mvnd` stays as configured.
+    let mut configs = [run(&mvn_path, false), run("mvnd", false)];
+    ide_sdk::apply::apply_to_run_configs(&mut configs, &project, &s);
+    assert_eq!(configs[0].command, mvn_path, "a custom absolute launcher is kept");
+    assert_eq!(configs[1].command, "mvnd", "a user-written mvnd is kept");
+
+    // A project JDK older than the daemon's Java 17 requirement keeps mvn.
+    let jdk8 = tmp.join("jdk8");
+    jdk(&jdk8, "1.8.0_392");
+    s.languages.java.jdk = jdk8.to_string_lossy().into_owned();
+    let mut configs = [run("mvn", true), run("mvn", false)];
+    ide_sdk::apply::apply_to_run_configs(&mut configs, &project, &s);
+    assert_eq!(configs[0].command, mvn_path, "JDK 8 cannot host the daemon JVM");
+    assert_eq!(configs[1].command, mvn_path);
+
+    // With the daemon off, the same configurations run the configured Maven.
+    s.languages.java.maven.daemon = false;
+    s.languages.java.jdk = String::new();
+    let mut configs = [run("mvn", true), run("mvn", false)];
+    ide_sdk::apply::apply_to_run_configs(&mut configs, &project, &s);
+    assert_eq!(configs[0].command, mvn_path);
+    assert_eq!(configs[1].command, mvn_path);
+}
diff --git a/crates/ide-search/src/engine.rs b/crates/ide-search/src/engine.rs
index 802595b0..638c1016 100644
--- a/crates/ide-search/src/engine.rs
+++ b/crates/ide-search/src/engine.rs
@@ -142,42 +142,16 @@ pub(crate) fn run(req: Request<'_>) -> IdeResult<SearchSummary> {
         }
     }
 
-    if let Some((first, rest)) = on_disk.split_first()
-        && !ctx.ctl.should_stop()
-    {
-        let mut walk = WalkBuilder::new(first);
-        for path in rest {
-            walk.add(path);
-        }
-        walk.hidden(true)
-            .ignore(true)
-            .git_ignore(true)
-            .git_global(true)
-            .git_exclude(true)
-            .parents(true)
-            .require_git(false)
-            .follow_links(false)
-            .threads(std::thread::available_parallelism().map_or(4, |n| n.get()).min(12))
-            .filter_entry(|e| e.file_name() != ".git");
-        walk.build_parallel().run(|| {
+    if !ctx.ctl.should_stop() {
+        walk_files(&on_disk, || {
             let mut searcher = searcher_builder.build();
             let matcher = matcher.clone();
             let ctx = &ctx;
-            Box::new(move |entry| {
+            Box::new(move |path| {
                 if ctx.ctl.should_stop() {
                     return WalkState::Quit;
                 }
-                let entry = match entry {
-                    Ok(entry) => entry,
-                    Err(err) => {
-                        tracing::debug!("search walk: {err}");
-                        return WalkState::Continue;
-                    }
-                };
-                // Archives (jar, zip) are browsed, not searched (IDEA skips them too).
-                if entry.file_type().is_some_and(|t| t.is_file()) && !ide_vfs::is_archive_file(entry.path()) {
-                    ctx.search_file(entry.path(), &matcher, &mut searcher);
-                }
+                ctx.search_file(path, &matcher, &mut searcher);
                 if ctx.ctl.stopped() { WalkState::Quit } else { WalkState::Continue }
             })
         });
@@ -193,6 +167,67 @@ pub(crate) fn run(req: Request<'_>) -> IdeResult<SearchSummary> {
     })
 }
 
+/// A per-thread file visitor of [`walk_files`].
+pub(crate) type VisitFile<'s> = Box<dyn FnMut(&Path) -> WalkState + Send + 's>;
+
+/// Visits the files below `roots` (and the roots that are files) in parallel,
+/// the way IDEA's project scope sees them: directories ignored by
+/// `.gitignore` / `.ignore` / `info/exclude` are skipped with everything in
+/// them, while ignored files elsewhere (`.env`) and hidden files and folders
+/// (`.github`, `.eslintrc`) are visited. `.git`, symlinks and archives (jar,
+/// zip: browsed, not searched) are never visited.
+pub(crate) fn walk_files<'s>(roots: &[PathBuf], mut visitor: impl FnMut() -> VisitFile<'s> + Send) {
+    let Some((first, rest)) = roots.split_first() else { return };
+    let mut walk = WalkBuilder::new(first);
+    for path in rest {
+        walk.add(path);
+    }
+    walk.hidden(false)
+        .ignore(true)
+        .git_ignore(true)
+        .git_global(true)
+        .git_exclude(true)
+        .parents(true)
+        .require_git(ide_core::ignored::inside_git_repo(first))
+        .follow_links(false)
+        .threads(std::thread::available_parallelism().map_or(4, |n| n.get()).min(12))
+        .filter_entry(|e| e.file_name() != ".git");
+    walk.build_parallel().run(|| {
+        let mut visit = visitor();
+        Box::new(move |entry| {
+            let entry = match entry {
+                Ok(entry) => entry,
+                Err(err) => {
+                    tracing::debug!("search walk: {err}");
+                    return WalkState::Continue;
+                }
+            };
+            let Some(file_type) = entry.file_type() else { return WalkState::Continue };
+            if file_type.is_dir() {
+                // The walker drops ignored files unseen, so the files of every walked
+                // directory come from listing it; the walker only picks the directories.
+                let Ok(children) = std::fs::read_dir(entry.path()) else { return WalkState::Continue };
+                for child in children.flatten() {
+                    let path = child.path();
+                    if child.file_name() != ".git"
+                        && child.file_type().is_ok_and(|t| t.is_file())
+                        && !ide_vfs::is_archive_file(&path)
+                        && matches!(visit(&path), WalkState::Quit)
+                    {
+                        return WalkState::Quit;
+                    }
+                }
+                WalkState::Continue
+            } else if file_type.is_file() && entry.depth() == 0 && !ide_vfs::is_archive_file(entry.path()) {
+                // A root that is a file (an explicit file list); files below roots come from listings.
+                visit(entry.path())
+            } else {
+                WalkState::Continue
+            }
+        })
+    });
+}
+
 /// Walk roots for a scope; relative paths are resolved against `root`.
 pub(crate) fn roots(root: &Path, scope: &SearchScope) -> IdeResult<Vec<PathBuf>> {
     let dir = |path: &Path| -> IdeResult<PathBuf> {
diff --git a/crates/ide-search/src/files.rs b/crates/ide-search/src/files.rs
index ba85acfc..97b3805d 100644
--- a/crates/ide-search/src/files.rs
+++ b/crates/ide-search/src/files.rs
@@ -1,10 +1,10 @@
 //! The files of a search scope, for analyses that read whole files
 //! (Inspect Code, Locate Duplicates, Structural Search).
 
-use crate::engine::{rel_path, roots};
+use crate::engine::{rel_path, roots, walk_files};
 use crate::{FileMask, PathFilter, SearchScope};
 use ide_core::{CancellationToken, IdeResult};
-use ignore::{WalkBuilder, WalkState};
+use ignore::WalkState;
 use std::path::PathBuf;
 use std::sync::Mutex;
 
@@ -16,7 +16,7 @@ pub struct ScopeFile {
 }
 
 /// Lists the files of `scope` under `root` the way Find in Files walks them
-/// (`.gitignore` honoured, hidden files and `.git` skipped), filtered by
+/// (ignored folders and `.git` skipped; ignored and hidden files kept), filtered by
 /// `mask` and `filter`, sorted by relative path. Explicitly listed files are
 /// kept even when they do not exist on disk (unsaved buffers). Returns what was
 /// found so far when cancelled.
@@ -43,42 +43,23 @@ pub fn scope_files(
             on_disk.push(path);
         }
     }
-    if let Some((first, rest)) = on_disk.split_first() {
-        let mut walk = WalkBuilder::new(first);
-        for path in rest {
-            walk.add(path);
-        }
-        walk.hidden(true)
-            .ignore(true)
-            .git_ignore(true)
-            .git_global(true)
-            .git_exclude(true)
-            .parents(true)
-            .require_git(false)
-            .follow_links(false)
-            .threads(std::thread::available_parallelism().map_or(4, |n| n.get()).min(12))
-            .filter_entry(|e| e.file_name() != ".git");
-        walk.build_parallel().run(|| {
-            let found = &found;
-            let keep = &keep;
-            Box::new(move |entry| {
-                if cancel.is_cancelled() {
-                    return WalkState::Quit;
-                }
-                let Ok(entry) = entry else { return WalkState::Continue };
-                if entry.file_type().is_some_and(|t| t.is_file()) && !ide_vfs::is_archive_file(entry.path()) {
-                    let rel = rel_path(root, entry.path());
-                    if keep(&rel) {
-                        found
-                            .lock()
-                            .unwrap_or_else(|e| e.into_inner())
-                            .push(ScopeFile { path: entry.into_path(), rel_path: rel });
-                    }
-                }
-                WalkState::Continue
-            })
-        });
-    }
+    walk_files(&on_disk, || {
+        let found = &found;
+        let keep = &keep;
+        Box::new(move |path| {
+            if cancel.is_cancelled() {
+                return WalkState::Quit;
+            }
+            let rel = rel_path(root, path);
+            if keep(&rel) {
+                found
+                    .lock()
+                    .unwrap_or_else(|e| e.into_inner())
+                    .push(ScopeFile { path: path.to_path_buf(), rel_path: rel });
+            }
+            WalkState::Continue
+        })
+    });
     let mut files = found.into_inner().unwrap_or_else(|e| e.into_inner());
     files.sort_by(|a, b| a.rel_path.cmp(&b.rel_path));
     files.dedup_by(|a, b| a.path == b.path);
@@ -107,12 +88,12 @@ mod tests {
     }
 
     #[test]
-    fn project_scope_honours_gitignore_and_masks() {
+    fn project_scope_skips_ignored_folders_and_honours_masks() {
         let dir = tree();
         let none = FileMask::new(&[], &[]).unwrap();
         let cancel = CancellationToken::new();
         let all = scope_files(dir.path(), &SearchScope::Project, &none, None, &cancel).unwrap();
-        assert_eq!(rels(&all), vec!["src/a.rs", "src/c.txt", "src/sub/b.rs"]);
+        assert_eq!(rels(&all), vec![".gitignore", "src/a.rs", "src/c.txt", "src/sub/b.rs"]);
 
         let rs = FileMask::new(&["*.rs".into()], &[]).unwrap();
         let only_rs = scope_files(dir.path(), &SearchScope::Project, &rs, None, &cancel).unwrap();
@@ -120,7 +101,7 @@ mod tests {
 
         let not_sub: PathFilter<'_> = &|rel: &str| !rel.starts_with("src/sub/");
         let filtered = scope_files(dir.path(), &SearchScope::Project, &none, Some(not_sub), &cancel).unwrap();
-        assert_eq!(rels(&filtered), vec!["src/a.rs", "src/c.txt"]);
+        assert_eq!(rels(&filtered), vec![".gitignore", "src/a.rs", "src/c.txt"]);
     }
 
     #[test]
diff --git a/crates/ide-search/src/lib.rs b/crates/ide-search/src/lib.rs
index 97515510..eb220fbb 100644
--- a/crates/ide-search/src/lib.rs
+++ b/crates/ide-search/src/lib.rs
@@ -1,7 +1,8 @@
 //! Find / Replace in Files (⌘⇧F / ⌘⇧R).
 //!
-//! Built on ripgrep's engine crates: a parallel `ignore` walk (honouring
-//! `.gitignore` / `.ignore`, skipping hidden files and `.git`) feeding
+//! Built on ripgrep's engine crates: a parallel `ignore` walk (skipping the
+//! folders `.gitignore` / `.ignore` exclude and `.git`, but like IDEA keeping
+//! ignored files elsewhere and hidden files) feeding
 //! `grep-searcher` with a `grep-regex` matcher. Binary files are skipped,
 //! unsaved editor buffers (the overlay) take precedence over disk content,
 //! and all columns are UTF-16.
diff --git a/crates/ide-search/src/words.rs b/crates/ide-search/src/words.rs
index ceb94a25..722ebe63 100644
--- a/crates/ide-search/src/words.rs
+++ b/crates/ide-search/src/words.rs
@@ -25,8 +25,8 @@ pub struct WordFiles {
 }
 
 /// Files under `query.dir` containing `query.word` as a whole word, in walk
-/// order (unsaved buffers through `overlay`, `.gitignore`d and hidden files
-/// skipped like Find in Files). Stops at `query.limit` files or when cancelled.
+/// order (unsaved buffers through `overlay`; ignored folders skipped, ignored
+/// and hidden files searched, like Find in Files). Stops at `query.limit` files or when cancelled.
 pub fn files_with_word(
     root: &std::path::Path,
     query: &WordQuery,
@@ -74,7 +74,9 @@ mod tests {
         let root = dir.path();
         fs::create_dir_all(root.join("pkg/ignored")).unwrap();
         fs::create_dir_all(root.join("build")).unwrap();
-        fs::write(root.join(".gitignore"), "ignored/\n").unwrap();
+        fs::write(root.join(".gitignore"), "ignored/\nlocal.py\n").unwrap();
+        // An ignored file outside ignored folders is still a candidate, as in IDEA.
+        fs::write(root.join("pkg/local.py"), "get_value\n").unwrap();
         fs::write(root.join("pkg/use.py"), "x.get_value(1)\n").unwrap();
         fs::write(root.join("pkg/longer.py"), "get_values()\n").unwrap();
         fs::write(root.join("pkg/case.py"), "Get_Value()\n").unwrap();
@@ -90,7 +92,10 @@ mod tests {
         found.files.sort();
         assert_eq!(
             found,
-            WordFiles { files: vec![root.join("pkg/open.py"), root.join("pkg/use.py")], limit_hit: false }
+            WordFiles {
+                files: vec![root.join("pkg/local.py"), root.join("pkg/open.py"), root.join("pkg/use.py")],
+                limit_hit: false
+            }
         );
     }
 
diff --git a/crates/ide-search/tests/search.rs b/crates/ide-search/tests/search.rs
index 412fe9b1..f4207d05 100644
--- a/crates/ide-search/tests/search.rs
+++ b/crates/ide-search/tests/search.rs
@@ -187,24 +187,77 @@ fn file_masks() {
     assert_eq!(with(&[], &["*.kt,*.ts"]), ["notes.md", "src/Util.java"]);
 }
 
+/// The files of `scope` under `root` (relative), sorted.
+fn scope_rels(root: &Path, scope: &SearchScope) -> Vec<String> {
+    let none = ide_search::FileMask::new(&[], &[]).unwrap();
+    let files = ide_search::scope_files(root, scope, &none, None, &CancellationToken::new()).unwrap();
+    let mut rels: Vec<_> = files.into_iter().map(|f| f.rel_path).collect();
+    rels.sort();
+    rels
+}
+
 #[test]
-fn honours_ignore_files_hidden_and_git() {
-    let p = project(&[
-        (".gitignore", b"target/\n*.log\n"),
-        (".ignore", b"generated.rs\n"),
-        ("src/a.rs", b"needle\n"),
-        ("src/generated.rs", b"needle\n"),
-        ("target/debug/out.rs", b"needle\n"),
-        ("build.log", b"needle\n"),
-        (".hidden/secret.rs", b"needle\n"),
-        (".env", b"needle\n"),
-        (".git/config", b"needle\n"),
-        ("sub/.gitignore", b"local.txt\n"),
-        ("sub/local.txt", b"needle\n"),
-        ("sub/kept.txt", b"needle\n"),
-    ]);
+fn searches_ignored_and_hidden_files_but_not_ignored_folders() {
+    // #1317: like IDEA, only ignored folders are left out; ignored files and dotfiles are searched.
+    // (path, content, walked): every file mentions `needle`.
+    let files: &[(&str, &[u8], bool)] = &[
+        (".gitignore", b"# needle\ntarget/\n*.log\n.env\nsrc/local/\n", true),
+        (".ignore", b"# needle\ngenerated.rs\nout/\n", true),
+        ("src/a.rs", b"needle\n", true),
+        // Ignored files outside ignored folders.
+        ("src/generated.rs", b"needle\n", true),
+        ("build.log", b"needle\n", true),
+        (".env", b"needle\n", true),
+        ("sub/.gitignore", b"# needle\nlocal.txt\ncache/\n", true),
+        ("sub/local.txt", b"needle\n", true),
+        ("sub/kept.txt", b"needle\n", true),
+        // Hidden files and folders.
+        (".eslintrc", b"needle\n", true),
+        (".github/workflows/ci.yml", b"needle\n", true),
+        (".hidden/secret.rs", b"needle\n", true),
+        // Ignored folders, whatever they hold.
+        ("target/debug/out.rs", b"needle\n", false),
+        ("target/.env", b"needle\n", false),
+        ("src/local/notes.txt", b"needle\n", false),
+        ("out/gen.rs", b"needle\n", false),
+        ("sub/cache/blob.txt", b"needle\n", false),
+        // Never: Git's own folder.
+        (".git/config", b"needle\n", false),
+    ];
+    let p = project(&files.iter().map(|(path, text, _)| (*path, *text)).collect::<Vec<_>>());
+    let mut expected: Vec<&str> = files.iter().filter(|(_, _, walked)| *walked).map(|(path, _, _)| *path).collect();
+    expected.sort();
+
     let (views, _) = run(p.path(), &query("needle"));
-    assert_eq!(paths(&views), ["src/a.rs", "sub/kept.txt"]);
+    assert_eq!(paths(&views), expected, "Find in Files");
+
+    assert_eq!(scope_rels(p.path(), &SearchScope::Project), expected, "scope files");
+
+    // A directory scope and an explicit ignored file are searched the same way.
+    let dir = SearchScope::Directory { path: ide_core::IpcPath(p.path().join("sub")) };
+    let (views, _) = run(p.path(), &SearchQuery { scope: dir, ..query("needle") });
+    assert_eq!(paths(&views), ["sub/.gitignore", "sub/kept.txt", "sub/local.txt"]);
+    let one = SearchScope::Files { paths: vec![ide_core::IpcPath(p.path().join("build.log"))] };
+    let (views, _) = run(p.path(), &SearchQuery { scope: one, ..query("needle") });
+    assert_eq!(paths(&views), ["build.log"]);
+}
+
+#[test]
+fn nested_repository_ignores_outer_repository_rules() {
+    // #1254: the opened project is a Git repository inside a folder its parent repository ignores.
+    let p = project(&[
+        (".git/HEAD", b"ref: refs/heads/main\n"),
+        ("projects/.gitignore", b"*\n!.gitignore\n"),
+        ("projects/nested/.git/HEAD", b"ref: refs/heads/main\n"),
+        ("projects/nested/.gitignore", b"logs/\n"),
+        ("projects/nested/search-test.txt", b"somesss\n"),
+        ("projects/nested/src/main.txt", b"somesss\n"),
+        ("projects/nested/logs/debug.txt", b"somesss\n"),
+    ]);
+    let nested = p.path().join("projects/nested");
+    let (views, _) = run(&nested, &query("somesss"));
+    assert_eq!(paths(&views), ["search-test.txt", "src/main.txt"]);
+    assert_eq!(scope_rels(&nested, &SearchScope::Project), [".gitignore", "search-test.txt", "src/main.txt"]);
 }
 
 #[test]
@@ -643,3 +696,31 @@ fn archives_are_skipped() {
     let (views, _) = run(p.path(), &query("needle"));
     assert_eq!(paths(&views), ["src/a.txt"]);
 }
+
+#[test]
+fn a_nested_repository_is_not_hidden_by_the_outer_repositorys_gitignore() {
+    // parent/.git, parent/projects/.gitignore ignores everything, parent/projects/nested is its own repository.
+    let p = project(&[
+        ("projects/.gitignore", b"*\n!.gitignore\n"),
+        ("projects/nested/search-test.txt", b"somesss\n"),
+        ("projects/nested/src/main.txt", b"somesss\n"),
+        ("projects/nested/.gitignore", b"logs/\n"),
+        ("projects/nested/logs/debug.txt", b"somesss\n"),
+    ]);
+    std::fs::create_dir(p.path().join(".git")).unwrap();
+    std::fs::create_dir(p.path().join("projects/nested/.git")).unwrap();
+    let (views, _) = run(&p.path().join("projects/nested"), &query("somesss"));
+    assert_eq!(
+        paths(&views),
+        ["search-test.txt", "src/main.txt"],
+        "the nested repository's own .gitignore still applies"
+    );
+}
+
+#[test]
+fn a_project_inside_a_repository_keeps_the_repositorys_gitignore() {
+    let p = project(&[(".gitignore", b"build/\n"), ("app/build/out.txt", b"hit\n"), ("app/src/a.txt", b"hit\n")]);
+    std::fs::create_dir(p.path().join(".git")).unwrap();
+    let (views, _) = run(&p.path().join("app"), &query("hit"));
+    assert_eq!(paths(&views), ["src/a.txt"]);
+}
diff --git a/crates/ide-ssh/Cargo.toml b/crates/ide-ssh/Cargo.toml
index feb93e12..3d99cdf0 100644
--- a/crates/ide-ssh/Cargo.toml
+++ b/crates/ide-ssh/Cargo.toml
@@ -14,15 +14,20 @@ tokio.workspace = true
 tracing.workspace = true
 parking_lot.workspace = true
 dirs.workspace = true
+uuid.workspace = true
+keyring.workspace = true
+keyring-core.workspace = true
 russh = { version = "0.64", default-features = false, features = ["ring", "rsa", "flate2"] }
 russh-config = "0.58.0"
 russh-sftp = "2.4"
 flate2 = "1"
 
 [features]
-# `testing`: an in-process SSH / SFTP server for tests of crates built on this one.
-testing = []
+# `testing`: an in-process SSH / SFTP server for tests of crates built on this one,
+# and an in-memory credential store in place of the OS one.
+testing = ["keyring-core/sample"]
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tempfile.workspace = true
+keyring-core = { workspace = true, features = ["sample"] }
diff --git a/crates/ide-ssh/src/git_creds.rs b/crates/ide-ssh/src/git_creds.rs
index bdc818e1..4e839aa4 100644
--- a/crates/ide-ssh/src/git_creds.rs
+++ b/crates/ide-ssh/src/git_creds.rs
@@ -216,6 +216,7 @@ mod tests {
     use super::*;
 
     fn store() -> (tempfile::TempDir, GitCredentials) {
+        crate::secrets::testing::use_memory_store();
         let tmp = tempfile::tempdir().unwrap();
         let path = tmp.path().join("git-credentials.json");
         (tmp, GitCredentials { saved: Arc::new(SecretFile::new(path)), sessions: Arc::default() })
diff --git a/crates/ide-ssh/src/secrets.rs b/crates/ide-ssh/src/secrets.rs
index 4cd6a9cb..7359f157 100644
--- a/crates/ide-ssh/src/secrets.rs
+++ b/crates/ide-ssh/src/secrets.rs
@@ -1,61 +1,289 @@
-//! Saved passwords (SSH passwords / key passphrases by configuration id, the HTTP
-//! proxy's), in the app's data directory rather than the OS credential store (no
-//! system prompts). One JSON object, key → secret; owner-only on Unix.
+//! Saved passwords (SSH passwords / key passphrases by configuration id, git HTTPS
+//! credentials, the HTTP proxy's) in the OS credential store: Windows Credential
+//! Manager, the macOS Keychain, the Secret Service on Linux. The file at `path` only
+//! indexes them (an id and the keys, never a secret); owner-only on Unix.
+//!
+//! Older versions kept the secrets themselves in that file: they are moved to the
+//! credential store on first use. Without a credential store (a headless Linux
+//! host) such a file is still read and forgetting a secret rewrites it without
+//! that one, but no new secret is written to disk: saving fails and callers keep
+//! the secret for the session only.
 
 use ide_core::{IdeError, IdeResult};
+pub use keyring_core::{Error as StoreError, Result as StoreResult};
 use parking_lot::Mutex;
-use std::collections::BTreeMap;
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, BTreeSet};
 use std::path::PathBuf;
+use std::sync::Arc;
+
+const SERVICE: &str = "ai.l0ng.openidea";
+
+/// Serialises read-modify-write of the index files (several stores may share one).
+static LOCK: Mutex<()> = Mutex::new(());
+
+/// Reads the secrets of an older version's file, by key (`None`: not that format).
+pub type Legacy = fn(serde_json::Value) -> Option<BTreeMap<String, String>>;
+
+/// Where the secrets are kept: the default credential store, or a stand-in in tests.
+pub trait Vault: Send + Sync {
+    fn available(&self) -> bool;
+    fn get(&self, service: &str, key: &str) -> StoreResult<String>;
+    fn set(&self, service: &str, key: &str, secret: &str) -> StoreResult<()>;
+    fn delete(&self, service: &str, key: &str) -> StoreResult<()>;
+}
+
+/// `keyring_core`'s default store: the OS's, unless a test installed another one.
+struct DefaultStore;
+
+impl DefaultStore {
+    fn entry(&self, service: &str, key: &str) -> StoreResult<keyring_core::Entry> {
+        if !self.available() {
+            return Err(StoreError::NoDefaultStore);
+        }
+        keyring_core::Entry::new(service, key)
+    }
+}
+
+impl Vault for DefaultStore {
+    fn available(&self) -> bool {
+        if keyring_core::get_default_store().is_some() {
+            return true;
+        }
+        static WARNED: std::sync::Once = std::sync::Once::new();
+        match keyring::Entry::store_status() {
+            Ok(()) => true,
+            Err(e) => {
+                WARNED.call_once(|| tracing::warn!("saved passwords: no credential store: {e}"));
+                false
+            }
+        }
+    }
+
+    fn get(&self, service: &str, key: &str) -> StoreResult<String> {
+        self.entry(service, key)?.get_password()
+    }
+
+    fn set(&self, service: &str, key: &str, secret: &str) -> StoreResult<()> {
+        self.entry(service, key)?.set_password(secret)
+    }
+
+    fn delete(&self, service: &str, key: &str) -> StoreResult<()> {
+        self.entry(service, key)?.delete_credential()
+    }
+}
 
 pub struct SecretFile {
     path: PathBuf,
-    lock: Mutex<()>,
+    legacy: Legacy,
+    vault: Arc<dyn Vault>,
+}
+
+/// The file's contents. `id` keeps the credentials of different data directories
+/// (and of tests) apart in the one OS store.
+#[derive(Serialize, Deserialize)]
+struct Index {
+    id: String,
+    keys: BTreeSet<String>,
+}
+
+enum Contents {
+    Index(Index),
+    /// An older version's file that could not be moved, and why.
+    Plaintext(BTreeMap<String, String>, String),
+}
+
+fn service(id: &str) -> String {
+    format!("{SERVICE}/{id}")
+}
+
+fn new_id() -> String {
+    uuid::Uuid::new_v4().to_string()
 }
 
 impl SecretFile {
     pub fn new(path: PathBuf) -> Self {
-        Self { path, lock: Mutex::new(()) }
+        Self::with_legacy(path, |v| serde_json::from_value(v).ok())
+    }
+
+    pub fn with_legacy(path: PathBuf, legacy: Legacy) -> Self {
+        Self::with_vault(path, legacy, Arc::new(DefaultStore))
+    }
+
+    pub fn with_vault(path: PathBuf, legacy: Legacy, vault: Arc<dyn Vault>) -> Self {
+        Self { path, legacy, vault }
     }
 
     pub fn get(&self, key: &str) -> Option<String> {
-        let _g = self.lock.lock();
-        self.read().remove(key)
+        let _g = LOCK.lock();
+        match self.load() {
+            Contents::Index(mut index) if index.keys.contains(key) => match self.vault.get(&service(&index.id), key) {
+                Ok(secret) => Some(secret),
+                Err(StoreError::NoEntry) => {
+                    // Removed outside the app: stop listing it.
+                    index.keys.remove(key);
+                    self.write_logged(&index);
+                    None
+                }
+                Err(e) => {
+                    tracing::warn!("saved passwords: {key}: {e}");
+                    None
+                }
+            },
+            Contents::Index(_) => None,
+            Contents::Plaintext(mut old, _) => old.remove(key),
+        }
     }
 
     pub fn set(&self, key: &str, secret: &str) -> IdeResult<()> {
-        let _g = self.lock.lock();
-        let mut all = self.read();
-        all.insert(key.to_owned(), secret.to_owned());
-        self.write(&all)
+        let _g = LOCK.lock();
+        let mut index = match self.load() {
+            Contents::Index(index) => index,
+            Contents::Plaintext(_, why) => return Err(unavailable(&why)),
+        };
+        let service = service(&index.id);
+        self.vault.set(&service, key, secret).map_err(|e| unavailable(&e.to_string()))?;
+        if index.keys.insert(key.to_owned())
+            && let Err(e) = self.write(&index)
+        {
+            let _ = self.vault.delete(&service, key);
+            return Err(e);
+        }
+        Ok(())
     }
 
     pub fn delete(&self, key: &str) {
-        let _g = self.lock.lock();
-        let mut all = self.read();
-        if all.remove(key).is_some()
-            && let Err(e) = self.write(&all)
-        {
-            tracing::warn!("{}", e.message);
+        let _g = LOCK.lock();
+        match self.load() {
+            Contents::Index(mut index) => {
+                if !index.keys.contains(key) {
+                    return;
+                }
+                match self.vault.delete(&service(&index.id), key) {
+                    Ok(()) | Err(StoreError::NoEntry) => {}
+                    Err(e) => {
+                        // Kept in the index so that the next delete tries again.
+                        tracing::warn!("saved passwords: could not forget {key}: {e}");
+                        return;
+                    }
+                }
+                index.keys.remove(key);
+                self.write_logged(&index);
+            }
+            Contents::Plaintext(mut old, _) => {
+                if old.remove(key).is_none() {
+                    return;
+                }
+                // A move halfway may have copied it already.
+                if let Some(id) = self.pending_id()
+                    && let Err(e) = self.vault.delete(&service(&id), key)
+                    && !matches!(e, StoreError::NoEntry)
+                {
+                    tracing::warn!("saved passwords: could not forget {key}: {e}");
+                    return;
+                }
+                self.write_logged(&old);
+            }
         }
     }
 
     /// Every stored key, sorted (the secrets themselves stay private).
     pub fn keys(&self) -> Vec<String> {
-        let _g = self.lock.lock();
-        self.read().into_keys().collect()
-    }
-
-    fn read(&self) -> BTreeMap<String, String> {
-        match std::fs::read(&self.path) {
-            Ok(bytes) => serde_json::from_slice(&bytes).unwrap_or_else(|e| {
-                tracing::warn!("saved passwords: {}: {e}", self.path.display());
-                BTreeMap::new()
-            }),
-            Err(_) => BTreeMap::new(),
+        let _g = LOCK.lock();
+        match self.load() {
+            Contents::Index(index) => index.keys.into_iter().collect(),
+            Contents::Plaintext(old, _) => old.into_keys().collect(),
         }
     }
 
-    fn write(&self, all: &BTreeMap<String, String>) -> IdeResult<()> {
+    fn load(&self) -> Contents {
+        let value = match std::fs::read(&self.path) {
+            Err(_) => return Contents::Index(Index { id: new_id(), keys: BTreeSet::new() }),
+            Ok(bytes) => match serde_json::from_slice::<serde_json::Value>(&bytes) {
+                Ok(v) => v,
+                Err(e) => return self.set_aside(&e.to_string()),
+            },
+        };
+        if let Ok(index) = serde_json::from_value::<Index>(value.clone()) {
+            return Contents::Index(index);
+        }
+        match (self.legacy)(value) {
+            Some(old) => self.migrate(old),
+            None => self.set_aside("unknown format"),
+        }
+    }
+
+    /// An unreadable file is renamed rather than overwritten (it may index
+    /// credentials, or hold secrets); the store starts over.
+    fn set_aside(&self, why: &str) -> Contents {
+        let aside = self.path.with_extension(format!("json.unreadable-{}", new_id()));
+        tracing::warn!("saved passwords: {}: {why}; moved to {}", self.path.display(), aside.display());
+        if let Err(e) = std::fs::rename(&self.path, &aside) {
+            // Not overwritten either: nothing is saved until it can be moved.
+            return Contents::Plaintext(BTreeMap::new(), format!("{}: {e}", self.path.display()));
+        }
+        Contents::Index(Index { id: new_id(), keys: BTreeSet::new() })
+    }
+
+    fn pending_path(&self) -> PathBuf {
+        self.path.with_extension("json.migrating")
+    }
+
+    /// The id of a move that has not finished (see [`SecretFile::migrate`]).
+    fn pending_id(&self) -> Option<String> {
+        let id = std::fs::read_to_string(self.pending_path()).ok()?;
+        Some(id.trim().to_owned()).filter(|id| !id.is_empty())
+    }
+
+    /// Moves an older version's secrets to the credential store, key by key; a secret
+    /// the store refuses for good (too long, say) is forgotten, and the user is asked
+    /// for it again. The old file is replaced only when everything else was moved.
+    /// Until then the id waits in `<file>.migrating`, so a retry after a failure or a
+    /// crash overwrites the same credentials instead of copying them again.
+    fn migrate(&self, old: BTreeMap<String, String>) -> Contents {
+        if !self.vault.available() {
+            return Contents::Plaintext(old, "no credential store".into());
+        }
+        let pending = self.pending_path();
+        let id = match self.pending_id() {
+            Some(id) => id,
+            None => {
+                let id = new_id();
+                if let Err(e) = std::fs::write(&pending, &id) {
+                    return Contents::Plaintext(old, format!("{}: {e}", pending.display()));
+                }
+                id
+            }
+        };
+        let mut index = Index { id, keys: BTreeSet::new() };
+        for (key, secret) in &old {
+            match self.vault.set(&service(&index.id), key, secret) {
+                Ok(()) => {
+                    index.keys.insert(key.clone());
+                }
+                Err(e @ (StoreError::TooLong(..) | StoreError::Invalid(..))) => {
+                    tracing::warn!("saved passwords: {key} does not fit the credential store and is forgotten: {e}");
+                }
+                Err(e) => {
+                    tracing::warn!("saved passwords: could not move {key} to the credential store: {e}");
+                    return Contents::Plaintext(old, e.to_string());
+                }
+            }
+        }
+        if let Err(e) = self.write(&index) {
+            return Contents::Plaintext(old, e.message);
+        }
+        let _ = std::fs::remove_file(&pending);
+        Contents::Index(index)
+    }
+
+    fn write_logged(&self, contents: &impl Serialize) {
+        if let Err(e) = self.write(contents) {
+            tracing::warn!("{}", e.message);
+        }
+    }
+
+    fn write(&self, contents: &impl Serialize) -> IdeResult<()> {
         let err = |e: std::io::Error| IdeError::unavailable(format!("saved passwords: {}: {e}", self.path.display()));
         if let Some(dir) = self.path.parent() {
             std::fs::create_dir_all(dir).map_err(err)?;
@@ -65,18 +293,258 @@ impl SecretFile {
         options.write(true).create(true).truncate(true);
         #[cfg(unix)]
         std::os::unix::fs::OpenOptionsExt::mode(&mut options, 0o600);
-        let bytes = serde_json::to_vec_pretty(all).map_err(|e| IdeError::internal(e.to_string()))?;
+        let bytes = serde_json::to_vec_pretty(contents).map_err(|e| IdeError::internal(e.to_string()))?;
         std::io::Write::write_all(&mut options.open(&tmp).map_err(err)?, &bytes).map_err(err)?;
         std::fs::rename(&tmp, &self.path).map_err(err)
     }
 }
 
+fn unavailable(why: &str) -> IdeError {
+    IdeError::unavailable(format!("saved passwords: {why}"))
+}
+
+/// Helpers for tests of crates that save secrets (feature `testing`).
+#[cfg(any(test, feature = "testing"))]
+pub mod testing {
+    use std::path::{Path, PathBuf};
+
+    /// Makes an in-memory credential store the default, so that the test never
+    /// touches the user's keychain. Call it before the first secret is saved.
+    pub fn use_memory_store() {
+        static ONCE: std::sync::Once = std::sync::Once::new();
+        ONCE.call_once(|| keyring_core::set_default_store(keyring_core::sample::Store::new().expect("memory store")));
+    }
+
+    /// Every file under `dir` whose bytes contain `needle`.
+    pub fn files_containing(dir: &Path, needle: &str) -> Vec<PathBuf> {
+        let mut found = Vec::new();
+        let mut pending = vec![dir.to_path_buf()];
+        while let Some(d) = pending.pop() {
+            for entry in std::fs::read_dir(&d).into_iter().flatten().flatten() {
+                let path = entry.path();
+                if path.is_dir() {
+                    pending.push(path);
+                } else if std::fs::read(&path).is_ok_and(|b| b.windows(needle.len()).any(|w| w == needle.as_bytes())) {
+                    found.push(path);
+                }
+            }
+        }
+        found
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    use super::testing::{files_containing, use_memory_store};
     use super::*;
+    use std::collections::HashMap;
+
+    /// A credential store that can be absent, or fail on chosen keys.
+    #[derive(Default)]
+    struct FakeVault {
+        absent: bool,
+        entries: Mutex<HashMap<(String, String), String>>,
+        failing: Mutex<HashMap<String, fn() -> StoreError>>,
+    }
+
+    impl FakeVault {
+        fn fail(&self, key: &str, error: fn() -> StoreError) {
+            self.failing.lock().insert(key.to_owned(), error);
+        }
+
+        fn heal(&self) {
+            self.failing.lock().clear();
+        }
+
+        fn check(&self, key: &str) -> StoreResult<()> {
+            if self.absent {
+                return Err(StoreError::NoDefaultStore);
+            }
+            self.failing.lock().get(key).map_or(Ok(()), |e| Err(e()))
+        }
+
+        fn secrets(&self) -> Vec<String> {
+            let mut all: Vec<_> = self.entries.lock().values().cloned().collect();
+            all.sort();
+            all
+        }
+    }
+
+    impl Vault for FakeVault {
+        fn available(&self) -> bool {
+            !self.absent
+        }
+        fn get(&self, service: &str, key: &str) -> StoreResult<String> {
+            self.check(key)?;
+            self.entries.lock().get(&(service.to_owned(), key.to_owned())).cloned().ok_or(StoreError::NoEntry)
+        }
+        fn set(&self, service: &str, key: &str, secret: &str) -> StoreResult<()> {
+            self.check(key)?;
+            self.entries.lock().insert((service.to_owned(), key.to_owned()), secret.to_owned());
+            Ok(())
+        }
+        fn delete(&self, service: &str, key: &str) -> StoreResult<()> {
+            self.check(key)?;
+            self.entries.lock().remove(&(service.to_owned(), key.to_owned())).map(|_| ()).ok_or(StoreError::NoEntry)
+        }
+    }
+
+    fn platform() -> StoreError {
+        StoreError::PlatformFailure("locked".into())
+    }
+
+    fn with_fake(path: &std::path::Path, vault: &Arc<FakeVault>) -> SecretFile {
+        SecretFile::with_vault(path.to_path_buf(), |v| serde_json::from_value(v).ok(), vault.clone())
+    }
+
+    const OLD: &str = r#"{"https://a.example": "me\nold-a", "https://b.example": "me\nold-b"}"#;
+
+    #[test]
+    fn saved_secrets_never_reach_disk() {
+        use_memory_store();
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("ssh-passwords.json");
+        SecretFile::new(path.clone()).set("a", "hunter2-ssh").unwrap();
+        assert_eq!(files_containing(tmp.path(), "hunter2-ssh"), Vec::<PathBuf>::new());
+        let reopened = SecretFile::new(path);
+        assert_eq!(reopened.get("a").as_deref(), Some("hunter2-ssh"));
+        assert_eq!(reopened.keys(), ["a"]);
+    }
+
+    #[test]
+    fn moves_plaintext_files_of_older_versions_off_disk() {
+        use_memory_store();
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("git-credentials.json");
+        std::fs::write(&path, r#"{"https://example.com": "me\nold-pw"}"#).unwrap();
+        let file = SecretFile::new(path.clone());
+        assert_eq!(file.keys(), ["https://example.com"]);
+        assert_eq!(files_containing(tmp.path(), "old-pw"), Vec::<PathBuf>::new());
+        assert_eq!(SecretFile::new(path).get("https://example.com").as_deref(), Some("me\nold-pw"));
+    }
+
+    #[test]
+    fn a_failed_move_keeps_the_old_file_and_the_retry_converges() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("git-credentials.json");
+        std::fs::write(&path, OLD).unwrap();
+        let vault = Arc::new(FakeVault::default());
+        vault.fail("https://b.example", platform);
+
+        let file = with_fake(&path, &vault);
+        assert_eq!(file.get("https://a.example").as_deref(), Some("me\nold-a"));
+        assert_eq!(std::fs::read_to_string(&path).unwrap(), OLD, "the old file is untouched");
+        assert!(file.set("https://c.example", "me\nnew").unwrap_err().message.contains("locked"));
+
+        vault.heal();
+        assert_eq!(file.keys(), ["https://a.example", "https://b.example"]);
+        assert_eq!(files_containing(tmp.path(), "old-a"), Vec::<PathBuf>::new());
+        assert_eq!(vault.secrets(), ["me\nold-a", "me\nold-b"], "the retry overwrote, not copied");
+        assert!(!path.with_extension("json.migrating").exists());
+        assert_eq!(with_fake(&path, &vault).get("https://b.example").as_deref(), Some("me\nold-b"));
+    }
+
+    #[test]
+    fn forgetting_during_a_pending_move_forgets_the_copy_too() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("git-credentials.json");
+        std::fs::write(&path, OLD).unwrap();
+        let vault = Arc::new(FakeVault::default());
+        vault.fail("https://b.example", platform);
+
+        let file = with_fake(&path, &vault);
+        file.delete("https://a.example");
+        vault.heal();
+        assert_eq!(file.keys(), ["https://b.example"]);
+        assert_eq!(vault.secrets(), ["me\nold-b"]);
+    }
+
+    #[test]
+    fn a_secret_the_store_refuses_for_good_is_forgotten_and_does_not_block_saving() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("git-credentials.json");
+        std::fs::write(&path, OLD).unwrap();
+        let vault = Arc::new(FakeVault::default());
+        vault.fail("https://b.example", || StoreError::TooLong("password".into(), 2560));
+
+        let file = with_fake(&path, &vault);
+        assert_eq!(file.keys(), ["https://a.example"]);
+        assert_eq!(files_containing(tmp.path(), "old-b"), Vec::<PathBuf>::new());
+        file.set("https://c.example", "me\nnew").unwrap();
+        assert_eq!(file.get("https://c.example").as_deref(), Some("me\nnew"));
+    }
+
+    #[test]
+    fn without_a_credential_store_the_old_file_is_read_and_nothing_new_is_saved() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("git-credentials.json");
+        std::fs::write(&path, OLD).unwrap();
+        let vault = Arc::new(FakeVault { absent: true, ..Default::default() });
+
+        let file = with_fake(&path, &vault);
+        assert_eq!(file.get("https://a.example").as_deref(), Some("me\nold-a"));
+        assert!(file.set("https://c.example", "me\nnew").unwrap_err().message.contains("no credential store"));
+        assert_eq!(files_containing(tmp.path(), "me\nnew"), Vec::<PathBuf>::new());
+        assert!(!path.with_extension("json.migrating").exists());
+
+        file.delete("https://a.example");
+        assert_eq!(file.keys(), ["https://b.example"]);
+        assert_eq!(files_containing(tmp.path(), "old-a"), Vec::<PathBuf>::new());
+    }
+
+    #[test]
+    fn forgets_only_what_the_store_forgot() {
+        let tmp = tempfile::tempdir().unwrap();
+        let vault = Arc::new(FakeVault::default());
+        let file = with_fake(&tmp.path().join("ssh-passwords.json"), &vault);
+        file.set("a", "pw").unwrap();
+        vault.fail("a", platform);
+        file.delete("a");
+        assert_eq!(file.keys(), ["a"], "still listed, so that forgetting can be retried");
+        vault.heal();
+        file.delete("a");
+        assert_eq!(file.keys(), Vec::<String>::new());
+        assert_eq!(vault.secrets(), Vec::<String>::new());
+    }
+
+    #[test]
+    fn a_secret_removed_outside_the_app_is_no_longer_listed() {
+        let tmp = tempfile::tempdir().unwrap();
+        let vault = Arc::new(FakeVault::default());
+        let file = with_fake(&tmp.path().join("ssh-passwords.json"), &vault);
+        file.set("a", "pw").unwrap();
+        vault.entries.lock().clear();
+        assert_eq!(file.get("a"), None);
+        assert_eq!(file.keys(), Vec::<String>::new());
+    }
+
+    #[test]
+    fn a_failed_index_write_takes_the_secret_back_out_of_the_store() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("ssh-passwords.json");
+        std::fs::create_dir(&path).unwrap();
+        let vault = Arc::new(FakeVault::default());
+        assert!(with_fake(&path, &vault).set("a", "pw").is_err());
+        assert_eq!(vault.secrets(), Vec::<String>::new());
+    }
+
+    #[test]
+    fn an_unreadable_file_is_set_aside_not_overwritten() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("ssh-passwords.json");
+        std::fs::write(&path, "{ not json").unwrap();
+        let vault = Arc::new(FakeVault::default());
+        let file = with_fake(&path, &vault);
+        assert_eq!(file.keys(), Vec::<String>::new());
+        file.set("a", "pw").unwrap();
+        std::fs::write(&path, "{ not json either").unwrap();
+        assert_eq!(file.keys(), Vec::<String>::new());
+        assert_eq!(files_containing(tmp.path(), "{ not json").len(), 2, "both kept, neither overwritten");
+    }
 
     #[test]
     fn stores_and_forgets_secrets() {
+        use_memory_store();
         let tmp = tempfile::tempdir().unwrap();
         let file = SecretFile::new(tmp.path().join("ssh-passwords.json"));
         file.set("a", "pw").unwrap();
diff --git a/crates/ide-ssh/src/session.rs b/crates/ide-ssh/src/session.rs
index 47f9cd21..c1e959d4 100644
--- a/crates/ide-ssh/src/session.rs
+++ b/crates/ide-ssh/src/session.rs
@@ -267,19 +267,29 @@ impl Session {
                 }),
             )
             .await?;
+        let failed = |code: Option<u32>| {
+            let err = String::from_utf8_lossy(&stderr.lock()).trim().to_owned();
+            io(format!("cannot write {remote} on {} ({code:?}): {err}", self.label))
+        };
+        // A command that exits early (no gzip, a folder it cannot write) stops reading: a
+        // write would wait for channel window forever, so each one races the exit.
+        let mut exit = std::pin::pin!(process.wait());
         let mut sent = 0;
         for chunk in packed.chunks(256 * 1024) {
-            process.write(chunk).await?;
+            tokio::select! {
+                written = process.write(chunk) => written?,
+                code = &mut exit => return Err(failed(code)),
+            }
             sent += chunk.len();
             progress(sent as f64 / packed.len().max(1) as f64);
         }
-        process.eof().await?;
-        match process.wait().await {
+        tokio::select! {
+            closed = process.eof() => closed?,
+            code = &mut exit => return Err(failed(code)),
+        }
+        match exit.await {
             Some(0) => Ok(()),
-            code => {
-                let err = String::from_utf8_lossy(&stderr.lock()).trim().to_owned();
-                Err(io(format!("cannot write {remote} on {} ({code:?}): {err}", self.label)))
-            }
+            code => Err(failed(code)),
         }
     }
 
diff --git a/crates/ide-ssh/tests/os_credential_store.rs b/crates/ide-ssh/tests/os_credential_store.rs
new file mode 100644
index 00000000..5382b6d7
--- /dev/null
+++ b/crates/ide-ssh/tests/os_credential_store.rs
@@ -0,0 +1,44 @@
+//! Saved passwords against the real OS credential store (Windows Credential
+//! Manager, macOS Keychain, Secret Service).
+
+use ide_ssh::secrets::SecretFile;
+
+/// Forgets every key of the file, also when the test panics.
+struct Forget<'a>(&'a SecretFile);
+
+impl Drop for Forget<'_> {
+    fn drop(&mut self) {
+        for key in self.0.keys() {
+            self.0.delete(&key);
+        }
+    }
+}
+
+#[test]
+#[ignore = "uses the OS credential store"]
+fn saves_moves_and_forgets_in_the_os_store() {
+    assert!(keyring::Entry::store_status().is_ok(), "no OS credential store");
+    let tmp = tempfile::tempdir().unwrap();
+    let path = tmp.path().join("git-credentials.json");
+    std::fs::write(&path, r#"{"https://old.example": "me\nold-os-pw"}"#).unwrap();
+    let file = SecretFile::new(path.clone());
+    let forget = Forget(&file);
+    file.set("https://new.example", "me\nnew-os-pw").unwrap();
+    let on_disk = std::fs::read_to_string(&path).unwrap();
+    assert!(!on_disk.contains("old-os-pw") && !on_disk.contains("new-os-pw"), "{on_disk}");
+
+    let reopened = SecretFile::new(path);
+    assert_eq!(reopened.get("https://old.example").as_deref(), Some("me\nold-os-pw"));
+    assert_eq!(reopened.get("https://new.example").as_deref(), Some("me\nnew-os-pw"));
+    #[cfg(windows)]
+    {
+        let index: serde_json::Value = serde_json::from_str(&on_disk).unwrap();
+        let service = format!("ai.l0ng.openidea/{}", index["id"].as_str().unwrap());
+        let listed = std::process::Command::new("cmdkey").arg("/list").output().unwrap();
+        let listed = String::from_utf8_lossy(&listed.stdout);
+        assert_eq!(listed.matches(service.as_str()).count(), 2, "{listed}");
+    }
+    drop(forget);
+    assert_eq!(reopened.keys(), Vec::<String>::new());
+    assert_eq!(reopened.get("https://old.example"), None);
+}
diff --git a/crates/ide-ssh/tests/session.rs b/crates/ide-ssh/tests/session.rs
index b1a00e28..6c89baa3 100644
--- a/crates/ide-ssh/tests/session.rs
+++ b/crates/ide-ssh/tests/session.rs
@@ -269,3 +269,26 @@ async fn runs_commands_and_streams_processes() {
     assert_eq!(process.wait().await, Some(3));
     assert_eq!(*seen.lock(), ("ran: python3 main.py".to_owned(), "oops".to_owned()));
 }
+
+#[tokio::test]
+async fn upload_reports_a_command_that_stops_reading() {
+    let env = env().await;
+    let session = env.connect_trusted(&env.target(SshAuth::Password), Some("secret")).await.ok().unwrap();
+    // Incompressible and larger than the channel window: the command exits (status 3, `oops`)
+    // without reading it, as when the host has no gzip or the folder is not writable.
+    let mut state = 0x9e37_79b9_7f4a_7c15_u64;
+    let data: Vec<u8> = (0..8 << 20)
+        .map(|_| {
+            state ^= state << 13;
+            state ^= state >> 7;
+            state ^= state << 17;
+            state as u8
+        })
+        .collect();
+    let put = session.put("/home/dev/.openidea/server/openidea-server", &data);
+    let err = tokio::time::timeout(std::time::Duration::from_secs(20), put)
+        .await
+        .expect("the upload must end when the command exits")
+        .unwrap_err();
+    assert!(err.message.contains("oops"), "{}", err.message);
+}
diff --git a/crates/ide-text/Cargo.toml b/crates/ide-text/Cargo.toml
index 8867ff2b..fac639ab 100644
--- a/crates/ide-text/Cargo.toml
+++ b/crates/ide-text/Cargo.toml
@@ -12,6 +12,7 @@ ide-core.workspace = true
 # Hence no `unicode_lines` / `cr_lines` (a test guards against feature unification).
 ropey = { version = "1.6", default-features = false, features = ["simd"] }
 serde.workspace = true
+similar = { version = "2.7", default-features = false }
 specta.workspace = true
 
 [dev-dependencies]
diff --git a/crates/ide-text/benches/text.rs b/crates/ide-text/benches/text.rs
index 34d89857..d6461953 100644
--- a/crates/ide-text/benches/text.rs
+++ b/crates/ide-text/benches/text.rs
@@ -73,6 +73,10 @@ fn bench(c: &mut Criterion) {
             BatchSize::SmallInput,
         )
     });
+    let two_edits = text.replacen("value_100 ", "renamed_100 ", 1).replacen("value_9000 ", "renamed_9000 ", 1);
+    c.bench_function("text/diff_two_edits_1mb", |b| b.iter(|| base.diff(black_box(&two_edits))));
+    let every_line = text.replace("compute", "calculate");
+    c.bench_function("text/diff_every_line_1mb", |b| b.iter(|| base.diff(black_box(&every_line))));
     c.bench_function("text/offset_to_pos_round_trip", |b| {
         let mut rng = Lcg(3);
         let len = base.len_utf16();
diff --git a/crates/ide-text/src/lib.rs b/crates/ide-text/src/lib.rs
index 500cc20a..3a1c53f2 100644
--- a/crates/ide-text/src/lib.rs
+++ b/crates/ide-text/src/lib.rs
@@ -14,6 +14,7 @@ use ide_core::{ChangeSet, IdeError, IdeResult, Pos, Range, TextChange, TextEdit}
 use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::borrow::Cow;
+use std::time::{Duration, Instant};
 
 pub use ropey;
 
@@ -66,6 +67,36 @@ impl LineEnding {
     }
 }
 
+/// How long [`Document::diff`] may look for separate regions, so a reload never stalls on a huge file.
+const DIFF_BUDGET: Duration = Duration::from_millis(50);
+
+type LineRange = std::ops::Range<usize>;
+
+/// Byte lengths of the common prefix and suffix; they never overlap.
+fn common_ends(a: &str, b: &str) -> (usize, usize) {
+    let shared = |a: &mut dyn Iterator<Item = char>, b: &mut dyn Iterator<Item = char>| -> usize {
+        a.zip(b).take_while(|(x, y)| x == y).map(|(x, _)| x.len_utf8()).sum()
+    };
+    let prefix = shared(&mut a.chars(), &mut b.chars());
+    let suffix = shared(&mut a[prefix..].chars().rev(), &mut b[prefix..].chars().rev());
+    (prefix, suffix)
+}
+
+/// Byte offset of each line, then the total length.
+fn line_starts(lines: &[&str]) -> Vec<usize> {
+    let mut at = 0;
+    let mut starts = vec![0];
+    starts.extend(lines.iter().map(|line| {
+        at += line.len();
+        at
+    }));
+    starts
+}
+
+fn utf16_len(text: &str) -> u32 {
+    text.chars().map(|c| c.len_utf16() as u32).sum()
+}
+
 /// Converts `\r\n` and lone `\r` to `\n`. Borrows when there is nothing to do.
 pub fn normalize_line_endings(text: &str) -> Cow<'_, str> {
     if !text.contains('\r') {
@@ -334,42 +365,63 @@ impl Document {
         cs
     }
 
-    /// The minimal single-change (common prefix/suffix) change set turning the
-    /// current text into `text` (after line-ending normalization). Empty when equal.
+    /// The change set turning the current text into `text` (after line-ending
+    /// normalization), one change per changed region. Empty when equal. A single change
+    /// spanning two distant edits would drag the editor's caret and view to the first one.
     pub fn diff(&self, text: &str) -> ChangeSet {
+        self.diff_until(text, Instant::now() + DIFF_BUDGET)
+    }
+
+    /// Past `deadline` the regions get coarser, never wrong.
+    fn diff_until(&self, text: &str, deadline: Instant) -> ChangeSet {
         let new = normalize_line_endings(text);
-        let old_chars = self.rope.len_chars();
+        let old = self.rope.to_string();
+        let (prefix, suffix) = common_ends(&old, &new);
+        let old_rest = &old[prefix..old.len() - suffix];
+        let new_rest = &new[prefix..new.len() - suffix];
 
-        let mut prefix_chars = 0usize;
-        let mut prefix_bytes = 0usize;
-        for (a, b) in self.rope.chars().zip(new.chars()) {
-            if a != b {
-                break;
+        let old_lines: Vec<&str> = old_rest.split_inclusive('\n').collect();
+        let new_lines: Vec<&str> = new_rest.split_inclusive('\n').collect();
+        let old_starts = line_starts(&old_lines);
+        let new_starts = line_starts(&new_lines);
+
+        let mut changes = Vec::new();
+        let mut utf16_at = utf16_len(&old[..prefix]);
+        let mut old_at = 0;
+        let mut region: Option<(LineRange, LineRange)> = None;
+        let ops =
+            similar::capture_diff_slices_deadline(similar::Algorithm::Myers, &old_lines, &new_lines, Some(deadline));
+        let mut flush = |region: Option<(LineRange, LineRange)>| {
+            let Some((old_range, new_range)) = region else { return };
+            let region_old = &old_rest[old_starts[old_range.start]..old_starts[old_range.end]];
+            let region_new = &new_rest[new_starts[new_range.start]..new_starts[new_range.end]];
+            let (head, tail) = common_ends(region_old, region_new);
+            let start = old_starts[old_range.start] + head;
+            let end = old_starts[old_range.end] - tail;
+            let from = utf16_at + utf16_len(&old_rest[old_at..start]);
+            let to = from + utf16_len(&old_rest[start..end]);
+            changes.push(TextChange { from, to, insert: region_new[head..region_new.len() - tail].to_owned() });
+            utf16_at = to;
+            old_at = end;
+        };
+        // Positions come from the lengths: `similar` can report a stale start for the empty
+        // side of an op (an insert after an equal run still names the run's first old line).
+        let (mut old_line, mut new_line) = (0, 0);
+        for op in ops {
+            let old_end = old_line + op.old_range().len();
+            let new_end = new_line + op.new_range().len();
+            if op.tag() == similar::DiffTag::Equal {
+                flush(region.take());
+            } else {
+                region = Some(match region.take() {
+                    Some((o, n)) => (o.start..old_end, n.start..new_end),
+                    None => (old_line..old_end, new_line..new_end),
+                });
             }
-            prefix_chars += 1;
-            prefix_bytes += b.len_utf8();
+            (old_line, new_line) = (old_end, new_end);
         }
-        let new_rest = &new[prefix_bytes..];
-        let new_rest_chars = new_rest.chars().count();
-        if prefix_chars == old_chars && new_rest_chars == 0 {
-            return ChangeSet::default();
-        }
-
-        let max_suffix = (old_chars - prefix_chars).min(new_rest_chars);
-        let mut suffix_chars = 0usize;
-        let mut suffix_bytes = 0usize;
-        for (a, b) in self.rope.chars_at(old_chars).reversed().zip(new_rest.chars().rev()).take(max_suffix) {
-            if a != b {
-                break;
-            }
-            suffix_chars += 1;
-            suffix_bytes += b.len_utf8();
-        }
-
-        let from = self.rope.char_to_utf16_cu(prefix_chars) as u32;
-        let to = self.rope.char_to_utf16_cu(old_chars - suffix_chars) as u32;
-        let insert = new_rest[..new_rest.len() - suffix_bytes].to_owned();
-        ChangeSet { changes: vec![TextChange { from, to, insert }] }
+        flush(region);
+        ChangeSet { changes }
     }
 
     // ---- coordinate conversion (UTF-16 offset ⇄ Pos ⇄ byte offset) ----
@@ -606,4 +658,45 @@ mod tests {
         assert_eq!(set.changes, vec![tc(2, 2, "x")]);
         assert_eq!(doc.text(), "😀x😀");
     }
+
+    fn numbered_lines(n: usize) -> String {
+        (0..n).map(|i| format!("line {i}\n")).collect()
+    }
+
+    #[test]
+    fn diff_keeps_distant_edits_apart() {
+        let old = numbered_lines(400);
+        let new = old.replace("line 20\n", "line 20x\n").replace("line 299\n", "line 299x\n");
+        let at = |line: &str| (old.find(line).unwrap() + line.len() - 1) as u32;
+        let set = Document::new(&old).diff(&new);
+        assert_eq!(
+            set.changes,
+            vec![tc(at("line 20\n"), at("line 20\n"), "x"), tc(at("line 299\n"), at("line 299\n"), "x")]
+        );
+    }
+
+    #[test]
+    fn diff_handles_added_and_removed_lines() {
+        let old = "a\nb\nc\nd\ne\nf\n";
+        let set = Document::new(old).diff("a\nnew\nb\nc\ne\nf\n");
+        assert_eq!(set.changes, vec![tc(2, 2, "new\n"), tc(5, 7, "")]);
+    }
+
+    #[test]
+    fn diff_counts_utf16_past_astral_text() {
+        let old = "😀 one\nsame\n😀 two\n";
+        let set = Document::new(old).diff("😀 ONE\nsame\n😀 TWO\n");
+        assert_eq!(set.changes, vec![tc(3, 6, "ONE"), tc(15, 18, "TWO")]);
+    }
+
+    #[test]
+    fn diff_past_its_deadline_is_coarser_but_still_correct() {
+        let old = numbered_lines(5000);
+        let new = old.replace("line 20\n", "line 20x\n").replace("line 4000\n", "line 4000x\n");
+        let doc = Document::new(&old);
+        let set = doc.diff_until(&new, std::time::Instant::now());
+        let mut replayed = Document::new(&old);
+        replayed.apply(0, &set).unwrap();
+        assert_eq!(replayed.text(), new);
+    }
 }
diff --git a/crates/ide-text/tests/props.proptest-regressions b/crates/ide-text/tests/props.proptest-regressions
index c1187945..ab2c31ca 100644
--- a/crates/ide-text/tests/props.proptest-regressions
+++ b/crates/ide-text/tests/props.proptest-regressions
@@ -5,3 +5,4 @@
 # It is recommended to check this file in to source control so that
 # everyone who runs the test benefits from these saved cases.
 cc afa0785335731ca8adc050b09312843aeb3ff05dc895963d09d9f728c553717c # shrinks to doc_text = "a", picks = [(0, 0, ""), (0, 0, ""), (658842129343018477, 1922606258417419361, ""), (0, 4297423518677873183, ""), (953525717999286983, 557348908835472853, "a"), (0, 0, "b"), (0, 1653396554766652711, "")], seed = 7072935092038531240
+cc dd6ec32be77e8ad96d0ce3ef14ad9d72d5ba2a06f227ea693bfdee62debf08b7 # shrinks to a = "中é\n\n", b = "\n\na"
diff --git a/crates/ide-text/tests/props.rs b/crates/ide-text/tests/props.rs
index b7324d10..bbf9d3a7 100644
--- a/crates/ide-text/tests/props.rs
+++ b/crates/ide-text/tests/props.rs
@@ -176,7 +176,7 @@ proptest! {
         let set = doc.replace_all(&b);
         prop_assert_eq!(doc.text(), b.clone());
         prop_assert_eq!(naive_apply(&a, &set), b.clone());
-        prop_assert!(set.changes.len() <= 1);
+        prop_assert!(set.changes.windows(2).all(|w| w[0].to < w[1].from));
         prop_assert_eq!(set.changes.is_empty(), a == b);
     }
 
diff --git a/crates/ide-tools/src/lib.rs b/crates/ide-tools/src/lib.rs
index 749b18f3..881393d6 100644
--- a/crates/ide-tools/src/lib.rs
+++ b/crates/ide-tools/src/lib.rs
@@ -8,6 +8,12 @@
 //!
 //! Language servers find managed tools once [`extend_process_path`] has put
 //! [`tools_bin_dirs`] on the process `PATH` at startup.
+//!
+//! GitHub API downloads prefer `GITHUB_TOKEN`, then `GH_TOKEN`, then the active
+//! `github.com` account from `gh auth token --hostname github.com`. The CLI is
+//! optional; absent credentials retain anonymous downloads. Tokens are passed
+//! to curl over stdin, never stored in tool manifests or command arguments, and
+//! are not sent to other download origins. CLI lookup is cancellable and bounded.
 
 pub mod archive;
 mod bundled;
@@ -389,6 +395,11 @@ pub fn parse_version(text: &str) -> Option<String> {
     None
 }
 
+/// A Windows App Execution Alias (`%LOCALAPPDATA%\Microsoft\WindowsApps\python.exe`).
+fn is_app_execution_alias(path: &Path) -> bool {
+    path.parent().and_then(Path::file_name).is_some_and(|d| d.eq_ignore_ascii_case("WindowsApps"))
+}
+
 /// A tool whose "command" is a plugin jar (e.g. a jdtls bundle) rather than an executable.
 fn is_bundle(command: &str) -> bool {
     command.ends_with(".jar")
@@ -485,8 +496,32 @@ impl Tools {
         cmd
     }
 
+    /// The interpreter that installs and probes Python tools. Windows installs `python.exe`
+    /// and the `py` launcher, not `python3.exe`; its `WindowsApps` entries are App Execution
+    /// Aliases that only open the Store unless the Store's Python is installed, so they count
+    /// only when they run.
     fn python(&self) -> Option<PathBuf> {
-        self.which_any(&["python3", "python"])
+        if self.platform.os != Os::Windows {
+            return self.which_any(&["python3", "python"]);
+        }
+        ["python", "py", "python3"]
+            .into_iter()
+            .flat_map(|command| {
+                std::env::split_paths(&self.system_path).filter_map(move |dir| {
+                    if dir.as_os_str().is_empty() {
+                        return None;
+                    }
+                    let search = std::env::join_paths([dir]).ok()?;
+                    ide_core::tool_path::find_command(command, &search, &self.root)
+                })
+            })
+            .find(|p| {
+                !is_app_execution_alias(p) || {
+                    let mut c = self.python_command(p);
+                    c.arg("--version");
+                    run_quiet(c, Duration::from_secs(5)).is_some_and(|(ok, _)| ok)
+                }
+            })
     }
 
     /// Executable `cmd` inside `dir`, honouring Windows suffixes.
diff --git a/crates/ide-tools/src/process.rs b/crates/ide-tools/src/process.rs
index 889cbe49..ac8a48b2 100644
--- a/crates/ide-tools/src/process.rs
+++ b/crates/ide-tools/src/process.rs
@@ -6,9 +6,9 @@ use ide_core::error::ErrorKind;
 use ide_core::output_encoding::decode_tool_output;
 use ide_core::process::{kill_tree, own_group};
 use ide_core::{CancellationToken, IdeError, IdeResult};
-use std::io::{BufRead, BufReader, Read};
+use std::io::{BufRead, BufReader, Read, Write};
 use std::path::Path;
-use std::process::{Command, Stdio};
+use std::process::{Child, Command, Stdio};
 use std::sync::mpsc;
 use std::time::{Duration, Instant};
 
@@ -144,6 +144,99 @@ fn strip_ansi(s: &str) -> String {
     out
 }
 
+const MAX_GITHUB_TOKEN: usize = 4096;
+
+fn valid_github_token(value: String) -> Option<String> {
+    let value = value.trim();
+    (!value.is_empty() && value.len() <= MAX_GITHUB_TOKEN && value.bytes().all(|b| b.is_ascii_graphic()))
+        .then(|| value.to_owned())
+}
+
+fn environment_github_token(read: impl Fn(&str) -> Option<String>) -> Option<String> {
+    ["GITHUB_TOKEN", "GH_TOKEN"].into_iter().find_map(|key| read(key).and_then(valid_github_token))
+}
+
+/// Ask gh for the active github.com account on each request, so switching or
+/// logging out takes effect without persisting a second copy of the credential.
+fn read_gh_token(gh: &Path, cancel: &CancellationToken, timeout: Duration) -> IdeResult<Option<String>> {
+    if cancel.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
+    let mut cmd = Command::new(gh);
+    own_group(ide_core::process::prepare(&mut cmd));
+    cmd.args(["auth", "token", "--hostname", "github.com"])
+        .env("GH_PROMPT_DISABLED", "1")
+        .stdin(Stdio::null())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::null());
+    let Ok(mut child) = cmd.spawn() else { return Ok(None) };
+    let stdout = child.stdout.take().expect("piped");
+    let (tx, rx) = mpsc::channel();
+    std::thread::spawn(move || {
+        let mut bytes = Vec::new();
+        let _ = stdout.take((MAX_GITHUB_TOKEN + 2) as u64).read_to_end(&mut bytes);
+        let _ = tx.send(bytes);
+    });
+    let started = Instant::now();
+    let mut status = None;
+    let mut output = None;
+    let bytes = loop {
+        if cancel.is_cancelled() || started.elapsed() >= timeout {
+            kill_tree(&mut child);
+            return if cancel.is_cancelled() { Err(IdeError::cancelled()) } else { Ok(None) };
+        }
+        if status.is_none() {
+            match child.try_wait() {
+                Ok(value) => status = value,
+                Err(_) => {
+                    kill_tree(&mut child);
+                    return Ok(None);
+                }
+            }
+        }
+        if let Some(status) = status {
+            if !status.success() {
+                kill_tree(&mut child);
+                return Ok(None);
+            }
+            if let Some(bytes) = output.take() {
+                break bytes;
+            }
+        }
+        match rx.recv_timeout(Duration::from_millis(15)) {
+            Ok(bytes) => output = Some(bytes),
+            Err(mpsc::RecvTimeoutError::Timeout) => {}
+            Err(mpsc::RecvTimeoutError::Disconnected) => std::thread::sleep(Duration::from_millis(15)),
+        }
+    };
+    if bytes.len() > MAX_GITHUB_TOKEN + 1 {
+        return Ok(None);
+    }
+    Ok(String::from_utf8(bytes).ok().and_then(valid_github_token))
+}
+
+fn send_auth(child: &mut Child, token: Option<&str>) -> IdeResult<()> {
+    if let Some(token) = token {
+        let result = child
+            .stdin
+            .take()
+            .expect("authenticated request has piped stdin")
+            .write_all(format!("Authorization: Bearer {token}\n").as_bytes());
+        if let Err(error) = result {
+            kill_tree(child);
+            return Err(IdeError::unavailable(format!("cannot pass download credentials to curl: {error}")));
+        }
+    }
+    Ok(())
+}
+
+fn redact_auth(message: &str, token: Option<&str>) -> String {
+    match token {
+        Some(token) => message.replace(token, "[redacted]"),
+        None => message.to_owned(),
+    }
+}
+
 /// Whether `curl` checks certificate revocation with Schannel and takes
 /// `--ssl-revoke-best-effort` (7.70+). Schannel fails the whole download with
 /// CRYPT_E_REVOCATION_OFFLINE when the CRL/OCSP servers are unreachable (corporate
@@ -174,6 +267,8 @@ fn curl_takes_revoke_best_effort(version: &str) -> bool {
 /// mainstream Linux), so the IDE carries no TLS stack of its own.
 pub struct Http {
     curl: std::path::PathBuf,
+    gh: Option<std::path::PathBuf>,
+    explicit_github_token: Option<String>,
     https_only: bool,
     revoke_best_effort: bool,
 }
@@ -182,8 +277,10 @@ impl Http {
     pub fn new(search_path: &std::ffi::OsStr) -> IdeResult<Self> {
         let curl = which::which_in("curl", Some(search_path), ".")
             .map_err(|_| IdeError::unavailable("`curl` is required to download tools"))?;
+        let gh = which::which_in("gh", Some(search_path), ".").ok();
+        let explicit_github_token = environment_github_token(|key| std::env::var(key).ok());
         let revoke_best_effort = cfg!(windows) && revoke_best_effort(&curl);
-        Ok(Self { curl, https_only: false, revoke_best_effort })
+        Ok(Self { curl, gh, explicit_github_token, https_only: false, revoke_best_effort })
     }
 
     /// Refuses every protocol but HTTPS, redirects included.
@@ -192,8 +289,28 @@ impl Http {
         self
     }
 
-    fn base(&self, url: &str) -> Command {
+    fn base(&self, url: &str, cancel: &CancellationToken) -> IdeResult<(Command, Option<String>)> {
+        if cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
+        let github = url.starts_with("https://api.github.com/");
+        let token = if github {
+            match &self.explicit_github_token {
+                Some(token) => Some(token.clone()),
+                None => match &self.gh {
+                    Some(gh) => read_gh_token(gh, cancel, Duration::from_secs(5))?,
+                    None => None,
+                },
+            }
+        } else {
+            None
+        };
         let mut cmd = Command::new(&self.curl);
+        // A user curlrc must not enable verbose token logging or forwarding
+        // Authorization across origins on authenticated API requests.
+        if token.is_some() {
+            cmd.arg("-q");
+        }
         own_group(ide_core::process::prepare(&mut cmd));
         cmd.args(["-fsSL", "--retry", "2", "--connect-timeout", "20", "-A", "openidea"]);
         // System Settings › HTTP Proxy (a manual proxy comes in through `prepare`'s environment).
@@ -204,13 +321,14 @@ impl Http {
         if self.revoke_best_effort {
             cmd.arg("--ssl-revoke-best-effort");
         }
-        if url.starts_with("https://api.github.com/")
-            && let Ok(token) = std::env::var("GITHUB_TOKEN").or_else(|_| std::env::var("GH_TOKEN"))
-            && !token.is_empty()
-        {
-            cmd.arg("-H").arg(format!("Authorization: Bearer {token}"));
+        cmd.stdin(Stdio::null());
+        if token.is_some() {
+            // Keep credentials out of process arguments, inherited environment,
+            // and files. curl strips Authorization on cross-origin redirects.
+            cmd.args(["--header", "@-", "--proto-redir", "=https"]);
+            cmd.env_remove("GH_TOKEN").env_remove("GITHUB_TOKEN").stdin(Stdio::piped());
         }
-        cmd
+        Ok((cmd, token))
     }
 
     /// GETs `url` as text.
@@ -235,15 +353,16 @@ impl Http {
         empty_on_404: bool,
         cancel: &CancellationToken,
     ) -> IdeResult<String> {
-        let mut cmd = self.base(url);
+        let (mut cmd, token) = self.base(url, cancel)?;
         if empty_on_404 {
             cmd.args(["--write-out", "\n%{http_code}"]);
         }
         if let Some(max) = max_bytes {
             cmd.arg("--max-filesize").arg(max.to_string());
         }
-        cmd.arg(url).stdin(Stdio::null()).stdout(Stdio::piped()).stderr(Stdio::piped());
+        cmd.arg(url).stdout(Stdio::piped()).stderr(Stdio::piped());
         let mut child = cmd.spawn().map_err(|e| IdeError::unavailable(format!("cannot run curl: {e}")))?;
+        send_auth(&mut child, token.as_deref())?;
         let stdout = child.stdout.take().expect("piped");
         let mut stderr = child.stderr.take().expect("piped");
         // Past the limit the pipe closes, which stops curl.
@@ -280,7 +399,10 @@ impl Http {
             let mut err = Vec::new();
             let _ = stderr.read_to_end(&mut err);
             let err = decode_tool_output(&err);
-            return Err(IdeError::new(ErrorKind::Io, format!("GET {url} failed: {}", err.trim())));
+            return Err(IdeError::new(
+                ErrorKind::Io,
+                format!("GET {url} failed: {}", redact_auth(err.trim(), token.as_deref())),
+            ));
         }
         String::from_utf8(body).map_err(|_| IdeError::new(ErrorKind::Protocol, format!("{url}: response is not UTF-8")))
     }
@@ -294,9 +416,10 @@ impl Http {
         cancel: &CancellationToken,
         emit: Emit,
     ) -> IdeResult<()> {
-        let mut cmd = self.base(url);
-        cmd.arg("-o").arg(dest).arg(url).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::piped());
+        let (mut cmd, token) = self.base(url, cancel)?;
+        cmd.arg("-o").arg(dest).arg(url).stdout(Stdio::null()).stderr(Stdio::piped());
         let mut child = cmd.spawn().map_err(|e| IdeError::unavailable(format!("cannot run curl: {e}")))?;
+        send_auth(&mut child, token.as_deref())?;
         let mut stderr = child.stderr.take().expect("piped");
         let err_t = std::thread::spawn(move || {
             let mut s = Vec::new();
@@ -327,7 +450,10 @@ impl Http {
         if !status.success() {
             return Err(IdeError::new(
                 ErrorKind::Io,
-                format!("download of {url} failed: {}", err_t.join().unwrap_or_default().trim()),
+                format!(
+                    "download of {url} failed: {}",
+                    redact_auth(err_t.join().unwrap_or_default().trim(), token.as_deref())
+                ),
             ));
         }
         let bytes = std::fs::metadata(dest).map(|m| m.len()).unwrap_or(0);
@@ -490,7 +616,13 @@ mod tests {
         use std::os::unix::fs::PermissionsExt;
         let tmp = tempfile::tempdir().unwrap();
         let curl = tmp.path().join("curl");
-        let http = Http { curl: curl.clone(), https_only: false, revoke_best_effort: false };
+        let http = Http {
+            curl: curl.clone(),
+            gh: None,
+            explicit_github_token: None,
+            https_only: false,
+            revoke_best_effort: false,
+        };
         for (code, exit, expected) in [(404, 22, Some("[]")), (200, 0, Some("payload")), (403, 22, None), (0, 7, None)]
         {
             std::fs::write(&curl, format!("#!/bin/sh\nprintf 'payload\\n{code:03}'\nexit {exit}\n")).unwrap();
@@ -595,3 +727,200 @@ mod input_tests {
         );
     }
 }
+
+#[cfg(test)]
+mod github_auth_tests {
+    use super::*;
+
+    #[test]
+    fn explicit_tokens_keep_precedence_and_reject_header_injection() {
+        let read = |key: &str| Some(if key == "GITHUB_TOKEN" { "first" } else { "second" }.to_owned());
+        assert_eq!(environment_github_token(read).as_deref(), Some("first"));
+        assert_eq!(
+            environment_github_token(|key| Some(if key == "GITHUB_TOKEN" { "" } else { "second" }.into())).as_deref(),
+            Some("second")
+        );
+        for bad in ["", "two words", "token\r\nX-Injected: yes", "token\0"] {
+            assert!(valid_github_token(bad.into()).is_none());
+        }
+        assert!(valid_github_token("a".repeat(MAX_GITHUB_TOKEN + 1)).is_none());
+        assert_eq!(valid_github_token("gho_example\n".into()).as_deref(), Some("gho_example"));
+    }
+
+    #[cfg(unix)]
+    mod unix {
+        use super::*;
+        use std::fs;
+        use std::os::unix::fs::PermissionsExt;
+        use std::path::PathBuf;
+
+        fn quote(path: &Path) -> String {
+            format!("'{}'", path.display().to_string().replace('\'', "'\\''"))
+        }
+        struct Fixture {
+            dir: tempfile::TempDir,
+            http: Http,
+        }
+        impl Fixture {
+            fn new() -> Self {
+                let dir = tempfile::tempdir().unwrap();
+                let curl = dir.path().join("curl");
+                let gh = dir.path().join("gh");
+                let fixture = Self {
+                    dir,
+                    http: Http {
+                        curl,
+                        gh: Some(gh),
+                        explicit_github_token: None,
+                        https_only: false,
+                        revoke_best_effort: false,
+                    },
+                };
+                fixture.script(
+                    "gh",
+                    &format!(
+                        "printf '%s\\n' \"$@\" >> {}\n/bin/cat {}",
+                        quote(&fixture.path("gh-args")),
+                        quote(&fixture.path("token"))
+                    ),
+                );
+                fs::write(fixture.path("token"), "gho_fake_first\n").unwrap();
+                fixture.curl("printf '{\"ok\":true}'");
+                fixture
+            }
+            fn path(&self, name: &str) -> PathBuf {
+                self.dir.path().join(name)
+            }
+            fn script(&self, name: &str, body: &str) {
+                let path = self.path(name);
+                fs::write(&path, format!("#!/bin/sh\n{body}\n")).unwrap();
+                fs::set_permissions(path, fs::Permissions::from_mode(0o755)).unwrap();
+            }
+            fn curl(&self, body: &str) {
+                self.script(
+                    "curl",
+                    &format!(
+                        "printf '%s\\n' \"$@\" > {}\n/bin/cat > {}\n{body}",
+                        quote(&self.path("curl-args")),
+                        quote(&self.path("headers"))
+                    ),
+                );
+            }
+            fn get(&self, url: &str) -> IdeResult<String> {
+                self.http.get_text(url, &CancellationToken::new())
+            }
+        }
+        const API: &str = "https://api.github.com/repos/example/project/releases/latest";
+
+        #[test]
+        fn active_gh_account_is_read_per_request_and_token_is_not_an_argument() {
+            let f = Fixture::new();
+            assert_eq!(f.get(API).unwrap(), "{\"ok\":true}");
+            assert_eq!(fs::read_to_string(f.path("headers")).unwrap(), "Authorization: Bearer gho_fake_first\n");
+            let args = fs::read_to_string(f.path("curl-args")).unwrap();
+            assert!(!args.contains("gho_fake"));
+            assert!(args.starts_with("-q\n"));
+            assert!(args.contains("--header\n@-\n--proto-redir\n=https\n"));
+            assert!(!args.contains("--location-trusted"));
+            assert_eq!(fs::read_to_string(f.path("gh-args")).unwrap(), "auth\ntoken\n--hostname\ngithub.com\n");
+            fs::write(f.path("token"), "gho_fake_second\n").unwrap();
+            f.get(API).unwrap();
+            assert_eq!(fs::read_to_string(f.path("headers")).unwrap(), "Authorization: Bearer gho_fake_second\n");
+        }
+
+        #[test]
+        fn explicit_token_avoids_gh_and_non_github_urls_receive_no_credentials() {
+            let mut f = Fixture::new();
+            f.http.explicit_github_token = Some("explicit_fake".into());
+            f.get(API).unwrap();
+            assert!(!f.path("gh-args").exists());
+            assert_eq!(fs::read_to_string(f.path("headers")).unwrap(), "Authorization: Bearer explicit_fake\n");
+            f.http.explicit_github_token = None;
+            for url in [
+                "https://example.com/file",
+                "http://api.github.com/repos/x",
+                "https://api.github.com.evil.example/file",
+                "https://api.github.com@evil.example/file",
+                "https://github.com/example/project/releases/download/v1/file",
+            ] {
+                f.get(url).unwrap();
+                assert_eq!(fs::read_to_string(f.path("headers")).unwrap(), "");
+                assert!(!f.path("gh-args").exists());
+            }
+        }
+
+        #[test]
+        fn missing_logged_out_or_malformed_gh_falls_back_to_anonymous() {
+            let mut f = Fixture::new();
+            for body in ["exit 1", "printf 'fake\\nX-Injected: yes\\n'", "printf ''", "printf 'fake'; exit 1"] {
+                f.script("gh", body);
+                f.get(API).unwrap();
+                assert_eq!(fs::read_to_string(f.path("headers")).unwrap(), "");
+            }
+            f.http.gh = None;
+            f.get(API).unwrap();
+            assert_eq!(fs::read_to_string(f.path("headers")).unwrap(), "");
+        }
+
+        #[test]
+        fn download_auth_and_errors_do_not_expose_the_token() {
+            let f = Fixture::new();
+            let dest = f.path("download");
+            f.curl(&format!("printf downloaded > {}", quote(&dest)));
+            f.http.download(API, &dest, None, &CancellationToken::new(), &|_| {}).unwrap();
+            assert_eq!(fs::read_to_string(&dest).unwrap(), "downloaded");
+            assert!(fs::read_to_string(f.path("headers")).unwrap().contains("gho_fake_first"));
+            f.curl(&format!("/bin/cat {} >&2; exit 22", quote(&f.path("headers"))));
+            let error = f.get(API).unwrap_err().to_string();
+            assert!(error.contains("[redacted]"));
+            assert!(!error.contains("gho_fake_first"));
+            let error = f.http.download(API, &dest, None, &CancellationToken::new(), &|_| {}).unwrap_err().to_string();
+            assert!(!error.contains("gho_fake_first"));
+        }
+
+        #[test]
+        fn credential_lookup_is_bounded_and_cancellable_even_with_inherited_stdout() {
+            let f = Fixture::new();
+            // The parent exits but a child keeps stdout open: joining a reader
+            // without checking the deadline would hang here.
+            f.script("gh", "/bin/sleep 5 &\nexit 0");
+            let started = Instant::now();
+            assert!(
+                read_gh_token(f.http.gh.as_ref().unwrap(), &CancellationToken::new(), Duration::from_millis(60))
+                    .unwrap()
+                    .is_none()
+            );
+            assert!(started.elapsed() < Duration::from_secs(3));
+            f.script("gh", "/bin/sleep 5");
+            let cancel = CancellationToken::new();
+            let trigger = cancel.clone();
+            let thread = std::thread::spawn(move || {
+                std::thread::sleep(Duration::from_millis(50));
+                trigger.cancel();
+            });
+            assert_eq!(f.http.get_text(API, &cancel).unwrap_err().kind, ErrorKind::Cancelled);
+            thread.join().unwrap();
+            assert!(!f.path("curl-args").exists());
+        }
+
+        #[test]
+        #[ignore = "requires an active gh github.com login and network access"]
+        fn live_github_release_uses_authenticated_quota() {
+            let http = Http::new(&std::env::var_os("PATH").unwrap()).unwrap();
+            assert!(http.gh.is_some());
+            let cancel = CancellationToken::new();
+            let body = http.get_text_limited("https://api.github.com/rate_limit", Some(64 * 1024), &cancel).unwrap();
+            let response: serde_json::Value = serde_json::from_str(&body).unwrap();
+            assert!(response["resources"]["core"]["limit"].as_u64().unwrap() > 60);
+            let body = http
+                .get_text_limited(
+                    "https://api.github.com/repos/redhat-developer/vscode-xml/releases/latest",
+                    Some(1024 * 1024),
+                    &cancel,
+                )
+                .unwrap();
+            let response: serde_json::Value = serde_json::from_str(&body).unwrap();
+            assert!(response["tag_name"].is_string());
+        }
+    }
+}
diff --git a/crates/ide-tools/src/registry.rs b/crates/ide-tools/src/registry.rs
index 116dbfc8..494482f7 100644
--- a/crates/ide-tools/src/registry.rs
+++ b/crates/ide-tools/src/registry.rs
@@ -641,11 +641,11 @@ pub static TOOLS: &[ToolSpec] = &[
         // ECJ 3.46.200 keeps the constructor call in a constructor's statements, which
         // @SneakyThrows / @NonNull must not wrap or precede (lombok#4089).
         // Return to Maven Central once an official release includes both.
-        // Source commit, build instructions and checksum: plugins/lombok/README.md.
+        // Source commit, build instructions and checksum: java/lombok/README.md.
         method: Method::Bundled {
             filename: "lombok-1.18.48-openidea.2.jar",
             version: "1.18.48-openidea.2",
-            bytes: include_bytes!("../../../plugins/lombok/lombok-1.18.48-openidea.2.jar"),
+            bytes: include_bytes!("../../../java/lombok/lombok-1.18.48-openidea.2.jar"),
         },
         fallback: None,
         version: V,
@@ -680,7 +680,9 @@ pub static TOOLS: &[ToolSpec] = &[
                 rule(Linux, Arm64, "kotlin-lsp-*-linux-aarch64.zip"),
                 rule(Windows, X64, "kotlin-lsp-*-win-x64.zip"),
             ],
-            locate: &["kotlin-lsp", "kotlin-lsp.sh", "kotlin-lsp.cmd"],
+            // `bin/intellij-server` is the launcher; current releases still ship the
+            // `kotlin-lsp.sh` / `kotlin-lsp.cmd` wrappers around it, deprecated, and old ones only those.
+            locate: &["intellij-server", "kotlin-lsp", "kotlin-lsp.sh", "kotlin-lsp.cmd"],
         },
         fallback: None,
         version: V,
@@ -1044,6 +1046,25 @@ mod tests {
     /// The v263 kotlin-server-* release notes: the CLI distribution archives plus
     /// the VS Code extension and checksums; each platform must pick its native
     /// distribution and the aarch64 archive must never be picked on x64.
+    #[test]
+    fn kotlin_lsp_runs_its_launcher_rather_than_the_deprecated_wrapper() {
+        let Method::Release { locate, .. } = &find("kotlin-lsp").unwrap().method else { unreachable!() };
+        let names: Vec<String> = locate.iter().map(|n| n.to_string()).collect();
+        let tmp = tempfile::tempdir().unwrap();
+        // Current releases: `kotlin-lsp.sh` warns that it will go and execs `bin/intellij-server`.
+        let current = tmp.path().join("current");
+        let dist = current.join("kotlin-server-263.7084.0");
+        std::fs::create_dir_all(dist.join("bin")).unwrap();
+        std::fs::write(dist.join("kotlin-lsp.sh"), "").unwrap();
+        std::fs::write(dist.join("bin/intellij-server"), "").unwrap();
+        assert_eq!(crate::archive::locate(&current, &names), Some(dist.join("bin/intellij-server")));
+        // Older releases have only the script.
+        let old = tmp.path().join("old");
+        std::fs::create_dir_all(&old).unwrap();
+        std::fs::write(old.join("kotlin-lsp.sh"), "").unwrap();
+        assert_eq!(crate::archive::locate(&old, &names), Some(old.join("kotlin-lsp.sh")));
+    }
+
     #[test]
     fn kotlin_lsp_picks_the_native_archive_for_each_platform() {
         use crate::platform::{Platform, select_asset};
diff --git a/crates/ide-tools/src/tests.rs b/crates/ide-tools/src/tests.rs
index be6878be..de4ff670 100644
--- a/crates/ide-tools/src/tests.rs
+++ b/crates/ide-tools/src/tests.rs
@@ -37,6 +37,12 @@ impl Env {
         fs::write(&p, format!("#!/bin/sh\n{body}\n")).unwrap();
         archive::make_executable(&p).unwrap();
     }
+
+    #[cfg(windows)]
+    fn script(&self, dir: &Path, name: &str, body: &str) {
+        fs::create_dir_all(dir).unwrap();
+        fs::write(dir.join(format!("{name}.cmd")), format!("@echo off\r\n{body}\r\n")).unwrap();
+    }
 }
 
 fn find<'a>(list: &'a [ToolInfo], name: &str) -> &'a ToolInfo {
@@ -71,7 +77,7 @@ fn bundled_lombok_is_available_offline_and_repairs_missing_or_corrupt_files() {
     let env = Env::new();
     let data = env.root.parent().unwrap();
     let agent = managed_bundle(data, "lombok").unwrap();
-    let checksum = include_str!("../../../plugins/lombok/SHA256SUMS").split_whitespace().next().unwrap();
+    let checksum = include_str!("../../../java/lombok/SHA256SUMS").split_whitespace().next().unwrap();
     assert_eq!(sources::sha256_file(&agent).unwrap(), checksum);
     for contents in [None, Some(b"incomplete jar".as_slice())] {
         if let Some(contents) = contents {
@@ -93,7 +99,7 @@ fn concurrent_windows_get_the_same_complete_bundled_lombok() {
         let windows: Vec<_> = (0..8).map(|_| scope.spawn(|| managed_bundle(data, "lombok").unwrap())).collect();
         let paths: Vec<_> = windows.into_iter().map(|window| window.join().unwrap()).collect();
         assert!(paths.iter().all(|path| path == &paths[0]));
-        let checksum = include_str!("../../../plugins/lombok/SHA256SUMS").split_whitespace().next().unwrap();
+        let checksum = include_str!("../../../java/lombok/SHA256SUMS").split_whitespace().next().unwrap();
         assert_eq!(sources::sha256_file(&paths[0]).unwrap(), checksum);
     });
 }
@@ -700,6 +706,34 @@ fn rust_analyzer_managed_copy_survives_rustup_becoming_available() {
     assert!(!env.root.join("rust-analyzer").exists());
 }
 
+/// Windows has `python.exe` and `py`, not `python3.exe`; the `WindowsApps` aliases only count
+/// when the Store's Python behind them runs.
+#[test]
+fn windows_python_skips_store_aliases_that_do_not_run() {
+    let env = Env::new();
+    let aliases = env.sys.parent().unwrap().join("Microsoft").join("WindowsApps");
+    env.script(&aliases, "python", "exit 9009");
+    env.script(&aliases, "python3", "exit 9009");
+    env.script(&env.sys, "py", "echo Python 3.12.0");
+    let windows = Platform { os: Os::Windows, arch: platform::Arch::X64 };
+    let found = || {
+        let dirs = std::env::join_paths([aliases.clone(), env.sys.clone()]).unwrap();
+        Tools::with_paths(env.root.clone(), dirs, windows).python().map(|python| {
+            let dir = python.parent().unwrap().file_name().unwrap().to_string_lossy().into_owned();
+            format!("{dir}/{}", python.file_stem().unwrap().to_string_lossy())
+        })
+    };
+    assert_eq!(found().as_deref(), Some("sysbin/py"));
+    fs::remove_file(env.sys.join(if cfg!(windows) { "py.cmd" } else { "py" })).unwrap();
+    assert_eq!(found(), None, "only broken aliases are available");
+    env.script(&env.sys, "python3", "echo Python 3.12.0");
+    assert_eq!(found().as_deref(), Some("sysbin/python3"), "python3 is the final fallback");
+    env.script(&env.sys, "python", "echo Python 3.12.0");
+    assert_eq!(found().as_deref(), Some("sysbin/python"), "a broken alias must not hide a later interpreter");
+    env.script(&aliases, "python", "echo Python 3.13.0");
+    assert_eq!(found().as_deref(), Some("WindowsApps/python"), "the Store's Python runs");
+}
+
 #[cfg(unix)]
 #[test]
 fn python_probes_run_in_an_empty_private_directory() {
diff --git a/crates/ide-vcs/Cargo.toml b/crates/ide-vcs/Cargo.toml
index 4d79193c..512b1bde 100644
--- a/crates/ide-vcs/Cargo.toml
+++ b/crates/ide-vcs/Cargo.toml
@@ -15,6 +15,8 @@ serde_json.workspace = true
 specta.workspace = true
 gix = { workspace = true, features = ["sha1", "sha256", "status", "blob-diff", "revision", "index", "dirwalk", "parallel"] }
 tracing.workspace = true
+redb.workspace = true
+blake3.workspace = true
 tempfile.workspace = true
 which = "8"
 regex-lite = "0.1"
diff --git a/crates/ide-vcs/src/bek.rs b/crates/ide-vcs/src/bek.rs
new file mode 100644
index 00000000..ad94665b
--- /dev/null
+++ b/crates/ide-vcs/src/bek.rs
@@ -0,0 +1,192 @@
+//! Bek branch partitioning and bottom-up block merge.
+//! Adapted from JetBrains intellij-community BekBranchCreator/BekBranch/Merger,
+//! Copyright 2000-2026 JetBrains s.r.o. and contributors, Apache-2.0.
+use std::cmp::Reverse;
+use std::collections::{BinaryHeap, HashSet};
+
+pub(crate) fn sort(parents: &[Vec<usize>], times: &[i64], heads: &[usize]) -> Vec<usize> {
+    let n = parents.len();
+    let mut children = vec![Vec::new(); n];
+    for (i, ps) in parents.iter().enumerate() {
+        for &p in ps {
+            children[p].push(i);
+        }
+    }
+    let mut layout = vec![0usize; n];
+    let mut important = Vec::new();
+    let mut next_layout = 1;
+    for &head in heads {
+        if layout[head] != 0 {
+            continue;
+        }
+        important.push(head);
+        let mut stack = vec![head];
+        while let Some(&node) = stack.last() {
+            let first = layout[node] == 0;
+            if first {
+                layout[node] = next_layout;
+            }
+            if let Some(&p) = parents[node].iter().find(|&&p| layout[p] == 0) {
+                stack.push(p);
+            } else {
+                if first {
+                    next_layout += 1;
+                }
+                stack.pop();
+            }
+        }
+    }
+    let mut done = vec![false; n];
+    let mut restrictions = vec![HashSet::new(); n];
+    let mut releases = vec![Vec::new(); n];
+    let mut branches = Vec::new();
+    for head in important {
+        if done[head] {
+            continue;
+        }
+        let start = layout[head];
+        done[head] = true;
+        let mut branch = vec![head];
+        let mut stack = vec![head];
+        while let Some(&node) = stack.last() {
+            let mut next = None;
+            for &p in parents[node].iter().rev() {
+                if done[p] {
+                    if layout[p] < start && restrictions[node].insert(p) {
+                        releases[p].push(node);
+                    }
+                } else if layout[node] <= layout[p] && !children[p].iter().any(|&c| !done[c] && layout[c] <= layout[p])
+                {
+                    next = Some(p);
+                    break;
+                }
+            }
+            if let Some(p) = next {
+                done[p] = true;
+                branch.push(p);
+                stack.push(p);
+            } else {
+                stack.pop();
+            }
+        }
+        branches.push(branch);
+    }
+    let mut owner = vec![0usize; n];
+    for (b, nodes) in branches.iter().enumerate() {
+        for &node in nodes {
+            owner[node] = b;
+        }
+    }
+    let mut remaining: Vec<_> = branches.iter().map(Vec::len).collect();
+    let mut prepared = vec![None; branches.len()];
+    let mut queue = BinaryHeap::new();
+    let prepare = |b: usize,
+                   remaining: &[usize],
+                   restrictions: &[HashSet<usize>],
+                   prepared: &mut [Option<usize>],
+                   queue: &mut BinaryHeap<Reverse<(i64, usize)>>| {
+        let end = remaining[b];
+        if end == 0 || prepared[b].is_some() || !restrictions[branches[b][end - 1]].is_empty() {
+            return;
+        }
+        let mut start = end - 1;
+        while start > 0 {
+            let up = branches[b][start - 1];
+            let down = branches[b][start];
+            if !restrictions[up].is_empty() {
+                break;
+            }
+            let connects = parents[up].contains(&down);
+            if !(parents[up].len() > 1 && connects) {
+                if !connects {
+                    break;
+                }
+                let delta = times[up].abs_diff(times[down]);
+                if delta > 3 * 24 * 3600 || (start + 20 < end && delta > 4 * 3600) {
+                    break;
+                }
+            }
+            start -= 1;
+        }
+        prepared[b] = Some(start);
+        queue.push(Reverse((times[branches[b][start]], b)));
+    };
+    for b in 0..branches.len() {
+        prepare(b, &remaining, &restrictions, &mut prepared, &mut queue);
+    }
+    let mut result = vec![0; n];
+    let mut offset = n;
+    while let Some(Reverse((_, b))) = queue.pop() {
+        let start = prepared[b].take().unwrap();
+        let part = &branches[b][start..remaining[b]];
+        offset -= part.len();
+        result[offset..offset + part.len()].copy_from_slice(part);
+        remaining[b] = start;
+        let mut released = HashSet::from([b]);
+        for &node in part {
+            for &up in &releases[node] {
+                restrictions[up].remove(&node);
+                let branch = owner[up];
+                if restrictions[up].is_empty() && remaining[branch] > 0 && branches[branch][remaining[branch] - 1] == up
+                {
+                    released.insert(branch);
+                }
+            }
+        }
+        for branch in released {
+            prepare(branch, &remaining, &restrictions, &mut prepared, &mut queue);
+        }
+    }
+    debug_assert_eq!(offset, 0, "Bek must place every node");
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn branch_blocks_preserve_every_edge_under_clock_skew_and_interleaved_refs() {
+        let mut seed = 17u64;
+        let mut random = || {
+            seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+            seed as usize
+        };
+        for _ in 0..200 {
+            let n = 70;
+            let parents: Vec<Vec<usize>> = (0..n)
+                .map(|i| {
+                    let mut ps = Vec::new();
+                    if i + 1 < n {
+                        for _ in 0..(random() % 3 + 1) {
+                            let p = i + 1 + random() % (n - i - 1);
+                            if !ps.contains(&p) {
+                                ps.push(p);
+                            }
+                        }
+                    }
+                    ps
+                })
+                .collect();
+            let times: Vec<_> = (0..n).map(|_| (random() % 1_000_000) as i64).collect();
+            let mut children = vec![0; n];
+            for ps in &parents {
+                for &p in ps {
+                    children[p] += 1;
+                }
+            }
+            let mut heads: Vec<_> = (0..n).filter(|&i| children[i] == 0 || i % 11 == 0).collect();
+            heads.sort_by_cached_key(|_| random());
+            let result = sort(&parents, &times, &heads);
+            assert_eq!(result.iter().copied().collect::<HashSet<_>>().len(), n);
+            let mut positions = vec![0; n];
+            for (i, &node) in result.iter().enumerate() {
+                positions[node] = i;
+            }
+            for (node, ps) in parents.iter().enumerate() {
+                for &p in ps {
+                    assert!(positions[node] < positions[p]);
+                }
+            }
+        }
+    }
+}
diff --git a/crates/ide-vcs/src/block_history.rs b/crates/ide-vcs/src/block_history.rs
new file mode 100644
index 00000000..c47d1cb8
--- /dev/null
+++ b/crates/ide-vcs/src/block_history.rs
@@ -0,0 +1,227 @@
+//! History for Selection: the commits that changed a block of lines
+//! (`git log -L`), each with the block as it was before and after.
+
+use crate::text_encoding::{TextEncoding, decode};
+use crate::{BlockHistory, BlockRevision, LineHunk, Repo, cli};
+use ide_core::{CancellationToken, IdeResult};
+use std::path::Path;
+
+/// Separates commits in the log output; fields of the header are separated by `\x1f`.
+const RECORD: u8 = 0x1e;
+const FORMAT: &str = "--format=%x1e%H%x1f%h%x1f%an%x1f%ae%x1f%at%x1f%s";
+
+pub(crate) fn block_history(
+    r: &Repo,
+    path: &Path,
+    current_text: Option<&str>,
+    lines: (u32, u32),
+    encoding: TextEncoding,
+    cancel: &CancellationToken,
+) -> IdeResult<BlockHistory> {
+    let rel = r.rel_path(path)?;
+    let head = {
+        let repo = r.gix()?;
+        crate::repo::blob_at(&repo, &rel, "HEAD")?
+    };
+    let Some(head) = head else {
+        return Ok(BlockHistory { head_lines: None, revisions: Vec::new() });
+    };
+    let head = decode(&head, encoding);
+    let current = match current_text {
+        Some(text) => text.to_owned(),
+        None => decode(&std::fs::read(r.abs_path(&rel))?, encoding).into_owned(),
+    };
+    let Some((start, end)) = head_range(&crate::diff::line_hunks(&head, &current), lines) else {
+        return Ok(BlockHistory { head_lines: None, revisions: Vec::new() });
+    };
+    let range = format!("-L{},{}:{rel}", start + 1, end + 1);
+    let args = ["log", "--no-color", "--no-ext-diff", "--no-textconv", FORMAT, &range, "HEAD"];
+    let out = cli::run_cancellable(r.root(), &args, cancel)?;
+    Ok(BlockHistory { head_lines: Some((start, end)), revisions: parse_log(&out.stdout, encoding) })
+}
+
+/// The HEAD lines (0-based, inclusive) of `lines` in the current text, given the
+/// hunks between HEAD and it. A selection end inside a changed region takes the
+/// whole region; None when every selected line is new.
+pub(crate) fn head_range(hunks: &[LineHunk], (start, end): (u32, u32)) -> Option<(u32, u32)> {
+    let (start, end) = (start.min(end), start.max(end));
+    let to_head = |line: u32, at_end: bool| -> i64 {
+        let mut shift = 0i64;
+        for h in hunks {
+            if line < h.start {
+                break;
+            }
+            if line < h.start + h.lines {
+                return if at_end {
+                    i64::from(h.old_start) + i64::from(h.old_lines) - 1
+                } else {
+                    i64::from(h.old_start)
+                };
+            }
+            shift += i64::from(h.lines) - i64::from(h.old_lines);
+        }
+        i64::from(line) - shift
+    };
+    let (from, to) = (to_head(start, false), to_head(end, true));
+    (from >= 0 && from <= to).then_some((from as u32, to as u32))
+}
+
+/// Commits of `git log -L` output, newest first.
+pub(crate) fn parse_log(stdout: &[u8], encoding: TextEncoding) -> Vec<BlockRevision> {
+    stdout
+        .split(|b| *b == RECORD)
+        .filter(|r| !r.is_empty())
+        .filter_map(|record| parse_record(record, encoding))
+        .collect()
+}
+
+fn parse_record(record: &[u8], encoding: TextEncoding) -> Option<BlockRevision> {
+    let newline = record.iter().position(|b| *b == b'\n').unwrap_or(record.len());
+    let header = String::from_utf8_lossy(&record[..newline]);
+    let mut fields = header.split('\x1f');
+    let id = fields.next()?.to_owned();
+    let short_id = fields.next()?.to_owned();
+    let author = fields.next()?.to_owned();
+    let email = fields.next()?.to_owned();
+    let time_ms = fields.next()?.trim().parse::<f64>().ok()? * 1000.0;
+    let summary = fields.next().unwrap_or_default().to_owned();
+    let patch = decode(record.get(newline + 1..).unwrap_or_default(), encoding);
+    let mut revision = BlockRevision {
+        id,
+        short_id,
+        author,
+        email,
+        time_ms,
+        summary,
+        path: String::new(),
+        before: String::new(),
+        after: String::new(),
+        before_line: 0,
+        after_line: 0,
+    };
+    let mut in_hunk = false;
+    for line in patch.lines() {
+        if let Some(path) = line.strip_prefix("+++ ") {
+            revision.path = unquote(path).trim_start_matches("b/").to_owned();
+        } else if let Some(ranges) = line.strip_prefix("@@ ") {
+            in_hunk = true;
+            let mut parts = ranges.split_whitespace();
+            revision.before_line = hunk_start(parts.next().unwrap_or_default());
+            revision.after_line = hunk_start(parts.next().unwrap_or_default());
+        } else if in_hunk {
+            match line.as_bytes().first() {
+                Some(b' ') => {
+                    push_line(&mut revision.before, &line[1..]);
+                    push_line(&mut revision.after, &line[1..]);
+                }
+                Some(b'-') => push_line(&mut revision.before, &line[1..]),
+                Some(b'+') => push_line(&mut revision.after, &line[1..]),
+                _ => {}
+            }
+        }
+    }
+    Some(revision)
+}
+
+/// 0-based first line of a hunk side (`-12,3` → 11; `+0,0` for a file that did not exist → 0).
+fn hunk_start(side: &str) -> u32 {
+    let n = side.trim_start_matches(['-', '+']).split(',').next().unwrap_or_default();
+    n.parse::<u32>().unwrap_or(0).saturating_sub(1)
+}
+
+fn push_line(block: &mut String, line: &str) {
+    block.push_str(line);
+    block.push('\n');
+}
+
+/// A C-quoted path (`"b/a \"b\".txt"`), as git writes unusual names.
+fn unquote(path: &str) -> String {
+    let Some(inner) = path.strip_prefix('"').and_then(|p| p.strip_suffix('"')) else {
+        return path.to_owned();
+    };
+    let mut out = String::new();
+    let mut chars = inner.chars();
+    while let Some(c) = chars.next() {
+        if c != '\\' {
+            out.push(c);
+            continue;
+        }
+        match chars.next() {
+            Some('t') => out.push('\t'),
+            Some('n') => out.push('\n'),
+            Some(other) => out.push(other),
+            None => {}
+        }
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::HunkKind;
+
+    fn hunk(start: u32, lines: u32, old_start: u32, old_lines: u32) -> LineHunk {
+        LineHunk { kind: HunkKind::Modified, start, lines, old_start, old_lines, old_text: String::new() }
+    }
+
+    #[test]
+    fn maps_the_selection_to_head_lines() {
+        // Unchanged file.
+        assert_eq!(head_range(&[], (3, 5)), Some((3, 5)));
+        // Two lines inserted at 1: current 4..=6 were HEAD 2..=4; a reversed selection too.
+        let inserted = [hunk(1, 2, 1, 0)];
+        assert_eq!(head_range(&inserted, (4, 6)), Some((2, 4)));
+        assert_eq!(head_range(&inserted, (6, 4)), Some((2, 4)));
+        // Selecting only the inserted lines: nothing committed.
+        assert_eq!(head_range(&inserted, (1, 2)), None);
+        // From an inserted line on: the HEAD lines after the insertion.
+        assert_eq!(head_range(&inserted, (2, 4)), Some((1, 2)));
+        // Three HEAD lines (5..=7) replaced by one: a selection ending in it takes all three.
+        let replaced = [hunk(5, 1, 5, 3)];
+        assert_eq!(head_range(&replaced, (4, 5)), Some((4, 7)));
+        assert_eq!(head_range(&replaced, (6, 6)), Some((8, 8)));
+        // Two HEAD lines deleted at 2: later lines move down by two.
+        let deleted = [hunk(2, 0, 2, 2)];
+        assert_eq!(head_range(&deleted, (2, 3)), Some((4, 5)));
+    }
+
+    #[test]
+    fn parses_git_log_line_ranges() {
+        let out = [
+            "\x1eaaaa1111\x1faaaa\x1fAda\x1fada@example.com\x1f1700000000\x1fRename greet",
+            "",
+            "diff --git a/src/a.txt b/src/b.txt",
+            "--- a/src/a.txt",
+            "+++ b/src/b.txt",
+            "@@ -2,2 +2,2 @@",
+            " keep",
+            "-hello",
+            "+hi",
+            "\x1ebbbb2222\x1fbbbb\x1fBo\x1fbo@example.com\x1f1600000000\x1fAdd",
+            "",
+            "diff --git a/src/a.txt b/src/a.txt",
+            "--- /dev/null",
+            "+++ b/src/a.txt",
+            "@@ -0,0 +2,2 @@",
+            "+keep",
+            "+hello",
+        ]
+        .join("\n");
+        let revisions = parse_log(out.as_bytes(), TextEncoding::from(encoding_rs::UTF_8));
+        assert_eq!(revisions.len(), 2);
+        let [newer, older] = &revisions[..] else { unreachable!() };
+        assert_eq!((newer.id.as_str(), newer.short_id.as_str(), newer.author.as_str()), ("aaaa1111", "aaaa", "Ada"));
+        assert_eq!((newer.time_ms, newer.summary.as_str(), newer.path.as_str()), (1.7e12, "Rename greet", "src/b.txt"));
+        assert_eq!((newer.before.as_str(), newer.after.as_str()), ("keep\nhello\n", "keep\nhi\n"));
+        assert_eq!((newer.before_line, newer.after_line), (1, 1));
+        assert_eq!((older.before.as_str(), older.after.as_str()), ("", "keep\nhello\n"));
+        assert_eq!((older.before_line, older.after_line), (0, 1));
+    }
+
+    #[test]
+    fn unquotes_c_quoted_paths() {
+        assert_eq!(unquote(r#""b/a \"q\"\tb.txt""#), "b/a \"q\"\tb.txt");
+        assert_eq!(unquote("b/plain.txt"), "b/plain.txt");
+    }
+}
diff --git a/crates/ide-vcs/src/history.rs b/crates/ide-vcs/src/history.rs
index ebdc7b27..be0da59b 100644
--- a/crates/ide-vcs/src/history.rs
+++ b/crates/ide-vcs/src/history.rs
@@ -4,9 +4,8 @@ use crate::repo::{gx, resolve, to_string};
 use crate::{ChangeKind, ChangedFile, Commit, LogOrder, LogQuery, Repo, RevisionChange};
 use gix::ObjectId;
 use gix::bstr::ByteSlice;
-use ide_core::{IdeError, IdeResult};
+use ide_core::{CancellationToken, IdeError, IdeResult};
 use std::collections::{HashMap, HashSet};
-use std::path::Path;
 
 /// Log "Text or hash" filter: the message (substring or regex), or a hash prefix.
 enum TextFilter {
@@ -50,52 +49,283 @@ impl TextFilter {
     }
 }
 
-pub(crate) fn log(r: &Repo, q: &LogQuery) -> IdeResult<Vec<Commit>> {
+pub(crate) fn log(r: &Repo, q: &LogQuery, cancel: &CancellationToken) -> IdeResult<Vec<Commit>> {
+    if cancel.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
+    let mut index = r.log_index.lock().unwrap_or_else(|p| p.into_inner());
+    let result = if q.summary_only {
+        let mut all = q.clone();
+        all.skip = 0;
+        all.limit = 0;
+        all.seek = None;
+        all.retain_until = None;
+        all.request = None;
+        all.stop_at = None;
+        let refs = r.log_refs()?;
+        let shallow = r
+            .gix()?
+            .shallow_commits()
+            .map_err(gx)?
+            .map(|ids| ids.iter().copied().collect::<Vec<_>>())
+            .unwrap_or_default();
+        let key = format!("{}:{refs:?}:{shallow:?}", serde_json::to_string(&all).map_err(gx)?);
+        let cached = index.views.get(&key).cloned();
+        let view = if let Some(cached) = cached {
+            cached
+        } else {
+            // Immutable metadata is reused across roots, filters, merges and ref changes.
+            all.request = q.request;
+            let commits =
+                std::sync::Arc::new(crate::log_index::IndexedView::new(log_indexed(r, &all, cancel, &mut index)?));
+            if index.views.len() >= 4 {
+                index.views.clear();
+            }
+            index.views.insert(key, commits.clone());
+            commits
+        };
+        let start = q
+            .seek
+            .as_ref()
+            .and_then(|id| view.positions.get(id).copied())
+            .map(|i| i.saturating_sub(if q.limit == 0 { 50 } else { 50.min(q.limit as usize / 2) }))
+            .unwrap_or(q.skip as usize);
+        let retain = q.retain_until.as_ref().and_then(|id| view.positions.get(id).copied()).map(|i| i + 1).unwrap_or(0);
+        let limit = if q.limit == 0 { usize::MAX } else { (q.limit as usize).max(retain.saturating_sub(start)) };
+        let mut result = Vec::new();
+        for (i, c) in view.commits.iter().enumerate().skip(start).take(limit) {
+            if cancel.is_cancelled() {
+                return Err(IdeError::cancelled());
+            }
+            let mut c = c.clone();
+            c.log_position = Some(i as u32);
+            c.log_total = Some(view.commits.len() as u32);
+            let stop = q.stop_at.as_ref() == Some(&c.id);
+            result.push(c);
+            if stop {
+                break;
+            }
+        }
+        Ok(result)
+    } else {
+        log_indexed(r, q, cancel, &mut index)
+    };
+    index.flush();
+    result
+}
+
+fn log_indexed(
+    r: &Repo,
+    q: &LogQuery,
+    cancel: &CancellationToken,
+    index: &mut crate::log_index::LogIndex,
+) -> IdeResult<Vec<Commit>> {
+    if cancel.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
     let repo = r.gix()?;
+    let shallow: HashSet<ObjectId> =
+        repo.shallow_commits().map_err(gx)?.map(|ids| ids.iter().copied().collect()).unwrap_or_default();
     let range = q.range.as_deref().map(str::trim).filter(|s| !s.is_empty());
     let revs: Vec<&str> = q.branch.iter().chain(&q.branches).map(|b| b.trim()).filter(|b| !b.is_empty()).collect();
-    let tips = if range.is_some() { Vec::new() } else { tips(&repo, &revs)? };
-    if tips.is_empty() && range.is_none() {
+    let ranges: Vec<_> = q.ranges.iter().map(|s| s.trim()).filter(|s| !s.is_empty()).collect();
+    let tips =
+        if range.is_some() || (!ranges.is_empty() && revs.is_empty()) { Vec::new() } else { tips(&repo, &revs)? };
+    if tips.is_empty() && range.is_none() && ranges.is_empty() {
         return Ok(Vec::new());
     }
     let decorations = decorations(&repo)?;
-    let path_filter = match q.path.as_deref() {
-        Some(p) => {
-            let rel = r.rel_path(p)?;
-            if rel.is_empty() { None } else { Some(rel) }
+    let paths: Vec<String> = q
+        .path
+        .iter()
+        .chain(&q.paths)
+        .map(|p| r.rel_path(p))
+        .collect::<IdeResult<Vec<_>>>()?
+        .into_iter()
+        .filter(|p| !p.is_empty())
+        .collect();
+    let range_ids = if let Some(range) = range {
+        Some(range_ids(r, range, q.order, q.first_parent, cancel)?)
+    } else if !ranges.is_empty() {
+        let mut ids = Vec::new();
+        let mut seen = HashSet::new();
+        for range in &ranges {
+            for id in range_ids(r, range, q.order, q.first_parent, cancel)? {
+                if seen.insert(id) {
+                    ids.push(id);
+                }
+            }
         }
-        None => None,
+        if !tips.is_empty() {
+            for id in range_ids(
+                r,
+                &tips.iter().map(ToString::to_string).collect::<Vec<_>>().join(" "),
+                q.order,
+                q.first_parent,
+                cancel,
+            )? {
+                if seen.insert(id) {
+                    ids.push(id);
+                }
+            }
+        }
+        Some(sort_subset(&repo, ids, q.order, q.first_parent, &shallow, cancel, &index.nodes)?)
+    } else {
+        None
     };
-    let authors: Vec<String> =
-        q.author.iter().chain(&q.authors).map(|a| a.trim().to_lowercase()).filter(|a| !a.is_empty()).collect();
-    let text = q.text.as_deref().map(|t| TextFilter::new(t, q.text_regex, q.text_match_case)).transpose()?.flatten();
-    let limit = if q.limit == 0 { usize::MAX } else { q.limit as usize };
-    let mut to_skip = q.skip as usize;
-
-    let path_walk = path_filter.is_some();
-    type Walk<'a> = Box<dyn Iterator<Item = IdeResult<(ObjectId, Vec<ObjectId>)>> + 'a>;
-    let walk: Walk<'_> = if let Some(range) = range {
-        let ids = range_ids(r, range, path_filter.as_deref())?;
-        let repo = &repo;
-        Box::new(ids.into_iter().map(move |id| {
-            let commit = repo.find_commit(id).map_err(gx)?;
-            Ok((id, commit.parent_ids().map(|p| p.detach()).collect()))
-        }))
-    } else if let Some(rel) = path_filter {
-        Box::new(PathWalk::new(&repo, tips, rel, q.first_parent)?)
-    } else if repo.is_shallow().unwrap_or(false) {
-        // Topological order needs complete history; shallow clones fall back to date order.
-        let mut walk = repo.rev_walk(tips).sorting(gix::revision::walk::Sorting::ByCommitTime(Default::default()));
-        if q.first_parent {
-            walk = walk.first_parent_only();
+    let mut history_paths = HashMap::new();
+    let path_ids = if paths.is_empty() {
+        None
+    } else {
+        let mut ids = HashSet::new();
+        if q.follow && paths.len() == 1 {
+            let rel = &paths[0];
+            let mut args = vec![
+                "log".to_string(),
+                "--format=%x00%H".into(),
+                "--name-status".into(),
+                "-z".into(),
+                "--follow".into(),
+                "--topo-order".into(),
+            ];
+            if q.first_parent {
+                args.push("--first-parent".into());
+            }
+            args.push("--end-of-options".into());
+            let scopes = if let Some(range) = range {
+                vec![range.to_string()]
+            } else {
+                let mut scopes = ranges.iter().map(|s| s.to_string()).collect::<Vec<_>>();
+                if !tips.is_empty() {
+                    scopes.push(tips.iter().map(ToString::to_string).collect::<Vec<_>>().join(" "));
+                }
+                scopes
+            };
+            for scope in scopes {
+                let mut args = args.clone();
+                args.extend(scope.split_whitespace().map(str::to_string));
+                args.extend(["--".into(), rel.clone()]);
+                let output = crate::cli::run_cancellable(
+                    r.root(),
+                    &args.iter().map(String::as_str).collect::<Vec<_>>(),
+                    cancel,
+                )?;
+                let text = output.stdout_str();
+                let mut tokens = text.split('\0').peekable();
+                let mut current_path = rel.clone();
+                while let Some(token) = tokens.next() {
+                    let token = token.trim_start_matches('\n');
+                    if let Ok(id) = ObjectId::from_hex(token.as_bytes()) {
+                        ids.insert(id);
+                        history_paths.insert(id, current_path.clone());
+                    } else if token.starts_with('R') && token[1..].bytes().all(|b| b.is_ascii_digit()) {
+                        if let (Some(old), Some(new)) = (tokens.next(), tokens.next())
+                            && new == current_path
+                        {
+                            current_path = old.to_string();
+                        }
+                    } else if ["A", "D", "M", "T", "U"].contains(&token) {
+                        tokens.next();
+                    }
+                }
+            }
+        } else {
+            let starts = range_ids.as_ref().cloned().unwrap_or_else(|| tips.clone());
+            ids.extend(
+                PathWalk::new(&repo, starts, paths.clone(), q.first_parent, cancel, index)?
+                    .map(|item| item.map(|(id, _)| id))
+                    .collect::<IdeResult<HashSet<_>>>()?,
+            );
         }
-        let walk = walk.all().map_err(gx)?;
-        Box::new(walk.map(|info| info.map(|i| (i.id, i.parent_ids.to_vec())).map_err(gx)))
+        Some(ids)
+    };
+    let authors: Vec<_> =
+        q.author.iter().chain(&q.authors).map(|a| a.trim().to_lowercase()).filter(|a| !a.is_empty()).collect();
+    let user_candidates = if q.authors_exact && !authors.is_empty() { index.user_candidates(&authors) } else { None };
+    let path_candidates = if !q.follow && !paths.is_empty() { index.path_candidates(&paths) } else { None };
+    let text_candidates = q.text.as_deref().filter(|_| !q.text_regex).and_then(|s| index.message_candidates(s));
+    let mut visibility = Visibility {
+        speed_refs: &decorations,
+        text_candidates,
+        user_candidates,
+        path_candidates,
+        query: q,
+        path_ids,
+        range_ids: range_ids.as_ref().map(|ids| ids.iter().copied().collect()),
+        authors,
+        text: q.text.as_deref().map(|t| TextFilter::new(t, q.text_regex, q.text_match_case)).transpose()?.flatten(),
+        matches: HashMap::new(),
+        projected: HashMap::new(),
+        cancel,
+        index,
+        shallow: shallow.clone(),
+    };
+    type Walk<'a> = Box<dyn Iterator<Item = IdeResult<ObjectId>> + 'a>;
+    let walk: Walk<'_> = if let Some(ids) = range_ids {
+        Box::new(ids.into_iter().map(Ok))
+    } else if q.summary_only {
+        let ids = visibility.index.graph(&repo, &tips, &shallow, q.first_parent, cancel)?;
+        Box::new(
+            sort_subset(&repo, ids, q.order, q.first_parent, &shallow, cancel, &visibility.index.nodes)?
+                .into_iter()
+                .map(Ok),
+        )
+    } else if repo.is_shallow().unwrap_or(false) || q.request.is_some() {
+        // The process can be interrupted even during indegree preparation. Git also
+        // respects shallow boundaries while retaining a topological order.
+        let mut args = vec![
+            "rev-list".to_string(),
+            match q.order {
+                LogOrder::Topo | LogOrder::Standard => "--topo-order",
+                LogOrder::Date => "--date-order",
+            }
+            .into(),
+        ];
+        if q.first_parent {
+            args.push("--first-parent".into());
+        }
+        if q.limit > 0
+            && q.order != LogOrder::Standard
+            && paths.is_empty()
+            && q.authors.is_empty()
+            && q.author.is_none()
+            && q.text.as_deref().is_none_or(|text| text.trim().is_empty())
+            && !q.no_merges
+            && q.since_ms.is_none()
+            && q.until_ms.is_none()
+        {
+            args.push(format!("--max-count={}", u64::from(q.skip) + u64::from(q.limit)));
+        }
+        args.push("--end-of-options".into());
+        args.extend(tips.iter().map(ToString::to_string));
+        let result =
+            crate::cli::run_cancellable(r.root(), &args.iter().map(String::as_str).collect::<Vec<_>>(), cancel)?;
+        let ids = result
+            .stdout_str()
+            .lines()
+            .map(|line| ObjectId::from_hex(line.as_bytes()).map_err(gx))
+            .collect::<IdeResult<Vec<_>>>()?;
+        if repo.is_shallow().unwrap_or(false) {
+            // A separately bounded walk provides the domain; pagination must never
+            // turn a shallow boundary into a connection through a locally present object.
+            let mut boundary_args = vec!["rev-list", "--end-of-options"];
+            let ids_as_text: Vec<_> = tips.iter().map(ToString::to_string).collect();
+            boundary_args.extend(ids_as_text.iter().map(String::as_str));
+            let boundaries = crate::cli::run_cancellable(r.root(), &boundary_args, cancel)?;
+            visibility.range_ids = Some(
+                boundaries
+                    .stdout_str()
+                    .lines()
+                    .map(|id| ObjectId::from_hex(id.as_bytes()).map_err(gx))
+                    .collect::<IdeResult<HashSet<_>>>()?,
+            );
+        }
+        Box::new(ids.into_iter().map(Ok))
     } else {
         use gix::traverse::commit::{Parents, topo};
         let graph = repo.commit_graph_if_enabled().ok().flatten();
         let sorting = match q.order {
-            LogOrder::Topo => topo::Sorting::TopoOrder,
+            LogOrder::Topo | LogOrder::Standard => topo::Sorting::TopoOrder,
             LogOrder::Date => topo::Sorting::DateOrder,
         };
         let topo = topo::Builder::from_iters(&repo.objects, tips, None::<Vec<ObjectId>>)
@@ -104,226 +334,385 @@ pub(crate) fn log(r: &Repo, q: &LogQuery) -> IdeResult<Vec<Commit>> {
             .with_commit_graph(graph)
             .build()
             .map_err(gx)?;
-        Box::new(topo.map(|info| info.map(|i| (i.id, i.parent_ids.to_vec())).map_err(gx)))
+        Box::new(topo.map(|info| info.map(|i| i.id).map_err(gx)))
     };
-
-    let shape = Shape {
-        no_merges: q.no_merges,
-        first_parent: q.first_parent,
-        since: q.since_ms.map(|ms| (ms / 1000.0).floor() as i64),
-        until: q.until_ms.map(|ms| (ms / 1000.0).ceil() as i64),
+    let walk: Walk<'_> = if q.order == LogOrder::Standard {
+        let ids = walk.collect::<IdeResult<Vec<_>>>()?;
+        Box::new(
+            sort_subset(&repo, ids, q.order, q.first_parent, &shallow, cancel, &visibility.index.nodes)?
+                .into_iter()
+                .map(Ok),
+        )
+    } else {
+        walk
     };
-    // Walks in (roughly) commit time order can stop once they are well past `since`.
-    let time_ordered = range.is_none() && (q.order == LogOrder::Date || path_walk);
-    let mut older_run = 0usize;
-    // A user or text filter hides commits within the history: the shown ones are linked to their
-    // nearest shown ancestors instead (dashed past hidden ones), as IDEA's filtered graph does.
-    // A path walk already links commits that way.
-    let mut links = (!path_walk && (!authors.is_empty() || text.is_some())).then(FilteredLinks::default);
-    let mut extra = 0usize;
-
-    let mut out = Vec::new();
-    for item in walk {
-        let (id, mut parents) = item?;
-        if q.first_parent {
-            parents.truncate(1);
-        }
-        if out.len() >= limit {
-            // Full: walk on only to link the last commits to their shown ancestors.
-            let Some(l) = links.as_ref() else { break };
-            extra += 1;
-            if l.is_empty() || extra > LINK_LIMIT {
-                break;
-            }
-        }
-        let commit = repo.find_commit(id).map_err(gx)?;
-        let commit_time = commit.time().map(|t| t.seconds).unwrap_or(0);
-        let mut shown = true;
-        if shape.is_active() {
-            let merge = commit.parent_ids().nth(1).is_some();
-            if shape.since.is_some_and(|s| commit_time < s) {
-                older_run += 1;
-                if time_ordered && older_run >= OLDER_RUN_LIMIT {
+    let head = repo.head_id().ok().map(|id| id.detach());
+    let shallow_stamp =
+        repo.shallow_file().ok().and_then(|path| std::fs::metadata(path).ok()).and_then(|m| m.modified().ok());
+    let stamp = head.map(|id| (id, shallow_stamp));
+    if visibility.index.head != stamp {
+        let mut additions = Vec::new();
+        let mut cursor = head;
+        let old_head = visibility.index.head;
+        if let (Some((old, old_shallow)), Some(_)) = (old_head, head)
+            && old_shallow == shallow_stamp
+        {
+            while let Some(id) = cursor {
+                if cancel.is_cancelled() {
+                    return Err(IdeError::cancelled());
+                }
+                if id == old {
                     break;
                 }
-                shown = false;
-            } else {
-                older_run = 0;
-                if !shape.shows(merge, commit_time) {
-                    shown = false;
-                } else if links.is_none() {
-                    parents = shape.rewrite_parents(&repo, &parents)?;
+                let record = visibility.index.get(&repo, id)?;
+                if record.parents.len() != 1 {
+                    cursor = None;
+                    break;
+                }
+                additions.push(id);
+                cursor = Some(ObjectId::from_hex(record.parents[0].as_bytes()).map_err(gx)?);
+            }
+        } else {
+            cursor = None;
+        }
+        if cursor.is_some() && cursor == old_head.map(|(id, _)| id) {
+            visibility.index.reachable.extend(additions);
+            visibility.index.head = stamp;
+        } else {
+            let mut reachable = HashSet::new();
+            if let Some(head) = head {
+                for item in repo.rev_walk([head]).all().map_err(gx)? {
+                    if cancel.is_cancelled() {
+                        return Err(IdeError::cancelled());
+                    }
+                    reachable.insert(item.map_err(gx)?.id);
                 }
             }
-        }
-        let sig = commit.author().map_err(gx)?;
-        let name = to_string(sig.name.trim().as_bstr());
-        let email = to_string(sig.email.trim().as_bstr());
-        if shown && !authors.is_empty() {
-            let (name, email) = (name.to_lowercase(), email.to_lowercase());
-            shown = authors.iter().any(|a| name.contains(a.as_str()) || email.contains(a.as_str()));
-        }
-        let message = to_string(commit.message_raw_sloppy());
-        if shown && let Some(filter) = text.as_ref() {
-            shown = filter.matches(&message, &id);
-        }
-        let listed = shown && to_skip == 0 && out.len() < limit;
-        if let Some(l) = links.as_mut() {
-            l.visit(id, &parents, shown, listed.then_some(out.len()));
-        }
-        if !shown {
-            continue;
-        }
-        if to_skip > 0 {
-            to_skip -= 1;
-            continue;
-        }
-        if !listed {
-            continue;
-        }
-        let time_ms = sig.time().map(|t| t.seconds as f64 * 1000.0).unwrap_or(0.0);
-        let summary = message.lines().find(|l| !l.trim().is_empty()).unwrap_or("").trim().to_string();
-        let hex = id.to_string();
-        out.push(Commit {
-            short_id: hex[..hex.len().min(8)].to_string(),
-            id: hex,
-            parents: parents.iter().map(ToString::to_string).collect(),
-            author: name,
-            email,
-            time_ms,
-            summary,
-            message: message.trim_end().to_string(),
-            refs: decorations.get(&id).cloned().unwrap_or_default(),
-            commit_time_ms: commit_time as f64 * 1000.0,
-            dashed: Vec::new(),
-        });
-        if out.len() >= limit && links.is_none() {
-            break;
+            visibility.index.reachable = reachable;
+            visibility.index.head = stamp;
         }
     }
-    if let Some(l) = links {
-        l.apply(&mut out);
+    let mut out = Vec::new();
+    let mut skip = q.skip as usize;
+    let limit = if q.limit == 0 { usize::MAX } else { q.limit as usize };
+    for item in walk {
+        if cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
+        let id = item?;
+        if !visibility.shows(&repo, id)? {
+            continue;
+        }
+        if skip > 0 {
+            skip -= 1;
+            continue;
+        }
+        let record = visibility.index.get(&repo, id)?;
+        let parents = record
+            .parents
+            .iter()
+            .map(|p| ObjectId::from_hex(p.as_bytes()).map_err(gx))
+            .collect::<IdeResult<Vec<_>>>()?;
+        let shown_parents = if shallow.contains(&id) { Vec::new() } else { visibility.parents(&repo, &parents)? };
+        let mut commit = (*record).clone();
+        commit.graph_dashed = shown_parents.iter().map(|p| !parents.contains(p)).collect();
+        commit.dashed = if commit.graph_dashed.iter().any(|d| *d) { commit.graph_dashed.clone() } else { Vec::new() };
+        commit.graph_parents = Some(shown_parents.iter().map(ToString::to_string).collect());
+        if shallow.contains(&id) {
+            commit.graph_boundary_parents = commit.parents.clone();
+        }
+        commit.on_current_branch = Some(visibility.index.reachable.contains(&id));
+        commit.refs = decorations.get(&id).cloned().unwrap_or_default();
+        commit.history_path = history_paths.get(&id).cloned();
+        if !q.summary_only {
+            commit.message = visibility.index.message(&repo, id)?;
+            commit.message_truncated = false;
+        }
+        out.push(commit);
+        if out.len() >= limit || q.stop_at.as_deref() == Some(id.to_string().as_str()) {
+            break;
+        }
     }
     Ok(out)
 }
 
-/// Commits walked past a full page to link its last commits to their shown ancestors.
-const LINK_LIMIT: usize = 20_000;
-
-/// The links of a filtered log: each listed commit's nearest shown ancestors. The walk visits
-/// children before parents, so a listed commit waits on its parents; a hidden commit passes
-/// the waits on to its own parents, and a shown one takes them.
-#[derive(Default)]
-struct FilteredLinks {
-    /// Commit → listed commits (by index) waiting on it, and whether the way passed a hidden one.
-    waiting: HashMap<ObjectId, Vec<(usize, bool)>>,
-    /// Per listed commit: its shown ancestors in the order found, and whether each link is dashed.
-    found: HashMap<usize, Vec<(ObjectId, bool)>>,
-}
-
-impl FilteredLinks {
-    fn is_empty(&self) -> bool {
-        self.waiting.is_empty()
-    }
-
-    fn visit(&mut self, id: ObjectId, parents: &[ObjectId], shown: bool, listed: Option<usize>) {
-        let waits = self.waiting.remove(&id).unwrap_or_default();
-        if shown {
-            for (child, dashed) in waits {
-                let links = self.found.entry(child).or_default();
-                match links.iter_mut().find(|(p, _)| *p == id) {
-                    Some(link) => link.1 &= dashed,
-                    None => links.push((id, dashed)),
-                }
-            }
-            if let Some(index) = listed {
-                for p in parents {
-                    Self::wait(&mut self.waiting, *p, index, false);
-                }
-            }
-        } else {
-            for p in parents {
-                for (child, _) in &waits {
-                    Self::wait(&mut self.waiting, *p, *child, true);
-                }
-            }
-        }
-    }
-
-    fn wait(waiting: &mut HashMap<ObjectId, Vec<(usize, bool)>>, on: ObjectId, child: usize, dashed: bool) {
-        let list = waiting.entry(on).or_default();
-        match list.iter_mut().find(|(c, _)| *c == child) {
-            Some(w) => w.1 &= dashed,
-            None => list.push((child, dashed)),
-        }
-    }
-
-    /// Replaces the listed commits' parents by their shown ancestors (none found: none).
-    fn apply(mut self, out: &mut [Commit]) {
-        for (index, commit) in out.iter_mut().enumerate() {
-            let links = self.found.remove(&index).unwrap_or_default();
-            commit.parents = links.iter().map(|(id, _)| id.to_string()).collect();
-            commit.dashed =
-                if links.iter().any(|(_, d)| *d) { links.iter().map(|(_, d)| *d).collect() } else { Vec::new() };
-        }
-    }
-}
-
-/// Consecutive commits older than `since` after which a time-ordered walk stops.
-const OLDER_RUN_LIMIT: usize = 64;
-
-/// Which commits the Log graph shows independently of the detail filters (author, text):
-/// `--no-merges` and the date range. Hidden commits are skipped and the parents of shown
-/// ones rewritten past them, like git's parent rewriting.
-struct Shape {
-    no_merges: bool,
+/// A ready-node stack gives incoming merge parents priority, while child counts
+/// prevent an ancestor shared with another branch from moving ahead of its children.
+fn sort_subset(
+    repo: &gix::Repository,
+    ids: Vec<ObjectId>,
+    order: LogOrder,
     first_parent: bool,
-    /// Commit time bounds in seconds; `since` inclusive, `until` exclusive.
-    since: Option<i64>,
-    until: Option<i64>,
+    shallow: &HashSet<ObjectId>,
+    cancel: &CancellationToken,
+    nodes: &HashMap<ObjectId, (Vec<ObjectId>, i64)>,
+) -> IdeResult<Vec<ObjectId>> {
+    let positions: HashMap<_, _> = ids.iter().enumerate().map(|(i, id)| (*id, i)).collect();
+    let mut parents = Vec::with_capacity(ids.len());
+    let mut children = vec![0usize; ids.len()];
+    let mut times = Vec::with_capacity(ids.len());
+    for id in &ids {
+        if cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
+        let (all_parents, time) = if let Some(record) = nodes.get(id) {
+            record.clone()
+        } else {
+            let commit = repo.find_commit(*id).map_err(gx)?;
+            (commit.parent_ids().map(|p| p.detach()).collect(), commit.time().map(|t| t.seconds).unwrap_or(0))
+        };
+        times.push(time);
+        let mut ordered = Vec::new();
+        let mut pending: Vec<_> = all_parents
+            .into_iter()
+            .take(if shallow.contains(id) {
+                0
+            } else if first_parent {
+                1
+            } else {
+                usize::MAX
+            })
+            .collect();
+        let mut visited = HashSet::new();
+        while let Some(parent) = pending.pop() {
+            if !visited.insert(parent) {
+                continue;
+            }
+            if let Some(position) = positions.get(&parent) {
+                if !ordered.contains(position) {
+                    ordered.push(*position);
+                }
+            } else if !shallow.contains(&parent) && repo.has_object(parent) {
+                pending.extend(
+                    repo.find_commit(parent)
+                        .map_err(gx)?
+                        .parent_ids()
+                        .take(if first_parent { 1 } else { usize::MAX })
+                        .map(|p| p.detach()),
+                );
+            }
+        }
+        ordered.reverse();
+        for p in &ordered {
+            children[*p] += 1;
+        }
+        parents.push(ordered);
+    }
+    if order == LogOrder::Standard {
+        let refs = decorations(repo)?;
+        let mut remote_names = HashSet::new();
+        for reference in repo.references().map_err(gx)?.remote_branches().map_err(gx)?.flatten() {
+            if let Some(name) = reference.name().as_bstr().strip_prefix(b"refs/remotes/") {
+                remote_names.insert(to_string(name.as_bstr()));
+            }
+        }
+        let priority = |i: usize| {
+            let labels = refs.get(&ids[i]);
+            let best = labels
+                .into_iter()
+                .flatten()
+                .map(|name| {
+                    (
+                        if name == "HEAD" {
+                            0
+                        } else if name == "main" || name == "master" {
+                            1
+                        } else if name.starts_with("tag: ") {
+                            4
+                        } else if remote_names.contains(name) {
+                            3
+                        } else {
+                            2
+                        },
+                        name.clone(),
+                    )
+                })
+                .min()
+                .unwrap_or((5, ids[i].to_string()));
+            (best, i)
+        };
+        let mut heads: Vec<_> = (0..ids.len()).filter(|i| children[*i] == 0 || refs.contains_key(&ids[*i])).collect();
+        heads.sort_by_key(|i| priority(*i));
+        let sorted = crate::bek::sort(&parents, &times, &heads);
+        return Ok(sorted.into_iter().map(|i| ids[i]).collect());
+    }
+    let mut ready: std::collections::BTreeSet<_> =
+        children.iter().enumerate().filter_map(|(i, count)| (*count == 0).then_some(i)).collect();
+    let mut stack = Vec::new();
+    let mut dates = std::collections::BinaryHeap::new();
+    if order == LogOrder::Date {
+        for &i in &ready {
+            dates.push((times[i], std::cmp::Reverse(i)));
+        }
+    }
+    let mut emitted = HashSet::new();
+    let mut out = Vec::with_capacity(ids.len());
+    while let Some(next) =
+        if order == LogOrder::Date { dates.pop().map(|(_, i)| i.0) } else { stack.pop().or_else(|| ready.pop_first()) }
+    {
+        if cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
+        if !emitted.insert(next) {
+            continue;
+        }
+        ready.remove(&next);
+        out.push(ids[next]);
+        let ordered: Vec<_> =
+            if order == LogOrder::Topo { parents[next].iter().rev().copied().collect() } else { parents[next].clone() };
+        for parent in ordered {
+            children[parent] -= 1;
+            if children[parent] == 0 {
+                ready.insert(parent);
+                stack.push(parent);
+                if order == LogOrder::Date {
+                    dates.push((times[parent], std::cmp::Reverse(parent)));
+                }
+            }
+        }
+    }
+    Ok(out)
 }
 
-/// Upper bound of commits visited while rewriting one commit's parents.
-const REWRITE_LIMIT: usize = 4096;
+/// Visibility and graph projection share exactly the same predicates. Revision parents
+/// remain immutable; only graph parents skip hidden commits. Memoisation avoids walking
+/// the same hidden ancestry for each visible child, without a truncation limit.
+struct Visibility<'a> {
+    speed_refs: &'a HashMap<ObjectId, Vec<String>>,
+    query: &'a LogQuery,
+    path_ids: Option<HashSet<ObjectId>>,
+    range_ids: Option<HashSet<ObjectId>>,
+    authors: Vec<String>,
+    text: Option<TextFilter>,
+    text_candidates: Option<HashSet<String>>,
+    user_candidates: Option<HashSet<String>>,
+    path_candidates: Option<HashSet<String>>,
+    matches: HashMap<ObjectId, bool>,
+    projected: HashMap<ObjectId, Vec<ObjectId>>,
+    cancel: &'a CancellationToken,
+    index: &'a mut crate::log_index::LogIndex,
+    shallow: HashSet<ObjectId>,
+}
 
-impl Shape {
-    fn is_active(&self) -> bool {
-        self.no_merges || self.since.is_some() || self.until.is_some()
+impl Visibility<'_> {
+    fn shows(&mut self, repo: &gix::Repository, id: ObjectId) -> IdeResult<bool> {
+        if self.cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
+        if let Some(shown) = self.matches.get(&id) {
+            return Ok(*shown);
+        }
+        let indexed = self.index.indexed(&id.to_string());
+        let shown = if (indexed && self.user_candidates.as_ref().is_some_and(|ids| !ids.contains(&id.to_string())))
+            || (indexed && self.path_candidates.as_ref().is_some_and(|ids| !ids.contains(&id.to_string())))
+            || !repo.has_object(id)
+            || self.path_ids.as_ref().is_some_and(|ids| !ids.contains(&id))
+            || self.range_ids.as_ref().is_some_and(|ids| !ids.contains(&id))
+        {
+            false
+        } else {
+            let commit = self.index.get(repo, id)?;
+            let time = commit.commit_time_ms;
+            let name = commit.author.to_lowercase();
+            let email = commit.email.to_lowercase();
+            !(self.query.no_merges && commit.parents.len() > 1)
+                && self.query.since_ms.is_none_or(|s| time >= s)
+                && self.query.until_ms.is_none_or(|u| time < u)
+                && self.query.speed_search.as_ref().is_none_or(|query| {
+                    let mut columns =
+                        vec![commit.summary.clone(), self.speed_refs.get(&id).cloned().unwrap_or_default().join(" ")];
+                    if self.query.search_fields.iter().any(|f| f == "author") {
+                        columns.push(commit.author.clone());
+                    }
+                    if self.query.search_fields.iter().any(|f| f == "hash") {
+                        columns.push(commit.short_id.clone());
+                    }
+                    query.to_lowercase().split_whitespace().all(|word| {
+                        columns.iter().any(|column| {
+                            let mut chars = word.chars().peekable();
+                            for c in column.to_lowercase().chars() {
+                                if chars.peek() == Some(&c) {
+                                    chars.next();
+                                }
+                            }
+                            chars.peek().is_none()
+                        })
+                    })
+                })
+                && (self.authors.is_empty()
+                    || self.authors.iter().any(|a| {
+                        if self.query.authors_exact {
+                            crate::log_index::matches_user(a, &name, &email)
+                        } else {
+                            name.contains(a.as_str()) || email.contains(a.as_str())
+                        }
+                    }))
+                && match &self.text {
+                    Some(text) => {
+                        self.text_candidates.as_ref().is_none_or(|ids| {
+                            ids.contains(&id.to_string())
+                                || !self.index.indexed(&id.to_string())
+                                || id.to_string().starts_with(
+                                    self.query.text.as_deref().unwrap_or("").trim().to_ascii_lowercase().as_str(),
+                                )
+                        }) && text.matches(&self.index.message(repo, id)?, &id)
+                    }
+                    None => true,
+                }
+        };
+        self.matches.insert(id, shown);
+        Ok(shown)
     }
 
-    fn shows(&self, merge: bool, time: i64) -> bool {
-        !(self.no_merges && merge) && self.since.is_none_or(|s| time >= s) && self.until.is_none_or(|u| time < u)
-    }
-
-    /// `parents` with each hidden one replaced by its nearest shown ancestors; parents
-    /// older than `since` are dropped (their history is not shown).
-    fn rewrite_parents(&self, repo: &gix::Repository, parents: &[ObjectId]) -> IdeResult<Vec<ObjectId>> {
-        let mut out: Vec<ObjectId> = Vec::new();
-        let mut seen: HashSet<ObjectId> = HashSet::new();
-        let mut stack: Vec<ObjectId> = parents.iter().rev().copied().collect();
-        let mut visited = 0usize;
-        while let Some(p) = stack.pop() {
-            if !seen.insert(p) || !repo.has_object(p) {
-                continue;
+    fn parents(&mut self, repo: &gix::Repository, parents: &[ObjectId]) -> IdeResult<Vec<ObjectId>> {
+        let parents = if self.query.first_parent { &parents[..parents.len().min(1)] } else { parents };
+        let mut out = Vec::new();
+        for parent in parents {
+            // Iterative postorder: a long hidden chain must not consume the call stack.
+            let mut stack = vec![(*parent, false)];
+            while let Some((id, expanded)) = stack.pop() {
+                if self.projected.contains_key(&id) {
+                    continue;
+                }
+                if self.shows(repo, id)? {
+                    self.projected.insert(id, vec![id]);
+                } else if !repo.has_object(id) {
+                    self.projected.insert(id, Vec::new());
+                } else {
+                    let commit = self.index.get(repo, id)?;
+                    let ancestors = commit
+                        .parents
+                        .iter()
+                        .take(if self.shallow.contains(&id) {
+                            0
+                        } else if self.query.first_parent {
+                            1
+                        } else {
+                            usize::MAX
+                        })
+                        .map(|p| ObjectId::from_hex(p.as_bytes()).map_err(gx))
+                        .collect::<IdeResult<Vec<_>>>()?;
+                    if !expanded {
+                        stack.push((id, true));
+                        stack.extend(ancestors.iter().rev().map(|p| (*p, false)));
+                    } else {
+                        let mut nearest = Vec::new();
+                        for p in ancestors {
+                            for ancestor in self.projected.get(&p).into_iter().flatten() {
+                                if !nearest.contains(ancestor) {
+                                    nearest.push(*ancestor);
+                                }
+                            }
+                        }
+                        self.projected.insert(id, nearest);
+                    }
+                }
             }
-            visited += 1;
-            if visited > REWRITE_LIMIT {
-                break;
-            }
-            let commit = repo.find_commit(p).map_err(gx)?;
-            let time = commit.time().map(|t| t.seconds).unwrap_or(0);
-            if self.since.is_some_and(|s| time < s) {
-                continue;
-            }
-            let ids: Vec<ObjectId> = commit.parent_ids().map(|i| i.detach()).collect();
-            if self.shows(ids.len() > 1, time) {
-                if !out.contains(&p) {
-                    out.push(p);
+            for ancestor in &self.projected[parent] {
+                if !out.contains(ancestor) {
+                    out.push(*ancestor);
                 }
-                continue;
             }
-            let next = if self.first_parent { &ids[..ids.len().min(1)] } else { &ids[..] };
-            stack.extend(next.iter().rev());
         }
         Ok(out)
     }
@@ -331,18 +720,25 @@ impl Shape {
 
 /// Commit ids of a revision range (`A..B`, `A...B`, `^A B`…), topologically ordered, via
 /// `git rev-list` so every rev syntax git understands (`@{u}`, `HEAD~3`) works.
-fn range_ids(r: &Repo, range: &str, path: Option<&str>) -> IdeResult<Vec<ObjectId>> {
-    let mut args: Vec<&str> = vec!["rev-list", "--topo-order", "--end-of-options"];
+fn range_ids(
+    r: &Repo,
+    range: &str,
+    order: LogOrder,
+    first_parent: bool,
+    cancel: &CancellationToken,
+) -> IdeResult<Vec<ObjectId>> {
+    let mut args: Vec<&str> = vec!["rev-list", if order == LogOrder::Date { "--date-order" } else { "--topo-order" }];
+    if first_parent {
+        args.push("--first-parent");
+    }
+    args.push("--end-of-options");
     for part in range.split_whitespace() {
         if part.starts_with('-') {
             return Err(ide_core::IdeError::invalid(format!("invalid revision range '{range}'")));
         }
         args.push(part);
     }
-    if let Some(rel) = path {
-        args.extend(["--", rel]);
-    }
-    let out = crate::cli::run(r.root(), &args, None)?;
+    let out = crate::cli::run_cancellable(r.root(), &args, cancel)?;
     out.stdout_str()
         .lines()
         .filter(|l| !l.trim().is_empty())
@@ -354,11 +750,69 @@ fn range_ids(r: &Repo, range: &str, path: Option<&str>) -> IdeResult<Vec<ObjectI
 fn tips(repo: &gix::Repository, revs: &[&str]) -> IdeResult<Vec<ObjectId>> {
     let mut tips = Vec::new();
     if !revs.is_empty() {
-        for rev in revs {
-            let id = resolve(repo, rev)?;
-            let commit = repo.find_object(id).map_err(gx)?.peel_to_commit().map_err(gx)?;
-            if !tips.contains(&commit.id) {
-                tips.push(commit.id);
+        let refs = decorations(repo)?;
+        let branches: Vec<_> = refs
+            .iter()
+            .flat_map(|(id, names)| {
+                names
+                    .iter()
+                    .filter(|name| *name != "HEAD" && !name.starts_with("tag: "))
+                    .map(move |name| (name.as_str(), *id))
+            })
+            .collect();
+        let mut excludes = Vec::new();
+        let includes: Vec<_> = revs.iter().filter(|rev| !rev.starts_with('-')).collect();
+        for rev in revs.iter().filter_map(|rev| rev.strip_prefix('-')) {
+            let re = if branches.iter().any(|(name, _)| *name == rev) {
+                None
+            } else {
+                Some(
+                    regex_lite::Regex::new(&format!("^(?:{rev})$"))
+                        .map_err(|e| IdeError::invalid(format!("invalid branch pattern: {e}")))?,
+                )
+            };
+            excludes.push((rev, re));
+        }
+        if includes.is_empty() {
+            for (name, id) in &branches {
+                if !excludes.iter().any(|(exact, re)| name == exact || re.as_ref().is_some_and(|re| re.is_match(name)))
+                    && !tips.contains(id)
+                {
+                    tips.push(*id);
+                }
+            }
+        }
+        for rev in includes {
+            if excludes.iter().any(|(exact, re)| *rev == *exact || re.as_ref().is_some_and(|re| re.is_match(rev))) {
+                continue;
+            }
+            match resolve(repo, rev) {
+                Ok(id) => {
+                    let commit = repo.find_object(id).map_err(gx)?.peel_to_commit().map_err(gx)?;
+                    if !tips.contains(&commit.id) {
+                        tips.push(commit.id);
+                    }
+                }
+                Err(error) => {
+                    let re = regex_lite::Regex::new(&format!("^(?:{rev})$")).map_err(|_| error.clone())?;
+                    let matches: Vec<_> = branches
+                        .iter()
+                        .filter(|(name, _)| {
+                            re.is_match(name)
+                                && !excludes
+                                    .iter()
+                                    .any(|(exact, re)| name == exact || re.as_ref().is_some_and(|re| re.is_match(name)))
+                        })
+                        .collect();
+                    if matches.is_empty() && !rev.chars().any(|c| ".*+?[]()|^$".contains(c)) {
+                        return Err(error);
+                    }
+                    for (_, id) in matches {
+                        if !tips.contains(id) {
+                            tips.push(*id);
+                        }
+                    }
+                }
             }
         }
         return Ok(tips);
@@ -367,7 +821,9 @@ fn tips(repo: &gix::Repository, revs: &[&str]) -> IdeResult<Vec<ObjectId>> {
         tips.push(id.detach());
     }
     let platform = repo.references().map_err(gx)?;
-    for iter in [platform.local_branches().map_err(gx)?, platform.remote_branches().map_err(gx)?] {
+    for iter in
+        [platform.local_branches().map_err(gx)?, platform.remote_branches().map_err(gx)?, platform.tags().map_err(gx)?]
+    {
         for reference in iter {
             let Ok(mut reference) = reference else { continue };
             if let Ok(id) = reference.peel_to_id() {
@@ -382,7 +838,7 @@ fn tips(repo: &gix::Repository, revs: &[&str]) -> IdeResult<Vec<ObjectId>> {
 }
 
 /// Commit id → decoration labels.
-fn decorations(repo: &gix::Repository) -> IdeResult<HashMap<ObjectId, Vec<String>>> {
+pub(crate) fn decorations(repo: &gix::Repository) -> IdeResult<HashMap<ObjectId, Vec<String>>> {
     let mut map: HashMap<ObjectId, Vec<String>> = HashMap::new();
     if let Ok(id) = repo.head_id() {
         map.entry(id.detach()).or_default().push("HEAD".to_string());
@@ -414,24 +870,35 @@ fn decorations(repo: &gix::Repository) -> IdeResult<HashMap<ObjectId, Vec<String
 /// merge that kept one parent's version only that parent's line of history is followed.
 struct PathWalk<'r> {
     repo: &'r gix::Repository,
-    rel: String,
+    paths: Vec<String>,
     queue: std::collections::BinaryHeap<(i64, u64, ObjectId)>,
     seen: HashSet<ObjectId>,
-    memo: HashMap<ObjectId, Option<ObjectId>>,
+    index: &'r mut crate::log_index::LogIndex,
     seq: u64,
     first_parent: bool,
+    cancel: &'r CancellationToken,
+    shallow: HashSet<ObjectId>,
 }
 
 impl<'r> PathWalk<'r> {
-    fn new(repo: &'r gix::Repository, tips: Vec<ObjectId>, rel: String, first_parent: bool) -> IdeResult<Self> {
+    fn new(
+        repo: &'r gix::Repository,
+        tips: Vec<ObjectId>,
+        paths: Vec<String>,
+        first_parent: bool,
+        cancel: &'r CancellationToken,
+        index: &'r mut crate::log_index::LogIndex,
+    ) -> IdeResult<Self> {
         let mut walk = PathWalk {
             repo,
-            rel,
+            paths,
             queue: Default::default(),
             seen: Default::default(),
-            memo: Default::default(),
+            index,
             seq: 0,
             first_parent,
+            cancel,
+            shallow: repo.shallow_commits().map_err(gx)?.map(|ids| ids.iter().copied().collect()).unwrap_or_default(),
         };
         for tip in tips {
             walk.push(tip)?;
@@ -440,6 +907,9 @@ impl<'r> PathWalk<'r> {
     }
 
     fn push(&mut self, id: ObjectId) -> IdeResult<()> {
+        if self.cancel.is_cancelled() {
+            return Err(IdeError::cancelled());
+        }
         if !self.seen.insert(id) || !self.repo.has_object(id) {
             return Ok(());
         }
@@ -458,13 +928,23 @@ impl<'r> PathWalk<'r> {
             let present: Vec<ObjectId> = parents
                 .iter()
                 .copied()
+                .take(if self.shallow.contains(&id) { 0 } else { usize::MAX })
                 .filter(|p| self.repo.has_object(p))
                 .take(if self.first_parent { 1 } else { usize::MAX })
                 .collect();
-            let mine = path_entry(self.repo, id, &self.rel, &mut self.memo)?;
+            let mine = self
+                .paths
+                .iter()
+                .map(|path| self.index.path_entry(self.repo, id, path))
+                .collect::<IdeResult<Vec<_>>>()?;
             let mut same_parent = None;
             for p in &present {
-                if path_entry(self.repo, *p, &self.rel, &mut self.memo)? == mine {
+                let theirs = self
+                    .paths
+                    .iter()
+                    .map(|path| self.index.path_entry(self.repo, *p, path))
+                    .collect::<IdeResult<Vec<_>>>()?;
+                if theirs == mine {
                     same_parent = Some(*p);
                     break;
                 }
@@ -475,7 +955,7 @@ impl<'r> PathWalk<'r> {
                     for p in &present {
                         self.push(*p)?;
                     }
-                    if !present.is_empty() || mine.is_some() {
+                    if !present.is_empty() || mine.iter().any(Option::is_some) {
                         return Ok(Some((id, parents)));
                     }
                 }
@@ -492,23 +972,6 @@ impl Iterator for PathWalk<'_> {
     }
 }
 
-/// Id of the tree entry at `rel` in `commit` (memoised).
-fn path_entry(
-    repo: &gix::Repository,
-    commit: ObjectId,
-    rel: &str,
-    memo: &mut HashMap<ObjectId, Option<ObjectId>>,
-) -> IdeResult<Option<ObjectId>> {
-    if let Some(v) = memo.get(&commit) {
-        return Ok(*v);
-    }
-    let commit_obj = repo.find_commit(commit).map_err(gx)?;
-    let tree = commit_obj.tree().map_err(gx)?;
-    let id = tree.lookup_entry_by_path(Path::new(rel)).map_err(gx)?.map(|e| e.object_id());
-    memo.insert(commit, id);
-    Ok(id)
-}
-
 pub(crate) fn commit_files(r: &Repo, rev: &str) -> IdeResult<Vec<ChangedFile>> {
     let repo = r.gix()?;
     Ok(first_parent_changes(&repo, rev)?.files)
diff --git a/crates/ide-vcs/src/lib.rs b/crates/ide-vcs/src/lib.rs
index a14c2344..7adf881e 100644
--- a/crates/ide-vcs/src/lib.rs
+++ b/crates/ide-vcs/src/lib.rs
@@ -77,28 +77,99 @@ pub struct BlameLine {
     pub summary: String,
 }
 
+/// History for Selection: the commits that changed a block of lines, newest first.
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct BlockHistory {
+    /// The selected lines in HEAD (0-based, inclusive); None when none of them is committed.
+    pub head_lines: Option<(u32, u32)>,
+    pub revisions: Vec<BlockRevision>,
+}
+
+/// A commit that changed the block, with the block in its first parent and in it.
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct BlockRevision {
+    pub id: String,
+    pub short_id: String,
+    pub author: String,
+    pub email: String,
+    pub time_ms: f64,
+    pub summary: String,
+    /// Repository-relative path of the file in this commit (before a later rename).
+    pub path: String,
+    /// The block before the commit; empty when the commit added it.
+    pub before: String,
+    pub after: String,
+    /// 0-based first line of the block before and after the commit.
+    pub before_line: u32,
+    pub after_line: u32,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct Commit {
     pub id: String,
     pub short_id: String,
     pub parents: Vec<String>,
+    /// Connections in the filtered graph; never use these as revision/diff parents.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub graph_parents: Option<Vec<String>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub graph_dashed: Vec<bool>,
+    /// Repository-relative filename at this revision in rename-following history.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub history_path: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub log_position: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub log_total: Option<u32>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub graph_boundary_parents: Vec<String>,
+    /// Reachability from HEAD, computed independently of the visible filters.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub on_current_branch: Option<bool>,
     pub author: String,
     pub email: String,
+    #[serde(default)]
+    pub committer: String,
+    #[serde(default)]
+    pub committer_email: String,
     pub time_ms: f64,
     pub summary: String,
     pub message: String,
+    #[serde(default)]
+    pub message_truncated: bool,
     pub refs: Vec<String>,
     /// Committer time (Log › View Options › Commit Timestamp).
     #[serde(default)]
     pub commit_time_ms: f64,
-    /// Per parent, under a user or text filter: the link passes commits the filter hides
-    /// (`parents` then name the nearest shown ancestors). Empty when no parent is rewritten.
+    /// Legacy alias of `graph_dashed`, indexed by displayed parents.
     #[serde(default)]
     #[specta(optional)]
     pub dashed: Vec<bool>,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct LogDetails {
+    pub message: String,
+    pub containing_branches: Vec<String>,
+    /// Git's verification code: G/U good, B bad, E error, N unsigned, X/Y expired, R revoked.
+    pub signature: String,
+    pub signer: String,
+    pub key: String,
+    pub fingerprint: String,
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct LogIndexProgress {
+    pub indexed: u32,
+    pub total: u32,
+    pub running: bool,
+}
+
 /// Order of the Git Log (Graph Options › Sort).
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
@@ -108,13 +179,29 @@ pub enum LogOrder {
     Topo,
     /// `--date-order`: commit time, but never a parent before its children.
     Date,
+    // Topological grouping with incoming merge parents visited before the main line.
+    Standard,
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct LogQuery {
+    #[serde(default)]
+    pub speed_search: Option<String>,
+    #[serde(default)]
+    pub search_fields: Vec<String>,
+    /// Jump directly to an indexed window containing this commit (50 rows of context).
+    #[serde(default)]
+    pub seek: Option<String>,
+    #[serde(default)]
+    pub retain_until: Option<String>,
     pub branch: Option<String>,
     pub path: Option<ide_core::IpcPath>,
+    #[serde(default)]
+    pub paths: Vec<ide_core::IpcPath>,
+    /// File history follows renames; structure filters retain fixed paths.
+    #[serde(default)]
+    pub follow: bool,
     pub author: Option<String>,
     pub text: Option<String>,
     pub skip: u32,
@@ -123,6 +210,9 @@ pub struct LogQuery {
     /// not the left). Takes precedence over `branch`.
     #[serde(default)]
     pub range: Option<String>,
+    /// Additional ranges unioned with each other and with selected branches.
+    #[serde(default)]
+    pub ranges: Vec<String>,
     /// `text` is a regular expression (Log filter `.*`).
     #[serde(default)]
     pub text_regex: bool,
@@ -136,6 +226,8 @@ pub struct LogQuery {
     #[serde(default)]
     pub authors: Vec<String>,
     #[serde(default)]
+    pub authors_exact: bool,
+    #[serde(default)]
     pub order: LogOrder,
     /// Follow only the first parent of merges (`--first-parent`).
     #[serde(default)]
@@ -150,6 +242,13 @@ pub struct LogQuery {
     pub since_ms: Option<f64>,
     #[serde(default)]
     pub until_ms: Option<f64>,
+    #[serde(default)]
+    pub request: Option<ide_core::RequestId>,
+    #[serde(default)]
+    pub summary_only: bool,
+    /// Inclusive refresh boundary. Clients join only verified linear prefixes.
+    #[serde(default)]
+    pub stop_at: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
@@ -458,7 +557,9 @@ pub struct ChangelistState {
     pub files: std::collections::BTreeMap<String, String>,
 }
 
+mod bek;
 mod blame;
+mod block_history;
 pub mod changelists;
 mod cli;
 mod compare;
@@ -466,6 +567,7 @@ mod diff;
 mod history;
 mod ignore;
 mod index_writes;
+mod log_index;
 mod manage;
 mod ops;
 mod patch;
@@ -569,6 +671,9 @@ pub struct Repo {
     git_dir: PathBuf,
     inner: std::sync::Mutex<repo::Cache>,
     ignored: std::sync::RwLock<IgnoredNames>,
+    log_index: std::sync::Mutex<log_index::LogIndex>,
+    index_progress: std::sync::Mutex<LogIndexProgress>,
+    log_signatures: std::sync::Mutex<std::collections::HashMap<String, LogDetails>>,
 }
 
 impl Repo {
@@ -685,6 +790,20 @@ impl Repo {
         let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
         write::blame(self, path, current_text, revision, encoding)
     }
+    /// History for Selection: commits that changed `lines` (0-based, inclusive, of the
+    /// current text: `current_text`, or the file on disk), mapped to HEAD's lines first.
+    pub fn block_history(
+        &self,
+        path: &Path,
+        current_text: Option<&str>,
+        lines: (u32, u32),
+        encoding: impl Into<TextEncoding>,
+        cancel: &CancellationToken,
+    ) -> IdeResult<BlockHistory> {
+        let encoding = encoding.into();
+        let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
+        block_history::block_history(self, path, current_text, lines, encoding, cancel)
+    }
     /// Commits newest-first in topological order (children before parents).
     ///
     /// `branch` is any revision; when absent, HEAD plus all local and remote branches are
@@ -694,7 +813,183 @@ impl Repo {
     /// `refs` decorations are `HEAD`, branch names (`main`, `origin/main`) and `tag: <name>`.
     pub fn log(&self, query: &LogQuery) -> IdeResult<Vec<Commit>> {
         let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
-        history::log(self, query)
+        history::log(self, query, &CancellationToken::new())
+    }
+    pub fn log_cancellable(&self, query: &LogQuery, cancel: &CancellationToken) -> IdeResult<Vec<Commit>> {
+        let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
+        history::log(self, query, cancel)
+    }
+    /// Enables the disposable, content-addressed log cache outside the worktree.
+    pub fn enable_log_index(&self, cache_dir: &Path) {
+        let key = blake3::hash(self.git_dir.to_string_lossy().as_bytes()).to_hex().to_string();
+        self.log_index.lock().unwrap_or_else(|p| p.into_inner()).open(&cache_dir.join(key));
+    }
+    /// Reference names and peeled commit ids, including tags and detached HEAD.
+    pub fn log_refs(&self) -> IdeResult<std::collections::BTreeMap<String, String>> {
+        let repo = self.gix()?;
+        Ok(history::decorations(&repo)?
+            .into_iter()
+            .flat_map(|(id, names)| names.into_iter().map(move |name| (name, id.to_string())))
+            .collect())
+    }
+    pub fn log_users(&self) -> IdeResult<Vec<String>> {
+        let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
+        let out = cli::run(self.root(), &["log", "--all", "--format=%an <%ae>"], None)?;
+        Ok(out
+            .stdout_str()
+            .lines()
+            .filter(|line| !line.is_empty())
+            .map(str::to_string)
+            .collect::<std::collections::BTreeSet<_>>()
+            .into_iter()
+            .collect())
+    }
+    pub fn log_index_progress(&self) -> LogIndexProgress {
+        self.index_progress.lock().unwrap_or_else(|p| p.into_inner()).clone()
+    }
+
+    /// Incremental persistent inverted index; completed objects survive cancellation/restart.
+    pub fn index_log(&self, cancel: &CancellationToken) -> IdeResult<LogIndexProgress> {
+        {
+            let mut progress = self.index_progress.lock().unwrap_or_else(|p| p.into_inner());
+            if progress.running {
+                return Ok(progress.clone());
+            }
+            progress.running = true;
+        }
+        let result = (|| {
+            let repo = self.gix()?;
+            let out = cli::run_cancellable(self.root(), &["rev-list", "--all", "--topo-order"], cancel)?;
+            let ids: Vec<_> = out
+                .stdout_str()
+                .lines()
+                .map(|id| gix::ObjectId::from_hex(id.as_bytes()).map_err(repo::gx))
+                .collect::<IdeResult<_>>()?;
+            {
+                let mut p = self.index_progress.lock().unwrap_or_else(|p| p.into_inner());
+                p.total = ids.len() as u32;
+                p.indexed = 0;
+            }
+            for (i, id) in ids.iter().enumerate() {
+                if cancel.is_cancelled() {
+                    return Err(ide_core::IdeError::cancelled());
+                }
+                let indexed = self.log_index.lock().unwrap_or_else(|p| p.into_inner()).indexed(&id.to_string());
+                if !indexed {
+                    let files = self.commit_files(&id.to_string())?;
+                    let paths =
+                        files.into_iter().flat_map(|f| std::iter::once(f.path).chain(f.old_path)).collect::<Vec<_>>();
+                    let mut index = self.log_index.lock().unwrap_or_else(|p| p.into_inner());
+                    let c = index.get(&repo, *id)?;
+                    let message = index.message(&repo, *id)?;
+                    index.index_commit(&c.id, &message, &c.author, &c.email, &paths);
+                    if i % 100 == 0 {
+                        index.flush();
+                    }
+                }
+                self.index_progress.lock().unwrap_or_else(|p| p.into_inner()).indexed = i as u32 + 1;
+            }
+            Ok(())
+        })();
+        self.log_index.lock().unwrap_or_else(|p| p.into_inner()).flush();
+        self.index_progress.lock().unwrap_or_else(|p| p.into_inner()).running = false;
+        result?;
+        Ok(self.log_index_progress())
+    }
+
+    pub fn log_details(&self, revision: &str) -> IdeResult<LogDetails> {
+        self.log_details_cancellable(revision, &CancellationToken::new())
+    }
+    pub fn log_details_cancellable(&self, revision: &str, cancel: &CancellationToken) -> IdeResult<LogDetails> {
+        let allowed = self.execution_allowed.load(std::sync::atomic::Ordering::Acquire);
+        let _scope = crate::ExecutionScope::enter(allowed);
+        let repo = self.gix()?;
+        let object =
+            repo.find_object(repo::resolve(&repo, revision)?).map_err(repo::gx)?.peel_to_commit().map_err(repo::gx)?;
+        let commit_id = object.id;
+        let id = commit_id.to_string();
+        let contains = format!("--contains={id}");
+        let branches =
+            cli::run_cancellable(self.root(), &["branch", "-a", &contains, "--format=%(refname:short)"], cancel)?;
+        let cache_key = format!("{allowed}:{id}");
+        let cached = self.log_signatures.lock().unwrap_or_else(|p| p.into_inner()).get(&cache_key).cloned();
+        let mut details = if let Some(details) = cached {
+            details
+        } else {
+            let end = object.data.windows(2).position(|s| s == b"\n\n").unwrap_or(object.data.len());
+            let headers = &object.data[..end];
+            let signed = headers.windows(8).any(|s| s == b"\ngpgsig ") || headers.windows(8).any(|s| s == b"\ngpgsig-");
+            let output = if allowed && signed {
+                Some(cli::run_cancellable(
+                    self.root(),
+                    &["log", "-1", "--format=%G?%x00%GS%x00%GK%x00%GF", "--end-of-options", &id],
+                    cancel,
+                )?)
+            } else {
+                None
+            };
+            let text = output.as_ref().map(|out| out.stdout_str()).unwrap_or_default();
+            let fields: Vec<_> = text.trim_end().split('\0').collect();
+            let message = {
+                let mut index = self.log_index.lock().unwrap_or_else(|p| p.into_inner());
+                let message = index.message(&repo, commit_id)?;
+                index.flush();
+                message
+            };
+            let details = LogDetails {
+                message,
+                containing_branches: Vec::new(),
+                signature: if !signed {
+                    "N".into()
+                } else {
+                    fields.first().filter(|s| !s.is_empty()).unwrap_or(&"E").to_string()
+                },
+                signer: fields.get(1).unwrap_or(&"").to_string(),
+                key: fields.get(2).unwrap_or(&"").to_string(),
+                fingerprint: fields.get(3).unwrap_or(&"").to_string(),
+            };
+            self.log_signatures.lock().unwrap_or_else(|p| p.into_inner()).insert(cache_key, details.clone());
+            details
+        };
+        details.containing_branches =
+            branches.stdout_str().lines().filter(|s| !s.ends_with("/HEAD")).map(str::to_string).collect();
+        Ok(details)
+    }
+
+    /// Lists one immutable revision directory. Directory names end in `/`.
+    pub fn revision_children(&self, revision: &str, directory: &str) -> IdeResult<Vec<String>> {
+        let repo = self.gix()?;
+        let id = repo::resolve(&repo, revision)?.to_string();
+        let directory = self.rel_path(std::path::Path::new(directory))?;
+        let tree = if directory.is_empty() { id } else { format!("{id}:{directory}") };
+        let out = cli::run(self.root(), &["ls-tree", "-z", "--", &tree], None)?;
+        Ok(out
+            .stdout
+            .split(|b| *b == 0)
+            .filter_map(|line| {
+                let split = line.iter().position(|b| *b == b'\t')?;
+                let name = String::from_utf8_lossy(&line[split + 1..]);
+                let dir = line.starts_with(b"040000 ");
+                Some(format!(
+                    "{}{name}{}",
+                    if directory.is_empty() { String::new() } else { format!("{directory}/") },
+                    if dir { "/" } else { "" }
+                ))
+            })
+            .collect())
+    }
+
+    pub fn revision_files(&self, revision: &str) -> IdeResult<Vec<String>> {
+        let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
+        let repo = self.gix()?;
+        let id = repo::resolve(&repo, revision)?.to_string();
+        let out = cli::run(self.root(), &["ls-tree", "-r", "-z", "--name-only", "--", &id], None)?;
+        Ok(out
+            .stdout
+            .split(|b| *b == 0)
+            .filter(|p| !p.is_empty())
+            .map(|p| String::from_utf8_lossy(p).into_owned())
+            .collect())
     }
     /// Files changed by `commit` relative to its first parent (renames detected).
     pub fn commit_files(&self, commit: &str) -> IdeResult<Vec<ChangedFile>> {
diff --git a/crates/ide-vcs/src/log_index.rs b/crates/ide-vcs/src/log_index.rs
new file mode 100644
index 00000000..c1d013aa
--- /dev/null
+++ b/crates/ide-vcs/src/log_index.rs
@@ -0,0 +1,385 @@
+//! Immutable commit metadata, persisted by object id. Ref decorations and graph
+//! projections are deliberately never cached as commit metadata.
+
+use crate::Commit;
+use crate::repo::{gx, to_string};
+use gix::ObjectId;
+use gix::bstr::ByteSlice;
+use ide_core::IdeResult;
+use redb::{Database, MultimapTableDefinition, ReadableDatabase, TableDefinition};
+use std::collections::{HashMap, HashSet};
+use std::path::Path;
+use std::sync::{Arc, Mutex, OnceLock, Weak};
+use std::time::SystemTime;
+
+const COMMITS: TableDefinition<&str, &[u8]> = TableDefinition::new("summaries-v2");
+const MESSAGES: TableDefinition<&str, &str> = TableDefinition::new("messages-v1");
+const PATHS: TableDefinition<&str, &[u8]> = TableDefinition::new("paths-v2");
+const POSTINGS: MultimapTableDefinition<&str, &str> = MultimapTableDefinition::new("search-v1");
+const INDEXED: TableDefinition<&str, bool> = TableDefinition::new("indexed-v1");
+
+pub(crate) struct IndexedView {
+    pub commits: Vec<Commit>,
+    pub positions: HashMap<String, usize>,
+}
+impl IndexedView {
+    pub fn new(commits: Vec<Commit>) -> Self {
+        let positions = commits.iter().enumerate().map(|(i, c)| (c.id.clone(), i)).collect();
+        Self { commits, positions }
+    }
+}
+
+#[derive(Default)]
+pub(crate) struct LogIndex {
+    opened: bool,
+    db: Option<Arc<Database>>,
+    memory: HashMap<ObjectId, Arc<Commit>>,
+    dirty: Vec<Arc<Commit>>,
+    dirty_messages: Vec<(String, String)>,
+    dirty_search: Vec<(String, Vec<String>)>,
+    path_memory: HashMap<(ObjectId, String), Option<(ObjectId, u16)>>,
+    dirty_paths: Vec<(String, Option<(String, u16)>)>,
+    pub head: Option<(ObjectId, Option<SystemTime>)>,
+    pub reachable: HashSet<ObjectId>,
+    pub views: HashMap<String, Arc<IndexedView>>,
+    pub nodes: HashMap<ObjectId, (Vec<ObjectId>, i64)>,
+    pub shallow: HashSet<ObjectId>,
+}
+
+impl LogIndex {
+    /// A permanent DAG: refresh discovers only new objects, then joins arbitrary
+    /// changed tips against known ancestry. Reachability is recomputed for resets/deleted refs.
+    pub fn graph(
+        &mut self,
+        repo: &gix::Repository,
+        tips: &[ObjectId],
+        shallow: &HashSet<ObjectId>,
+        first_parent: bool,
+        cancel: &ide_core::CancellationToken,
+    ) -> IdeResult<Vec<ObjectId>> {
+        if &self.shallow != shallow {
+            self.nodes.clear();
+            self.shallow = shallow.clone();
+        }
+        let mut pending = tips.to_vec();
+        while let Some(id) = pending.pop() {
+            if cancel.is_cancelled() {
+                return Err(ide_core::IdeError::cancelled());
+            }
+            if self.nodes.contains_key(&id) {
+                continue;
+            }
+            let record = self.get(repo, id)?;
+            let parents: Vec<_> = if shallow.contains(&id) {
+                Vec::new()
+            } else {
+                record.parents.iter().map(|s| ObjectId::from_hex(s.as_bytes()).map_err(gx)).collect::<IdeResult<_>>()?
+            };
+            pending.extend(parents.iter().copied());
+            self.nodes.insert(id, (parents, (record.commit_time_ms / 1000.0) as i64));
+        }
+        let mut seen = HashSet::new();
+        let mut ids = Vec::new();
+        let mut pending = tips.to_vec();
+        while let Some(id) = pending.pop() {
+            if !seen.insert(id) {
+                continue;
+            }
+            ids.push(id);
+            if let Some((parents, _)) = self.nodes.get(&id) {
+                pending.extend(parents.iter().take(if first_parent { 1 } else { usize::MAX }).rev().copied());
+            }
+        }
+        Ok(ids)
+    }
+    pub fn indexed(&self, id: &str) -> bool {
+        self.db
+            .as_ref()
+            .and_then(|db| {
+                let txn = db.begin_read().ok()?;
+                let table = txn.open_table(INDEXED).ok()?;
+                Some(table.get(id).ok()??.value())
+            })
+            .unwrap_or(false)
+    }
+
+    pub fn index_commit(&mut self, id: &str, message: &str, author: &str, email: &str, paths: &[String]) {
+        let mut keys: HashSet<String> = Self::grams(message).into_iter().map(|s| format!("m:{s}")).collect();
+        for user in [author, email, email.split('@').next().unwrap_or(email)] {
+            keys.insert(format!("u:{}", normalize_user(user)));
+        }
+        for path in paths {
+            keys.insert(format!("p:{path}"));
+        }
+        self.dirty_search.push((id.into(), keys.into_iter().collect()));
+    }
+
+    fn grams(text: &str) -> Vec<String> {
+        let chars: Vec<_> = text.to_lowercase().chars().collect();
+        chars.windows(3).map(|s| s.iter().collect()).collect::<HashSet<_>>().into_iter().collect()
+    }
+
+    /// Missing/unindexed commits are always checked directly by the caller.
+    pub fn message_candidates(&self, text: &str) -> Option<HashSet<String>> {
+        let grams = Self::grams(text);
+        if grams.is_empty() {
+            return None;
+        }
+        let db = self.db.as_ref()?;
+        let txn = db.begin_read().ok()?;
+        let table = txn.open_multimap_table(POSTINGS).ok()?;
+        let mut candidates: Option<HashSet<String>> = None;
+        for gram in grams {
+            let values = table.get(format!("m:{gram}").as_str()).ok()?;
+            let ids: HashSet<_> = values.filter_map(Result::ok).map(|s| s.value().to_string()).collect();
+            candidates = Some(match candidates {
+                Some(old) => old.intersection(&ids).cloned().collect(),
+                None => ids,
+            });
+            if candidates.as_ref().is_some_and(HashSet::is_empty) {
+                break;
+            }
+        }
+        Some(candidates.unwrap_or_default())
+    }
+
+    pub fn user_candidates(&self, authors: &[String]) -> Option<HashSet<String>> {
+        let txn = self.db.as_ref()?.begin_read().ok()?;
+        let table = txn.open_multimap_table(POSTINGS).ok()?;
+        let mut ids = HashSet::new();
+        for author in authors {
+            let name = author.split('<').next().unwrap_or(author).trim();
+            let email = author.split('<').nth(1).map(|s| s.trim_end_matches('>')).unwrap_or(author);
+            for alias in [name, email, email.split('@').next().unwrap_or(email)] {
+                for value in table.get(format!("u:{}", normalize_user(alias)).as_str()).ok()?.filter_map(Result::ok) {
+                    ids.insert(value.value().to_string());
+                }
+            }
+        }
+        Some(ids)
+    }
+
+    pub fn path_candidates(&self, paths: &[String]) -> Option<HashSet<String>> {
+        let txn = self.db.as_ref()?.begin_read().ok()?;
+        let table = txn.open_multimap_table(POSTINGS).ok()?;
+        let mut ids = HashSet::new();
+        for path in paths {
+            for value in table.get(format!("p:{path}").as_str()).ok()?.filter_map(Result::ok) {
+                ids.insert(value.value().to_string());
+            }
+            let prefix = format!("p:{path}/");
+            let end = format!("{prefix}{}", char::MAX);
+            for row in table.range(prefix.as_str()..end.as_str()).ok()?.filter_map(Result::ok) {
+                for value in row.1.filter_map(Result::ok) {
+                    ids.insert(value.value().to_string());
+                }
+            }
+        }
+        Some(ids)
+    }
+    pub fn open(&mut self, dir: &Path) {
+        if self.opened {
+            return;
+        }
+        self.opened = true;
+        // Several windows can read the same worktree; redb permits one owning
+        // handle per file, shared here rather than silently disabling its index.
+        static DATABASES: OnceLock<Mutex<HashMap<std::path::PathBuf, Weak<Database>>>> = OnceLock::new();
+        let path = dir.join("commits.redb");
+        let mut databases = DATABASES.get_or_init(Mutex::default).lock().unwrap_or_else(|p| p.into_inner());
+        self.db = databases.get(&path).and_then(Weak::upgrade).or_else(|| {
+            let db = Arc::new(std::fs::create_dir_all(dir).ok().and_then(|_| Database::create(&path).ok())?);
+            databases.insert(path, Arc::downgrade(&db));
+            Some(db)
+        });
+    }
+
+    pub fn get(&mut self, repo: &gix::Repository, id: ObjectId) -> IdeResult<Arc<Commit>> {
+        if let Some(commit) = self.memory.get(&id) {
+            return Ok(commit.clone());
+        }
+        let key = id.to_string();
+        let cached = self.db.as_ref().and_then(|db| {
+            let txn = db.begin_read().ok()?;
+            let table = txn.open_table(COMMITS).ok()?;
+            let value = table.get(key.as_str()).ok()??;
+            serde_json::from_slice::<Commit>(value.value()).ok().filter(|c| c.id == key)
+        });
+        let commit = if let Some(commit) = cached {
+            Arc::new(commit)
+        } else {
+            let commit = repo.find_commit(id).map_err(gx)?;
+            let author = commit.author().map_err(gx)?;
+            let committer = commit.committer().map_err(gx)?;
+            let raw = commit.message_raw_sloppy();
+            let summary = raw.split(|b| *b == b'\n').find(|l| !l.trim().is_empty()).unwrap_or_default().trim();
+            let summary_text = to_string(summary.as_bstr());
+            let record = Arc::new(Commit {
+                id: key.clone(),
+                short_id: key[..key.len().min(8)].to_string(),
+                parents: commit.parent_ids().map(|p| p.to_string()).collect(),
+                graph_parents: None,
+                graph_dashed: Vec::new(),
+                dashed: Vec::new(),
+                on_current_branch: None,
+                author: to_string(author.name.trim().as_bstr()),
+                email: to_string(author.email.trim().as_bstr()),
+                committer: to_string(committer.name.trim().as_bstr()),
+                committer_email: to_string(committer.email.trim().as_bstr()),
+                time_ms: author.time().map(|t| t.seconds as f64 * 1000.0).unwrap_or(0.0),
+                commit_time_ms: committer.time().map(|t| t.seconds as f64 * 1000.0).unwrap_or(0.0),
+                summary: summary_text.clone(),
+                message: summary_text,
+                message_truncated: raw.trim() != summary,
+                history_path: None,
+                log_position: None,
+                log_total: None,
+                graph_boundary_parents: Vec::new(),
+                refs: Vec::new(),
+            });
+            if self.db.is_some() {
+                self.dirty.push(record.clone());
+            }
+            record
+        };
+        // Keep hot pages in memory; older metadata stays in the persistent index.
+        if self.memory.len() >= 4096 {
+            self.flush();
+            self.memory.clear();
+        }
+        self.memory.insert(id, commit.clone());
+        Ok(commit)
+    }
+
+    pub fn message(&mut self, repo: &gix::Repository, id: ObjectId) -> IdeResult<String> {
+        if let Some((_, message)) = self.dirty_messages.iter().find(|(key, _)| key == &id.to_string()) {
+            return Ok(message.clone());
+        }
+        let key = id.to_string();
+        let cached = self.db.as_ref().and_then(|db| {
+            let txn = db.begin_read().ok()?;
+            let table = txn.open_table(MESSAGES).ok()?;
+            Some(table.get(key.as_str()).ok()??.value().to_string())
+        });
+        if let Some(message) = cached {
+            return Ok(message);
+        }
+        let message = to_string(repo.find_commit(id).map_err(gx)?.message_raw_sloppy()).trim_end().to_string();
+        if self.db.is_some() {
+            self.dirty_messages.push((key, message.clone()));
+        }
+        Ok(message)
+    }
+
+    pub fn flush(&mut self) {
+        if self.dirty.is_empty()
+            && self.dirty_paths.is_empty()
+            && self.dirty_messages.is_empty()
+            && self.dirty_search.is_empty()
+        {
+            return;
+        }
+        let result = (|| -> Result<(), Box<dyn std::error::Error>> {
+            let Some(db) = &self.db else {
+                return Ok(());
+            };
+            let txn = db.begin_write()?;
+            {
+                let mut table = txn.open_table(COMMITS)?;
+                for commit in &self.dirty {
+                    let bytes = serde_json::to_vec(commit.as_ref())?;
+                    table.insert(commit.id.as_str(), bytes.as_slice())?;
+                }
+            }
+            {
+                let mut table = txn.open_table(PATHS)?;
+                for (key, value) in &self.dirty_paths {
+                    let bytes = serde_json::to_vec(value)?;
+                    table.insert(key.as_str(), bytes.as_slice())?;
+                }
+            }
+            {
+                let mut table = txn.open_table(MESSAGES)?;
+                for (id, message) in &self.dirty_messages {
+                    table.insert(id.as_str(), message.as_str())?;
+                }
+            }
+            {
+                let mut postings = txn.open_multimap_table(POSTINGS)?;
+                let mut indexed = txn.open_table(INDEXED)?;
+                for (id, keys) in &self.dirty_search {
+                    for key in keys {
+                        postings.insert(key.as_str(), id.as_str())?;
+                    }
+                    indexed.insert(id.as_str(), true)?;
+                }
+            }
+            txn.commit()?;
+            Ok(())
+        })();
+        if let Err(error) = result {
+            tracing::warn!("Git log cache write failed: {error}");
+        }
+        self.dirty_messages.clear();
+        self.dirty_search.clear();
+        self.dirty.clear();
+        self.dirty_paths.clear();
+    }
+
+    pub fn path_entry(
+        &mut self,
+        repo: &gix::Repository,
+        id: ObjectId,
+        path: &str,
+    ) -> IdeResult<Option<(ObjectId, u16)>> {
+        let memory_key = (id, path.to_string());
+        if let Some(value) = self.path_memory.get(&memory_key) {
+            return Ok(*value);
+        }
+        let key = format!("{id}\0{path}");
+        let cached = self.db.as_ref().and_then(|db| {
+            let txn = db.begin_read().ok()?;
+            let table = txn.open_table(PATHS).ok()?;
+            let value = table.get(key.as_str()).ok()??;
+            serde_json::from_slice::<Option<(String, u16)>>(value.value()).ok()
+        });
+        let cached = match cached {
+            Some(None) => Some(None),
+            Some(Some((hex, mode))) => ObjectId::from_hex(hex.as_bytes()).ok().map(|id| Some((id, mode))),
+            None => None,
+        };
+        let value = if let Some(value) = cached {
+            value
+        } else {
+            let tree = repo.find_commit(id).map_err(gx)?.tree().map_err(gx)?;
+            let value = tree
+                .lookup_entry_by_path(Path::new(path))
+                .map_err(gx)?
+                .map(|entry| (entry.object_id(), entry.mode().value()));
+            if self.db.is_some() {
+                self.dirty_paths.push((key, value.map(|(id, mode)| (id.to_string(), mode))));
+            }
+            value
+        };
+        if self.path_memory.len() >= 4096 {
+            self.flush();
+            self.path_memory.clear();
+        }
+        self.path_memory.insert(memory_key, value);
+        Ok(value)
+    }
+}
+
+pub(crate) fn normalize_user(user: &str) -> String {
+    user.chars().filter(|c| c.is_alphanumeric()).flat_map(char::to_lowercase).collect()
+}
+
+pub(crate) fn matches_user(query: &str, name: &str, email: &str) -> bool {
+    let query_name = query.split('<').next().unwrap_or(query).trim();
+    let query_email = query.split('<').nth(1).map(|s| s.trim_end_matches('>')).unwrap_or(query);
+    let target =
+        [normalize_user(name), normalize_user(email), normalize_user(email.split('@').next().unwrap_or(email))];
+    [query_name, query_email, query_email.split('@').next().unwrap_or(query_email)]
+        .iter()
+        .any(|alias| target.contains(&normalize_user(alias)))
+}
diff --git a/crates/ide-vcs/src/repo.rs b/crates/ide-vcs/src/repo.rs
index 47e145b6..6ad81787 100644
--- a/crates/ide-vcs/src/repo.rs
+++ b/crates/ide-vcs/src/repo.rs
@@ -64,6 +64,9 @@ pub(crate) fn discover(path: &Path) -> IdeResult<Option<Repo>> {
         git_dir,
         inner: std::sync::Mutex::new(cache),
         ignored: Default::default(),
+        log_index: Default::default(),
+        index_progress: Default::default(),
+        log_signatures: Default::default(),
     }))
 }
 
diff --git a/crates/ide-vcs/tests/block_history.rs b/crates/ide-vcs/tests/block_history.rs
new file mode 100644
index 00000000..96128273
--- /dev/null
+++ b/crates/ide-vcs/tests/block_history.rs
@@ -0,0 +1,124 @@
+//! History for Selection (`git log -L`) against throwaway repositories built with the git CLI.
+
+use ide_core::CancellationToken;
+use ide_core::error::ErrorKind;
+use ide_vcs::*;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+struct Fixture {
+    _tmp: tempfile::TempDir,
+    dir: PathBuf,
+}
+
+impl Fixture {
+    fn new() -> Self {
+        let tmp = tempfile::tempdir().unwrap();
+        let dir = tmp.path().join("work");
+        std::fs::create_dir(&dir).unwrap();
+        let fx = Fixture { _tmp: tmp, dir };
+        fx.git(&["init", "-q"]);
+        for (k, v) in [("user.name", "Test User"), ("user.email", "test@example.com"), ("commit.gpgsign", "false")] {
+            fx.git(&["config", k, v]);
+        }
+        fx
+    }
+    fn git(&self, args: &[&str]) -> String {
+        let out = Command::new("git")
+            .current_dir(&self.dir)
+            .args(["-c", "init.defaultBranch=main", "-c", "core.autocrlf=false"])
+            .args(args)
+            .output()
+            .expect("git runs");
+        assert!(out.status.success(), "git {args:?} failed: {}", String::from_utf8_lossy(&out.stderr));
+        String::from_utf8_lossy(&out.stdout).trim().to_string()
+    }
+    fn write(&self, rel: &str, content: &str) {
+        std::fs::write(self.dir.join(rel), content).unwrap();
+    }
+    fn commit(&self, msg: &str) {
+        self.git(&["add", "-A"]);
+        self.git(&["commit", "-q", "-m", msg]);
+    }
+    fn repo(&self) -> Repo {
+        Repo::discover(&self.dir).unwrap().expect("repository found")
+    }
+    fn path(&self, rel: &str) -> PathBuf {
+        self.dir.join(rel)
+    }
+}
+
+fn history(repo: &Repo, path: &Path, text: Option<&str>, lines: (u32, u32)) -> BlockHistory {
+    repo.block_history(path, text, lines, encoding_rs::UTF_8, &CancellationToken::new()).unwrap()
+}
+
+/// a.txt: added, line 2 edited, line 5 edited, renamed to b.txt, line 3 edited.
+fn renamed_history() -> Fixture {
+    let fx = Fixture::new();
+    fx.write("a.txt", "one\ntwo\nthree\nfour\nfive\n");
+    fx.commit("Add a");
+    fx.write("a.txt", "one\nTWO\nthree\nfour\nfive\n");
+    fx.commit("Shout two");
+    fx.write("a.txt", "one\nTWO\nthree\nfour\nFIVE\n");
+    fx.commit("Shout five");
+    fx.git(&["mv", "a.txt", "b.txt"]);
+    fx.commit("Rename a to b");
+    fx.write("b.txt", "one\nTWO\nTHREE\nfour\nFIVE\n");
+    fx.commit("Shout three");
+    fx
+}
+
+#[test]
+fn follows_the_block_through_edits_and_a_rename() {
+    let fx = renamed_history();
+    let h = history(&fx.repo(), &fx.path("b.txt"), None, (1, 2));
+    assert_eq!(h.head_lines, Some((1, 2)));
+    let shown: Vec<_> = h.revisions.iter().map(|r| (r.summary.as_str(), r.path.as_str())).collect();
+    // Edits outside the block and the pure rename are left out.
+    assert_eq!(shown, [("Shout three", "b.txt"), ("Shout two", "a.txt"), ("Add a", "a.txt")]);
+    let blocks: Vec<_> = h.revisions.iter().map(|r| (r.before.as_str(), r.after.as_str())).collect();
+    assert_eq!(blocks, [("TWO\nthree\n", "TWO\nTHREE\n"), ("two\nthree\n", "TWO\nthree\n"), ("", "two\nthree\n")]);
+    let newest = &h.revisions[0];
+    assert_eq!((newest.before_line, newest.after_line, newest.author.as_str()), (1, 1, "Test User"));
+    assert!(newest.id.starts_with(&newest.short_id) && newest.time_ms > 0.0);
+}
+
+#[test]
+fn maps_an_edited_selection_to_head_lines() {
+    let fx = renamed_history();
+    let repo = fx.repo();
+    // Two unsaved lines inserted at the top: lines 3..=4 are HEAD's 1..=2.
+    let edited = "new\nnew\none\nTWO\nTHREE\nfour\nFIVE\n";
+    let h = history(&repo, &fx.path("b.txt"), Some(edited), (3, 4));
+    assert_eq!(h.head_lines, Some((1, 2)));
+    assert_eq!(h.revisions.len(), 3);
+    // Only new lines selected, or a file Git does not know: nothing committed to show.
+    let h = history(&repo, &fx.path("b.txt"), Some(edited), (0, 1));
+    assert_eq!((h.head_lines, h.revisions.len()), (None, 0));
+    fx.write("untracked.txt", "x\n");
+    let h = history(&repo, &fx.path("untracked.txt"), None, (0, 0));
+    assert_eq!((h.head_lines, h.revisions.len()), (None, 0));
+}
+
+#[test]
+fn restricted_mode_runs_no_diff_driver_of_the_repository() {
+    let fx = renamed_history();
+    let marker = fx.path("textconv-ran");
+    fx.write(".gitattributes", "*.txt diff=probe\n");
+    fx.commit("Attributes");
+    fx.git(&["config", "diff.probe.textconv", &format!("sh -c 'touch {}; cat \"$0\"'", marker.display())]);
+    let repo = fx.repo();
+    repo.set_execution_allowed(false);
+    let h = history(&repo, &fx.path("b.txt"), None, (1, 2));
+    assert_eq!(h.revisions.len(), 3);
+    assert!(!marker.exists(), "a textconv driver ran in restricted mode");
+}
+
+#[test]
+fn cancelled_requests_stop() {
+    let fx = renamed_history();
+    let cancel = CancellationToken::new();
+    cancel.cancel();
+    let err = fx.repo().block_history(&fx.path("b.txt"), None, (1, 2), encoding_rs::UTF_8, &cancel).unwrap_err();
+    assert_eq!(err.kind, ErrorKind::Cancelled);
+}
diff --git a/crates/ide-vcs/tests/log_projection.rs b/crates/ide-vcs/tests/log_projection.rs
new file mode 100644
index 00000000..10c9c61a
--- /dev/null
+++ b/crates/ide-vcs/tests/log_projection.rs
@@ -0,0 +1,438 @@
+use ide_vcs::{LogOrder, LogQuery, Repo};
+use std::io::Write;
+use std::path::Path;
+use std::process::{Command, Stdio};
+
+fn git(dir: &Path, args: &[&str]) -> String {
+    let out = Command::new("git")
+        .current_dir(dir)
+        .args([
+            "-c",
+            "init.defaultBranch=main",
+            "-c",
+            "user.name=Test",
+            "-c",
+            "user.email=test@example.com",
+            "-c",
+            "commit.gpgsign=false",
+        ])
+        .args(args)
+        .output()
+        .unwrap();
+    assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+    String::from_utf8_lossy(&out.stdout).trim().to_string()
+}
+
+fn commit(dir: &Path, file: &str, message: &str) -> String {
+    std::fs::write(dir.join(file), message).unwrap();
+    git(dir, &["add", "-A"]);
+    git(dir, &["commit", "-qm", message]);
+    git(dir, &["rev-parse", "HEAD"])
+}
+
+#[test]
+fn branch_and_independent_ranges_form_a_union() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let root = commit(dir, "a", "root");
+    let first = commit(dir, "a", "first");
+    let second = commit(dir, "a", "second");
+    let third = commit(dir, "a", "third");
+    git(dir, &["checkout", "-qb", "side", &root]);
+    let side = commit(dir, "b", "side");
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    for order in [LogOrder::Topo, LogOrder::Date, LogOrder::Standard] {
+        let log = repo
+            .log(&LogQuery {
+                branches: vec!["side".into()],
+                ranges: vec![format!("{root}..{first}"), format!("{second}..{third}")],
+                order,
+                ..Default::default()
+            })
+            .unwrap();
+        let got: std::collections::HashSet<_> = log.iter().map(|c| c.id.clone()).collect();
+        assert_eq!(got, [root.clone(), first.clone(), third.clone(), side.clone()].into());
+        let ranges = repo
+            .log(&LogQuery {
+                ranges: vec![format!("{root}..{first}"), format!("{second}..{third}")],
+                order,
+                ..Default::default()
+            })
+            .unwrap();
+        assert_eq!(
+            ranges.iter().map(|c| c.id.clone()).collect::<std::collections::HashSet<_>>(),
+            [first.clone(), third.clone()].into()
+        );
+        let positions: std::collections::HashMap<_, _> =
+            log.iter().enumerate().map(|(i, c)| (c.id.as_str(), i)).collect();
+        for (i, c) in log.iter().enumerate() {
+            for p in c.graph_parents.as_ref().unwrap() {
+                assert!(positions.get(p.as_str()).is_none_or(|p| *p > i));
+            }
+        }
+    }
+}
+
+#[test]
+fn lazy_summaries_seek_and_index_survive_refresh_and_restart() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let mut ids = Vec::new();
+    for i in 0..70 {
+        ids.push(commit(dir, "a", &format!("summary {i}\n\nneedle body {i}")));
+    }
+    let cache = tempfile::tempdir().unwrap();
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    repo.enable_log_index(cache.path());
+    let query = LogQuery { summary_only: true, limit: 5, ..Default::default() };
+    let page = repo.log(&query).unwrap();
+    assert_eq!(page[0].message, "summary 69");
+    assert!(page[0].message_truncated);
+    assert_eq!(page[0].log_position, Some(0));
+    assert_eq!(page[0].log_total, Some(70));
+    let window = repo.log(&LogQuery { seek: Some(ids[5].clone()), limit: 20, ..query.clone() }).unwrap();
+    assert!(window.iter().any(|c| c.id == ids[5]));
+    assert!(window[0].log_position.unwrap() > 0);
+    assert!(repo.log(&LogQuery { request: Some(ide_core::RequestId(1)), ..query.clone() }).is_ok());
+    let cancel = ide_core::CancellationToken::new();
+    cancel.cancel();
+    assert!(repo.log_cancellable(&query, &cancel).is_err());
+    let progress = repo.index_log(&ide_core::CancellationToken::new()).unwrap();
+    assert_eq!((progress.indexed, progress.total, progress.running), (70, 70, false));
+    assert_eq!(repo.log(&LogQuery { text: Some("needle body 5".into()), ..query.clone() }).unwrap().len(), 5);
+    let new = commit(dir, "b", "new head");
+    let refreshed = repo.log(&LogQuery { retain_until: Some(ids[0].clone()), ..query.clone() }).unwrap();
+    assert_eq!(refreshed[0].id, new);
+    assert_eq!(refreshed.len(), 71);
+    drop(repo);
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    repo.enable_log_index(cache.path());
+    let hit = repo.log(&LogQuery { text: Some("needle body 69".into()), ..query }).unwrap();
+    assert_eq!(hit[0].id, ids[69]);
+    assert_eq!(repo.log_details(&ids[69]).unwrap().message, "summary 69\n\nneedle body 69");
+    assert_eq!(repo.log_details(&ids[69]).unwrap().signature, "N");
+}
+
+#[test]
+fn followed_history_carries_the_filename_at_each_revision() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let first = commit(dir, "old.txt", "original");
+    git(dir, &["mv", "old.txt", "new.txt"]);
+    git(dir, &["commit", "-qm", "rename"]);
+    let renamed = git(dir, &["rev-parse", "HEAD"]);
+    let tip = commit(dir, "new.txt", "latest");
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let log = repo.log(&LogQuery { path: Some("new.txt".into()), follow: true, ..Default::default() }).unwrap();
+    assert_eq!(
+        log.iter().map(|c| (c.id.as_str(), c.history_path.as_deref())).collect::<Vec<_>>(),
+        vec![(tip.as_str(), Some("new.txt")), (renamed.as_str(), Some("new.txt")), (first.as_str(), Some("old.txt"))]
+    );
+    assert_eq!(repo.revision_children(&first, "").unwrap(), vec!["old.txt"]);
+}
+
+#[test]
+fn detail_filters_connect_visible_ancestors_without_changing_revision_parents() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let a = commit(dir, "a", "keep root");
+    commit(dir, "b", "hidden middle");
+    git(dir, &["commit", "--amend", "--no-edit", "--author=Other <other@example.com>"]);
+    let b = git(dir, &["rev-parse", "HEAD"]);
+    let c = commit(dir, "a", "keep tip");
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    for q in [
+        LogQuery { text: Some("keep".into()), ..Default::default() },
+        LogQuery { path: Some("a".into()), ..Default::default() },
+        LogQuery { authors: vec!["Test".into()], authors_exact: true, ..Default::default() },
+    ] {
+        let page = repo.log(&LogQuery { limit: 1, ..q.clone() }).unwrap();
+        assert_eq!(page[0].id, c);
+        assert_eq!(page[0].parents, vec![b.clone()]);
+        assert_eq!(page[0].graph_parents, Some(vec![a.clone()]));
+        assert_eq!(page[0].graph_dashed, vec![true]);
+        assert_eq!(page[0].on_current_branch, Some(true));
+        let next = repo.log(&LogQuery { skip: 1, limit: 1, ..q }).unwrap();
+        assert_eq!(next[0].id, a);
+        assert_eq!(next[0].graph_parents, Some(vec![]));
+    }
+}
+
+#[test]
+fn all_history_includes_commits_reachable_only_from_tags() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let root = commit(dir, "a", "root");
+    let tip = commit(dir, "a", "tagged tip");
+    git(dir, &["tag", "v1"]);
+    git(dir, &["reset", "--hard", &root]);
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let log = repo.log(&LogQuery::default()).unwrap();
+    let tagged = log.iter().find(|c| c.id == tip).unwrap();
+    assert!(tagged.refs.contains(&"tag: v1".into()));
+    assert_eq!(tagged.on_current_branch, Some(false));
+}
+
+#[test]
+fn projection_does_not_truncate_long_hidden_chains() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let mut stream = String::new();
+    for i in 0..4100 {
+        let message = if i == 0 || i == 4099 { "keep" } else { "hide" };
+        stream.push_str(&format!(
+            "commit refs/heads/main\ncommitter Test <test@example.com> {} +0000\ndata {}\n{}\n\n",
+            1000 + i,
+            message.len(),
+            message
+        ));
+    }
+    let mut child = Command::new("git")
+        .current_dir(dir)
+        .args(["fast-import", "--quiet"])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::null())
+        .spawn()
+        .unwrap();
+    child.stdin.take().unwrap().write_all(stream.as_bytes()).unwrap();
+    assert!(child.wait().unwrap().success());
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let log = repo.log(&LogQuery { text: Some("keep".into()), ..Default::default() }).unwrap();
+    assert_eq!(log.len(), 2);
+    assert_eq!(log[0].graph_parents, Some(vec![log[1].id.clone()]));
+}
+
+#[test]
+fn path_and_shallow_history_remain_topological_with_clock_skew() {
+    let tmp = tempfile::tempdir().unwrap();
+    let source = tmp.path().join("source");
+    std::fs::create_dir(&source).unwrap();
+    git(&source, &["init", "-q"]);
+    let make = |message: &str, parent: Option<&str>, time: &str| {
+        std::fs::write(source.join("a.txt"), message).unwrap();
+        git(&source, &["add", "a.txt"]);
+        let tree = git(&source, &["write-tree"]);
+        let mut cmd = Command::new("git");
+        cmd.current_dir(&source).args([
+            "-c",
+            "user.name=Test",
+            "-c",
+            "user.email=t@example.com",
+            "commit-tree",
+            &tree,
+            "-m",
+            message,
+        ]);
+        if let Some(p) = parent {
+            cmd.args(["-p", p]);
+        }
+        let out = cmd.env("GIT_AUTHOR_DATE", time).env("GIT_COMMITTER_DATE", time).output().unwrap();
+        assert!(out.status.success());
+        String::from_utf8(out.stdout).unwrap().trim().to_string()
+    };
+    let root = make("root", None, "@5000 +0000");
+    let left = make("left", Some(&root), "@1000 +0000");
+    let right = make("right", Some(&root), "@2000 +0000");
+    git(&source, &["update-ref", "refs/heads/main", &left]);
+    git(&source, &["update-ref", "refs/heads/side", &right]);
+    let shallow = tmp.path().join("shallow");
+    git(
+        tmp.path(),
+        &[
+            "clone",
+            "-q",
+            "--depth=2",
+            "--no-single-branch",
+            &format!("file://{}", source.display()),
+            shallow.to_str().unwrap(),
+        ],
+    );
+    for dir in [&source, &shallow] {
+        let repo = Repo::discover(dir).unwrap().unwrap();
+        for order in [LogOrder::Date, LogOrder::Topo, LogOrder::Standard] {
+            let log = repo.log(&LogQuery { order, path: Some("a.txt".into()), ..Default::default() }).unwrap();
+            assert_eq!(log.len(), 3);
+            let positions: std::collections::HashMap<_, _> =
+                log.iter().enumerate().map(|(i, c)| (c.id.as_str(), i)).collect();
+            for (i, c) in log.iter().enumerate() {
+                for parent in c.graph_parents.as_ref().unwrap() {
+                    assert!(positions.get(parent.as_str()).is_none_or(|p| *p > i));
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn multiple_paths_exact_authors_patterns_and_rename_history() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let root = commit(dir, "old.txt", "root");
+    git(dir, &["mv", "old.txt", "new.txt"]);
+    git(dir, &["commit", "-qm", "rename"]);
+    let rename = git(dir, &["rev-parse", "HEAD"]);
+    let tip = commit(dir, "other.txt", "another file");
+    git(dir, &["branch", "feature/log"]);
+    git(dir, &["branch", "feature/skip", &root]);
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let log = repo.log(&LogQuery { paths: vec!["new.txt".into(), "other.txt".into()], ..Default::default() }).unwrap();
+    assert_eq!(log.iter().map(|c| c.id.clone()).collect::<Vec<_>>(), vec![tip.clone(), rename.clone()]);
+    let log = repo.log(&LogQuery { path: Some("new.txt".into()), follow: true, ..Default::default() }).unwrap();
+    assert_eq!(log.iter().map(|c| c.id.clone()).collect::<Vec<_>>(), vec![rename, root.clone()]);
+    let log = repo
+        .log(&LogQuery { branches: vec!["feature/.*".into(), "-feature/skip".into()], ..Default::default() })
+        .unwrap();
+    assert_eq!(log[0].id, tip);
+    std::fs::write(dir.join("other.txt"), "different author").unwrap();
+    git(dir, &["add", "-A"]);
+    git(dir, &["-c", "user.name=Test User", "-c", "user.email=other@example.com", "commit", "-qm", "different author"]);
+    let log = repo.log(&LogQuery { authors: vec!["Test".into()], authors_exact: true, ..Default::default() }).unwrap();
+    assert_eq!(log.len(), 3);
+    assert!(log.iter().all(|c| c.author == "Test"));
+    assert!(repo.log_users().unwrap().contains(&"Test User <other@example.com>".to_string()));
+}
+
+#[test]
+fn metadata_and_path_cache_survive_restart_without_caching_refs_or_filters() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path().join("repo");
+    std::fs::create_dir(&dir).unwrap();
+    git(&dir, &["init", "-q"]);
+    let first = commit(&dir, "a", "first\n\nComplete commit body");
+    git(&dir, &["tag", "v1"]);
+    git(&dir, &["tag", "-a", "annotated", "-m", "release"]);
+    let cache = tmp.path().join("cache");
+    {
+        let repo = Repo::discover(&dir).unwrap().unwrap();
+        repo.enable_log_index(&cache);
+        let log = repo.log(&LogQuery { path: Some("a".into()), summary_only: true, ..Default::default() }).unwrap();
+        assert!(log[0].message_truncated);
+        assert_eq!(log[0].message, "first");
+        assert_eq!(repo.log_details(&first).unwrap().message, "first\n\nComplete commit body");
+        let details = repo.log_details("annotated").unwrap();
+        assert_eq!(details.message, "first\n\nComplete commit body");
+        assert_eq!(details.signature, "N");
+        assert!(details.containing_branches.contains(&"main".to_string()));
+        assert_eq!(repo.revision_files(&first).unwrap(), vec!["a"]);
+    }
+    let second = commit(&dir, "a", "second");
+    git(&dir, &["tag", "-f", "v1"]);
+    let repo = Repo::discover(&dir).unwrap().unwrap();
+    repo.enable_log_index(&cache);
+    let log = repo.log(&LogQuery { path: Some("a".into()), ..Default::default() }).unwrap();
+    assert_eq!(log[0].id, second);
+    assert!(log[0].refs.contains(&"tag: v1".into()));
+    assert!(!log[1].refs.contains(&"tag: v1".into()));
+    assert!(log[1].message.contains("Complete commit body"));
+    assert!(!log[1].message_truncated);
+}
+
+#[test]
+fn cancelled_query_does_not_publish_a_partial_page() {
+    let tmp = tempfile::tempdir().unwrap();
+    git(tmp.path(), &["init", "-q"]);
+    commit(tmp.path(), "a", "root");
+    let repo = Repo::discover(tmp.path()).unwrap().unwrap();
+    let cancel = ide_core::CancellationToken::new();
+    cancel.cancel();
+    assert_eq!(
+        repo.log_cancellable(&LogQuery::default(), &cancel).unwrap_err().kind,
+        ide_core::error::ErrorKind::Cancelled
+    );
+}
+
+#[test]
+fn shallow_boundaries_do_not_reconnect_to_locally_present_ancestors() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let root = commit(dir, "a", "keep root");
+    let boundary = commit(dir, "a", "hidden boundary");
+    let tip = commit(dir, "a", "keep tip");
+    git(dir, &["tag", "root", &root]);
+    std::fs::write(dir.join(".git/shallow"), format!("{boundary}\n")).unwrap();
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    for order in [LogOrder::Date, LogOrder::Topo, LogOrder::Standard] {
+        for text in [None, Some("keep".to_string())] {
+            let log = repo.log(&LogQuery { order, text, path: Some("a".into()), ..Default::default() }).unwrap();
+            let boundary_row = log.iter().find(|c| c.id == boundary);
+            if let Some(row) = boundary_row {
+                assert_eq!(row.parents, vec![root.clone()]);
+                assert_eq!(row.graph_parents, Some(vec![]));
+            } else {
+                assert_eq!(log.iter().find(|c| c.id == tip).unwrap().graph_parents, Some(vec![]));
+            }
+        }
+    }
+}
+
+#[test]
+fn exact_branch_exclusions_treat_punctuation_literally() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let root = commit(dir, "a", "root");
+    git(dir, &["branch", "release/1.0"]);
+    let tip = commit(dir, "a", "tip");
+    git(dir, &["branch", "release/1x0"]);
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let log = repo
+        .log(&LogQuery { branches: vec!["release/.*".into(), "-release/1.0".into()], ..Default::default() })
+        .unwrap();
+    assert_eq!(log.iter().map(|c| c.id.as_str()).collect::<Vec<_>>(), vec![tip.as_str(), root.as_str()]);
+}
+
+#[test]
+fn mode_only_changes_appear_in_path_history() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    let root = commit(dir, "script", "root");
+    git(dir, &["update-index", "--chmod=+x", "script"]);
+    git(dir, &["commit", "-qm", "make executable"]);
+    let tip = git(dir, &["rev-parse", "HEAD"]);
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let log = repo.log(&LogQuery { path: Some("script".into()), ..Default::default() }).unwrap();
+    assert_eq!(log.iter().map(|c| c.id.as_str()).collect::<Vec<_>>(), vec![tip.as_str(), root.as_str()]);
+}
+
+#[test]
+fn multiple_paths_are_simplified_together_at_merges() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = tmp.path();
+    git(dir, &["init", "-q"]);
+    commit(dir, "a", "a0");
+    commit(dir, "b", "b0");
+    git(dir, &["branch", "side"]);
+    commit(dir, "a", "left");
+    git(dir, &["checkout", "side"]);
+    commit(dir, "b", "right");
+    git(dir, &["checkout", "main"]);
+    git(dir, &["merge", "--no-ff", "side", "-m", "merge both paths"]);
+    let repo = Repo::discover(dir).unwrap().unwrap();
+    let expected = git(dir, &["log", "--topo-order", "--format=%H", "--", "a", "b"]);
+    for order in [LogOrder::Topo, LogOrder::Date, LogOrder::Standard] {
+        let log = repo
+            .log(&LogQuery {
+                branch: Some("HEAD".into()),
+                paths: vec!["a".into(), "b".into()],
+                order,
+                ..Default::default()
+            })
+            .unwrap();
+        assert_eq!(log[0].summary, "merge both paths");
+        assert_eq!(
+            log.iter().map(|c| c.id.as_str()).collect::<std::collections::HashSet<_>>(),
+            expected.lines().collect()
+        );
+        assert_eq!(log[0].parents.len(), 2);
+        assert_eq!(log[0].graph_parents.as_ref().unwrap().len(), 2);
+    }
+}
diff --git a/crates/ide-vcs/tests/log_shape.rs b/crates/ide-vcs/tests/log_shape.rs
index b26236ec..4414d6d5 100644
--- a/crates/ide-vcs/tests/log_shape.rs
+++ b/crates/ide-vcs/tests/log_shape.rs
@@ -64,7 +64,7 @@ fn ids(commits: &[Commit]) -> Vec<String> {
 }
 
 fn parents_of(commits: &[Commit], id: &str) -> Vec<String> {
-    commits.iter().find(|c| c.id == id).unwrap().parents.clone()
+    commits.iter().find(|c| c.id == id).unwrap().graph_parents.clone().unwrap()
 }
 
 #[test]
@@ -75,6 +75,14 @@ fn date_order_follows_commit_time_and_reports_it() {
     assert_eq!(out[0].commit_time_ms, 5_000_000.0);
 }
 
+#[test]
+fn incoming_order_groups_the_merged_branch_before_the_main_parent() {
+    let h = history();
+    let out = log(&h, LogQuery { order: LogOrder::Standard, ..Default::default() });
+    assert_eq!(ids(&out), vec![h.c3.clone(), h.m.clone(), h.s1.clone(), h.c2.clone(), h.c1.clone()]);
+    assert_eq!(out[1].parents, vec![h.c2.clone(), h.s1.clone()]);
+}
+
 #[test]
 fn no_merges_links_children_to_the_merge_parents() {
     let h = history();
@@ -90,6 +98,7 @@ fn first_parent_skips_merged_branches() {
     let out = log(&h, LogQuery { first_parent: true, ..Default::default() });
     assert_eq!(ids(&out), vec![h.c3.clone(), h.m.clone(), h.c2.clone(), h.c1.clone()]);
     assert_eq!(parents_of(&out, &h.m), vec![h.c2.clone()]);
+    assert_eq!(out.iter().find(|c| c.id == h.m).unwrap().parents, vec![h.c2.clone(), h.s1.clone()]);
 }
 
 #[test]
@@ -201,19 +210,26 @@ fn a_user_filter_links_shown_commits_past_hidden_ones() {
     let log = repo.log(&LogQuery { author: Some("me@".into()), ..Default::default() }).unwrap();
     let links: Vec<(&str, Vec<&str>, Vec<bool>)> = log
         .iter()
-        .map(|c| (c.summary.as_str(), c.parents.iter().map(String::as_str).collect(), c.dashed.clone()))
+        .map(|c| {
+            (
+                c.summary.as_str(),
+                c.graph_parents.as_ref().unwrap().iter().map(String::as_str).collect(),
+                if c.graph_dashed.iter().any(|d| *d) { c.graph_dashed.clone() } else { Vec::new() },
+            )
+        })
         .collect();
     assert_eq!(
         links,
         [("m3", vec![m2.as_str()], vec![]), ("m2", vec![m1.as_str()], vec![true]), ("m1", vec![], vec![]),],
         "m2's parent o1 is hidden: m2 links to m1, dashed"
     );
-    assert!(!log.iter().any(|c| c.parents.contains(&o1)));
+    assert!(!log.iter().any(|c| c.graph_parents.as_ref().unwrap().contains(&o1)));
+    assert_eq!(log[1].parents, vec![o1]);
 
     // A page ends at m2: walking on still links it to m1.
     let page = repo.log(&LogQuery { author: Some("me@".into()), limit: 2, ..Default::default() }).unwrap();
     assert_eq!(page.len(), 2);
-    assert_eq!(page[1].parents, std::slice::from_ref(&m1));
+    assert_eq!(page[1].graph_parents.as_deref().unwrap(), std::slice::from_ref(&m1));
     let next = repo.log(&LogQuery { author: Some("me@".into()), skip: 2, limit: 2, ..Default::default() }).unwrap();
     assert_eq!(next.iter().map(|c| c.id.clone()).collect::<Vec<_>>(), std::slice::from_ref(&m1));
     let _ = m3;
diff --git a/crates/ide-vfs/Cargo.toml b/crates/ide-vfs/Cargo.toml
index 42d430ec..dd4bfdf3 100644
--- a/crates/ide-vfs/Cargo.toml
+++ b/crates/ide-vfs/Cargo.toml
@@ -13,7 +13,7 @@ serde.workspace = true
 specta.workspace = true
 ignore.workspace = true
 globset.workspace = true
-notify-debouncer-full.workspace = true
+notify.workspace = true
 encoding_rs.workspace = true
 chardetng.workspace = true
 trash.workspace = true
diff --git a/crates/ide-vfs/src/lib.rs b/crates/ide-vfs/src/lib.rs
index 6ac24e21..3941e8ba 100644
--- a/crates/ide-vfs/src/lib.rs
+++ b/crates/ide-vfs/src/lib.rs
@@ -256,6 +256,11 @@ pub fn set_writable(path: &Path, writable: bool) -> IdeResult<()> {
 pub fn rename(from: &Path, to: &Path) -> IdeResult<()> {
     ops::rename(from, to)
 }
+/// Checks source existence and destination conflicts without mutation, using
+/// the same filesystem identity rules as [`rename`].
+pub fn validate_rename(from: &Path, to: &Path) -> IdeResult<()> {
+    ops::validate_rename(from, to)
+}
 /// Moves to the OS trash (recoverable), like IDEA's safe delete for files.
 /// Deletes permanently when the trash is unavailable.
 pub fn delete(path: &Path) -> IdeResult<()> {
@@ -274,13 +279,14 @@ pub fn copy(from: &Path, to: &Path) -> IdeResult<()> {
 /// honouring .gitignore, .ignore and `excludes`. Shared by index and search.
 ///
 /// Hidden files are included; `.git` is always skipped. `.gitignore` applies
-/// even outside a git repository. Symlinks to files are visited, symlinked
+/// even outside a git repository; inside one, a nested repository's root is a
+/// boundary for the outer repository's rules. Symlinks to files are visited, symlinked
 /// directories are not followed.
 pub fn walk_files(root: &Path, excludes: &[String], visit: impl Fn(&Path) + Send + Sync) {
     let excludes = Arc::new(ExcludeMatcher::new(excludes));
     let base = root.to_path_buf();
     let mut builder = ignore::WalkBuilder::new(root);
-    builder.hidden(false).require_git(false).follow_links(false);
+    builder.hidden(false).require_git(ide_core::ignored::inside_git_repo(root)).follow_links(false);
     builder.filter_entry(move |entry| {
         if entry.depth() > 0 && entry.file_name() == ".git" {
             return false;
@@ -324,6 +330,11 @@ pub struct FsBatch {
     /// Folders holding changes filtered out as excluded or ignored. Only a view already
     /// showing such a folder cares, so they don't count as worktree changes.
     pub excluded_dirs: Vec<PathBuf>,
+    /// Files changed, created or removed that an ignore rule matches while their folder
+    /// is not ignored (`.env`). Kept apart from the worktree changes above (no Local
+    /// History, deployment or `fsChanged`), but the index lists them and open editors
+    /// follow them, like IDEA, where only ignored folders leave the project.
+    pub ignored: Vec<PathBuf>,
 }
 
 impl FsBatch {
@@ -333,6 +344,7 @@ impl FsBatch {
             && self.removed.is_empty()
             && self.vcs.is_empty()
             && self.excluded_dirs.is_empty()
+            && self.ignored.is_empty()
     }
 }
 
diff --git a/crates/ide-vfs/src/ops.rs b/crates/ide-vfs/src/ops.rs
index d256aa34..7ebe171f 100644
--- a/crates/ide-vfs/src/ops.rs
+++ b/crates/ide-vfs/src/ops.rs
@@ -88,7 +88,7 @@ fn same_file(a: &Path, b: &Path) -> bool {
     }
 }
 
-pub(crate) fn rename(from: &Path, to: &Path) -> IdeResult<()> {
+pub(crate) fn validate_rename(from: &Path, to: &Path) -> IdeResult<()> {
     if !exists(from) {
         return Err(not_found(from));
     }
@@ -99,6 +99,14 @@ pub(crate) fn rename(from: &Path, to: &Path) -> IdeResult<()> {
     if exists(to) && !same_file(from, to) {
         return Err(already_exists(to));
     }
+    Ok(())
+}
+
+pub(crate) fn rename(from: &Path, to: &Path) -> IdeResult<()> {
+    validate_rename(from, to)?;
+    if from == to {
+        return Ok(());
+    }
     ensure_parent(to)?;
     match fs::rename(from, to) {
         Ok(()) => Ok(()),
diff --git a/crates/ide-vfs/src/watch.rs b/crates/ide-vfs/src/watch.rs
index d9309d90..253d7a82 100644
--- a/crates/ide-vfs/src/watch.rs
+++ b/crates/ide-vfs/src/watch.rs
@@ -12,9 +12,8 @@
 use crate::FsBatch;
 use crate::rules::{ExcludeMatcher, GitignoreStack};
 use ide_core::{IdeError, IdeEvent, IdeResult, SharedSink};
-use notify_debouncer_full::notify::event::{ModifyKind, RenameMode};
-use notify_debouncer_full::notify::{self, EventKind, PollWatcher, RecommendedWatcher, RecursiveMode, WatcherKind};
-use notify_debouncer_full::{DebounceEventResult, DebouncedEvent, Debouncer, NoCache, new_debouncer_opt};
+use notify::event::{ModifyKind, RenameMode};
+use notify::{Event, EventKind, PollWatcher, RecommendedWatcher, RecursiveMode, WatcherKind};
 use parking_lot::{Condvar, Mutex, RwLock};
 use std::collections::{BTreeMap, BTreeSet, HashSet};
 use std::path::{Component, Path, PathBuf};
@@ -62,10 +61,9 @@ pub struct Watcher {
 
 type SharedExcludes = Arc<RwLock<ExcludeMatcher>>;
 
-enum Inner {
-    Recursive(#[allow(dead_code)] Debouncer<RecommendedWatcher, NoCache>),
-    Polling(#[allow(dead_code)] Debouncer<PollWatcher, NoCache>),
-    PerDirectory { state: Arc<DirState>, thread: Option<JoinHandle<()>> },
+struct Inner {
+    state: Arc<DirState>,
+    thread: Option<JoinHandle<()>>,
 }
 
 impl Watcher {
@@ -131,80 +129,32 @@ impl Watcher {
 
     /// Number of OS-level watches (1 in recursive and flat mode).
     pub fn watch_count(&self) -> usize {
-        match &self.inner {
-            Inner::Recursive(_) | Inner::Polling(_) => 1,
-            Inner::PerDirectory { state, .. } => state.watched.lock().len(),
-        }
+        self.inner.state.watched.lock().len()
     }
 
     fn start_native(root: &Path, filter: EventFilter, emit: Emit, mode: WatchMode) -> IdeResult<Inner> {
-        let config = notify::Config::default();
-        match mode {
-            WatchMode::Recursive => {
-                Self::start_debounced(root, filter, emit, RecursiveMode::Recursive, config).map(Inner::Recursive)
-            }
-            WatchMode::Flat => {
-                Self::start_debounced(root, filter, emit, RecursiveMode::NonRecursive, config).map(Inner::Recursive)
-            }
-            WatchMode::PerDirectory => Self::start_per_directory::<RecommendedWatcher>(root, filter, emit, config),
-        }
+        Self::start_queued::<RecommendedWatcher>(root, filter, emit, mode, notify::Config::default())
     }
 
     /// Polls per directory unless flat: a recursive poll would rescan
     /// `node_modules` and `target` every round.
     fn start_polling(root: &Path, filter: EventFilter, emit: Emit, mode: WatchMode) -> IdeResult<Inner> {
         let config = notify::Config::default().with_poll_interval(POLL_INTERVAL);
-        match mode {
-            WatchMode::Flat => {
-                Self::start_debounced(root, filter, emit, RecursiveMode::NonRecursive, config).map(Inner::Polling)
-            }
-            WatchMode::Recursive | WatchMode::PerDirectory => {
-                Self::start_per_directory::<PollWatcher>(root, filter, emit, config)
-            }
-        }
+        let mode = if mode == WatchMode::Flat { mode } else { WatchMode::PerDirectory };
+        Self::start_queued::<PollWatcher>(root, filter, emit, mode, config)
     }
 
-    fn start_debounced<W: notify::Watcher>(
-        root: &Path,
-        filter: EventFilter,
-        emit: Emit,
-        recursive: RecursiveMode,
-        config: notify::Config,
-    ) -> IdeResult<Debouncer<W, NoCache>> {
-        let polled = W::kind() == WatcherKind::PollWatcher;
-        // No file-id cache: building it walks and stats the whole tree before `watch` returns,
-        // which made opening large projects block for seconds. Renames arrive as remove + create.
-        let handler = move |result: DebounceEventResult| match result {
-            Ok(mut events) => {
-                if polled {
-                    events.retain(|e| !is_dir_touch(&e.event));
-                }
-                let (batch, _) = filter.batch_detailed(&events);
-                if !batch.is_empty() {
-                    emit(&batch);
-                }
-            }
-            Err(errors) => {
-                for e in errors {
-                    tracing::warn!("file watcher: {e}");
-                }
-            }
-        };
-        let mut debouncer = new_debouncer_opt::<_, W, _>(DEBOUNCE, None, handler, NoCache, config)
-            .map_err(|e| io_error(format!("cannot start file watcher: {e}")))?;
-        debouncer.watch(root, recursive).map_err(|e| io_error(format!("cannot watch {}: {e}", root.display())))?;
-        Ok(debouncer)
-    }
-
-    fn start_per_directory<W: notify::Watcher + Send + 'static>(
+    fn start_queued<W: notify::Watcher + Send + 'static>(
         root: &Path,
         filter: EventFilter,
         emit: Emit,
+        mode: WatchMode,
         config: notify::Config,
     ) -> IdeResult<Inner> {
         let polled = W::kind() == WatcherKind::PollWatcher;
         let state = Arc::new(DirState {
             filter,
+            mode,
             watcher: Mutex::new(None),
             watched: Mutex::default(),
             queue: Mutex::default(),
@@ -228,8 +178,11 @@ impl Watcher {
         )
         .map_err(|e| io_error(format!("cannot start file watcher: {e}")))?;
         *state.watcher.lock() = Some(Box::new(watcher));
-        let mut created = Vec::new();
-        state.watch_tree(root, false, &mut created);
+        if mode == WatchMode::PerDirectory {
+            state.watch_tree(root, false, &mut Vec::new());
+        } else {
+            state.add_watch(root);
+        }
         if state.watched.lock().is_empty() {
             return Err(io_error(format!("cannot watch {}", root.display())));
         }
@@ -240,20 +193,22 @@ impl Watcher {
                 .spawn(move || state.run(&*emit))
                 .map_err(|e| io_error(format!("cannot start file watcher: {e}")))?
         };
-        Ok(Inner::PerDirectory { state, thread: Some(thread) })
+        Ok(Inner { state, thread: Some(thread) })
     }
 }
 
-impl Drop for Watcher {
+impl Drop for Inner {
     fn drop(&mut self) {
-        if let Inner::PerDirectory { state, thread } = &mut self.inner {
+        let state = &self.state;
+        {
+            let _queue = state.queue.lock();
             state.stop.store(true, Ordering::SeqCst);
             state.wake.notify_all();
-            let watcher = state.watcher.lock().take();
-            drop(watcher);
-            if let Some(t) = thread.take() {
-                let _ = t.join();
-            }
+        }
+        let watcher = state.watcher.lock().take();
+        drop(watcher);
+        if let Some(t) = self.thread.take() {
+            let _ = t.join();
         }
     }
 }
@@ -268,10 +223,10 @@ fn is_dir_touch(event: &notify::Event) -> bool {
     matches!(event.kind, EventKind::Modify(_)) && event.paths.iter().all(|p| p.is_dir())
 }
 
-/// State of the per-directory strategy, shared with the notify callback
-/// (weakly) and the debounce thread.
+/// Shared with the notify callback (weakly) and the debounce thread.
 struct DirState {
     filter: EventFilter,
+    mode: WatchMode,
     watcher: Mutex<Option<Box<dyn notify::Watcher + Send>>>,
     watched: Mutex<HashSet<PathBuf>>,
     queue: Mutex<Vec<(notify::Event, Instant)>>,
@@ -310,9 +265,13 @@ impl DirState {
                 }
                 std::mem::take(&mut *q)
             };
-            let events: Vec<DebouncedEvent> = events.into_iter().map(|(e, t)| DebouncedEvent::new(e, t)).collect();
+            // A scan may publish a path before its create event is delivered:
+            // keep create + remove pairs so the consumer still sees the removal.
+            let events: Vec<Event> = events.into_iter().map(|(e, _)| e).collect();
             let (mut batch, rule_dirs) = self.filter.batch_detailed(&events);
-            self.update_watches(&mut batch, &rule_dirs);
+            if self.mode == WatchMode::PerDirectory {
+                self.update_watches(&mut batch, &rule_dirs);
+            }
             if !batch.is_empty() && !self.stopped() {
                 emit(&batch);
             }
@@ -363,7 +322,9 @@ impl DirState {
         }
         let mut guard = self.watcher.lock();
         let Some(w) = guard.as_mut() else { return false };
-        match w.watch(dir, RecursiveMode::NonRecursive) {
+        let recursive =
+            if self.mode == WatchMode::Recursive { RecursiveMode::Recursive } else { RecursiveMode::NonRecursive };
+        match w.watch(dir, recursive) {
             Ok(()) => {
                 self.watched.lock().insert(dir.to_path_buf());
                 true
@@ -443,6 +404,9 @@ fn merge(prev: Option<Change>, next: Change) -> Change {
     match (prev, next) {
         (None, n) => n,
         (Some(Vcs), _) | (_, Vcs) => Vcs,
+        // FSEvents reports a deleted file's history as create, remove, then modify: a
+        // modify can't bring back a path that went away, only a create can.
+        (Some(Transient), Modified) => Transient,
         (Some(Created | Transient), Modified | Created) => Created,
         (Some(Created | Transient), Removed) => Transient,
         (Some(Removed), Created | Modified) => Modified,
@@ -531,6 +495,13 @@ impl EventFilter {
             && !self.gitignore.is_ignored(path, is_dir)
     }
 
+    /// Whether a filtered-out file is ignored by a rule on the file itself, in a folder
+    /// that is neither excluded nor ignored.
+    fn is_ignored_file(&self, path: &Path, rel: &Path) -> bool {
+        !self.excludes.read().is_excluded(rel)
+            && path.parent().is_some_and(|dir| dir == self.root || !self.gitignore.is_ignored(dir, true))
+    }
+
     fn classify(&self, path: &Path, change: Change, out: &mut BTreeMap<PathBuf, Change>) {
         let rel = match path.strip_prefix(&self.root) {
             Ok(rel) if rel.as_os_str().is_empty() => return,
@@ -548,17 +519,17 @@ impl EventFilter {
     }
 
     #[cfg(test)]
-    pub fn batch(&self, events: &[DebouncedEvent]) -> FsBatch {
+    pub fn batch(&self, events: &[Event]) -> FsBatch {
         self.batch_detailed(events).0
     }
 
     /// The coalesced, filtered batch plus the directories whose ignore rules
     /// changed (their cached matchers have been rebuilt already).
-    pub fn batch_detailed(&self, events: &[DebouncedEvent]) -> (FsBatch, Vec<PathBuf>) {
+    pub fn batch_detailed(&self, events: &[Event]) -> (FsBatch, Vec<PathBuf>) {
         let mut changes: BTreeMap<PathBuf, Change> = BTreeMap::new();
         for ev in events {
-            let paths = &ev.event.paths;
-            match ev.event.kind {
+            let paths = &ev.paths;
+            match ev.kind {
                 EventKind::Access(_) => {}
                 EventKind::Create(_) => paths.iter().for_each(|p| self.classify(p, Change::Created, &mut changes)),
                 EventKind::Remove(_) => paths.iter().for_each(|p| self.classify(p, Change::Removed, &mut changes)),
@@ -594,7 +565,7 @@ impl EventFilter {
                 rule_dirs.insert(dir.to_path_buf());
             }
         }
-        if events.iter().flat_map(|e| &e.event.paths).any(|p| p.ends_with(".git/info/exclude")) {
+        if events.iter().flat_map(|e| &e.paths).any(|p| p.ends_with(".git/info/exclude")) {
             self.gitignore.reload_repo_level();
             rule_dirs.insert(self.root.clone());
         }
@@ -642,6 +613,9 @@ impl EventFilter {
                     if change != Change::Modified {
                         excluded_dirs.extend(path.parent().map(Path::to_path_buf));
                     }
+                    if !is_dir && self.is_ignored_file(&path, rel) {
+                        batch.ignored.push(path);
+                    }
                     continue;
                 }
             }
@@ -659,11 +633,125 @@ impl EventFilter {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use notify_debouncer_full::notify::Event;
-    use notify_debouncer_full::notify::event::{CreateKind, DataChange, RemoveKind};
+    use notify::event::{CreateKind, DataChange, MetadataKind, RemoveKind};
 
-    fn ev(kind: EventKind, paths: Vec<PathBuf>) -> DebouncedEvent {
-        DebouncedEvent::new(Event { kind, paths, attrs: Default::default() }, Instant::now())
+    fn ev(kind: EventKind, paths: Vec<PathBuf>) -> Event {
+        Event { kind, paths, attrs: Default::default() }
+    }
+
+    const TRANSIENT_PATHS: &[&str] = &["fresh.txt", "src/fresh.rs", "src/tasks/fresh.py"];
+
+    /// Delivers a whole debounce window without depending on OS scheduling.
+    struct TransientWatcher(Box<dyn notify::EventHandler>);
+
+    impl notify::Watcher for TransientWatcher {
+        fn new<F: notify::EventHandler>(handler: F, _: notify::Config) -> notify::Result<Self> {
+            Ok(Self(Box::new(handler)))
+        }
+
+        fn watch(&mut self, root: &Path, _: RecursiveMode) -> notify::Result<()> {
+            for rel in TRANSIENT_PATHS {
+                for kind in [
+                    EventKind::Create(CreateKind::File),
+                    EventKind::Modify(ModifyKind::Data(DataChange::Content)),
+                    EventKind::Remove(RemoveKind::File),
+                ] {
+                    self.0.handle_event(Ok(Event::new(kind).add_path(root.join(rel))));
+                }
+            }
+            for kind in [EventKind::Create(CreateKind::Folder), EventKind::Remove(RemoveKind::Folder)] {
+                self.0.handle_event(Ok(Event::new(kind).add_path(root.join("new"))));
+            }
+            for (rel, kind) in [
+                ("from.py", EventKind::Create(CreateKind::File)),
+                ("from.py", EventKind::Modify(ModifyKind::Name(RenameMode::From))),
+                ("to.py", EventKind::Modify(ModifyKind::Name(RenameMode::To))),
+                ("to.py", EventKind::Remove(RemoveKind::File)),
+            ] {
+                self.0.handle_event(Ok(Event::new(kind).add_path(root.join(rel))));
+            }
+            for kind in [EventKind::Remove(RemoveKind::File), EventKind::Create(CreateKind::File)] {
+                self.0.handle_event(Ok(Event::new(kind).add_path(root.join("kept.py"))));
+            }
+            Ok(())
+        }
+
+        fn unwatch(&mut self, _: &Path) -> notify::Result<()> {
+            Ok(())
+        }
+
+        fn kind() -> WatcherKind {
+            WatcherKind::NullWatcher
+        }
+    }
+
+    #[test]
+    fn debounce_preserves_transient_removals_and_atomic_replacements() {
+        for mode in [WatchMode::Recursive, WatchMode::Flat, WatchMode::PerDirectory] {
+            let tmp = tempfile::tempdir().unwrap();
+            let root = dunce::canonicalize(tmp.path()).unwrap();
+            std::fs::write(root.join("kept.py"), "class Kept: pass\n").unwrap();
+            let (tx, rx) = std::sync::mpsc::channel();
+            let emit: Emit = Arc::new(move |b| tx.send(b.clone()).unwrap());
+            let _watcher = Watcher::start_queued::<TransientWatcher>(
+                &root,
+                EventFilter::new(root.clone(), &[]),
+                emit,
+                mode,
+                notify::Config::default(),
+            )
+            .unwrap();
+            let batch = rx.recv_timeout(Duration::from_secs(5)).unwrap();
+            let removed: BTreeSet<_> = batch.removed.into_iter().collect();
+            let expected =
+                TRANSIENT_PATHS.iter().copied().chain(["new", "from.py", "to.py"]).map(|rel| root.join(rel)).collect();
+            assert_eq!(removed, expected, "{mode:?}: scans may have already published transient paths");
+            assert_eq!(batch.modified, vec![root.join("kept.py")]);
+            assert!(batch.created.is_empty());
+        }
+    }
+
+    #[cfg(windows)]
+    #[test]
+    fn native_watch_reports_quickly_removed_files() {
+        for mode in [WatchMode::Recursive, WatchMode::Flat, WatchMode::PerDirectory] {
+            let tmp = tempfile::tempdir().unwrap();
+            let root = dunce::canonicalize(tmp.path()).unwrap();
+            std::fs::create_dir_all(root.join("src/tasks")).unwrap();
+            let batches: Arc<Mutex<Vec<FsBatch>>> = Arc::default();
+            let watcher = {
+                let batches = batches.clone();
+                Watcher::start_with(
+                    &root,
+                    Vec::new(),
+                    Arc::new(ide_core::NullSink),
+                    Box::new(move |b| batches.lock().push(b.clone())),
+                    mode,
+                )
+                .unwrap()
+            };
+            assert!(watcher.polling().is_none());
+            assert_eq!(watcher.watch_count(), if mode == WatchMode::PerDirectory { 3 } else { 1 });
+            let paths: Vec<_> = TRANSIENT_PATHS
+                .iter()
+                .filter(|rel| mode != WatchMode::Flat || !rel.contains('/'))
+                .map(|rel| root.join(rel))
+                .collect();
+            for path in &paths {
+                std::fs::write(path, "class FreshWidget:\n    pass\n").unwrap();
+                std::fs::remove_file(path).unwrap();
+            }
+            assert!(
+                wait_for(&batches, |b| paths.iter().all(|p| b.iter().any(|batch| batch.removed.contains(p)))),
+                "{mode:?}: {:?}",
+                batches.lock()
+            );
+            drop(watcher);
+            let count = batches.lock().len();
+            std::fs::write(root.join("after-drop.txt"), "x").unwrap();
+            std::thread::sleep(DEBOUNCE * 2);
+            assert_eq!(batches.lock().len(), count, "no callback after drop in {mode:?}");
+        }
     }
 
     #[test]
@@ -700,6 +788,25 @@ mod tests {
         assert_eq!(batch.vcs, vec![root.join(".git/HEAD"), root.join(".git/refs/heads/feature")]);
         assert_eq!(batch.modified, vec![root.join("kept.txt")]);
         assert_eq!(batch.removed, vec![root.join("from.txt"), root.join("gone.txt"), root.join("old.txt")]);
+        assert_eq!(batch.ignored, vec![root.join("debug.log")], "ignored files are reported apart");
+    }
+
+    /// What FSEvents delivers when a file is deleted: its coalesced history flags as
+    /// create, remove, then modify events, all for a path that no longer exists.
+    #[test]
+    fn fsevents_deletion_with_history_flags_is_a_removal() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = dunce::canonicalize(tmp.path()).unwrap();
+        let filter = EventFilter::new(root.clone(), &[]);
+        let gone = root.join("src/Fresh.java");
+        let batch = filter.batch(&[
+            ev(EventKind::Create(CreateKind::File), vec![gone.clone()]),
+            ev(EventKind::Remove(RemoveKind::File), vec![gone.clone()]),
+            ev(EventKind::Modify(ModifyKind::Metadata(MetadataKind::Extended)), vec![gone.clone()]),
+            ev(EventKind::Modify(ModifyKind::Data(DataChange::Content)), vec![gone.clone()]),
+        ]);
+        assert_eq!(batch.removed, vec![gone]);
+        assert!(batch.created.is_empty() && batch.modified.is_empty());
     }
 
     #[test]
@@ -751,6 +858,20 @@ mod tests {
         ]);
         assert!(batch.created.is_empty() && batch.modified.is_empty() && batch.removed.is_empty(), "{batch:?}");
         assert_eq!(batch.excluded_dirs, vec![root.clone(), root.join("dist"), root.join("target/debug")]);
+        assert_eq!(batch.ignored, vec![root.join("debug.log")], "only the ignored file outside ignored folders");
+
+        // An ignored file's edit and removal reach the index too (nothing else changes).
+        let modify = EventKind::Modify(ModifyKind::Data(DataChange::Content));
+        let batch = filter.batch(&[ev(modify, vec![root.join("debug.log")])]);
+        assert_eq!(batch.ignored, vec![root.join("debug.log")]);
+        assert!(!batch.is_empty() && batch.excluded_dirs.is_empty());
+        std::fs::remove_file(root.join("debug.log")).unwrap();
+        let batch = filter.batch(&[
+            ev(EventKind::Remove(RemoveKind::File), vec![root.join("debug.log")]),
+            ev(EventKind::Remove(RemoveKind::File), vec![root.join("dist/app.js")]),
+        ]);
+        // A removed path can't tell file from folder: it goes out as a removal, as before.
+        assert_eq!(batch.removed, vec![root.join("debug.log")]);
 
         // Sibling files in unignored directories still come through.
         let batch = filter.batch(&[ev(create_file, vec![root.join("src/main.rs")])]);
@@ -797,10 +918,10 @@ mod tests {
         }
         let filter = EventFilter::new(root.clone(), &[]);
         let modify = EventKind::Modify(ModifyKind::Data(DataChange::Content));
-        let touch =
-            |paths: &[&str]| -> Vec<DebouncedEvent> { paths.iter().map(|p| ev(modify, vec![root.join(p)])).collect() };
+        let touch = |paths: &[&str]| -> Vec<Event> { paths.iter().map(|p| ev(modify, vec![root.join(p)])).collect() };
         let (batch, rules) = filter.batch_detailed(&touch(&["pkg/a.tmp", "pkg/gen/x.rs", "pkg/keep.rs", "b.tmp"]));
         assert_eq!(batch.modified, vec![root.join("b.tmp"), root.join("pkg/keep.rs")]);
+        assert_eq!(batch.ignored, vec![root.join("pkg/a.tmp")], "nested rules, but not inside ignored folders");
         assert!(rules.is_empty());
         assert!(!filter.should_watch_dir(&root.join("pkg/gen")));
 
@@ -818,7 +939,8 @@ mod tests {
         std::fs::create_dir_all(root.join(".git/info")).unwrap();
         std::fs::write(root.join(".git/info/exclude"), "b.tmp\n").unwrap();
         let (batch, rules) = filter.batch_detailed(&touch(&[".git/info/exclude", "b.tmp"]));
-        assert!(batch.is_empty(), "{batch:?}");
+        assert!(batch.modified.is_empty() && batch.vcs.is_empty(), "{batch:?}");
+        assert_eq!(batch.ignored, vec![root.join("b.tmp")]);
         assert_eq!(rules, vec![root.clone()]);
     }
 
@@ -846,10 +968,7 @@ mod tests {
     }
 
     fn watcher_state(w: &Watcher) -> &DirState {
-        match &w.inner {
-            Inner::PerDirectory { state, .. } => state,
-            Inner::Recursive(_) | Inner::Polling(_) => panic!("not per-directory"),
-        }
+        &w.inner.state
     }
 
     fn wait_for(events: &Mutex<Vec<FsBatch>>, pred: impl Fn(&[FsBatch]) -> bool) -> bool {
diff --git a/crates/ide-vfs/tests/vfs.rs b/crates/ide-vfs/tests/vfs.rs
index 76d2cdc7..0a08f732 100644
--- a/crates/ide-vfs/tests/vfs.rs
+++ b/crates/ide-vfs/tests/vfs.rs
@@ -259,6 +259,47 @@ fn walk_honours_ignores() {
     assert_eq!(found, expected);
 }
 
+#[test]
+fn walk_scopes_gitignore_to_each_repository() {
+    let (_t, r) = root();
+    // An outer repository ignores everything under `projects/`, nested repository included (#1254).
+    write(&r.join("outer/.git/HEAD"), "ref: refs/heads/main\n");
+    write(&r.join("outer/top.txt"), "");
+    write(&r.join("outer/projects/.gitignore"), "*\n!.gitignore\n");
+    write(&r.join("outer/projects/nested/.git/HEAD"), "ref: refs/heads/main\n");
+    write(&r.join("outer/projects/nested/.git/info/exclude"), "local.txt\n");
+    write(&r.join("outer/projects/nested/.gitignore"), "*.log\n");
+    write(&r.join("outer/projects/nested/search-test.txt"), "");
+    write(&r.join("outer/projects/nested/src/a.rs"), "");
+    write(&r.join("outer/projects/nested/debug.log"), "");
+    write(&r.join("outer/projects/nested/local.txt"), "");
+    write(&r.join("outer/projects/plain/file.txt"), "");
+    write(&r.join("loose/.gitignore"), "*.log\n");
+    write(&r.join("loose/a.txt"), "");
+    write(&r.join("loose/b.log"), "");
+
+    let walk = |dir: &str| {
+        let base = r.join(dir);
+        let found = Mutex::new(BTreeSet::new());
+        walk_files(&base, &[], |p| {
+            found.lock().insert(p.strip_prefix(&base).unwrap().to_string_lossy().replace('\\', "/"));
+        });
+        found.into_inner().into_iter().collect::<Vec<_>>()
+    };
+    let cases: [(&str, &[&str]); 4] = [
+        // The nested repository's own rules apply; the outer repository's do not.
+        ("outer/projects/nested", &[".gitignore", "search-test.txt", "src/a.rs"]),
+        // A plain folder inside the outer repository is still governed by it, as in Git.
+        ("outer/projects/plain", &[]),
+        ("outer", &["projects/.gitignore", "top.txt"]),
+        // Outside any repository `.gitignore` still applies.
+        ("loose", &[".gitignore", "a.txt"]),
+    ];
+    for (dir, expected) in cases {
+        assert_eq!(walk(dir), expected, "{dir}");
+    }
+}
+
 fn wait_for(events: &Mutex<Vec<FsBatch>>, pred: impl Fn(&[FsBatch]) -> bool) -> bool {
     let deadline = Instant::now() + Duration::from_secs(10);
     while Instant::now() < deadline {
diff --git a/crates/ide-workspace/Cargo.toml b/crates/ide-workspace/Cargo.toml
index bf51d793..5ebf071f 100644
--- a/crates/ide-workspace/Cargo.toml
+++ b/crates/ide-workspace/Cargo.toml
@@ -21,6 +21,7 @@ blake3.workspace = true
 tracing.workspace = true
 tempfile.workspace = true
 globset.workspace = true
+uuid.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true
diff --git a/crates/ide-workspace/src/documents/workspace_edit.rs b/crates/ide-workspace/src/documents/workspace_edit.rs
index 46698708..6e5e67f9 100644
--- a/crates/ide-workspace/src/documents/workspace_edit.rs
+++ b/crates/ide-workspace/src/documents/workspace_edit.rs
@@ -4,7 +4,7 @@ use super::{DocState, Documents, RegEntry, disk_len, keys_for};
 use ide_core::error::ErrorKind;
 use ide_core::{DocId, FileEdit, IdeError, IdeEvent, IdeResult, NullSink, WorkspaceEdit, WorkspaceEditPrecondition};
 use parking_lot::Mutex;
-use std::collections::VecDeque;
+use std::collections::{HashMap, VecDeque};
 use std::fs;
 use std::io::Read;
 use std::path::{Path, PathBuf};
@@ -259,7 +259,9 @@ fn hash_bytes(hash: &mut blake3::Hasher, bytes: &[u8]) {
     hash.update(bytes);
 }
 
-fn hash_disk(hash: &mut blake3::Hasher, path: &Path) -> IdeResult<()> {
+/// Hashes `path` (recursively for a directory). A file in `unsaved` contributes the bytes its
+/// buffer would save, not its disk bytes, so saving a buffer leaves the hash unchanged.
+fn hash_disk(hash: &mut blake3::Hasher, path: &Path, unsaved: &HashMap<PathBuf, Vec<u8>>) -> IdeResult<()> {
     let meta = match fs::symlink_metadata(path) {
         Ok(meta) => meta,
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
@@ -277,6 +279,10 @@ fn hash_disk(hash: &mut blake3::Hasher, path: &Path) -> IdeResult<()> {
     if meta.file_type().is_symlink() {
         hash.update(b"link");
         hash_bytes(hash, fs::read_link(path)?.as_os_str().as_encoded_bytes());
+    } else if let Some(bytes) = unsaved.get(path).filter(|_| meta.is_file()) {
+        hash.update(b"file");
+        hash.update(&(bytes.len() as u64).to_le_bytes());
+        hash.update(bytes);
     } else if meta.is_file() {
         hash.update(b"file");
         hash.update(&meta.len().to_le_bytes());
@@ -295,7 +301,7 @@ fn hash_disk(hash: &mut blake3::Hasher, path: &Path) -> IdeResult<()> {
         entries.sort_by_key(|e| e.file_name());
         for entry in entries {
             hash_bytes(hash, entry.file_name().as_encoded_bytes());
-            hash_disk(hash, &entry.path())?;
+            hash_disk(hash, &entry.path(), unsaved)?;
         }
     } else {
         return Err(IdeError::invalid(format!("{} is not a regular file or directory", path.display())));
@@ -303,14 +309,19 @@ fn hash_disk(hash: &mut blake3::Hasher, path: &Path) -> IdeResult<()> {
     Ok(())
 }
 
-/// A reverted edit may leave the dirty flag set even when all saved bytes match.
-fn differs_from_disk(state: &DocState) -> IdeResult<bool> {
+/// The bytes saving `state` would write.
+fn saved_bytes(state: &DocState) -> IdeResult<Vec<u8>> {
     let text = state.doc.text_for_save();
-    let bytes = if state.native_to_ascii {
+    Ok(if state.native_to_ascii {
         ide_vfs::encode_properties_ascii(&text).into_bytes()
     } else {
         ide_vfs::encode(&text, &state.encoding, state.has_bom)?
-    };
+    })
+}
+
+/// A reverted edit may leave the dirty flag set even when all saved bytes match.
+fn differs_from_disk(state: &DocState) -> IdeResult<bool> {
+    let bytes = saved_bytes(state)?;
     match fs::read(&state.path) {
         Ok(disk) => Ok(disk != bytes),
         Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(true),
@@ -329,35 +340,31 @@ impl Documents {
         Ok(())
     }
 
+    /// What each path holds: disk contents, with unsaved buffers in place of their files. Saving
+    /// a buffer doesn't change it; edits, external writes and file operations do.
     fn fingerprints(&self, paths: &[PathBuf]) -> IdeResult<Vec<WorkspaceEditPrecondition>> {
+        let mut unsaved = HashMap::new();
+        for id in self.open_documents() {
+            self.with_doc(id, |state| {
+                let file = text_path(&state.path)?;
+                if state.dirty && paths.iter().any(|path| file.starts_with(path)) && differs_from_disk(state)? {
+                    unsaved.insert(file, saved_bytes(state)?);
+                }
+                Ok(())
+            })?;
+        }
         paths
             .iter()
             .map(|path| {
                 let mut hash = blake3::Hasher::new();
-                hash_disk(&mut hash, path)?;
-                let mut dirty = Vec::new();
-                for id in self.open_documents() {
-                    self.with_doc(id, |state| {
-                        let file = text_path(&state.path)?;
-                        if state.dirty && file.starts_with(path) && differs_from_disk(state)? {
-                            dirty.push((
-                                file,
-                                state.doc.text(),
-                                state.encoding.clone(),
-                                state.doc.line_ending(),
-                                state.has_bom,
-                            ));
-                        }
-                        Ok(())
-                    })?;
-                }
-                dirty.sort_by(|a, b| a.0.cmp(&b.0));
-                for (file, text, encoding, ending, bom) in dirty {
+                hash_disk(&mut hash, path, &unsaved)?;
+                // Unsaved files not on disk (yet) or outside what the walk above reached.
+                let mut extra: Vec<_> =
+                    unsaved.iter().filter(|(file, _)| file.starts_with(path) && !file.exists()).collect();
+                extra.sort_by(|a, b| a.0.cmp(b.0));
+                for (file, bytes) in extra {
                     hash_bytes(&mut hash, file.as_os_str().as_encoded_bytes());
-                    hash_bytes(&mut hash, text.as_bytes());
-                    hash_bytes(&mut hash, encoding.as_bytes());
-                    hash_bytes(&mut hash, ending.as_str().as_bytes());
-                    hash.update(&[u8::from(bom)]);
+                    hash_bytes(&mut hash, bytes);
                 }
                 Ok(WorkspaceEditPrecondition { path: path.clone().into(), hash: hash.finalize().to_hex().to_string() })
             })
@@ -394,14 +401,22 @@ impl Documents {
         if edit.files.is_empty() {
             return Ok(());
         }
+        // Validate project rules before path resolution can erase linked components.
+        crate::file_ops::validate_workspace_edit_paths(edit)?;
         let mut edit = normalize_edit(edit)?;
+        let captured = !edit.preconditions.is_empty();
+        crate::file_ops::expand_workspace_edit(&mut edit)?;
         self.prepare_workspace_edit(&mut edit)?;
         self.validate_preconditions(&edit.preconditions)?;
         for file in &edit.files {
             if let FileEdit::Edit { path, version: Some(version), .. } = file {
-                let doc = self.by_path(path).ok_or_else(|| stale(path))?;
-                if i64::from(self.version(doc)?) != i64::from(*version) {
-                    return Err(stale(path));
+                match self.by_path(path) {
+                    Some(doc) if i64::from(self.version(doc)?) != i64::from(*version) => return Err(stale(path)),
+                    Some(_) => {}
+                    // Servers version files the editor never opened (gopls renames). The
+                    // preconditions captured with the edit already cover its disk contents.
+                    None if captured => {}
+                    None => return Err(stale(path)),
                 }
             }
         }
diff --git a/crates/ide-workspace/src/file_moves.rs b/crates/ide-workspace/src/file_moves.rs
index ad6444b8..7a1cae91 100644
--- a/crates/ide-workspace/src/file_moves.rs
+++ b/crates/ide-workspace/src/file_moves.rs
@@ -120,6 +120,8 @@ impl FileMoves {
         if moves.is_empty() {
             return Err(IdeError::invalid("nothing to move"));
         }
+        let expanded = crate::file_ops::expand_moves(moves)?;
+        let moves = expanded.as_slice();
         for m in moves {
             if !m.from.exists() {
                 return Err(IdeError::not_found(format!("{} does not exist", m.from.display())));
@@ -145,16 +147,9 @@ impl FileMoves {
             restore(documents, &paths, &before);
             return Err(e);
         }
-        let mut done: Vec<&FileMove> = Vec::new();
-        for m in moves {
-            if let Err(e) = ide_vfs::rename(&m.from, &m.to) {
-                for d in done.iter().rev() {
-                    let _ = ide_vfs::rename(&d.to, &d.from);
-                }
-                restore(documents, &paths, &before);
-                return Err(e);
-            }
-            done.push(m);
+        if let Err(e) = crate::file_ops::move_files(moves) {
+            restore(documents, &paths, &before);
+            return Err(e);
         }
         let mut edited = Vec::with_capacity(paths.len());
         for (p, before) in paths.iter().zip(before) {
@@ -196,27 +191,21 @@ impl FileMoves {
                 .ok_or_else(|| IdeError::not_found("the refactoring can no longer be undone"))?;
             records.remove(i)
         };
-        for m in &record.moves {
-            if !m.to.exists() {
-                return Err(IdeError::not_found(format!("{} no longer exists", m.to.display())));
-            }
-            if m.from.exists() {
-                return Err(IdeError::new(
-                    ide_core::error::ErrorKind::AlreadyExists,
-                    format!("{} exists again", m.from.display()),
-                ));
-            }
+        let back: Vec<_> =
+            record.moves.iter().rev().map(|m| FileMove { from: m.to.clone(), to: m.from.clone() }).collect();
+        if let Err(e) = crate::file_ops::move_files(&back) {
+            self.records.lock().push(record);
+            return Err(e);
         }
-        let mut outcome = UndoOutcome::default();
-        for m in record.moves.iter().rev() {
-            ide_vfs::rename(&m.to, &m.from)?;
-            outcome.moves.push(FileMove { from: m.to.clone(), to: m.from.clone() });
-        }
-        let back: Vec<FileMove> = outcome.moves.clone();
+        let mut outcome = UndoOutcome { moves: back.clone(), conflicts: Vec::new() };
         for f in &record.edited {
             let path = moved_path(&f.path, &back);
             match read_text(documents, &path) {
-                Ok(now) if now == f.after => write_text(documents, &path, &f.before)?,
+                Ok(now) if now == f.after => {
+                    if write_text(documents, &path, &f.before).is_err() {
+                        outcome.conflicts.push(path.into());
+                    }
+                }
                 Ok(now) if now == f.before => {}
                 _ => outcome.conflicts.push(path.into()),
             }
diff --git a/crates/ide-workspace/src/file_ops.rs b/crates/ide-workspace/src/file_ops.rs
new file mode 100644
index 00000000..6f3324d1
--- /dev/null
+++ b/crates/ide-workspace/src/file_ops.rs
@@ -0,0 +1,94 @@
+//! Project-aware file operations. Plain files retain the VFS behavior; project
+//! rules may expand a resource operation before the common transaction runs.
+
+use crate::FileMove;
+use ide_core::{IdeError, IdeResult, WorkspaceEdit};
+use std::path::{Path, PathBuf};
+
+mod project;
+
+pub fn copy(from: &Path, to: &Path) -> IdeResult<()> {
+    project::copy(from, to).unwrap_or_else(|| ide_vfs::copy(from, to))
+}
+
+pub fn delete(path: &Path) -> IdeResult<()> {
+    project::delete(path).unwrap_or_else(|| ide_vfs::delete(path))
+}
+
+/// Files Local History must capture before deletion.
+pub fn deletion_paths(path: &Path) -> IdeResult<Vec<PathBuf>> {
+    project::deletion_paths(path).unwrap_or_else(|| Ok(vec![path.to_path_buf()]))
+}
+
+pub fn rename(from: &Path, to: &Path) -> IdeResult<()> {
+    if !project::has_move_rules(from, to) {
+        return ide_vfs::rename(from, to);
+    }
+    let moves = expand_moves(&[FileMove { from: from.into(), to: to.into() }])?;
+    move_files(&moves)
+}
+
+pub(crate) fn expand_moves(moves: &[FileMove]) -> IdeResult<Vec<FileMove>> {
+    let expanded = project::expand_moves(moves)?;
+    validate_moves(&expanded)?;
+    Ok(expanded)
+}
+
+fn path_key(path: &Path) -> PathBuf {
+    #[cfg(windows)]
+    return path.to_string_lossy().replace('\\', "/").to_lowercase().into();
+    #[cfg(not(windows))]
+    path.to_path_buf()
+}
+
+fn validate_moves(moves: &[FileMove]) -> IdeResult<()> {
+    let mut sources = std::collections::HashSet::new();
+    let mut targets = std::collections::HashSet::new();
+    for m in moves {
+        ide_vfs::validate_rename(&m.from, &m.to)?;
+        let from = path_key(&m.from);
+        let to = path_key(&m.to);
+        if to != from && to.starts_with(&from) {
+            return Err(IdeError::invalid("Cannot move a directory into itself"));
+        }
+        if !sources.insert(from) || !targets.insert(to) {
+            return Err(IdeError::invalid("Duplicate source or destination in file operation"));
+        }
+    }
+    Ok(())
+}
+
+pub(crate) fn move_files(moves: &[FileMove]) -> IdeResult<()> {
+    execute_moves(moves, &|from, to| project::rename_entry(from, to).unwrap_or_else(|| ide_vfs::rename(from, to)))
+}
+
+/// Executes an expanded batch. Rollback never overwrites a newly occupied path;
+/// failures report where the caller can recover the remaining files.
+pub(crate) fn execute_moves(moves: &[FileMove], rename: &dyn Fn(&Path, &Path) -> IdeResult<()>) -> IdeResult<()> {
+    validate_moves(moves)?;
+    for (i, m) in moves.iter().enumerate() {
+        if let Err(mut error) = rename(&m.from, &m.to) {
+            for done in moves[..i].iter().rev() {
+                if let Err(rollback) =
+                    ide_vfs::validate_rename(&done.to, &done.from).and_then(|()| rename(&done.to, &done.from))
+                {
+                    error.message.push_str(&format!(
+                        "; rollback {} -> {} failed: {rollback}",
+                        done.to.display(),
+                        done.from.display()
+                    ));
+                }
+            }
+            return Err(error);
+        }
+    }
+    Ok(())
+}
+
+pub(crate) fn validate_workspace_edit_paths(edit: &WorkspaceEdit) -> IdeResult<()> {
+    project::validate_workspace_edit_paths(edit)
+}
+
+pub(crate) fn expand_workspace_edit(edit: &mut WorkspaceEdit) -> IdeResult<()> {
+    project::expand_workspace_edit(edit)
+}
diff --git a/crates/ide-workspace/src/file_ops/project.rs b/crates/ide-workspace/src/file_ops/project.rs
new file mode 100644
index 00000000..d38b6ccd
--- /dev/null
+++ b/crates/ide-workspace/src/file_ops/project.rs
@@ -0,0 +1,52 @@
+//! The integration boundary for project-specific resource rules. These rules
+//! never replace the plain VFS path unless an operation touches project assets.
+
+use crate::{FileMove, unity::assets};
+use ide_core::{FileEdit, IdeResult, WorkspaceEdit};
+use std::path::{Path, PathBuf};
+
+pub(super) fn has_move_rules(from: &Path, to: &Path) -> bool {
+    assets::project_root(from).is_some() || assets::project_root(to).is_some()
+}
+
+pub(super) fn copy(from: &Path, to: &Path) -> Option<IdeResult<()>> {
+    has_move_rules(from, to).then(|| assets::copy(from, to))
+}
+
+pub(super) fn delete(path: &Path) -> Option<IdeResult<()>> {
+    assets::project_root(path).map(|_| assets::delete(path))
+}
+
+pub(super) fn deletion_paths(path: &Path) -> Option<IdeResult<Vec<PathBuf>>> {
+    assets::project_root(path).map(|_| assets::deletion_paths(path))
+}
+
+pub(super) fn rename_entry(from: &Path, to: &Path) -> Option<IdeResult<()>> {
+    has_move_rules(from, to).then(|| assets::move_one(from, to))
+}
+
+pub(super) fn expand_moves(moves: &[FileMove]) -> IdeResult<Vec<FileMove>> {
+    if moves.iter().any(|m| has_move_rules(&m.from, &m.to)) { assets::expand_moves(moves) } else { Ok(moves.to_vec()) }
+}
+
+fn has_edit_rules(edit: &WorkspaceEdit) -> bool {
+    edit.files.iter().any(|file| match file {
+        FileEdit::Rename { from, to } => has_move_rules(from, to),
+        FileEdit::Delete { path, .. } => assets::project_root(path).is_some(),
+        _ => false,
+    })
+}
+
+pub(super) fn validate_workspace_edit_paths(edit: &WorkspaceEdit) -> IdeResult<()> {
+    if has_edit_rules(edit) {
+        assets::validate_workspace_edit_paths(edit)?;
+    }
+    Ok(())
+}
+
+pub(super) fn expand_workspace_edit(edit: &mut WorkspaceEdit) -> IdeResult<()> {
+    if has_edit_rules(edit) {
+        assets::expand_workspace_edit(edit)?;
+    }
+    Ok(())
+}
diff --git a/crates/ide-workspace/src/lib.rs b/crates/ide-workspace/src/lib.rs
index 38ba30ca..18c29fc1 100644
--- a/crates/ide-workspace/src/lib.rs
+++ b/crates/ide-workspace/src/lib.rs
@@ -7,6 +7,7 @@ pub mod documents;
 pub mod editorconfig;
 pub mod file_defaults;
 pub mod file_moves;
+pub mod file_ops;
 pub mod file_refs;
 pub mod history;
 pub mod memory;
@@ -15,6 +16,7 @@ pub mod recent;
 pub mod roots;
 pub mod settings;
 pub mod text_refs;
+pub mod unity;
 pub mod window_groups;
 pub mod workspace;
 
diff --git a/crates/ide-workspace/src/roots/detect.rs b/crates/ide-workspace/src/roots/detect.rs
index 3212bcff..1e243bc2 100644
--- a/crates/ide-workspace/src/roots/detect.rs
+++ b/crates/ide-workspace/src/roots/detect.rs
@@ -62,7 +62,10 @@ const ROOT_NAMES: &[&str] = &[
 pub fn affects_roots(rel: &Path) -> bool {
     let mut names = rel.iter().rev().filter_map(|c| c.to_str());
     let Some(name) = names.next() else { return false };
-    BUILD_FILES.contains(&name) || ROOT_NAMES.contains(&name) || names.next() == Some("src")
+    BUILD_FILES.contains(&name)
+        || ROOT_NAMES.contains(&name)
+        || matches!(name, "Assets" | "Packages" | "ProjectSettings" | "ProjectVersion.txt")
+        || names.next() == Some("src")
 }
 
 /// Detects roots below `root`; paths in the result are unique and sorted.
@@ -77,6 +80,29 @@ pub fn detect(root: &Path) -> Vec<SourceFolder> {
             break;
         }
         let dir = if rel.is_empty() { root.to_path_buf() } else { root.join(&rel) };
+        if crate::unity::is_project(&dir) {
+            for (name, kind) in
+                [("Assets", RootKind::Source), ("Packages", RootKind::Source), ("ProjectSettings", RootKind::Resources)]
+            {
+                if dir.join(name).is_dir() {
+                    out.push(SourceFolder {
+                        path: join(&rel, name),
+                        kind,
+                        detected_from: Some(join(&rel, crate::unity::VERSION_FILE)),
+                    });
+                }
+            }
+            // Exclude before the index/watchers start, even if Unity creates its caches later.
+            for name in crate::unity::GENERATED_DIRS {
+                out.push(SourceFolder {
+                    path: join(&rel, name),
+                    kind: RootKind::Excluded,
+                    detected_from: Some(join(&rel, crate::unity::VERSION_FILE)),
+                });
+            }
+            // Assets and PackageCache may contain arbitrary build files; they aren't nested modules.
+            continue;
+        }
         let Ok(entries) = std::fs::read_dir(&dir) else { continue };
         let mut files: Vec<String> = Vec::new();
         let mut dirs: Vec<String> = Vec::new();
@@ -244,6 +270,43 @@ mod tests {
         roots.iter().map(|r| format!("{}={:?}@{}", r.path, r.kind, r.detected_from.as_deref().unwrap_or(""))).collect()
     }
 
+    #[test]
+    fn unity_roots_exclude_future_caches_and_do_not_scan_assets_as_modules() {
+        let dir = tree(&[
+            "Assets/Scripts/Player.cs",
+            "Assets/Plugins/Tool/package.json",
+            "ProjectSettings/ProjectVersion.txt",
+            "Packages/manifest.json",
+            "Library/PackageCache/tool/Cargo.toml",
+        ]);
+        let roots = detect(dir.path());
+        assert!(roots.iter().any(|r| r.path == "Assets" && r.kind == RootKind::Source));
+        assert!(roots.iter().any(|r| r.path == "Packages" && r.kind == RootKind::Source));
+        assert!(!roots.iter().any(|r| r.path.starts_with("Assets/") || r.path.starts_with("Library/")));
+        let effective = super::super::ProjectRoots::compute(roots, &Default::default());
+        for name in crate::unity::GENERATED_DIRS {
+            assert!(effective.excluded_globs().contains(&format!("/{name}")));
+        }
+        for path in ["Assets", "Packages", "ProjectSettings", crate::unity::VERSION_FILE] {
+            assert!(affects_roots(Path::new(path)));
+        }
+    }
+
+    #[test]
+    fn nested_unity_roots_are_anchored_without_excluding_other_projects() {
+        let dir = tree(&[
+            "game/Assets/Scripts/Player.cs",
+            "game/ProjectSettings/ProjectVersion.txt",
+            "server/Cargo.toml",
+            "server/src/main.rs",
+            "Library/Source.cs",
+        ]);
+        let roots = super::super::ProjectRoots::compute(detect(dir.path()), &Default::default());
+        assert!(roots.excluded_globs().contains(&"/game/Library".to_owned()));
+        assert!(!roots.excluded_globs().contains(&"/Library".to_owned()));
+        assert!(roots.roots.iter().any(|r| r.path == "server/src" && r.kind == RootKind::Source));
+    }
+
     #[test]
     fn maven_conventional_roots_and_target() {
         let dir = tree(&[
diff --git a/crates/ide-workspace/src/unity.rs b/crates/ide-workspace/src/unity.rs
new file mode 100644
index 00000000..1d348b9d
--- /dev/null
+++ b/crates/ide-workspace/src/unity.rs
@@ -0,0 +1,94 @@
+//! Unity project identity. Generated C# solutions are optional, not root markers.
+
+pub(crate) mod assets;
+
+use serde::{Deserialize, Serialize};
+use specta::Type;
+use std::io::Read;
+use std::path::Path;
+
+pub const VERSION_FILE: &str = "ProjectSettings/ProjectVersion.txt";
+/// Root-relative caches and build outputs, including folders not created yet.
+pub const GENERATED_DIRS: &[&str] = &["Library", "Temp", "Obj", "obj", "Logs", "Build", "Builds", "UserSettings"];
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct UnityProjectInfo {
+    pub editor_version: Option<String>,
+    /// File names relative to the Unity root, in stable order.
+    pub solutions: Vec<String>,
+    pub projects: Vec<String>,
+}
+
+pub fn is_project(root: &Path) -> bool {
+    root.join("Assets").is_dir() && root.join(VERSION_FILE).is_file()
+}
+
+pub fn detect(root: &Path) -> Option<UnityProjectInfo> {
+    if !is_project(root) {
+        return None;
+    }
+    let mut text = String::new();
+    let _ = std::fs::File::open(root.join(VERSION_FILE)).and_then(|f| f.take(64 * 1024).read_to_string(&mut text));
+    let editor_version = text.lines().find_map(|line| {
+        let (key, value) = line.trim_start_matches('\u{feff}').split_once(':')?;
+        let value = value.trim();
+        (key.trim() == "m_EditorVersion" && !value.is_empty() && value.len() <= 128).then(|| value.to_owned())
+    });
+    let mut info = UnityProjectInfo { editor_version, solutions: Vec::new(), projects: Vec::new() };
+    if let Ok(entries) = std::fs::read_dir(root) {
+        for entry in entries.flatten() {
+            if !entry.file_type().is_ok_and(|t| t.is_file()) {
+                continue;
+            }
+            let name = entry.file_name().to_string_lossy().into_owned();
+            match entry.path().extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase).as_deref() {
+                Some("sln" | "slnx") => info.solutions.push(name),
+                Some("csproj") => info.projects.push(name),
+                _ => {}
+            }
+        }
+    }
+    info.solutions.sort();
+    info.projects.sort();
+    Some(info)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn detects_fresh_and_legacy_projects_without_packages_or_solutions() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path();
+        std::fs::create_dir(root.join("Assets")).unwrap();
+        assert!(detect(root).is_none());
+        std::fs::create_dir(root.join("ProjectSettings")).unwrap();
+        std::fs::write(
+            root.join(VERSION_FILE),
+            "\u{feff}m_EditorVersion: 2022.3.62f1\r\nm_EditorVersionWithRevision: ignored\r\n",
+        )
+        .unwrap();
+        let info = detect(root).unwrap();
+        assert_eq!(info.editor_version.as_deref(), Some("2022.3.62f1"));
+        assert!(info.solutions.is_empty() && info.projects.is_empty());
+        std::fs::write(root.join("Game.sln"), "").unwrap();
+        std::fs::write(root.join("Game.slnx"), "").unwrap();
+        std::fs::write(root.join("Assembly-CSharp.csproj"), "").unwrap();
+        std::fs::create_dir(root.join("NotAProject.csproj")).unwrap();
+        let info = detect(root).unwrap();
+        assert_eq!(info.solutions, ["Game.sln", "Game.slnx"]);
+        assert_eq!(info.projects, ["Assembly-CSharp.csproj"]);
+        std::fs::write(root.join(VERSION_FILE), "malformed").unwrap();
+        assert_eq!(detect(root).unwrap().editor_version, None);
+    }
+
+    #[test]
+    fn ordinary_csharp_projects_are_not_unity_projects() {
+        let temp = tempfile::tempdir().unwrap();
+        std::fs::write(temp.path().join("App.csproj"), "").unwrap();
+        std::fs::create_dir(temp.path().join("Assets")).unwrap();
+        assert!(detect(temp.path()).is_none());
+    }
+}
diff --git a/crates/ide-workspace/src/unity/assets.rs b/crates/ide-workspace/src/unity/assets.rs
new file mode 100644
index 00000000..2aa69bdb
--- /dev/null
+++ b/crates/ide-workspace/src/unity/assets.rs
@@ -0,0 +1,254 @@
+//! Filesystem operations for assets under a Unity project's Assets directory.
+//! Metadata moves with the asset; duplication gets new GUIDs before publication.
+
+use crate::{file_moves::FileMove, file_ops::execute_moves};
+use ide_core::{IdeError, IdeResult, error::ErrorKind};
+use std::{
+    collections::HashMap,
+    fs,
+    path::{Component, Path, PathBuf},
+};
+
+mod duplicate;
+mod workspace_edit;
+pub(crate) use workspace_edit::{expand_workspace_edit, validate_workspace_edit_paths};
+#[cfg(test)]
+mod tests;
+
+pub fn meta_path(path: &Path) -> PathBuf {
+    let mut name = path.as_os_str().to_os_string();
+    name.push(".meta");
+    name.into()
+}
+
+/// Includes Assets itself so callers can protect the asset root.
+pub fn project_root(path: &Path) -> Option<PathBuf> {
+    path.ancestors().find_map(|p| {
+        (p.file_name().is_some_and(|n| if cfg!(windows) { n.eq_ignore_ascii_case("Assets") } else { n == "Assets" })
+            && p.parent().is_some_and(super::is_project))
+        .then(|| p.parent().unwrap().to_path_buf())
+    })
+}
+
+fn exists(path: &Path) -> bool {
+    fs::symlink_metadata(path).is_ok()
+}
+
+fn is_meta(path: &Path) -> bool {
+    path.extension().is_some_and(|ext| ext.eq_ignore_ascii_case("meta"))
+}
+
+fn validate_asset(path: &Path) -> IdeResult<()> {
+    if let Some(root) = project_root(path) {
+        if key(path) == key(&root.join("Assets")) {
+            return Err(IdeError::invalid("The Unity Assets root cannot be moved, copied or deleted"));
+        }
+        if is_meta(path) && exists(&path.with_extension("")) {
+            return Err(IdeError::invalid(
+                "Select the Unity asset instead of its .meta file; metadata is handled together",
+            ));
+        }
+    }
+    no_links(path)
+}
+
+fn no_links(path: &Path) -> IdeResult<()> {
+    if path.components().any(|c| matches!(c, Component::ParentDir)) {
+        return Err(IdeError::invalid("Unity asset operations require paths without '..'"));
+    }
+    // Trust the opened project's location, including a linked root or parent
+    // (macOS /var and /tmp). Check inside it, including Library staging paths.
+    // The outermost root prevents a nested Unity project from hiding a link.
+    let root = path.ancestors().filter(|p| super::is_project(p)).last();
+    for p in path.ancestors().take_while(|p| Some(*p) != root) {
+        match fs::symlink_metadata(p) {
+            Ok(m) if is_link(&m) => {
+                return Err(IdeError::invalid(format!("Unity asset operations do not follow links: {}", p.display())));
+            }
+            Ok(_) => {}
+            Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
+            Err(e) => return Err(e.into()),
+        }
+    }
+    Ok(())
+}
+
+fn is_link(metadata: &fs::Metadata) -> bool {
+    #[cfg(windows)]
+    {
+        use std::os::windows::fs::MetadataExt;
+        // Also reject directory junctions and other reparse points.
+        metadata.file_attributes() & 0x400 != 0
+    }
+    #[cfg(not(windows))]
+    {
+        metadata.file_type().is_symlink()
+    }
+}
+
+fn key(path: &Path) -> String {
+    let s = path.to_string_lossy().replace('\\', "/");
+    if cfg!(windows) { s.to_lowercase() } else { s }
+}
+
+fn vacant(from: &Path, to: &Path) -> IdeResult<()> {
+    if exists(to) {
+        if !exists(from) {
+            return Err(IdeError::new(ErrorKind::AlreadyExists, format!("{} already exists", to.display())));
+        }
+        ide_vfs::validate_rename(from, to)?;
+    }
+    Ok(())
+}
+
+/// Expand before applying reference edits, so orphan metadata conflicts cannot
+/// leave a partially refactored asset. Metadata goes first on publication.
+pub fn expand_moves(moves: &[FileMove]) -> IdeResult<Vec<FileMove>> {
+    let mut out = Vec::new();
+    for m in moves {
+        let unity = project_root(&m.from).is_some() || project_root(&m.to).is_some();
+        if unity {
+            // A caller may explicitly select both an asset and its metadata.
+            if is_meta(&m.from)
+                && moves
+                    .iter()
+                    .any(|a| meta_path(&a.from) == m.from.to_path_buf() && meta_path(&a.to) == m.to.to_path_buf())
+            {
+                continue;
+            }
+            validate_asset(&m.from)?;
+            validate_asset(&m.to)?;
+            let from = meta_path(&m.from);
+            let to = meta_path(&m.to);
+            no_links(&from)?;
+            no_links(&to)?;
+            vacant(&from, &to)?;
+            if exists(&from) {
+                out.push(FileMove { from: from.into(), to: to.into() });
+            }
+        }
+        out.push(m.clone());
+    }
+    Ok(out)
+}
+
+pub(crate) fn move_one(from: &Path, to: &Path) -> IdeResult<()> {
+    if project_root(from).is_some() || project_root(to).is_some() {
+        no_links(from)?;
+        no_links(to)?;
+        if let Some(parent) = to.parent() {
+            fs::create_dir_all(parent)?;
+        }
+        // A failed cross-volume copy/delete cannot be rolled back reliably.
+        // Keep paired Unity moves atomic per entry and let rename report it.
+        fs::rename(from, to)?;
+        Ok(())
+    } else {
+        ide_vfs::rename(from, to)
+    }
+}
+
+/// The paths Local History must snapshot before an asset deletion.
+pub fn deletion_paths(path: &Path) -> IdeResult<Vec<PathBuf>> {
+    validate_asset(path)?;
+    let meta = meta_path(path);
+    no_links(&meta)?;
+    let mut paths = vec![path.to_path_buf()];
+    if exists(&meta) {
+        paths.push(meta);
+    }
+    Ok(paths)
+}
+
+fn staging(root: &Path) -> IdeResult<PathBuf> {
+    let parent = root.join("Library/OpenIDEA/AssetOperations");
+    no_links(&parent)?;
+    fs::create_dir_all(&parent)?;
+    let dir = parent.join(uuid::Uuid::new_v4().simple().to_string());
+    fs::create_dir(&dir)?;
+    Ok(dir)
+}
+
+pub fn delete(path: &Path) -> IdeResult<()> {
+    delete_with(path, &ide_vfs::delete)
+}
+
+fn delete_with(path: &Path, remove: &dyn Fn(&Path) -> IdeResult<()>) -> IdeResult<()> {
+    let paths = deletion_paths(path)?;
+    let root = project_root(path).ok_or_else(|| IdeError::invalid("Expected a Unity asset path"))?;
+    let stage = staging(&root)?;
+    let payload = stage.join("files");
+    fs::create_dir(&payload)?;
+    let moves: Vec<_> = paths
+        .iter()
+        .map(|p| FileMove { from: p.clone().into(), to: payload.join(p.file_name().unwrap()).into() })
+        .collect();
+    // Recycle-bin restore returns the group to staging. Keep its destinations
+    // with it so originals can also be recovered without the IDE's history.
+    let manifest = stage.join("restore-paths.json");
+    fs::write(&manifest, serde_json::to_vec_pretty(&paths).map_err(|e| IdeError::internal(e.to_string()))?)?;
+    // Never automatically delete this staging directory on failure: it may
+    // contain originals when rollback fails.
+    if let Err(e) = execute_moves(&moves, &move_one) {
+        if fs::remove_dir(&payload).is_ok() {
+            let _ = fs::remove_file(&manifest);
+            let _ = fs::remove_dir(&stage);
+        }
+        return Err(e);
+    }
+    if let Err(mut e) = remove(&stage) {
+        let back: Vec<_> = moves.iter().rev().map(|m| FileMove { from: m.to.clone(), to: m.from.clone() }).collect();
+        if let Err(rollback) = execute_moves(&back, &move_one) {
+            e.message.push_str(&format!("; recovery files at {}: {rollback}", stage.display()));
+        }
+        if fs::remove_dir(&payload).is_ok() {
+            let _ = fs::remove_file(&manifest);
+            let _ = fs::remove_dir(&stage);
+        }
+        return Err(e);
+    }
+    Ok(())
+}
+
+pub fn copy(from: &Path, to: &Path) -> IdeResult<()> {
+    let root = project_root(to)
+        .or_else(|| project_root(from))
+        .ok_or_else(|| IdeError::invalid("Expected a Unity asset path"))?;
+    validate_asset(from)?;
+    validate_asset(to)?;
+    if key(from) == key(to) || key(to).starts_with(&(key(from) + "/")) {
+        return Err(IdeError::invalid("Cannot copy an asset onto or into itself"));
+    }
+    if exists(to) {
+        return Err(IdeError::new(ErrorKind::AlreadyExists, format!("{} already exists", to.display())));
+    }
+    let src_meta = meta_path(from);
+    let dst_meta = meta_path(to);
+    no_links(&src_meta)?;
+    no_links(&dst_meta)?;
+    // Copies never overwrite metadata, including orphan destination metadata.
+    if exists(&dst_meta) {
+        return Err(IdeError::new(ErrorKind::AlreadyExists, format!("{} already exists", dst_meta.display())));
+    }
+    let stage = staging(&root)?;
+    let result = (|| {
+        let asset = stage.join(from.file_name().ok_or_else(|| IdeError::invalid("Missing asset name"))?);
+        duplicate::copy_tree(from, &asset)?;
+        let meta = meta_path(&asset);
+        if exists(&src_meta) {
+            duplicate::copy_tree(&src_meta, &meta)?;
+        }
+        if project_root(to).is_some() {
+            duplicate::regenerate(&stage)?;
+        }
+        let mut moves = Vec::new();
+        if exists(&meta) {
+            moves.push(FileMove { from: meta.into(), to: dst_meta.into() });
+        }
+        moves.push(FileMove { from: asset.into(), to: to.into() });
+        execute_moves(&moves, &move_one)
+    })();
+    // Only disposable copies live here, never the source assets.
+    let _ = fs::remove_dir_all(&stage);
+    result
+}
diff --git a/crates/ide-workspace/src/unity/assets/duplicate.rs b/crates/ide-workspace/src/unity/assets/duplicate.rs
new file mode 100644
index 00000000..f35642ae
--- /dev/null
+++ b/crates/ide-workspace/src/unity/assets/duplicate.rs
@@ -0,0 +1,236 @@
+use super::*;
+use std::io::Read;
+
+const TEXT_LIMIT: u64 = 32 * 1024 * 1024;
+
+pub(super) fn copy_tree(from: &Path, to: &Path) -> IdeResult<()> {
+    no_links(from)?;
+    let metadata = fs::symlink_metadata(from)?;
+    if metadata.is_dir() {
+        fs::create_dir(to)?;
+        for entry in fs::read_dir(from)? {
+            let entry = entry?;
+            copy_tree(&entry.path(), &to.join(entry.file_name()))?;
+        }
+    } else if metadata.is_file() {
+        fs::copy(from, to)?;
+    } else {
+        return Err(IdeError::invalid(format!("Not a regular Unity asset: {}", from.display())));
+    }
+    Ok(())
+}
+
+fn files(dir: &Path, out: &mut Vec<PathBuf>) -> IdeResult<()> {
+    for entry in fs::read_dir(dir)? {
+        let entry = entry?;
+        if entry.file_type()?.is_dir() {
+            files(&entry.path(), out)?;
+        } else {
+            out.push(entry.path());
+        }
+    }
+    Ok(())
+}
+
+fn read_text(path: &Path) -> IdeResult<String> {
+    let mut bytes = Vec::new();
+    fs::File::open(path)?.take(TEXT_LIMIT + 1).read_to_end(&mut bytes)?;
+    if bytes.len() as u64 > TEXT_LIMIT {
+        return Err(IdeError::invalid(format!(
+            "Unity serialized asset exceeds the 32 MiB copy limit: {}",
+            path.display()
+        )));
+    }
+    String::from_utf8(bytes)
+        .map_err(|_| IdeError::invalid(format!("Cannot rewrite binary Unity metadata: {}", path.display())))
+}
+
+fn guid(value: &str) -> bool {
+    value.len() == 32 && value.bytes().all(|b| b.is_ascii_hexdigit()) && value.bytes().any(|b| b != b'0')
+}
+
+pub(super) fn regenerate(stage: &Path) -> IdeResult<()> {
+    let mut paths = Vec::new();
+    files(stage, &mut paths)?;
+    let mut ids = HashMap::new();
+    for path in paths.iter().filter(|p| is_meta(p)) {
+        let text = read_text(path)?;
+        let values: Vec<_> = text
+            .trim_start_matches('\u{feff}')
+            .lines()
+            .filter_map(|l| l.strip_prefix("guid:").map(str::trim))
+            .collect();
+        if values.len() != 1 || !guid(values[0]) {
+            return Err(IdeError::invalid(format!("Missing or invalid GUID in {}", path.display())));
+        }
+        if ids.insert(values[0].to_ascii_lowercase(), uuid::Uuid::new_v4().simple().to_string()).is_some() {
+            return Err(IdeError::invalid("Duplicate source GUIDs; resolve them in Unity before copying"));
+        }
+    }
+    for path in paths {
+        let ext = path.extension().unwrap_or_default().to_string_lossy().to_ascii_lowercase();
+        if ext == "asmdef" || ext == "asmref" {
+            let text = read_text(&path)?;
+            let mut json: serde_json::Value =
+                serde_json::from_str(&text).map_err(|e| IdeError::invalid(e.to_string()))?;
+            if rewrite_json(&mut json, &ids) {
+                fs::write(&path, serde_json::to_string_pretty(&json).map_err(|e| IdeError::internal(e.to_string()))?)?;
+            }
+            continue;
+        }
+        let mut header = [0; 32];
+        let n = fs::File::open(&path)?.read(&mut header)?;
+        let header = String::from_utf8_lossy(&header[..n]);
+        let header = header.trim_start_matches('\u{feff}');
+        let yaml = header.starts_with("%YAML") || header.starts_with("--- !u!");
+        if !yaml && !is_meta(&path) {
+            // These formats may be binary under Mixed/Force Binary. We cannot
+            // safely preserve internal references without Unity deserialization.
+            if matches!(
+                ext.as_str(),
+                "asset"
+                    | "prefab"
+                    | "unity"
+                    | "mat"
+                    | "anim"
+                    | "controller"
+                    | "overridecontroller"
+                    | "playable"
+                    | "mask"
+                    | "rendertexture"
+                    | "physicmaterial"
+                    | "physicsmaterial2d"
+                    | "lighting"
+                    | "terrainlayer"
+                    | "guiskin"
+                    | "flare"
+                    | "cubemap"
+                    | "spriteatlas"
+                    | "spriteatlasv2"
+                    | "preset"
+                    | "shadervariants"
+                    | "giparams"
+                    | "lightingdata"
+                    | "fontsettings"
+                    | "texture2d"
+                    | "mesh"
+            ) {
+                return Err(IdeError::invalid(format!(
+                    "Cannot copy binary Unity serialized asset {}; use Force Text serialization in Unity",
+                    path.display()
+                )));
+            }
+            continue;
+        }
+        let before = read_text(&path)?;
+        let after = rewrite_yaml(&before, &ids);
+        if before != after {
+            fs::write(&path, after)?;
+        }
+    }
+    Ok(())
+}
+
+fn rewrite_json(value: &mut serde_json::Value, ids: &HashMap<String, String>) -> bool {
+    match value {
+        serde_json::Value::String(s) => {
+            if let Some(id) = s.strip_prefix("GUID:").and_then(|id| ids.get(&id.to_ascii_lowercase())) {
+                *s = format!("GUID:{id}");
+                true
+            } else {
+                false
+            }
+        }
+        serde_json::Value::Array(a) => {
+            let mut changed = false;
+            for v in a {
+                changed |= rewrite_json(v, ids);
+            }
+            changed
+        }
+        serde_json::Value::Object(o) => {
+            let mut changed = false;
+            for v in o.values_mut() {
+                changed |= rewrite_json(v, ids);
+            }
+            changed
+        }
+        _ => false,
+    }
+}
+
+/// Patch GUID scalar tokens without reserializing Unity's YAML dialect. Quoted
+/// strings, comments and indented block scalars are not asset references.
+fn rewrite_yaml(text: &str, ids: &HashMap<String, String>) -> String {
+    let mut bytes = text.as_bytes().to_vec();
+    let mut offset = 0;
+    let mut block_indent = None;
+    let mut quote = None;
+    for line in text.split_inclusive('\n') {
+        let raw = line.as_bytes();
+        let indent = raw.iter().take_while(|b| **b == b' ').count();
+        if block_indent.is_some_and(|n| indent > n || line.trim().is_empty()) {
+            offset += raw.len();
+            continue;
+        }
+        block_indent = None;
+        let mut i = 0;
+        while i < raw.len() {
+            let b = raw[i];
+            if let Some(q) = quote {
+                if q == b'"' && b == b'\\' {
+                    i += 2;
+                    continue;
+                }
+                if b == q {
+                    if q == b'\'' && raw.get(i + 1) == Some(&q) {
+                        i += 2;
+                        continue;
+                    }
+                    quote = None;
+                }
+                i += 1;
+                continue;
+            }
+            if b == b'#' && (i == 0 || raw[i - 1].is_ascii_whitespace()) {
+                break;
+            }
+            if b == b'"' || b == b'\'' {
+                let prefix = line[..i].trim();
+                // Apostrophes inside plain scalars (e.g. Hero's Sword) do not
+                // open a quoted scalar or suppress references on later lines.
+                if prefix.is_empty() || prefix.ends_with([':', '-', '[', '{', ',']) {
+                    quote = Some(b);
+                    i += 1;
+                    continue;
+                }
+            }
+            if (b == b'|' || b == b'>') && line[..i].trim_end().ends_with([':', '-']) {
+                block_indent = Some(indent);
+                break;
+            }
+            if raw[i..].starts_with(b"guid:") {
+                let prefix = line[..i].trim_start_matches('\u{feff}').trim_end();
+                if prefix.is_empty() || prefix.ends_with(['{', ',']) {
+                    let start = i + 5 + raw[i + 5..].iter().take_while(|b| **b == b' ' || **b == b'\t').count();
+                    let end = start + 32;
+                    if end <= raw.len()
+                        && raw[start..end].iter().all(u8::is_ascii_hexdigit)
+                        && (end == raw.len()
+                            || raw[end].is_ascii_whitespace()
+                            || matches!(raw[end], b',' | b'}' | b'#'))
+                        && let Some(new) = ids.get(&line[start..end].to_ascii_lowercase())
+                    {
+                        bytes[offset + start..offset + end].copy_from_slice(new.as_bytes());
+                        i = end;
+                        continue;
+                    }
+                }
+            }
+            // Non-ASCII bytes cannot begin any token handled above.
+            i += 1;
+        }
+        offset += raw.len();
+    }
+    String::from_utf8(bytes).expect("GUID substitutions preserve UTF-8")
+}
diff --git a/crates/ide-workspace/src/unity/assets/tests.rs b/crates/ide-workspace/src/unity/assets/tests.rs
new file mode 100644
index 00000000..3dd670e1
--- /dev/null
+++ b/crates/ide-workspace/src/unity/assets/tests.rs
@@ -0,0 +1,217 @@
+use super::*;
+use crate::file_ops::{move_files, rename};
+use crate::{documents::Documents, file_moves::FileMoves};
+use ide_core::{LanguageId, WorkspaceEdit};
+use std::sync::Arc;
+
+mod links;
+
+const A: &str = "11111111111111111111111111111111";
+const B: &str = "22222222222222222222222222222222";
+const C: &str = "33333333333333333333333333333333";
+
+fn project() -> tempfile::TempDir {
+    let tmp = tempfile::tempdir().unwrap();
+    fs::create_dir(tmp.path().join("Assets")).unwrap();
+    fs::create_dir(tmp.path().join("ProjectSettings")).unwrap();
+    fs::write(tmp.path().join(super::super::VERSION_FILE), "m_EditorVersion: 6000.0.1f1").unwrap();
+    tmp
+}
+
+fn asset(root: &Path, name: &str, content: &str, id: &str) -> PathBuf {
+    let path = root.join("Assets").join(name);
+    fs::create_dir_all(path.parent().unwrap()).unwrap();
+    fs::write(&path, content).unwrap();
+    fs::write(meta_path(&path), format!("fileFormatVersion: 2\r\nguid: {id}\r\nImporter:\r\n  setting: keep\r\n"))
+        .unwrap();
+    path
+}
+
+fn id(path: &Path) -> String {
+    fs::read_to_string(meta_path(path))
+        .unwrap()
+        .lines()
+        .find_map(|l| l.strip_prefix("guid: ").map(str::to_owned))
+        .unwrap()
+}
+
+#[test]
+fn rename_preserves_metadata_and_undo_retries_after_conflict() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Player.cs", "class Player {}", A);
+    let dst = src.with_file_name("Hero.cs");
+    let docs = Documents::new(Arc::new(|_| {}), Box::new(|_: &Path, _: Option<&str>| LanguageId::new("plaintext")));
+    let stack = FileMoves::new();
+    let moves = [FileMove { from: src.clone().into(), to: dst.clone().into() }];
+    let token = stack.perform(&docs, None, &moves, &WorkspaceEdit::default(), "Rename", &|_| Ok(())).unwrap();
+    assert_eq!(id(&dst), A);
+    assert!(!meta_path(&src).exists());
+    fs::write(meta_path(&src), "conflict").unwrap();
+    assert!(stack.undo(&docs, token).is_err());
+    assert!(stack.can_undo(token));
+    assert!(dst.exists());
+    fs::remove_file(meta_path(&src)).unwrap();
+    let undone = stack.undo(&docs, token).unwrap();
+    assert_eq!(undone.moves.len(), 2);
+    assert_eq!(id(&src), A);
+    assert!(!dst.exists());
+}
+
+#[test]
+fn orphan_metadata_conflicts_and_standalone_metadata_are_protected() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Player.cs", "code", A);
+    let dst = src.with_file_name("Hero.cs");
+    fs::write(meta_path(&dst), "orphan").unwrap();
+    assert!(rename(&src, &dst).is_err());
+    assert!(copy(&src, &dst).is_err());
+    assert!(src.exists() && !dst.exists());
+    assert_eq!(id(&src), A);
+    assert!(rename(&meta_path(&src), &src.with_file_name("Other.meta")).is_err());
+    assert!(delete_with(&meta_path(&src), &|_| panic!("must reject before deletion")).is_err());
+    assert!(rename(&tmp.path().join("Assets"), &tmp.path().join("Renamed")).is_err());
+}
+
+#[test]
+fn folder_copy_regenerates_guids_and_only_internal_references() {
+    let tmp = project();
+    let root = tmp.path();
+    let text = format!(
+        "%YAML 1.1\n--- !u!1 &1\nObject:\n  internal: {{fileID: 1, guid: {B}, type: 3}}\n  external: {{fileID: 2, guid: {C}, type: 3}}\n  quoted: \"guid: {B}\"\n  block: |\n    guid: {B}\n"
+    );
+    let src = asset(root, "Group/Scene.prefab", &text, A);
+    asset(root, "Group/Script.cs", "// untouched", B);
+    fs::write(root.join("Assets/Group.meta"), format!("guid: {C}\nfolderAsset: yes\n")).unwrap();
+    // An actual external id not copied into Group.
+    let external = "44444444444444444444444444444444";
+    fs::write(
+        &src,
+        text.replace(&format!("external: {{fileID: 2, guid: {C}"), &format!("external: {{fileID: 2, guid: {external}")),
+    )
+    .unwrap();
+    fs::write(root.join("Assets/Group/Assembly.asmdef"), format!(r#"{{"references":["GUID:{B}","GUID:{external}"]}}"#))
+        .unwrap();
+    let to = root.join("Assets/Group Copy");
+    copy(&root.join("Assets/Group"), &to).unwrap();
+    let script = id(&to.join("Script.cs"));
+    assert_ne!(script, B);
+    assert_ne!(id(&to.join("Scene.prefab")), A);
+    assert_ne!(id(&to), C);
+    assert_eq!(id(&src), A);
+    let copied = fs::read_to_string(to.join("Scene.prefab")).unwrap();
+    assert!(copied.contains(&format!("internal: {{fileID: 1, guid: {script}")));
+    assert!(copied.contains(&format!("external: {{fileID: 2, guid: {external}")));
+    assert!(copied.contains(&format!("quoted: \"guid: {B}\"")));
+    assert!(copied.contains(&format!("block: |\n    guid: {B}")));
+    assert!(fs::read_to_string(meta_path(&to.join("Script.cs"))).unwrap().contains("setting: keep\r\n"));
+    let assembly = fs::read_to_string(to.join("Assembly.asmdef")).unwrap();
+    assert!(assembly.contains(&format!("GUID:{script}")) && assembly.contains(external));
+}
+
+#[test]
+fn invalid_or_binary_copy_never_publishes_partial_assets() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Group/Data.asset", "binary data", A);
+    let from = src.parent().unwrap();
+    let to = from.with_file_name("Copy");
+    assert!(copy(from, &to).is_err());
+    assert!(!to.exists() && !meta_path(&to).exists());
+    assert_eq!(id(&src), A);
+    fs::write(&src, "%YAML 1.1\n--- !u!1 &1\n").unwrap();
+    fs::write(meta_path(&src), "guid: invalid\n").unwrap();
+    assert!(copy(from, &to).is_err());
+    assert!(!to.exists());
+}
+
+#[test]
+fn deletion_groups_sidecar_and_restores_both_on_trash_failure() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Player.cs", "code", A);
+    assert_eq!(deletion_paths(&src).unwrap(), vec![src.clone(), meta_path(&src)]);
+    let error = delete_with(&src, &|stage| {
+        assert!(stage.join("files/Player.cs").exists());
+        assert!(stage.join("files/Player.cs.meta").exists());
+        let destinations: Vec<PathBuf> =
+            serde_json::from_slice(&fs::read(stage.join("restore-paths.json")).unwrap()).unwrap();
+        assert_eq!(destinations, vec![src.clone(), meta_path(&src)]);
+        Err(IdeError::internal("trash unavailable"))
+    })
+    .unwrap_err();
+    assert!(error.message.contains("trash unavailable"));
+    assert!(src.exists());
+    assert_eq!(id(&src), A);
+    delete_with(&src, &ide_vfs::delete_permanently).unwrap();
+    assert!(!src.exists() && !meta_path(&src).exists());
+}
+
+#[test]
+fn selecting_both_asset_and_sidecar_does_not_move_twice() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Player.cs", "code", A);
+    let dst = src.with_file_name("Hero.cs");
+    let expanded = expand_moves(&[
+        FileMove { from: src.clone().into(), to: dst.clone().into() },
+        FileMove { from: meta_path(&src).into(), to: meta_path(&dst).into() },
+    ])
+    .unwrap();
+    assert_eq!(expanded.len(), 2);
+    move_files(&expanded).unwrap();
+    assert_eq!(id(&dst), A);
+}
+
+#[test]
+fn non_unity_operations_do_not_touch_adjacent_metadata() {
+    let tmp = tempfile::tempdir().unwrap();
+    let src = tmp.path().join("file.txt");
+    let dst = tmp.path().join("copy.txt");
+    fs::write(&src, "text").unwrap();
+    fs::write(meta_path(&src), "unrelated").unwrap();
+    crate::file_ops::copy(&src, &dst).unwrap();
+    assert!(!meta_path(&dst).exists());
+    rename(&src, &tmp.path().join("moved.txt")).unwrap();
+    assert!(meta_path(&src).exists());
+}
+
+#[test]
+fn failed_second_move_rolls_back_metadata() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Player.cs", "code", A);
+    let meta_dst = src.with_file_name("Moved.cs.meta");
+    let blocker = tmp.path().join("Assets/blocked");
+    fs::write(&blocker, "not a directory").unwrap();
+    let moves = [
+        FileMove { from: meta_path(&src).into(), to: meta_dst.clone().into() },
+        FileMove { from: src.clone().into(), to: blocker.join("Moved.cs").into() },
+    ];
+    assert!(move_files(&moves).is_err());
+    assert_eq!(id(&src), A);
+    assert!(src.exists() && !meta_dst.exists());
+}
+
+#[test]
+fn yaml_scalar_text_does_not_change_reference_detection() {
+    let tmp = project();
+    let text = format!(
+        "%YAML 1.1\n--- !u!1 &1\nObject:\n  name: Hero's Sword\n  self: {{fileID: 1, guid: {A}, type: 3}}\n  text: \"escaped \\\" guid: {A}\"\n  multiline: 'value\n    guid: {A}'\n  selfAgain: {{fileID: 1, guid: {A}, type: 3}}\n"
+    );
+    let src = asset(tmp.path(), "Player.prefab", &text, A);
+    let dst = src.with_file_name("Copied.prefab");
+    copy(&src, &dst).unwrap();
+    let new_id = id(&dst);
+    let copied = fs::read_to_string(&dst).unwrap();
+    assert!(copied.contains(&format!("self: {{fileID: 1, guid: {new_id}")));
+    assert!(copied.contains(&format!("selfAgain: {{fileID: 1, guid: {new_id}")));
+    assert!(copied.contains(&format!("multiline: 'value\n    guid: {A}'")));
+    assert!(copied.contains(&format!("text: \"escaped \\\" guid: {A}\"")));
+}
+
+#[cfg(windows)]
+#[test]
+fn case_only_rename_keeps_metadata() {
+    let tmp = project();
+    let src = asset(tmp.path(), "Player.cs", "code", A);
+    let dst = src.with_file_name("player.cs");
+    rename(&src, &dst).unwrap();
+    assert_eq!(id(&dst), A);
+    assert!(fs::read_dir(dst.parent().unwrap()).unwrap().any(|e| e.unwrap().file_name() == "player.cs.meta"));
+}
diff --git a/crates/ide-workspace/src/unity/assets/tests/links.rs b/crates/ide-workspace/src/unity/assets/tests/links.rs
new file mode 100644
index 00000000..cabbb176
--- /dev/null
+++ b/crates/ide-workspace/src/unity/assets/tests/links.rs
@@ -0,0 +1,233 @@
+use super::*;
+use ide_core::FileEdit;
+
+fn dir_link(target: &Path, link: &Path) {
+    #[cfg(unix)]
+    std::os::unix::fs::symlink(target, link).unwrap();
+    #[cfg(windows)]
+    {
+        use std::os::windows::process::CommandExt;
+        let output = std::process::Command::new("cmd")
+            .args(["/c", "mklink", "/J"])
+            .arg(link.to_string_lossy().replace('/', "\\"))
+            .arg(target.to_string_lossy().replace('/', "\\"))
+            .creation_flags(0x08000000)
+            .output()
+            .unwrap();
+        assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
+    }
+}
+
+#[test]
+fn linked_parent_and_project_root_support_asset_operations_and_undo() {
+    for parent_alias in [false, true] {
+        let tmp = project();
+        let aliases = tempfile::tempdir().unwrap();
+        let link = aliases.path().join("alias");
+        let root = if parent_alias {
+            dir_link(tmp.path().parent().unwrap(), &link);
+            link.join(tmp.path().file_name().unwrap())
+        } else {
+            dir_link(tmp.path(), &link);
+            link.clone()
+        };
+        let from = asset(&root, "Player.cs", "class Player {}", A);
+        let to = root.join("Assets/New/Nested/Hero.cs");
+        let docs = Documents::new(Arc::new(|_| {}), Box::new(|_: &Path, _: Option<&str>| LanguageId::new("plaintext")));
+        let moves = FileMoves::new();
+        let token = moves
+            .perform(
+                &docs,
+                None,
+                &[FileMove { from: from.clone().into(), to: to.clone().into() }],
+                &WorkspaceEdit::default(),
+                "Move",
+                &|_| Ok(()),
+            )
+            .unwrap();
+        assert_eq!(id(&to), A);
+        moves.undo(&docs, token).unwrap();
+        assert_eq!(id(&from), A);
+        copy(&from, &to).unwrap();
+        assert_ne!(id(&to), A);
+        assert_eq!(id(&from), A);
+        delete_with(&to, &ide_vfs::delete_permanently).unwrap();
+        assert!(!to.exists() && !meta_path(&to).exists());
+        let intermediate = root.join("Assets/Intermediate.cs");
+        docs.apply_workspace_edit(&WorkspaceEdit {
+            files: vec![
+                FileEdit::Rename { from: from.clone().into(), to: intermediate.clone().into() },
+                FileEdit::Rename { from: intermediate.into(), to: to.clone().into() },
+            ],
+            ..Default::default()
+        })
+        .unwrap();
+        assert_eq!(id(&to), A);
+        assert!(!from.exists() && !meta_path(&from).exists());
+    }
+}
+
+#[test]
+fn internal_directory_links_reject_asset_operations_before_mutation() {
+    for relative in ["Assets/Linked", "Library", "Library/OpenIDEA", "Library/OpenIDEA/AssetOperations"] {
+        let tmp = project();
+        let outside = tempfile::tempdir().unwrap();
+        fs::write(outside.path().join("sentinel"), "keep").unwrap();
+        let from = asset(tmp.path(), "Player.cs", "code", A);
+        let link = tmp.path().join(relative);
+        fs::create_dir_all(link.parent().unwrap()).unwrap();
+        dir_link(outside.path(), &link);
+        let to = if relative.starts_with("Assets") { link.join("Copy.cs") } else { from.with_file_name("Copy.cs") };
+        assert!(copy(&from, &to).unwrap_err().message.contains("do not follow links"));
+        if relative.starts_with("Assets") {
+            assert!(rename(&from, &to).is_err());
+            let docs =
+                Documents::new(Arc::new(|_| {}), Box::new(|_: &Path, _: Option<&str>| LanguageId::new("plaintext")));
+            assert!(
+                docs.apply_workspace_edit(&WorkspaceEdit {
+                    files: vec![FileEdit::Rename { from: from.clone().into(), to: to.clone().into() },],
+                    ..Default::default()
+                })
+                .is_err()
+            );
+            let sentinel = link.join("sentinel");
+            assert!(
+                docs.apply_workspace_edit(&WorkspaceEdit {
+                    files: vec![FileEdit::Delete { path: sentinel.into(), recursive: false },],
+                    ..Default::default()
+                })
+                .is_err()
+            );
+        } else {
+            assert!(delete_with(&from, &|_| panic!("must reject before removal")).is_err());
+        }
+        assert_eq!(id(&from), A);
+        assert!(from.exists() && !to.exists() && !meta_path(&to).exists());
+        assert_eq!(fs::read_to_string(outside.path().join("sentinel")).unwrap(), "keep");
+        assert_eq!(fs::read_dir(outside.path()).unwrap().count(), 1);
+    }
+}
+
+#[test]
+fn linked_assets_root_and_recursive_copy_links_are_rejected() {
+    let tmp = project();
+    let outside = tempfile::tempdir().unwrap();
+    fs::remove_dir(tmp.path().join("Assets")).unwrap();
+    dir_link(outside.path(), &tmp.path().join("Assets"));
+    let from = asset(tmp.path(), "Player.cs", "code", A);
+    assert!(rename(&from, &from.with_file_name("Hero.cs")).is_err());
+    assert!(deletion_paths(&from).is_err());
+    assert_eq!(id(&from), A);
+
+    let tmp = project();
+    let from = asset(tmp.path(), "Group/Player.cs", "code", A);
+    dir_link(outside.path(), &tmp.path().join("Assets/Group/Linked"));
+    let to = tmp.path().join("Assets/Copy");
+    assert!(copy(from.parent().unwrap(), &to).is_err());
+    assert!(!to.exists() && !meta_path(&to).exists());
+    assert_eq!(id(&from), A);
+}
+
+#[cfg(unix)]
+#[test]
+fn linked_asset_and_sidecar_leaves_are_rejected() {
+    for sidecar in [false, true] {
+        let tmp = project();
+        let outside = tempfile::NamedTempFile::new().unwrap();
+        let from = asset(tmp.path(), "Player.cs", "code", A);
+        let path = if sidecar { meta_path(&from) } else { from.clone() };
+        fs::remove_file(&path).unwrap();
+        std::os::unix::fs::symlink(outside.path(), &path).unwrap();
+        assert!(rename(&from, &from.with_file_name("Hero.cs")).is_err());
+        assert!(copy(&from, &from.with_file_name("Copy.cs")).is_err());
+        assert!(deletion_paths(&from).is_err());
+        assert!(fs::symlink_metadata(&path).unwrap().file_type().is_symlink());
+    }
+}
+
+#[test]
+fn cross_project_operations_validate_each_root_and_keep_metadata() {
+    let source = project();
+    let destination = project();
+    let aliases = tempfile::tempdir().unwrap();
+    let a = aliases.path().join("source");
+    let b = aliases.path().join("destination");
+    dir_link(source.path(), &a);
+    dir_link(destination.path(), &b);
+    let from = asset(&a, "Player.cs", "code", A);
+    let copied = b.join("Assets/Copied.cs");
+    copy(&from, &copied).unwrap();
+    assert_ne!(id(&copied), A);
+    assert_eq!(id(&from), A);
+    let moved = b.join("Assets/Moved.cs");
+    rename(&from, &moved).unwrap();
+    assert_eq!(id(&moved), A);
+    assert!(!from.exists() && !meta_path(&from).exists());
+}
+
+#[test]
+fn external_links_do_not_become_trusted_by_importing_into_unity() {
+    let tmp = project();
+    let external = tempfile::tempdir().unwrap();
+    let aliases = tempfile::tempdir().unwrap();
+    fs::write(external.path().join("File.cs"), "code").unwrap();
+    let link = aliases.path().join("external");
+    dir_link(external.path(), &link);
+    let from = link.join("File.cs");
+    let to = tmp.path().join("Assets/Imported.cs");
+    assert!(copy(&from, &to).is_err());
+    assert!(rename(&from, &to).is_err());
+    assert!(from.exists() && !to.exists());
+}
+
+#[test]
+fn folder_rename_cannot_hide_linked_children_in_later_transaction_operations() {
+    let tmp = project();
+    let outside = tempfile::tempdir().unwrap();
+    fs::write(outside.path().join("sentinel"), "keep").unwrap();
+    let from = tmp.path().join("Assets/Group");
+    fs::create_dir(&from).unwrap();
+    dir_link(outside.path(), &from.join("Linked"));
+    let to = tmp.path().join("Assets/Moved");
+    let docs = Documents::new(Arc::new(|_| {}), Box::new(|_: &Path, _: Option<&str>| LanguageId::new("plaintext")));
+    let error = docs
+        .apply_workspace_edit(&WorkspaceEdit {
+            files: vec![
+                FileEdit::Rename { from: from.clone().into(), to: to.clone().into() },
+                FileEdit::Delete {
+                    path: (if cfg!(windows) { tmp.path().join("Assets/moved") } else { to.clone() })
+                        .join("Linked/sentinel")
+                        .into(),
+                    recursive: false,
+                },
+            ],
+            ..Default::default()
+        })
+        .unwrap_err();
+    assert!(error.message.contains("do not follow links"));
+    assert!(from.exists() && !to.exists());
+    assert_eq!(fs::read_to_string(outside.path().join("sentinel")).unwrap(), "keep");
+}
+
+#[test]
+fn directory_transactions_reject_nested_links_before_snapshotting() {
+    for delete in [false, true] {
+        let tmp = project();
+        let outside = tempfile::tempdir().unwrap();
+        fs::write(outside.path().join("sentinel"), "keep").unwrap();
+        let from = tmp.path().join("Assets/Group");
+        fs::create_dir(&from).unwrap();
+        dir_link(outside.path(), &from.join("Linked"));
+        let to = tmp.path().join("Assets/Moved");
+        let file = if delete {
+            FileEdit::Delete { path: from.clone().into(), recursive: true }
+        } else {
+            FileEdit::Rename { from: from.clone().into(), to: to.clone().into() }
+        };
+        let docs = Documents::new(Arc::new(|_| {}), Box::new(|_: &Path, _: Option<&str>| LanguageId::new("plaintext")));
+        let error = docs.apply_workspace_edit(&WorkspaceEdit { files: vec![file], ..Default::default() }).unwrap_err();
+        assert!(error.message.contains("do not follow links"));
+        assert!(from.exists() && !to.exists());
+        assert_eq!(fs::read_to_string(outside.path().join("sentinel")).unwrap(), "keep");
+    }
+}
diff --git a/crates/ide-workspace/src/unity/assets/workspace_edit.rs b/crates/ide-workspace/src/unity/assets/workspace_edit.rs
new file mode 100644
index 00000000..c3a5baf1
--- /dev/null
+++ b/crates/ide-workspace/src/unity/assets/workspace_edit.rs
@@ -0,0 +1,99 @@
+//! Include sidecars in the document transaction's preflight, recovery and undo.
+use super::{exists, fs, is_link, key, meta_path, no_links, project_root, validate_asset};
+use ide_core::{FileEdit, IdeError, IdeResult, WorkspaceEdit};
+use std::path::Path;
+
+pub(crate) fn validate_workspace_edit_paths(edit: &WorkspaceEdit) -> IdeResult<()> {
+    for file in &edit.files {
+        let validate = |path: &Path| -> IdeResult<()> {
+            validate_asset(path)?;
+            no_links(&meta_path(path))?;
+            no_nested_links(path)
+        };
+        match file {
+            FileEdit::Rename { from, to } if project_root(from).is_some() || project_root(to).is_some() => {
+                validate(from)?;
+                validate(to)?;
+            }
+            FileEdit::Delete { path, .. } if project_root(path).is_some() => validate(path)?,
+            _ => {}
+        }
+    }
+    Ok(())
+}
+
+// Transactions snapshot directories recursively. Reject linked descendants
+// before backup, including junctions and children renamed by a later operation.
+fn no_nested_links(path: &Path) -> IdeResult<()> {
+    let metadata = match fs::symlink_metadata(path) {
+        Ok(metadata) => metadata,
+        Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(()),
+        Err(error) => return Err(error.into()),
+    };
+    if is_link(&metadata) {
+        return Err(IdeError::invalid(format!("Unity asset operations do not follow links: {}", path.display())));
+    }
+    if metadata.is_dir() {
+        for entry in fs::read_dir(path)? {
+            no_nested_links(&entry?.path())?;
+        }
+    }
+    Ok(())
+}
+
+// Resolve against the state produced by earlier operations without touching disk.
+// This also handles renaming a folder before renaming/deleting a child asset.
+fn present(path: &Path, preceding: &[FileEdit]) -> bool {
+    let mut path = path.to_path_buf();
+    for op in preceding.iter().rev() {
+        match op {
+            FileEdit::Rename { from, to } => {
+                if let Ok(relative) = path.strip_prefix(to) {
+                    // Joining an empty suffix adds a separator to a file path;
+                    // that makes an existing sidecar look like a missing directory.
+                    path = if relative.as_os_str().is_empty() { from.to_path_buf() } else { from.join(relative) };
+                } else if path.starts_with(from) {
+                    return false;
+                }
+            }
+            FileEdit::Delete { path: deleted, .. } if path.starts_with(deleted) => return false,
+            FileEdit::Create { path: created, .. } if path == created.to_path_buf() => return true,
+            _ => {}
+        }
+    }
+    exists(&path)
+}
+
+pub(crate) fn expand_workspace_edit(edit: &mut WorkspaceEdit) -> IdeResult<()> {
+    let mut files = Vec::new();
+    for file in &edit.files {
+        match file {
+            FileEdit::Rename { from, to } if project_root(from).is_some() || project_root(to).is_some() => {
+                validate_asset(from)?;
+                validate_asset(to)?;
+                let source = meta_path(from);
+                let destination = meta_path(to);
+                no_links(&source)?;
+                no_links(&destination)?;
+                if present(&destination, &files) && key(&source) != key(&destination) {
+                    return Err(IdeError::invalid(format!("{} already exists", destination.display())));
+                }
+                if present(&source, &files) {
+                    files.push(FileEdit::Rename { from: source.into(), to: destination.into() });
+                }
+            }
+            FileEdit::Delete { path, .. } if project_root(path).is_some() => {
+                validate_asset(path)?;
+                let meta = meta_path(path);
+                no_links(&meta)?;
+                if present(&meta, &files) {
+                    files.push(FileEdit::Delete { path: meta.into(), recursive: false });
+                }
+            }
+            _ => {}
+        }
+        files.push(file.clone());
+    }
+    edit.files = files;
+    Ok(())
+}
diff --git a/crates/ide-workspace/tests/documents.rs b/crates/ide-workspace/tests/documents.rs
index 16670ce1..52c20e95 100644
--- a/crates/ide-workspace/tests/documents.rs
+++ b/crates/ide-workspace/tests/documents.rs
@@ -344,6 +344,28 @@ fn backend_edits_emit_patches() {
     assert_eq!(fs::read_to_string(&path).unwrap(), "ONE\r\n2\r\nTHREE\r\n");
 }
 
+#[test]
+fn external_change_in_two_places_patches_each() {
+    let f = fixture();
+    let path = f.root.join("two.txt");
+    let old: String = (0..400).map(|i| format!("line {i}\n")).collect();
+    fs::write(&path, &old).unwrap();
+    let id = f.docs.open(&path).unwrap().id;
+
+    std::thread::sleep(std::time::Duration::from_millis(10));
+    let new = old.replace("line 20\n", "line 20x\n").replace("line 299\n", "line 299x\n");
+    fs::write(&path, &new).unwrap();
+    f.docs.on_disk_changed(std::slice::from_ref(&path));
+
+    assert_eq!(f.docs.snapshot(id).unwrap().text, new);
+    let events = f.events.lock();
+    let changes = events.iter().find_map(|e| match e {
+        IdeEvent::DocPatched { changes, .. } => Some(changes),
+        _ => None,
+    });
+    assert_eq!(changes.map(Vec::len), Some(2));
+}
+
 #[test]
 fn external_changes() {
     let f = fixture();
diff --git a/crates/ide-workspace/tests/file_operations.rs b/crates/ide-workspace/tests/file_operations.rs
new file mode 100644
index 00000000..6999b038
--- /dev/null
+++ b/crates/ide-workspace/tests/file_operations.rs
@@ -0,0 +1,147 @@
+use ide_workspace::file_ops;
+use std::{fs, path::Path};
+
+fn metadata_path(path: &Path) -> std::path::PathBuf {
+    let mut name = path.as_os_str().to_os_string();
+    name.push(".meta");
+    name.into()
+}
+
+fn unity_project(root: &Path) {
+    fs::create_dir_all(root.join("Assets")).unwrap();
+    fs::create_dir_all(root.join("ProjectSettings")).unwrap();
+    fs::write(root.join("ProjectSettings/ProjectVersion.txt"), "m_EditorVersion: 2022.3.40f1").unwrap();
+}
+
+fn directory_alias(target: &Path, alias: &Path) {
+    #[cfg(unix)]
+    std::os::unix::fs::symlink(target, alias).unwrap();
+    #[cfg(windows)]
+    {
+        use std::os::windows::process::CommandExt;
+        let output = std::process::Command::new("cmd")
+            .args(["/c", "mklink", "/J"])
+            .arg(alias.to_string_lossy().replace('/', "\\"))
+            .arg(target.to_string_lossy().replace('/', "\\"))
+            .creation_flags(0x08000000)
+            .output()
+            .unwrap();
+        assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
+    }
+}
+
+#[test]
+fn ordinary_rename_through_an_alias_keeps_vfs_same_file_behavior() {
+    let dir = tempfile::tempdir().unwrap();
+    let aliases = tempfile::tempdir().unwrap();
+    let alias = aliases.path().join("project");
+    directory_alias(dir.path(), &alias);
+    let from = dir.path().join("File.txt");
+    let to = alias.join("File.txt");
+    fs::write(&from, "keep").unwrap();
+    ide_vfs::rename(&from, &to).unwrap();
+    file_ops::rename(&from, &to).unwrap();
+    let copied = alias.join("Copy.txt");
+    file_ops::copy(&to, &copied).unwrap();
+    assert_eq!(fs::read_to_string(copied).unwrap(), "keep");
+    assert_eq!(fs::read_to_string(from).unwrap(), "keep");
+}
+
+#[test]
+fn plain_files_and_non_assets_in_unity_keep_adjacent_metadata_untouched() {
+    for unity in [false, true] {
+        let dir = tempfile::tempdir().unwrap();
+        if unity {
+            unity_project(dir.path());
+        }
+        let from = dir.path().join("File.txt");
+        let copied = dir.path().join("Copy.txt");
+        let renamed = dir.path().join("file.txt");
+        fs::write(&from, "data").unwrap();
+        fs::write(metadata_path(&from), "unrelated").unwrap();
+        file_ops::copy(&from, &copied).unwrap();
+        assert!(!metadata_path(&copied).exists());
+        file_ops::rename(&from, &renamed).unwrap();
+        assert_eq!(fs::read_to_string(&renamed).unwrap(), "data");
+        assert_eq!(file_ops::deletion_paths(&renamed).unwrap(), [renamed]);
+        assert_eq!(fs::read_to_string(metadata_path(&from)).unwrap(), "unrelated");
+    }
+}
+
+#[test]
+fn mixed_move_and_undo_apply_rules_only_to_unity_assets() {
+    use ide_core::{LanguageId, WorkspaceEdit};
+    use ide_workspace::{Documents, FileMove, FileMoves};
+    use std::sync::Arc;
+
+    let unity = tempfile::tempdir().unwrap();
+    unity_project(unity.path());
+    let plain = tempfile::tempdir().unwrap();
+    let aliases = tempfile::tempdir().unwrap();
+    let alias = aliases.path().join("plain");
+    directory_alias(plain.path(), &alias);
+    let source = unity.path().join("Assets/Player.cs");
+    let destination = unity.path().join("Assets/Hero.cs");
+    let ordinary = alias.join("plain.txt");
+    let ordinary_to = alias.join("moved.txt");
+    fs::write(&source, "class Player {}").unwrap();
+    fs::write(metadata_path(&source), "guid: 11111111111111111111111111111111\n").unwrap();
+    fs::write(&ordinary, "plain").unwrap();
+    fs::write(metadata_path(&ordinary), "unrelated").unwrap();
+    let docs = Documents::new(Arc::new(|_| {}), Box::new(|_: &Path, _: Option<&str>| LanguageId::new("plaintext")));
+    let moves = FileMoves::new();
+    let token = moves
+        .perform(
+            &docs,
+            None,
+            &[
+                FileMove { from: ordinary.clone().into(), to: ordinary_to.clone().into() },
+                FileMove { from: source.clone().into(), to: destination.clone().into() },
+            ],
+            &WorkspaceEdit::default(),
+            "Move",
+            &|_| Ok(()),
+        )
+        .unwrap();
+    assert!(destination.exists() && metadata_path(&destination).exists());
+    assert!(ordinary_to.exists() && !metadata_path(&ordinary_to).exists());
+    assert!(metadata_path(&ordinary).exists());
+    moves.undo(&docs, token).unwrap();
+    assert!(source.exists() && metadata_path(&source).exists());
+    assert!(ordinary.exists() && metadata_path(&ordinary).exists());
+    assert!(!destination.exists() && !metadata_path(&destination).exists());
+
+    let blocker = alias.join("blocked");
+    fs::write(&blocker, "not a directory").unwrap();
+    assert!(
+        moves
+            .perform(
+                &docs,
+                None,
+                &[
+                    FileMove { from: source.clone().into(), to: destination.clone().into() },
+                    FileMove { from: ordinary.clone().into(), to: blocker.join("file.txt").into() },
+                ],
+                &WorkspaceEdit::default(),
+                "Move",
+                &|_| Ok(()),
+            )
+            .is_err()
+    );
+    assert!(source.exists() && metadata_path(&source).exists());
+    assert!(ordinary.exists() && metadata_path(&ordinary).exists());
+    assert!(!destination.exists() && !metadata_path(&destination).exists());
+}
+
+#[test]
+fn vfs_operations_remain_unaware_of_unity_metadata() {
+    let dir = tempfile::tempdir().unwrap();
+    unity_project(dir.path());
+    let from = dir.path().join("Assets/Player.cs");
+    let to = dir.path().join("Assets/Hero.cs");
+    fs::write(&from, "code").unwrap();
+    fs::write(metadata_path(&from), "metadata").unwrap();
+    ide_vfs::rename(&from, &to).unwrap();
+    assert!(to.exists() && !metadata_path(&to).exists());
+    assert!(metadata_path(&from).exists());
+}
diff --git a/crates/ide-workspace/tests/workspace_edits.rs b/crates/ide-workspace/tests/workspace_edits.rs
index 78bd905b..e58d7f52 100644
--- a/crates/ide-workspace/tests/workspace_edits.rs
+++ b/crates/ide-workspace/tests/workspace_edits.rs
@@ -9,6 +9,95 @@ fn documents() -> Documents {
     Documents::new(Arc::new(NullSink), Box::new(|_, _| LanguageId::plain_text()))
 }
 
+fn meta(path: &std::path::Path) -> std::path::PathBuf {
+    let mut name = path.as_os_str().to_os_string();
+    name.push(".meta");
+    name.into()
+}
+
+fn unity_project() -> tempfile::TempDir {
+    let tmp = tempfile::tempdir().unwrap();
+    std::fs::create_dir_all(tmp.path().join("Assets")).unwrap();
+    std::fs::create_dir_all(tmp.path().join("ProjectSettings")).unwrap();
+    std::fs::write(tmp.path().join("ProjectSettings/ProjectVersion.txt"), "m_EditorVersion: 2022.3.40f1\n").unwrap();
+    tmp
+}
+
+#[test]
+fn unity_rename_chain_and_delete_share_metadata_undo() {
+    let tmp = unity_project();
+    let original = tmp.path().join("Assets/Player.cs");
+    let renamed = tmp.path().join("Assets/Hero.cs");
+    std::fs::write(&original, "old").unwrap();
+    std::fs::write(meta(&original), "guid: unchanged").unwrap();
+    let (docs, events) = recorded_documents();
+    docs.apply_workspace_edit(&WorkspaceEdit {
+        files: vec![
+            FileEdit::Rename { from: original.clone().into(), to: renamed.clone().into() },
+            FileEdit::Delete { path: renamed.clone().into(), recursive: false },
+        ],
+        ..Default::default()
+    })
+    .unwrap();
+    for path in [&original, &renamed, &meta(&original), &meta(&renamed)] {
+        assert!(!path.exists(), "{} should be removed", path.display());
+    }
+    docs.undo_workspace_edit(undo_id(&events)).unwrap();
+    assert_eq!(std::fs::read_to_string(&original).unwrap(), "old");
+    assert_eq!(std::fs::read_to_string(meta(&original)).unwrap(), "guid: unchanged");
+    assert!(!renamed.exists() && !meta(&renamed).exists());
+}
+
+#[test]
+fn unity_metadata_conflict_keeps_earlier_edits_unchanged() {
+    let tmp = unity_project();
+    let original = tmp.path().join("Assets/Player.cs");
+    let renamed = tmp.path().join("Assets/Hero.cs");
+    std::fs::write(&original, "old").unwrap();
+    std::fs::write(meta(&original), "guid: original").unwrap();
+    std::fs::write(meta(&renamed), "guid: orphan").unwrap();
+    assert!(
+        documents()
+            .apply_workspace_edit(&WorkspaceEdit {
+                files: vec![
+                    edit(&original, "new"),
+                    FileEdit::Rename { from: original.clone().into(), to: renamed.clone().into() }
+                ],
+                ..Default::default()
+            })
+            .is_err()
+    );
+    assert_eq!(std::fs::read_to_string(&original).unwrap(), "old");
+    assert_eq!(std::fs::read_to_string(meta(&original)).unwrap(), "guid: original");
+    assert_eq!(std::fs::read_to_string(meta(&renamed)).unwrap(), "guid: orphan");
+}
+
+#[test]
+fn unity_folder_rename_then_child_rename_preserves_metadata() {
+    let tmp = unity_project();
+    let folder = tmp.path().join("Assets/Before");
+    let moved = tmp.path().join("Assets/After");
+    std::fs::create_dir(&folder).unwrap();
+    std::fs::write(meta(&folder), "folder guid").unwrap();
+    std::fs::write(folder.join("Player.cs"), "old").unwrap();
+    std::fs::write(meta(&folder.join("Player.cs")), "script guid").unwrap();
+    let (docs, events) = recorded_documents();
+    docs.apply_workspace_edit(&WorkspaceEdit {
+        files: vec![
+            FileEdit::Rename { from: folder.clone().into(), to: moved.clone().into() },
+            FileEdit::Rename { from: moved.join("Player.cs").into(), to: moved.join("Hero.cs").into() },
+        ],
+        ..Default::default()
+    })
+    .unwrap();
+    assert_eq!(std::fs::read_to_string(meta(&moved)).unwrap(), "folder guid");
+    assert_eq!(std::fs::read_to_string(meta(&moved.join("Hero.cs"))).unwrap(), "script guid");
+    assert!(!meta(&moved.join("Player.cs")).exists());
+    docs.undo_workspace_edit(undo_id(&events)).unwrap();
+    assert_eq!(std::fs::read_to_string(meta(&folder.join("Player.cs"))).unwrap(), "script guid");
+    assert!(!moved.exists() && !meta(&moved).exists());
+}
+
 fn edit(path: &Path, text: &str) -> FileEdit {
     FileEdit::Edit {
         path: path.to_owned().into(),
@@ -111,6 +200,37 @@ fn matching_document_version_is_applied() {
     assert_eq!(std::fs::read_to_string(a).unwrap(), "new\n");
 }
 
+#[test]
+fn versioned_edit_of_a_closed_file_is_guarded_by_its_preconditions() {
+    // gopls versions every file of a rename, including ones the editor never opened.
+    let tmp = tempfile::tempdir().unwrap();
+    let path = tmp.path().join("closed.txt");
+    std::fs::write(&path, "old\n").unwrap();
+    let docs = documents();
+    let versioned = || {
+        let mut operation = edit(&path, "new");
+        if let FileEdit::Edit { version, .. } = &mut operation {
+            *version = Some(0);
+        }
+        WorkspaceEdit { files: vec![operation], ..Default::default() }
+    };
+    // Without a snapshot of what the server saw, a version for a closed file can't be trusted.
+    assert_eq!(docs.apply_workspace_edit(&versioned()).unwrap_err().kind, ErrorKind::OutOfSync);
+    assert_eq!(std::fs::read_to_string(&path).unwrap(), "old\n");
+
+    let mut changed = versioned();
+    docs.prepare_workspace_edit(&mut changed).unwrap();
+    std::fs::write(&path, "own\n").unwrap();
+    assert_eq!(docs.apply_workspace_edit(&changed).unwrap_err().kind, ErrorKind::OutOfSync);
+    assert_eq!(std::fs::read_to_string(&path).unwrap(), "own\n");
+
+    std::fs::write(&path, "old\n").unwrap();
+    let mut prepared = versioned();
+    docs.prepare_workspace_edit(&mut prepared).unwrap();
+    docs.apply_workspace_edit(&prepared).unwrap();
+    assert_eq!(std::fs::read_to_string(&path).unwrap(), "new\n");
+}
+
 #[test]
 fn unversioned_preview_rejects_changed_disk_and_dirty_buffers() {
     let tmp = tempfile::tempdir().unwrap();
@@ -144,6 +264,38 @@ fn unversioned_preview_rejects_changed_disk_and_dirty_buffers() {
     }
 }
 
+#[test]
+fn saving_between_preview_and_apply_keeps_the_edit_valid() {
+    let tmp = tempfile::tempdir().unwrap();
+    // A new scratch (empty on disk) and an edited file, saved after the edit was computed.
+    for (name, disk, typed) in [("scratch.c", "", "int\n"), ("a.txt", "old\n", "own")] {
+        let path = tmp.path().join(name);
+        std::fs::write(&path, disk).unwrap();
+        let docs = documents();
+        let info = docs.open(&path).unwrap();
+        let replace = if disk.is_empty() { 0 } else { 3 };
+        docs.edit(
+            info.id,
+            info.version,
+            ChangeSet { changes: vec![TextChange { from: 0, to: replace, insert: typed.into() }] },
+        )
+        .unwrap();
+        let mut change = WorkspaceEdit { files: vec![edit(&path, "new")], ..Default::default() };
+        docs.prepare_workspace_edit(&mut change).unwrap();
+        docs.save(info.id).unwrap();
+        docs.apply_workspace_edit(&change).unwrap_or_else(|e| panic!("{name}: {e}"));
+        assert!(docs.snapshot(info.id).unwrap().text.starts_with("new"), "{name}");
+        // A real change after the preview still invalidates it.
+        let mut change = WorkspaceEdit { files: vec![edit(&path, "xyz")], ..Default::default() };
+        docs.prepare_workspace_edit(&mut change).unwrap();
+        let version = docs.snapshot(info.id).unwrap().version;
+        docs.edit(info.id, version, ChangeSet { changes: vec![TextChange { from: 0, to: 0, insert: "!".into() }] })
+            .unwrap();
+        docs.save(info.id).unwrap();
+        assert!(docs.apply_workspace_edit(&change).is_err(), "{name}");
+    }
+}
+
 #[test]
 fn grouped_undo_restores_open_closed_and_unsaved_files() {
     let tmp = tempfile::tempdir().unwrap();
diff --git a/docs/plugins/themes.md b/docs/plugins/themes.md
index b11082a3..e28db7a8 100644
--- a/docs/plugins/themes.md
+++ b/docs/plugins/themes.md
@@ -132,9 +132,29 @@ and credit the original authors in `authors` and `description`.
 
 ### From IntelliJ IDEA (automatic)
 
+To use a theme you already have in IntelliJ, open **Settings › Plugins**, gear
+menu:
+
+- **Import Theme from IntelliJ IDE…** lists the theme plugins installed in the
+  JetBrains IDEs (and Android Studio) on this computer, the theme each IDE uses
+  first. It reads their settings folders: `~/Library/Application Support/JetBrains`
+  (macOS), `%APPDATA%\JetBrains` (Windows), `~/.config/JetBrains` and
+  `~/.local/share/JetBrains` (Linux).
+- **Import IntelliJ Theme from File…** takes a theme plugin downloaded from the
+  JetBrains Marketplace (`.jar`, or a `.zip` with the plugin's `lib/*.jar`) or a
+  `.theme.json` (its `editorScheme` file is read from the same folder).
+
+The whole plugin becomes one OpenIDEA theme plugin, `intellij.<plugin id>`, with
+each of its themes and their editor schemes; it is installed through the usual
+install page and the chosen theme (otherwise the first) is applied. Importing
+the plugin again replaces it. Both are actions too (`plugins.importIntellijTheme`,
+`plugins.importInstalledIntellijTheme`). The conversion is the one described
+below.
+
 `scripts/theme/import-intellij-theme.ts` converts an IntelliJ `.theme.json`,
-and optionally its `.icls` editor scheme, into a ready-to-install plugin. It
-has no dependencies beyond Node 22.
+and optionally its `.icls` editor scheme, into a plugin folder you can edit
+before installing it — the way to port a theme for publishing. It has no
+dependencies beyond Node 22.
 
 ```sh
 pnpm theme:import-intellij path/to/MyTheme.theme.json path/to/MyTheme.icls --out ~/my-theme --author "Original Author"
@@ -172,14 +192,16 @@ ship no `.icls` at all keep the built-in syntax colours.
 | `--danger`, `--warning` | `Component.errorFocusColor`, `Component.warningFocusColor` |
 | `--bg-tooltip`, `--fg-tooltip`, `--border-tooltip` | `ToolTip.background`, `.foreground`, `.borderColor` |
 | `--bg-button`, `--border-button` | `Button.startBackground`, `Button.startBorderColor` |
-| `--bg-tab-selected`, `--border-tab-selected` | `EditorTabs.underlinedTabBackground`, `EditorTabs.underlineColor` |
+| `--bg-tab-selected` | `EditorTabs.underlinedTabBackground` |
+| `--border-tab-selected` | `EditorTabs.underlinedBorderColor` (Islands), `EditorTabs.underlineColor` |
+| `--fg-completion-match` | `CompletionPopup.matchForeground` |
 | `--bg-toolbar-hover`, `--bg-toolbar-pressed` | `ActionButton.hoverBackground`, `ActionButton.pressedBackground` |
 | `--bg-stripe-hover`, `--bg-stripe-selected` | `ToolWindow.Button.hoverBackground`, `.selectedBackground` |
 | `--scrollbar-thumb`, `--scrollbar-thumb-hover` | `ScrollBar.Mac.thumbColor`, `ScrollBar.Mac.hoverThumbColor` |
 | `--bg-toggle-*` | `ToggleButton.onBackground`, `.offBackground`, `.buttonColor` |
 | `--bg-feedback-*`, `--border-feedback-*` | `Banner.infoBackground`, `Banner.errorBorderColor`, … |
 
-The full table is `UI_KEYS` in [`scripts/theme/intellij.ts`](../../scripts/theme/intellij.ts).
+The full table is `UI_KEYS` in [`src/features/plugins/intellijTheme.ts`](../../src/features/plugins/intellijTheme.ts).
 
 #### `.icls` → editor scheme
 
@@ -189,6 +211,7 @@ The full table is `UI_KEYS` in [`scripts/theme/intellij.ts`](../../scripts/theme
 | `--caret`, `--bg-current-line` | colour `CARET_COLOR`, `CARET_ROW_COLOR` |
 | `--bg-editor-selection` | colour `SELECTION_BACKGROUND` |
 | `--fg-line-number`, `--fg-line-number-current` | colour `LINE_NUMBERS_COLOR`, `LINE_NUMBER_ON_CARET_ROW_COLOR` |
+| `--bg-editor-gutter` | colour `EDITOR_GUTTER_BACKGROUND`, else the editor background (as the new UI paints it; `GUTTER_BACKGROUND` is the classic UI's) |
 | `--border-indent-guide`, `--border-right-margin`, `--fg-whitespace` | colour `INDENT_GUIDE`, `RIGHT_MARGIN_COLOR`, `WHITESPACES` |
 | `--vcs-*`, `--gutter-*` | colour `FILESTATUS_*`, `MODIFIED_LINES_COLOR`, `ADDED_LINES_COLOR`, `DELETED_LINES_COLOR` |
 | `--syn-keyword`, `--syn-string`, `--syn-number` | `DEFAULT_KEYWORD`, `DEFAULT_STRING`, `DEFAULT_NUMBER` |
@@ -206,7 +229,9 @@ The full table is `UI_KEYS` in [`scripts/theme/intellij.ts`](../../scripts/theme
 | `--syn-self`, `--syn-keyword-arg`, `--syn-docstring`, `--syn-predefined` | `PY.SELF_PARAMETER`, `PY.KEYWORD_ARGUMENT`, `PY.DOC_COMMENT`, `PY.BUILTIN_NAME` |
 | `--ansi-*` | `CONSOLE_*_OUTPUT` (`CONSOLE_DARKGRAY_OUTPUT` is bright black, `CONSOLE_GRAY_OUTPUT` white) |
 
-The full tables are `ICLS_COLORS` and `ICLS_ATTRIBUTES` in the same file.
+The full tables are `ICLS_COLORS` and `ICLS_ATTRIBUTES` in the same file. An
+attribute written as `<value />` has no colours of its own and shows as plain
+text (`TEXT`'s foreground), as in IntelliJ, not with the parent scheme's colour.
 
 ### From VS Code (by hand)
 
@@ -298,7 +323,7 @@ a token.
 
 <!-- BEGIN GENERATED TOKEN REFERENCE: pnpm gen:theme-docs -->
 
-223 themeable tokens: 117 in the UI theme file, 106 in the editor colour scheme file.
+224 themeable tokens: 117 in the UI theme file, 107 in the editor colour scheme file.
 
 ### Surfaces (UI theme)
 
@@ -400,6 +425,7 @@ a token.
 | `--syn-number` | `#2aacb8` | `#1750eb` |
 | `--syn-punct` | `#bcbec4` | `#080808` |
 | `--syn-variable` | `#bcbec4` | `#080808` |
+| `--syn-global` | `var(--syn-variable)` | `var(--syn-variable)` |
 | `--syn-param` | `#bcbec4` | `#080808` |
 | `--syn-property` | `#c77dbb` | `#871094` |
 | `--syn-constant` | `#c77dbb` | `#871094` |
diff --git a/docs/unity.md b/docs/unity.md
new file mode 100644
index 00000000..28c9eba2
--- /dev/null
+++ b/docs/unity.md
@@ -0,0 +1,23 @@
+# Unity projects
+
+Open the folder containing `Assets` and `ProjectSettings/ProjectVersion.txt`.
+OpenIDEA detects Unity without requiring a generated solution and shows the editor
+version in the Unity project view.
+
+The Unity view hides `.meta` files, generated C# project files and cache/build
+folders. **Show Meta Files** and **Show Generated Files** reveal them independently;
+the regular Project view is still available. Generated folders are excluded from
+indexing and search, including folders Unity creates after the project is opened.
+
+Operations on assets inside `Assets` include their `.meta` files. Rename and move
+preserve GUIDs, deletion removes both files, and copy generates new GUIDs and updates
+references within the copied group. References to assets outside the group stay
+unchanged. File move undo and transactional workspace edits include metadata too.
+Destination metadata conflicts are rejected before making changes.
+
+Projects may be opened through a linked root or parent directory, including macOS
+`/var` and `/tmp`. Links inside the project (including Windows junctions) are not
+followed by asset operations. For moves/copies to or from ordinary directories,
+the external path must have no linked ancestors. Cross-volume asset moves and
+copies that require rewriting binary serialized assets are rejected; use Unity
+for those operations.
diff --git a/docs/workspaces-and-window-groups.md b/docs/workspaces-and-window-groups.md
index db86800e..02136699 100644
--- a/docs/workspaces-and-window-groups.md
+++ b/docs/workspaces-and-window-groups.md
@@ -22,7 +22,15 @@ Paths in an existing manifest may be relative to the workspace directory. New an
 
 Linked folders appear as roots in Project view and participate in indexing, Find in Files, Git repository discovery and language-server root selection. Detected and saved run configurations have project-qualified names and use their member's working directory and launch settings. Build Project combines the linked projects' build plans; Compile File targets its owning project. Workspace editor/settings state belongs to its own directory. Each member retains its repository and project configuration.
 
-The specialized Maven/Gradle tool-window model still describes the workspace directory itself; it does not yet aggregate independent member models. Workspace creation and management currently target local folders.
+The specialized Maven/Gradle tool-window model still describes the workspace directory itself; it does not yet aggregate independent member models. Workspace creation and management currently target local folders. To link independent Gradle builds in one Gradle tree, open their parent folder as an ordinary project instead of creating a Workspace manifest, then use **Link Gradle Projects…** in the Gradle toolbar or Find Action.
+
+## Linked Gradle builds in a project
+
+In an ordinary project window, **Link Gradle Projects…** accepts one or more `settings.gradle`, `settings.gradle.kts`, `build.gradle`, or `build.gradle.kts` files. Each linked build has its own root in the Gradle tool window. Its tasks, dependencies, wrapper, working directory and sync cache stay separate, even when another build has the same `:app` project or task names. Included builds remain under the build that includes them.
+
+Right-click a build root for **Reload Gradle Project** or **Unlink Gradle Project**. Unlinking only removes the IDE connection; it does not delete files or saved run configurations. The Link button remains available after the last build is unlinked. Linked builds may live outside the opened folder.
+
+Links are saved in project settings as `languages.java.gradle.linkedProjects`. Until links are configured, existing automatic discovery is unchanged. An explicit empty list means that no Gradle builds are linked. Opening the project again restores its links. A folder first opened by an older version may need one fresh sync because independent builds now have separate caches.
 
 ## Window group
 
@@ -30,7 +38,7 @@ Open two project windows, then use **Window → Merge All Project Windows**. The
 
 Use the tab's close button to close that project, or **Move Tab to New Window** to detach the current tab. Right-click a tab for **Close Other Tabs**, **Close Tabs to the Left** and **Close Tabs to the Right**, which close the projects one at a time and keep the clicked tab; cancelling one project's unsaved-changes prompt leaves it and the rest open. The same commands are in the Command Palette and can be assigned shortcuts. Closing uses the existing unsaved-changes guard. Quit visits project windows in sequence so a hidden project's prompt is visible. Groups restore when **Reopen last project** is enabled.
 
-The grouping model lives in `ide-workspace`, independently of project ownership. The desktop adapter keeps each member's WebView and backend services alive, presents the selected window at the group's position/size, and hides its peers. This is an application-drawn tab strip, not the macOS native tab strip. Its persistence is application-local in `window-groups.json`. Language servers, terminals, editor buffers and settings remain independent between group members.
+The grouping model lives in `ide-workspace`, independently of project ownership. The desktop adapter keeps each member's WebView and backend services alive, presents the selected window at the group's position/size, and hides its peers. Hidden members are kept at the selected window's frame and display (and follow it after a move or resize), so switching projects only changes which window is visible. This is an application-drawn tab strip, not the macOS native tab strip. Its persistence is application-local in `window-groups.json`. Language servers, terminals, editor buffers and settings remain independent between group members.
 
 ## Validation
 
diff --git a/e2e/agentMarkdown.spec.ts b/e2e/agentMarkdown.spec.ts
new file mode 100644
index 00000000..da15e0e3
--- /dev/null
+++ b/e2e/agentMarkdown.spec.ts
@@ -0,0 +1,130 @@
+/** Markdown in agent replies, in the real conversation: browser defaults don't suit a narrow chat. */
+import { expect, test, type Page } from "@playwright/test";
+
+const TASK = {
+  id: "t1",
+  title: "Repro task",
+  status: "ready" as const,
+  isolation: "local" as const,
+  provider: "codex",
+  model: null,
+  cwd: "/dev/acme-api",
+  branch: null,
+  base: null,
+  baseCommit: null,
+  error: null,
+  createdMs: 0,
+  updatedMs: 0,
+  config: [],
+  commands: [],
+  usage: null,
+  queue: [],
+};
+
+const PIXEL = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";
+const REPLY = [
+  "# Heading one",
+  "",
+  "## Heading two",
+  "",
+  "##### Heading five",
+  "",
+  "> A quote",
+  "",
+  "- [x] done",
+  "- [ ] open",
+  "",
+  "---",
+  "",
+  `![pixel](${PIXEL})`,
+  "",
+  "| Path | Owner | Status | Notes |",
+  "| --- | --- | --- | --- |",
+  "| src/features/agents/conversation/very/long/path/file.tsx | someone | modified | a fairly long note |",
+  "",
+  "```ts",
+  "const a = 1;",
+  "```",
+].join("\n");
+
+async function openReply(page: Page, text: string) {
+  await page.goto("/");
+  await page.getByRole("tree", { name: "Project" }).waitFor();
+  await page.evaluate(
+    async ({ task, text }) => {
+      // Paths go through variables: knip can't resolve these browser-absolute URLs.
+      const storePath = "/src/features/agents/store.ts";
+      const store = await import(storePath);
+      store.useAgents.setState({
+        loaded: true,
+        error: null,
+        providers: [],
+        tasks: new Map([[task.id, task]]),
+        entries: new Map([[task.id, [{ type: "agent", text }]]]),
+        unread: new Set(),
+        docked: null,
+      });
+      store.dockTask(task.id);
+    },
+    { task: TASK, text },
+  );
+  const reply = page.locator("[class*='_markdown_']").first();
+  await reply.locator("h1, p").first().waitFor();
+  return reply;
+}
+
+const css = (reply: ReturnType<Page["locator"]>, selector: string, property: string) =>
+  reply
+    .locator(selector)
+    .first()
+    .evaluate((el, name) => getComputedStyle(el).getPropertyValue(name), property);
+const px = (value: string) => Number.parseFloat(value);
+
+test("styles tables so a reply reads as a table", async ({ page }) => {
+  const reply = await openReply(page, REPLY);
+  expect(await css(reply, "td", "border-top-width")).toBe("1px");
+  expect(await css(reply, "td", "padding-left")).toBe("8px");
+  expect(await css(reply, "th", "border-top-width")).toBe("1px");
+  // A narrow chat must not squeeze a column to a few letters.
+  const widths = await reply
+    .locator("td")
+    .evaluateAll((cells) => cells.map((cell) => cell.getBoundingClientRect().width));
+  for (const width of widths) expect(width).toBeGreaterThanOrEqual(70);
+});
+
+test("scrolls a wide table inside the reply", async ({ page }) => {
+  const reply = await openReply(page, REPLY);
+  const sizes = await reply.evaluate((el) => {
+    const table = el.querySelector("table")!;
+    return { reply: el.clientWidth, table: table.clientWidth, content: table.scrollWidth };
+  });
+  expect(sizes.table).toBeLessThanOrEqual(sizes.reply);
+  expect(sizes.content).toBeGreaterThan(sizes.table);
+});
+
+test("sizes headings for a chat and keeps small ones readable", async ({ page }) => {
+  const reply = await openReply(page, REPLY);
+  const body = px(await css(reply, "td", "font-size"));
+  const h1 = px(await css(reply, "h1", "font-size"));
+  expect(h1).toBeGreaterThan(body);
+  expect(h1).toBeLessThanOrEqual(body * 1.2);
+  expect(px(await css(reply, "h2", "font-size"))).toBeLessThan(h1);
+  expect(px(await css(reply, "h5", "font-size"))).toBe(body);
+});
+
+test("starts and ends a reply without stray margins", async ({ page }) => {
+  const reply = await openReply(page, REPLY);
+  expect(await css(reply, "> :first-child", "margin-top")).toBe("0px");
+  expect(await css(reply, "> :last-child", "margin-bottom")).toBe("0px");
+});
+
+test("styles quotes, rules, images and task lists", async ({ page }) => {
+  const reply = await openReply(page, REPLY);
+  expect(await css(reply, "blockquote", "margin-left")).toBe("0px");
+  expect(await css(reply, "blockquote", "border-left-width")).toBe("3px");
+  expect(await css(reply, "hr", "border-left-width")).toBe("0px");
+  expect(await css(reply, "hr", "border-top-width")).toBe("1px");
+  expect(await css(reply, "img", "max-width")).toBe("100%");
+  // A checkbox stands in for the bullet.
+  expect(await css(reply, "li:has(> input)", "list-style-type")).toBe("none");
+});
diff --git a/e2e/clickhouse-source.spec.ts b/e2e/clickhouse-source.spec.ts
new file mode 100644
index 00000000..8a29e09e
--- /dev/null
+++ b/e2e/clickhouse-source.spec.ts
@@ -0,0 +1,42 @@
+import { expect, test } from "./fixtures";
+
+test("configures a ClickHouse HTTP source and keeps transaction controls unavailable", async ({
+  workbench: page,
+}, info) => {
+  await page.evaluate(async () => {
+    const storePath = "/src/features/database/store.ts";
+    const bindingsPath = "/src/bindings.ts";
+    const { useDatabase } = await import(storePath);
+    const { commands } = await import(bindingsPath);
+    commands.dbTest = async (source: unknown) => {
+      document.documentElement.dataset.testedSource = JSON.stringify(source);
+      return { status: "ok", data: "ClickHouse" };
+    };
+    useDatabase.setState({ dialog: { kind: "source", source: null } });
+  });
+  const dialog = page.getByRole("dialog", { name: "New Data Source", exact: true });
+  await dialog.getByRole("button", { name: "Data source type", exact: true }).click();
+  await page.getByRole("option", { name: "ClickHouse", exact: true }).click();
+  await expect(dialog.locator("#db-port")).toHaveValue("8123");
+  await expect(dialog.locator("#db-user")).toHaveValue("default");
+  await expect(dialog.locator("#db-database")).toHaveValue("default");
+  await expect(dialog.locator("#db-url")).toHaveValue("http://localhost:8123/default");
+  await dialog.locator("#db-url").fill("https://reader@db.example:8443/analytics");
+  await expect(dialog.locator("#db-host")).toHaveValue("db.example");
+  await expect(dialog.locator("#db-port")).toHaveValue("8443");
+  await expect(dialog.locator("#db-user")).toHaveValue("reader");
+  await expect(dialog.locator("#db-database")).toHaveValue("analytics");
+  await dialog.getByRole("button", { name: "Test Connection", exact: true }).click();
+  await expect(dialog.getByRole("status")).toHaveText("Succeeded: ClickHouse");
+  expect(await page.evaluate(() => JSON.parse(document.documentElement.dataset.testedSource!))).toMatchObject({
+    driver: "clickhouse",
+    host: "db.example",
+    port: 8443,
+    user: "reader",
+    database: "analytics",
+    ssl: "verifyFull",
+  });
+  await dialog.screenshot({ path: info.outputPath("clickhouse-source.png") });
+  await dialog.getByRole("tab", { name: "Options", exact: true }).click();
+  await expect(dialog.getByRole("button", { name: "Transaction control", exact: true })).toBeDisabled();
+});
diff --git a/e2e/codeInsight.spec.ts b/e2e/codeInsight.spec.ts
new file mode 100644
index 00000000..ed4e4c7f
--- /dev/null
+++ b/e2e/codeInsight.spec.ts
@@ -0,0 +1,219 @@
+/**
+ * Code intelligence through the editor: completion, navigation, usages, rename, quick fixes and
+ * diagnostics. The language server is stubbed at the IPC layer; the servers themselves are covered
+ * by `crates/ide-lsp/tests`.
+ */
+import type { Locator, Page } from "@playwright/test";
+import { expect, ipcCalls, openFromTree, stubDesktop, test } from "./fixtures";
+
+const ROOT = "/dev/acme-api";
+const FILE = `${ROOT}/build.gradle.kts`;
+
+const at = (line: number, col: number) => ({ line, col });
+const range = (line: number, from: number, to: number) => ({ start: at(line, from), end: at(line, to) });
+
+/** Puts the caret just before `word` on the line containing `text`. */
+async function caretAt(editor: Locator, page: Page, text: string, word: string) {
+  const line = editor.locator(".cm-line", { hasText: text });
+  await line.click();
+  await page.keyboard.press("Home");
+  const content = (await line.textContent()) ?? "";
+  const indent = content.length - content.trimStart().length;
+  for (let i = indent; i < content.indexOf(word); i++) await page.keyboard.press("ArrowRight");
+}
+
+async function openSample(page: Page) {
+  const editor = await openFromTree(page, "build.gradle.kts");
+  await stubDesktop(page);
+  return editor;
+}
+
+test("completion lists the server's items and inserts the chosen one", async ({ workbench: page }) => {
+  const editor = await openSample(page);
+  await page.evaluate(() => {
+    const item = (label: string, kind: string, detail: string, insertText: string) => ({
+      label,
+      labelDetail: null,
+      detail,
+      kind,
+      documentation: null,
+      sortText: null,
+      filterText: null,
+      preselect: false,
+      deprecated: false,
+      insertText,
+      isSnippet: false,
+      replaceRange: null,
+      replaceRangeTab: null,
+      additionalEdits: [],
+      commitCharacters: [],
+      command: null,
+      data: null,
+      server: "kotlin",
+    });
+    window.__ipc.handlers.lsp_completion = () => ({
+      isIncomplete: false,
+      items: [item("toDto", "method", "OrderDto", "toDto()"), item("total", "property", "BigDecimal", "total")],
+    });
+  });
+  await editor.locator(".cm-line", { hasText: "return order.toDto()" }).click();
+  await page.keyboard.press("End");
+  await page.keyboard.press("Enter");
+  await page.keyboard.type("order.");
+  await page.keyboard.press("Control+Space");
+  const popup = page.locator(".cm-tooltip-autocomplete");
+  await expect(popup.getByText("total", { exact: true })).toBeVisible();
+  await expect(popup.getByText("toDto", { exact: true })).toBeVisible();
+  await page.keyboard.type("toD");
+  await expect(popup.getByText("total", { exact: true })).toBeHidden();
+  await page.keyboard.press("Enter");
+  await expect(popup).toBeHidden();
+  await expect(editor.locator(".cm-activeLine")).toHaveText(/^\s*order\.toDto\(\)$/);
+  expect((await ipcCalls(page, "lsp_completion")).length).toBeGreaterThan(0);
+});
+
+test("⌘B goes to the declaration in another file", async ({ workbench: page }) => {
+  const editor = await openSample(page);
+  await page.evaluate(
+    ({ path, target }) => {
+      window.__ipc.handlers.lsp_goto = () => [{ path, range: target }];
+    },
+    { path: `${ROOT}/settings.gradle.kts`, target: range(20, 12, 17) },
+  );
+  await caretAt(editor, page, "val order: Order", "service");
+  await page.keyboard.press("Meta+b");
+  const tabs = page.getByRole("tablist", { name: "Editor tabs" });
+  await expect(tabs.getByRole("tab", { name: "settings.gradle.kts" })).toHaveAttribute("aria-selected", "true");
+  const target = page.locator(".cm-editor").filter({ has: page.locator(".cm-activeLine") });
+  await expect(target.locator(".cm-activeLine")).toContainText("val order: Order = service.create(req)");
+  const [args] = await ipcCalls(page, "lsp_goto");
+  expect(args).toMatchObject({ pos: at(20, 27), kind: "definition" });
+});
+
+test("Find Usages lists every usage by file and opens one", async ({ workbench: page }) => {
+  const editor = await openSample(page);
+  await page.evaluate(
+    ({ file, other }) => {
+      const loc = (path: string, line: number, from: number, to: number) => ({
+        path,
+        range: { start: { line, col: from }, end: { line, col: to } },
+      });
+      window.__ipc.handlers.lsp_references = () => ({
+        locations: [loc(file, 16, 8, 15), loc(file, 20, 27, 34), loc(other, 16, 8, 15)],
+        incomplete: null,
+      });
+    },
+    { file: FILE, other: `${ROOT}/settings.gradle.kts` },
+  );
+  await caretAt(editor, page, "val order: Order", "service");
+  await page.keyboard.press("Alt+F7");
+  const usages = page.getByRole("tree", { name: /usages/i });
+  await expect(usages.getByRole("treeitem", { name: "Found usages 3 results" })).toBeVisible();
+  await expect(usages.getByRole("treeitem", { name: "build.gradle.kts 2 usages" })).toBeVisible();
+  await expect(usages.getByRole("treeitem", { name: /^17 service\.find\(status/ })).toBeVisible();
+  await expect(usages.getByRole("treeitem", { name: /^21 val order: Order = service\.create/ })).toBeVisible();
+  const other = usages.getByRole("treeitem", { name: "settings.gradle.kts 1 usage" });
+  await expect(other).toBeVisible();
+  // Double-clicking a usage in another file opens that file.
+  await usages.getByRole("treeitem", { name: /^17/ }).last().dblclick();
+  await expect(
+    page.getByRole("tablist", { name: "Editor tabs" }).getByRole("tab", { name: "settings.gradle.kts" }),
+  ).toHaveAttribute("aria-selected", "true");
+});
+
+test("⇧F6 renames in place and sends the server's edit to be applied", async ({ workbench: page }) => {
+  const editor = await openSample(page);
+  await page.evaluate(
+    ({ file, prepared, uses }) => {
+      window.__ipc.handlers.lsp_prepare_rename = () => prepared;
+      window.__ipc.handlers.lsp_rename = (args) => ({
+        edit: {
+          files: [
+            {
+              kind: "edit",
+              path: file,
+              edits: uses.map((range) => ({ range, new_text: args.newName })),
+            },
+          ],
+        },
+        incomplete: null,
+      });
+    },
+    { file: FILE, prepared: range(20, 12, 17), uses: [range(20, 12, 17), range(21, 15, 20)] },
+  );
+  await caretAt(editor, page, "val order: Order", "order");
+  await page.keyboard.press("Shift+F6");
+  await expect(page.getByText(/Press ⇧F6 to show dialog/)).toBeVisible();
+  // The name starts selected; occurrences follow as it's typed.
+  await page.keyboard.type("placed");
+  await expect(editor.locator(".cm-line", { hasText: "val placed: Order" })).toBeVisible();
+  await page.keyboard.press("Enter");
+  await expect.poll(() => ipcCalls(page, "apply_workspace_edit")).toHaveLength(1);
+  const [rename] = await ipcCalls(page, "lsp_rename");
+  expect(rename).toMatchObject({ pos: at(20, 12), newName: "placed" });
+  const [apply] = await ipcCalls(page, "apply_workspace_edit");
+  expect(JSON.stringify(apply)).toContain('"new_text":"placed"');
+});
+
+test("diagnostics underline the range and ⌥⏎ applies the preferred quick fix", async ({ workbench: page }) => {
+  const editor = await openSample(page);
+  await page.evaluate(
+    ({ file, bad }) => {
+      window.__ipc.handlers.lsp_code_actions = () => [
+        {
+          title: "Import 'com.acme.orders.model.Order'",
+          kind: "quickfix",
+          isPreferred: true,
+          disabledReason: null,
+          edit: {
+            files: [
+              {
+                kind: "edit",
+                path: file,
+                edits: [
+                  {
+                    range: { start: { line: 4, col: 0 }, end: { line: 4, col: 0 } },
+                    new_text: "import com.acme.orders.model.Order\n",
+                  },
+                ],
+              },
+            ],
+          },
+          command: null,
+          data: null,
+          server: "kotlin",
+        },
+        {
+          title: "Create class 'Order'",
+          kind: "quickfix",
+          isPreferred: false,
+          disabledReason: null,
+          edit: null,
+          command: null,
+          data: null,
+          server: "kotlin",
+        },
+      ];
+      window.__ipc.emit({
+        type: "diagnostics",
+        path: file,
+        source: "kotlin",
+        items: [
+          { range: bad, severity: "error", message: "Unresolved reference: Order", source: "kotlin", code: null },
+        ],
+      });
+    },
+    { file: FILE, bad: range(20, 19, 24) },
+  );
+  const squiggle = editor.locator(".cm-lintRange-error");
+  await expect(squiggle).toHaveText("Order");
+  await caretAt(editor, page, "val order: Order", "Order ");
+  await page.keyboard.press("Alt+Enter");
+  const fix = page.getByRole("option", { name: /Import 'com\.acme\.orders\.model\.Order'/ });
+  await expect(fix).toBeVisible();
+  await expect(page.getByRole("option", { name: /Create class 'Order'/ })).toBeVisible();
+  await fix.click();
+  await expect.poll(() => ipcCalls(page, "lsp_execute_code_action")).toHaveLength(1);
+  const [applied] = await ipcCalls(page, "lsp_execute_code_action");
+  expect(applied).toMatchObject({ action: { title: "Import 'com.acme.orders.model.Order'" } });
+});
diff --git a/e2e/commit.spec.ts b/e2e/commit.spec.ts
new file mode 100644
index 00000000..6d0c1852
--- /dev/null
+++ b/e2e/commit.spec.ts
@@ -0,0 +1,75 @@
+/**
+ * Committing from the Commit tool window. Git is stubbed at the IPC layer; the repository side is
+ * covered by `crates/ide-vcs` against real repositories.
+ */
+import type { Page } from "@playwright/test";
+import { expect, ipcCalls, openFromTree, stubDesktop, test } from "./fixtures";
+
+const ROOT = "/dev/acme-api";
+
+/** A repository with a modified tracked file and an untracked one; `vcs_commit` clears both. */
+async function stubRepository(page: Page) {
+  await stubDesktop(page);
+  await page.evaluate(async (root) => {
+    let committed = false;
+    const changes = [
+      {
+        path: `${root}/build.gradle.kts`,
+        relPath: "build.gradle.kts",
+        staged: null,
+        unstaged: "modified",
+        renamedFrom: null,
+      },
+      { path: `${root}/notes.txt`, relPath: "notes.txt", staged: null, unstaged: "untracked", renamedFrom: null },
+    ];
+    const h = window.__ipc.handlers;
+    h.vcs_roots = () => [{ root, operation: null, head: "main", headCommit: "1111111" }];
+    h.vcs_branch_info = () => ({
+      head: "main",
+      headCommit: "1111111",
+      upstream: null,
+      ahead: 0,
+      behind: 0,
+      operation: null,
+    });
+    h.vcs_status = () => (committed ? [] : changes);
+    h.vcs_stage = () => null;
+    h.vcs_unstage = () => null;
+    h.vcs_commit = () => {
+      committed = true;
+      return "2222222";
+    };
+    const vcsModule = "/src/features/vcs/store.ts";
+    const { useVcs, refreshNow } = await import(/* @vite-ignore */ vcsModule);
+    useVcs.setState({ available: true, root, repo: root, branchesLoaded: false, stashesLoaded: false });
+    await refreshNow();
+  }, ROOT);
+}
+
+test("⌘K commits the checked changes with the typed message", async ({ workbench: page }) => {
+  await openFromTree(page, "build.gradle.kts");
+  await stubRepository(page);
+  await page.keyboard.press("Meta+k");
+  const panel = page.getByRole("region", { name: "Commit", exact: true });
+  const commit = panel.getByRole("button", { name: "Commit", exact: true });
+  const changes = panel.getByRole("tree", { name: "Changes" });
+  // Tracked changes start included; unversioned files start excluded.
+  await expect(changes.getByRole("checkbox", { name: "Include build.gradle.kts in commit" })).toBeChecked();
+  await expect(changes.getByRole("checkbox", { name: "Include Unversioned Files in commit" })).not.toBeChecked();
+  const message = panel.getByRole("textbox", { name: "Commit message" });
+  await expect(message).toBeFocused();
+
+  // Committing without a message is refused.
+  await commit.click();
+  await expect(panel.getByRole("alert")).toHaveText("Specify commit message");
+  expect(await ipcCalls(page, "vcs_commit")).toHaveLength(0);
+
+  await message.fill("Return order DTOs from create");
+  await commit.click();
+  await expect(page.getByText(/1 file committed: Return order DTOs from create/)).toBeVisible();
+  const [committed] = await ipcCalls(page, "vcs_commit");
+  expect(committed).toMatchObject({ repo: ROOT, message: "Return order DTOs from create" });
+  const staged = (await ipcCalls(page, "vcs_stage")).flatMap((a) => a.paths as string[]);
+  expect(staged).toEqual([`${ROOT}/build.gradle.kts`]);
+  await expect(changes.getByRole("checkbox", { name: "Include build.gradle.kts in commit" })).toBeHidden();
+});
diff --git a/e2e/debug.spec.ts b/e2e/debug.spec.ts
new file mode 100644
index 00000000..1af77663
--- /dev/null
+++ b/e2e/debug.spec.ts
@@ -0,0 +1,115 @@
+/**
+ * A debugging session: a breakpoint set in the editor reaches the adapter, the session stops there
+ * with its frames and variables, and stepping and resuming go back to the adapter. The adapter is
+ * stubbed at the IPC layer; `crates/ide-dap/tests` drives real ones.
+ */
+import { expect, ipcCalls, openFromTree, stubDesktop, test } from "./fixtures";
+
+const ROOT = "/dev/acme-api";
+const FILE = `${ROOT}/build.gradle.kts`;
+const SESSION = 3;
+
+test("stops at a breakpoint, shows frames and variables, steps and resumes", async ({ workbench: page }) => {
+  const editor = await openFromTree(page, "build.gradle.kts");
+  await stubDesktop(page);
+  await page.evaluate(
+    async ({ file, root, session }) => {
+      const config = {
+        id: "python:app",
+        name: "app",
+        kind: "python",
+        command: "python3",
+        args: ["app.py"],
+        cwd: root,
+        env: {},
+        detected: false,
+        isTest: false,
+        debugAdapter: "debugpy",
+      };
+      const h = window.__ipc.handlers;
+      const debug = (event: Record<string, unknown>) => window.__ipc.emit({ type: "debug", session, event });
+      const stopAt = (line: number) => {
+        h.debug_stack_trace = () => [
+          { id: 11, name: "create", path: file, line, column: 0, presentationHint: null },
+          { id: 12, name: "handle", path: file, line: 16, column: 0, presentationHint: null },
+        ];
+        debug({ kind: "stopped", threadId: 1, reason: "breakpoint", description: null, allThreadsStopped: true });
+      };
+      h.run_configs = () => [config];
+      h.run_apply_settings = (args) => args.configs;
+      h.debug_set_breakpoints = (args) =>
+        (args.breakpoints as { line: number }[]).map((b, i) => ({
+          id: i + 1,
+          verified: true,
+          line: b.line,
+          message: null,
+        }));
+      h.debug_start = () => {
+        setTimeout(() => {
+          debug({ kind: "started", name: config.name, adapter: "debugpy", parent: null });
+          debug({ kind: "initialized" });
+          stopAt(20);
+        }, 50);
+        return session;
+      };
+      h.debug_threads = () => [{ id: 1, name: "MainThread" }];
+      h.debug_scopes = () => [{ name: "Locals", variablesReference: 100, expensive: false }];
+      h.debug_variables = () => [
+        {
+          name: "req",
+          value: "CreateOrderRequest(sku='A-1', qty=2)",
+          typeName: "CreateOrderRequest",
+          variablesReference: 0,
+          evaluateName: "req",
+        },
+        { name: "qty", value: "2", typeName: "int", variablesReference: 0, evaluateName: "qty" },
+      ];
+      h.debug_step = () => {
+        setTimeout(() => {
+          debug({ kind: "continued", threadId: 1, allThreadsContinued: true });
+          stopAt(21);
+        }, 50);
+        return null;
+      };
+      h.debug_resume = () => {
+        setTimeout(() => {
+          debug({ kind: "continued", threadId: 1, allThreadsContinued: true });
+          debug({ kind: "exited", code: 0 });
+          debug({ kind: "terminated" });
+        }, 50);
+        return null;
+      };
+      const runModule = "/src/features/run/store.ts";
+      const { loadConfigs, selectConfig } = await import(/* @vite-ignore */ runModule);
+      await loadConfigs();
+      selectConfig(config.id);
+    },
+    { file: FILE, root: ROOT, session: SESSION },
+  );
+
+  // Breakpoint and execution lines carry CSS-module classes (`_bpLine_<hash>`).
+  const line = (text: string) => editor.locator(".cm-line", { hasText: text });
+  await line("val order: Order").click();
+  await page.keyboard.press("Meta+F8");
+  await expect(line("val order: Order")).toHaveClass(/_bpLine_/);
+
+  await page.keyboard.press("Control+d");
+  await expect.poll(() => ipcCalls(page, "debug_start")).toHaveLength(1);
+  const set = (await ipcCalls(page, "debug_set_breakpoints")).filter((a) => a.path === FILE).at(-1);
+  expect(set?.breakpoints).toEqual([expect.objectContaining({ line: 20 })]);
+
+  const debug = page.getByRole("region", { name: "Debug", exact: true });
+  await expect(debug.getByText("create", { exact: true })).toBeVisible();
+  await expect(debug.getByText("handle", { exact: true })).toBeVisible();
+  await expect(debug.getByText("CreateOrderRequest(sku='A-1', qty=2)")).toBeVisible();
+  await expect(line("val order: Order")).toHaveClass(/_execLine_/);
+
+  await page.keyboard.press("F8");
+  await expect.poll(() => ipcCalls(page, "debug_step")).toEqual([{ session: SESSION, threadId: 1, kind: "over" }]);
+  await expect(line("return order.toDto()")).toHaveClass(/_execLine_/);
+  await expect(line("val order: Order")).not.toHaveClass(/_execLine_/);
+
+  await page.keyboard.press("F9");
+  await expect.poll(() => ipcCalls(page, "debug_resume")).toHaveLength(1);
+  await expect(debug.getByText("CreateOrderRequest(sku='A-1', qty=2)")).toBeHidden();
+});
diff --git a/e2e/deployment.spec.ts b/e2e/deployment.spec.ts
new file mode 100644
index 00000000..9f110d06
--- /dev/null
+++ b/e2e/deployment.spec.ts
@@ -0,0 +1,287 @@
+/** Deployment diff over an in-memory server: no SSH or filesystem writes. */
+import { test, expect } from "./fixtures";
+import type { Page } from "@playwright/test";
+
+test("native deployment entry fills its own window and exposes minimize and maximize controls", async ({
+  page,
+}, info) => {
+  const errors: string[] = [];
+  page.on("pageerror", (error) => errors.push(error.message));
+  await page.route("**/deployment-window-test", (route) =>
+    route.fulfill({
+      contentType: "text/html",
+      body: '<!doctype html><html><head></head><body><div id="root"></div></body></html>',
+    }),
+  );
+  await page.goto("/deployment-window-test");
+  await page.evaluate(async () => {
+    const refreshModule = "/@react-refresh";
+    const { default: refresh } = await import(/* @vite-ignore */ refreshModule);
+    refresh.injectIntoGlobalHook(window);
+    Object.assign(window, {
+      $RefreshReg$: () => {},
+      $RefreshSig$: () => (type: unknown) => type,
+      __vite_plugin_react_preamble_installed__: true,
+    });
+    const mocksModule = "/node_modules/@tauri-apps/api/mocks.js";
+    const { mockIPC, mockWindows } = await import(/* @vite-ignore */ mocksModule);
+    const calls: string[] = [];
+    (window as unknown as { deploymentCalls: string[] }).deploymentCalls = calls;
+    const settings = {
+      appearance: { theme: "dark", syncWithOs: false },
+      deployment: { servers: [{ id: "staging", name: "Staging", kind: "local", rootPath: "/srv/app" }] },
+    };
+    let launch = true;
+    const local = "<?php\nclass Perfil {\n    public $name = 'Local';\n}\n";
+    const remote = "<?php\nclass Perfil {\n    public $name = 'Remote';\n}\n";
+    mockWindows("deployment-main", "main");
+    mockIPC(
+      (command: string, args: Record<string, unknown>) => {
+        calls.push(command);
+        if (/deploy_(upload|download|sync|delete)|doc_save|fs_write/.test(command)) throw new Error("Unexpected write");
+        if (command === "app_info")
+          return { platform: "windows", version: "test", configDir: "/config", wayland: false };
+        if (command === "settings_get") return settings;
+        if (command === "project_current") return { root: "/second", name: "Second", settings };
+        if (command === "window_take_launch") {
+          if (!launch) return null;
+          launch = false;
+          return { deployment: { server: "staging", paths: ["/second/perfil.php"] } };
+        }
+        if (command === "deploy_coverage") return [{ server: "staging", paths: ["/second/perfil.php"], skipped: [] }];
+        if (command === "deploy_compare")
+          return [
+            {
+              path: "perfil.php",
+              remotePath: "/srv/app/perfil.php",
+              local: { size: local.length, mtime: 1700000100 },
+              remote: { size: remote.length, mtime: 1700000000 },
+              status: "localNewer",
+            },
+          ];
+        if (command === "remote_open") return "/snapshot/perfil.php";
+        if (command === "fs_probe") return { size: local.length, binary: false, tooLarge: false };
+        if (command === "fs_read_text") return String(args.path).startsWith("/snapshot/") ? remote : local;
+        if (command === "doc_open") throw new Error("Read-only test fixture");
+        if (command === "languages") return [];
+        if (command === "plugin:window|is_maximized" || command === "plugin:window|is_fullscreen") return false;
+        return null;
+      },
+      { shouldMockEvents: true },
+    );
+    const entry = "/src/main.tsx";
+    await import(/* @vite-ignore */ entry);
+  });
+  const comparison = page.getByRole("region", { name: "Diff Between 'local files' and 'files on Staging'" });
+  await expect(comparison.getByRole("grid", { name: "Files to synchronize" })).toBeVisible();
+  await expect(comparison.getByRole("region", { name: "perfil.php" }).getByRole("textbox")).toHaveCount(2);
+  await expect(page.getByRole("dialog")).toHaveCount(0);
+  await expect(page.getByRole("tree", { name: "Project" })).toHaveCount(0);
+  const frame = await comparison.boundingBox();
+  expect(frame!.y).toBe(0);
+  expect(frame!.height).toBe(page.viewportSize()!.height);
+  await expect(comparison.getByRole("button", { name: "Synchronize All", exact: true })).toBeInViewport();
+  await expect(comparison.getByRole("button", { name: "Synchronize Selected", exact: true })).toBeVisible();
+  await comparison.getByRole("button", { name: "Minimize", exact: true }).click();
+  await comparison.getByRole("button", { name: "Maximize", exact: true }).click();
+  // The caption buttons reach the window API asynchronously.
+  const calls = () => page.evaluate(() => (window as unknown as { deploymentCalls: string[] }).deploymentCalls);
+  await expect.poll(calls).toContain("plugin:window|minimize");
+  await expect.poll(calls).toContain("plugin:window|toggle_maximize");
+  expect(errors).toEqual([]);
+  await page.screenshot({ path: info.outputPath("deployment-native-window.png") });
+});
+
+async function showComparison(page: Page) {
+  await page.evaluate(async () => {
+    const projectModule = "/src/platform/project.ts";
+    const settingsModule = "/src/platform/remoteSettings.ts";
+    const stateModule = "/src/features/deployment/store.ts";
+    const routeModule = "/src/platform/tauriCore.ts";
+    const backendModule = "/src/editor/core/backend.ts";
+    const [{ useProject }, { DEFAULT_DEPLOYMENT_SERVER }, { useDeployment }, { setInvokeRoute }, { docBackend }] =
+      await Promise.all([
+        import(/* @vite-ignore */ projectModule),
+        import(/* @vite-ignore */ settingsModule),
+        import(/* @vite-ignore */ stateModule),
+        import(/* @vite-ignore */ routeModule),
+        import(/* @vite-ignore */ backendModule),
+      ]);
+    const local: Record<string, string> = {
+      "app.js": "export const version = 'local';\n",
+      "perfil.php":
+        "<?php\nclass Perfil extends AppModel {\n    var $name = 'Perfil';\n    var $useTable = 'app_perfiles';\n    var $displayField = 'descripcion';\n\n    function getPerfilesValidos($model) {\n        return $this->find('list', [\n            'fields' => [$this->alias . '.id', $this->alias . '.descripcion'],\n            'order' => $this->alias . '.descripcion ASC',\n        ]);\n    }\n}\n",
+      "hidden.php": "alpha",
+      "same.js": "same",
+    };
+    const remote: Record<string, string> = {
+      "app.js": "export const version = 'deployed';\n",
+      "perfil.php":
+        "<?php\nclass Perfil extends AppModel {\n    var $name = 'Perfil';\n    var $useTable = 'app_perfiles';\n}\n",
+      "hidden.php": "bravo",
+      "same.js": "same",
+    };
+    const root = useProject.getState().project.root;
+    for (const [path, content] of Object.entries(local)) docBackend().files.set(`${root}/${path}`, content);
+    const writes: string[] = [];
+    (window as unknown as { deploymentWrites: string[] }).deploymentWrites = writes;
+    const syncState = { enabled: false, transfers: [] as { path: string; action: string }[][] };
+    (window as unknown as { deploymentSyncState: typeof syncState }).deploymentSyncState = syncState;
+    const text = (path: string) => (path.startsWith("/snapshot/") ? remote : local)[path.split("/").at(-1)!] ?? "";
+    setInvokeRoute((command: string, args: Record<string, unknown>) => {
+      const path = String(args?.path ?? "");
+      if (command === "remote_open") return Promise.resolve(`/snapshot/${path.split("/").at(-1)}`);
+      if (command === "fs_probe") return Promise.resolve({ size: text(path).length, binary: false, tooLarge: false });
+      if (command === "fs_read_text") return Promise.resolve(text(path));
+      if (command === "fs_read_range") {
+        const content = text(path);
+        return Promise.resolve({
+          total: content.length,
+          offset: args.offset,
+          data: btoa(content.slice(Number(args.offset), Number(args.offset) + Number(args.len))),
+        });
+      }
+      if (command === "doc_open") return Promise.reject(new Error("No live document in this fixture"));
+      if (command === "deploy_sync" && syncState.enabled) {
+        const steps = args.steps as { path: string; action: string }[];
+        syncState.transfers.push(steps.map((step) => ({ ...step })));
+        writes.push(command);
+        for (const step of steps) {
+          if (step.action === "upload") remote[step.path] = local[step.path]!;
+          else if (step.action === "download") local[step.path] = remote[step.path]!;
+          else if (step.action === "deleteLocal") delete local[step.path];
+          else if (step.action === "deleteRemote") delete remote[step.path];
+        }
+        return Promise.resolve({ files: steps.length, skipped: 0, errors: [] });
+      }
+      if (command === "deploy_compare") {
+        const name = path.slice(root.length + 1);
+        if (local[name] === undefined && remote[name] === undefined) return Promise.resolve([]);
+        const identical = local[name] === remote[name];
+        return Promise.resolve([
+          {
+            path: name,
+            remotePath: `/srv/app/${name}`,
+            local: local[name] === undefined ? null : { size: local[name]!.length, mtime: 1_700_000_100 },
+            remote:
+              remote[name] === undefined
+                ? null
+                : { size: remote[name]!.length, mtime: identical ? 1_700_000_100 : 1_700_000_000 },
+            status:
+              local[name] === undefined
+                ? "remoteOnly"
+                : remote[name] === undefined
+                  ? "localOnly"
+                  : identical
+                    ? "same"
+                    : "localNewer",
+          },
+        ]);
+      }
+      if (/deploy_(upload|download|sync|delete)|doc_save|fs_write/.test(command)) {
+        writes.push(command);
+        return Promise.reject(new Error("Unexpected write"));
+      }
+      return null;
+    });
+    const entries = Object.keys(local).map((path) => ({
+      path,
+      remotePath: `/srv/app/${path}`,
+      local: { size: local[path]!.length, mtime: 1_700_000_100 },
+      remote: { size: remote[path]!.length, mtime: 1_700_000_000 },
+      status: path === "hidden.php" || path === "same.js" ? "same" : "localNewer",
+    }));
+    useProject.setState({
+      settings: {
+        ...useProject.getState().settings,
+        appearance: { ...useProject.getState().settings?.appearance, theme: "dark", syncWithOs: false },
+        deployment: {
+          servers: [
+            { ...DEFAULT_DEPLOYMENT_SERVER, id: "staging", kind: "local", name: "Staging", rootPath: "/srv/app" },
+          ],
+        },
+      },
+    });
+    useDeployment.setState({
+      sync: {
+        server: "staging",
+        serverName: "Staging",
+        paths: [useProject.getState().project.root],
+        entries,
+        skipped: [],
+        request: null,
+        error: null,
+        choices: Object.fromEntries(entries.map((entry) => [entry.path, entry.status === "same" ? "skip" : "upload"])),
+        hideSame: true,
+        running: false,
+      },
+    });
+  });
+}
+
+test("deployment shows mirrored lists and a selectable side-by-side content diff", async ({
+  workbench: page,
+}, info) => {
+  await showComparison(page);
+  const dialog = page.getByRole("dialog", { name: "Diff Between 'local files' and 'files on Staging'" });
+  await expect(dialog).toBeVisible();
+  const grid = dialog.getByRole("grid", { name: "Files to synchronize" });
+  await grid.getByRole("combobox", { name: "Action perfil.php" }).locator("..", {}).locator("..").click();
+  const preview = dialog.locator('[aria-label="Deployment content comparison"]');
+  await expect(preview.locator(".cm-editor")).toHaveCount(2);
+  await expect(preview.locator(".cm-editor").first()).toContainText("getPerfilesValidos");
+  await expect(preview.locator(".cm-editor").last()).not.toContainText("getPerfilesValidos");
+  await expect(preview.locator(".cm-editor").last().locator(".cm-content")).toHaveAttribute("contenteditable", "false");
+  await expect(dialog.getByRole("toolbar", { name: "Diff" })).toBeVisible();
+  await expect(dialog.getByRole("separator", { name: "Resize file list and diff preview" })).toBeVisible();
+  await dialog.screenshot({ path: info.outputPath("deployment-comparison.png"), animations: "disabled" });
+  await page.getByLabel("Action perfil.php", { exact: true }).selectOption("skip");
+  await grid.focus();
+  await page.keyboard.press("Enter");
+  await expect(dialog).toBeVisible();
+  expect(await page.evaluate(() => (window as unknown as { deploymentWrites: string[] }).deploymentWrites)).toEqual([]);
+});
+
+test("Synchronize Selected and Enter transfer one file at a time while the comparison stays open", async ({
+  workbench: page,
+}) => {
+  await showComparison(page);
+  await page.evaluate(() => {
+    (window as unknown as { deploymentSyncState: { enabled: boolean } }).deploymentSyncState.enabled = true;
+  });
+  const dialog = page.getByRole("dialog", { name: "Diff Between 'local files' and 'files on Staging'" });
+  const grid = dialog.getByRole("grid", { name: "Files to synchronize" });
+  await grid.getByRole("combobox", { name: "Action perfil.php" }).locator("..").locator("..").click();
+  await dialog.getByRole("button", { name: "Synchronize Selected", exact: true }).click();
+  await expect(dialog).toBeVisible();
+  await expect(grid.getByRole("combobox", { name: "Action perfil.php" })).toHaveCount(0);
+  await expect(grid.getByRole("combobox", { name: "Action app.js" })).toHaveValue("upload");
+  await expect(dialog.locator('[aria-label="Deployment content comparison"] .cm-editor').last()).toContainText(
+    "deployed",
+  );
+  await grid.focus();
+  await page.keyboard.press("Enter");
+  await expect(dialog.getByRole("button", { name: "Synchronize All", exact: true })).toBeDisabled();
+  await expect(dialog.getByRole("button", { name: "Synchronize Selected", exact: true })).toBeDisabled();
+  await expect(dialog).toBeVisible();
+  expect(
+    await page.evaluate(
+      () => (window as unknown as { deploymentSyncState: { transfers: unknown[] } }).deploymentSyncState.transfers,
+    ),
+  ).toEqual([[{ path: "perfil.php", action: "upload" }], [{ path: "app.js", action: "upload" }]]);
+});
+
+test("binary content finds changes hidden by metadata and file filters keep the preview in sync", async ({
+  workbench: page,
+}) => {
+  await showComparison(page);
+  await page.getByLabel("Compare by", { exact: true }).selectOption("content");
+  await expect(page.getByLabel("Action hidden.php", { exact: true })).toHaveValue("upload");
+  await expect(page.getByLabel("Action same.js", { exact: true })).toHaveCount(0);
+  await page.getByLabel("Filter by name", { exact: true }).fill("hidden.php");
+  const preview = page.locator('[aria-label="Deployment content comparison"]');
+  await expect(preview.locator(".cm-editor").first()).toContainText("alpha");
+  await expect(preview.locator(".cm-editor").last()).toContainText("bravo");
+  await page.getByLabel("Action hidden.php", { exact: true }).selectOption("skip");
+  expect(await page.evaluate(() => (window as unknown as { deploymentWrites: string[] }).deploymentWrites)).toEqual([]);
+});
diff --git a/e2e/editor.spec.ts b/e2e/editor.spec.ts
index 4f8163df..6f6a79d5 100644
--- a/e2e/editor.spec.ts
+++ b/e2e/editor.spec.ts
@@ -1,3 +1,4 @@
+import type { Page } from "@playwright/test";
 import { expect, openFromTree, test } from "./fixtures";
 
 test("opens a file from the project tree and types into it", async ({ workbench: page }) => {
@@ -25,6 +26,49 @@ test("⌘F opens the find bar and highlights matches; Escape returns to the edit
   await expect(editor.locator(".cm-content")).toBeFocused();
 });
 
+test("each file keeps its own find bar, query and caret", async ({ workbench: page }) => {
+  const find = page.getByRole("textbox", { name: "Find" });
+  const caret = page.getByRole("button", { name: /^\d+:\d+/ });
+  const tab = (name: string) => page.getByRole("tablist", { name: "Editor tabs" }).getByRole("tab", { name });
+
+  const a = await openFromTree(page, "build.gradle.kts");
+  await a.locator(".cm-content").click();
+  await page.keyboard.press("Meta+f");
+  await find.fill("Order");
+  await expect(caret).toHaveText(/\(5 chars\)/);
+  const caretA = await caret.textContent();
+
+  // Another file has no bar until ⌘F; opening one starts from the last search without moving the caret.
+  const b = await openFromTree(page, "settings.gradle.kts");
+  await expect(find).toBeHidden();
+  await b.locator(".cm-line", { hasText: "@PostMapping" }).click();
+  const caretB = await caret.textContent();
+  await page.keyboard.press("Meta+f");
+  await expect(find).toHaveValue("Order");
+  await expect(caret).toHaveText(caretB!);
+  await find.fill("status");
+  await expect(caret).toHaveText(/\(6 chars\)/);
+  const caretB2 = await caret.textContent();
+
+  // A third file starts from the latest search.
+  await openFromTree(page, "README.md");
+  await expect(find).toBeHidden();
+  await page.keyboard.press("Meta+f");
+  await expect(find).toHaveValue("status");
+
+  // Switching back shows each file's own query, caret untouched.
+  await tab("build.gradle.kts").click();
+  await expect(find).toHaveValue("Order");
+  await expect(caret).toHaveText(caretA!);
+  await tab("settings.gradle.kts").click();
+  await expect(find).toHaveValue("status");
+  await expect(caret).toHaveText(caretB2!);
+  await find.press("Escape");
+  await expect(find).toBeHidden();
+  await tab("build.gradle.kts").click();
+  await expect(find).toHaveValue("Order");
+});
+
 test("opening several files creates tabs and ⌘W closes the active one", async ({ workbench: page }) => {
   await openFromTree(page, "build.gradle.kts");
   await openFromTree(page, "settings.gradle.kts");
@@ -59,3 +103,44 @@ test("breadcrumbs follow the caret into the symbol under it", async ({ workbench
   await page.keyboard.press("Escape");
   await expect(bar).toBeHidden();
 });
+
+/** What the in-memory backend has saved for `path`. */
+const saved = (page: Page, path: string) =>
+  page.evaluate(async (path) => {
+    const backendModule = "/src/editor/core/backend.ts";
+    const { docBackend } = await import(/* @vite-ignore */ backendModule);
+    return (docBackend() as { files: Map<string, string> }).files.get(path) ?? null;
+  }, path);
+
+test("an edit marks the tab modified and ⌘S saves it", async ({ workbench: page }) => {
+  const editor = await openFromTree(page, "build.gradle.kts");
+  // The only tab; its modified dot sits next to its close button.
+  const tabs = page.getByRole("tablist", { name: "Editor tabs" });
+  await expect(tabs.getByLabel("Modified")).toHaveCount(0);
+  await editor.locator(".cm-line", { hasText: "return order.toDto()" }).click();
+  await page.keyboard.press("End");
+  await page.keyboard.press("Enter");
+  await page.keyboard.type("// saved by e2e");
+  await expect(tabs.getByLabel("Modified")).toHaveCount(1);
+  expect(await saved(page, "/dev/acme-api/build.gradle.kts")).toBeNull();
+  await page.keyboard.press("Meta+s");
+  await expect(tabs.getByLabel("Modified")).toHaveCount(0);
+  expect(await saved(page, "/dev/acme-api/build.gradle.kts")).toContain("// saved by e2e");
+});
+
+test("⌘R replaces every match in the file", async ({ workbench: page }) => {
+  const editor = await openFromTree(page, "build.gradle.kts");
+  await editor.locator(".cm-content").click();
+  await page.keyboard.press("Meta+r");
+  const bar = page.getByRole("search", { name: "Replace in file" });
+  await bar.getByRole("textbox", { name: "Find" }).fill("OrderDto");
+  await bar.getByRole("textbox", { name: "Replace" }).fill("OrderView");
+  await bar.getByRole("button", { name: "Replace All" }).click();
+  const content = editor.locator(".cm-content");
+  await expect(content).not.toContainText("OrderDto");
+  await expect(editor.locator(".cm-line", { hasText: "OrderView" })).toHaveCount(2);
+  // One undo step takes the whole replacement back.
+  await content.click();
+  await page.keyboard.press("Meta+z");
+  await expect(editor.locator(".cm-line", { hasText: "OrderDto" })).toHaveCount(2);
+});
diff --git a/e2e/fixtures.ts b/e2e/fixtures.ts
index 05369faf..71cda429 100644
--- a/e2e/fixtures.ts
+++ b/e2e/fixtures.ts
@@ -23,6 +23,97 @@ export const test = base.extend<{ workbench: Page }>({
 
 export { expect };
 
+/** What `stubDesktop` installs on `window.__ipc`; handlers are defined inside `page.evaluate`. */
+export interface IpcStub {
+  /** Command name as the backend registers it (`lsp_goto`) → its answer; throw `{ kind, message }` for an `IdeError`. */
+  handlers: Record<string, (args: Record<string, unknown>) => unknown>;
+  calls: { cmd: string; args: Record<string, unknown> }[];
+  /** Sends one message down a `Channel` passed to a command. */
+  send(channel: unknown, message: unknown): void;
+  /** Emits an `IdeEvent` the way the backend does. */
+  emit(event: { type: string } & Record<string, unknown>): void;
+}
+
+declare global {
+  interface Window {
+    __ipc: IpcStub;
+  }
+}
+
+/**
+ * Switches the page into desktop mode over a stubbed native layer: commands with a handler answer,
+ * every other command fails as unavailable, the way a backend without that feature does. Documents
+ * keep their in-memory backend; the project tree keeps its sample only while it isn't reloaded, so
+ * open files from it before stubbing.
+ */
+export async function stubDesktop(page: Page) {
+  await page.evaluate(async () => {
+    // Documents stay in memory: the editor's backend is chosen once, on first use.
+    const backendModule = "/src/editor/core/backend.ts";
+    const { docBackend } = await import(/* @vite-ignore */ backendModule);
+    docBackend();
+    const callbacks = new Map<number, (message: unknown) => void>();
+    const channelIndex = new Map<number, number>();
+    const listeners: { event: string; handler: number }[] = [];
+    let nextCallback = 1;
+    const ipc: IpcStub = {
+      // This window is the only one.
+      handlers: { "plugin:window|get_all_windows": () => [] },
+      calls: [],
+      send(channel, message) {
+        const id = (channel as { id: number }).id;
+        const index = channelIndex.get(id) ?? 0;
+        channelIndex.set(id, index + 1);
+        callbacks.get(id)?.({ index, message });
+      },
+      emit(event) {
+        for (const l of listeners)
+          if (l.event === "ide://event") callbacks.get(l.handler)?.({ event: l.event, id: 0, payload: event });
+      },
+    };
+    window.__ipc = ipc;
+    Object.defineProperty(window, "__TAURI_EVENT_PLUGIN_INTERNALS__", {
+      configurable: true,
+      value: { unregisterListener: () => {} },
+    });
+    Object.defineProperty(window, "__TAURI_INTERNALS__", {
+      configurable: true,
+      value: {
+        metadata: { currentWindow: { label: "main" }, currentWebview: { label: "main", windowLabel: "main" } },
+        transformCallback(cb: (message: unknown) => void) {
+          const id = nextCallback++;
+          callbacks.set(id, cb);
+          return id;
+        },
+        unregisterCallback(id: number) {
+          callbacks.delete(id);
+        },
+        convertFileSrc: (path: string) => path,
+        async invoke(cmd: string, args: Record<string, unknown> = {}) {
+          ipc.calls.push({ cmd, args });
+          if (cmd === "plugin:event|listen") {
+            listeners.push({ event: args.event as string, handler: args.handler as number });
+            return listeners.length;
+          }
+          const handler = ipc.handlers[cmd];
+          // Tauri plugin calls (windows, events) succeed quietly; app commands are what tests stub.
+          if (!handler && cmd.startsWith("plugin:")) return null;
+          if (!handler) throw { kind: "unavailable", message: `${cmd} is not stubbed`, detail: null };
+          return handler(args);
+        },
+      },
+    });
+    const ipcModule = "/src/platform/ipc.ts";
+    const { ideEventsReady } = await import(/* @vite-ignore */ ipcModule);
+    await ideEventsReady();
+  });
+}
+
+/** The commands the page has invoked so far under `stubDesktop`, by name. */
+export async function ipcCalls(page: Page, cmd: string): Promise<Record<string, unknown>[]> {
+  return page.evaluate((cmd) => window.__ipc.calls.filter((c) => c.cmd === cmd).map((c) => c.args), cmd);
+}
+
 /** Tool windows currently laid out (visible) in the workbench. */
 export async function visibleToolWindows(page: Page): Promise<string[]> {
   return page
diff --git a/e2e/hierarchyRefactor.spec.ts b/e2e/hierarchyRefactor.spec.ts
new file mode 100644
index 00000000..1c6ed491
--- /dev/null
+++ b/e2e/hierarchyRefactor.spec.ts
@@ -0,0 +1,172 @@
+/**
+ * Pull Members Up / Push Members Down. The language server is stubbed at the IPC layer: the
+ * Java side is covered by java/java-usages/tests/hierarchy.py against a real JDT LS.
+ */
+import type { Page } from "@playwright/test";
+import { expect, openFromTree, test } from "./fixtures";
+
+const captureDir = process.env.OPENIDEA_ACCEPTANCE_DIR;
+
+/** Opens the dialog as the action does after the server answered, for the editor's view. */
+async function openDialog(page: Page, kind: "pullUp" | "pushDown") {
+  await page.evaluate(async (kind) => {
+    const module = "/src/editor/refactor/hierarchy.ts";
+    const { useHierarchyDialog } = await import(/* @vite-ignore */ module);
+    const view = (document.querySelector(".cm-content") as unknown as { cmTile: { view: { state: { doc: unknown } } } })
+      .cmTile.view;
+    const pullUp = kind === "pullUp";
+    useHierarchyDialog.setState({
+      request: {
+        seq: 1,
+        view,
+        kind,
+        doc: 1,
+        pos: { line: 0, col: 0 },
+        text: view.state.doc,
+        info: {
+          className: pullUp ? "Dog" : "Animal",
+          targets: pullUp
+            ? [
+                { id: "animal", name: "Animal", qualifiedName: "zoo.Animal", interface: false },
+                { id: "speaker", name: "Speaker", qualifiedName: "zoo.Speaker", interface: true },
+              ]
+            : [
+                { id: "dog", name: "Dog", qualifiedName: "zoo.Dog", interface: false },
+                { id: "cat", name: "Cat", qualifiedName: "zoo.Cat", interface: false },
+              ],
+          members: pullUp
+            ? [
+                { id: "tail", label: "tail : int", kind: "field", selected: false, abstractable: false },
+                { id: "bark", label: "bark() : String", kind: "method", selected: true, abstractable: true },
+                { id: "wag", label: "wag() : int", kind: "method", selected: false, abstractable: true },
+              ]
+            : [
+                { id: "name", label: "name : String", kind: "field", selected: false, abstractable: false },
+                { id: "describe", label: "describe() : String", kind: "method", selected: true, abstractable: true },
+              ],
+        },
+      },
+    });
+  }, kind);
+}
+
+/** Stubs the server's check and the edit application; returns what reached them. */
+async function stubServer(page: Page, problems: { severity: string; message: string }[]) {
+  await page.evaluate(async (problems) => {
+    const module = "/src/platform/ipc.ts";
+    const { commands } = await import(/* @vite-ignore */ module);
+    // Only the stubbed commands answer; window lookups by other features keep working.
+    Object.defineProperty(window, "__TAURI_INTERNALS__", {
+      configurable: true,
+      value: {
+        transformCallback: () => 1,
+        invoke: async () => null,
+        metadata: { currentWindow: { label: "main" }, currentWebview: { label: "main", windowLabel: "main" } },
+      },
+    });
+    const seen = ((window as unknown as { hierarchySeen: unknown[] }).hierarchySeen = [] as unknown[]);
+    commands.lspHierarchyRefactor = async (...args: unknown[]) => {
+      seen.push({ refactor: args.slice(3) });
+      return {
+        status: "ok",
+        data: {
+          problems,
+          edit: {
+            files: [
+              {
+                kind: "edit",
+                path: "/dev/acme-api/README.md",
+                edits: [{ range: { start: { line: 0, col: 0 }, end: { line: 0, col: 0 } }, new_text: "" }],
+              },
+            ],
+          },
+        },
+      };
+    };
+    commands.applyWorkspaceEdit = async (edit: unknown) => {
+      seen.push({ apply: edit });
+      return { status: "ok", data: null };
+    };
+  }, problems);
+}
+
+const seen = (page: Page) => page.evaluate(() => (window as unknown as { hierarchySeen: unknown[] }).hierarchySeen);
+
+test("the editor's Refactor menu offers Pull Members Up and Push Members Down", async ({ workbench: page }) => {
+  const editor = await openFromTree(page, "README.md");
+  await editor.locator(".cm-content").click({ button: "right" });
+  await page.getByRole("menuitem", { name: "Refactor", exact: true }).hover();
+  await expect(page.getByRole("menuitem", { name: /^Pull Members Up…/ })).toBeVisible();
+  await expect(page.getByRole("menuitem", { name: /^Push Members Down…/ })).toBeVisible();
+  if (captureDir) await page.screenshot({ path: `${captureDir}/01-refactor-menu.png` });
+  await page.keyboard.press("Escape");
+});
+
+test("Pull Members Up: members, interface destination, conflicts, then the edit", async ({ workbench: page }) => {
+  await openFromTree(page, "README.md");
+  await openDialog(page, "pullUp");
+  const dialog = page.getByRole("dialog", { name: "Pull Members Up" });
+  await expect(dialog).toBeVisible();
+  await expect(dialog.getByText("Pull up members of Dog to:")).toBeVisible();
+  const member = (label: string) => dialog.getByRole("row").filter({ hasText: label });
+  // The member at the caret starts checked; fields can't be made abstract.
+  await expect(member("bark() : String").getByRole("checkbox").first()).toBeChecked();
+  await expect(member("wag() : int").getByRole("checkbox").first()).not.toBeChecked();
+  await member("tail : int").getByRole("checkbox").first().check();
+  await expect(member("tail : int").getByRole("checkbox", { name: "Make abstract" })).toBeDisabled();
+  if (captureDir) await page.screenshot({ path: `${captureDir}/02-pull-up-dialog.png` });
+
+  // To an interface, methods are declared abstract there.
+  await dialog.getByRole("button", { name: "Destination class" }).click();
+  await page.getByRole("option", { name: /zoo\.Speaker/ }).click();
+  const abstractBark = member("bark() : String").getByRole("checkbox", { name: "Make abstract" });
+  await expect(abstractBark).toBeChecked();
+  await expect(abstractBark).toBeDisabled();
+  await expect(dialog.getByText("Methods pulled up to an interface are declared abstract there.")).toBeVisible();
+  if (captureDir) await page.screenshot({ path: `${captureDir}/03-pull-up-to-interface.png` });
+
+  await stubServer(page, [
+    { severity: "error", message: "Field 'zoo.Dog.tail' is not accessible from type 'zoo.Speaker'" },
+  ]);
+  await dialog.getByRole("button", { name: "Refactor", exact: true }).click();
+  const problems = page.getByRole("alertdialog").or(page.getByRole("dialog", { name: "Problems Detected" }));
+  await expect(problems.getByText(/is not accessible from type/)).toBeVisible();
+  if (captureDir) await page.screenshot({ path: `${captureDir}/04-problems-detected.png` });
+  // Cancel: nothing applied, the dialog stays.
+  await problems.getByRole("button", { name: "Cancel", exact: true }).click();
+  await expect(dialog).toBeVisible();
+  expect(await seen(page)).toEqual([
+    {
+      refactor: [
+        "pullUp",
+        "speaker",
+        [
+          { id: "tail", makeAbstract: false },
+          { id: "bark", makeAbstract: true },
+        ],
+      ],
+    },
+  ]);
+  // Continue: the edit is applied and the dialog closes.
+  await dialog.getByRole("button", { name: "Refactor", exact: true }).click();
+  await problems.getByRole("button", { name: "Continue", exact: true }).click();
+  await expect(dialog).toBeHidden();
+  await expect.poll(async () => (await seen(page)).some((s) => "apply" in (s as object))).toBe(true);
+});
+
+test("Push Members Down keeps an abstract declaration when asked", async ({ workbench: page }) => {
+  await openFromTree(page, "README.md");
+  await openDialog(page, "pushDown");
+  const dialog = page.getByRole("dialog", { name: "Push Members Down" });
+  await expect(dialog.getByText("Push members of Animal down to:")).toBeVisible();
+  await expect(dialog.getByText("Dog, Cat")).toBeVisible();
+  const describe = dialog.getByRole("row").filter({ hasText: "describe() : String" });
+  await describe.getByRole("checkbox", { name: "Keep abstract" }).check();
+  if (captureDir) await page.screenshot({ path: `${captureDir}/05-push-down-dialog.png` });
+  await stubServer(page, []);
+  await dialog.getByRole("button", { name: "Refactor", exact: true }).click();
+  await expect(dialog).toBeHidden();
+  const calls = await seen(page);
+  expect(calls[0]).toEqual({ refactor: ["pushDown", null, [{ id: "describe", makeAbstract: true }]] });
+  expect(calls.some((s) => "apply" in (s as object))).toBe(true);
+});
diff --git a/e2e/linkedGradle.spec.ts b/e2e/linkedGradle.spec.ts
new file mode 100644
index 00000000..0ee3dc8c
--- /dev/null
+++ b/e2e/linkedGradle.spec.ts
@@ -0,0 +1,120 @@
+/** Linked Gradle builds use isolated native stubs; no real builds or files are touched. */
+import type { GradleModel, RunConfig } from "../src/platform/ipc";
+import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
+
+const build = (dir: string): GradleModel => ({
+  dir,
+  command: `/dev/acme-api/${dir}/gradlew`,
+  env: { JAVA_HOME: `/${dir}/jdk` },
+  javaVersion: 21,
+  syncedAt: 1,
+  stale: false,
+  syncError: null,
+  projects: [
+    { path: ":", name: dir, dir, buildFile: `${dir}/build.gradle`, tasks: [] },
+    {
+      path: ":app",
+      name: "app",
+      dir: `${dir}/app`,
+      buildFile: `${dir}/app/build.gradle`,
+      tasks: [{ name: "assemble", group: "build", description: "Assembles this project" }],
+    },
+  ],
+});
+
+test("links independent Gradle roots, runs identical task paths in their own builds and unlinks without deletion", async ({
+  workbench: page,
+}, info) => {
+  await stubDesktop(page);
+  await page.evaluate(
+    async ({ first, second }) => {
+      let linked = [first];
+      let runId = 0;
+      const model = () => ({ maven: null, gradle: linked });
+      const h = window.__ipc.handlers;
+      h.build_model = model;
+      h.build_sync = model;
+      h.run_configs = () => [];
+      h.run_apply_settings = (args) => args.configs;
+      h.gradle_link_projects = () => {
+        if (!linked.some((g) => g.dir === second.dir)) linked = [...linked, second];
+        return model();
+      };
+      h.gradle_unlink_projects = (args) => {
+        linked = linked.filter((g) => !(args.paths as string[]).includes(g.dir));
+        return model();
+      };
+      h["plugin:dialog|open"] = () => ["/dev/acme-api/second/settings.gradle"];
+      h.run_start = (args) => {
+        const config = args.config as RunConfig;
+        const id = ++runId;
+        setTimeout(() => window.__ipc.emit({ type: "runExited", run: id, code: 0 }), 50);
+        return { id, configId: config.id, name: config.name, pid: 4242 + id, running: true, pty: false };
+      };
+      const storeModule = "/src/features/build-tools/store.ts";
+      const { loadModel } = await import(/* @vite-ignore */ storeModule);
+      await loadModel();
+      const contributionsModule = "/src/workbench/contributions.ts";
+      const { toolWindowService } = await import(/* @vite-ignore */ contributionsModule);
+      toolWindowService().show("gradle", true);
+    },
+    { first: build("first"), second: build("second") },
+  );
+
+  const tree = page.getByRole("tree", { name: "Gradle projects" });
+  await expect(tree.getByRole("treeitem", { name: "first", exact: true })).toBeVisible();
+  await expect(tree.getByRole("treeitem", { name: "second", exact: true })).toHaveCount(0);
+  await page.screenshot({ path: info.outputPath("gradle-one-root.png"), animations: "disabled" });
+
+  await page.getByRole("button", { name: "Link Gradle Projects", exact: true }).click();
+  await expect
+    .poll(() => ipcCalls(page, "gradle_link_projects"))
+    .toEqual([{ paths: ["/dev/acme-api/second/settings.gradle"] }]);
+  await expect(tree.getByRole("treeitem", { name: "second", exact: true })).toBeVisible();
+  // Reloading the model reads the persisted linkage again.
+  await page.evaluate(async () => {
+    const storeModule = "/src/features/build-tools/store.ts";
+    const { loadModel } = await import(/* @vite-ignore */ storeModule);
+    await loadModel();
+    const actionModule = "/src/platform/actions.ts";
+    const { executeAction } = await import(/* @vite-ignore */ actionModule);
+    await executeAction("gradle.expandAll");
+    await executeAction("gradle.toggleOffline");
+  });
+  const tasks = tree.getByRole("treeitem", { name: /^assemble\b/ });
+  await expect(tasks).toHaveCount(2);
+  await page.screenshot({ path: info.outputPath("gradle-two-roots.png"), animations: "disabled" });
+
+  await tasks.nth(0).dblclick();
+  await expect.poll(async () => (await ipcCalls(page, "run_start")).length).toBe(1);
+  await tasks.nth(1).dblclick();
+  await expect.poll(async () => (await ipcCalls(page, "run_start")).length).toBe(2);
+  const runs = (await ipcCalls(page, "run_start")).map((args) => args.config as RunConfig);
+  expect(runs[0]!.id).not.toBe(runs[1]!.id);
+  for (const [index, dir] of ["first", "second"].entries()) {
+    expect(runs[index]).toMatchObject({
+      command: `/dev/acme-api/${dir}/gradlew`,
+      cwd: dir,
+      args: [":app:assemble", "--offline"],
+      env: { JAVA_HOME: `/${dir}/jdk` },
+    });
+  }
+
+  for (const dir of ["second", "first"]) {
+    await tree.getByRole("treeitem", { name: dir, exact: true }).click({ button: "right" });
+    await page.getByRole("menuitem", { name: "Unlink Gradle Project", exact: true }).click();
+    const dialog = page.getByRole("dialog", { name: "Unlink Gradle project?" });
+    await expect(dialog).toContainText("Files will remain");
+    await dialog.getByRole("button", { name: "Unlink", exact: true }).click();
+    await expect(tree.getByRole("treeitem", { name: dir, exact: true })).toHaveCount(0);
+  }
+  await expect
+    .poll(() => ipcCalls(page, "gradle_unlink_projects"))
+    .toEqual([{ paths: ["second"] }, { paths: ["first"] }]);
+  await expect(page.getByText("No Gradle projects", { exact: true })).toBeVisible();
+  await expect(page.getByRole("button", { name: "Link Gradle Projects", exact: true })).toBeVisible();
+  expect(
+    await page.evaluate(() => window.__ipc.calls.filter((c) => /^fs_(?:delete|remove|trash)/.test(c.cmd))),
+  ).toEqual([]);
+  await page.screenshot({ path: info.outputPath("gradle-unlinked.png"), animations: "disabled" });
+});
diff --git a/e2e/openProject.spec.ts b/e2e/openProject.spec.ts
new file mode 100644
index 00000000..12445bd1
--- /dev/null
+++ b/e2e/openProject.spec.ts
@@ -0,0 +1,71 @@
+/**
+ * Closing a project returns to the Welcome screen, and a recent project opens from there into the
+ * workbench. The backend's project handling is stubbed at the IPC layer; `crates/ide-host/tests`
+ * covers opening and closing real projects.
+ */
+import { doubleShift, expect, ipcCalls, stubDesktop, test } from "./fixtures";
+
+const BILLING = "/dev/billing";
+
+test("Close Project shows the Welcome screen; a recent project opens from it once trusted", async ({
+  workbench: page,
+}) => {
+  await stubDesktop(page);
+  await page.evaluate((root) => {
+    const entry = (name: string, kind: string) => ({
+      name,
+      path: `${root}/${name}`,
+      kind,
+      size: 0,
+      mtimeMs: null,
+      ignored: false,
+      excluded: false,
+    });
+    const h = window.__ipc.handlers;
+    h.close_project = () => null;
+    h.app_info = () => ({ version: "1.0.0", platform: "macos", configDir: "/Users/dev/.openidea", wayland: false });
+    h.recent_projects = () => [
+      { path: root, name: "billing", openedAtMs: Date.now() - 3_600_000, branch: "main" },
+      { path: "/dev/acme-api", name: "acme-api", openedAtMs: Date.now(), branch: "main" },
+    ];
+    let trusted = false;
+    h.project_trust_status = (args) => ({ root: args.path, trusted, decided: trusted });
+    h.project_trust_set = (args) => {
+      trusted = Boolean(args.trusted);
+      return null;
+    };
+    h.open_project = (args) => ({
+      trusted: true,
+      root: args.path,
+      name: String(args.path).split("/").pop(),
+      isGit: false,
+      settings: {},
+    });
+    h.fs_read_dir = (args) =>
+      args.path === root ? [entry("src", "dir"), entry("package.json", "file"), entry("README.md", "file")] : [];
+  }, BILLING);
+
+  await doubleShift(page);
+  const search = page.getByRole("dialog", { name: "Search Everywhere" });
+  await search.getByRole("combobox").fill("Close Project");
+  await expect(search.getByRole("option", { name: /^Close Project/ }).first()).toBeVisible();
+  await page.keyboard.press("Enter");
+
+  const projects = page.getByRole("region", { name: "Projects" });
+  await expect(page.getByRole("tree", { name: "Project" })).toBeHidden();
+  await expect(projects.getByRole("option", { name: /^billing/ })).toBeVisible();
+  expect(await ipcCalls(page, "close_project")).toHaveLength(1);
+
+  await projects.getByRole("option", { name: /^billing/ }).click();
+  // A project not yet trusted asks first.
+  const trust = page.getByRole("dialog", { name: "Trust and Open Project?" });
+  await expect(trust).toBeVisible();
+  expect(await ipcCalls(page, "open_project")).toHaveLength(0);
+  await trust.getByRole("button", { name: "Trust Project" }).click();
+  await expect(trust).toBeHidden();
+  expect(await ipcCalls(page, "project_trust_set")).toEqual([{ path: BILLING, trusted: true, folder: false }]);
+  await expect.poll(() => ipcCalls(page, "open_project")).toEqual([{ path: BILLING }]);
+  const tree = page.getByRole("tree", { name: "Project" });
+  await expect(tree.getByRole("treeitem", { name: /^billing/ })).toBeVisible();
+  await expect(tree.getByRole("treeitem", { name: "package.json" })).toBeVisible();
+});
diff --git a/e2e/run.spec.ts b/e2e/run.spec.ts
new file mode 100644
index 00000000..75596434
--- /dev/null
+++ b/e2e/run.spec.ts
@@ -0,0 +1,82 @@
+/**
+ * Running a configuration: output streams into the Run tool window, the exit shows, and Stop ends
+ * the process. Processes are stubbed at the IPC layer; `crates/ide-run` covers spawning them.
+ */
+import type { Page } from "@playwright/test";
+import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
+
+const RUN_ID = 7;
+
+/** One saved `npm run dev` configuration; `run_start` prints `output` and exits with `exit` unless null. */
+async function stubRun(page: Page, output: { kind: string; text: string }[], exit: number | null) {
+  await stubDesktop(page);
+  await page.evaluate(
+    async ({ output, exit, runId }) => {
+      const config = {
+        id: "npm:dev",
+        name: "dev",
+        kind: "npm",
+        command: "npm",
+        args: ["run", "dev"],
+        cwd: "/dev/acme-api",
+        env: {},
+        detected: false,
+        isTest: false,
+        debugAdapter: null,
+      };
+      const h = window.__ipc.handlers;
+      h.run_configs = () => [config];
+      h.run_apply_settings = (args) => args.configs;
+      h.run_start = (args) => {
+        setTimeout(() => {
+          for (const chunk of output) window.__ipc.send(args.onOutput, chunk);
+          if (exit !== null) setTimeout(() => window.__ipc.emit({ type: "runExited", run: runId, code: exit }), 50);
+        }, 50);
+        return { id: runId, configId: config.id, name: config.name, pid: 4242, running: true, pty: false };
+      };
+      h.run_stop = () => {
+        setTimeout(() => window.__ipc.emit({ type: "runExited", run: runId, code: 143 }), 50);
+        return null;
+      };
+      const runModule = "/src/features/run/store.ts";
+      const { loadConfigs, selectConfig } = await import(/* @vite-ignore */ runModule);
+      await loadConfigs();
+      selectConfig(config.id);
+    },
+    { output, exit, runId: RUN_ID },
+  );
+}
+
+test("⌃R runs the selected configuration and shows its output and exit", async ({ workbench: page }) => {
+  await stubRun(
+    page,
+    [
+      { kind: "stdout", text: "> acme-api@1.0.0 dev\n" },
+      { kind: "stdout", text: "Server listening on http://localhost:8080\n" },
+      { kind: "stderr", text: "warning: config/dev.json not found, using defaults\n" },
+    ],
+    0,
+  );
+  await page.keyboard.press("Control+r");
+  const run = page.getByRole("region", { name: "Run", exact: true });
+  await expect(run).toBeVisible();
+  await expect(run.getByText("Server listening on http://localhost:8080")).toBeVisible();
+  await expect(run.getByText("warning: config/dev.json not found, using defaults")).toBeVisible();
+  // Once the process exits, Stop is off and the session's tab tells the exit code.
+  await expect(run.getByRole("button", { name: "Stop" })).toBeDisabled();
+  await expect(run.getByRole("tab", { name: "dev" })).toHaveAttribute("data-tooltip", /exit code 0$/);
+  const [started] = await ipcCalls(page, "run_start");
+  expect(started).toMatchObject({ config: { id: "npm:dev", command: "npm", args: ["run", "dev"] } });
+});
+
+test("⌘F2 stops a running process", async ({ workbench: page }) => {
+  await stubRun(page, [{ kind: "stdout", text: "Watching for changes…\n" }], null);
+  await page.keyboard.press("Control+r");
+  const run = page.getByRole("region", { name: "Run", exact: true });
+  await expect(run.getByText("Watching for changes…")).toBeVisible();
+  await expect(run.getByRole("button", { name: "Stop" })).toBeEnabled();
+  await page.keyboard.press("Meta+F2");
+  await expect.poll(() => ipcCalls(page, "run_stop")).toEqual([{ id: RUN_ID }]);
+  await expect(run.getByRole("button", { name: "Stop" })).toBeDisabled();
+  await expect(run.getByRole("tab", { name: "dev" })).toHaveAttribute("data-tooltip", /exit code 143$/);
+});
diff --git a/e2e/search.spec.ts b/e2e/search.spec.ts
index cdf4fefc..e27aedc9 100644
--- a/e2e/search.spec.ts
+++ b/e2e/search.spec.ts
@@ -1,4 +1,4 @@
-import { doubleShift, expect, test } from "./fixtures";
+import { doubleShift, expect, ipcCalls, stubDesktop, test } from "./fixtures";
 
 test("double Shift opens Search Everywhere with its tabs; Escape closes it", async ({ workbench: page }) => {
   await doubleShift(page);
@@ -23,15 +23,92 @@ test("Search Everywhere finds and runs an action", async ({ workbench: page }) =
   await expect(page.getByRole("list", { name: /language servers/i })).toBeVisible();
 });
 
+const ROOT = "/dev/acme-api";
+const SERVICE = `${ROOT}/src/main/kotlin/com/acme/orders/service/OrderService.kt`;
+
 test("Search Everywhere finds a file and opens it", async ({ workbench: page }) => {
-  // TODO(search): plain-browser mode has no in-memory `findFiles`, so the Files
-  // source returns nothing. Un-fixme once search/everywhere gets browser deps
-  // (e.g. backed by the project-tree sample file system).
-  test.fixme(true, "Search Everywhere has no in-memory file source in browser mode");
+  // The project's file index is stubbed at the IPC layer.
+  await stubDesktop(page);
+  await page.evaluate((path) => {
+    window.__ipc.handlers.find_files = (args) =>
+      String(args.query).startsWith("OrderSer")
+        ? [{ path, relPath: path.slice("/dev/acme-api/".length), score: 100, indices: [] }]
+        : [];
+  }, SERVICE);
   await doubleShift(page);
   const dialog = page.getByRole("dialog", { name: "Search Everywhere" });
   await dialog.getByRole("combobox").fill("OrderService");
   await expect(dialog.getByRole("option", { name: /OrderService\.kt/ })).toBeVisible();
   await page.keyboard.press("Enter");
-  await expect(page.getByRole("tab", { name: "OrderService.kt" })).toBeVisible();
+  await expect(page.getByRole("tab", { name: "OrderService.kt" })).toHaveAttribute("aria-selected", "true");
+  await expect(page.getByRole("textbox", { name: `Editor for ${SERVICE}` })).toBeVisible();
+});
+
+test("Find in Files streams matches by file and opens the chosen one at its line", async ({ workbench: page }) => {
+  await stubDesktop(page);
+  await page.evaluate(
+    ({ root, service }) => {
+      const match = (line: number, text: string, word: string) => ({
+        line,
+        text,
+        ranges: [[text.indexOf(word), text.indexOf(word) + word.length]],
+        textOffset: 0,
+      });
+      window.__ipc.handlers.search_validate = () => null;
+      window.__ipc.handlers.search_start = (args) => {
+        const send = (event: unknown) => window.__ipc.send(args.onEvent, event);
+        setTimeout(() => {
+          send({
+            type: "file",
+            file: {
+              path: `${root}/build.gradle.kts`,
+              relPath: "build.gradle.kts",
+              matches: [
+                match(7, "class OrderController(private val service: OrderService) {", "OrderService"),
+                match(3, "import com.acme.orders.service.OrderService", "OrderService"),
+              ],
+            },
+          });
+          send({
+            type: "file",
+            file: {
+              path: service,
+              relPath: service.slice(root.length + 1),
+              matches: [match(0, "// OrderService", "OrderService")],
+            },
+          });
+          send({
+            type: "done",
+            summary: { files: 2, matches: 3, limitHit: false, cancelled: false, elapsedMs: 4 },
+          });
+        }, 20);
+        return null;
+      };
+    },
+    { root: ROOT, service: SERVICE },
+  );
+  await page.keyboard.press("Meta+Shift+f");
+  const dialog = page.getByRole("dialog", { name: "Find in Files" });
+  await dialog.getByRole("textbox", { name: "Text to find" }).fill("OrderService");
+  const matches = dialog.getByRole("listbox", { name: "Matches" });
+  await expect(matches.getByRole("option")).toHaveCount(3);
+  await expect
+    .poll(async () => (await ipcCalls(page, "search_start")).at(-1)?.query)
+    .toMatchObject({
+      pattern: "OrderService",
+    });
+  await matches.getByRole("option", { name: /import com\.acme\.orders\.service\.OrderService/ }).dblclick();
+  await expect(page.getByRole("tab", { name: "build.gradle.kts" })).toHaveAttribute("aria-selected", "true");
+  const caretLine = () =>
+    page.evaluate((label) => {
+      const content = document.querySelector(`.cm-content[aria-label="${label}"]`) as unknown as {
+        cmTile: {
+          view: { state: { doc: { lineAt(pos: number): { text: string } }; selection: { main: { head: number } } } };
+        };
+      } | null;
+      if (!content) return null;
+      const { state } = content.cmTile.view;
+      return state.doc.lineAt(state.selection.main.head).text;
+    }, `Editor for ${ROOT}/build.gradle.kts`);
+  await expect.poll(caretLine).toBe("import com.acme.orders.service.OrderService");
 });
diff --git a/e2e/toolwindows.spec.ts b/e2e/toolwindows.spec.ts
index e8eb67d9..dcf00a8d 100644
--- a/e2e/toolwindows.spec.ts
+++ b/e2e/toolwindows.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test, visibleToolWindows } from "./fixtures";
+import { expect, ipcCalls, stubDesktop, test, visibleToolWindows } from "./fixtures";
 
 test("⌘1 focuses, hides and re-shows the Project tool window", async ({ workbench: page }) => {
   const project = page.getByRole("region", { name: "Project" });
@@ -31,6 +31,34 @@ test("⌥F12 opens the Terminal tool window and toggles it closed", async ({ wor
   await expect(terminal).toBeHidden();
 });
 
+test("the first ⌥F12 focuses the terminal input once the lazily loaded view mounts", async ({ workbench: page }) => {
+  await page.keyboard.press("Alt+F12");
+  const terminal = page.getByRole("region", { name: "Terminal", exact: true });
+  await expect(terminal.getByRole("textbox", { name: "Terminal input" })).toBeFocused();
+  // Reopened with the view already mounted, it focuses the input as well.
+  await page.keyboard.press("Alt+F12");
+  await expect(terminal).toBeHidden();
+  await page.keyboard.press("Alt+F12");
+  await expect(terminal.getByRole("textbox", { name: "Terminal input" })).toBeFocused();
+});
+
+test("a terminal view that loads late doesn't take focus moved elsewhere meanwhile", async ({ workbench: page }) => {
+  let release!: () => void;
+  const loaded = new Promise<void>((resolve) => (release = resolve));
+  await page.route(/\/src\/features\/terminal\/runtime\.ts/, async (route) => {
+    await loaded;
+    await route.continue();
+  });
+  await page.keyboard.press("Alt+F12");
+  const terminal = page.getByRole("region", { name: "Terminal", exact: true });
+  await expect(terminal).toBeVisible();
+  const tree = page.getByRole("tree", { name: "Project" });
+  await tree.getByRole("treeitem", { name: "README.md" }).click();
+  release();
+  await expect(terminal.getByRole("textbox", { name: "Terminal input" })).toBeAttached();
+  await expect(tree).toBeFocused();
+});
+
 test("Split Right gives the Terminal a tab group with its own header; Unsplit merges it back", async ({
   workbench: page,
 }) => {
@@ -80,3 +108,47 @@ test("⌘⇧F12 hides all tool windows and restores them", async ({ workbench: p
   await expect(page.getByRole("region", { name: "Project" })).toBeVisible();
   await expect(page.getByRole("region", { name: "Problems" })).toBeVisible();
 });
+
+test("the Terminal sends typed commands to the shell and shows its output", async ({ workbench: page }) => {
+  // The shell is stubbed at the IPC layer: it echoes input and answers `echo`.
+  await stubDesktop(page);
+  await page.evaluate(() => {
+    let output: unknown = null;
+    let line = "";
+    const out = (text: string) => window.__ipc.send(output, text);
+    const h = window.__ipc.handlers;
+    h.term_default_shell = () => "/bin/zsh";
+    h.term_available_shells = () => ["/bin/zsh"];
+    h.term_spawn = (args) => {
+      output = args.onOutput;
+      setTimeout(() => out("acme-api % "), 20);
+      return { id: 5, title: "zsh", pid: 99 };
+    };
+    h.term_resize = () => null;
+    h.term_is_busy = () => false;
+    h.term_write = (args) => {
+      for (const ch of String(args.data)) {
+        if (ch === "\r") {
+          const said = /^echo (.*)$/.exec(line);
+          out(`\r\n${said ? `${said[1]}\r\n` : ""}acme-api % `);
+          line = "";
+        } else {
+          line += ch;
+          out(ch);
+        }
+      }
+      return null;
+    };
+  });
+  await page.keyboard.press("Alt+F12");
+  const terminal = page.getByRole("region", { name: "Terminal", exact: true });
+  const rows = terminal.locator(".xterm-rows");
+  await expect(rows).toContainText("acme-api %");
+  await terminal.locator(".xterm-screen").click();
+  await expect(terminal.getByRole("textbox", { name: "Terminal input" })).toBeFocused();
+  await page.keyboard.type("echo hello from e2e");
+  await page.keyboard.press("Enter");
+  await expect(rows.locator("div", { hasText: /^hello from e2e\s*$/ })).toHaveCount(1);
+  const written = (await ipcCalls(page, "term_write")).map((a) => a.data).join("");
+  expect(written).toBe("echo hello from e2e\r");
+});
diff --git a/fixtures/README.md b/fixtures/README.md
index c6c97e17..a4353ca3 100644
--- a/fixtures/README.md
+++ b/fixtures/README.md
@@ -12,11 +12,19 @@ something to show.
 | `python-app/`    | Python 3.10+, pytest                                            | `python -m tasks.cli` (from `src/`) | `pytest`             | `OPENIDEA_FAIL=1 pytest`                  | unused imports in `models.py`                            |
 | `go-app/`        | Go 1.22+                                                        | `go run ./cmd/server`               | `go test ./...`      | `OPENIDEA_FAIL=1 go test ./...`           | unused `fmt.Sprintf` result in `internal/store/store.go` |
 | `kotlin-gradle/` | JDK 21, Gradle 8 (no wrapper)                                   | `gradle run`                        | `gradle test`        | `gradle test -PopenideaFail`              | unused variable in `App.kt`                              |
+| `java-app/`      | JDK 21, Maven 3.9                                               | `mvn compile exec:java`             | `mvn test`           | `mvn test -DopenideaFail=true`            | unused variable in `App.java`                            |
 | `polyglot/`      | Go, TS, Python, C, shell, SQL, TOML/YAML/JSON, proto, Terraform | `make`                              | `make test`          | —                                     | unused variable in `native/hash.c`                       |
 
 The fixtures are standalone: `rust-app` declares its own `[workspace]` and
 `fixtures/eslint.config.js` keeps them out of the IDE's own lint run.
 
+The language smoke test (`crates/ide-host/tests/language_smoke.rs`) runs completion,
+navigation, diagnostics, quick fixes, formatting and rename on these projects with real
+language servers, `smoke/run.test.ts` runs each project's run and test configurations
+(the intentionally failing test included, then Rerun Failed Tests), and `smoke/debug.test.ts`
+debugs its entry point from the "Set a breakpoint here" line: when you change a fixture, run
+them for that language.
+
 ## Setup
 
 Work on a **copy** so git and edits never touch this repository:
diff --git a/fixtures/java-app/.gitignore b/fixtures/java-app/.gitignore
new file mode 100644
index 00000000..2f7896d1
--- /dev/null
+++ b/fixtures/java-app/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/fixtures/java-app/pom.xml b/fixtures/java-app/pom.xml
new file mode 100644
index 00000000..916e3138
--- /dev/null
+++ b/fixtures/java-app/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>openidea-fixture-orders</artifactId>
+  <version>0.1.0</version>
+  <description>OpenIDEA QA fixture: a tiny order book</description>
+
+  <properties>
+    <maven.compiler.release>21</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- `mvn test -DopenideaFail=true` runs the intentionally failing test. -->
+    <openideaFail>false</openideaFail>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.11.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.2</version>
+        <configuration>
+          <systemPropertyVariables>
+            <openidea.fail>${openideaFail}</openidea.fail>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <mainClass>com.example.orders.App</mainClass>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/fixtures/java-app/src/main/java/com/example/orders/App.java b/fixtures/java-app/src/main/java/com/example/orders/App.java
new file mode 100644
index 00000000..80bd50d7
--- /dev/null
+++ b/fixtures/java-app/src/main/java/com/example/orders/App.java
@@ -0,0 +1,16 @@
+package com.example.orders;
+
+public class App {
+    public static void main(String[] args) {
+        OrderBook book = new OrderBook();
+        book.place("alice", "Mechanical keyboard", 1, 8999);
+        book.place("bob", "Wireless mouse", 2, 2999);
+        book.place("alice", "USB-C hub", 1, 3999);
+
+        int unused = 42; // intentional warning: unused variable
+        // Set a breakpoint here (QA: debugger) and inspect `book`.
+        long revenue = book.revenueCents();
+        System.out.printf("%d orders, revenue %.2f%n", book.size(), revenue / 100.0);
+        book.largest().ifPresent(o -> System.out.println("Largest: " + o.product()));
+    }
+}
diff --git a/fixtures/java-app/src/main/java/com/example/orders/Order.java b/fixtures/java-app/src/main/java/com/example/orders/Order.java
new file mode 100644
index 00000000..a082b0c4
--- /dev/null
+++ b/fixtures/java-app/src/main/java/com/example/orders/Order.java
@@ -0,0 +1,14 @@
+package com.example.orders;
+
+/** A customer order: a product, how many and the unit price in cents. */
+public record Order(String customer, String product, int quantity, long unitPriceCents) {
+
+    public Order {
+        if (quantity <= 0) throw new IllegalArgumentException("quantity must be positive");
+    }
+
+    /** The order's total in cents. */
+    public long totalCents() {
+        return unitPriceCents * quantity;
+    }
+}
diff --git a/fixtures/java-app/src/main/java/com/example/orders/OrderBook.java b/fixtures/java-app/src/main/java/com/example/orders/OrderBook.java
new file mode 100644
index 00000000..07926151
--- /dev/null
+++ b/fixtures/java-app/src/main/java/com/example/orders/OrderBook.java
@@ -0,0 +1,35 @@
+package com.example.orders;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+/** Keeps the orders placed so far, in the order they were placed. */
+public class OrderBook {
+    private final List<Order> orders = new ArrayList<>();
+
+    /** Places an order and returns it. */
+    public Order place(String customer, String product, int quantity, long unitPriceCents) {
+        Order order = new Order(customer, product, quantity, unitPriceCents);
+        orders.add(order);
+        return order;
+    }
+
+    public List<Order> byCustomer(String customer) {
+        return orders.stream().filter(o -> o.customer().equals(customer)).toList();
+    }
+
+    public Optional<Order> largest() {
+        return orders.stream().max(Comparator.comparingLong(Order::totalCents));
+    }
+
+    // TODO: discounts for repeat customers
+    public long revenueCents() {
+        return orders.stream().mapToLong(Order::totalCents).sum();
+    }
+
+    public int size() {
+        return orders.size();
+    }
+}
diff --git a/fixtures/java-app/src/test/java/com/example/orders/OrderBookTest.java b/fixtures/java-app/src/test/java/com/example/orders/OrderBookTest.java
new file mode 100644
index 00000000..42b30c2d
--- /dev/null
+++ b/fixtures/java-app/src/test/java/com/example/orders/OrderBookTest.java
@@ -0,0 +1,29 @@
+package com.example.orders;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+
+class OrderBookTest {
+    @Test
+    void sumsRevenueOverAllOrders() {
+        OrderBook book = new OrderBook();
+        book.place("alice", "Keyboard", 2, 1000);
+        book.place("bob", "Mouse", 1, 500);
+        assertEquals(2500, book.revenueCents());
+        assertEquals(1, book.byCustomer("bob").size());
+    }
+
+    @Test
+    void rejectsEmptyOrders() {
+        assertThrows(IllegalArgumentException.class, () -> new Order("alice", "Keyboard", 0, 1000));
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "openidea.fail", matches = "true")
+    void intentionallyFails() {
+        assertEquals(1, new OrderBook().size(), "QA: an intentionally failing test");
+    }
+}
diff --git a/plugins/java-usages/CONFIGURATION.md b/java/java-usages/CONFIGURATION.md
similarity index 96%
rename from plugins/java-usages/CONFIGURATION.md
rename to java/java-usages/CONFIGURATION.md
index f0965bcd..11d122a0 100644
--- a/plugins/java-usages/CONFIGURATION.md
+++ b/java/java-usages/CONFIGURATION.md
@@ -95,10 +95,10 @@ runtime or resolve profile/precedence rules.
 Use the JDT LS distribution / Java version documented in [README](README.md).
 
 ```sh
-python3 plugins/java-usages/build.py /path/to/jdtls
-python3 plugins/java-usages/tests/configuration.py /path/to/jdtls
-OPENIDEA_CONFIGURATION_STRESS=1 python3 plugins/java-usages/tests/configuration.py /path/to/jdtls
-OPENIDEA_SPRING_BOOT_JAR=/path/to/spring-boot-autoconfigure.jar python3 plugins/java-usages/tests/configuration.py /path/to/jdtls
+python3 java/java-usages/build.py /path/to/jdtls
+python3 java/java-usages/tests/configuration.py /path/to/jdtls
+OPENIDEA_CONFIGURATION_STRESS=1 python3 java/java-usages/tests/configuration.py /path/to/jdtls
+OPENIDEA_SPRING_BOOT_JAR=/path/to/spring-boot-autoconfigure.jar python3 java/java-usages/tests/configuration.py /path/to/jdtls
 cargo test -p ide-language -p ide-lsp
 ```
 
diff --git a/plugins/java-usages/MANIFEST.MF b/java/java-usages/MANIFEST.MF
similarity index 72%
rename from plugins/java-usages/MANIFEST.MF
rename to java/java-usages/MANIFEST.MF
index 2d5796c3..252534d5 100644
--- a/plugins/java-usages/MANIFEST.MF
+++ b/java/java-usages/MANIFEST.MF
@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OpenIDEA Java usages
 Bundle-SymbolicName: ai.openidea.usages;singleton:=true
-Bundle-Version: 1.2.1
+Bundle-Version: 1.3.0
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.jdt.ls.core,org.eclipse.jdt.core,
  org.eclipse.jdt.core.manipulation,org.eclipse.core.runtime,
- org.eclipse.lsp4j,org.eclipse.core.resources,com.google.gson
+ org.eclipse.lsp4j,org.eclipse.core.resources,com.google.gson,
+ org.eclipse.ltk.core.refactoring
 
diff --git a/plugins/java-usages/README.md b/java/java-usages/README.md
similarity index 79%
rename from plugins/java-usages/README.md
rename to java/java-usages/README.md
index 819fd2b3..f5d7b242 100644
--- a/plugins/java-usages/README.md
+++ b/java/java-usages/README.md
@@ -57,7 +57,7 @@ is not a claim of full IntelliJ feature parity.
 ## Rebuild and delivery
 
 The checked-in jar is embedded by ide-sdk `include_bytes!`, installed as
-`java-usages-1.2.1.jar`, and added alongside existing initialization bundles.
+`java-usages-1.3.0.jar`, and added alongside existing initialization bundles.
 Users need no compiler, Maven or Python. Manifest/install version must change
 when replacing the bundle because OSGi caches bundles.
 
@@ -73,10 +73,12 @@ Version 1.2.0 adds the configuration command; its reproducible SHA-256 is
 Version 1.2.1 keeps the configuration snapshot across editor open/close, saves of
 unrelated content and non-Java resource changes; its reproducible SHA-256 is
 `cbae3e3a0bcf2818b4cc9d98998bd9b81f92e1ae7803dc757134485f9776a4e1`.
+Version 1.3.0 adds the class-hierarchy refactoring commands; its reproducible SHA-256 is
+`cca4cc385ace286111730d2a6164333b8958d74d69631548eadca8863255c24a`.
 
 ```sh
 export PATH=/path/to/jdk25/bin:$PATH
-python3 plugins/java-usages/build.py /path/to/jdtls
+python3 java/java-usages/build.py /path/to/jdtls
 ```
 
 ## Manual upgrades
@@ -98,9 +100,10 @@ not rebuild this jar. A maintainer must:
 ## Real server verification
 
 ```sh
-python3 plugins/java-usages/tests/verify.py /path/to/jdtls /path/to/lombok.jar
-python3 plugins/java-usages/tests/read-write.py /path/to/jdtls /path/to/lombok.jar > /tmp/read-write.json
-OPENIDEA_USAGES_INDEX_STRESS=1 python3 plugins/java-usages/tests/read-write.py /path/to/jdtls /path/to/lombok.jar > /tmp/read-write-indexed.json
+python3 java/java-usages/tests/verify.py /path/to/jdtls /path/to/lombok.jar
+python3 java/java-usages/tests/read-write.py /path/to/jdtls /path/to/lombok.jar > /tmp/read-write.json
+OPENIDEA_USAGES_INDEX_STRESS=1 python3 java/java-usages/tests/read-write.py /path/to/jdtls /path/to/lombok.jar > /tmp/read-write-indexed.json
+python3 java/java-usages/tests/hierarchy.py /path/to/jdtls
 ```
 
 The harnesses select the JDT LS configuration for the current platform. The first
@@ -112,6 +115,24 @@ method references, receiver/array reads and a real cancellation response (`-3280
 Use the actual desktop app to check read/write toggles, mutual toggle behavior,
 Find transfer, persistence and unfiltered non-Java counts with the same fixture.
 
+`hierarchy.py` runs Pull Members Up and Push Members Down: member and destination
+listing, moving, declaring abstract, pulling up to an interface, conflicts reported
+before any change, and a class without supertypes. Each edit is applied to a copy of
+the fixture and compiled with javac.
+
+## Class-hierarchy refactorings
+
+`openidea.java.hierarchy.members(uri, line, column, kind)` describes the class at the
+position for `kind` `pullUp` or `pushDown`: its movable members (handle id, label,
+kind, preselected, can be declared abstract) and the destination supertypes, or the
+direct subtypes the members are pushed into. A position on a member preselects it.
+`openidea.java.hierarchy.refactor(uri, line, column, kind, target, choices)` runs
+JDT's `PullUpRefactoringProcessor` / `PushDownRefactoringProcessor` with the chosen
+`{id, abstract}` members and returns `{problems, edit}`. Nothing is applied by the
+server; the app shows the problems, then applies the edit as one undoable change.
+A method pulled up to an interface is always declared there, as in JDT's wizard.
+Either command answers `{refused: reason}` when the position can't be refactored.
+
 ## Review and manual reproduction
 
 See [the English reproduction guide](tests/REPRODUCE.md) for a small Java/Lombok
@@ -129,6 +150,11 @@ This is an app-owned JDT LS extension, not a standard LSP feature. It uses:
   objects (`isIncludeAccessors`).
 - `JDTUtils.resolveTypeRoot`, `findElementAtSelection`.
 - `org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil`.
+- `org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoringProcessor`,
+  `PushDownRefactoringProcessor`, `RefactoringAvailabilityTesterCore`, `JdtFlags`,
+  `JavaElementLabelsCore`, `PreferenceManager.getCodeGenerationSettings`,
+  `JsonRpcHelpers.toOffset`, `JDTUtils.resolveCompilationUnit` and
+  `ChangeUtil.convertToWorkspaceEdit`.
 - Public JDT model/DOM APIs for exact target identity and source-expression context.
 
 The fingerprint protects native target discovery, not all binary compatibility.
diff --git a/plugins/java-usages/build-dependencies.sha256 b/java/java-usages/build-dependencies.sha256
similarity index 100%
rename from plugins/java-usages/build-dependencies.sha256
rename to java/java-usages/build-dependencies.sha256
diff --git a/plugins/java-usages/build.py b/java/java-usages/build.py
similarity index 100%
rename from plugins/java-usages/build.py
rename to java/java-usages/build.py
diff --git a/plugins/java-usages/openidea-java-usages.jar b/java/java-usages/openidea-java-usages.jar
similarity index 80%
rename from plugins/java-usages/openidea-java-usages.jar
rename to java/java-usages/openidea-java-usages.jar
index bedb5a1a..2493c96f 100644
Binary files a/plugins/java-usages/openidea-java-usages.jar and b/java/java-usages/openidea-java-usages.jar differ
diff --git a/plugins/java-usages/plugin.xml b/java/java-usages/plugin.xml
similarity index 67%
rename from plugins/java-usages/plugin.xml
rename to java/java-usages/plugin.xml
index dad7e8d8..d6c345e0 100644
--- a/plugins/java-usages/plugin.xml
+++ b/java/java-usages/plugin.xml
@@ -7,5 +7,9 @@
     <delegateCommandHandler class="ai.openidea.configuration.ConfigurationCommand">
       <command id="openidea.java.configuration"/>
     </delegateCommandHandler>
+    <delegateCommandHandler class="ai.openidea.hierarchy.HierarchyCommand">
+      <command id="openidea.java.hierarchy.members"/>
+      <command id="openidea.java.hierarchy.refactor"/>
+    </delegateCommandHandler>
   </extension>
 </plugin>
diff --git a/plugins/java-usages/src/ai/openidea/configuration/ConfigurationCommand.java b/java/java-usages/src/ai/openidea/configuration/ConfigurationCommand.java
similarity index 100%
rename from plugins/java-usages/src/ai/openidea/configuration/ConfigurationCommand.java
rename to java/java-usages/src/ai/openidea/configuration/ConfigurationCommand.java
diff --git a/java/java-usages/src/ai/openidea/hierarchy/HierarchyCommand.java b/java/java-usages/src/ai/openidea/hierarchy/HierarchyCommand.java
new file mode 100644
index 00000000..b2504dd7
--- /dev/null
+++ b/java/java-usages/src/ai/openidea/hierarchy/HierarchyCommand.java
@@ -0,0 +1,261 @@
+package ai.openidea.hierarchy;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jdt.core.*;
+import org.eclipse.jdt.internal.core.manipulation.JavaElementLabelsCore;
+import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTesterCore;
+import org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoringProcessor;
+import org.eclipse.jdt.internal.corext.refactoring.structure.PushDownRefactoringProcessor;
+import org.eclipse.jdt.internal.corext.refactoring.structure.PushDownRefactoringProcessor.MemberActionInfo;
+import org.eclipse.jdt.internal.corext.util.JdtFlags;
+import org.eclipse.jdt.ls.core.internal.ChangeUtil;
+import org.eclipse.jdt.ls.core.internal.IDelegateCommandHandler;
+import org.eclipse.jdt.ls.core.internal.JDTUtils;
+import org.eclipse.jdt.ls.core.internal.handlers.JsonRpcHelpers;
+import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry;
+import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
+import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
+
+/**
+ * Pull Members Up / Push Members Down with JDT's own processors.
+ *
+ * <p>{@code openidea.java.hierarchy.members(uri, line, column, kind)} describes the class at the
+ * position: its movable members and, for pull up, the supertypes in project sources.
+ * {@code openidea.java.hierarchy.refactor(uri, line, column, kind, target, choices)} checks the
+ * chosen move and returns its problems and the edit, which is never applied here. {@code kind}
+ * is {@code pullUp} or {@code pushDown}; {@code choices} are {@code {id, abstract}} objects whose
+ * ids are the handle identifiers returned by {@code members}.
+ */
+public final class HierarchyCommand implements IDelegateCommandHandler {
+    static final String MEMBERS = "openidea.java.hierarchy.members";
+    static final String REFACTOR = "openidea.java.hierarchy.refactor";
+
+    private static final long LABEL = JavaElementLabelsCore.M_PARAMETER_TYPES | JavaElementLabelsCore.M_APP_RETURNTYPE
+            | JavaElementLabelsCore.F_APP_TYPE_SIGNATURE;
+
+    @Override
+    public Object executeCommand(String command, List<Object> arguments, IProgressMonitor monitor) throws Exception {
+        String uri = (String) arguments.get(0);
+        int line = ((Number) arguments.get(1)).intValue();
+        int column = ((Number) arguments.get(2)).intValue();
+        boolean pullUp = switch ((String) arguments.get(3)) {
+            case "pullUp" -> true;
+            case "pushDown" -> false;
+            default -> throw new IllegalArgumentException("unknown hierarchy refactoring " + arguments.get(3));
+        };
+        ICompilationUnit unit = JDTUtils.resolveCompilationUnit(uri);
+        if (unit == null || !unit.exists()) return refused("The file is not part of a Java project");
+        IMember start = memberAt(unit, JsonRpcHelpers.toOffset(unit, line, column));
+        IMember[] members = start == null ? null : selection(start, pullUp);
+        if (members == null) {
+            return refused(pullUp ? "Caret should be inside a class that has members to pull up"
+                    : "Caret should be inside a class that has members to push down");
+        }
+        if (MEMBERS.equals(command)) return pullUp ? pullUpMembers(unit, members, monitor) : pushDownMembers(members, monitor);
+        if (REFACTOR.equals(command)) {
+            String target = (String) arguments.get(4);
+            List<Choice> choices = new ArrayList<>();
+            for (Object o : (List<?>) arguments.get(5)) {
+                Map<?, ?> map = (Map<?, ?>) o;
+                IJavaElement element = JavaCore.create((String) map.get("id"));
+                if (!(element instanceof IMember member) || !member.exists()) return refused("The class changed; open the dialog again");
+                choices.add(new Choice(member, Boolean.TRUE.equals(map.get("abstract"))));
+            }
+            if (choices.isEmpty()) return refused("No members selected");
+            // Started from the class, the processors know it even when no member is moved
+            // (a method only declared abstract in the destination).
+            IType declaring = members[0] instanceof IType type ? type : members[0].getDeclaringType();
+            IMember[] owner = { declaring };
+            return pullUp ? pullUp(unit, owner, target, choices, monitor) : pushDown(owner, choices, monitor);
+        }
+        throw new IllegalArgumentException("unknown command " + command);
+    }
+
+    private record Choice(IMember member, boolean makeAbstract) {}
+
+    /** The innermost member at the offset, or the type itself for an initializer. */
+    private static IMember memberAt(ICompilationUnit unit, int offset) throws JavaModelException {
+        IJavaElement element = unit.getElementAt(offset);
+        while (element != null && !(element instanceof IMember)) element = element.getParent();
+        if (element instanceof IInitializer initializer) return initializer.getDeclaringType();
+        return (IMember) element;
+    }
+
+    /** The members to start from: the one at the caret when it can move, otherwise its class. */
+    private static IMember[] selection(IMember start, boolean pullUp) throws JavaModelException {
+        for (IMember member = start; member != null; member = member.getDeclaringType()) {
+            if (member.isBinary() || member.isReadOnly()) return null;
+            if (pullUp ? RefactoringAvailabilityTesterCore.isPullUpAvailable(member)
+                    : RefactoringAvailabilityTesterCore.isPushDownAvailable(member)) return new IMember[] { member };
+            if (member instanceof IType type && (pullUp ? RefactoringAvailabilityTesterCore.getPullUpMembers(type)
+                    : RefactoringAvailabilityTesterCore.getPushDownMembers(type)).length > 0) {
+                return new IMember[] { type };
+            }
+        }
+        return null;
+    }
+
+    private static Object pullUpMembers(ICompilationUnit unit, IMember[] members, IProgressMonitor monitor) throws Exception {
+        var processor = new PullUpRefactoringProcessor(members, PreferenceManager.getCodeGenerationSettings(unit));
+        RefactoringStatus status = new ProcessorBasedRefactoring(processor).checkInitialConditions(monitor);
+        if (status.hasFatalError()) return refused(status.getMessageMatchingSeverity(RefactoringStatus.FATAL));
+        IType[] candidates = processor.getCandidateTypes(new RefactoringStatus(), monitor);
+        cancelled(monitor);
+        if (candidates.length == 0) {
+            return refused("'" + processor.getDeclaringType().getElementName()
+                    + "' has no superclass or interface in the project sources to pull members up to");
+        }
+        List<Map<String, Object>> targets = new ArrayList<>();
+        for (IType type : candidates) {
+            Map<String, Object> row = new LinkedHashMap<>();
+            row.put("id", type.getHandleIdentifier());
+            row.put("name", type.getElementName());
+            row.put("qualifiedName", type.getFullyQualifiedName('.'));
+            row.put("interface", type.isInterface());
+            targets.add(row);
+        }
+        Set<IMember> selected = Set.of(processor.getMembersToMove());
+        List<Map<String, Object>> rows = new ArrayList<>();
+        for (IMember member : processor.getPullableMembersOfDeclaringType()) {
+            boolean abstractable = member instanceof IMethod method && !JdtFlags.isStatic(method);
+            rows.add(member(member, selected.contains(member), abstractable));
+        }
+        return info(processor.getDeclaringType(), targets, rows);
+    }
+
+    private static Object pushDownMembers(IMember[] members, IProgressMonitor monitor) throws Exception {
+        var processor = new PushDownRefactoringProcessor(members);
+        RefactoringStatus status = new ProcessorBasedRefactoring(processor).checkInitialConditions(monitor);
+        if (status.hasFatalError()) return refused(status.getMessageMatchingSeverity(RefactoringStatus.FATAL));
+        IType declaring = processor.getDeclaringType();
+        List<Map<String, Object>> targets = new ArrayList<>();
+        for (IType type : declaring.newTypeHierarchy(declaring.getJavaProject(), monitor).getSubtypes(declaring)) {
+            if (type.isBinary()) continue;
+            Map<String, Object> row = new LinkedHashMap<>();
+            row.put("id", type.getHandleIdentifier());
+            row.put("name", type.getElementName());
+            row.put("qualifiedName", type.getFullyQualifiedName('.'));
+            row.put("interface", type.isInterface());
+            targets.add(row);
+        }
+        cancelled(monitor);
+        List<Map<String, Object>> rows = new ArrayList<>();
+        for (MemberActionInfo info : processor.getMemberActionInfos()) {
+            boolean abstractable = false;
+            for (int action : info.getAvailableActions()) abstractable |= action == MemberActionInfo.PUSH_ABSTRACT_ACTION;
+            rows.add(member(info.getMember(), info.isToBePushedDown(), abstractable));
+        }
+        return info(declaring, targets, rows);
+    }
+
+    private static Object pullUp(ICompilationUnit unit, IMember[] members, String target, List<Choice> choices,
+            IProgressMonitor monitor) throws Exception {
+        if (!(JavaCore.create(target) instanceof IType destination) || !destination.exists()) {
+            return refused("The destination class no longer exists");
+        }
+        var processor = new PullUpRefactoringProcessor(members, PreferenceManager.getCodeGenerationSettings(unit));
+        List<IMember> moved = new ArrayList<>();
+        List<IMethod> declaredAbstract = new ArrayList<>();
+        List<IMethod> deleted = new ArrayList<>();
+        for (Choice choice : choices) {
+            // A method pulled up to an interface is declared there, as JDT's own wizard does.
+            if (choice.member instanceof IMethod method && (choice.makeAbstract || destination.isInterface())) {
+                declaredAbstract.add(method);
+            } else {
+                moved.add(choice.member);
+                if (choice.member instanceof IMethod method) deleted.add(method);
+            }
+        }
+        processor.setMembersToMove(moved.toArray(IMember[]::new));
+        processor.setAbstractMethods(declaredAbstract.toArray(IMethod[]::new));
+        processor.setDeletedMethods(deleted.toArray(IMethod[]::new));
+        processor.setDestinationType(destination);
+        processor.setCreateMethodStubs(true);
+        return run(processor, monitor);
+    }
+
+    private static Object pushDown(IMember[] members, List<Choice> choices, IProgressMonitor monitor) throws Exception {
+        var processor = new PushDownRefactoringProcessor(members);
+        var refactoring = new ProcessorBasedRefactoring(processor);
+        RefactoringStatus initial = refactoring.checkInitialConditions(monitor);
+        if (initial.hasFatalError()) return result(initial, null);
+        Map<IMember, Choice> chosen = new LinkedHashMap<>();
+        for (Choice choice : choices) chosen.put(choice.member, choice);
+        for (MemberActionInfo info : processor.getMemberActionInfos()) {
+            Choice choice = chosen.get(info.getMember());
+            if (choice == null) info.setAction(MemberActionInfo.NO_ACTION);
+            else info.setAction(choice.makeAbstract && info.getMember() instanceof IMethod
+                    ? MemberActionInfo.PUSH_ABSTRACT_ACTION : MemberActionInfo.PUSH_DOWN_ACTION);
+        }
+        RefactoringStatus status = refactoring.checkFinalConditions(monitor);
+        initial.merge(status);
+        return finish(refactoring, initial, monitor);
+    }
+
+    private static Object run(RefactoringProcessor processor, IProgressMonitor monitor) throws Exception {
+        var refactoring = new ProcessorBasedRefactoring(processor);
+        RefactoringStatus status = refactoring.checkAllConditions(monitor);
+        return finish(refactoring, status, monitor);
+    }
+
+    private static Object finish(ProcessorBasedRefactoring refactoring, RefactoringStatus status, IProgressMonitor monitor)
+            throws Exception {
+        cancelled(monitor);
+        if (status.hasFatalError()) return result(status, null);
+        Change change = refactoring.createChange(monitor);
+        cancelled(monitor);
+        return result(status, ChangeUtil.convertToWorkspaceEdit(change));
+    }
+
+    private static Map<String, Object> member(IMember member, boolean selected, boolean abstractable) {
+        Map<String, Object> row = new LinkedHashMap<>();
+        row.put("id", member.getHandleIdentifier());
+        row.put("label", JavaElementLabelsCore.getElementLabel(member, LABEL));
+        row.put("kind", member instanceof IMethod ? "method" : member instanceof IField ? "field" : "type");
+        row.put("selected", selected);
+        row.put("abstractable", abstractable);
+        return row;
+    }
+
+    private static Map<String, Object> info(IType type, List<Map<String, Object>> targets, List<Map<String, Object>> members) {
+        Map<String, Object> out = new LinkedHashMap<>();
+        out.put("className", type.getElementName());
+        out.put("targets", targets);
+        out.put("members", members);
+        return out;
+    }
+
+    private static Map<String, Object> result(RefactoringStatus status, Object edit) {
+        List<Map<String, Object>> problems = new ArrayList<>();
+        for (RefactoringStatusEntry entry : status.getEntries()) {
+            String severity = switch (entry.getSeverity()) {
+                case RefactoringStatus.FATAL -> "fatal";
+                case RefactoringStatus.ERROR -> "error";
+                case RefactoringStatus.WARNING -> "warning";
+                default -> "info";
+            };
+            problems.add(Map.of("severity", severity, "message", entry.getMessage()));
+        }
+        Map<String, Object> out = new LinkedHashMap<>();
+        out.put("problems", problems);
+        out.put("edit", edit);
+        return out;
+    }
+
+    private static Map<String, Object> refused(String reason) {
+        return Map.of("refused", reason);
+    }
+
+    private static void cancelled(IProgressMonitor monitor) {
+        if (monitor.isCanceled()) throw new OperationCanceledException();
+    }
+}
diff --git a/plugins/java-usages/src/ai/openidea/usages/UsageAccess.java b/java/java-usages/src/ai/openidea/usages/UsageAccess.java
similarity index 100%
rename from plugins/java-usages/src/ai/openidea/usages/UsageAccess.java
rename to java/java-usages/src/ai/openidea/usages/UsageAccess.java
diff --git a/plugins/java-usages/src/ai/openidea/usages/UsagesCommand.java b/java/java-usages/src/ai/openidea/usages/UsagesCommand.java
similarity index 100%
rename from plugins/java-usages/src/ai/openidea/usages/UsagesCommand.java
rename to java/java-usages/src/ai/openidea/usages/UsagesCommand.java
diff --git a/plugins/java-usages/tests/REPRODUCE.md b/java/java-usages/tests/REPRODUCE.md
similarity index 98%
rename from plugins/java-usages/tests/REPRODUCE.md
rename to java/java-usages/tests/REPRODUCE.md
index aad80dc6..7dc2d013 100644
--- a/plugins/java-usages/tests/REPRODUCE.md
+++ b/java/java-usages/tests/REPRODUCE.md
@@ -73,7 +73,7 @@ checks cancellation. No Maven download is needed for this harness.
 
 ```sh
 export PATH=/path/to/jdk25/bin:$PATH
-python3 plugins/java-usages/tests/read-write.py /path/to/jdtls /path/to/lombok.jar > /tmp/read-write.json
+python3 java/java-usages/tests/read-write.py /path/to/jdtls /path/to/lombok.jar > /tmp/read-write.json
 ```
 
 Then launch the desktop app with `pnpm tauri dev` and open the same Java/Lombok
diff --git a/plugins/java-usages/tests/ReadWrite.java b/java/java-usages/tests/ReadWrite.java
similarity index 100%
rename from plugins/java-usages/tests/ReadWrite.java
rename to java/java-usages/tests/ReadWrite.java
diff --git a/plugins/java-usages/tests/configuration.py b/java/java-usages/tests/configuration.py
similarity index 100%
rename from plugins/java-usages/tests/configuration.py
rename to java/java-usages/tests/configuration.py
diff --git a/java/java-usages/tests/hierarchy.py b/java/java-usages/tests/hierarchy.py
new file mode 100644
index 00000000..7e0e4ad5
--- /dev/null
+++ b/java/java-usages/tests/hierarchy.py
@@ -0,0 +1,272 @@
+"""Pull Members Up / Push Members Down against a real JDT LS. Argument: jdtls home.
+
+Each case computes the edit from the same unchanged sources, applies it to a copy
+of the project and compiles the copy with javac.
+"""
+import json
+import pathlib
+import platform
+import queue
+import shutil
+import subprocess
+import sys
+import tempfile
+import threading
+import time
+import urllib.parse
+
+home = pathlib.Path(sys.argv[1]).resolve()
+bundle = pathlib.Path(__file__).resolve().parents[1] / 'openidea-java-usages.jar'
+work = pathlib.Path(tempfile.mkdtemp(prefix='openidea-hierarchy-'))
+config = work / 'config'
+config.mkdir()
+system, machine = platform.system(), platform.machine().lower()
+config_name = {'Windows': 'config_win', 'Darwin': 'config_mac'}.get(system, 'config_linux')
+config_names = ([config_name + '_arm'] if machine in ('arm64', 'aarch64') else []) + [config_name]
+config_source = next(home / name / 'config.ini' for name in config_names if (home / name / 'config.ini').is_file())
+(config / 'config.ini').write_bytes(config_source.read_bytes())
+project = work / 'project'
+(project / 'src/zoo').mkdir(parents=True)
+(project / '.project').write_text('<projectDescription><name>zoo</name><buildSpec><buildCommand><name>org.eclipse.jdt.core.javabuilder</name></buildCommand></buildSpec><natures><nature>org.eclipse.jdt.core.javanature</nature></natures></projectDescription>')
+(project / '.classpath').write_text('<classpath><classpathentry kind="src" path="src"/><classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/><classpathentry kind="output" path="bin"/></classpath>')
+sources = {
+    'Animal.java': '''package zoo;
+
+public abstract class Animal {
+    protected String name = "animal";
+
+    public String describe() {
+        return "I am " + name;
+    }
+}
+''',
+    'Speaker.java': '''package zoo;
+
+public interface Speaker {
+}
+''',
+    'Dog.java': '''package zoo;
+
+public class Dog extends Animal implements Speaker {
+    private int tail = 1;
+
+    public String bark() {
+        return "Woof";
+    }
+
+    public int wag() {
+        return tail * 2;
+    }
+}
+''',
+    'Cat.java': '''package zoo;
+
+public class Cat extends Animal {
+    public String purr() {
+        return describe() + " purr";
+    }
+}
+''',
+    'Lonely.java': '''package zoo;
+
+public class Lonely {
+    public void alone() {
+    }
+}
+''',
+    'Use.java': '''package zoo;
+
+public class Use {
+    String run(Dog dog, Animal animal) {
+        return dog.bark() + dog.wag() + animal.describe();
+    }
+}
+''',
+}
+for name, text in sources.items():
+    (project / 'src/zoo' / name).write_text(text)
+uri = lambda name: (project / 'src/zoo' / name).as_uri()
+
+log = (work / 'stderr.log').open('w')
+proc = subprocess.Popen(['java', '-Declipse.application=org.eclipse.jdt.ls.core.id1', '-Dosgi.bundles.defaultStartLevel=4', '-Declipse.product=org.eclipse.jdt.ls.core.product', '-Xmx1G', '--add-modules=ALL-SYSTEM', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-jar', str(next((home / 'plugins').glob('org.eclipse.equinox.launcher_*.jar'))), '-configuration', str(config), '-data', str(work / 'metadata')], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=log)
+messages = queue.Queue()
+lock = threading.Lock()
+
+
+def send(message):
+    data = json.dumps(message).encode()
+    with lock:
+        proc.stdin.write(f'Content-Length: {len(data)}\r\n\r\n'.encode() + data)
+        proc.stdin.flush()
+
+
+def read():
+    while True:
+        headers = {}
+        while True:
+            line = proc.stdout.readline()
+            if not line:
+                return
+            if line == b'\r\n':
+                break
+            k, v = line.decode().split(':', 1)
+            headers[k.lower()] = v.strip()
+        message = json.loads(proc.stdout.read(int(headers['content-length'])))
+        if 'method' in message and 'id' in message:
+            send({'jsonrpc': '2.0', 'id': message['id'], 'result': [] if message['method'] == 'workspace/configuration' else None})
+        else:
+            messages.put(message)
+
+
+threading.Thread(target=read, daemon=True).start()
+seq = 0
+
+
+def request(method, params):
+    global seq
+    seq += 1
+    send({'jsonrpc': '2.0', 'id': seq, 'method': method, 'params': params})
+    deadline = time.monotonic() + 180
+    while time.monotonic() < deadline:
+        msg = messages.get(timeout=max(1, deadline - time.monotonic()))
+        if msg.get('id') == seq:
+            if 'error' in msg:
+                raise RuntimeError(msg['error'])
+            return msg.get('result')
+    raise TimeoutError(method)
+
+
+def position(name, needle):
+    lines = sources[name].splitlines()
+    line = next(i for i, t in enumerate(lines) if needle in t)
+    return line, lines[line].index(needle)
+
+
+def command(name, *args):
+    return request('workspace/executeCommand', {'command': name, 'arguments': list(args)})
+
+
+def members(file, needle, kind):
+    line, col = position(file, needle)
+    return command('openidea.java.hierarchy.members', uri(file), line, col, kind)
+
+
+def refactor(file, needle, kind, target, choices):
+    line, col = position(file, needle)
+    return command('openidea.java.hierarchy.refactor', uri(file), line, col, kind, target, choices)
+
+
+def offset(text, pos):
+    lines = text.split('\n')
+    return sum(len(l) + 1 for l in lines[:pos['line']]) + pos['character']
+
+
+def apply(edit):
+    """The project after `edit`, compiled; returns the edited sources."""
+    per_file = {}
+    for u, edits in (edit.get('changes') or {}).items():
+        per_file.setdefault(u, []).extend(edits)
+    for change in edit.get('documentChanges') or []:
+        assert 'kind' not in change, change
+        per_file.setdefault(change['textDocument']['uri'], []).extend(change['edits'])
+    out = dict(sources)
+    for u, edits in per_file.items():
+        name = pathlib.Path(urllib.parse.unquote(urllib.parse.urlparse(u).path)).name
+        text = out[name]
+        for e in sorted(edits, key=lambda e: offset(text, e['range']['start']), reverse=True):
+            text = text[:offset(text, e['range']['start'])] + e['newText'] + text[offset(text, e['range']['end']):]
+        out[name] = text
+    copy = work / f'compile{seq}'
+    (copy / 'zoo').mkdir(parents=True)
+    for name, text in out.items():
+        (copy / 'zoo' / name).write_text(text)
+    javac = subprocess.run(['javac', '-d', str(copy / 'bin'), *map(str, (copy / 'zoo').glob('*.java'))], capture_output=True, text=True)
+    assert javac.returncode == 0, (javac.stderr, out)
+    return out
+
+
+def body(text, name):
+    return [l.strip() for l in text.splitlines() if name in l]
+
+
+try:
+    init = request('initialize', {'processId': None, 'rootUri': project.as_uri(), 'workspaceFolders': [{'uri': project.as_uri(), 'name': 'zoo'}], 'capabilities': {'workspace': {'workspaceEdit': {'documentChanges': True}}}, 'initializationOptions': {'bundles': [str(bundle)], 'settings': {'java': {'import': {'gradle': {'enabled': False}, 'maven': {'enabled': False}}}}}})
+    commands = init['capabilities']['executeCommandProvider']['commands']
+    assert 'openidea.java.hierarchy.members' in commands and 'openidea.java.hierarchy.refactor' in commands, commands
+    send({'jsonrpc': '2.0', 'method': 'initialized', 'params': {}})
+    for name, text in sources.items():
+        send({'jsonrpc': '2.0', 'method': 'textDocument/didOpen', 'params': {'textDocument': {'uri': uri(name), 'languageId': 'java', 'version': 1, 'text': text}}})
+    request('java/buildWorkspace', True)
+    evidence = {}
+
+    # Members of Dog, with bark() preselected; Animal and Speaker are destinations.
+    info = members('Dog.java', 'bark', 'pullUp')
+    evidence['pullUpMembers'] = info
+    assert info['className'] == 'Dog', info
+    assert {t['name'] for t in info['targets']} == {'Animal', 'Speaker'}, info['targets']
+    rows = {m['label'].split('(')[0].split(':')[0].strip(): m for m in info['members']}
+    assert rows['bark']['selected'] and not rows['wag']['selected'] and not rows['tail']['selected'], rows
+    assert rows['bark']['abstractable'] and rows['bark']['kind'] == 'method' and rows['tail']['kind'] == 'field', rows
+    animal = next(t for t in info['targets'] if t['name'] == 'Animal')
+    speaker = next(t for t in info['targets'] if t['name'] == 'Speaker')
+
+    # Caret on the class name: nothing preselected.
+    on_class = members('Dog.java', 'class Dog', 'pullUp')
+    assert on_class['className'] == 'Dog' and not any(m['selected'] for m in on_class['members']), on_class
+
+    # Pull bark() up to Animal: moved, call sites unchanged, compiles.
+    result = refactor('Dog.java', 'bark', 'pullUp', animal['id'], [{'id': rows['bark']['id'], 'abstract': False}])
+    evidence['pullUp'] = result
+    assert not [p for p in result['problems'] if p['severity'] in ('error', 'fatal')], result['problems']
+    out = apply(result['edit'])
+    assert 'bark()' in out['Animal.java'] and 'bark()' not in out['Dog.java'], out
+    assert out['Use.java'] == sources['Use.java']
+
+    # Make abstract: declared in Animal, kept (and overridden) in Dog.
+    result = refactor('Dog.java', 'bark', 'pullUp', animal['id'], [{'id': rows['bark']['id'], 'abstract': True}])
+    evidence['pullUpAbstract'] = result
+    out = apply(result['edit'])
+    assert any('abstract' in l for l in body(out['Animal.java'], 'bark()')), out['Animal.java']
+    assert 'Woof' in out['Dog.java'] and '@Override' in out['Dog.java'], out['Dog.java']
+
+    # To an interface, a method is always declared, never moved.
+    result = refactor('Dog.java', 'bark', 'pullUp', speaker['id'], [{'id': rows['bark']['id'], 'abstract': False}])
+    evidence['pullUpInterface'] = result
+    out = apply(result['edit'])
+    assert body(out['Speaker.java'], 'bark()') == ['String bark();'] or body(out['Speaker.java'], 'bark()') == ['public String bark();'], out['Speaker.java']
+    assert 'Woof' in out['Dog.java'] and '@Override' in out['Dog.java'], out['Dog.java']
+
+    # wag() uses Dog's private field: reported before anything changes.
+    result = refactor('Dog.java', 'wag', 'pullUp', animal['id'], [{'id': rows['wag']['id'], 'abstract': False}])
+    evidence['pullUpConflict'] = result
+    assert any(p['severity'] in ('error', 'fatal') and 'tail' in p['message'] for p in result['problems']), result
+
+    # No superclass in the sources.
+    refused = members('Lonely.java', 'alone', 'pullUp')
+    evidence['pullUpRefused'] = refused
+    assert 'refused' in refused, refused
+
+    # Push describe() down: copied into Dog and Cat, removed from Animal.
+    info = members('Animal.java', 'describe', 'pushDown')
+    evidence['pushDownMembers'] = info
+    assert info['className'] == 'Animal' and {t['name'] for t in info['targets']} == {'Dog', 'Cat'}, info
+    rows = {m['label'].split('(')[0].split(':')[0].strip(): m for m in info['members']}
+    assert rows['describe']['selected'] and rows['describe']['abstractable'] and not rows['name']['abstractable'], rows
+    result = refactor('Animal.java', 'describe', 'pushDown', None, [{'id': rows['describe']['id'], 'abstract': True}])
+    evidence['pushDownAbstract'] = result
+    assert not [p for p in result['problems'] if p['severity'] in ('error', 'fatal')], result['problems']
+    out = apply(result['edit'])
+    assert any('abstract' in l for l in body(out['Animal.java'], 'describe()')), out['Animal.java']
+    assert 'I am' in out['Dog.java'] and 'I am' in out['Cat.java'], out
+
+    # Without keeping a declaration, Use's animal.describe() breaks: JDT reports it.
+    result = refactor('Animal.java', 'describe', 'pushDown', None, [{'id': rows['describe']['id'], 'abstract': False}])
+    evidence['pushDownConflict'] = result
+    assert any(p['severity'] in ('error', 'fatal') for p in result['problems']), result
+
+    (work / 'evidence.json').write_text(json.dumps(evidence, indent=2))
+    print('hierarchy: all cases passed')
+finally:
+    proc.terminate()
+    proc.wait(timeout=20)
+    print('Evidence:', work, file=sys.stderr)
diff --git a/plugins/java-usages/tests/read-write.py b/java/java-usages/tests/read-write.py
similarity index 100%
rename from plugins/java-usages/tests/read-write.py
rename to java/java-usages/tests/read-write.py
diff --git a/plugins/java-usages/tests/verify.py b/java/java-usages/tests/verify.py
similarity index 100%
rename from plugins/java-usages/tests/verify.py
rename to java/java-usages/tests/verify.py
diff --git a/plugins/kotlin-bridge/MANIFEST.MF b/java/kotlin-bridge/MANIFEST.MF
similarity index 100%
rename from plugins/kotlin-bridge/MANIFEST.MF
rename to java/kotlin-bridge/MANIFEST.MF
diff --git a/plugins/kotlin-bridge/README.md b/java/kotlin-bridge/README.md
similarity index 94%
rename from plugins/kotlin-bridge/README.md
rename to java/kotlin-bridge/README.md
index a1eb4bf2..afc2ee41 100644
--- a/plugins/kotlin-bridge/README.md
+++ b/java/kotlin-bridge/README.md
@@ -47,8 +47,8 @@ for the JDT command and Java 8 target for the Maven participant. Use Java 25 to
 run the build compiler. Archive order and timestamps are deterministic.
 
 ```sh
-python3 plugins/kotlin-bridge/build.py /path/to/jdtls /path/to/maven
-shasum -a 256 plugins/kotlin-bridge/openidea-kotlin-bridge.jar
+python3 java/kotlin-bridge/build.py /path/to/jdtls /path/to/maven
+shasum -a 256 java/kotlin-bridge/openidea-kotlin-bridge.jar
 ```
 
 Committed jar SHA-256:
@@ -61,7 +61,7 @@ data directory, and includes it in JDT LS initialization bundles.
 
 ```sh
 # `java` on PATH must satisfy JDT LS; JAVA_HOME selects Maven's project JDK.
-JAVA_HOME=/path/to/project/jdk python3 plugins/kotlin-bridge/tests/verify.py /path/to/jdtls
+JAVA_HOME=/path/to/project/jdk python3 java/kotlin-bridge/tests/verify.py /path/to/jdtls
 ```
 
 Requires Maven on PATH and access to Kotlin 2.0.10 and the fixture's Maven
diff --git a/plugins/kotlin-bridge/build-dependencies.sha256 b/java/kotlin-bridge/build-dependencies.sha256
similarity index 100%
rename from plugins/kotlin-bridge/build-dependencies.sha256
rename to java/kotlin-bridge/build-dependencies.sha256
diff --git a/plugins/kotlin-bridge/build.py b/java/kotlin-bridge/build.py
similarity index 100%
rename from plugins/kotlin-bridge/build.py
rename to java/kotlin-bridge/build.py
diff --git a/plugins/kotlin-bridge/components.xml b/java/kotlin-bridge/components.xml
similarity index 100%
rename from plugins/kotlin-bridge/components.xml
rename to java/kotlin-bridge/components.xml
diff --git a/plugins/kotlin-bridge/maven/ai/openidea/kotlin/IsolatedOutput.java b/java/kotlin-bridge/maven/ai/openidea/kotlin/IsolatedOutput.java
similarity index 100%
rename from plugins/kotlin-bridge/maven/ai/openidea/kotlin/IsolatedOutput.java
rename to java/kotlin-bridge/maven/ai/openidea/kotlin/IsolatedOutput.java
diff --git a/plugins/kotlin-bridge/openidea-kotlin-bridge.jar b/java/kotlin-bridge/openidea-kotlin-bridge.jar
similarity index 100%
rename from plugins/kotlin-bridge/openidea-kotlin-bridge.jar
rename to java/kotlin-bridge/openidea-kotlin-bridge.jar
diff --git a/plugins/kotlin-bridge/plugin.xml b/java/kotlin-bridge/plugin.xml
similarity index 100%
rename from plugins/kotlin-bridge/plugin.xml
rename to java/kotlin-bridge/plugin.xml
diff --git a/plugins/kotlin-bridge/src/ai/openidea/kotlin/KotlinLibraries.java b/java/kotlin-bridge/src/ai/openidea/kotlin/KotlinLibraries.java
similarity index 100%
rename from plugins/kotlin-bridge/src/ai/openidea/kotlin/KotlinLibraries.java
rename to java/kotlin-bridge/src/ai/openidea/kotlin/KotlinLibraries.java
diff --git a/plugins/kotlin-bridge/tests/verify.py b/java/kotlin-bridge/tests/verify.py
similarity index 100%
rename from plugins/kotlin-bridge/tests/verify.py
rename to java/kotlin-bridge/tests/verify.py
diff --git a/plugins/lombok/LICENSE b/java/lombok/LICENSE
similarity index 100%
rename from plugins/lombok/LICENSE
rename to java/lombok/LICENSE
diff --git a/plugins/lombok/README.md b/java/lombok/README.md
similarity index 97%
rename from plugins/lombok/README.md
rename to java/lombok/README.md
index 33b513f5..4959509c 100644
--- a/plugins/lombok/README.md
+++ b/java/lombok/README.md
@@ -52,7 +52,7 @@ git fetch https://github.com/Rawi01/lombok.git eclipse-constructor-call-statemen
 git cherry-pick 2d535482a913de46c27d06c5b0b294918ede3f9c 3098f4dd78b5349c2f382e7310e64db810dd380b
 git cherry-pick 7832faa49b35c839088866daf865384c82cd555f 3f3a80b857a969839ab1baba12767aec4965ac32
 ant dist
-cp dist/lombok.jar /path/to/openidea/plugins/lombok/lombok-1.18.48-openidea.2.jar
+cp dist/lombok.jar /path/to/openidea/java/lombok/lombok-1.18.48-openidea.2.jar
 ```
 
 The changelog context conflicts because the first commit adds a release-note line under the
@@ -96,7 +96,7 @@ On macOS arm64 with JDT LS 1.63.0 / Equinox 3.25.0, server OpenJDK 25 and projec
   programs ran with identical output, and `@NonNull` checks run after the constructor call again.
 - Real JDT LS `java/buildWorkspace(true)` of the same sources with the agent: `openidea.1` reported
   Failed with three internal errors and wrote no classes; `openidea.2` Succeeded with all classes.
-- `plugins/java-usages/tests/verify.py` and `read-write.py` passed with `openidea.2`.
+- `java/java-usages/tests/verify.py` and `read-write.py` passed with `openidea.2`.
 
 Windows and Linux runtime validation has not been performed. Rust tests cover source selection
 for both supported architectures on all three OS variants, offline provisioning, corruption
diff --git a/plugins/lombok/SHA256SUMS b/java/lombok/SHA256SUMS
similarity index 100%
rename from plugins/lombok/SHA256SUMS
rename to java/lombok/SHA256SUMS
diff --git a/plugins/lombok/lombok-1.18.48-openidea.2.jar b/java/lombok/lombok-1.18.48-openidea.2.jar
similarity index 100%
rename from plugins/lombok/lombok-1.18.48-openidea.2.jar
rename to java/lombok/lombok-1.18.48-openidea.2.jar
diff --git a/knip.ts b/knip.ts
index 600d5224..572c234a 100644
--- a/knip.ts
+++ b/knip.ts
@@ -9,6 +9,7 @@ const config: KnipConfig = {
     "scripts/**/*.ts",
     "perf/**/*.ts",
     "e2e/**/*.ts",
+    "smoke/**/*.ts",
   ],
   // Plugins' web pages are projects of their own (own package.json, checked by plugins/build.sh and CI).
   ignore: ["plugins/**/web-src/**"],
diff --git a/languages/c.toml b/languages/c.toml
index 06da28f9..436454ed 100644
--- a/languages/c.toml
+++ b/languages/c.toml
@@ -6,6 +6,14 @@ block-comment = ["/*", "*/"]
 indent = { tab-size = 4, insert-spaces = true }
 ui-mode = "C"
 tree-sitter = "c"
+scratch-template = '''
+#include <stdio.h>
+
+int main(void) {
+    $END$
+    return 0;
+}
+'''
 
 [[language-servers]]
 name = "clangd"
diff --git a/languages/cpp.toml b/languages/cpp.toml
index f9e4589c..16802dc1 100644
--- a/languages/cpp.toml
+++ b/languages/cpp.toml
@@ -6,6 +6,14 @@ block-comment = ["/*", "*/"]
 indent = { tab-size = 4, insert-spaces = true }
 ui-mode = "C++"
 tree-sitter = "cpp"
+scratch-template = '''
+#include <iostream>
+
+int main() {
+    $END$
+    return 0;
+}
+'''
 
 [[language-servers]]
 name = "clangd"
diff --git a/languages/csharp.toml b/languages/csharp.toml
index fc677e31..ef8d6bd4 100644
--- a/languages/csharp.toml
+++ b/languages/csharp.toml
@@ -10,7 +10,7 @@ tree-sitter = "csharp"
 [[language-servers]]
 name = "csharp-ls"
 command = "csharp-ls"
-root-markers = ["*.sln", "*.slnx", "*.csproj", "global.json", "Directory.Build.props"]
+root-markers = ["*.sln", "*.slnx", "*.csproj", "global.json", "Directory.Build.props", "ProjectSettings/ProjectVersion.txt"]
 install-hint = "dotnet tool install --global csharp-ls"
 
 [debugger]
diff --git a/languages/go.toml b/languages/go.toml
index 6d820dd5..30dbabb6 100644
--- a/languages/go.toml
+++ b/languages/go.toml
@@ -6,6 +6,13 @@ block-comment = ["/*", "*/"]
 indent = { tab-size = 4, insert-spaces = false }
 ui-mode = "Go"
 tree-sitter = "go"
+scratch-template = '''
+package main
+
+func main() {
+	$END$
+}
+'''
 
 [[language-servers]]
 name = "gopls"
diff --git a/languages/graphql.toml b/languages/graphql.toml
index a26bb6ac..7e1c1f43 100644
--- a/languages/graphql.toml
+++ b/languages/graphql.toml
@@ -10,5 +10,5 @@ tree-sitter = "graphql"
 name = "graphql-lsp"
 command = "graphql-lsp"
 args = ["server", "-m", "stream"]
-root-markers = [".graphqlrc", ".graphqlrc.yml", ".graphqlrc.yaml", ".graphqlrc.json", "graphql.config.js", "graphql.config.ts", "graphql.config.yml"]
+root-markers = [".graphqlrc", ".graphqlrc.yml", ".graphqlrc.yaml", ".graphqlrc.json", "graphql.config.js", "graphql.config.ts", "graphql.config.yml", "graphql.config.yaml", "graphql.config.json"]
 install-hint = "npm i -g graphql-language-service-cli"
diff --git a/languages/java.toml b/languages/java.toml
index 7e7837b0..af9967e9 100644
--- a/languages/java.toml
+++ b/languages/java.toml
@@ -6,6 +6,13 @@ block-comment = ["/*", "*/"]
 indent = { tab-size = 4, insert-spaces = true }
 ui-mode = "Java"
 tree-sitter = "java"
+scratch-template = '''
+class Scratch {
+    public static void main(String[] args) {
+        $END$
+    }
+}
+'''
 
 # Microsoft java-debug runs inside jdtls as a bundle (`initializationOptions.bundles`,
 # added when installed); sessions start with `vscode.java.startDebugSession` and the
diff --git a/languages/javascript.toml b/languages/javascript.toml
index 5f19df86..70954b50 100644
--- a/languages/javascript.toml
+++ b/languages/javascript.toml
@@ -17,6 +17,21 @@ args = ["--stdio"]
 root-markers = ["jsconfig.json", "tsconfig.json", "package.json"]
 install-hint = "npm i -g @vtsls/language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.typescript.preferences]
+useAliasesForRenames = false
+
+[language-servers.initialization-options.javascript.preferences]
+useAliasesForRenames = false
+
+# Moving a file: the IDE asks for the import updates up front (preview, undo); the server
+# doesn't prompt after the move.
+[language-servers.initialization-options.typescript.updateImportsOnFileMove]
+enabled = "never"
+
+[language-servers.initialization-options.javascript.updateImportsOnFileMove]
+enabled = "never"
+
 [[language-servers]]
 name = "typescript-language-server"
 tsserver-project = true
@@ -27,6 +42,10 @@ args = ["--stdio"]
 root-markers = ["jsconfig.json", "tsconfig.json", "package.json"]
 install-hint = "npm i -g typescript@6 typescript-language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.preferences]
+providePrefixAndSuffixTextForRename = false
+
 [[language-servers]]
 name = "oxlint"
 command = "oxlint"
diff --git a/languages/javascriptreact.toml b/languages/javascriptreact.toml
index be5b5ab9..cdab8c31 100644
--- a/languages/javascriptreact.toml
+++ b/languages/javascriptreact.toml
@@ -16,6 +16,21 @@ args = ["--stdio"]
 root-markers = ["jsconfig.json", "tsconfig.json", "package.json"]
 install-hint = "npm i -g @vtsls/language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.typescript.preferences]
+useAliasesForRenames = false
+
+[language-servers.initialization-options.javascript.preferences]
+useAliasesForRenames = false
+
+# Moving a file: the IDE asks for the import updates up front (preview, undo); the server
+# doesn't prompt after the move.
+[language-servers.initialization-options.typescript.updateImportsOnFileMove]
+enabled = "never"
+
+[language-servers.initialization-options.javascript.updateImportsOnFileMove]
+enabled = "never"
+
 [[language-servers]]
 name = "typescript-language-server"
 tsserver-project = true
@@ -26,6 +41,10 @@ args = ["--stdio"]
 root-markers = ["jsconfig.json", "tsconfig.json", "package.json"]
 install-hint = "npm i -g typescript@6 typescript-language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.preferences]
+providePrefixAndSuffixTextForRename = false
+
 [[language-servers]]
 name = "oxlint"
 command = "oxlint"
diff --git a/languages/kotlin.toml b/languages/kotlin.toml
index 212bb950..097eafcd 100644
--- a/languages/kotlin.toml
+++ b/languages/kotlin.toml
@@ -6,6 +6,11 @@ block-comment = ["/*", "*/"]
 indent = { tab-size = 4, insert-spaces = true }
 ui-mode = "Kotlin"
 tree-sitter = "kotlin"
+scratch-template = '''
+fun main() {
+    $END$
+}
+'''
 
 [[language-servers]]
 name = "kotlin-lsp"
diff --git a/languages/php.toml b/languages/php.toml
index 4b14b8d8..b0fc0f4e 100644
--- a/languages/php.toml
+++ b/languages/php.toml
@@ -14,6 +14,8 @@ command = "intelephense"
 args = ["--stdio"]
 root-markers = ["composer.json", ".phpactor.json", "index.php"]
 install-hint = "npm i -g intelephense"
+# Intelephense applies the PHP version only to documents it parses after reading it.
+resync-on-configuration = true
 
 [[language-servers]]
 name = "phpactor"
diff --git a/languages/rust.toml b/languages/rust.toml
index 61bb1dc1..fcd712e3 100644
--- a/languages/rust.toml
+++ b/languages/rust.toml
@@ -6,6 +6,11 @@ block-comment = ["/*", "*/"]
 indent = { tab-size = 4, insert-spaces = true }
 ui-mode = "Rust"
 tree-sitter = "rust"
+scratch-template = '''
+fn main() {
+    $END$
+}
+'''
 
 [[language-servers]]
 name = "rust-analyzer"
diff --git a/languages/typescript.toml b/languages/typescript.toml
index 0dedc17a..951c0922 100644
--- a/languages/typescript.toml
+++ b/languages/typescript.toml
@@ -16,6 +16,21 @@ args = ["--stdio"]
 root-markers = ["tsconfig.json", "jsconfig.json", "package.json"]
 install-hint = "npm i -g @vtsls/language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.typescript.preferences]
+useAliasesForRenames = false
+
+[language-servers.initialization-options.javascript.preferences]
+useAliasesForRenames = false
+
+# Moving a file: the IDE asks for the import updates up front (preview, undo); the server
+# doesn't prompt after the move.
+[language-servers.initialization-options.typescript.updateImportsOnFileMove]
+enabled = "never"
+
+[language-servers.initialization-options.javascript.updateImportsOnFileMove]
+enabled = "never"
+
 [[language-servers]]
 name = "typescript-language-server"
 tsserver-project = true
@@ -26,6 +41,10 @@ args = ["--stdio"]
 root-markers = ["tsconfig.json", "jsconfig.json", "package.json"]
 install-hint = "npm i -g typescript@6 typescript-language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.preferences]
+providePrefixAndSuffixTextForRename = false
+
 # Angular projects only: templates inline in components (`template: ...`),
 # and their usages and renames in templates. Last: TypeScript's own hover,
 # definition and symbols come first.
diff --git a/languages/typescriptreact.toml b/languages/typescriptreact.toml
index d7ecf0b8..3d4b1377 100644
--- a/languages/typescriptreact.toml
+++ b/languages/typescriptreact.toml
@@ -16,6 +16,21 @@ args = ["--stdio"]
 root-markers = ["tsconfig.json", "jsconfig.json", "package.json"]
 install-hint = "npm i -g @vtsls/language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.typescript.preferences]
+useAliasesForRenames = false
+
+[language-servers.initialization-options.javascript.preferences]
+useAliasesForRenames = false
+
+# Moving a file: the IDE asks for the import updates up front (preview, undo); the server
+# doesn't prompt after the move.
+[language-servers.initialization-options.typescript.updateImportsOnFileMove]
+enabled = "never"
+
+[language-servers.initialization-options.javascript.updateImportsOnFileMove]
+enabled = "never"
+
 [[language-servers]]
 name = "typescript-language-server"
 tsserver-project = true
@@ -26,6 +41,10 @@ args = ["--stdio"]
 root-markers = ["tsconfig.json", "jsconfig.json", "package.json"]
 install-hint = "npm i -g typescript@6 typescript-language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.preferences]
+providePrefixAndSuffixTextForRename = false
+
 [[language-servers]]
 name = "oxlint"
 command = "oxlint"
diff --git a/languages/vue.toml b/languages/vue.toml
index 247f0930..e47d985a 100644
--- a/languages/vue.toml
+++ b/languages/vue.toml
@@ -23,6 +23,21 @@ args = ["--stdio"]
 root-markers = ["tsconfig.json", "jsconfig.json", "package.json"]
 install-hint = "npm i -g @vtsls/language-server"
 
+# Rename renames the symbol everywhere: no `import { a as b }` alias in the file renamed from.
+[language-servers.initialization-options.typescript.preferences]
+useAliasesForRenames = false
+
+[language-servers.initialization-options.javascript.preferences]
+useAliasesForRenames = false
+
+# Moving a file: the IDE asks for the import updates up front (preview, undo); the server
+# doesn't prompt after the move.
+[language-servers.initialization-options.typescript.updateImportsOnFileMove]
+enabled = "never"
+
+[language-servers.initialization-options.javascript.updateImportsOnFileMove]
+enabled = "never"
+
 [[language-servers]]
 name = "oxlint"
 command = "oxlint"
diff --git a/package.json b/package.json
index 76100246..5ba6e561 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "openidea",
   "private": true,
   "description": "An open-source IDE inspired by IntelliJ IDEA",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "license": "Apache-2.0",
   "type": "module",
   "scripts": {
@@ -12,11 +12,12 @@
     "tauri": "node scripts/tauri.ts",
     "test": "vitest run",
     "test:watch": "vitest",
+    "smoke": "vitest run --config smoke/vitest.config.ts",
     "lint": "oxlint",
     "format": "oxfmt",
     "format:check": "oxfmt --check",
     "knip": "knip",
-    "typecheck": "tsrs --noEmit && tsrs -p tsconfig.node.json --noEmit && tsrs -p perf --noEmit && tsrs -p scripts --noEmit",
+    "typecheck": "tsrs --noEmit && tsrs -p tsconfig.node.json --noEmit && tsrs -p perf --noEmit && tsrs -p scripts --noEmit && tsrs -p smoke --noEmit",
     "gen:bindings": "cargo test -p openidea --test export_bindings",
     "gen:windows-icons": "node scripts/gen-windows-icons.ts",
     "gen:angular-grammar": "lezer-generator src/editor/core/cm/angular/angular.grammar --typeScript -o src/editor/core/cm/angular/parser.ts",
diff --git a/perf/budgets.json b/perf/budgets.json
index f831d10c..783e64ec 100644
--- a/perf/budgets.json
+++ b/perf/budgets.json
@@ -62,6 +62,8 @@
     "text/open_1mb": 2000,
     "text/apply_keystroke_1mb": 20,
     "text/apply_100_changes_1mb": 1000,
+    "text/diff_two_edits_1mb": 10000,
+    "text/diff_every_line_1mb": 100000,
     "text/offset_to_pos_round_trip": 5,
     "text/pos_to_byte": 5,
     "text/text_for_save_crlf_1mb": 1000,
@@ -76,6 +78,9 @@
     "index_100k/find_files/ordcon": 10000,
     "index_100k/find_files/src/user": 10000,
     "index_100k/find_files/PaymentService": 10000,
+    "index_100k/find_dirs/util": 5000,
+    "index_100k/find_dirs/src/ui": 5000,
+    "index_100k/find_dirs/a": 5000,
     "index_100k/find_symbols/OCo": 15000,
     "index_100k/find_symbols/q": 15000,
     "index_100k/find_symbols/invoiceRepo": 15000,
diff --git a/plugins/README.md b/plugins/README.md
index 4e994f5e..8a74a1d1 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -44,7 +44,8 @@ The plugin API is defined in [`wit/`](../wit/) (`openidea:plugin@1.0.0`, world
 The `openidea-plugin` tool scaffolds, builds, checks and links plugins:
 
 ```sh
-cargo install --path crates/ide-host --bin openidea-plugin   # or: cargo run -p ide-host --bin openidea-plugin -- …
+cargo install --locked --git https://github.com/l0ng-ai/openidea ide-host --bin openidea-plugin
+# in a checkout of this repository: cargo install --path crates/ide-host --bin openidea-plugin
 
 openidea-plugin new my-plugin                          # Rust command plugin (SDK)
 openidea-plugin new my-theme --template theme          # also: icon-theme, language
@@ -54,6 +55,17 @@ openidea-plugin build                                  # → dist/plugin.wasm, t
 openidea-plugin link                                   # load this folder in the IDE
 ```
 
+Each release also attaches the tool for Linux x64
+(`openidea-plugin-linux-x86_64.gz`). A plugin is a project of its own: keep it
+in its own repository, and list it in the community marketplace when it is
+ready (§8.1).
+
+A Rust plugin made by `new` depends on the SDK of the tool's release, from
+this repository's tag (`openidea-plugin = { git = "…", tag = "vX.Y.Z" }`);
+change the tag to build against a later API. Inside a checkout of this
+repository, or with `--sdk <path to sdk/rust/openidea-plugin>`, it depends on
+that SDK by path instead.
+
 `build` runs `cargo build --release --target wasm32-wasip2` (installing the
 target through rustup if needed), copies the component to the manifest's
 `wasm` path and runs `check`. `check` validates the package exactly as
@@ -79,6 +91,7 @@ authors = ["You <you@example.com>"]
 homepage = "https://example.com"  # optional
 license = "MIT"                   # optional
 change-notes = "1.2.0 — …"        # shown under What's New
+categories = ["tools"]            # marketplace categories, see below
 engines.openidea = "^1.0"         # the plugin API this package needs
 wasm = "dist/plugin.wasm"         # omit for data-only plugins
 activation = ["on-language:markdown"]   # optional, see below
@@ -94,6 +107,13 @@ category = "Word Tools"           # group in Search Everywhere / Keymap
 when = "editorFocus"              # optional: same expressions as built-in actions
 ```
 
+`categories` (up to 3) file the plugin in the marketplace: `languages`,
+`themes`, `icon-themes`, `linters` (linters and formatters), `vcs`, `ai`,
+`frameworks`, `tools`, `other`. Without them, a plugin contributing themes,
+icon themes or languages is filed under those, any other under `other`.
+Categories an IDE doesn't know, and any after the first three it knows, are
+ignored (`check` warns about both).
+
 All paths are relative to the package directory and may not leave it. A
 manifest is validated as a whole: if one contribution is invalid, nothing is
 installed or loaded. Contribution types the IDE does not know (a newer API) are
@@ -105,23 +125,23 @@ work), but 0.1 code no longer runs: rebuild it against the 1.0 SDK.
 
 ### Contribution points
 
-| Point           | Declaration                                                                                        | Code needed   |
-| --------------- | -------------------------------------------------------------------------------------------------- | ------------- |
-| `commands`      | `id`, `title`, `category?`, `when?`                                                                | to run them   |
-| `themes`        | `path` (theme JSON), `editor-scheme?`                                                              | no            |
-| `iconThemes`    | `id`, `label`, `path` (icon theme JSON, see §5)                                                    | no            |
-| `languages`     | `path` (`languages/<id>.toml` format, see §6)                                                      | no            |
-| `runDetectors`  | `id`, `name`, `files`, `command`, `args?`, `test?` (§6.2)                                          | no            |
-| `providers`     | `kinds`, `languages` (editor providers, see _Providers_)                                           | yes           |
-| `secrets`       | `name`, `label`, `description?` (see _Network_)                                                    | to use them   |
-| `menus`         | `menu` (`editor.context`, `projectView.context`, `editorTab.context`, `tools`), `command`, `when?` | no            |
-| `keymaps`       | `command`, `key`, `mac?` (`Ctrl+Alt+C`; a chord: `Meta+K Meta+C`)                                  | no            |
-| `statusBar`     | `id`, `text`, `tooltip?`, `command?`, `align?`, `priority?`                                        | no            |
-| `settings`      | `schema` (JSON file), `title?` — one table, see _Settings_                                         | no            |
-| `views`         | `id`, `title`, `icon?`, `location` (`left`, `right`, `bottom`), `web?` (see _Web views_)           | without `web` |
-| `customEditors` | `id`, `title`, `patterns` (file names), `priority` (`default`, `option`), `layout?`, `web?`        | without `web` |
-| `fileIcons`     | `id`, `patterns` (file names), `icon` (SVG), `iconDark?` — whatever icon theme is in use           | no            |
-| `fileTemplates` | `id`, `name`, `extension`, `path` (the new file's content; template variables work) — New menu     | no            |
+| Point           | Declaration                                                                                                                       | Code needed   |
+| --------------- | --------------------------------------------------------------------------------------------------------------------------------- | ------------- |
+| `commands`      | `id`, `title`, `category?`, `when?`                                                                                               | to run them   |
+| `themes`        | `path` (theme JSON), `editor-scheme?`                                                                                             | no            |
+| `iconThemes`    | `id`, `label`, `path` (icon theme JSON, see §5)                                                                                   | no            |
+| `languages`     | `path` (`languages/<id>.toml` format, see §6)                                                                                     | no            |
+| `runDetectors`  | `id`, `name`, `files`, `command`, `args?`, `test?` (§6.2)                                                                         | no            |
+| `providers`     | `kinds`, `languages` (editor providers, see _Providers_)                                                                          | yes           |
+| `secrets`       | `name`, `label`, `description?` (see _Network_)                                                                                   | to use them   |
+| `menus`         | `menu` (`editor.context`, `projectView.context`, `editorTab.context`, `tools`), `command`, `when?`                                | no            |
+| `keymaps`       | `command`, `key`, `mac?` (`Ctrl+Alt+C`; a chord: `Meta+K Meta+C`)                                                                 | no            |
+| `statusBar`     | `id`, `text`, `tooltip?`, `command?`, `align?`, `priority?`                                                                       | no            |
+| `settings`      | `schema` (JSON file), `title?` — one table, see _Settings_                                                                        | no            |
+| `views`         | `id`, `title`, `icon?` (an icon name, or an SVG of the package), `location` (`left`, `right`, `bottom`), `web?` (see _Web views_) | without `web` |
+| `customEditors` | `id`, `title`, `patterns` (file names), `priority` (`default`, `option`), `layout?`, `web?`                                       | without `web` |
+| `fileIcons`     | `id`, `patterns` (file names), `icon` (SVG), `iconDark?` — whatever icon theme is in use                                          | no            |
+| `fileTemplates` | `id`, `name`, `extension`, `path` (the new file's content; template variables work) — New menu                                    | no            |
 
 Declared contributions are live as soon as the plugin is enabled — commands
 show in Find Action, menus and the status bar, shortcuts work, themes and icon
@@ -204,7 +224,7 @@ edition = "2024"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-openidea-plugin = { path = "…/sdk/rust/openidea-plugin" }
+openidea-plugin = { git = "https://github.com/l0ng-ai/openidea", tag = "vX.Y.Z" }   # or { path = "…/sdk/rust/openidea-plugin" }
 
 [profile.release]
 opt-level = "s"
@@ -293,6 +313,7 @@ then run `openidea-plugin check`.
 | `host::refresh_view(view)`                                               | `views.refresh`                  | The view (or custom editors) render again; call it when the content changed.                                                                                                                                         |
 | `host::post_view_message(view, text)`                                    | `views.post-message`             | To the script of the view's `html` body.                                                                                                                                                                             |
 | `host::open_terminal(title, program, args)`                              | `views.open-terminal`            | A terminal tab in the invoking window running the approved `process:<program>` in the project root: output that keeps coming, interactive sessions.                                                                  |
+| `host::open_location(path, line, column)`                                | `views.open-location`            | Opens a file inside the project in an editor of the invoking window, the caret at `line`/`column` (0-based, UTF-16): a view's links to code. Needs `project.read`.                                                   |
 | `host::setting(key)`, `setting_bool`, `setting_string`, `setting_number` | `settings.get`                   | The user's value (project over global) or the schema's default.                                                                                                                                                      |
 
 `run-command` receives an optional string argument: `executeAction("plugin.<plugin id>.<command id>", "arg")`
@@ -313,6 +334,11 @@ Events are batched: a running plugin gets them within a fraction of a second,
 an idle one collects them for 2 s before it is woken, so frequent events
 (Key Promoter's actions) don't keep it alive.
 
+Kinds are names (`subscribe` takes a string), so later IDEs add kinds without
+a new API: an IDE refuses a kind it doesn't know with `invalid`, and a kind
+newer than the plugin's SDK arrives as `Event::Other { kind, data }` (JSON).
+The SDK's event enums are `#[non_exhaustive]`; match them with a `_` arm.
+
 ### Providers
 
 Declare what the plugin provides in the editor; only plugins whose
@@ -330,7 +356,14 @@ Then `register_plugin!(MyPlugin, providers)` and implement
 the document (path, language, version, text). Results join the language
 servers' (completion lists, ⌥⏎ quick fixes, ⌘B, gutter icons; a code action
 carries edits for any files, applied as one change). A completion item's
-`kind` (`CompletionKind` in the SDK, a string in the WIT) picks its icon.
+`kind` (`CompletionKind` in the SDK, a string in the WIT) picks its icon; it
+can be a `snippet` (`$1`, `${1:name}`, `$0`), match on `filter_text` instead
+of its label, and bring `additional_edits` elsewhere in the document (an
+import). A code action can leave `edits` empty and set `data`: its edits are
+then computed by `resolve_code_action` when the user picks it, under the
+command budget instead of the 50 ms. Problems (`publish_diagnostics`) can name
+the tool that found them (`source`) and be `unnecessary` (faded) or
+`deprecated` (struck through).
 Editor providers run under the edit-path budget: 50 ms, after which the
 result is dropped, and an interruption at 500 ms. Every plugin providing a
 kind is asked at the same time, so each has the whole budget.
@@ -385,6 +418,9 @@ collapse of items, form fields, table cells, inserted and deleted rows, and
 `html` messages. A tree is a flat list whose items name their `parent`; an
 `expandable` item gets its children when it is expanded. A table gets only
 the rows it shows (`viewport`): report `total_rows` and return those.
+Bodies, field types and view events added by later APIs travel as `Other {
+kind, data }`: an IDE that doesn't know a body says it needs updating, and
+leaves out a field type it doesn't know.
 
 Showing a view activates the plugin (`on-view:<id>`). `views` become tool
 windows; a `customEditors` file (`priority = "default"`) opens in the
@@ -585,6 +621,84 @@ attributes only, no scripts, event handlers, external references, `url()` or
 entities. Apply a theme in Settings › Plugins; see
 [`official/material-icons`](official/material-icons) for a complete one.
 
+Optional fields:
+
+```json
+{
+  "iconDefinitions": { "rust": { "light": "icons/rust.svg", "dark": "icons/rust_dark.svg" } },
+  "folderOpen": "folder-open",
+  "patterns": [
+    { "pattern": "^.*\\.spec\\.ts$", "icon": "test-ts", "ignoreCase": true },
+    { "pattern": "/fixtures/", "icon": "fixture", "path": true, "group": "tests" },
+    { "pattern": "^src$", "icon": "folder-src", "target": "folder", "openIcon": "folder-src-open" }
+  ],
+  "overrides": { "chevron-right": "arrow-right", "symbol-class": "class" },
+  "groups": [{ "id": "tests", "name": "Tests", "enabled": false }],
+  "choices": [
+    {
+      "id": "arrows", "name": "Arrows", "default": "plain",
+      "options": [
+        { "id": "plain", "name": "Default" },
+        { "id": "plus", "name": "Plus-Minus", "overrides": { "chevron-right": "plus" } }
+      ]
+    }
+  ],
+  "accent": true,
+  "settings": [
+    {
+      "title": "Icons",
+      "items": [
+        { "option": "hideFiles", "invert": true, "label": "Show file icons", "hint": "In trees, lists and tabs" },
+        { "option": "groups", "columns": 2 },
+        { "option": "choice", "choice": "arrows" },
+        { "option": "iconSize", "label": "Icon size", "default": 16 }
+      ]
+    }
+  ]
+}
+```
+
+- `iconDefinitions` values may be `{ "light", "dark" }`; the dark SVG is used
+  in dark themes. Icon ids may not end in `_dark`.
+- `patterns` are regular expressions checked in order, before `fileNames`
+  and `fileExtensions`. `target` is `file` (default) or `folder`; with `path`
+  a pattern matches the whole path (`/` separators) instead of the name;
+  `ignoreCase` ignores case. Patterns that could backtrack badly (a repeated
+  group, too many ways to match one name), lookaround, inline flags and
+  named groups are refused.
+- `openIcon` (folder patterns) and `folderOpen` (other folders) are used for
+  folders holding a file open in the editor when _Hollow folders_ is on.
+- `overrides` replace built-in IDE icons by name (`chevron-right`,
+  `folder-source`, …); symbol icons (`symbol-<kind>`, `class`, `method`, …)
+  are PSI icons.
+- `groups` are packs of patterns the user turns on or off; `enabled` is the
+  default.
+- `choices` are variants the user picks one of; the picked option's
+  `overrides` win over `overrides`.
+- `accent: true`: elements with `data-tint="true"` take the colour the user
+  picks.
+- Elements with `data-themed="true"` take the accent colour of Settings ›
+  Appearance, or the theme's custom accent colour.
+
+- `settings` describe the theme's page in Settings › Plugins › _theme label_;
+  a theme without them has no page. Sections have a `title` and `items`; an
+  item names an `option` the IDE implements, with the theme's `label`,
+  optional `hint` and, where the option needs one, `default`:
+
+  | `option`                                                                   | Control              | Item fields                                          |
+  | -------------------------------------------------------------------------- | -------------------- | ---------------------------------------------------- |
+  | `hideFiles`, `hideFolders`, `hideUiIcons`, `hidePsiIcons`, `hollowFolders` | checkbox             | `invert`: checked means off                          |
+  | `groups`                                                                   | a checkbox per group | `columns` (1–4), `label?` (group names are shown)    |
+  | `choice`                                                                   | the choice's options | `choice` (its id), `label?` (default: its name)      |
+  | `accent`, `monochrome`                                                     | checkbox and colour  | `default` (`#rrggbb`); `accent` needs `accent: true` |
+  | `saturation` (0–20), `opacity` (10–100), `iconSize`, `rowHeight` (px)      | checkbox and number  | `default` within the range                           |
+
+  `iconSize` is 12–32 and `rowHeight` 16–48. Values are kept per theme in
+  `appearance.fileIconThemeOptions` and apply while the theme is selected.
+
+The first icon theme of a plugin is selected when the plugin is installed or
+enabled while no icon theme is.
+
 ## 6. Languages
 
 `languages/<id>.toml` files use the IDE's own language format; see any file in
@@ -650,7 +764,9 @@ granted, and starts the approved program.
 - **Install:** Settings › Plugins › _Install Plugin from Disk…_ (a package
   folder) or _Install Plugin from Package File…_ (a `.oiplugin`, a `.zip` with
   the package at its root or in its only folder, or a folder's `plugin.toml`;
-  a zip without a `plugin.toml` there, such as an IntelliJ plugin, is refused). The install
+  a zip without a `plugin.toml` there, such as an IntelliJ plugin, is refused; IntelliJ
+  theme plugins are imported instead: _Import IntelliJ Theme from File…_ and _Import Theme
+  from IntelliJ IDE…_, see [`docs/plugins/themes.md`](../docs/plugins/themes.md)). The install
   page lists every capability and whether the package is signed by a publisher
   the marketplace trusts; nothing is copied until you accept.
 - **Versions:** installed plugins live in `<app-data>/plugins/<id>/<version>/`
@@ -659,13 +775,30 @@ granted, and starts the approved program.
   the version it replaced automatically (you're told why); _Roll Back to …_
   in the plugin's details does it by hand. Data (`storage`) is per plugin, not
   per version.
+- **Updates:** when the daily marketplace check finds newer versions of
+  installed plugins, the IDE says so once, with _Update All_ (also in the gear
+  menu and as the _Update All Plugins_ action). An update that asks for
+  nothing new installs with the grants the installed version has; the install
+  page is shown only for new capabilities, an unsigned package or another
+  signer (see _Distribution_).
 - **Linked plugins:** `openidea-plugin link <dir>` (§1). Listed with a _linked_
   tag; capabilities are granted per folder.
 - **Project plugins:** put (or symlink) the package in
   `<project>/.openidea/plugins/<name>/`. They load only in trusted projects and
   only after you approve their capabilities.
+- **Where:** installing, removing, enabling, granting and reloading plugins
+  work on the welcome screen and in trusted projects. A project opened in
+  restricted mode can browse the marketplace and show a package's install
+  page, but not change which plugin code runs.
 - Commands appear in Search Everywhere › Actions under their category, and can
   be bound in Settings › Keymap like any other action.
+- **Troubleshooting:** `openidea-plugin check` says why a package would be
+  refused. Settings › Plugins shows each plugin's state, why it failed if it
+  did, and its call stats (§3, _Sandbox and limits_). `host::log` lines go to
+  the IDE log (Help › _Show Log in Finder_ / _Explorer_ / _Files_) tagged with
+  the plugin id; debug and trace lines are written when the IDE is started
+  with `RUST_LOG=info,ide_plugin=trace`. `eprintln!` output is logged as
+  well, and a panic's message is shown with the crash.
 
 ## 8. Distribution
 
@@ -678,6 +811,9 @@ files).
 openidea-plugin keygen acme.key                     # once; keep the file secret
 openidea-plugin pack plugins/acme-tools --key acme.key --publisher acme
 openidea-plugin index market/ --publisher acme --name "ACME" --key acme.key
+openidea-plugin check acme.tools-1.0.0.oiplugin      # a package as installing would check it
+openidea-plugin merge market/index.json https://example.com/index.json --keep acme
+openidea-plugin endorse <new public key> --key acme.key --publisher acme   # when rotating keys
 ```
 
 A **marketplace** is static: an `index.json` and the packages next to it, on
@@ -693,8 +829,68 @@ and the publisher's key, then shows the install page.
 - **Revocation:** the index can revoke plugin versions (or all versions) and
   publisher keys. The IDE reads the index daily; revoked plugins are disabled
   with the reason and the user is notified — also after a restart, before
-  their code could run. A publisher rotates keys by adding the new one; older
-  keys stay valid until revoked.
+  their code could run.
+- **Key rotation:** a publisher rotates keys by registering the new one with
+  `index --key new.key --previous-key old.key`: the old key endorses the new
+  one, and older keys stay valid until revoked (`endorse` prints the
+  endorsement for an index someone else writes, such as the registry's). An installed plugin updates
+  silently only to a package signed with the key it was installed with, or
+  one that key endorsed (directly or through endorsed keys; endorsements by
+  revoked keys don't count). Another signer — an unendorsed key, or an
+  unsigned package replacing a signed one — is shown on the install page and
+  needs the user's confirmation.
+- **Official key:** release builds carry the official publisher's public key
+  (`OPENIDEA_OFFICIAL_PLUGIN_KEYS`, derived from the release's signing key).
+  `openidea.*` plugins must be signed with it, or with a key it endorsed,
+  whatever keys an index lists for `openidea`.
+- **Format:** fields are only ever added to the index (an IDE ignores those it
+  doesn't know), and `format` stays `1` unless older IDEs can't read the
+  change. An IDE reading a newer format still applies its revocations and
+  `moved`, lists no plugins, and asks the user to update.
+- **Moving:** an index with `"moved": "<url>"` sends the IDE to the index at
+  that URL (relative or absolute; https stays https), so a marketplace can
+  change hosts while released IDEs keep the address they were built with.
+
+**Versions.** Each index entry records the plugin API it needs (`engine`: the
+manifest's `engines.openidea`, narrowed to the API its component was built
+for; an entry without one is offered to no IDE), and a plugin may be listed in
+several versions. Settings › Plugins
+offers the newest version this IDE can load; when there is none, it shows the
+plugin as incompatible and says which API it needs. Entries also carry the
+plugin's categories, which Settings › Plugins › Available filters by. Indexing keeps, of each
+plugin, the newest version per API requirement, so users of an older IDE keep
+the last version built for them.
+
+`index` with a key registers the publisher and lists the folder's packages
+as its plugins (their earlier versions stay as above; plugins no longer in the
+folder go), keeping the other publishers'; `--download-base` makes downloads
+absolute, so a version stays where it was first published. Without a key, it
+lists every package in the folder, each checked against the publishers the
+index already has. `merge` takes the
+publishers, plugins and revocations of another index (downloads made absolute)
+in place of every publisher but `--keep`; `check` also takes a `.oiplugin`.
+
+### 8.1 Official and community plugins
+
+The IDE's default marketplace is `plugins-index.json` of the latest release.
+It lists two kinds of plugins:
+
+- **Official** (`plugins/official/`, ids `openidea.*`): maintained in this
+  repository, built and signed by its release workflow, and kept working as
+  the API changes. New official plugins are proposed in an issue first; they
+  cover general needs or show how to use part of the API.
+- **Community** (their authors' ids and keys): developed in their authors'
+  repositories and listed through the registry,
+  [l0ng-ai/openidea-plugins](https://github.com/l0ng-ai/openidea-plugins).
+  An author registers a publisher (an id prefix, its public key and the GitHub
+  accounts that may change it) and adds each plugin version by pull request;
+  the registry checks the package (digest, signature, `openidea-plugin check`)
+  and publishes its index, which `plugins-index.yml` merges into the release's
+  within the hour. Its README has the rules.
+
+Pull requests that add a plugin to this repository are for official plugins.
+A plugin that needs a new extension point brings the extension point here, as
+its own pull request, and the plugin to the registry.
 
 ## 9. Testing the host
 
@@ -733,7 +929,10 @@ only grows:
    Extend with new types and new functions (or interfaces). `types.error` is
    used everywhere and is no exception; new situations use `failed(string)`
    or `invalid(string)`. Sets that keep growing (completion, token, symbol and
-   fold kinds, icons) are strings for this reason.
+   fold kinds, icons, event kinds, action sources, diagnostic tags) are
+   strings for this reason, and variants that grow (`event`, view `body`,
+   `view-event`, `field-value`) have an `other(extension)` case, a kind and
+   JSON data, that carries later cases to older plugins and IDEs.
 2. **Host interfaces (imports) may gain functions and interfaces**: older
    components don't import them.
 3. **Plugin interfaces (exports) never gain functions** once released: the
@@ -745,6 +944,11 @@ only grows:
    minor with a message that says to update the IDE or rebuild with the SDK.
 5. **One version number**: the `wit/` package version, `ENGINE_VERSION` and
    `API_VERSION` agree, and the SDK's `wit/` copy is identical to `wit/`.
+6. **1.x calls are synchronous and pass documents whole.** Host calls block
+   the plugin's instance, and providers get the document's text with each
+   call. WASI 0.3 async components come with 2.0, behind an adapter in the
+   host that keeps 1.x plugins running; incremental document sync, if
+   needed, is a new interface.
 
 Checked automatically:
 
diff --git a/plugins/official/ai-completion/dist/plugin.wasm b/plugins/official/ai-completion/dist/plugin.wasm
index ee11a42e..4fc5e771 100644
Binary files a/plugins/official/ai-completion/dist/plugin.wasm and b/plugins/official/ai-completion/dist/plugin.wasm differ
diff --git a/plugins/official/ai-completion/dist/plugin.wasm.sources b/plugins/official/ai-completion/dist/plugin.wasm.sources
index 43ce4cdf..d07cfcec 100644
--- a/plugins/official/ai-completion/dist/plugin.wasm.sources
+++ b/plugins/official/ai-completion/dist/plugin.wasm.sources
@@ -1 +1 @@
-bf264a97dc918f24ac00f0e9e0d0373b68391a96921b44345b466c2a087c5283
+9ad412cb7b853d40467c67305a1126bb87910d179ecfa1c88e13d4a900367c50
diff --git a/plugins/official/ai-completion/plugin.toml b/plugins/official/ai-completion/plugin.toml
index 8cf1c563..bf21db21 100644
--- a/plugins/official/ai-completion/plugin.toml
+++ b/plugins/official/ai-completion/plugin.toml
@@ -5,6 +5,7 @@ description = "Inline code suggestions (ghost text) from a local model (Ollama)
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: local (Ollama) and OpenAI backends; the key stays in the system keychain."
+categories = ["ai"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-command:*"]
diff --git a/plugins/official/checkstyle/dist/plugin.wasm b/plugins/official/checkstyle/dist/plugin.wasm
index b7508504..e719df8d 100644
Binary files a/plugins/official/checkstyle/dist/plugin.wasm and b/plugins/official/checkstyle/dist/plugin.wasm differ
diff --git a/plugins/official/checkstyle/dist/plugin.wasm.sources b/plugins/official/checkstyle/dist/plugin.wasm.sources
index 6192fb92..f7e63f8f 100644
--- a/plugins/official/checkstyle/dist/plugin.wasm.sources
+++ b/plugins/official/checkstyle/dist/plugin.wasm.sources
@@ -1 +1 @@
-6095c7e30658b93d79270e6355d42941a4cfe13eeb8bada07acc7ae462194853
+49a3c6bf2511ba137457397203244bdfca3d6e10f62dbc7fde9473dab07f6457
diff --git a/plugins/official/checkstyle/plugin.toml b/plugins/official/checkstyle/plugin.toml
index 444157b6..1732ad30 100644
--- a/plugins/official/checkstyle/plugin.toml
+++ b/plugins/official/checkstyle/plugin.toml
@@ -5,6 +5,7 @@ description = "Checks Java files with Checkstyle when you save them: problems in
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: check on save (a newer save cancels the running check), Google style by default, quick fixes."
+categories = ["linters"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-event:file-saved", "on-command:*"]
diff --git a/plugins/official/checkstyle/src/lib.rs b/plugins/official/checkstyle/src/lib.rs
index 74f17cc4..aebf998e 100644
--- a/plugins/official/checkstyle/src/lib.rs
+++ b/plugins/official/checkstyle/src/lib.rs
@@ -97,12 +97,8 @@ fn diagnostic(p: &Problem, text: &str) -> Diagnostic {
     let line_len = text.split('\n').nth(p.line as usize).map_or(0, |l| l.encode_utf16().count() as u32);
     let start = p.column.unwrap_or(0).min(line_len);
     let end = if p.column.is_some() && start < line_len { start + 1 } else { line_len };
-    Diagnostic {
-        range: Range::new(Position::new(p.line, start), Position::new(p.line, end.max(start))),
-        severity: p.severity,
-        message: p.message.clone(),
-        code: Some(p.check.clone()),
-    }
+    let range = Range::new(Position::new(p.line, start), Position::new(p.line, end.max(start)));
+    Diagnostic::new(range, p.severity, p.message.clone()).code(p.check.clone())
 }
 
 /// The project containing `path`.
@@ -188,6 +184,7 @@ impl Providers for Checkstyle {
                     kind: Some("quickfix".into()),
                     preferred: true,
                     edits: vec![(doc.path.clone(), vec![edit])],
+                    data: None,
                 });
             }
         }
diff --git a/plugins/official/csv-editor/dist/plugin.wasm b/plugins/official/csv-editor/dist/plugin.wasm
index 539a1dce..752aba90 100644
Binary files a/plugins/official/csv-editor/dist/plugin.wasm and b/plugins/official/csv-editor/dist/plugin.wasm differ
diff --git a/plugins/official/csv-editor/dist/plugin.wasm.sources b/plugins/official/csv-editor/dist/plugin.wasm.sources
index d1b11a17..4f6159a0 100644
--- a/plugins/official/csv-editor/dist/plugin.wasm.sources
+++ b/plugins/official/csv-editor/dist/plugin.wasm.sources
@@ -1 +1 @@
-b96941af697ce7a6c1c8ef1539d34aa7c23d2d41dd1b2ccffdfda5648f90cf56
+c199dc52e00d3943882d532e7e6095f7b2f8d7d6026cf1ccaa685dd6300f2319
diff --git a/plugins/official/csv-editor/plugin.toml b/plugins/official/csv-editor/plugin.toml
index 06d920a5..e42c1d7a 100644
--- a/plugins/official/csv-editor/plugin.toml
+++ b/plugins/official/csv-editor/plugin.toml
@@ -5,6 +5,7 @@ description = "Edit CSV and TSV files as a table. Edits go to the file's text, s
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: table editor for .csv and .tsv with cell editing, inserting and deleting rows; large files load the visible rows only."
+categories = ["tools"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-view:table"]
diff --git a/plugins/official/excalidraw/plugin.toml b/plugins/official/excalidraw/plugin.toml
index 70bf7ad0..fdfc495b 100644
--- a/plugins/official/excalidraw/plugin.toml
+++ b/plugins/official/excalidraw/plugin.toml
@@ -5,6 +5,7 @@ description = "Draw and edit Excalidraw diagrams (.excalidraw). The drawing is t
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: the Excalidraw canvas next to (or instead of) the file's text, kept in step both ways; export to PNG and SVG through the save dialog; a file icon and a New › Excalidraw Drawing template. Based on the Excalidraw editor proposed by Deng Liu (#738)."
+categories = ["tools"]
 engines.openidea = "^1.0"
 
 [capabilities]
diff --git a/plugins/official/git-toolbox/dist/plugin.wasm b/plugins/official/git-toolbox/dist/plugin.wasm
index 9479f183..5e26ce4e 100644
Binary files a/plugins/official/git-toolbox/dist/plugin.wasm and b/plugins/official/git-toolbox/dist/plugin.wasm differ
diff --git a/plugins/official/git-toolbox/dist/plugin.wasm.sources b/plugins/official/git-toolbox/dist/plugin.wasm.sources
index fd509401..0131a6b6 100644
--- a/plugins/official/git-toolbox/dist/plugin.wasm.sources
+++ b/plugins/official/git-toolbox/dist/plugin.wasm.sources
@@ -1 +1 @@
-ad545605b33c6f4e55a06a376333de3162739ed920b5d7d277942e50a4420083
+6047be5eeaa1330d7aa1f182e88ae2f352f244829ad9a01fdc3a2a081bdca95d
diff --git a/plugins/official/git-toolbox/plugin.toml b/plugins/official/git-toolbox/plugin.toml
index ff5bbfce..d0f02117 100644
--- a/plugins/official/git-toolbox/plugin.toml
+++ b/plugins/official/git-toolbox/plugin.toml
@@ -5,6 +5,7 @@ description = "Fetches your repositories in the background and shows the branch
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: auto-fetch every 5 minutes, ahead/behind in the status bar, Fetch Now."
+categories = ["vcs"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 # Fetches on schedule (also after being reclaimed while idle) and refreshes
diff --git a/plugins/official/graphviz/dist/plugin.wasm b/plugins/official/graphviz/dist/plugin.wasm
index fa2c8114..912edbd6 100644
Binary files a/plugins/official/graphviz/dist/plugin.wasm and b/plugins/official/graphviz/dist/plugin.wasm differ
diff --git a/plugins/official/graphviz/dist/plugin.wasm.sources b/plugins/official/graphviz/dist/plugin.wasm.sources
index 8e261ce0..1657b2d5 100644
--- a/plugins/official/graphviz/dist/plugin.wasm.sources
+++ b/plugins/official/graphviz/dist/plugin.wasm.sources
@@ -1 +1 @@
-de353be96a6b66629901f55a8027a0f27107a7ac2fb9d891089db1b7fd716299
+7a3ee410d228d1e39155aa042237d222d23d7f5a45e261086cffc45c6ee1ad32
diff --git a/plugins/official/graphviz/plugin.toml b/plugins/official/graphviz/plugin.toml
index 04f87a2e..8cf06eb4 100644
--- a/plugins/official/graphviz/plugin.toml
+++ b/plugins/official/graphviz/plugin.toml
@@ -5,6 +5,7 @@ description = "Graphviz DOT files (.dot, .gv) with a live preview beside the tex
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: live preview (Graphviz compiled to WebAssembly), layout engines, zoom, errors as problems, SVG and PNG export."
+categories = ["languages", "tools"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-view:preview"]
diff --git a/plugins/official/graphviz/src/lib.rs b/plugins/official/graphviz/src/lib.rs
index cd76c651..c8ab1210 100644
--- a/plugins/official/graphviz/src/lib.rs
+++ b/plugins/official/graphviz/src/lib.rs
@@ -52,12 +52,9 @@ pub fn diagnostics(text: &str, reports: &[Report]) -> Vec<Diagnostic> {
         .map(|r| {
             let line = r.line.map_or(0, |l| l.saturating_sub(1)).min(lines.len().saturating_sub(1) as u32);
             let len = lines.get(line as usize).map_or(0, |l| l.encode_utf16().count() as u32);
-            Diagnostic {
-                range: Range::new(Position::new(line, 0), Position::new(line, len)),
-                severity: if r.error { Severity::Error } else { Severity::Warning },
-                message: r.message.clone(),
-                code: Some("graphviz".into()),
-            }
+            let range = Range::new(Position::new(line, 0), Position::new(line, len));
+            let severity = if r.error { Severity::Error } else { Severity::Warning };
+            Diagnostic::new(range, severity, r.message.clone()).code("graphviz")
         })
         .collect()
 }
diff --git a/plugins/official/harbor-night/themes/harbor-night.scheme.json b/plugins/official/harbor-night/themes/harbor-night.scheme.json
index 892744ea..41bd2966 100644
--- a/plugins/official/harbor-night/themes/harbor-night.scheme.json
+++ b/plugins/official/harbor-night/themes/harbor-night.scheme.json
@@ -18,6 +18,7 @@
     "--syn-number": "#7fc8f8",
     "--syn-punct": "#a9b4c2",
     "--syn-variable": "#d9dfe8",
+    "--syn-global": "#d9dfe8",
     "--syn-param": "#d9dfe8",
     "--syn-property": "#b9a3f0",
     "--syn-constant": "#e58fa3",
diff --git a/plugins/official/key-promoter/dist/plugin.wasm b/plugins/official/key-promoter/dist/plugin.wasm
index daefc884..99400b9b 100644
Binary files a/plugins/official/key-promoter/dist/plugin.wasm and b/plugins/official/key-promoter/dist/plugin.wasm differ
diff --git a/plugins/official/key-promoter/dist/plugin.wasm.sources b/plugins/official/key-promoter/dist/plugin.wasm.sources
index 9965326d..84b4dfaa 100644
--- a/plugins/official/key-promoter/dist/plugin.wasm.sources
+++ b/plugins/official/key-promoter/dist/plugin.wasm.sources
@@ -1 +1 @@
-345c39f818e4950914bf3fcc795fac9e30ff2d87ad3e66f24c7bc00800f92980
+7658a95eb9fc27468cae4b1d20e3b5ab299fde478e07f69ab0fdb4cc10caf11d
diff --git a/plugins/official/key-promoter/plugin.toml b/plugins/official/key-promoter/plugin.toml
index 10f032b4..3a430fb9 100644
--- a/plugins/official/key-promoter/plugin.toml
+++ b/plugins/official/key-promoter/plugin.toml
@@ -5,6 +5,7 @@ description = "Shows the keyboard shortcut of an action you ran with the mouse,
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: shortcut tips, statistics, per-action \"don't show again\"."
+categories = ["tools"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 # Actions arrive in batches (a few seconds apart while the plugin is idle),
diff --git a/plugins/official/license-header/dist/plugin.wasm b/plugins/official/license-header/dist/plugin.wasm
index 6cd6d293..fdcbdd18 100644
Binary files a/plugins/official/license-header/dist/plugin.wasm and b/plugins/official/license-header/dist/plugin.wasm differ
diff --git a/plugins/official/license-header/dist/plugin.wasm.sources b/plugins/official/license-header/dist/plugin.wasm.sources
index 01859b4b..e5ee06b9 100644
--- a/plugins/official/license-header/dist/plugin.wasm.sources
+++ b/plugins/official/license-header/dist/plugin.wasm.sources
@@ -1 +1 @@
-6a4210a3978f058b3526427eb41ef398924e8c011cc4dc53c19f5419d31501f3
+227a30ef0028f167a20825bdd775b15392161e641f6c68030e01d0c79e263bb5
diff --git a/plugins/official/license-header/plugin.toml b/plugins/official/license-header/plugin.toml
index af970e2e..c32b4176 100644
--- a/plugins/official/license-header/plugin.toml
+++ b/plugins/official/license-header/plugin.toml
@@ -5,6 +5,7 @@ description = "Keeps a copyright and SPDX license header at the top of source fi
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: missing headers reported on open and save, Add License Header quick fix and command, project scan in the background."
+categories = ["tools"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-event:file-opened", "on-event:file-saved", "on-command:*"]
diff --git a/plugins/official/license-header/src/lib.rs b/plugins/official/license-header/src/lib.rs
index 7fd5d789..1da3c9e1 100644
--- a/plugins/official/license-header/src/lib.rs
+++ b/plugins/official/license-header/src/lib.rs
@@ -129,12 +129,8 @@ pub fn header_edit(path: &str, text: &str, year: i64, owner: &str, license: &str
 fn missing(text: &str) -> Diagnostic {
     let line = insert_line(text);
     let len = text.lines().nth(line as usize).map_or(0, |l| l.encode_utf16().count() as u32);
-    Diagnostic {
-        range: Range::new(Position::new(line, 0), Position::new(line, len)),
-        severity: Severity::Info,
-        message: "No license header".into(),
-        code: Some(CODE.into()),
-    }
+    Diagnostic::new(Range::new(Position::new(line, 0), Position::new(line, len)), Severity::Info, "No license header")
+        .code(CODE)
 }
 
 /// Reports `path` when it takes a header and has none, clears it otherwise.
@@ -274,6 +270,7 @@ impl Providers for LicenseHeader {
             kind: Some("quickfix".into()),
             preferred: true,
             edits: vec![(doc.path.clone(), vec![edit])],
+            data: None,
         }]
     }
 }
diff --git a/plugins/official/mybatis/dist/plugin.wasm b/plugins/official/mybatis/dist/plugin.wasm
index 5ed3800a..b31649e9 100644
Binary files a/plugins/official/mybatis/dist/plugin.wasm and b/plugins/official/mybatis/dist/plugin.wasm differ
diff --git a/plugins/official/mybatis/dist/plugin.wasm.sources b/plugins/official/mybatis/dist/plugin.wasm.sources
index 0241ff75..34acc267 100644
--- a/plugins/official/mybatis/dist/plugin.wasm.sources
+++ b/plugins/official/mybatis/dist/plugin.wasm.sources
@@ -1 +1 @@
-f7df58bb0ab2b92370b148de2614174ec1ff9b01c0078b5c20bd331f82298616
+046f769822102de0d4ecec99ad41027cb792941065226716f38a6e64c50ff364
diff --git a/plugins/official/mybatis/plugin.toml b/plugins/official/mybatis/plugin.toml
index fac11916..d5a55c69 100644
--- a/plugins/official/mybatis/plugin.toml
+++ b/plugins/official/mybatis/plugin.toml
@@ -5,6 +5,7 @@ description = "Jumps between MyBatis mapper interfaces and their XML statements
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: navigation both ways, line markers, id and parameter completion."
+categories = ["frameworks"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-command:*"]
diff --git a/plugins/official/regex-tester/dist/plugin.wasm b/plugins/official/regex-tester/dist/plugin.wasm
index 9eed421b..a8e10a84 100644
Binary files a/plugins/official/regex-tester/dist/plugin.wasm and b/plugins/official/regex-tester/dist/plugin.wasm differ
diff --git a/plugins/official/regex-tester/dist/plugin.wasm.sources b/plugins/official/regex-tester/dist/plugin.wasm.sources
index b9543105..df4b262a 100644
--- a/plugins/official/regex-tester/dist/plugin.wasm.sources
+++ b/plugins/official/regex-tester/dist/plugin.wasm.sources
@@ -1 +1 @@
-d2e35f3e4ee6b699899ea43fdf96d5ec99f0730c502f94fd6f3246e605be99a7
+0b9c3572390a3caab7d47f9b975439f8dde3feff6b9044579d99b8334ac2a692
diff --git a/plugins/official/regex-tester/plugin.toml b/plugins/official/regex-tester/plugin.toml
index a889b96a..22e45435 100644
--- a/plugins/official/regex-tester/plugin.toml
+++ b/plugins/official/regex-tester/plugin.toml
@@ -5,6 +5,7 @@ description = "Try a regular expression against sample text: matches highlighted
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: live matching with flags, capture groups, replacement preview, the editor's selection as test text."
+categories = ["tools"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 activation = ["on-view:regex", "on-command:*"]
diff --git a/plugins/official/solidity/dist/plugin.wasm b/plugins/official/solidity/dist/plugin.wasm
index 3cb17fd7..cef826bb 100644
Binary files a/plugins/official/solidity/dist/plugin.wasm and b/plugins/official/solidity/dist/plugin.wasm differ
diff --git a/plugins/official/solidity/dist/plugin.wasm.sources b/plugins/official/solidity/dist/plugin.wasm.sources
index d7a74f4c..09d61924 100644
--- a/plugins/official/solidity/dist/plugin.wasm.sources
+++ b/plugins/official/solidity/dist/plugin.wasm.sources
@@ -1 +1 @@
-3893bd8ad06d3e19c0112081c6643b3bf3c67f5a184098432a6fd338426cd682
+0af62bcd4583d126a616cafbf2ddc80f039a3ead2b5dcb7144222b0ebc673432
diff --git a/plugins/official/solidity/plugin.toml b/plugins/official/solidity/plugin.toml
index cc03892b..2ef3c864 100644
--- a/plugins/official/solidity/plugin.toml
+++ b/plugins/official/solidity/plugin.toml
@@ -5,6 +5,7 @@ description = "Solidity support: file detection, highlighting, structure view an
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: .sol detection, highlighting, structure view, folding; language server via @nomicfoundation/solidity-language-server or solc."
+categories = ["languages"]
 engines.openidea = "^1.0"
 # Highlighting, structure and folding come from this component; it is loaded
 # when the first Solidity file is opened.
diff --git a/plugins/official/string-tools/dist/plugin.wasm b/plugins/official/string-tools/dist/plugin.wasm
index 1c33e3e4..3ae03a50 100644
Binary files a/plugins/official/string-tools/dist/plugin.wasm and b/plugins/official/string-tools/dist/plugin.wasm differ
diff --git a/plugins/official/string-tools/dist/plugin.wasm.sources b/plugins/official/string-tools/dist/plugin.wasm.sources
index 2dbf488f..c511466f 100644
--- a/plugins/official/string-tools/dist/plugin.wasm.sources
+++ b/plugins/official/string-tools/dist/plugin.wasm.sources
@@ -1 +1 @@
-a88c39d5782369329efa55b12330daa906e5c8d91252bd57c7343648840bac79
+24ef150beefb05622212228e1c44cb487fffe6526776762d713f3ebdf4c02ac0
diff --git a/plugins/official/string-tools/plugin.toml b/plugins/official/string-tools/plugin.toml
index 18ff2bb5..9ff53b75 100644
--- a/plugins/official/string-tools/plugin.toml
+++ b/plugins/official/string-tools/plugin.toml
@@ -5,6 +5,7 @@ description = "Case conversion (camelCase, snake_case, kebab-case…), encoding
 authors = ["OpenIDEA contributors"]
 license = "Apache-2.0"
 change-notes = "0.1.0 — first release: 26 commands in four groups."
+categories = ["tools"]
 engines.openidea = "^1.0"
 wasm = "dist/plugin.wasm"
 # The commands are declared below, so Find Action and the keymap list them
diff --git a/scripts/theme/import-intellij-theme.ts b/scripts/theme/import-intellij-theme.ts
index 4fdd0cf1..d294c1ce 100644
--- a/scripts/theme/import-intellij-theme.ts
+++ b/scripts/theme/import-intellij-theme.ts
@@ -10,7 +10,8 @@
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
 import { parseArgs } from "node:util";
-import { convertIntellijTheme, pluginManifest } from "./intellij.ts";
+import { convertIntellijTheme, pluginManifest } from "../../src/features/plugins/intellijTheme.ts";
+import { stripJsonComments } from "./tokens.ts";
 
 const { values, positionals } = parseArgs({
   allowPositionals: true,
@@ -25,7 +26,7 @@ if (!themePath || !values.out) {
 }
 
 const converted = convertIntellijTheme(
-  readFileSync(themePath, "utf8"),
+  stripJsonComments(readFileSync(themePath, "utf8")),
   iclsPath ? readFileSync(iclsPath, "utf8") : undefined,
   values.id,
 );
@@ -34,7 +35,17 @@ const source = [basename(themePath), iclsPath && basename(iclsPath)].filter(Bool
 const header = (what: string) => `// ${theme.name}: ${what}, converted from ${source}.\n`;
 
 mkdirSync(join(values.out, "themes"), { recursive: true });
-writeFileSync(join(values.out, "plugin.toml"), pluginManifest(converted, values.author ?? "Unknown", source));
+const info = {
+  id: `theme-${theme.id}`,
+  name: `${theme.name} Theme`,
+  version: "1.0.0",
+  description: `${theme.name}, converted from an IntelliJ theme.`,
+  authors: [values.author ?? "Unknown"],
+};
+writeFileSync(
+  join(values.out, "plugin.toml"),
+  pluginManifest(info, [converted], `Converted from ${source} by scripts/theme/import-intellij-theme.ts.`),
+);
 writeFileSync(
   join(values.out, "themes", `${theme.id}.theme.json`),
   header("UI theme") + JSON.stringify(theme, null, 2) + "\n",
diff --git a/scripts/theme/theme.test.ts b/scripts/theme/theme.test.ts
index bf533329..404d9909 100644
--- a/scripts/theme/theme.test.ts
+++ b/scripts/theme/theme.test.ts
@@ -5,9 +5,10 @@ import {
   convertIntellijTheme,
   ICLS_ATTRIBUTES,
   ICLS_COLORS,
+  intellijThemePackage,
   pluginManifest,
   UI_KEYS,
-} from "./intellij.ts";
+} from "../../src/features/plugins/intellijTheme.ts";
 import { referenceMarkdown, stripJsonComments, themeTokenGroups, tokenSets, withReference } from "./tokens.ts";
 
 const read = (p: string) => readFileSync(p, "utf8");
@@ -90,6 +91,8 @@ describe("IntelliJ theme import", () => {
       "Button": { "default": { "startBackground": "accent" } },
       "Popup.background": "#181f28",
       "Label.infoForeground": "#80888F80",
+      "EditorTabs": { "underlineColor": "#405060", "underlinedBorderColor": "#bd93f9" },
+      "CompletionPopup.matchForeground": "#ff79c6",
       "Tree": { "rowHeight": 24 }
     }
   }`;
@@ -98,6 +101,7 @@ describe("IntelliJ theme import", () => {
     <option name="CARET_COLOR" value="ffcc00" />
     <option name="LINE_NUMBERS_COLOR" value="0" />
     <option name="UNKNOWN_KEY" value="123456" />
+    <option name="GUTTER_BACKGROUND" value="313335" />
   </colors>
   <attributes>
     <option name="DEFAULT_KEYWORD">
@@ -125,11 +129,14 @@ describe("IntelliJ theme import", () => {
       </value>
     </option>
     <option name="DEFAULT_CONSTANT" baseAttributes="DEFAULT_IDENTIFIER" />
+    <option name="DEFAULT_INSTANCE_FIELD">
+      <value />
+    </option>
   </attributes>
 </scheme>`;
 
   it("maps ui keys, named colours and wildcards", () => {
-    const { theme: t, scheme: s } = convertIntellijTheme(themeJson);
+    const { theme: t, scheme: s } = convertIntellijTheme(stripJsonComments(themeJson));
     expect(t).toMatchObject({ id: "deep-sea", name: "Deep Sea", kind: "dark" });
     expect(t.tokens["--bg-app"]).toBe("#101820"); // *.background → named colour
     expect(t.tokens["--accent"]).toBe("#33aaff");
@@ -137,6 +144,9 @@ describe("IntelliJ theme import", () => {
     expect(t.tokens["--bg-selected"]).toBe("#203040");
     expect(t.tokens["--fg-muted"]).toBe("#80888f80");
     expect(t.tokens["--fg"]).toBe("#c0c8d0");
+    // Islands borders the selected tab with underlinedBorderColor.
+    expect(t.tokens["--border-tab-selected"]).toBe("#bd93f9");
+    expect(t.tokens["--fg-completion-match"]).toBe("#ff79c6");
     expect(s).toBeNull();
   });
 
@@ -164,20 +174,82 @@ describe("IntelliJ theme import", () => {
       "--syn-comment-style": "italic",
       "--fg-editor": "#a9b7c6",
       "--bg-editor": "#2b2b2b",
+      // GUTTER_BACKGROUND is the classic UI's: the gutter keeps the editor's background.
       "--bg-editor-gutter": "#2b2b2b",
       "--wave-error": "#ff0000",
       "--editor-error-decoration": "underline wavy #ff0000",
+      // <value />: plain text, not the parent scheme's colour.
+      "--syn-property": "#a9b7c6",
     });
     expect(s.tokens["--syn-constant"]).toBeUndefined();
   });
 
   it("produces an installable package", () => {
-    const c = convertIntellijTheme(themeJson.replace('"dark": true,', ""), icls.replace("Darcula", "Default"), "sea");
+    const light = stripJsonComments(themeJson.replace('"dark": true,', ""));
+    const c = convertIntellijTheme(light, icls.replace("Darcula", "Default"), "sea");
     expect(c.theme.kind).toBe("light");
     expect(c.theme.id).toBe("sea");
     expect(c.theme.tokens["--bg-island"]).toBe("#101820"); // ToolWindow ← *.background wins over the editor
-    const toml = pluginManifest(c, "Someone", "DeepSea.theme.json");
+    const info = {
+      id: "theme-sea",
+      name: 'Sea "Deep"',
+      version: "1.0.0",
+      description: "a\\b\nc",
+      authors: ["Someone"],
+    };
+    const toml = pluginManifest(info, [c], "Converted from\nDeepSea.theme.json");
+    expect(toml).toContain("# Converted from DeepSea.theme.json\n");
     expect(toml).toContain('id = "theme-sea"');
+    expect(toml).toContain('name = "Sea \\"Deep\\""');
+    expect(toml).toContain('description = "a\\\\b\\u000ac"');
+    expect(toml).toContain('engines.openidea = "^1.0"');
     expect(toml).toContain('editor-scheme = "themes/sea.scheme.json"');
   });
+
+  it("turns a theme plugin into one package with all its themes", () => {
+    const deep = stripJsonComments(themeJson);
+    const pkg = intellijThemePackage({
+      name: "Deep Sea Themes",
+      pluginId: "com.example.DeepSea",
+      version: "2.3",
+      vendor: "Someone",
+      themes: [
+        { id: "deep-sea-id", theme: deep, editorScheme: icls },
+        { id: "copy-id", theme: deep, editorScheme: null },
+        { id: "light-id", theme: '{"name":"Shallow","dark":false}', editorScheme: null },
+      ],
+    });
+    expect(pkg.id).toBe("intellij.com-example-deepsea");
+    expect(pkg.themes).toEqual([
+      { id: "deep-sea", sourceId: "deep-sea-id", name: "Deep Sea" },
+      { id: "deep-sea-2", sourceId: "copy-id", name: "Deep Sea" },
+      { id: "shallow", sourceId: "light-id", name: "Shallow" },
+    ]);
+    expect(pkg.files.map((f) => f.path)).toEqual([
+      "plugin.toml",
+      "themes/deep-sea.theme.json",
+      "themes/deep-sea.scheme.json",
+      "themes/deep-sea-2.theme.json",
+      "themes/shallow.theme.json",
+    ]);
+    const manifest = pkg.files[0]!.text;
+    expect(manifest).toContain('version = "2.3.0"');
+    expect(manifest).toContain('authors = ["Someone"]');
+    expect(manifest.match(/\[\[contributes\.themes\]\]/g)).toHaveLength(3);
+    const shallow = JSON.parse(pkg.files[4]!.text) as { id: string; kind: string };
+    expect(shallow).toMatchObject({ id: "shallow", kind: "light" });
+    expect(
+      intellijThemePackage({
+        name: "X",
+        pluginId: null,
+        version: "SNAPSHOT",
+        vendor: null,
+        themes: [{ id: "x", theme: "{}", editorScheme: null }],
+      }).files[0]!.text,
+    ).toContain('version = "1.0.0"');
+    expect(() =>
+      intellijThemePackage({ name: "Empty", pluginId: null, version: null, vendor: null, themes: [] }),
+    ).toThrow();
+    expect(() => convertIntellijTheme("[1]")).toThrow("Not an IntelliJ theme");
+  });
 });
diff --git a/sdk/rust/openidea-plugin/src/host.rs b/sdk/rust/openidea-plugin/src/host.rs
index 187c5f8b..88cef0e3 100644
--- a/sdk/rust/openidea-plugin/src/host.rs
+++ b/sdk/rust/openidea-plugin/src/host.rs
@@ -152,24 +152,12 @@ mod imp {
         wit::vcs::fetch(p).map_err(error)
     }
 
-    fn kind(k: EventKind) -> wit::events::EventKind {
-        use wit::events::EventKind as K;
-        match k {
-            EventKind::FileOpened => K::FileOpened,
-            EventKind::FileSaved => K::FileSaved,
-            EventKind::EditorFocused => K::EditorFocused,
-            EventKind::ActionPerformed => K::ActionPerformed,
-            EventKind::VcsChanged => K::VcsChanged,
-            EventKind::Scheduled => K::Scheduled,
-        }
-    }
-
     pub fn subscribe(k: EventKind) -> Result<(), Error> {
-        wit::events::subscribe(kind(k)).map_err(error)
+        wit::events::subscribe(k.name()).map_err(error)
     }
 
     pub fn unsubscribe(k: EventKind) {
-        wit::events::unsubscribe(kind(k))
+        wit::events::unsubscribe(k.name())
     }
 
     pub fn begin_task(title: &str, cancellable: bool) -> TaskRes {
@@ -189,7 +177,7 @@ mod imp {
     }
 
     pub fn publish_diagnostics(path: &str, items: &[Diagnostic]) -> Result<(), Error> {
-        use wit::diagnostics::{Diagnostic as D, Severity as S};
+        use wit::diagnostics::{Diagnostic as D, RelatedInformation as R, Severity as S};
         let items: Vec<D> = items
             .iter()
             .map(|d| D {
@@ -202,6 +190,23 @@ mod imp {
                 },
                 message: d.message.clone(),
                 code: d.code.clone(),
+                source: d.source.clone(),
+                tags: [(d.unnecessary, "unnecessary"), (d.deprecated, "deprecated")]
+                    .into_iter()
+                    .filter(|(on, _)| *on)
+                    .map(|(_, tag)| tag.to_owned())
+                    .collect(),
+                related: d
+                    .related
+                    .iter()
+                    .map(|r| R {
+                        location: wit::types::Location {
+                            path: r.location.path.clone(),
+                            range: range_out(r.location.range),
+                        },
+                        message: r.message.clone(),
+                    })
+                    .collect(),
             })
             .collect();
         wit::diagnostics::publish(path, &items).map_err(error)
@@ -240,6 +245,10 @@ mod imp {
         wit::views::open_terminal(title, program, args).map_err(error)
     }
 
+    pub fn open_location(path: &str, line: u32, column: u32) -> Result<(), Error> {
+        wit::views::open_location(path, line, column).map_err(error)
+    }
+
     pub fn setting(key: &str) -> Option<String> {
         wit::settings::get(key)
     }
@@ -264,7 +273,7 @@ mod imp {
     }
 
     pub fn event(e: wit::events::Event) -> Event {
-        use wit::events::{ActionSource as S, Event as E};
+        use wit::events::Event as E;
         match e {
             E::FileOpened(p) => Event::FileOpened(p),
             E::FileSaved(p) => Event::FileSaved(p),
@@ -274,16 +283,10 @@ mod imp {
             E::ActionPerformed(a) => Event::ActionPerformed(ActionPerformed {
                 action: a.action,
                 title: a.title,
-                source: match a.source {
-                    S::Keyboard => ActionSource::Keyboard,
-                    S::Menu => ActionSource::Menu,
-                    S::Toolbar => ActionSource::Toolbar,
-                    S::ContextMenu => ActionSource::ContextMenu,
-                    S::Search => ActionSource::Search,
-                    S::Other => ActionSource::Other,
-                },
+                source: ActionSource::parse(&a.source),
                 shortcut: a.shortcut,
             }),
+            E::Other(x) => Event::Other { kind: x.kind, data: x.data },
         }
     }
 }
@@ -388,6 +391,10 @@ pub fn open_terminal(title: &str, program: &str, args: &[String]) -> Result<(),
     imp::open_terminal(title, program, args)
 }
 
+pub fn open_location(path: &str, line: u32, column: u32) -> Result<(), Error> {
+    imp::open_location(path, line, column)
+}
+
 /// One of the plugin's settings (`[contributes.settings]`) as JSON: the
 /// user's value (project over global) or the schema's default.
 pub fn setting(key: &str) -> Option<String> {
diff --git a/sdk/rust/openidea-plugin/src/lib.rs b/sdk/rust/openidea-plugin/src/lib.rs
index f59d728c..57aebe86 100644
--- a/sdk/rust/openidea-plugin/src/lib.rs
+++ b/sdk/rust/openidea-plugin/src/lib.rs
@@ -255,6 +255,16 @@ macro_rules! __providers_exports {
                 $crate::__rt::code_actions::<$plugin>(doc, selection)
             }
 
+            fn resolve_code_action(
+                doc: $crate::providers_bindings::exports::openidea::plugin::providers::Document,
+                action: $crate::providers_bindings::exports::openidea::plugin::providers::CodeAction,
+            ) -> ::core::result::Result<
+                $crate::providers_bindings::exports::openidea::plugin::providers::CodeAction,
+                $crate::bindings::openidea::plugin::types::Error,
+            > {
+                $crate::__rt::resolve_code_action::<$plugin>(doc, action)
+            }
+
             fn definition(
                 doc: $crate::providers_bindings::exports::openidea::plugin::providers::Document,
                 at: $crate::bindings::openidea::plugin::types::Position,
@@ -420,9 +430,12 @@ pub mod __rt {
                 detail: i.detail,
                 kind: i.kind.map(|k| k.as_str().to_owned()),
                 insert_text: i.insert_text,
+                snippet: i.snippet,
                 replace: i.replace.map(crate::host::__range_to),
                 sort_text: i.sort_text,
+                filter_text: i.filter_text,
                 documentation: i.documentation,
+                additional_edits: i.additional_edits.into_iter().map(edit_out).collect(),
             })
             .collect()
     }
@@ -443,25 +456,54 @@ pub mod __rt {
         sel: b::types::Range,
     ) -> Vec<w::CodeAction> {
         let d = doc(d);
-        with::<T, _>(|x| x.code_actions(&d, crate::host::__range_from(sel)))
-            .into_iter()
-            .map(|a| w::CodeAction {
-                title: a.title,
-                kind: a.kind,
-                preferred: a.preferred,
-                edits: a
-                    .edits
-                    .into_iter()
-                    .map(|(path, edits)| w::FileEdit {
-                        path,
-                        edits: edits
-                            .into_iter()
-                            .map(|e| b::types::TextEdit { range: crate::host::__range_to(e.range), text: e.text })
-                            .collect(),
-                    })
-                    .collect(),
-            })
-            .collect()
+        with::<T, _>(|x| x.code_actions(&d, crate::host::__range_from(sel))).into_iter().map(action_out).collect()
+    }
+
+    pub fn resolve_code_action<T: Plugin + p::Providers + Default>(
+        d: w::Document,
+        action: w::CodeAction,
+    ) -> Result<w::CodeAction, b::types::Error> {
+        let d = doc(d);
+        with::<T, _>(|x| x.resolve_code_action(&d, action_in(action))).map(action_out).map_err(error_out)
+    }
+
+    fn edit_out(e: crate::TextEdit) -> b::types::TextEdit {
+        b::types::TextEdit { range: crate::host::__range_to(e.range), text: e.text }
+    }
+
+    fn action_out(a: p::CodeAction) -> w::CodeAction {
+        w::CodeAction {
+            title: a.title,
+            kind: a.kind,
+            preferred: a.preferred,
+            edits: a
+                .edits
+                .into_iter()
+                .map(|(path, edits)| w::FileEdit { path, edits: edits.into_iter().map(edit_out).collect() })
+                .collect(),
+            data: a.data,
+        }
+    }
+
+    fn action_in(a: w::CodeAction) -> p::CodeAction {
+        p::CodeAction {
+            title: a.title,
+            kind: a.kind,
+            preferred: a.preferred,
+            edits: a
+                .edits
+                .into_iter()
+                .map(|f| {
+                    let edits = f
+                        .edits
+                        .into_iter()
+                        .map(|e| crate::TextEdit { range: crate::host::__range_from(e.range), text: e.text })
+                        .collect();
+                    (f.path, edits)
+                })
+                .collect(),
+            data: a.data,
+        }
     }
 
     pub fn definition<T: Plugin + p::Providers + Default>(
@@ -531,6 +573,9 @@ pub mod __rt {
                             v::FieldValue::Multiline(t) => vt::FieldValue::Multiline(t),
                             v::FieldValue::Checkbox(c) => vt::FieldValue::Checkbox(c),
                             v::FieldValue::Choice(o, s) => vt::FieldValue::Choice((o, s)),
+                            v::FieldValue::Other { kind, data } => {
+                                vt::FieldValue::Other(b::types::Extension { kind, data })
+                            }
                         },
                     })
                     .collect(),
@@ -543,6 +588,7 @@ pub mod __rt {
                 editable: t.editable,
             }),
             v::Body::Html(h) => vt::Body::Html(h),
+            v::Body::Other { kind, data } => vt::Body::Other(b::types::Extension { kind, data }),
         };
         vt::View {
             toolbar: view
@@ -582,6 +628,7 @@ pub mod __rt {
             vt::ViewEvent::InsertRow(r) => v::ViewEvent::InsertRow(r),
             vt::ViewEvent::DeleteRows(r) => v::ViewEvent::DeleteRows(r),
             vt::ViewEvent::Message(m) => v::ViewEvent::Message(m),
+            vt::ViewEvent::Other(x) => v::ViewEvent::Other { kind: x.kind, data: x.data },
         };
         with::<T, _>(|p| p.handle(&view, event, &ctx)).map_err(error_out)
     }
diff --git a/sdk/rust/openidea-plugin/src/mock.rs b/sdk/rust/openidea-plugin/src/mock.rs
index 33ce121d..334da48f 100644
--- a/sdk/rust/openidea-plugin/src/mock.rs
+++ b/sdk/rust/openidea-plugin/src/mock.rs
@@ -74,6 +74,7 @@ struct State {
     refreshed: Vec<String>,
     view_messages: Vec<(String, String)>,
     terminals: Vec<MockTerminal>,
+    locations: Vec<(String, u32, u32)>,
     settings: BTreeMap<String, String>,
 }
 
@@ -220,6 +221,10 @@ impl MockHost {
         self.state.borrow().view_messages.clone()
     }
 
+    pub fn opened_locations(&self) -> Vec<(String, u32, u32)> {
+        self.state.borrow().locations.clone()
+    }
+
     /// Terminals the plugin opened.
     pub fn terminals(&self) -> Vec<MockTerminal> {
         self.state.borrow().terminals.clone()
@@ -595,6 +600,14 @@ pub mod current {
         })
     }
 
+    pub fn open_location(path: &str, line: u32, column: u32) -> Result<(), Error> {
+        with(|s| {
+            require(s, "project.read")?;
+            s.locations.push((path.into(), line, column));
+            Ok(())
+        })
+    }
+
     pub fn setting(key: &str) -> Option<String> {
         with(|s| s.settings.get(key).cloned())
     }
@@ -722,11 +735,8 @@ mod tests {
         let out = mock.invocation().project().unwrap().run_process("java", &["-version".into()], None).unwrap();
         assert_eq!(out.stdout, "-version");
         assert_eq!(mock.process_runs()[0].cwd.as_deref(), Some("/project"));
-        host::publish_diagnostics(
-            "/project/a.java",
-            &[Diagnostic { range: Range::default(), severity: Severity::Warning, message: "m".into(), code: None }],
-        )
-        .unwrap();
+        host::publish_diagnostics("/project/a.java", &[Diagnostic::new(Range::default(), Severity::Warning, "m")])
+            .unwrap();
         assert_eq!(mock.diagnostics()["/project/a.java"].len(), 1);
     }
 }
diff --git a/sdk/rust/openidea-plugin/src/providers.rs b/sdk/rust/openidea-plugin/src/providers.rs
index c10f75cf..2cf80850 100644
--- a/sdk/rust/openidea-plugin/src/providers.rs
+++ b/sdk/rust/openidea-plugin/src/providers.rs
@@ -92,12 +92,18 @@ pub struct CompletionItem {
     pub label: String,
     pub detail: Option<String>,
     pub kind: Option<CompletionKind>,
+    /// With `snippet`, tab stops and placeholders (`$1`, `${1:name}`, `$0`).
     pub insert_text: String,
+    pub snippet: bool,
     /// Replaced on accept; `None`: the word at the caret.
     pub replace: Option<Range>,
     pub sort_text: Option<String>,
+    /// Matched against what was typed instead of `label`.
+    pub filter_text: Option<String>,
     /// Markdown.
     pub documentation: Option<String>,
+    /// Applied with the item elsewhere in the document (an import).
+    pub additional_edits: Vec<TextEdit>,
 }
 
 impl CompletionItem {
@@ -107,9 +113,12 @@ impl CompletionItem {
             detail: None,
             kind: Some(kind),
             insert_text: label.into(),
+            snippet: false,
             replace: None,
             sort_text: None,
+            filter_text: None,
             documentation: None,
+            additional_edits: Vec::new(),
         }
     }
 }
@@ -129,6 +138,9 @@ pub struct CodeAction {
     pub preferred: bool,
     /// (absolute path, edits) per file.
     pub edits: Vec<(String, Vec<TextEdit>)>,
+    /// The plugin's own reference: with it and no `edits`, the edits come
+    /// from [`Providers::resolve_code_action`] once the user picks the action.
+    pub data: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -157,6 +169,12 @@ pub trait Providers {
         Vec::new()
     }
 
+    /// The edits of an action [`Providers::code_actions`] returned with
+    /// `data`, when the user picks it (the command budget applies, not 50 ms).
+    fn resolve_code_action(&mut self, _doc: &Document, action: CodeAction) -> Result<CodeAction, crate::Error> {
+        Ok(action)
+    }
+
     fn definition(&mut self, _doc: &Document, _at: Position) -> Vec<Location> {
         Vec::new()
     }
diff --git a/sdk/rust/openidea-plugin/src/types.rs b/sdk/rust/openidea-plugin/src/types.rs
index 5a74f67d..6a6fbd7a 100644
--- a/sdk/rust/openidea-plugin/src/types.rs
+++ b/sdk/rust/openidea-plugin/src/types.rs
@@ -143,7 +143,9 @@ pub struct StatusItem {
     pub command: Option<String>,
 }
 
+/// Kinds of workbench events; later SDKs add more.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum EventKind {
     FileOpened,
     FileSaved,
@@ -154,17 +156,46 @@ pub enum EventKind {
     Scheduled,
 }
 
-/// How the user started an action.
+impl EventKind {
+    /// The name the IDE knows it by.
+    pub fn name(self) -> &'static str {
+        match self {
+            Self::FileOpened => "file-opened",
+            Self::FileSaved => "file-saved",
+            Self::EditorFocused => "editor-focused",
+            Self::ActionPerformed => "action-performed",
+            Self::VcsChanged => "vcs-changed",
+            Self::Scheduled => "scheduled",
+        }
+    }
+}
+
+/// How the user started an action; later IDEs may report more.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum ActionSource {
     Keyboard,
     Menu,
     Toolbar,
     ContextMenu,
     Search,
+    /// Anything else, including sources this SDK doesn't know.
     Other,
 }
 
+impl ActionSource {
+    pub fn parse(name: &str) -> Self {
+        match name {
+            "keyboard" => Self::Keyboard,
+            "menu" => Self::Menu,
+            "toolbar" => Self::Toolbar,
+            "context-menu" => Self::ContextMenu,
+            "search" => Self::Search,
+            _ => Self::Other,
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ActionPerformed {
     /// Action id (`editor.duplicate-line`).
@@ -177,6 +208,7 @@ pub struct ActionPerformed {
 
 /// A workbench event (see [`crate::host::subscribe`]).
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum Event {
     FileOpened(String),
     FileSaved(String),
@@ -186,6 +218,11 @@ pub enum Event {
     VcsChanged(String),
     /// The `on-schedule` period elapsed.
     Scheduled,
+    /// A kind this SDK doesn't know: its name and JSON data.
+    Other {
+        kind: String,
+        data: String,
+    },
 }
 
 /// The repository containing a project.
@@ -227,6 +264,41 @@ pub struct Diagnostic {
     pub message: String,
     /// Rule or check id.
     pub code: Option<String>,
+    /// The tool that found it, when not the plugin itself.
+    pub source: Option<String>,
+    /// Code that does nothing (shown faded).
+    pub unnecessary: bool,
+    /// Use of something deprecated (struck through).
+    pub deprecated: bool,
+    /// Other places that explain it.
+    pub related: Vec<RelatedInformation>,
+}
+
+impl Diagnostic {
+    pub fn new(range: Range, severity: Severity, message: impl Into<String>) -> Self {
+        Self {
+            range,
+            severity,
+            message: message.into(),
+            code: None,
+            source: None,
+            unnecessary: false,
+            deprecated: false,
+            related: Vec::new(),
+        }
+    }
+
+    pub fn code(mut self, code: impl Into<String>) -> Self {
+        self.code = Some(code.into());
+        self
+    }
+}
+
+/// Another place that explains a diagnostic.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct RelatedInformation {
+    pub location: Location,
+    pub message: String,
 }
 
 /// An HTTP request (see [`crate::host::fetch`]).
@@ -276,3 +348,17 @@ pub struct ProcessOutput {
     pub stdout: String,
     pub stderr: String,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn names_the_ide_uses() {
+        assert_eq!(EventKind::ActionPerformed.name(), "action-performed");
+        assert_eq!(ActionSource::parse("context-menu"), ActionSource::ContextMenu);
+        assert_eq!(ActionSource::parse("pen"), ActionSource::Other, "a source of a newer IDE");
+        let d = Diagnostic::new(Range::default(), Severity::Hint, "m").code("c");
+        assert_eq!((d.code.as_deref(), d.unnecessary, d.related.len()), (Some("c"), false, 0));
+    }
+}
diff --git a/sdk/rust/openidea-plugin/src/views.rs b/sdk/rust/openidea-plugin/src/views.rs
index 3da8e506..b8a693d5 100644
--- a/sdk/rust/openidea-plugin/src/views.rs
+++ b/sdk/rust/openidea-plugin/src/views.rs
@@ -110,12 +110,19 @@ impl ListItem {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum FieldValue {
     Text(String),
     Multiline(String),
     Checkbox(bool),
     /// Options and the chosen one.
     Choice(Vec<String>, String),
+    /// A field type of a newer plugin API: its kind and JSON data (IDEs that
+    /// don't know it leave the field out).
+    Other {
+        kind: String,
+        data: String,
+    },
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -142,6 +149,7 @@ pub struct Table {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum Body {
     Message(String),
     Tree(Vec<TreeItem>),
@@ -151,6 +159,12 @@ pub enum Body {
     /// Shown in a sandboxed frame; its script talks to the plugin with
     /// `openidea.postMessage(text)` and `openidea.onMessage(fn)`.
     Html(String),
+    /// A body of a newer plugin API: its kind and JSON data (IDEs that don't
+    /// know it say they need updating).
+    Other {
+        kind: String,
+        data: String,
+    },
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -197,6 +211,7 @@ impl Viewport {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum ViewEvent {
     Button(String),
     Activate(String),
@@ -213,6 +228,11 @@ pub enum ViewEvent {
     InsertRow(u32),
     DeleteRows(Vec<u32>),
     Message(String),
+    /// An event this SDK doesn't know: its kind and JSON data.
+    Other {
+        kind: String,
+        data: String,
+    },
 }
 
 /// Content of the plugin's declared views and custom editors.
diff --git a/sdk/rust/openidea-plugin/wit/events.wit b/sdk/rust/openidea-plugin/wit/events.wit
index 8470c298..2d118d81 100644
--- a/sdk/rust/openidea-plugin/wit/events.wit
+++ b/sdk/rust/openidea-plugin/wit/events.wit
@@ -2,36 +2,15 @@ package openidea:plugin@1.0.0;
 
 /// Workbench events, delivered in batches to `event-handler.handle`.
 interface events {
-    use types.{error};
-
-    enum event-kind {
-        file-opened,
-        file-saved,
-        /// The focused editor changed.
-        editor-focused,
-        /// An IDE action ran. Requires `events.input`.
-        action-performed,
-        /// A repository's state changed (commit, checkout, fetch, …).
-        vcs-changed,
-        /// The plugin's `on-schedule` period elapsed.
-        scheduled,
-    }
-
-    /// How the user started an action.
-    enum action-source {
-        keyboard,
-        menu,
-        toolbar,
-        context-menu,
-        search,
-        other,
-    }
+    use types.{error, extension};
 
     record action-performed {
         /// Action id (`editor.duplicate-line`).
         action: string,
         title: string,
-        source: action-source,
+        /// How the user started it: `keyboard`, `menu`, `toolbar`,
+        /// `context-menu`, `search` or `other` (more may be added).
+        source: string,
         /// Its keyboard shortcut, when it has one (`Ctrl+D`).
         shortcut: option<string>,
     }
@@ -43,14 +22,21 @@ interface events {
         action-performed(action-performed),
         vcs-changed(string),
         scheduled,
+        /// A kind added after 1.0 (subscribed to by its name).
+        other(extension),
     }
 
     /// Delivers `kind` events from now on, for the rest of the session (also
     /// across idle reclaim: an event activates the plugin again). Declare
     /// `activation = ["on-event:<kind>"]` to get them before first use.
+    /// Kinds: `file-opened`, `file-saved`, `editor-focused` (the focused editor
+    /// changed), `vcs-changed` (a repository's state changed: commit,
+    /// checkout, fetch…), `action-performed` (an IDE action ran) and
+    /// `scheduled` (the `on-schedule` period elapsed); later IDEs add more,
+    /// and an IDE that doesn't know one fails with `invalid`.
     /// Requires `events` (`events.input` for `action-performed`).
-    subscribe: func(kind: event-kind) -> result<_, error>;
-    unsubscribe: func(kind: event-kind);
+    subscribe: func(kind: string) -> result<_, error>;
+    unsubscribe: func(kind: string);
 }
 
 /// Long-running work with a progress indicator. While a task is open, the
diff --git a/sdk/rust/openidea-plugin/wit/io.wit b/sdk/rust/openidea-plugin/wit/io.wit
index a1aeb849..f1fe634a 100644
--- a/sdk/rust/openidea-plugin/wit/io.wit
+++ b/sdk/rust/openidea-plugin/wit/io.wit
@@ -2,7 +2,7 @@ package openidea:plugin@1.0.0;
 
 /// Problems in files, shown in the editor and the Problems view.
 interface diagnostics {
-    use types.{error, range};
+    use types.{error, range, location};
 
     enum severity {
         error,
@@ -11,12 +11,23 @@ interface diagnostics {
         hint,
     }
 
+    /// Another place that explains a diagnostic (the earlier declaration, say).
+    record related-information {
+        location: location,
+        message: string,
+    }
+
     record diagnostic {
         range: range,
         severity: severity,
         message: string,
         /// Rule or check id (`LineLength`).
         code: option<string>,
+        /// The tool that found it, when not the plugin itself (`checkstyle`).
+        source: option<string>,
+        /// `unnecessary` (shown faded) and `deprecated` (struck through); unknown ones are ignored.
+        tags: list<string>,
+        related: list<related-information>,
     }
 
     /// Replaces the plugin's diagnostics for the file at `path` (absolute, in
diff --git a/sdk/rust/openidea-plugin/wit/providers.wit b/sdk/rust/openidea-plugin/wit/providers.wit
index cfca6560..97dd4c7a 100644
--- a/sdk/rust/openidea-plugin/wit/providers.wit
+++ b/sdk/rust/openidea-plugin/wit/providers.wit
@@ -5,7 +5,7 @@ package openidea:plugin@1.0.0;
 /// on the editing path: a result later than ~50 ms is dropped, a call still
 /// running at 500 ms is interrupted.
 interface providers {
-    use types.{position, range, text-edit, location};
+    use types.{error, position, range, text-edit, location};
 
     /// The document a request is about.
     record document {
@@ -24,11 +24,17 @@ interface providers {
         /// constant, struct, event, operator or type-parameter. Unknown kinds
         /// show no icon.
         kind: option<string>,
+        /// With `snippet`, tab stops and placeholders (`$1`, `${1:name}`, `$0`).
         insert-text: string,
+        snippet: bool,
         /// Replaced on accept; `none`: the word at the caret.
         replace: option<range>,
         sort-text: option<string>,
+        /// Matched against what was typed instead of `label`.
+        filter-text: option<string>,
         documentation: option<string>,
+        /// Applied with the item elsewhere in the document (an import).
+        additional-edits: list<text-edit>,
     }
 
     record inline-suggestion {
@@ -48,6 +54,9 @@ interface providers {
         kind: option<string>,
         preferred: bool,
         edits: list<file-edit>,
+        /// The plugin's own reference: with it and no `edits`, the edits are
+        /// computed by `resolve-code-action` once the user picks the action.
+        data: option<string>,
     }
 
     record line-marker {
@@ -64,6 +73,9 @@ interface providers {
     inline-completion: func(doc: document, at: position) -> option<inline-suggestion>;
     /// Actions for `selection` (quick fixes for the plugin's own diagnostics).
     code-actions: func(doc: document, selection: range) -> list<code-action>;
+    /// The edits of an action `code-actions` returned with `data`, when the
+    /// user picks it (the command budget applies, not the editor's 50 ms).
+    resolve-code-action: func(doc: document, action: code-action) -> result<code-action, error>;
     definition: func(doc: document, at: position) -> list<location>;
     line-markers: func(doc: document) -> list<line-marker>;
 }
diff --git a/sdk/rust/openidea-plugin/wit/types.wit b/sdk/rust/openidea-plugin/wit/types.wit
index 5c4f237e..2e2b48f7 100644
--- a/sdk/rust/openidea-plugin/wit/types.wit
+++ b/sdk/rust/openidea-plugin/wit/types.wit
@@ -52,6 +52,15 @@ interface types {
         range: range,
     }
 
+    /// A case added after 1.0, carried by the `other` case of a variant that
+    /// grows (events, view bodies, view events, form fields): its kind and its
+    /// data as JSON. Whoever doesn't know the kind ignores it or shows a
+    /// fallback; the SDKs decode the kinds they know.
+    record extension {
+        kind: string,
+        data: string,
+    }
+
     /// Passed to `lifecycle.activate`.
     record context {
         plugin-id: string,
diff --git a/sdk/rust/openidea-plugin/wit/views.wit b/sdk/rust/openidea-plugin/wit/views.wit
index de1ae780..c4435ece 100644
--- a/sdk/rust/openidea-plugin/wit/views.wit
+++ b/sdk/rust/openidea-plugin/wit/views.wit
@@ -8,6 +8,8 @@ package openidea:plugin@1.0.0;
 /// runs in the WebView, except a `html` body, which is shown in a sandboxed
 /// frame that can only exchange messages with the plugin.
 interface view-types {
+    use types.{extension};
+
     record button {
         id: string,
         label: string,
@@ -43,6 +45,8 @@ interface view-types {
         checkbox(bool),
         /// The options and the chosen one.
         choice(tuple<list<string>, string>),
+        /// A field type added after 1.0 (an IDE that doesn't know it leaves it out).
+        other(extension),
     }
 
     record field {
@@ -72,6 +76,8 @@ interface view-types {
         /// network, no IDE API. Its script talks to the plugin with
         /// `openidea.postMessage(text)` / `openidea.onMessage(fn)`.
         html(string),
+        /// A body added after 1.0; an IDE that doesn't know it says it needs updating.
+        other(extension),
     }
 
     record view {
@@ -109,6 +115,8 @@ interface view-types {
         delete-rows(list<u32>),
         /// From the `html` body's script.
         message(string),
+        /// An event added after 1.0, from a body or field added after 1.0.
+        other(extension),
     }
 }
 
@@ -125,6 +133,10 @@ interface views {
     /// `program` (pinned by a `process:<program>` grant) with `args` in the
     /// project root: long-running output (logs) and interactive sessions.
     open-terminal: func(title: string, program: string, args: list<string>) -> result<_, error>;
+    /// Opens `path` (project-relative or absolute, inside the project) in an
+    /// editor of the window the call came from, the caret at `line` and
+    /// `column` (0-based; UTF-16 column): a view's links to code.
+    open-location: func(path: string, line: u32, column: u32) -> result<_, error>;
 }
 
 /// The plugin's own settings (`[contributes.settings]`), as the user set them
diff --git a/smoke/debug.test.ts b/smoke/debug.test.ts
new file mode 100644
index 00000000..1e336b0e
--- /dev/null
+++ b/smoke/debug.test.ts
@@ -0,0 +1,251 @@
+/**
+ * Debugging each language's `fixtures/` project the way the editor does: a breakpoint on the
+ * entry point's "Set a breakpoint here" line, Debug from the file's context, then the paused
+ * frame, its variables, evaluation, Step Over and Resume, with the debugger the IDE installs.
+ */
+import { execFileSync } from "node:child_process";
+import { cpSync, mkdtempSync, readFileSync, realpathSync, rmSync } from "node:fs";
+import { get } from "node:http";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterAll, afterEach, beforeAll, expect, test } from "vitest";
+import { Channel } from "@tauri-apps/api/core";
+import { commands, type InstallEvent } from "@/bindings";
+import { executeAction } from "@/platform/actions";
+import { call, nextRequestId, onIdeEvent } from "@/platform/ipc";
+import { useBuildModel } from "@/platform/buildModel";
+import { openProject, useProject } from "@/platform/project";
+import { activate as activateBuildTools } from "@/features/build-tools";
+import { useBuild } from "@/features/build-tools/store";
+import { activate as activateDebugger } from "@/features/debugger";
+import { addBreakpoint } from "@/features/debugger/breakpoints/store";
+import { activeSession, evaluate, useDebug } from "@/features/debugger/state";
+import { activate as activateRun } from "@/features/run";
+import { resetRuns, useRun } from "@/features/run/store";
+import { activateWorkbench } from "@/workbench/activate";
+import { useNotifications } from "@/workbench/notificationStore";
+import { connectDesktop } from "./desktop";
+import { repoRoot, Server } from "./server";
+
+interface Case {
+  fixture: string;
+  /** Runs in the project copy first (installs its dependencies). */
+  setup?: (root: string) => void;
+  /** The IDE's tool that debugs it. */
+  debugger: string;
+  /** The entry point, debugged from its context. */
+  file: string;
+  /** A variable of the paused frame. */
+  variable: string;
+  /** An expression evaluated there (Evaluate Expression), and its value. */
+  evaluate: [string, RegExp];
+  /** A server: the breakpoint is in this request's handler, and the session is stopped at the end. */
+  request?: string;
+}
+
+const CASES: Record<string, Case> = {
+  typescript: {
+    fixture: "ts-app",
+    setup: (root) => execFileSync("npm", ["install", "--no-audit", "--no-fund"], { cwd: root, stdio: "ignore" }),
+    debugger: "js-debug",
+    file: "src/index.ts",
+    variable: "cart",
+    evaluate: ["cart.items.length", /^2$/],
+  },
+  python: {
+    fixture: "python-app",
+    setup: (root) => execFileSync("python3", ["-m", "venv", ".venv"], { cwd: root, stdio: "ignore" }),
+    debugger: "debugpy",
+    file: "src/tasks/cli.py",
+    variable: "tasks",
+    evaluate: ["len(tasks.pending())", /^3$/],
+  },
+  rust: {
+    fixture: "rust-app",
+    debugger: "codelldb",
+    file: "src/main.rs",
+    variable: "inventory",
+    evaluate: ["inventory", /\S/],
+  },
+  go: {
+    fixture: "go-app",
+    debugger: "delve",
+    file: "cmd/server/main.go",
+    variable: "r",
+    evaluate: ["r.Method", /^"GET"$/],
+    request: "http://127.0.0.1:8080/notes?q=openidea",
+  },
+  java: {
+    fixture: "java-app",
+    debugger: "java-debug",
+    file: "src/main/java/com/example/orders/App.java",
+    variable: "book",
+    evaluate: ["book.size()", /^3$/],
+  },
+  kotlin: {
+    fixture: "kotlin-gradle",
+    debugger: "kotlin-debug-adapter",
+    file: "src/main/kotlin/com/example/library/App.kt",
+    variable: "library",
+    evaluate: ["library", /Library/],
+  },
+};
+
+let deactivate: (() => void) | null = null;
+let server: Server | null = null;
+let disconnect: (() => void) | null = null;
+let base = "";
+
+/** Backend events received, for failure messages. */
+const events: string[] = [];
+beforeAll(() => {
+  onIdeEvent("*", (e) => events.push(e.type === "debug" ? `debug ${e.session} ${e.event.kind}` : e.type));
+  const disposers = [activateWorkbench(), activateBuildTools(), activateRun(), activateDebugger()];
+  deactivate = () => disposers.reverse().forEach((d) => d());
+});
+afterAll(() => deactivate?.());
+
+afterEach(() => {
+  resetRuns();
+  disconnect?.();
+  server?.close();
+  if (base) rmSync(base, { recursive: true, force: true });
+});
+
+async function open(c: Case): Promise<string> {
+  base = realpathSync(mkdtempSync(join(tmpdir(), "openidea-smoke-")));
+  const root = join(base, c.fixture);
+  cpSync(join(repoRoot, "fixtures", c.fixture), root, { recursive: true });
+  c.setup?.(root);
+  server = await Server.start(join(base, "home"));
+  disconnect = connectDesktop(server);
+  await openProject(root);
+  const trusted = await commands.projectTrustSet(root, true, false);
+  if (trusted.status !== "ok") throw new Error(trusted.error.message);
+  useProject.setState({ project: { ...useProject.getState().project!, trusted: true } });
+  // Run and Debug follow the build (a Gradle project's Application runs through Gradle).
+  await until(
+    "the build model",
+    () => {
+      const error = useBuild.getState().error;
+      if (error) throw new Error(`the build model did not load: ${error}`);
+      return useBuildModel.getState().root === root && useBuildModel.getState().model;
+    },
+    5 * 60_000,
+  );
+  return root;
+}
+
+async function install(tool: string) {
+  const tools = await call(commands.toolsList());
+  if (tools.find((t) => t.name === tool)?.status === "installed") return;
+  const channel = new Channel<InstallEvent>();
+  const info = await call(commands.toolsInstall(tool, nextRequestId(), channel));
+  expect(info.status, `${tool} installs`).toBe("installed");
+}
+
+/** What the Debug and Run tool windows show, for failure messages. */
+function shown(): string {
+  const { sessions, console } = useDebug.getState();
+  const debug = Object.values(sessions).map(
+    (s) =>
+      `debug ${s.id} ${s.name} ${s.status} ${s.stopReason ?? ""}\n` +
+      (console[s.id] ?? [])
+        .slice(-40)
+        .map((l) => `  ${l.text}`)
+        .join(""),
+  );
+  const runs = useRun.getState().sessions.map((s) => `run ${s.id} ${s.config.name} ${s.status} ${s.exitCode ?? ""}`);
+  const notes = useNotifications.getState().items.map((n) => `${n.level}: ${n.title} ${n.body ?? ""}`);
+  return [...debug, ...runs, ...notes, `events: ${events.slice(-60).join(", ")}`, server?.log() ?? ""].join("\n");
+}
+
+/** Waits for `value` to be truthy; fails with what the tool windows show. */
+async function until<T>(what: string, value: () => T | null | undefined | false, timeoutMs = 60_000): Promise<T> {
+  const end = Date.now() + timeoutMs;
+  for (;;) {
+    const v = value();
+    if (v) return v;
+    if (Date.now() > end) throw new Error(`timed out waiting for ${what}\n${shown()}`);
+    await new Promise((r) => setTimeout(r, 200));
+  }
+}
+
+/** Requests `url` once the debugged server accepts connections (the response waits for Resume). */
+async function requestWhenListening(url: string) {
+  for (let i = 0; i < 600; i++) {
+    const connected = await new Promise<boolean>((resolve) => {
+      const req = get(url, (res) => {
+        res.resume();
+        resolve(true);
+      });
+      req.on("socket", (socket) => socket.on("connect", () => resolve(true)));
+      req.on("error", () => resolve(false));
+    });
+    if (connected) return;
+    await new Promise((r) => setTimeout(r, 500));
+  }
+}
+
+const paused = () => {
+  const s = activeSession();
+  return s?.status === "paused" && s.frames.length > 0 ? s : null;
+};
+
+/** Paused, failing as soon as every session has ended instead. */
+const pausedOrEnded = () => {
+  const sessions = Object.values(useDebug.getState().sessions);
+  if (sessions.length > 0 && sessions.every((s) => s.status === "terminated"))
+    throw new Error(`the debugger ended before the breakpoint\n${shown()}`);
+  return paused();
+};
+
+async function smoke(language: string) {
+  const c = CASES[language]!;
+  const root = await open(c);
+  await install(c.debugger);
+
+  const path = join(root, c.file);
+  const content = readFileSync(path, "utf8");
+  const marker = content.split("\n").findIndex((l) => l.includes("Set a breakpoint here"));
+  const line = marker + 1;
+  addBreakpoint(path, line);
+
+  await executeAction("run.debugContext", { path, content });
+  if (c.request) void requestWhenListening(c.request);
+  const s = await until("the breakpoint", pausedOrEnded, 5 * 60_000);
+  expect(s.stopReason, `${s.stopDescription}\n${shown()}`).toBe("breakpoint");
+  const top = s.frames[0]!;
+  expect(top.path).toBe(path);
+  expect(top.line).toBe(line);
+
+  const scopes = await call(commands.debugScopes(s.id, top.id));
+  const locals = await call(commands.debugVariables(s.id, scopes[0]!.variablesReference));
+  expect(locals.map((v) => v.name)).toContain(c.variable);
+
+  const value = await evaluate(c.evaluate[0], "repl", s);
+  expect(value.value, c.evaluate[0]).toMatch(c.evaluate[1]);
+
+  // Python 3.12 reports a conditional expression's line twice: Step Over may stop on it
+  // (and its breakpoint) again.
+  for (let step = 0; step < 3 && paused()!.frames[0]!.line === line; step++) {
+    const stops = useDebug.getState().stopSeq;
+    await executeAction("debug.stepOver");
+    await until("Step Over", () => useDebug.getState().stopSeq > stops && paused());
+  }
+  const after = paused()!;
+  expect(after.stopReason, shown()).toBe("step");
+  expect(after.frames[0]!.line, shown()).toBeGreaterThan(line);
+
+  await executeAction("debug.resume");
+  if (c.request) {
+    await until("the request to be served", () => useDebug.getState().sessions[s.id]?.status === "running");
+    await executeAction("debug.stop");
+  }
+  // Every session ends (a JVM that listens again as its debugger detaches may be attached once more).
+  await until("the end", () => Object.values(useDebug.getState().sessions).every((d) => d.status === "terminated"));
+}
+
+for (const language of Object.keys(CASES)) {
+  test(language, () => smoke(language));
+}
diff --git a/smoke/desktop.ts b/smoke/desktop.ts
new file mode 100644
index 00000000..c8919e69
--- /dev/null
+++ b/smoke/desktop.ts
@@ -0,0 +1,77 @@
+/**
+ * The frontend's view of the desktop app, with a real backend: the window's Tauri runtime
+ * (callbacks, `Channel`s, the event plugin) in-process, and every app command sent to an
+ * `openidea-server` through the route remote development uses (`src/platform/tauriCore.ts`).
+ */
+import { homedir, tmpdir } from "node:os";
+import { join } from "node:path";
+import { setInvokeRoute } from "@/platform/tauriCore";
+import { encodeArgs } from "@/platform/remote";
+import { Server } from "./server";
+
+type Callback = (message: unknown) => void;
+
+// One runtime per page, there from the start as in the app: the frontend registers its event
+// listener once (`src/platform/ipc.ts`), possibly before a server is connected, and keeps it
+// across the servers connected one after another.
+const callbacks = new Map<number, Callback>();
+const listeners: { event: string; handler: number }[] = [];
+const channels = new Map<number, { onmessage: (data: unknown) => void }>();
+let nextCallback = 1;
+/** `BaseDirectory` values (`@tauri-apps/api/path`) the frontend resolves. */
+const DIRECTORIES: Record<number, string> = { 12: tmpdir(), 21: homedir() };
+
+{
+  const internals = {
+    metadata: { currentWindow: { label: "main" }, currentWebview: { label: "main", windowLabel: "main" } },
+    transformCallback(cb: Callback) {
+      const id = nextCallback++;
+      callbacks.set(id, cb);
+      return id;
+    },
+    unregisterCallback(id: number) {
+      callbacks.delete(id);
+    },
+    convertFileSrc: (path: string) => path,
+    // Only the window's own plugins reach this: app commands take the route below.
+    async invoke(cmd: string, args: Record<string, unknown> = {}) {
+      if (cmd === "plugin:event|listen") {
+        listeners.push({ event: args.event as string, handler: args.handler as number });
+        return listeners.length;
+      }
+      if (cmd === "plugin:window|get_all_windows") return [];
+      // This machine's directories (`@tauri-apps/api/path`), as on the desktop.
+      if (cmd === "plugin:path|resolve_directory") return DIRECTORIES[args.directory as number] ?? null;
+      if (cmd === "plugin:path|join") return join(...(args.paths as string[]));
+      if (cmd.startsWith("plugin:")) return null;
+      throw { kind: "unavailable", message: `${cmd} has no route`, detail: null };
+    },
+  };
+  Object.assign(window, {
+    __TAURI_INTERNALS__: internals,
+    __TAURI_EVENT_PLUGIN_INTERNALS__: { unregisterListener: () => {} },
+  });
+}
+
+/** Connects this page's frontend to `server`; returns a function that disconnects it. */
+export function connectDesktop(server: Server): () => void {
+  channels.clear();
+  server.onChannel = (id, data) => channels.get(id)?.onmessage(data);
+  server.onEvent = (target, event) => {
+    if (target !== null && target !== "main") return;
+    for (const l of listeners) {
+      if (l.event === "ide://event") callbacks.get(l.handler)?.({ event: l.event, id: 0, payload: event });
+    }
+  };
+  setInvokeRoute((cmd, args) => {
+    if (cmd.startsWith("plugin:")) return null;
+    const { json, channels: used } = encodeArgs(args);
+    for (const [id, channel] of used) channels.set(id, channel as unknown as { onmessage: (data: unknown) => void });
+    return server.invoke(cmd, JSON.parse(json));
+  });
+  return () => {
+    setInvokeRoute(null);
+    server.onChannel = () => {};
+    server.onEvent = () => {};
+  };
+}
diff --git a/smoke/run.test.ts b/smoke/run.test.ts
new file mode 100644
index 00000000..22dcce33
--- /dev/null
+++ b/smoke/run.test.ts
@@ -0,0 +1,232 @@
+/**
+ * Running and testing each language's `fixtures/` project the way the Run tool window does:
+ * the backend detects the configurations, the run store starts them (with its test
+ * reporting), parses the output into the test tree, and reruns the failed tests.
+ */
+import { execFileSync } from "node:child_process";
+import { cpSync, mkdtempSync, realpathSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, expect, test } from "vitest";
+import { commands, type RunConfig } from "@/bindings";
+import { onIdeEvent } from "@/platform/ipc";
+import { openProject, useProject } from "@/platform/project";
+import {
+  failedTests,
+  loadConfigs,
+  onRunExited,
+  rerunFailed,
+  resetRuns,
+  runtime,
+  startRun,
+  stopSession,
+  useRun,
+  waitForExit,
+} from "@/features/run/store";
+import { nodeStatus } from "@/features/run/testing/results";
+import { connectDesktop } from "./desktop";
+import { repoRoot, Server } from "./server";
+
+interface Case {
+  fixture: string;
+  /** Runs in the project copy first (installs its dependencies). */
+  setup?: (root: string) => void;
+  /** A configuration that runs to completion printing this, or a server stopped once it prints it. */
+  run?: { config: string; prints: string; stop?: boolean };
+  tests: {
+    config: string;
+    /** The configuration with the fixture's intentionally failing test switched on. */
+    failing: (config: RunConfig) => RunConfig;
+    passed: number;
+    failed: string;
+    /** The failure's location ends with this file. */
+    file: string;
+  };
+}
+
+const env = (config: RunConfig, vars: Record<string, string>): RunConfig => ({
+  ...config,
+  env: { ...config.env, ...vars },
+});
+const args = (config: RunConfig, extra: string[]): RunConfig => ({ ...config, args: [...config.args, ...extra] });
+
+const CASES: Record<string, Case> = {
+  typescript: {
+    fixture: "ts-app",
+    setup: (root) => execFileSync("npm", ["install", "--no-audit", "--no-fund"], { cwd: root, stdio: "ignore" }),
+    run: { config: "npm:start", prints: "Total: $134.97" },
+    tests: {
+      config: "npm:test",
+      failing: (c) => env(c, { OPENIDEA_FAIL: "1" }),
+      passed: 4,
+      failed: "intentionally fails (set OPENIDEA_FAIL=1)",
+      file: "tests/cart.test.ts",
+    },
+  },
+  python: {
+    fixture: "python-app",
+    // A project venv with pytest, as the fixture's README sets it up.
+    setup: (root) => {
+      execFileSync("python3", ["-m", "venv", ".venv"], { cwd: root, stdio: "ignore" });
+      execFileSync(join(root, ".venv", "bin", "pip"), ["install", "-q", "pytest"], { cwd: root, stdio: "ignore" });
+    },
+    tests: {
+      config: "pytest",
+      failing: (c) => env(c, { OPENIDEA_FAIL: "1" }),
+      passed: 4,
+      failed: "test_intentionally_failing",
+      file: "tests/test_models.py",
+    },
+  },
+  rust: {
+    fixture: "rust-app",
+    run: { config: "cargo:run:inventory", prints: "Sold 3 mice, 9 left" },
+    tests: {
+      config: "cargo:test",
+      failing: (c) => args(c, ["--features", "failing-tests"]),
+      // `cargo test` stops after the failing unit tests: the integration tests don't run.
+      passed: 7,
+      failed: "intentionally_failing",
+      file: "src/lib.rs",
+    },
+  },
+  go: {
+    fixture: "go-app",
+    run: { config: "go:run:server", prints: "listening on", stop: true },
+    tests: {
+      config: "go:test",
+      failing: (c) => env(c, { OPENIDEA_FAIL: "1" }),
+      passed: 3,
+      failed: "TestIntentionallyFailing",
+      file: "store_test.go",
+    },
+  },
+  java: {
+    fixture: "java-app",
+    tests: {
+      config: "maven:test",
+      failing: (c) => args(c, ["-DopenideaFail=true"]),
+      passed: 2,
+      failed: "intentionallyFails",
+      file: "OrderBookTest.java",
+    },
+  },
+  kotlin: {
+    fixture: "kotlin-gradle",
+    run: { config: "gradle:run", prints: "Lent 'Kotlin in Action' until 2024-01-15" },
+    tests: {
+      config: "gradle:test",
+      failing: (c) => args(c, ["-PopenideaFail"]),
+      passed: 3,
+      failed: "intentionally failing",
+      file: "LibraryTest.kt",
+    },
+  },
+};
+
+let server: Server | null = null;
+let disconnect: (() => void) | null = null;
+let base = "";
+
+afterEach(() => {
+  // As switching projects does: run ids restart with each server.
+  resetRuns();
+  disconnect?.();
+  server?.close();
+  if (base) rmSync(base, { recursive: true, force: true });
+});
+
+async function open(c: Case): Promise<string> {
+  base = realpathSync(mkdtempSync(join(tmpdir(), "openidea-smoke-")));
+  const root = join(base, c.fixture);
+  cpSync(join(repoRoot, "fixtures", c.fixture), root, { recursive: true });
+  c.setup?.(root);
+  server = await Server.start(join(base, "home"));
+  disconnect = connectDesktop(server);
+  const unsubscribe = onIdeEvent("runExited", (e) => onRunExited(e.run, e.code));
+  const previous = disconnect;
+  disconnect = () => {
+    unsubscribe();
+    previous();
+  };
+  await openProject(root);
+  const trusted = await commands.projectTrustSet(root, true, false);
+  if (trusted.status !== "ok") throw new Error(trusted.error.message);
+  useProject.setState({ project: { ...useProject.getState().project!, trusted: true } });
+  await loadConfigs();
+  return root;
+}
+
+function config(id: string): RunConfig {
+  const found = useRun.getState().configs.find((c) => c.id === id);
+  if (!found)
+    throw new Error(
+      `no configuration ${id}: ${useRun
+        .getState()
+        .configs.map((c) => c.id)
+        .join(", ")}`,
+    );
+  return found;
+}
+
+/** Runs `config` to its end; returns its session id and output. */
+async function runToEnd(config: RunConfig, timeoutMs = 8 * 60_000): Promise<{ id: string; output: string[] }> {
+  const output: string[] = [];
+  const session = await startRun(config, undefined, undefined, { prepared: true, onLine: (l) => output.push(l) });
+  if (!session) throw new Error(`${config.id} didn't start`);
+  await waitForExit([session.id], timeoutMs);
+  const ended = useRun.getState().sessions.find((s) => s.id === session.id)!;
+  expect(ended.status, `${config.id} is still running:\n${output.join("\n")}`).not.toBe("running");
+  return { id: session.id, output };
+}
+
+async function smoke(language: string) {
+  const c = CASES[language]!;
+  await open(c);
+
+  if (c.run) {
+    const output: string[] = [];
+    const session = await startRun(config(c.run.config), undefined, undefined, {
+      prepared: true,
+      onLine: (l) => output.push(l),
+    });
+    expect(session, "the run starts").toBeTruthy();
+    await expect.poll(() => output.join("\n"), { timeout: 5 * 60_000 }).toContain(c.run.prints);
+    if (c.run.stop) await stopSession(session!.id);
+    await waitForExit([session!.id], 60_000);
+    const ended = useRun.getState().sessions.find((s) => s.id === session!.id)!;
+    expect(ended.status, output.join("\n")).toBe("finished");
+    if (!c.run.stop) expect(ended.exitCode, output.join("\n")).toBe(0);
+  }
+
+  // Tests, with the intentionally failing one switched on: one failure, located, the rest passed.
+  const { id, output } = await runToEnd(c.tests.failing(config(c.tests.config)));
+  const tests = runtime(id)!.tests!;
+  const log = `\n--- output ---\n${output.slice(-80).join("\n")}`;
+  expect(tests.counts(), log).toMatchObject({ passed: c.tests.passed, failed: 1 });
+  const failure = tests.firstFailure()!;
+  expect(failure.name, log).toBe(c.tests.failed);
+  expect(failure.location?.path ?? "", `${JSON.stringify(failure.location)}${log}`).toMatch(
+    new RegExp(`${c.tests.file.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`),
+  );
+  expect(failure.output.join("\n"), "the failure's message is kept").not.toBe("");
+  expect(failedTests(id)).toHaveLength(1);
+
+  // Rerun Failed Tests runs that one test only.
+  const rerunOutput: string[] = [];
+  const before = useRun.getState().sessions.find((s) => s.id === id)!.startedAt;
+  expect(rerunFailed(id), "Rerun Failed Tests is offered").toBe(true);
+  const ended = () => {
+    const s = useRun.getState().sessions.find((s) => s.id === id)!;
+    return s.startedAt > before && s.endedAt !== null && s.endedAt >= s.startedAt;
+  };
+  await expect.poll(ended, { timeout: 8 * 60_000 }).toBe(true);
+  const again = runtime(id)!.tests!;
+  rerunOutput.push(...again.roots.map((r) => `${r.name}: ${nodeStatus(r)}`));
+  expect(again.counts(), rerunOutput.join("\n")).toMatchObject({ passed: 0, failed: 1 });
+  expect(again.firstFailure()?.name).toBe(c.tests.failed);
+}
+
+for (const language of Object.keys(CASES)) {
+  test(language, () => smoke(language));
+}
diff --git a/smoke/server.ts b/smoke/server.ts
new file mode 100644
index 00000000..241e8130
--- /dev/null
+++ b/smoke/server.ts
@@ -0,0 +1,135 @@
+/**
+ * `openidea-server --stdio`, spoken to as the desktop app does in remote development:
+ * JSON-RPC with `Content-Length` framing over the server's stdin / stdout.
+ */
+import { type ChildProcessWithoutNullStreams, spawn } from "node:child_process";
+import { appendFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+
+const PROTOCOL_VERSION = 2;
+const WINDOW = "main";
+
+// Not `new URL(…, import.meta.url)`: the jsdom environment's `URL` isn't Node's.
+export const repoRoot = join(dirname(import.meta.filename), "..");
+
+/** The server binary: `OPENIDEA_SERVER`, else the workspace's debug build. */
+function serverBinary(): string {
+  const exe = process.platform === "win32" ? ".exe" : "";
+  return process.env.OPENIDEA_SERVER ?? join(repoRoot, "target", "debug", `openidea-server${exe}`);
+}
+
+interface Pending {
+  resolve: (value: unknown) => void;
+  reject: (error: unknown) => void;
+}
+
+export class Server {
+  private nextId = 1;
+  private readonly pending = new Map<number, Pending>();
+  private buffer = Buffer.alloc(0);
+  private readonly stderr: string[] = [];
+  /** `channel` notifications: a value streamed to the `Channel` with this id. */
+  onChannel: (id: number, data: unknown) => void = () => {};
+  /** `event` notifications: an `IdeEvent` for a window (`null`: every window). */
+  onEvent: (window: string | null, event: unknown) => void = () => {};
+
+  private constructor(private readonly child: ChildProcessWithoutNullStreams) {
+    child.stdout.on("data", (chunk: Buffer) => this.receive(chunk));
+    child.stderr.on("data", (chunk: Buffer) => {
+      // The whole log, when asked for (OPENIDEA_SMOKE_LOG=<file>; OPENIDEA_LOG sets its level).
+      if (process.env.OPENIDEA_SMOKE_LOG) appendFileSync(process.env.OPENIDEA_SMOKE_LOG, chunk);
+      this.stderr.push(chunk.toString());
+      if (this.stderr.length > 200) this.stderr.shift();
+    });
+    child.on("exit", (code) => {
+      for (const p of this.pending.values()) p.reject(new Error(`openidea-server exited (${code}): ${this.log()}`));
+      this.pending.clear();
+    });
+  }
+
+  /** Starts a server whose settings, caches and tools live under `home`. */
+  static async start(home: string, env: Record<string, string> = {}): Promise<Server> {
+    const child = spawn(serverBinary(), ["--stdio"], {
+      env: { ...process.env, OPENIDEA_SERVER_HOME: home, ...env },
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    const server = new Server(child);
+    await server.request("initialize", { version: PROTOCOL_VERSION });
+    return server;
+  }
+
+  /** The tail of the server's log, for failure messages. */
+  log(): string {
+    return this.stderr.join("").split("\n").slice(-40).join("\n");
+  }
+
+  /** Runs an IPC command; rejects with the command's `IdeError`. */
+  async invoke(cmd: string, args: unknown): Promise<unknown> {
+    try {
+      return await this.request("invoke", { window: WINDOW, cmd, args });
+    } catch (e) {
+      const message = (e as { message?: string }).message ?? String(e);
+      try {
+        throw JSON.parse(message);
+      } catch (parsed) {
+        if (parsed instanceof SyntaxError) throw { kind: "protocol", message, detail: null };
+        throw parsed;
+      }
+    }
+  }
+
+  close() {
+    this.child.stdin.end();
+    this.child.kill();
+  }
+
+  private request(method: string, params: unknown): Promise<unknown> {
+    const id = this.nextId++;
+    return new Promise((resolve, reject) => {
+      this.pending.set(id, { resolve, reject });
+      this.send({ jsonrpc: "2.0", id, method, params });
+    });
+  }
+
+  private send(message: unknown) {
+    const body = Buffer.from(JSON.stringify(message));
+    this.child.stdin.write(`Content-Length: ${body.length}\r\n\r\n`);
+    this.child.stdin.write(body);
+  }
+
+  private receive(chunk: Buffer) {
+    this.buffer = Buffer.concat([this.buffer, chunk]);
+    for (;;) {
+      const end = this.buffer.indexOf("\r\n\r\n");
+      if (end < 0) return;
+      const length = /content-length:\s*(\d+)/i.exec(this.buffer.subarray(0, end).toString())?.[1];
+      if (!length) throw new Error(`bad header: ${this.buffer.subarray(0, end)}`);
+      const start = end + 4;
+      if (this.buffer.length < start + Number(length)) return;
+      const message = JSON.parse(this.buffer.subarray(start, start + Number(length)).toString());
+      this.buffer = this.buffer.subarray(start + Number(length));
+      this.dispatch(message);
+    }
+  }
+
+  private dispatch(message: {
+    id?: number;
+    method?: string;
+    params?: { id?: number; data?: unknown; window?: string | null; event?: unknown };
+    result?: unknown;
+    error?: { message: string };
+  }) {
+    if (message.method && message.id !== undefined) {
+      this.send({ jsonrpc: "2.0", id: message.id, error: { code: -32601, message: "not supported" } });
+    } else if (message.method === "channel") {
+      this.onChannel(message.params!.id!, message.params!.data);
+    } else if (message.method === "event") {
+      this.onEvent(message.params!.window ?? null, message.params!.event);
+    } else if (message.id !== undefined) {
+      const pending = this.pending.get(message.id);
+      this.pending.delete(message.id);
+      if (message.error) pending?.reject(message.error);
+      else pending?.resolve(message.result);
+    }
+  }
+}
diff --git a/smoke/tsconfig.json b/smoke/tsconfig.json
new file mode 100644
index 00000000..b8389953
--- /dev/null
+++ b/smoke/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["node", "vite/client"],
+    "paths": { "@/*": ["../src/*"] }
+  },
+  "include": ["./**/*.ts", "../src/**/*.d.ts"]
+}
diff --git a/smoke/vitest.config.ts b/smoke/vitest.config.ts
new file mode 100644
index 00000000..a4fb5c3b
--- /dev/null
+++ b/smoke/vitest.config.ts
@@ -0,0 +1,20 @@
+/**
+ * Backend smoke tests (`pnpm smoke`): the frontend's own modules driving a real
+ * `openidea-server` and real toolchains. Not part of `pnpm test`: they need the server
+ * built (`cargo build -p ide-host --bin openidea-server`) and each language's tools.
+ */
+import { defineConfig, mergeConfig } from "vitest/config";
+import viteConfig from "../vite.config.ts";
+
+export default mergeConfig(
+  viteConfig({ command: "serve", mode: "test" }),
+  defineConfig({
+    test: {
+      include: ["smoke/**/*.test.ts"],
+      testTimeout: 10 * 60_000,
+      hookTimeout: 5 * 60_000,
+      // Each file starts a server and toolchains of its own.
+      fileParallelism: false,
+    },
+  }),
+);
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 90ad25d6..e99b4838 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -16,7 +16,7 @@ dunce.workspace = true
 [dependencies]
 tauri = { version = "2", features = [] }
 tauri-plugin-opener = "2"
-tauri-plugin-dialog = "2"
+tauri-plugin-dialog = { version = "2", default-features = false, features = ["xdg-portal"] }
 tauri-plugin-mcp-bridge = "0.13"
 tauri-plugin-window-state = "2"
 tauri-plugin-single-instance = "2"
@@ -78,7 +78,7 @@ block2 = "0.6"
 # Plugin secrets in the login keychain.
 security-framework = "3.7"
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSButton", "NSResponder", "NSView", "NSWindow"] }
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSButton", "NSEvent", "NSResponder", "NSScreen", "NSView", "NSWindow"] }
 objc2-core-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "CFRunLoop"] }
 objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSNotification", "NSOperation", "NSString"] }
 # Used only by the debug font-restriction override; Cargo dependency cfg cannot test debug_assertions.
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index bb12e5cc..86277d7c 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -2,10 +2,11 @@
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "default",
   "description": "Capability for the main window",
-  "windows": ["main", "project-*", "settings-*"],
+  "windows": ["main", "project-*", "settings-*", "comparison-*", "deployment-*"],
   "permissions": [
     "core:default",
     "core:window:allow-start-dragging",
+    "core:window:allow-start-resize-dragging",
     "core:window:allow-minimize",
     "core:window:allow-toggle-maximize",
     "core:window:allow-internal-toggle-maximize",
@@ -17,6 +18,9 @@
     "opener:allow-reveal-item-in-dir",
     "dialog:default",
     "core:window:allow-destroy",
-    "core:window:allow-close"
+    "core:window:allow-close",
+    "core:window:allow-set-focus",
+    "core:window:allow-unminimize",
+    "core:window:allow-show"
   ]
 }
diff --git a/src-tauri/capabilities/e2e.json b/src-tauri/capabilities/e2e.json
index 2e1cd42c..253b1ce6 100644
--- a/src-tauri/capabilities/e2e.json
+++ b/src-tauri/capabilities/e2e.json
@@ -2,6 +2,6 @@
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "e2e-bridge",
   "description": "Debug-only automation bridge",
-  "windows": ["main", "project-*", "settings-*"],
+  "windows": ["main", "project-*", "settings-*", "comparison-*", "deployment-*"],
   "permissions": ["mcp-bridge:default"]
 }
diff --git a/src-tauri/src/commands/app.rs b/src-tauri/src/commands/app.rs
index dbef3318..8c5e994c 100644
--- a/src-tauri/src/commands/app.rs
+++ b/src-tauri/src/commands/app.rs
@@ -57,7 +57,7 @@ pub async fn open_project(window: Window, path: PathBuf) -> IdeResult<ProjectInf
     let label = window.label().to_owned();
     // Replacing this window's project (the UI skips reopening the same one).
     if app.state::<AppState>().project(&label).is_ok() {
-        crate::windows::close_settings_window(&app, &label);
+        crate::windows::close_auxiliary_windows(&app, &label);
     }
     let project = tauri::async_runtime::spawn_blocking(move || app.state::<AppState>().open_project(&label, &path))
         .await
@@ -80,7 +80,7 @@ pub async fn light_edit_open(window: Window, path: PathBuf) -> IdeResult<Setting
     let app = window.app_handle().clone();
     let label = window.label().to_owned();
     if app.state::<AppState>().project(&label).is_ok_and(|p| !p.light) {
-        crate::windows::close_settings_window(&app, &label);
+        crate::windows::close_auxiliary_windows(&app, &label);
         crate::window_groups::detach(&app, &label)?;
         crate::window_groups::persist(&app).await?;
     }
@@ -113,7 +113,7 @@ pub fn project_rename(window: Window, state: State<'_, AppState>, name: String)
 #[tauri::command]
 #[specta::specta]
 pub fn close_project(window: Window, state: State<'_, AppState>) {
-    crate::windows::close_settings_window(window.app_handle(), window.label());
+    crate::windows::close_auxiliary_windows(window.app_handle(), window.label());
     let _ = crate::window_groups::detach(window.app_handle(), window.label());
     state.close_project(window.label());
     let app = window.app_handle().clone();
diff --git a/src-tauri/src/commands/build.rs b/src-tauri/src/commands/build.rs
index 7daaf11e..fd157cad 100644
--- a/src-tauri/src/commands/build.rs
+++ b/src-tauri/src/commands/build.rs
@@ -17,11 +17,32 @@ pub async fn build_model(window: Window, state: State<'_, AppState>) -> IdeResul
     ide_host::ops::build::build_model(&state.host, window.label()).await
 }
 
+#[tauri::command]
+#[specta::specta]
+pub async fn gradle_link_projects(
+    window: Window,
+    state: State<'_, AppState>,
+    paths: Vec<String>,
+) -> IdeResult<BuildModel> {
+    ide_host::ops::build::gradle_link_projects(&state.host, window.label(), paths).await
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn gradle_unlink_projects(
+    window: Window,
+    state: State<'_, AppState>,
+    paths: Vec<String>,
+) -> IdeResult<BuildModel> {
+    ide_host::ops::build::gradle_unlink_projects(&state.host, window.label(), paths).await
+}
+
 /// Runs Maven (`help:effective-pom dependency:tree`) or Gradle (`tasks --all`) in the
 /// background, reporting progress on `on_progress`; cancellable with `cancel_request(request)`.
 /// Returns the refreshed model; a failed build is reported in its `syncError`.
 #[tauri::command]
 #[specta::specta]
+#[allow(clippy::too_many_arguments)]
 pub async fn build_sync(
     window: Window,
     state: State<'_, AppState>,
@@ -29,6 +50,7 @@ pub async fn build_sync(
     request: RequestId,
     offline: bool,
     profiles: Vec<String>,
+    build_dir: Option<String>,
     on_progress: Channel<SyncProgress>,
 ) -> IdeResult<BuildModel> {
     ide_host::ops::build::build_sync(
@@ -38,11 +60,36 @@ pub async fn build_sync(
         request,
         offline,
         profiles,
+        build_dir,
         crate::commands::sender(on_progress),
     )
     .await
 }
 
+/// The resolved dependency tree of a Gradle project for one configuration (Dependency Analyzer).
+#[tauri::command]
+#[specta::specta]
+pub async fn gradle_dependencies(
+    window: Window,
+    state: State<'_, AppState>,
+    gradle_path: String,
+    configuration: String,
+    offline: bool,
+    request: RequestId,
+    build_dir: Option<String>,
+) -> IdeResult<Vec<ide_build::GradleDependency>> {
+    ide_host::ops::build::gradle_dependencies(
+        &state.host,
+        window.label(),
+        gradle_path,
+        configuration,
+        offline,
+        request,
+        build_dir,
+    )
+    .await
+}
+
 /// The `.toml` of a version catalog the build imports as `group:artifact:version`, once a
 /// build has downloaded it.
 #[tauri::command]
diff --git a/src-tauri/src/commands/doc.rs b/src-tauri/src/commands/doc.rs
index 5d366faa..c2a3ef90 100644
--- a/src-tauri/src/commands/doc.rs
+++ b/src-tauri/src/commands/doc.rs
@@ -8,7 +8,7 @@ use ide_language::{FoldRange, SyntaxHighlights};
 use ide_text::LineEnding;
 use ide_workspace::{DocumentInfo, HistoryEntry};
 use std::path::PathBuf;
-use tauri::{State, Window};
+use tauri::{Manager, State, Window};
 
 /// Opens a document. Async: reading and decoding a large file must not block
 /// the main thread (synchronous commands run on it).
@@ -38,8 +38,14 @@ pub async fn doc_edit(
     changes: ChangeSet,
 ) -> IdeResult<u32> {
     let host = state.host.clone();
-    let window = window.label().to_owned();
-    blocking(move || ide_host::ops::doc::edit(&host, &window, doc, base_version, changes)).await
+    let label = window.label().to_owned();
+    let peers = crate::events::document_edit_peers(window.app_handle(), &label);
+    let mirrored = (!peers.is_empty()).then(|| changes.changes.clone());
+    let version = blocking(move || ide_host::ops::doc::edit(&host, &label, doc, base_version, changes)).await?;
+    if let Some(changes) = mirrored {
+        crate::events::emit_document_edit(window.app_handle(), peers, doc, base_version, version, changes);
+    }
+    Ok(version)
 }
 
 #[tauri::command]
diff --git a/src-tauri/src/commands/fs.rs b/src-tauri/src/commands/fs.rs
index 2e41aebf..fbecf3c2 100644
--- a/src-tauri/src/commands/fs.rs
+++ b/src-tauri/src/commands/fs.rs
@@ -65,8 +65,8 @@ pub fn fs_create_dir(path: PathBuf) -> IdeResult<()> {
 
 #[tauri::command]
 #[specta::specta]
-pub fn fs_rename(from: PathBuf, to: PathBuf) -> IdeResult<()> {
-    ide_vfs::rename(&from, &to)
+pub async fn fs_rename(state: State<'_, AppState>, from: PathBuf, to: PathBuf) -> IdeResult<()> {
+    fs::rename(&state.host, from, to).await
 }
 
 /// Toggle Read-only Attribute: sets the writable bit (and the open document's
diff --git a/src-tauri/src/commands/lsp.rs b/src-tauri/src/commands/lsp.rs
index 0092cdcf..1db210fa 100644
--- a/src-tauri/src/commands/lsp.rs
+++ b/src-tauri/src/commands/lsp.rs
@@ -240,6 +240,38 @@ pub async fn lsp_rename(
     ide_host::ops::lsp::lsp_rename(&state.host, window.label(), request, doc, pos, new_name).await
 }
 
+/// The class at `pos` and the members Pull Members Up / Push Members Down can move.
+#[tauri::command]
+#[specta::specta]
+pub async fn lsp_hierarchy_members(
+    window: Window,
+    state: State<'_, AppState>,
+    request: RequestId,
+    doc: DocId,
+    pos: Pos,
+    kind: HierarchyRefactoring,
+) -> IdeResult<HierarchyMembers> {
+    ide_host::ops::lsp::lsp_hierarchy_members(&state.host, window.label(), request, doc, pos, kind).await
+}
+
+/// Checks Pull Members Up / Push Members Down and computes the edit without applying it.
+#[tauri::command]
+#[specta::specta]
+#[allow(clippy::too_many_arguments)]
+pub async fn lsp_hierarchy_refactor(
+    window: Window,
+    state: State<'_, AppState>,
+    request: RequestId,
+    doc: DocId,
+    pos: Pos,
+    kind: HierarchyRefactoring,
+    target: Option<String>,
+    choices: Vec<HierarchyChoice>,
+) -> IdeResult<HierarchyRefactored> {
+    ide_host::ops::lsp::lsp_hierarchy_refactor(&state.host, window.label(), request, doc, pos, kind, target, choices)
+        .await
+}
+
 #[tauri::command]
 #[specta::specta]
 pub async fn lsp_format(
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 2b4cee4e..d882ce9e 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -45,6 +45,7 @@ pub mod tools;
 pub mod vcs;
 pub mod web;
 pub mod window;
+pub mod window_drag;
 pub mod window_group;
 pub mod workspace;
 
@@ -186,8 +187,10 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         caches::caches_schedule_invalidation,
         caches::app_restart,
         nav::index_status,
+        nav::index_file_extensions,
         nav::spring_route_sources,
         nav::find_files,
+        nav::find_dirs,
         nav::find_symbols,
         nav::mark_recent,
         nav::recent_files,
@@ -221,6 +224,8 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         lsp::lsp_apply_code_action,
         lsp::lsp_prepare_rename,
         lsp::lsp_rename,
+        lsp::lsp_hierarchy_members,
+        lsp::lsp_hierarchy_refactor,
         lsp::lsp_format,
         lsp::lsp_inlay_hints,
         lsp::lsp_semantic_tokens,
@@ -244,7 +249,16 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         vcs::vcs_line_hunks,
         vcs::vcs_file_at,
         vcs::vcs_blame,
+        vcs::vcs_block_history,
         vcs::vcs_log,
+        vcs::vcs_log_refs,
+        vcs::vcs_log_users,
+        vcs::vcs_open_external_log,
+        vcs::vcs_log_details,
+        vcs::vcs_log_details_batch,
+        vcs::vcs_log_index,
+        vcs::vcs_revision_children,
+        vcs::vcs_revision_files,
         vcs::vcs_commit_files,
         vcs::vcs_commits_changes,
         vcs::vcs_branches,
@@ -330,6 +344,7 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         run::run_close_stdin,
         run::run_resize,
         run::run_gradle_jvm_args_script,
+        run::run_gradle_init_script,
         run::run_tomcat_home,
         run::run_tomcat_artifacts,
         run::run_tomcat_build,
@@ -339,7 +354,10 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         run::run_tomcat_update,
         run::run_test_reports,
         build::build_model,
+        build::gradle_link_projects,
+        build::gradle_unlink_projects,
         build::build_sync,
+        build::gradle_dependencies,
         build::gradle_published_catalog,
         build::maven_dependency_declaration,
         build::maven_exclude_dependency,
@@ -372,6 +390,7 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         tools::jdk_download,
         sdk::sdk_detect,
         sdk::sdk_python_effective,
+        sdk::sdk_php_language_level,
         sdk::sdk_project_libraries,
         sdk::sdk_locate_tools,
         sdk::sdk_python_create_venv,
@@ -383,9 +402,12 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         window::window_open_remote,
         window::window_new,
         window::window_open_settings,
+        window::window_open_comparison,
+        window::window_open_deployment,
         window::window_cycle,
         window::window_toggle_fullscreen,
         window::window_set_titlebar_height,
+        window_drag::window_start_drag,
         window::window_take_launch,
         window::window_close_context,
         window::window_open_projects,
@@ -452,6 +474,9 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
         plugin::plugin_set_market_url,
         plugin::plugin_market_download,
         plugin::plugin_unpack_package,
+        plugin::plugin_read_intellij_theme,
+        plugin::plugin_installed_intellij_themes,
+        plugin::plugin_stage_package,
         plugin::plugin_roll_back,
         plugin::plugin_secrets,
         plugin::plugin_set_secret,
diff --git a/src-tauri/src/commands/nav.rs b/src-tauri/src/commands/nav.rs
index dd1e1d5f..d5cd946d 100644
--- a/src-tauri/src/commands/nav.rs
+++ b/src-tauri/src/commands/nav.rs
@@ -4,7 +4,7 @@ use crate::state::AppState;
 use ide_core::{DocId, IdeResult, IpcPath, Pos};
 #[allow(unused_imports)]
 pub use ide_host::ops::nav::*;
-use ide_index::{FileMatch, IndexStatus, SymbolFilter, SymbolMatch};
+use ide_index::{ExtensionCount, FileMatch, IndexStatus, SymbolFilter, SymbolMatch};
 use ide_language::FileReference;
 use ide_workspace::file_refs::PathCompletion;
 use std::path::PathBuf;
@@ -16,12 +16,25 @@ pub fn index_status(window: Window, state: State<'_, AppState>) -> IdeResult<Ind
     ide_host::ops::nav::index_status(&state.host, window.label())
 }
 
+#[tauri::command]
+#[specta::specta]
+pub fn index_file_extensions(window: Window, state: State<'_, AppState>) -> IdeResult<Vec<ExtensionCount>> {
+    ide_host::ops::nav::index_file_extensions(&state.host, window.label())
+}
+
 #[tauri::command]
 #[specta::specta]
 pub fn find_files(window: Window, state: State<'_, AppState>, query: String, limit: u32) -> IdeResult<Vec<FileMatch>> {
     ide_host::ops::nav::find_files(&state.host, window.label(), query, limit)
 }
 
+/// Folders holding indexed files, for `@` references.
+#[tauri::command]
+#[specta::specta]
+pub fn find_dirs(window: Window, state: State<'_, AppState>, query: String, limit: u32) -> IdeResult<Vec<FileMatch>> {
+    ide_host::ops::nav::find_dirs(&state.host, window.label(), query, limit)
+}
+
 /// Spring Web mapping sources for the request-path index of Search Everywhere.
 #[tauri::command]
 #[specta::specta]
diff --git a/src-tauri/src/commands/plugin.rs b/src-tauri/src/commands/plugin.rs
index 3698057b..bb565af4 100644
--- a/src-tauri/src/commands/plugin.rs
+++ b/src-tauri/src/commands/plugin.rs
@@ -6,9 +6,10 @@
 use crate::state::AppState;
 use ide_core::{IdeError, IdeResult};
 use ide_extension::ActivationEvent;
+use ide_host::plugins::intellij::{self, InstalledIntellijTheme, IntellijThemeSource};
 use ide_host::plugins::{
-    ActiveTheme, CatalogPlugin, Consent, EventKind, HostWorkspace, InstallPreview, PluginEditor, PluginEvent,
-    PluginHost, PluginInfo, PluginStatusItem, PluginsSnapshot, WorkbenchEvent,
+    ActiveTheme, CatalogPlugin, Consent, EventKind, HostWorkspace, InstallPreview, PackageFile, PluginEditor,
+    PluginEvent, PluginHost, PluginInfo, PluginStatusItem, PluginsSnapshot, WorkbenchEvent,
 };
 use ide_plugin::{Invocation, Limits};
 use parking_lot::Mutex;
@@ -472,7 +473,7 @@ pub async fn plugin_web_read_file(path: PathBuf) -> IdeResult<String> {
     Ok(base64::engine::general_purpose::STANDARD.encode(bytes))
 }
 
-/// The marketplace's plugins: read again when `refresh`, else the last index read.
+/// The marketplace's plugins: read again when `refresh` or when none was read yet, else the last index read.
 #[tauri::command]
 #[specta::specta]
 pub async fn plugin_market(
@@ -480,7 +481,7 @@ pub async fn plugin_market(
     refresh: bool,
 ) -> IdeResult<Vec<ide_host::plugins::MarketPlugin>> {
     let host = state.plugins.clone();
-    blocking(move || if refresh { host.refresh_market() } else { Ok(host.market_plugins()) }).await
+    blocking(move || host.market_listing(refresh)).await
 }
 
 #[tauri::command]
@@ -512,6 +513,32 @@ pub async fn plugin_unpack_package(state: State<'_, AppState>, path: PathBuf) ->
     blocking(move || host.unpack_package(&path)).await
 }
 
+/// Reads an IntelliJ theme plugin (`.jar`, Marketplace `.zip`, plugin folder) or `.theme.json` to import.
+#[tauri::command]
+#[specta::specta]
+pub async fn plugin_read_intellij_theme(path: PathBuf) -> IdeResult<IntellijThemeSource> {
+    blocking(move || intellij::read_source(&path)).await
+}
+
+/// Theme plugins installed in the JetBrains IDEs of this user, the ones in use first.
+#[tauri::command]
+#[specta::specta]
+pub async fn plugin_installed_intellij_themes() -> IdeResult<Vec<InstalledIntellijTheme>> {
+    blocking(|| Ok(intellij::installed_themes())).await
+}
+
+/// Writes a package the UI generated (an imported theme); returns the folder for the install page.
+#[tauri::command]
+#[specta::specta]
+pub async fn plugin_stage_package(
+    state: State<'_, AppState>,
+    name: String,
+    files: Vec<PackageFile>,
+) -> IdeResult<PathBuf> {
+    let host = state.plugins.clone();
+    blocking(move || host.stage_package(&name, &files)).await
+}
+
 /// Goes back to the version the last update of `id` replaced.
 #[tauri::command]
 #[specta::specta]
diff --git a/src-tauri/src/commands/run.rs b/src-tauri/src/commands/run.rs
index fe4990c8..d53b89a1 100644
--- a/src-tauri/src/commands/run.rs
+++ b/src-tauri/src/commands/run.rs
@@ -189,6 +189,18 @@ pub async fn run_gradle_jvm_args_script(
     ide_host::ops::run::run_gradle_jvm_args_script(&state.host, window.label(), jvm_args).await
 }
 
+/// Writes one of the IDE's Gradle init scripts where the build runs; returns its path.
+#[tauri::command]
+#[specta::specta]
+pub async fn run_gradle_init_script(
+    window: Window,
+    state: State<'_, AppState>,
+    name: String,
+    text: String,
+) -> IdeResult<String> {
+    ide_host::ops::run::run_gradle_init_script(&state.host, window.label(), name, text).await
+}
+
 /// Results from the JUnit XML reports (Surefire, Failsafe, Gradle) of the module at
 /// `module` (relative to the project root) written since `since_ms` (Unix epoch, ms).
 #[tauri::command]
diff --git a/src-tauri/src/commands/sdk.rs b/src-tauri/src/commands/sdk.rs
index 050c2c10..db2692f5 100644
--- a/src-tauri/src/commands/sdk.rs
+++ b/src-tauri/src/commands/sdk.rs
@@ -24,6 +24,17 @@ pub fn sdk_python_effective(window: Window, state: State<'_, AppState>) -> IdeRe
     ide_host::ops::sdk::sdk_python_effective(&state.host, window.label())
 }
 
+/// The PHP language level of the project `path` belongs to: the effective one and Auto's.
+#[tauri::command]
+#[specta::specta]
+pub async fn sdk_php_language_level(
+    window: Window,
+    state: State<'_, AppState>,
+    path: PathBuf,
+) -> IdeResult<ide_host::ops::sdk::PhpLanguageLevels> {
+    ide_host::ops::sdk::sdk_php_language_level(&state.host, window.label(), path).await
+}
+
 /// SDK / library source folders shown under "External Libraries" in the Project view,
 /// with the Maven / Gradle dependency jars of the build model.
 #[tauri::command]
diff --git a/src-tauri/src/commands/vcs.rs b/src-tauri/src/commands/vcs.rs
index 9f23a5a5..93439846 100644
--- a/src-tauri/src/commands/vcs.rs
+++ b/src-tauri/src/commands/vcs.rs
@@ -50,6 +50,21 @@ pub async fn vcs_file_at(
     ide_host::ops::vcs::vcs_file_at(&state.host, window.label(), path, rev).await
 }
 
+/// History for Selection: commits that changed `lines` (0-based, inclusive) of `path`'s
+/// editor text. Cancellable with `cancel_request(request)`.
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_block_history(
+    window: Window,
+    state: State<'_, AppState>,
+    request: RequestId,
+    path: PathBuf,
+    text: Option<String>,
+    lines: (u32, u32),
+) -> IdeResult<BlockHistory> {
+    ide_host::ops::vcs::vcs_block_history(&state.host, window.label(), request, path, text, lines).await
+}
+
 #[tauri::command]
 #[specta::specta]
 pub async fn vcs_blame(
@@ -73,6 +88,91 @@ pub async fn vcs_log(
     ide_host::ops::vcs::vcs_log(&state.host, window.label(), repo, query).await
 }
 
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_log_refs(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+) -> IdeResult<std::collections::BTreeMap<String, String>> {
+    ide_host::ops::vcs::vcs_log_refs(&state.host, window.label(), repo).await
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_log_users(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+) -> IdeResult<Vec<String>> {
+    ide_host::ops::vcs::vcs_log_users(&state.host, window.label(), repo).await
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_open_external_log(
+    window: Window,
+    state: State<'_, AppState>,
+    path: PathBuf,
+) -> IdeResult<ide_core::IpcPath> {
+    ide_host::ops::vcs::vcs_open_external_log(&state.host, window.label(), path).await
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_log_details(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+    revision: String,
+) -> IdeResult<LogDetails> {
+    ide_host::ops::vcs::vcs_log_details(&state.host, window.label(), repo, revision).await
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_log_details_batch(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+    revisions: Vec<String>,
+    request: RequestId,
+) -> IdeResult<Vec<LogDetails>> {
+    ide_host::ops::vcs::vcs_log_details_batch(&state.host, window.label(), repo, revisions, request).await
+}
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_log_index(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+    request: Option<RequestId>,
+) -> IdeResult<LogIndexProgress> {
+    ide_host::ops::vcs::vcs_log_index(&state.host, window.label(), repo, request).await
+}
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_revision_children(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+    revision: String,
+    directory: String,
+) -> IdeResult<Vec<String>> {
+    ide_host::ops::vcs::vcs_revision_children(&state.host, window.label(), repo, revision, directory).await
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn vcs_revision_files(
+    window: Window,
+    state: State<'_, AppState>,
+    repo: Option<PathBuf>,
+    revision: String,
+) -> IdeResult<Vec<String>> {
+    ide_host::ops::vcs::vcs_revision_files(&state.host, window.label(), repo, revision).await
+}
+
 #[tauri::command]
 #[specta::specta]
 pub async fn vcs_commit_files(
diff --git a/src-tauri/src/commands/window.rs b/src-tauri/src/commands/window.rs
index b655bf6e..abec5dae 100644
--- a/src-tauri/src/commands/window.rs
+++ b/src-tauri/src/commands/window.rs
@@ -87,6 +87,33 @@ pub async fn window_open_settings(
     windows::open_settings_window(&app, &window, page, new_projects, background)
 }
 
+/// Opens a window listing the files that differ between two revisions of this window's project.
+/// `background` (`#rrggbb`) paints it until its page has loaded.
+#[tauri::command]
+#[specta::specta]
+pub async fn window_open_comparison(
+    app: AppHandle,
+    window: WebviewWindow,
+    comparison: windows::ComparisonLaunch,
+    background: Option<String>,
+) -> IdeResult<()> {
+    windows::open_comparison_window(&app, &window, comparison, background)
+}
+
+/// Opens this window's Sync with Deployed window comparing `paths` with `server` (or hands them
+/// to the open one). `background` (`#rrggbb`) paints a new window until its page has loaded.
+#[tauri::command]
+#[specta::specta]
+pub async fn window_open_deployment(
+    app: AppHandle,
+    window: WebviewWindow,
+    server: String,
+    paths: Vec<PathBuf>,
+    background: Option<String>,
+) -> IdeResult<()> {
+    windows::open_deployment_window(&app, &window, server, paths, background)
+}
+
 /// Focuses the next / previous window (⌘` / ⇧⌘`).
 #[tauri::command]
 #[specta::specta]
@@ -97,9 +124,7 @@ pub fn window_cycle(app: AppHandle, window: WebviewWindow, forward: bool) {
 #[tauri::command]
 #[specta::specta]
 pub fn window_toggle_fullscreen(window: WebviewWindow) -> IdeResult<bool> {
-    let on = !window.is_fullscreen().map_err(|e| IdeError::internal(e.to_string()))?;
-    window.set_fullscreen(on).map_err(|e| IdeError::internal(e.to_string()))?;
-    Ok(on)
+    crate::window_groups::toggle_fullscreen(&window)
 }
 
 /// Height of the web title bar in native logical pixels (CSS height × IDE zoom).
diff --git a/src-tauri/src/commands/window_drag.rs b/src-tauri/src/commands/window_drag.rs
new file mode 100644
index 00000000..700bf865
--- /dev/null
+++ b/src-tauri/src/commands/window_drag.rs
@@ -0,0 +1,19 @@
+//! Native window drag started from the web title bar.
+
+use ide_core::{IdeError, IdeResult};
+use tauri::WebviewWindow;
+
+/// Starts dragging `window` while the primary mouse button is still down; returns whether a drag began.
+///
+/// macOS WebKit can deliver a tap's `mousedown` after the button is already up. AppKit would then run
+/// its drag loop with no release left to end it, and the window follows the pointer until the next click.
+#[tauri::command]
+#[specta::specta]
+pub fn window_start_drag(window: WebviewWindow) -> IdeResult<bool> {
+    #[cfg(target_os = "macos")]
+    if objc2_app_kit::NSEvent::pressedMouseButtons() & 1 == 0 {
+        return Ok(false);
+    }
+    window.start_dragging().map_err(|e| IdeError::internal(e.to_string()))?;
+    Ok(true)
+}
diff --git a/src-tauri/src/events.rs b/src-tauri/src/events.rs
index 4263bc10..ef2576f8 100644
--- a/src-tauri/src/events.rs
+++ b/src-tauri/src/events.rs
@@ -4,7 +4,35 @@ use tauri::{AppHandle, Emitter};
 /// Name of the single backend → UI event. Payload: [`IdeEvent`].
 pub const IDE_EVENT: &str = "ide://event";
 
-/// Forwards events to one window (`Some(label)`) or to all windows.
+/// The other windows showing the documents of `source`'s project: its project window and the
+/// auxiliary windows with documents. An edit made in one is not echoed by the backend, so they
+/// get it as a patch ([`emit_document_edit`]).
+pub fn document_edit_peers(app: &AppHandle, source: &str) -> Vec<String> {
+    let owner = crate::state::AppState::owner_window(source);
+    let mut peers = crate::windows::document_windows(app, owner);
+    peers.push(owner.to_owned());
+    peers.retain(|label| label != source);
+    peers
+}
+
+pub fn emit_document_edit(
+    app: &AppHandle,
+    peers: Vec<String>,
+    doc: ide_core::DocId,
+    base_version: u32,
+    version: u32,
+    changes: Vec<ide_core::TextChange>,
+) {
+    let event = IdeEvent::DocPatched { doc, base_version, version, changes, workspace_edit: false };
+    for label in peers {
+        if let Err(e) = app.emit_to(label, IDE_EVENT, &event) {
+            tracing::warn!("failed to mirror document edit: {e}");
+        }
+    }
+}
+
+/// Forwards events to one window (`Some(label)`, plus its auxiliary windows that show its
+/// project's documents) or to all windows.
 pub struct TauriSink {
     pub app: AppHandle,
     pub window: Option<String>,
@@ -13,7 +41,12 @@ pub struct TauriSink {
 impl EventSink for TauriSink {
     fn emit(&self, event: IdeEvent) {
         let result = match &self.window {
-            Some(label) => self.app.emit_to(label.as_str(), IDE_EVENT, &event),
+            Some(label) => {
+                for target in crate::windows::document_windows(&self.app, label) {
+                    let _ = self.app.emit_to(target.as_str(), IDE_EVENT, &event);
+                }
+                self.app.emit_to(label.as_str(), IDE_EVENT, &event)
+            }
             None => self.app.emit(IDE_EVENT, &event),
         };
         if let Err(e) = result {
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 8ba8e5f9..76acd0b6 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -28,7 +28,7 @@ mod windows;
 
 use parking_lot::Mutex;
 use state::AppState;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use tauri::{Emitter, Manager};
 use windows::WindowsState;
@@ -40,12 +40,21 @@ pub fn specta_builder() -> tauri_specta::Builder<tauri::Wry> {
 }
 
 pub fn export_bindings(builder: &tauri_specta::Builder<tauri::Wry>) {
+    let target = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../src/bindings.ts"));
+    // Rewritten only when it changes: every debug launch exports, also a second instance that just
+    // hands its path over, and a rewrite makes Vite reload the running app's windows.
+    let fresh = std::env::temp_dir().join(format!("openidea-bindings-{}.ts", std::process::id()));
     builder
         .export(
             specta_typescript::Typescript::default().header("// @ts-nocheck\n/* eslint-disable */\n// Generated by tauri-specta. Do not edit; run `pnpm gen:bindings`."),
-            concat!(env!("CARGO_MANIFEST_DIR"), "/../src/bindings.ts"),
+            &fresh,
         )
         .expect("failed to export TypeScript bindings");
+    let text = std::fs::read(&fresh).expect("exported TypeScript bindings");
+    let _ = std::fs::remove_file(&fresh);
+    if std::fs::read(target).ok().as_deref() != Some(text.as_slice()) {
+        std::fs::write(target, text).expect("failed to write TypeScript bindings");
+    }
 }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -85,8 +94,8 @@ pub fn run() {
     let app = app.plugin(
         tauri_plugin_window_state::Builder::default()
             .with_state_flags(window_state_flags())
-            // One remembered geometry shared by every project's settings window.
-            .map_label(|l| if windows::is_settings_window(l) { "settings" } else { l })
+            // One remembered geometry per kind of auxiliary window (all projects' settings windows share one).
+            .map_label(windows::state_key)
             .build(),
     );
     let app = app
@@ -176,23 +185,26 @@ pub fn run() {
             }
         }
         tauri::WindowEvent::Focused(false) => application_focus::changed(window.app_handle(), false),
+        tauri::WindowEvent::Moved(_) | tauri::WindowEvent::Resized(_) => {
+            window_groups::frame_changed(window.app_handle(), window.label());
+        }
         tauri::WindowEvent::Destroyed => {
             #[cfg(target_os = "macos")]
             {
                 titlebar::forget(window);
                 macos::forget_fullscreen(window.label());
             }
-            window_groups::destroyed(window.app_handle(), window.label());
-            if let Some(settings) = window.app_handle().get_webview_window(&windows::settings_label(window.label())) {
-                let _ = settings.destroy();
-            }
-            if let Some(state) = window.try_state::<AppState>() {
-                state.close_project(window.label());
+            if windows::auxiliary_parent(window.label()).is_none() {
+                window_groups::destroyed(window.app_handle(), window.label());
+                windows::close_auxiliary_windows(window.app_handle(), window.label());
+                if let Some(state) = window.try_state::<AppState>() {
+                    state.close_project(window.label());
+                }
             }
             if let Some(w) = window.try_state::<WindowsState>() {
                 w.forget(window.label());
             }
-            if !windows::is_settings_window(window.label()) {
+            if windows::auxiliary_parent(window.label()).is_none() {
                 windows::continue_quit(window.app_handle(), Some(window.label()));
             }
         }
@@ -237,15 +249,20 @@ fn on_menu_event(app: &tauri::AppHandle, event: tauri::menu::MenuEvent) {
     let Some(route) = menu::route(&menu::spec(menu::Os::current()), id) else { return };
     match windows::target_window(app) {
         Some(w) => {
-            // Settings is modal for its project window: only app-level items get through, to the parent.
-            let label = match windows::settings_parent(w.label()) {
-                Some(parent)
+            // App-level items of an auxiliary window go to its project window. Settings is modal for it:
+            // nothing else gets through. Others handle their own items; Close Tab closes the window.
+            let label = match windows::auxiliary(w.label()) {
+                Some((_, parent))
                     if matches!(route.action.as_str(), "app.quit" | "file.settings" | "file.newProjectsSettings") =>
                 {
                     parent
                 }
-                Some(_) => return,
-                None => w.label(),
+                Some((kind, _)) if kind.modal() => return,
+                Some(_) if route.action == "editor.closeTab" => {
+                    let _ = w.close();
+                    return;
+                }
+                _ => w.label(),
             };
             if let Err(e) = app.emit_to(label, menu::MENU_EVENT, &route) {
                 tracing::warn!("failed to deliver menu event {id}: {e}");
diff --git a/src-tauri/src/linux_window_state.rs b/src-tauri/src/linux_window_state.rs
index a05a6f7e..f3923bfa 100644
--- a/src-tauri/src/linux_window_state.rs
+++ b/src-tauri/src/linux_window_state.rs
@@ -120,7 +120,7 @@ mod runtime {
     }
 
     fn key(label: &str) -> &str {
-        if crate::windows::is_settings_window(label) { "settings" } else { label }
+        crate::windows::state_key(label)
     }
 
     pub fn prepare(app: &AppHandle, config: &mut WindowConfig) -> bool {
@@ -198,7 +198,7 @@ mod runtime {
             pending.phase = Phase::Mapping;
             pending.mode_requested = false;
         }
-        let mut fit_settings = false;
+        let mut place_aux = false;
         let mut position = None;
         if matches!(pending.phase, Phase::Mapping) {
             if pending.restore_position {
@@ -286,7 +286,7 @@ mod runtime {
                 return;
             }
             pending.phase = Phase::Tracking;
-            fit_settings = crate::windows::is_settings_window(window.label());
+            place_aux = crate::windows::auxiliary_parent(window.label()).is_some();
         }
         pending.history = ModeHistory(frame.mode);
         pending.normal = remember_size(pending.normal, frame.size, false, frame.mode);
@@ -304,15 +304,15 @@ mod runtime {
         if let Some(position) = position {
             let _ = window.set_position(position);
         }
-        if fit_settings {
+        if place_aux {
             let app = window.app_handle().clone();
             let label = window.label().to_owned();
             let _ = window.run_on_main_thread(move || {
-                if let Some(parent) = crate::windows::settings_parent(&label).and_then(|p| app.get_webview_window(p))
-                    && let Some(settings) = app.get_webview_window(&label)
-                    && let Err(error) = crate::windows::place_settings_window(&settings, &parent)
+                if let Some(parent) = crate::windows::auxiliary_parent(&label).and_then(|p| app.get_webview_window(p))
+                    && let Some(aux) = app.get_webview_window(&label)
+                    && let Err(error) = crate::windows::place_over_parent(&aux, &parent)
                 {
-                    tracing::warn!("cannot fit restored settings window: {error}");
+                    tracing::warn!("cannot fit restored auxiliary window: {error}");
                 }
             });
         }
diff --git a/src-tauri/src/macos.rs b/src-tauri/src/macos.rs
index 783e0a99..36cb0141 100644
--- a/src-tauri/src/macos.rs
+++ b/src-tauri/src/macos.rs
@@ -2,7 +2,11 @@
 use crate::windows::{Launch, WindowsState};
 use ide_core::{IdeError, IdeResult};
 use ide_workspace::window_groups::{TabbingPreference, should_group_new_project};
-use objc2::{MainThreadMarker, rc::Retained, runtime::ProtocolObject};
+use objc2::{
+    MainThreadMarker,
+    rc::Retained,
+    runtime::{AnyClass, AnyObject, Imp, ProtocolObject, Sel},
+};
 use objc2_app_kit::{NSWindow, NSWindowUserTabbingPreference};
 use objc2_foundation::{NSNotificationCenter, NSObjectProtocol};
 use tauri::{AppHandle, Manager, WebviewWindow};
@@ -35,7 +39,7 @@ pub fn new_project_tab_target(app: &AppHandle, launch: &Launch) -> IdeResult<Opt
         .cloned()
         .or_else(|| app.state::<WindowsState>().last_focused().and_then(|label| windows.get(&label).cloned()));
     let active = active.and_then(|w| {
-        let label = crate::windows::settings_parent(w.label()).unwrap_or(w.label());
+        let label = crate::windows::auxiliary_parent(w.label()).unwrap_or(w.label());
         windows.get(label).cloned()
     });
     let active = active.filter(|w| {
@@ -96,3 +100,148 @@ pub fn transfer_fullscreen(from: &WebviewWindow, to: &WebviewWindow) -> tauri::R
         native.toggleFullScreen(None);
     })
 }
+
+/// Windows in simple fullscreen. Grouped project windows take turns in one Space; simple
+/// fullscreen covers the screen without a Space of its own, so switching projects is a plain
+/// show/hide instead of leaving one fullscreen Space and entering another.
+static SIMPLE_FULLSCREEN: std::sync::Mutex<Vec<String>> = std::sync::Mutex::new(Vec::new());
+
+pub fn is_simple_fullscreen(label: &str) -> bool {
+    SIMPLE_FULLSCREEN.lock().unwrap().iter().any(|l| l == label)
+}
+
+pub fn set_simple_fullscreen(window: &WebviewWindow, on: bool) -> tauri::Result<()> {
+    if !on {
+        // Before the window goes back to its own frame.
+        let target = window.clone();
+        window.run_on_main_thread(move || keep_window_buttons(&target, false))?;
+    }
+    window.set_simple_fullscreen(on)?;
+    let any = {
+        let mut labels = SIMPLE_FULLSCREEN.lock().unwrap();
+        labels.retain(|l| l != window.label());
+        if on {
+            labels.push(window.label().to_owned());
+        }
+        !labels.is_empty()
+    };
+    let target = window.clone();
+    window.run_on_main_thread(move || {
+        present(any);
+        if on {
+            keep_window_buttons(&target, true);
+        }
+    })
+}
+
+thread_local! {
+    /// Minimum sizes of windows in simple fullscreen, restored when they leave it.
+    static MIN_SIZES: std::cell::RefCell<std::collections::HashMap<String, objc2_foundation::NSSize>> =
+        std::cell::RefCell::default();
+}
+
+/// Simple fullscreen drops the title bar and resizing; ours is transparent over the web toolbar,
+/// so keep it and its buttons, the green one (enabled only for a resizable window) leading back
+/// out of fullscreen. A minimum size of the whole screen keeps the edges from being dragged.
+fn keep_window_buttons(window: &WebviewWindow, on: bool) {
+    use objc2_app_kit::NSWindowStyleMask;
+    let Ok(pointer) = window.ns_window() else { return };
+    let native = unsafe { &*pointer.cast::<NSWindow>() };
+    let label = window.label().to_owned();
+    if !on {
+        if let Some(size) = MIN_SIZES.with_borrow_mut(|sizes| sizes.remove(&label)) {
+            native.setMinSize(size);
+        }
+        return;
+    }
+    let Some(screen) = native.screen() else { return };
+    let frame = screen.frame();
+    MIN_SIZES.with_borrow_mut(|sizes| {
+        sizes.entry(label).or_insert_with(|| native.minSize());
+    });
+    native.setMinSize(frame.size);
+    native.setStyleMask(native.styleMask() | NSWindowStyleMask::Titled | NSWindowStyleMask::Resizable);
+    native.setFrame_display(frame, true);
+}
+
+/// Forgets a closed window; true when it was in simple fullscreen.
+pub fn forget_simple_fullscreen(app: &AppHandle, label: &str) -> bool {
+    let (was, any) = {
+        let mut labels = SIMPLE_FULLSCREEN.lock().unwrap();
+        let before = labels.len();
+        labels.retain(|l| l != label);
+        (labels.len() != before, !labels.is_empty())
+    };
+    if was {
+        let label = label.to_owned();
+        let _ = app.run_on_main_thread(move || {
+            MIN_SIZES.with_borrow_mut(|sizes| sizes.remove(&label));
+            present(any);
+        });
+    }
+    was
+}
+
+/// Each window restores the presentation options it found on entering, which is wrong once
+/// fullscreen has passed between windows; derive them from the windows in fullscreen instead.
+fn present(fullscreen: bool) {
+    use objc2_app_kit::{NSApplication, NSApplicationPresentationOptions};
+    let Some(mtm) = MainThreadMarker::new() else { return };
+    let options = if fullscreen {
+        NSApplicationPresentationOptions::AutoHideDock | NSApplicationPresentationOptions::AutoHideMenuBar
+    } else {
+        NSApplicationPresentationOptions::Default
+    };
+    NSApplication::sharedApplication(mtm).setPresentationOptions(options);
+}
+
+type ToggleFullScreen = unsafe extern "C-unwind" fn(*mut AnyObject, Sel, *mut AnyObject);
+
+static NATIVE_TOGGLE_FULLSCREEN: std::sync::OnceLock<ToggleFullScreen> = std::sync::OnceLock::new();
+static APP: std::sync::OnceLock<AppHandle> = std::sync::OnceLock::new();
+
+/// The green window button, the Globe-F shortcut and the system's Enter Full Screen item all
+/// send `toggleFullScreen:`; a grouped window answers it with simple fullscreen instead.
+pub fn intercept_toggle_fullscreen(window: &WebviewWindow) {
+    let _ = APP.set(window.app_handle().clone());
+    let _ = window.with_webview(|webview| unsafe {
+        let class = objc2::ffi::object_getClass(webview.ns_window().cast()) as *mut AnyClass;
+        let selector = objc2::sel!(toggleFullScreen:);
+        if NATIVE_TOGGLE_FULLSCREEN.get().is_some() {
+            return;
+        }
+        let Some(method) = (*class).instance_method(selector) else { return };
+        let native: ToggleFullScreen = std::mem::transmute(method.implementation());
+        let types = objc2::ffi::method_getTypeEncoding(method);
+        let _ = NATIVE_TOGGLE_FULLSCREEN.set(native);
+        let replacement: Imp = std::mem::transmute(toggle_fullscreen as ToggleFullScreen);
+        objc2::ffi::class_replaceMethod(class, selector, replacement, types);
+    });
+}
+
+unsafe extern "C-unwind" fn toggle_fullscreen(this: *mut AnyObject, selector: Sel, sender: *mut AnyObject) {
+    if let Some(window) = APP.get().and_then(|app| simple_fullscreen_window(app, this)) {
+        if let Err(error) = crate::window_groups::toggle_fullscreen(&window) {
+            tracing::warn!(message = error.message, "cannot toggle fullscreen");
+        }
+        return;
+    }
+    if let Some(native) = NATIVE_TOGGLE_FULLSCREEN.get() {
+        unsafe { native(this, selector, sender) };
+    }
+}
+
+/// `native` as a grouped project window (or one still in simple fullscreen) that is not in
+/// native fullscreen; one in native fullscreen leaves it the usual way.
+fn simple_fullscreen_window(app: &AppHandle, native: *mut AnyObject) -> Option<WebviewWindow> {
+    let mask: objc2_app_kit::NSWindowStyleMask = unsafe { objc2::msg_send![native, styleMask] };
+    if mask.contains(objc2_app_kit::NSWindowStyleMask::FullScreen) {
+        return None;
+    }
+    let window = app
+        .webview_windows()
+        .into_values()
+        .find(|w| w.ns_window().is_ok_and(|pointer| pointer.cast::<AnyObject>() == native))?;
+    let grouped = app.state::<WindowsState>().groups.lock().group(window.label()).is_some();
+    (grouped || is_simple_fullscreen(window.label())).then_some(window)
+}
diff --git a/src-tauri/src/menu.rs b/src-tauri/src/menu.rs
index 57191232..8b9fc95a 100644
--- a/src-tauri/src/menu.rs
+++ b/src-tauri/src/menu.rs
@@ -542,6 +542,9 @@ pub fn spec(os: Os) -> Vec<Entry> {
             act("refactor.extractMethod", "Extract Method…"),
             act("refactor.inline", "Inline…"),
             SEP,
+            act("refactor.pullMembersUp", "Pull Members Up…"),
+            act("refactor.pushMembersDown", "Push Members Down…"),
+            SEP,
             act("refactor.move", "Move…"),
             act("project.copyElement", "Copy…"),
             act("refactor.safeDelete", "Safe Delete…"),
@@ -667,6 +670,7 @@ pub fn spec(os: Os) -> Vec<Entry> {
                     act("vcs.showDiff", "Show Diff"),
                     act("vcs.compareWithBranch", "Compare with Branch or Revision…"),
                     act("vcs.showHistory", "Show History"),
+                    act("vcs.showHistoryForSelection", "Show History for Selection"),
                     SEP,
                     act("vcs.localHistory", "Local History"),
                     act("localHistory.putLabel", "Put Label…"),
diff --git a/src-tauri/src/remote_dev.rs b/src-tauri/src/remote_dev.rs
index 0a6c74cc..2d210b4b 100644
--- a/src-tauri/src/remote_dev.rs
+++ b/src-tauri/src/remote_dev.rs
@@ -635,8 +635,37 @@ pub async fn remote_invoke(
             }
         }
     }
+    #[derive(Deserialize)]
+    #[serde(rename_all = "camelCase")]
+    struct DocumentEdit {
+        doc: ide_core::DocId,
+        base_version: u32,
+        changes: ide_core::ChangeSet,
+    }
+    let mirrored = if cmd == "doc_edit" {
+        let peers = crate::events::document_edit_peers(window.app_handle(), window.label());
+        if peers.is_empty() {
+            None
+        } else {
+            serde_json::from_value::<DocumentEdit>(args.clone()).ok().map(|edit| (peers, edit))
+        }
+    } else {
+        None
+    };
     let call = Invoke { window: label, cmd, args };
     let result: Value = c.peer.request("invoke", call, None).await.map_err(ide_host::rpc::error_from_reply)?;
+    if let (Some((peers, edit)), Some(version)) =
+        (mirrored, result.as_u64().and_then(|version| u32::try_from(version).ok()))
+    {
+        crate::events::emit_document_edit(
+            window.app_handle(),
+            peers,
+            edit.doc,
+            edit.base_version,
+            version,
+            edit.changes.changes,
+        );
+    }
     Ok(result.to_string())
 }
 
diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs
index b205e44c..f651c71f 100644
--- a/src-tauri/src/state.rs
+++ b/src-tauri/src/state.rs
@@ -131,7 +131,7 @@ impl AppState {
 
     /// The window that owns what `window` starts: a settings window's parent, else `window`.
     pub fn owner_window(window: &str) -> &str {
-        crate::windows::settings_parent(window).unwrap_or(window)
+        crate::windows::auxiliary_parent(window).unwrap_or(window)
     }
 
     /// Opens `root` in `window` and records it in the recent projects.
@@ -154,9 +154,11 @@ impl AppState {
         self.host.open_light(window, file)
     }
 
+    /// Called on the event-loop thread (window destruction, the `close_project`
+    /// command), so it must not wait for the project's workers to shut down.
     pub fn close_project(&self, window: &str) {
         self.remote_dev.disconnect(window);
-        self.host.close_project(window);
+        self.host.close_project_detached(window);
     }
 }
 
diff --git a/src-tauri/src/window_groups.rs b/src-tauri/src/window_groups.rs
index 76ad5e6e..44e70c2d 100644
--- a/src-tauri/src/window_groups.rs
+++ b/src-tauri/src/window_groups.rs
@@ -8,9 +8,17 @@ use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::collections::VecDeque;
 use std::path::PathBuf;
-use std::sync::atomic::Ordering;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::time::Duration;
 use tauri::{AppHandle, Manager, WebviewWindow};
 
+/// Wait for the selection's asynchronous `hide` calls to take effect before moving the peers.
+const FRAME_SETTLE_AFTER_SELECT: Duration = Duration::from_millis(50);
+/// Wait for a drag/resize to stop before copying its frame to the hidden peers.
+const FRAME_SETTLE_AFTER_MOVE: Duration = Duration::from_millis(100);
+/// Coalesces the move/resize events a drag emits.
+static FRAME_SYNC_GENERATION: AtomicU64 = AtomicU64::new(0);
+
 #[derive(Clone, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct WindowTab {
@@ -48,7 +56,47 @@ fn changed(app: &AppHandle) {
     app.state::<AppState>().sink.emit(IdeEvent::WindowGroupsChanged);
 }
 
+/// Whether `to` already presents `from`'s frame, so moving it would only make it flicker.
+fn same_frame(from: &WebviewWindow, to: &WebviewWindow) -> bool {
+    let (Ok(from_max), Ok(to_max)) = (from.is_maximized(), to.is_maximized()) else { return false };
+    let (Ok(from_full), Ok(to_full)) = (from.is_fullscreen(), to.is_fullscreen()) else { return false };
+    if from_max != to_max || from_full != to_full {
+        return false;
+    }
+    let same_monitor = match (from.current_monitor(), to.current_monitor()) {
+        (Ok(Some(a)), Ok(Some(b))) => a.position() == b.position() && a.size() == b.size(),
+        // An unmapped window may not report a monitor; treat only equal states as matching.
+        (Ok(None), Ok(None)) | (Err(_), Err(_)) => true,
+        _ => false,
+    };
+    if !same_monitor {
+        return false;
+    }
+    from_full
+        || from_max
+        || (from.outer_position().ok() == to.outer_position().ok() && from.inner_size().ok() == to.inner_size().ok())
+}
+
+/// Moves a hidden window onto `from`'s monitor. A restored window keeps its normal position on
+/// the monitor it last occupied; maximizing or going fullscreen there would make the window
+/// visibly jump across displays when its tab is selected.
+fn place_on_monitor(from: &WebviewWindow, to: &WebviewWindow) -> IdeResult<()> {
+    // Wayland does not let clients place top-level windows; maximizing stays on that output.
+    #[cfg(target_os = "linux")]
+    if crate::linux_window_state::is_wayland() {
+        return Ok(());
+    }
+    let err = |e: tauri::Error| IdeError::internal(e.to_string());
+    if let Some(monitor) = from.current_monitor().map_err(err)? {
+        to.set_position(*monitor.position()).map_err(err)?;
+    }
+    Ok(())
+}
+
 fn copy_frame(from: &WebviewWindow, to: &WebviewWindow) -> IdeResult<()> {
+    if same_frame(from, to) {
+        return Ok(());
+    }
     let err = |e: tauri::Error| IdeError::internal(e.to_string());
     let fullscreen = from.is_fullscreen().map_err(err)?;
     if fullscreen {
@@ -56,6 +104,8 @@ fn copy_frame(from: &WebviewWindow, to: &WebviewWindow) -> IdeResult<()> {
         crate::macos::transfer_fullscreen(from, to).map_err(err)?;
         #[cfg(not(target_os = "macos"))]
         {
+            to.set_fullscreen(false).map_err(err)?;
+            place_on_monitor(from, to)?;
             from.set_fullscreen(false).map_err(err)?;
             to.set_fullscreen(true).map_err(err)?;
         }
@@ -75,17 +125,114 @@ fn copy_frame(from: &WebviewWindow, to: &WebviewWindow) -> IdeResult<()> {
         crate::linux_window_state::normal_size_requested(to.app_handle(), to.label(), size);
         to.set_size(size).map_err(err)?;
     } else {
+        // Maximize the target on the source's monitor, not on the monitor it happened to
+        // occupy while hidden.
+        to.unmaximize().map_err(err)?;
+        place_on_monitor(from, to)?;
         to.maximize().map_err(err)?;
     }
     Ok(())
 }
 
+/// Keeps hidden group members at the selected window's frame. Selecting a tab then only
+/// changes which window is visible instead of moving or resizing one on screen.
+fn sync_member_frames(app: &AppHandle, selected: &str) {
+    let Some(group) = app.state::<WindowsState>().groups.lock().group(selected).cloned() else { return };
+    if group.selected != selected {
+        return;
+    }
+    let Some(from) = app.get_webview_window(selected) else { return };
+    if from.is_fullscreen().unwrap_or(false) || from.is_minimized().unwrap_or(false) || simple_fullscreen(selected) {
+        return;
+    }
+    for member in group.members.iter().filter(|member| member.as_str() != selected) {
+        let Some(to) = app.get_webview_window(member) else { continue };
+        // A visible peer is the one being presented; never move it behind the user's back.
+        if to.is_visible().unwrap_or(false) {
+            continue;
+        }
+        if let Err(error) = copy_frame(&from, &to) {
+            tracing::warn!("cannot align window {member} with {selected}: {}", error.message);
+        }
+    }
+}
+
+/// A presented group window moved or resized. Align its hidden peers after the user stops, so
+/// the next tab selection is only a visibility change.
+pub fn frame_changed(app: &AppHandle, label: &str) {
+    let Some(group) = app.state::<WindowsState>().groups.lock().group(label).cloned() else { return };
+    if group.selected != label {
+        return;
+    }
+    let generation = FRAME_SYNC_GENERATION.fetch_add(1, Ordering::Relaxed) + 1;
+    let app = app.clone();
+    let label = label.to_owned();
+    tauri::async_runtime::spawn(async move {
+        tokio::time::sleep(FRAME_SETTLE_AFTER_MOVE).await;
+        if FRAME_SYNC_GENERATION.load(Ordering::Relaxed) != generation {
+            return;
+        }
+        if !app.state::<WindowsState>().quitting() {
+            sync_member_frames(&app, &label);
+        }
+    });
+}
+
+fn simple_fullscreen(label: &str) -> bool {
+    #[cfg(target_os = "macos")]
+    return crate::macos::is_simple_fullscreen(label);
+    #[cfg(not(target_os = "macos"))]
+    {
+        let _ = label;
+        false
+    }
+}
+
+#[cfg(target_os = "macos")]
+fn set_simple_fullscreen(window: &WebviewWindow, on: bool) -> IdeResult<()> {
+    crate::macos::set_simple_fullscreen(window, on).map_err(|e| IdeError::internal(e.to_string()))
+}
+
+/// Fullscreen for `window`. On macOS a grouped window uses simple fullscreen, for every member
+/// at once: the group stays in one Space and each member keeps the screen's size, so switching
+/// projects is only showing one window and hiding the others.
+pub fn toggle_fullscreen(window: &WebviewWindow) -> IdeResult<bool> {
+    let err = |e: tauri::Error| IdeError::internal(e.to_string());
+    #[cfg(target_os = "macos")]
+    {
+        let simple = simple_fullscreen(window.label());
+        let app = window.app_handle();
+        let members = app.state::<WindowsState>().groups.lock().group(window.label()).map(|g| g.members.clone());
+        if simple || (members.is_some() && !window.is_fullscreen().map_err(err)?) {
+            set_simple_fullscreen(window, !simple)?;
+            for member in members.iter().flatten().filter(|m| *m != window.label()) {
+                if let Some(other) = app.get_webview_window(member)
+                    && simple_fullscreen(member) == simple
+                {
+                    set_simple_fullscreen(&other, !simple)?;
+                }
+            }
+            return Ok(!simple);
+        }
+    }
+    let on = !window.is_fullscreen().map_err(err)?;
+    window.set_fullscreen(on).map_err(err)?;
+    Ok(on)
+}
+
 pub fn select(app: &AppHandle, caller: &str, target: &str) -> IdeResult<()> {
     let to = app.get_webview_window(target).ok_or_else(|| IdeError::not_found("Window closed"))?;
     let state = app.state::<WindowsState>();
     let previous = state.groups.lock().select(caller, target)?;
+    // In a fullscreen group the target already covers the screen, or does so before it is shown.
+    let simple = previous.selected != target && simple_fullscreen(&previous.selected);
     let result = (|| {
-        if previous.selected != target
+        #[cfg(target_os = "macos")]
+        if simple && !simple_fullscreen(target) {
+            set_simple_fullscreen(&to, true)?;
+        }
+        if !simple
+            && previous.selected != target
             && let Some(from) = app.get_webview_window(&previous.selected)
         {
             copy_frame(&from, &to)?;
@@ -114,6 +261,18 @@ pub fn select(app: &AppHandle, caller: &str, target: &str) -> IdeResult<()> {
                 }
             }
         }
+    } else if !state.quitting() {
+        // Align the members that are now hidden while they stay invisible, so the next
+        // selection does not move or resize a window on screen. Hiding is asynchronous;
+        // wait for it before moving a peer that is still on screen.
+        let app = app.clone();
+        let target = target.to_owned();
+        tauri::async_runtime::spawn(async move {
+            tokio::time::sleep(FRAME_SETTLE_AFTER_SELECT).await;
+            if !app.state::<WindowsState>().quitting() {
+                sync_member_frames(&app, &target);
+            }
+        });
     }
     changed(app);
     result
@@ -137,6 +296,10 @@ pub fn merge(app: &AppHandle, caller: &str) -> IdeResult<()> {
     // Native fullscreen puts each window in a separate Space; leave it before grouping.
     for label in &members {
         if let Some(window) = app.get_webview_window(label) {
+            #[cfg(target_os = "macos")]
+            if label != caller && simple_fullscreen(label) {
+                set_simple_fullscreen(&window, false)?;
+            }
             window.set_fullscreen(false).map_err(|e| IdeError::internal(e.to_string()))?;
         }
     }
@@ -148,10 +311,21 @@ pub fn detach(app: &AppHandle, caller: &str) -> IdeResult<()> {
     let state = app.state::<WindowsState>();
     let next = state.groups.lock().detach(caller);
     if let Some(next) = next {
+        // The tab that stays keeps the fullscreen; the detached window opens beside it.
+        #[cfg(target_os = "macos")]
+        let simple = simple_fullscreen(caller);
         if let Some(window) = app.get_webview_window(&next) {
+            #[cfg(target_os = "macos")]
+            if simple && !simple_fullscreen(&next) {
+                set_simple_fullscreen(&window, true)?;
+            }
             window.show().map_err(|e| IdeError::internal(e.to_string()))?;
         }
         if let Some(window) = app.get_webview_window(caller) {
+            #[cfg(target_os = "macos")]
+            if simple {
+                set_simple_fullscreen(&window, false)?;
+            }
             if let Ok(position) = window.outer_position() {
                 let _ = window.set_position(tauri::PhysicalPosition::new(position.x + 32, position.y + 32));
             }
@@ -164,9 +338,15 @@ pub fn detach(app: &AppHandle, caller: &str) -> IdeResult<()> {
 
 pub fn destroyed(app: &AppHandle, caller: &str) {
     let Some(state) = app.try_state::<WindowsState>() else { return };
+    #[cfg(target_os = "macos")]
+    let simple = crate::macos::forget_simple_fullscreen(app, caller);
     let next = state.groups.lock().detach(caller);
     if !state.quitting() {
         if let Some(window) = next.and_then(|label| app.get_webview_window(&label)) {
+            #[cfg(target_os = "macos")]
+            if simple && !simple_fullscreen(window.label()) {
+                let _ = set_simple_fullscreen(&window, true);
+            }
             windows::focus(&window);
         }
         let app = app.clone();
diff --git a/src-tauri/src/windows.rs b/src-tauri/src/windows.rs
index ecc5021e..a0db3c12 100644
--- a/src-tauri/src/windows.rs
+++ b/src-tauri/src/windows.rs
@@ -6,9 +6,9 @@
 //! (`window_take_launch`), and re-taken whenever [`LAUNCH_EVENT`] fires (a
 //! second app instance asking an already-loaded window to open a path).
 //!
-//! Settings open in a separate window `settings-<parent>` (one per project
-//! window) that shares its parent's project (see [`AppState::project`]); its
-//! [`Launch::settings_page`] tells it which page to show.
+//! Auxiliary windows ([`AuxKind`]: Settings, Compare with Local, Sync with Deployed) belong to a project window and share its project (see
+//! [`AppState::project`]). Their labels name the kind and the parent
+//! (`settings-main`, `comparison-project-2-3`); their [`Launch`] says what to show.
 
 use crate::state::AppState;
 use crate::theme_frame::builtin_frame;
@@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use tauri::utils::config::{Color, WindowConfig};
 use tauri::{AppHandle, Emitter, Manager, Theme, WebviewWindow, WebviewWindowBuilder};
 
@@ -27,10 +27,13 @@ use tauri::{AppHandle, Emitter, Manager, Theme, WebviewWindow, WebviewWindowBuil
 pub const LAUNCH_EVENT: &str = "openidea://launch";
 const MAIN: &str = "main";
 const PREFIX: &str = "project-";
-const SETTINGS_PREFIX: &str = "settings-";
 const CASCADE: f64 = 28.0;
 const SETTINGS_SIZE: (f64, f64) = (980.0, 720.0);
 const SETTINGS_MIN_SIZE: (f64, f64) = (640.0, 420.0);
+const COMPARISON_SIZE: (f64, f64) = (1100.0, 720.0);
+const COMPARISON_MIN_SIZE: (f64, f64) = (640.0, 360.0);
+const DEPLOYMENT_SIZE: (f64, f64) = (1400.0, 900.0);
+const DEPLOYMENT_MIN_SIZE: (f64, f64) = (800.0, 500.0);
 
 /// What a freshly opened window should do once its frontend is up.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
@@ -50,6 +53,43 @@ pub struct Launch {
     /// Where to place the caret in some of `files` (`openidea --line 12 --column 5 <file>`).
     #[serde(default)]
     pub positions: Vec<FilePosition>,
+    /// Comparison windows: the revisions to compare (boxed: most launches have none).
+    #[serde(default)]
+    pub comparison: Option<Box<ComparisonLaunch>>,
+    /// Deployment windows: the server and local selection to compare.
+    #[serde(default)]
+    pub deployment: Option<DeploymentLaunch>,
+}
+
+/// Local files to compare with a deployment server (Sync with Deployed).
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Type)]
+pub struct DeploymentLaunch {
+    /// Deployment server id.
+    pub server: String,
+    pub paths: Vec<ide_core::IpcPath>,
+}
+
+/// A Git revision and how the comparison window names it.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Type)]
+pub struct ComparisonRevision {
+    pub rev: String,
+    pub label: String,
+}
+
+/// Limits a comparison to some paths (Compare with Branch on a selection).
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Type)]
+pub struct ComparisonScope {
+    pub paths: Vec<ide_core::IpcPath>,
+    pub repositories: Option<Vec<ide_core::IpcPath>>,
+}
+
+/// Files that differ between `from` and `to` (the working tree when `None`).
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Type)]
+pub struct ComparisonLaunch {
+    pub from: ComparisonRevision,
+    pub to: Option<ComparisonRevision>,
+    pub scope: Option<ComparisonScope>,
+    pub repo: Option<ide_core::IpcPath>,
 }
 
 /// A caret position for a file opened from the command line: 0-based line and column.
@@ -85,6 +125,8 @@ pub struct WindowsState {
     pub tab_closes: Mutex<Option<crate::window_groups::TabCloses>>,
     /// Relaunch once the quit completes (after installing an update).
     restart: AtomicBool,
+    /// Numbers windows of kinds that can open several times per project window.
+    aux_serial: AtomicU64,
 }
 
 impl WindowsState {
@@ -159,29 +201,101 @@ impl WindowsState {
     }
 }
 
-/// The project window a settings window belongs to (`settings-main` → `main`).
-pub fn settings_parent(label: &str) -> Option<&str> {
-    label.strip_prefix(SETTINGS_PREFIX)
+/// A window that belongs to a project window (its parent) and shares its project.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum AuxKind {
+    Settings,
+    Comparison,
+    Deployment,
 }
 
-pub fn is_settings_window(label: &str) -> bool {
-    settings_parent(label).is_some()
-}
+impl AuxKind {
+    const ALL: [AuxKind; 3] = [AuxKind::Settings, AuxKind::Comparison, AuxKind::Deployment];
 
-pub fn settings_label(parent: &str) -> String {
-    format!("{SETTINGS_PREFIX}{parent}")
-}
+    /// Label prefix, and the key of the one remembered geometry shared by every window of the kind.
+    pub fn name(self) -> &'static str {
+        match self {
+            AuxKind::Settings => "settings",
+            AuxKind::Comparison => "comparison",
+            AuxKind::Deployment => "deployment",
+        }
+    }
 
-/// Closes `parent`'s settings window: it shows (and would apply to) the project the parent is leaving.
-pub fn close_settings_window(app: &AppHandle, parent: &str) {
-    if let Some(w) = app.get_webview_window(&settings_label(parent)) {
-        let _ = w.close();
+    /// Several per project window (`<kind>-<parent>-<n>`), else one (`<kind>-<parent>`).
+    fn multiple(self) -> bool {
+        self == AuxKind::Comparison
+    }
+
+    /// Shows the project's documents: gets its parent's events and edits made in sibling windows,
+    /// and asks about its own unsaved changes before the parent closes it.
+    pub fn shares_documents(self) -> bool {
+        self != AuxKind::Settings
+    }
+
+    /// Modal for its parent: menu items other than app-level ones are dropped.
+    pub fn modal(self) -> bool {
+        self == AuxKind::Settings
+    }
+
+    /// Needs its parent to have a project open.
+    fn needs_project(self) -> bool {
+        self != AuxKind::Settings
     }
 }
 
-/// Project windows (everything but settings windows), for counting and cycling.
+/// The kind and parent of an auxiliary window (`comparison-project-2-3` → `Comparison`, `project-2`).
+pub fn auxiliary(label: &str) -> Option<(AuxKind, &str)> {
+    AuxKind::ALL.into_iter().find_map(|kind| {
+        let rest = label.strip_prefix(kind.name())?.strip_prefix('-')?;
+        let parent = if kind.multiple() {
+            let (parent, n) = rest.rsplit_once('-')?;
+            n.parse::<u64>().ok()?;
+            parent
+        } else {
+            rest
+        };
+        (!parent.is_empty()).then_some((kind, parent))
+    })
+}
+
+/// The project window an auxiliary window belongs to (`settings-main` → `main`).
+pub fn auxiliary_parent(label: &str) -> Option<&str> {
+    auxiliary(label).map(|(_, parent)| parent)
+}
+
+pub fn settings_label(parent: &str) -> String {
+    format!("{}-{parent}", AuxKind::Settings.name())
+}
+
+/// The window state key: one geometry per auxiliary kind, else the label itself.
+pub fn state_key(label: &str) -> &str {
+    auxiliary(label).map_or(label, |(kind, _)| kind.name())
+}
+
+/// `parent`'s auxiliary windows that show its project's documents.
+pub fn document_windows(app: &AppHandle, parent: &str) -> Vec<String> {
+    app.webview_windows()
+        .into_keys()
+        .filter(|label| auxiliary(label).is_some_and(|(kind, p)| kind.shares_documents() && p == parent))
+        .collect()
+}
+
+/// Closes `parent`'s auxiliary windows: they show (and would apply to) the project it is leaving.
+/// Windows with documents are destroyed: the parent's leave guard has already settled their
+/// unsaved changes (`closeAuxiliaryWindows` in the UI).
+pub fn close_auxiliary_windows(app: &AppHandle, parent: &str) {
+    for (label, window) in app.webview_windows() {
+        match auxiliary(&label) {
+            Some((kind, p)) if p == parent && kind.shares_documents() => drop(window.destroy()),
+            Some((_, p)) if p == parent => drop(window.close()),
+            _ => {}
+        }
+    }
+}
+
+/// Project windows, excluding auxiliary windows, for counting and cycling.
 pub fn project_window_labels(app: &AppHandle) -> Vec<String> {
-    sorted_labels(app.webview_windows().keys().map(String::as_str).filter(|l| !is_settings_window(l)))
+    sorted_labels(app.webview_windows().keys().map(String::as_str).filter(|l| auxiliary_parent(l).is_none()))
 }
 
 /// Sort key: `main` first, then `project-<n>` by n, then anything else.
@@ -295,7 +409,7 @@ pub fn continue_quit(app: &AppHandle, closed: Option<&str>) {
 /// The window whose open project is `root` (already canonical).
 pub fn find_project_window(app: &AppHandle, root: &Path) -> Option<WebviewWindow> {
     let state = app.try_state::<AppState>()?;
-    app.webview_windows().into_iter().filter(|(label, _)| !is_settings_window(label)).find_map(|(label, w)| {
+    app.webview_windows().into_iter().filter(|(label, _)| auxiliary_parent(label).is_none()).find_map(|(label, w)| {
         let project = state.project(&label).ok()?;
         (project.root == root && !project.light).then_some(w)
     })
@@ -488,6 +602,8 @@ fn create_window_for(
     app.state::<WindowsState>().set_launch(&label, launch);
     let window = build_project_window(app, config)?;
     #[cfg(target_os = "macos")]
+    crate::macos::intercept_toggle_fullscreen(&window);
+    #[cfg(target_os = "macos")]
     if let Some(target) = tab_target {
         crate::window_groups::join(app, target.label(), window.label())?;
         return Ok(window);
@@ -839,6 +955,93 @@ pub fn cycle(app: &AppHandle, current: &str, forward: bool) {
     }
 }
 
+/// An auxiliary window to open over its parent.
+pub struct AuxWindow {
+    pub kind: AuxKind,
+    pub title: &'static str,
+    pub size: (f64, f64),
+    pub min_size: (f64, f64),
+    pub launch: Launch,
+    /// `#rrggbb` painted until the page has loaded (the theme's frame colour).
+    pub background: Option<String>,
+}
+
+/// Opens an auxiliary window of `caller`'s project window, centred over it. A kind with one window
+/// per parent reuses it: the new launch is handed over ([`LAUNCH_EVENT`]) and the window focused.
+pub fn open_auxiliary_window(app: &AppHandle, caller: &WebviewWindow, aux: AuxWindow) -> IdeResult<()> {
+    // Asked from an auxiliary window itself: open it for that window's parent.
+    let parent_label = auxiliary_parent(caller.label()).unwrap_or(caller.label()).to_owned();
+    if aux.kind.needs_project() {
+        let state = app.state::<AppState>();
+        if state.project(&parent_label).is_err() && state.remote_dev.get(&parent_label).is_none() {
+            return Err(IdeError::not_found("no project is open"));
+        }
+    }
+    let windows = app.state::<WindowsState>();
+    let label = if aux.kind.multiple() {
+        format!("{}-{parent_label}-{}", aux.kind.name(), windows.aux_serial.fetch_add(1, Ordering::Relaxed))
+    } else {
+        format!("{}-{parent_label}", aux.kind.name())
+    };
+    if let Some(existing) = app.get_webview_window(&label) {
+        if aux.launch != Launch::default() {
+            windows.set_launch(&label, aux.launch);
+            let _ = app.emit_to(label.as_str(), LAUNCH_EVENT, ());
+        }
+        focus(&existing);
+        return Ok(());
+    }
+    let parent = app.get_webview_window(&parent_label).ok_or_else(|| IdeError::not_found("no parent window"))?;
+    let mut config = window_config(app)?;
+    config.label = label.clone();
+    config.title = aux.title.into();
+    // Frameless on Windows and Linux like project windows (tauri.<os>.conf.json): the page draws
+    // the title bar in the app theme instead of a system caption that follows the OS theme.
+    (config.width, config.height) = aux.size;
+    (config.min_width, config.min_height) = (Some(aux.min_size.0), Some(aux.min_size.1));
+    config.center = false;
+    config.visible = false;
+    config.maximized = false;
+    config.fullscreen = false;
+    config.drag_drop_enabled = false;
+    // Paint the theme's frame colour before the page loads.
+    if let Some(color) = aux.background.as_deref().and_then(hex_color) {
+        config.background_color = Some(color);
+    }
+    windows.set_launch(&label, aux.launch);
+    #[cfg(target_os = "linux")]
+    crate::linux_window_state::prepare(app, &mut config);
+    let builder = WebviewWindowBuilder::from_config(app, &config);
+    // Windows: an owned child (WS_POPUP) of a borderless parent gets no DWM
+    // shadow, leaving the frameless window flat against its parent.
+    // Ownership is tracked by the `<kind>-<parent>` label instead
+    // (parent-close cleanup, menu modality), so only Linux keeps the native
+    // parent link. AppKit child windows can disappear when dragged to another
+    // display's Space, so macOS keeps it too.
+    #[cfg(target_os = "linux")]
+    let builder = builder.and_then(|b| b.parent(&parent));
+    let window = builder.and_then(|b| dev_font_preferences(b).build()).map_err(|e| {
+        windows.forget(&label);
+        IdeError::internal(format!("cannot create {} window: {e}", aux.kind.name()))
+    })?;
+    #[cfg(target_os = "linux")]
+    decorate_csd(&window);
+    apply_zoom(app, &window);
+    #[cfg(target_os = "macos")]
+    align_titlebar(app, &window);
+    // Restore runs during build; fit its size to the parent's current display before showing.
+    #[cfg(target_os = "macos")]
+    if let Err(e) = fit_over_parent(&window, &parent, aux.min_size) {
+        tracing::warn!("cannot fit {} window: {e}", aux.kind.name());
+    }
+    #[cfg(not(target_os = "macos"))]
+    if let Err(e) = place_over_parent(&window, &parent) {
+        tracing::warn!("cannot place {} window: {e}", aux.kind.name());
+    }
+    focus(&window);
+    Ok(())
+}
+
 /// Opens (or focuses) the settings window of `parent` showing `page`: a
 /// separate window centred over its parent, sized like IDEA's Settings.
 pub fn open_settings_window(
@@ -848,71 +1051,69 @@ pub fn open_settings_window(
     new_projects: bool,
     background: Option<String>,
 ) -> IdeResult<()> {
-    // Asked from a settings window itself: navigate it.
-    let parent_label = settings_parent(parent.label()).unwrap_or(parent.label()).to_owned();
-    let label = settings_label(&parent_label);
-    let windows = app.state::<WindowsState>();
-    if let Some(existing) = app.get_webview_window(&label) {
-        if page.is_some() || new_projects {
-            windows.set_launch(&label, Launch { settings_page: page, new_projects, ..Default::default() });
-            let _ = app.emit_to(label.as_str(), LAUNCH_EVENT, ());
-        }
-        focus(&existing);
-        return Ok(());
-    }
-    let parent = app.get_webview_window(&parent_label).ok_or_else(|| IdeError::not_found("no parent window"))?;
-    let mut config = window_config(app)?;
-    config.label = label.clone();
-    config.title = "Settings".into();
-    // Frameless on Windows and Linux like project windows (tauri.<os>.conf.json): the page draws
-    // the title bar in the app theme instead of a system caption that follows the OS theme.
-    (config.width, config.height) = SETTINGS_SIZE;
-    (config.min_width, config.min_height) = (Some(SETTINGS_MIN_SIZE.0), Some(SETTINGS_MIN_SIZE.1));
-    config.center = false;
-    config.visible = false;
-    config.maximized = false;
-    config.fullscreen = false;
-    config.drag_drop_enabled = false;
-    // Paint the theme's frame colour before the page loads.
-    if let Some(color) = background.as_deref().and_then(hex_color) {
-        config.background_color = Some(color);
-    }
-    windows.set_launch(&label, Launch { settings_page: page, new_projects, ..Default::default() });
-    #[cfg(target_os = "linux")]
-    crate::linux_window_state::prepare(app, &mut config);
-    let builder = WebviewWindowBuilder::from_config(app, &config);
-    // Windows: an owned child (WS_POPUP) of a borderless parent gets no DWM
-    // shadow, leaving the frameless settings window flat against its parent.
-    // Ownership is tracked by the `settings-<parent>` label instead
-    // (parent-close cleanup, menu modality), so only Linux keeps the native
-    // parent link. AppKit child windows can disappear when dragged to another
-    // display's Space, so macOS keeps it too.
-    #[cfg(target_os = "linux")]
-    let builder = builder.and_then(|b| b.parent(&parent));
-    let window = builder
-        .and_then(|b| dev_font_preferences(b).build())
-        .map_err(|e| IdeError::internal(format!("cannot create settings window: {e}")))?;
-    #[cfg(target_os = "linux")]
-    decorate_csd(&window);
-    apply_zoom(app, &window);
-    #[cfg(target_os = "macos")]
-    align_titlebar(app, &window);
-    // Restore runs during build; fit its size to the parent's current display before showing.
-    #[cfg(target_os = "macos")]
-    if let Err(e) = fit_settings_window(&window, &parent) {
-        tracing::warn!("cannot fit settings window: {e}");
-    }
-    #[cfg(not(target_os = "macos"))]
-    if let Err(e) = place_settings_window(&window, &parent) {
-        tracing::warn!("cannot place settings window: {e}");
-    }
-    focus(&window);
-    Ok(())
+    open_auxiliary_window(
+        app,
+        parent,
+        AuxWindow {
+            kind: AuxKind::Settings,
+            title: "Settings",
+            size: SETTINGS_SIZE,
+            min_size: SETTINGS_MIN_SIZE,
+            launch: Launch { settings_page: page, new_projects, ..Default::default() },
+            background,
+        },
+    )
+}
+
+/// Opens a window listing the files that differ between two revisions (Compare with Local and
+/// friends), next to its project window like IDEA's diff windows.
+pub fn open_comparison_window(
+    app: &AppHandle,
+    parent: &WebviewWindow,
+    comparison: ComparisonLaunch,
+    background: Option<String>,
+) -> IdeResult<()> {
+    open_auxiliary_window(
+        app,
+        parent,
+        AuxWindow {
+            kind: AuxKind::Comparison,
+            title: "Compare",
+            size: COMPARISON_SIZE,
+            min_size: COMPARISON_MIN_SIZE,
+            launch: Launch { comparison: Some(Box::new(comparison)), ..Default::default() },
+            background,
+        },
+    )
+}
+
+/// Opens (or focuses and hands over to) the project window's Sync with Deployed window: local
+/// files next to their copies on a deployment server, like IDEA's.
+pub fn open_deployment_window(
+    app: &AppHandle,
+    parent: &WebviewWindow,
+    server: String,
+    paths: Vec<PathBuf>,
+    background: Option<String>,
+) -> IdeResult<()> {
+    let paths = paths.into_iter().map(Into::into).collect();
+    open_auxiliary_window(
+        app,
+        parent,
+        AuxWindow {
+            kind: AuxKind::Deployment,
+            title: "Sync with Deployed",
+            size: DEPLOYMENT_SIZE,
+            min_size: DEPLOYMENT_MIN_SIZE,
+            launch: Launch { deployment: Some(DeploymentLaunch { server, paths }), ..Default::default() },
+            background,
+        },
+    )
 }
 
 /// Fit outer bounds, including native decorations, using one monitor's logical coordinate space.
 #[cfg(target_os = "macos")]
-fn fit_settings_window(window: &WebviewWindow, parent: &WebviewWindow) -> tauri::Result<()> {
+fn fit_over_parent(window: &WebviewWindow, parent: &WebviewWindow, min_size: (f64, f64)) -> tauri::Result<()> {
     let Some(monitor) = parent.current_monitor()?.or(parent.primary_monitor()?) else {
         return Ok(());
     };
@@ -935,8 +1136,8 @@ fn fit_settings_window(window: &WebviewWindow, parent: &WebviewWindow) -> tauri:
     // A small work area takes precedence over the usual minimum window size.
     window.set_min_size(Some(
         tauri::LogicalSize::new(
-            SETTINGS_MIN_SIZE.0.min((available.width - frame.0).max(1.0)),
-            SETTINGS_MIN_SIZE.1.min((available.height - frame.1).max(1.0)),
+            min_size.0.min((available.width - frame.0).max(1.0)),
+            min_size.1.min((available.height - frame.1).max(1.0)),
         )
         .to_physical::<u32>(scale),
     ))?;
@@ -953,7 +1154,7 @@ fn fit_settings_window(window: &WebviewWindow, parent: &WebviewWindow) -> tauri:
 /// may still be on another display with a different scale, so its size is converted with its own
 /// scale and its position is given in physical pixels.
 #[cfg(not(target_os = "macos"))]
-pub(super) fn place_settings_window(window: &WebviewWindow, parent: &WebviewWindow) -> tauri::Result<()> {
+pub(super) fn place_over_parent(window: &WebviewWindow, parent: &WebviewWindow) -> tauri::Result<()> {
     // Placement setters leave maximized mode. Fit the restored frame, then reapply the saved state.
     // A restored fullscreen window already covers its display and must not be fitted to the work area.
     if window.is_fullscreen()? {
@@ -1340,12 +1541,18 @@ mod tests {
     }
 
     #[test]
-    fn settings_windows_map_to_their_parent() {
+    fn auxiliary_windows_map_to_their_parent() {
         assert_eq!(settings_label("project-2"), "settings-project-2");
-        assert_eq!(settings_parent("settings-main"), Some("main"));
-        assert_eq!(settings_parent("main"), None);
-        assert!(is_settings_window("settings-project-1"));
-        assert!(!is_settings_window("project-1"));
+        assert_eq!(auxiliary("settings-main"), Some((AuxKind::Settings, "main")));
+        assert_eq!(auxiliary("comparison-project-2-14"), Some((AuxKind::Comparison, "project-2")));
+        assert_eq!(auxiliary("deployment-project-2"), Some((AuxKind::Deployment, "project-2")));
+        for label in ["main", "project-1", "comparison-main", "comparison-main-x", "settings-", "settingsmain"] {
+            assert_eq!(auxiliary(label), None, "{label}");
+        }
+        assert_eq!(state_key("comparison-main-3"), "comparison");
+        assert_eq!(state_key("project-3"), "project-3");
+        let labels = ["comparison-main-0", "project-2", "main", "settings-main", "deployment-project-2"];
+        assert_eq!(sorted_labels(labels.into_iter().filter(|l| auxiliary_parent(l).is_none())), ["main", "project-2"]);
     }
 
     #[test]
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index e4f640aa..b8522510 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "OpenIDEA",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "identifier": "ai.l0ng.openidea",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/src/bindings.ts b/src/bindings.ts
index ab0d32e5..93bbd908 100644
--- a/src/bindings.ts
+++ b/src/bindings.ts
@@ -42,6 +42,7 @@ export const commands = {
 	isGit: boolean,
 	settings: Settings_Serialize,
 	workspace?: Workspace_Serialize | null,
+	unity?: UnityProjectInfo | null,
 } | null>("project_current"),
 	closeProject: () => __TAURI_INVOKE<void>("close_project"),
 	languages: () => __TAURI_INVOKE<LanguageInfo_Serialize[]>("languages"),
@@ -324,9 +325,12 @@ export const commands = {
 	/**  Quits through every window's unsaved-changes check, then starts again. */
 	appRestart: () => __TAURI_INVOKE<void>("app_restart"),
 	indexStatus: () => typedError<IndexStatus, IdeError>(__TAURI_INVOKE("index_status")),
+	indexFileExtensions: () => typedError<ExtensionCount[], IdeError>(__TAURI_INVOKE("index_file_extensions")),
 	/**  Spring Web mapping sources for the request-path index of Search Everywhere. */
 	springRouteSources: () => typedError<RouteSource[], IdeError>(__TAURI_INVOKE("spring_route_sources")),
 	findFiles: (query: string, limit: number) => typedError<FileMatch[], IdeError>(__TAURI_INVOKE("find_files", { query, limit })),
+	/**  Folders holding indexed files, for `@` references. */
+	findDirs: (query: string, limit: number) => typedError<FileMatch[], IdeError>(__TAURI_INVOKE("find_dirs", { query, limit })),
 	findSymbols: (query: string, filter: SymbolFilter, limit: number) => typedError<SymbolMatch[], IdeError>(__TAURI_INVOKE("find_symbols", { query, filter, limit })),
 	markRecent: (path: string) => typedError<null, IdeError>(__TAURI_INVOKE("mark_recent", { path })),
 	/**  Recently opened files, most recent first (⌘E). */
@@ -418,6 +422,10 @@ export const commands = {
 } | null, IdeError>(__TAURI_INVOKE("lsp_prepare_rename", { doc, pos })),
 	/**  Computes the rename edit without applying it, so the UI can preview conflicts. */
 	lspRename: (request: RequestId, doc: DocId, pos: Pos, newName: string) => typedError<Renamed, IdeError>(__TAURI_INVOKE("lsp_rename", { request, doc, pos, newName })),
+	/**  The class at `pos` and the members Pull Members Up / Push Members Down can move. */
+	lspHierarchyMembers: (request: RequestId, doc: DocId, pos: Pos, kind: HierarchyRefactoring) => typedError<HierarchyMembers, IdeError>(__TAURI_INVOKE("lsp_hierarchy_members", { request, doc, pos, kind })),
+	/**  Checks Pull Members Up / Push Members Down and computes the edit without applying it. */
+	lspHierarchyRefactor: (request: RequestId, doc: DocId, pos: Pos, kind: HierarchyRefactoring, target: string | null, choices: HierarchyChoice[]) => typedError<HierarchyRefactored, IdeError>(__TAURI_INVOKE("lsp_hierarchy_refactor", { request, doc, pos, kind, target, choices })),
 	lspFormat: (doc: DocId, range: {
 	start: Pos,
 	end: Pos,
@@ -463,7 +471,20 @@ export const commands = {
 	vcsLineHunks: (path: string) => typedError<LineHunk[], IdeError>(__TAURI_INVOKE("vcs_line_hunks", { path })),
 	vcsFileAt: (path: string, rev: string | null) => typedError<string | null, IdeError>(__TAURI_INVOKE("vcs_file_at", { path, rev })),
 	vcsBlame: (path: string, text: string | null, revision: string | null) => typedError<BlameLine[], IdeError>(__TAURI_INVOKE("vcs_blame", { path, text, revision })),
-	vcsLog: (repo: string | null, query: LogQuery) => typedError<Commit[], IdeError>(__TAURI_INVOKE("vcs_log", { repo, query })),
+	/**
+	 *  History for Selection: commits that changed `lines` (0-based, inclusive) of `path`'s
+	 *  editor text. Cancellable with `cancel_request(request)`.
+	 */
+	vcsBlockHistory: (request: RequestId, path: string, text: string | null, lines: [number, number]) => typedError<BlockHistory, IdeError>(__TAURI_INVOKE("vcs_block_history", { request, path, text, lines })),
+	vcsLog: (repo: string | null, query: LogQuery) => typedError<Commit_Serialize[], IdeError>(__TAURI_INVOKE("vcs_log", { repo, query })),
+	vcsLogRefs: (repo: string | null) => typedError<{ [key in string]: string }, IdeError>(__TAURI_INVOKE("vcs_log_refs", { repo })),
+	vcsLogUsers: (repo: string | null) => typedError<string[], IdeError>(__TAURI_INVOKE("vcs_log_users", { repo })),
+	vcsOpenExternalLog: (path: string) => typedError<IpcPath, IdeError>(__TAURI_INVOKE("vcs_open_external_log", { path })),
+	vcsLogDetails: (repo: string | null, revision: string) => typedError<LogDetails, IdeError>(__TAURI_INVOKE("vcs_log_details", { repo, revision })),
+	vcsLogDetailsBatch: (repo: string | null, revisions: string[], request: RequestId) => typedError<LogDetails[], IdeError>(__TAURI_INVOKE("vcs_log_details_batch", { repo, revisions, request })),
+	vcsLogIndex: (repo: string | null, request: number | null) => typedError<LogIndexProgress, IdeError>(__TAURI_INVOKE("vcs_log_index", { repo, request })),
+	vcsRevisionChildren: (repo: string | null, revision: string, directory: string) => typedError<string[], IdeError>(__TAURI_INVOKE("vcs_revision_children", { repo, revision, directory })),
+	vcsRevisionFiles: (repo: string | null, revision: string) => typedError<string[], IdeError>(__TAURI_INVOKE("vcs_revision_files", { repo, revision })),
 	vcsCommitFiles: (repo: string | null, commit: string) => typedError<ChangedFile[], IdeError>(__TAURI_INVOKE("vcs_commit_files", { repo, commit })),
 	/**  Combined changes of several commits, `commits` oldest first. */
 	vcsCommitsChanges: (repo: string | null, commits: string[]) => typedError<RevisionChange[], IdeError>(__TAURI_INVOKE("vcs_commits_changes", { repo, commits })),
@@ -609,6 +630,8 @@ export const commands = {
 	runResize: (id: RunId, cols: number, rows: number) => typedError<null, IdeError>(__TAURI_INVOKE("run_resize", { id, cols, rows })),
 	/**  Writes the Gradle init script adding `jvm_args` to the JVMs the build forks; returns its path. */
 	runGradleJvmArgsScript: (jvmArgs: string[]) => typedError<string, IdeError>(__TAURI_INVOKE("run_gradle_jvm_args_script", { jvmArgs })),
+	/**  Writes one of the IDE's Gradle init scripts where the build runs; returns its path. */
+	runGradleInitScript: (name: string, text: string) => typedError<string, IdeError>(__TAURI_INVOKE("run_gradle_init_script", { name, text })),
 	runTomcatHome: (home: string) => typedError<TomcatHome, IdeError>(__TAURI_INVOKE("run_tomcat_home", { home })),
 	runTomcatArtifacts: () => typedError<WebArtifact[], IdeError>(__TAURI_INVOKE("run_tomcat_artifacts")),
 	runTomcatBuild: (config: RunConfig_Deserialize) => typedError<({
@@ -641,12 +664,16 @@ export const commands = {
 	runTestReports: (module: string | null, sinceMs: number | null) => typedError<TestCaseReport[], IdeError>(__TAURI_INVOKE("run_test_reports", { module, sinceMs })),
 	/**  Maven and Gradle projects of the window's project, from the build files plus the last sync. */
 	buildModel: () => typedError<BuildModel, IdeError>(__TAURI_INVOKE("build_model")),
+	gradleLinkProjects: (paths: string[]) => typedError<BuildModel, IdeError>(__TAURI_INVOKE("gradle_link_projects", { paths })),
+	gradleUnlinkProjects: (paths: string[]) => typedError<BuildModel, IdeError>(__TAURI_INVOKE("gradle_unlink_projects", { paths })),
 	/**
 	 *  Runs Maven (`help:effective-pom dependency:tree`) or Gradle (`tasks --all`) in the
 	 *  background, reporting progress on `on_progress`; cancellable with `cancel_request(request)`.
 	 *  Returns the refreshed model; a failed build is reported in its `syncError`.
 	 */
-	buildSync: (tool: BuildTool, request: RequestId, offline: boolean, profiles: string[], onProgress: Channel<SyncProgress>) => typedError<BuildModel, IdeError>(__TAURI_INVOKE("build_sync", { tool, request, offline, profiles, onProgress })),
+	buildSync: (tool: BuildTool, request: RequestId, offline: boolean, profiles: string[], buildDir: string | null, onProgress: Channel<SyncProgress>) => typedError<BuildModel, IdeError>(__TAURI_INVOKE("build_sync", { tool, request, offline, profiles, buildDir, onProgress })),
+	/**  The resolved dependency tree of a Gradle project for one configuration (Dependency Analyzer). */
+	gradleDependencies: (gradlePath: string, configuration: string, offline: boolean, request: RequestId, buildDir: string | null) => typedError<GradleDependency[], IdeError>(__TAURI_INVOKE("gradle_dependencies", { gradlePath, configuration, offline, request, buildDir })),
 	/**
 	 *  The `.toml` of a version catalog the build imports as `group:artifact:version`, once a
 	 *  build has downloaded it.
@@ -725,6 +752,8 @@ export const commands = {
 	sdkDetect: (kind: SdkKind) => typedError<Sdk[], IdeError>(__TAURI_INVOKE("sdk_detect", { kind })),
 	/**  The interpreter the project uses: the configured one, else its virtualenv. */
 	sdkPythonEffective: () => typedError<string | null, IdeError>(__TAURI_INVOKE("sdk_python_effective")),
+	/**  The PHP language level of the project `path` belongs to: the effective one and Auto's. */
+	sdkPhpLanguageLevel: (path: string) => typedError<PhpLanguageLevels, IdeError>(__TAURI_INVOKE("sdk_php_language_level", { path })),
 	/**
 	 *  SDK / library source folders shown under "External Libraries" in the Project view,
 	 *  with the Maven / Gradle dependency jars of the build model.
@@ -769,11 +798,28 @@ export const commands = {
 	 *  `background` (`#rrggbb`) paints a new window until its page has loaded.
 	 */
 	windowOpenSettings: (page: string | null, newProjects: boolean, background: string | null) => typedError<null, IdeError>(__TAURI_INVOKE("window_open_settings", { page, newProjects, background })),
+	/**
+	 *  Opens a window listing the files that differ between two revisions of this window's project.
+	 *  `background` (`#rrggbb`) paints it until its page has loaded.
+	 */
+	windowOpenComparison: (comparison: ComparisonLaunch, background: string | null) => typedError<null, IdeError>(__TAURI_INVOKE("window_open_comparison", { comparison, background })),
+	/**
+	 *  Opens this window's Sync with Deployed window comparing `paths` with `server` (or hands them
+	 *  to the open one). `background` (`#rrggbb`) paints a new window until its page has loaded.
+	 */
+	windowOpenDeployment: (server: string, paths: string[], background: string | null) => typedError<null, IdeError>(__TAURI_INVOKE("window_open_deployment", { server, paths, background })),
 	/**  Focuses the next / previous window (⌘` / ⇧⌘`). */
 	windowCycle: (forward: boolean) => __TAURI_INVOKE<void>("window_cycle", { forward }),
 	windowToggleFullscreen: () => typedError<boolean, IdeError>(__TAURI_INVOKE("window_toggle_fullscreen")),
 	/**  Height of the web title bar in native logical pixels (CSS height × IDE zoom). */
 	windowSetTitlebarHeight: (height: number | null) => typedError<null, IdeError>(__TAURI_INVOKE("window_set_titlebar_height", { height })),
+	/**
+	 *  Starts dragging `window` while the primary mouse button is still down; returns whether a drag began.
+	 * 
+	 *  macOS WebKit can deliver a tap's `mousedown` after the button is already up. AppKit would then run
+	 *  its drag loop with no release left to end it, and the window follows the pointer until the next click.
+	 */
+	windowStartDrag: () => typedError<boolean, IdeError>(__TAURI_INVOKE("window_start_drag")),
 	/**  What this window was opened for (taken once). */
 	windowTakeLaunch: () => __TAURI_INVOKE<{
 	/**  Project folder to open. */
@@ -791,6 +837,10 @@ export const commands = {
 	newProjects: boolean,
 	/**  Where to place the caret in some of `files` (`openidea --line 12 --column 5 <file>`). */
 	positions?: FilePosition[],
+	/**  Comparison windows: the revisions to compare (boxed: most launches have none). */
+	comparison?: ComparisonLaunch | null,
+	/**  Deployment windows: the server and local selection to compare. */
+	deployment?: DeploymentLaunch | null,
 } | null>("window_take_launch"),
 	windowCloseContext: () => __TAURI_INVOKE<CloseContext>("window_close_context"),
 	/**  Projects open in project windows, in window order (title bar project widget). */
@@ -958,7 +1008,7 @@ export const commands = {
 	pluginWebReadFile: (path: string) => typedError<string, IdeError>(__TAURI_INVOKE("plugin_web_read_file", { path })),
 	/**  Gutter markers of plugin `line-markers` providers for an open document. */
 	pluginLineMarkers: (doc: DocId) => typedError<LineMarkerInfo[], IdeError>(__TAURI_INVOKE("plugin_line_markers", { doc })),
-	/**  The marketplace's plugins: read again when `refresh`, else the last index read. */
+	/**  The marketplace's plugins: read again when `refresh` or when none was read yet, else the last index read. */
 	pluginMarket: (refresh: boolean) => typedError<MarketPlugin[], IdeError>(__TAURI_INVOKE("plugin_market", { refresh })),
 	pluginMarketUrl: () => __TAURI_INVOKE<string | null>("plugin_market_url"),
 	/**  Sets the marketplace index URL (an `https://…/index.json` or a local path; `None` for the default). */
@@ -967,6 +1017,12 @@ export const commands = {
 	pluginMarketDownload: (id: string) => typedError<string, IdeError>(__TAURI_INVOKE("plugin_market_download", { id })),
 	/**  Unpacks a package file (`.oiplugin` or `.zip`); returns the folder for the install page. */
 	pluginUnpackPackage: (path: string) => typedError<string, IdeError>(__TAURI_INVOKE("plugin_unpack_package", { path })),
+	/**  Reads an IntelliJ theme plugin (`.jar`, Marketplace `.zip`, plugin folder) or `.theme.json` to import. */
+	pluginReadIntellijTheme: (path: string) => typedError<IntellijThemeSource, IdeError>(__TAURI_INVOKE("plugin_read_intellij_theme", { path })),
+	/**  Theme plugins installed in the JetBrains IDEs of this user, the ones in use first. */
+	pluginInstalledIntellijThemes: () => typedError<InstalledIntellijTheme[], IdeError>(__TAURI_INVOKE("plugin_installed_intellij_themes")),
+	/**  Writes a package the UI generated (an imported theme); returns the folder for the install page. */
+	pluginStagePackage: (name: string, files: PackageFile[]) => typedError<string, IdeError>(__TAURI_INVOKE("plugin_stage_package", { name, files })),
 	/**  Goes back to the version the last update of `id` replaced. */
 	pluginRollBack: (id: string) => typedError<PluginInfo, IdeError>(__TAURI_INVOKE("plugin_roll_back", { id })),
 	pluginSecrets: (pluginId: string) => typedError<PluginSecretState[], IdeError>(__TAURI_INVOKE("plugin_secrets", { pluginId })),
@@ -1580,6 +1636,7 @@ export type AppearanceSettings = {
 	preferredDarkTheme?: string,
 	/**  A plugin's file icon theme (`<plugin-id>/<theme-id>`); empty = the built-in icons. */
 	fileIconTheme?: string,
+	fileIconThemeOptions?: { [key in string]: FileIconThemeOptions },
 	/**  IDE zoom in percent (50–300). */
 	zoom?: number,
 	/**  Apply `ui_font_family` / `ui_font_size` (otherwise the theme's). */
@@ -1681,6 +1738,31 @@ export type BlameLine = {
 	summary: string,
 };
 
+/**  History for Selection: the commits that changed a block of lines, newest first. */
+export type BlockHistory = {
+	/**  The selected lines in HEAD (0-based, inclusive); None when none of them is committed. */
+	headLines: [number, number] | null,
+	revisions: BlockRevision[],
+};
+
+/**  A commit that changed the block, with the block in its first parent and in it. */
+export type BlockRevision = {
+	id: string,
+	shortId: string,
+	author: string,
+	email: string,
+	timeMs: number | null,
+	summary: string,
+	/**  Repository-relative path of the file in this commit (before a later rename). */
+	path: string,
+	/**  The block before the commit; empty when the commit added it. */
+	before: string,
+	after: string,
+	/**  0-based first line of the block before and after the commit. */
+	beforeLine: number,
+	afterLine: number,
+};
+
 export type Branch = {
 	name: string,
 	remote: boolean,
@@ -1778,7 +1860,7 @@ export type BuildMessage = {
 /**  The build systems of a project; `None` when the project does not use one. */
 export type BuildModel = {
 	maven: MavenModel | null,
-	gradle: GradleModel | null,
+	gradle?: GradleModel[],
 };
 
 export type BuildResult = {
@@ -2056,24 +2138,7 @@ export type CommandForm = {
 	formAnswers: FormAnswer[],
 };
 
-export type Commit = {
-	id: string,
-	shortId: string,
-	parents: string[],
-	author: string,
-	email: string,
-	timeMs: number | null,
-	summary: string,
-	message: string,
-	refs: string[],
-	/**  Committer time (Log › View Options › Commit Timestamp). */
-	commitTimeMs?: number | null,
-	/**
-	 *  Per parent, under a user or text filter: the link passes commits the filter hides
-	 *  (`parents` then name the nearest shown ancestors). Empty when no parent is rewritten.
-	 */
-	dashed?: boolean[],
-};
+export type Commit = Commit_Serialize | Commit_Deserialize;
 
 /**  Commit Options (IDEA's commit options popup). */
 export type CommitOptions = {
@@ -2114,6 +2179,64 @@ export type CommitSettings = {
 	wrapAtMargin?: boolean,
 };
 
+export type Commit_Deserialize = {
+	id: string,
+	shortId: string,
+	parents: string[],
+	/**  Connections in the filtered graph; never use these as revision/diff parents. */
+	graphParents?: string[] | null,
+	graphDashed?: boolean[],
+	/**  Repository-relative filename at this revision in rename-following history. */
+	historyPath?: string | null,
+	logPosition?: number | null,
+	logTotal?: number | null,
+	graphBoundaryParents?: string[],
+	/**  Reachability from HEAD, computed independently of the visible filters. */
+	onCurrentBranch?: boolean | null,
+	author: string,
+	email: string,
+	committer?: string,
+	committerEmail?: string,
+	timeMs: number | null,
+	summary: string,
+	message: string,
+	messageTruncated?: boolean,
+	refs: string[],
+	/**  Committer time (Log › View Options › Commit Timestamp). */
+	commitTimeMs?: number | null,
+	/**  Legacy alias of `graph_dashed`, indexed by displayed parents. */
+	dashed?: boolean[],
+};
+
+export type Commit_Serialize = {
+	id: string,
+	shortId: string,
+	parents: string[],
+	/**  Connections in the filtered graph; never use these as revision/diff parents. */
+	graphParents?: string[] | null,
+	graphDashed?: boolean[],
+	/**  Repository-relative filename at this revision in rename-following history. */
+	historyPath?: string | null,
+	logPosition?: number | null,
+	logTotal?: number | null,
+	graphBoundaryParents?: string[],
+	/**  Reachability from HEAD, computed independently of the visible filters. */
+	onCurrentBranch?: boolean | null,
+	author: string,
+	email: string,
+	committer: string,
+	committerEmail: string,
+	timeMs: number | null,
+	summary: string,
+	message: string,
+	messageTruncated: boolean,
+	refs: string[],
+	/**  Committer time (Log › View Options › Commit Timestamp). */
+	commitTimeMs: number | null,
+	/**  Legacy alias of `graph_dashed`, indexed by displayed parents. */
+	dashed?: boolean[],
+};
+
 export type CompareResult = {
 	repositories: RepositoryComparison[],
 	skippedPaths: IpcPath[],
@@ -2126,6 +2249,26 @@ export type CompareScope = {
 	singleFile: boolean,
 };
 
+/**  Files that differ between `from` and `to` (the working tree when `None`). */
+export type ComparisonLaunch = {
+	from: ComparisonRevision,
+	to: ComparisonRevision | null,
+	scope: ComparisonScope | null,
+	repo: IpcPath | null,
+};
+
+/**  A Git revision and how the comparison window names it. */
+export type ComparisonRevision = {
+	rev: string,
+	label: string,
+};
+
+/**  Limits a comparison to some paths (Compare with Branch on a selection). */
+export type ComparisonScope = {
+	paths: IpcPath[],
+	repositories: IpcPath[] | null,
+};
+
 export type CompletionItem = {
 	label: string,
 	/**  e.g. `(req: CreateOrderRequest)` shown right after the label. */
@@ -2192,6 +2335,11 @@ export type Consent = {
 	 *  ones are implied by consenting at all.
 	 */
 	optional: string[],
+	/**
+	 *  The user accepted a package signed by another key than the installed
+	 *  copy ([`InstallPreview::signer_changed`]).
+	 */
+	signerChange?: boolean,
 };
 
 /**  Build, Execution, Deployment › Console. */
@@ -2341,6 +2489,11 @@ export type DataSource = {
 	options?: DbOptions,
 	introspection?: DbIntrospection,
 	properties?: DbProperty[],
+	/**
+	 *  Stored app-wide and listed in every project. Implied by the file it is read from,
+	 *  so not written to it.
+	 */
+	global?: boolean,
 };
 
 /**  System Settings › Date Formats (Git log, Local History, blame). */
@@ -2405,7 +2558,7 @@ export type DbDriver = "sqlite" | "postgres" |
 /**  MySQL and MariaDB. */
 "mysql" | 
 /**  Microsoft SQL Server. */
-"sqlServer";
+"sqlServer" | "clickhouse";
 
 /**  `schema.table (columns) REFERENCES ref_schema.ref_table (ref_columns)`. */
 export type DbForeignKey = {
@@ -2701,6 +2854,13 @@ export type DeploymentCoverage = {
 	skipped: TransferError[],
 };
 
+/**  Local files to compare with a deployment server (Sync with Deployed). */
+export type DeploymentLaunch = {
+	/**  Deployment server id. */
+	server: string,
+	paths: IpcPath[],
+};
+
 export type DeploymentMapping = {
 	/**  Project-relative folder, or absolute inside the project; empty = the project root. */
 	local?: string,
@@ -3272,6 +3432,12 @@ export type ExpressionAt = {
 	hasError: boolean,
 };
 
+/**  How many indexed files share an extension (lower case, without the dot). */
+export type ExtensionCount = {
+	extension: string,
+	files: number,
+};
+
 /**  A formatter that runs outside the language servers, with its own settings group. */
 export type ExternalFormatter = "prettier" | "oxfmt";
 
@@ -3338,6 +3504,27 @@ export type FileEntry = {
 	targetKind?: EntryKind | null,
 };
 
+/**
+ *  Main toolbar entries per side, in order: title widget ids (`project`,
+ *  `vcs.branch`…) or `action:<id>`. Widgets in neither list nor `hidden`
+ *  (registered later) keep their default place.
+ */
+export type FileIconThemeOptions = {
+	groups?: { [key in string]: boolean },
+	choices?: { [key in string]: string },
+	hideFiles?: boolean,
+	hideFolders?: boolean,
+	hollowFolders?: boolean,
+	hideUiIcons?: boolean,
+	hidePsiIcons?: boolean,
+	monochrome?: string | null,
+	saturation?: number | null,
+	opacity?: number | null,
+	iconSize?: number | null,
+	rowHeight?: number | null,
+	accent?: string | null,
+};
+
 /**  Identifier occurrences in one file (`identifiers_in_files`). */
 export type FileIdentifiers = {
 	path: IpcPath,
@@ -3672,6 +3859,27 @@ export type GoSettings = {
 
 export type GotoKind = "definition" | "declaration" | "typeDefinition" | "implementation";
 
+/**  One line of the report: an occurrence of a dependency where it is requested. */
+export type GradleDependency = {
+	/**  `group`, empty for a project dependency. */
+	group: string,
+	/**  Artifact name, or the project path (`:core`) of a project dependency. */
+	name: string,
+	/**  The version asked for here; `None` when a platform or constraint supplies it. */
+	requested: string | null,
+	/**  The version Gradle selected (`-> 1.2`), when it differs from the request. */
+	selected: string | null,
+	/**  A project of the build (`project :core`, or a module substituted by one). */
+	project: boolean,
+	/**  `(*)`: listed with its dependencies earlier in the tree. */
+	repeated: boolean,
+	/**  `(c)`: a dependency constraint rather than a dependency. */
+	constraint: boolean,
+	/**  `(n)` / `FAILED`: not resolved. */
+	unresolved: boolean,
+	children: GradleDependency[],
+};
+
 export type GradleDistribution = "wrapper" | "local";
 
 export type GradleModel = {
@@ -3718,6 +3926,8 @@ export type GradleRunUsing =
 
 /**  Build Tools › Gradle. */
 export type GradleSettings = {
+	/**  Linked build directories; absent preserves automatic discovery, empty unlinks all builds. */
+	linkedProjects?: string[] | null,
 	/**  Empty = Project JDK; otherwise a JDK home. */
 	jvm?: string,
 	distribution?: GradleDistribution,
@@ -3736,6 +3946,19 @@ export type GradleTask = {
 	description: string | null,
 };
 
+export type HierarchyChoice = {
+	id: string,
+	makeAbstract: boolean,
+};
+
+export type HierarchyClass = {
+	/**  Server-owned identity, passed back as the pull-up destination. */
+	id: string,
+	name: string,
+	qualifiedName: string,
+	interface: boolean,
+};
+
 export type HierarchyDirection = 
 /**  Callers / supertypes. */
 "incoming" | 
@@ -3756,6 +3979,38 @@ export type HierarchyItem = {
 	fromRanges: Range[],
 };
 
+export type HierarchyMember = {
+	id: string,
+	/**  `name(Params) : Type`, as the server renders it. */
+	label: string,
+	kind: HierarchyMemberKind,
+	/**  The member at the caret. */
+	selected: boolean,
+	/**  Can be declared abstract in the destination (pull up) or kept abstract (push down). */
+	abstractable: boolean,
+};
+
+export type HierarchyMemberKind = "field" | "method" | "type";
+
+/**
+ *  The class at a position and what can move: pull-up destinations, or the subclasses
+ *  members are pushed into.
+ */
+export type HierarchyMembers = {
+	className: string,
+	targets: HierarchyClass[],
+	members: HierarchyMember[],
+};
+
+/**  A checked refactoring: what the server found, and the edit unless a problem is fatal. */
+export type HierarchyRefactored = {
+	problems: RefactoringProblem[],
+	edit: WorkspaceEdit | null,
+};
+
+/**  IDEA's class-hierarchy refactorings. */
+export type HierarchyRefactoring = "pullUp" | "pushDown";
+
 export type Highlight = {
 	range: Range,
 	kind: HighlightKind,
@@ -3998,6 +4253,14 @@ export type IndexEntry = {
 	/**  [`package_digest`] of its contents. */
 	digest: string,
 	capabilities?: string[],
+	/**
+	 *  The plugin API versions it loads in (a semver requirement): its
+	 *  manifest's `engines.openidea` and the API its component was built for.
+	 *  Required: an entry without one is offered to no IDE.
+	 */
+	engine?: string,
+	/**  Marketplace categories (`CATEGORIES`); an IDE ignores those it doesn't know. */
+	categories?: string[],
 };
 
 export type IndexStatus = {
@@ -4155,6 +4418,52 @@ export type InstallPreview = {
 	unsigned: boolean,
 	/**  The verified publisher. */
 	publisher: string | null,
+	/**
+	 *  Replaces an installed copy signed with another key, which didn't
+	 *  endorse this package's (or this one is unsigned): the user confirms it
+	 *  ([`Consent::signer_change`]).
+	 */
+	signerChanged: boolean,
+	/**
+	 *  Something to confirm: a first install, an unsigned package, another
+	 *  signer, or capabilities the installed version wasn't granted or
+	 *  refused. Without, an update installs with the grants it has.
+	 */
+	needsConsent: boolean,
+};
+
+/**  A theme of a plugin installed in a JetBrains IDE. */
+export type InstalledIntellijTheme = {
+	/**  The IDE and its version: `IntelliJ IDEA 2025.2`. */
+	ide: string,
+	/**  The plugin's name. */
+	plugin: string,
+	/**  What to import: the plugin's folder or jar. */
+	path: IpcPath,
+	themeId: string,
+	themeName: string,
+	dark: boolean,
+	/**  The IDE is set to this theme. */
+	active: boolean,
+};
+
+export type IntellijThemeFile = {
+	/**  The `themeProvider` id (what `laf.xml` names), or the file name without `.theme.json`. */
+	id: string,
+	/**  The `.theme.json`, comments removed. */
+	theme: string,
+	/**  The editor scheme (`.icls` XML) its `editorScheme` names, when the plugin has it. */
+	editorScheme: string | null,
+};
+
+/**  A theme plugin's themes, as read from its files. */
+export type IntellijThemeSource = {
+	/**  The plugin's `<name>`, or the theme's for a loose file. */
+	name: string,
+	pluginId: string | null,
+	version: string | null,
+	vendor: string | null,
+	themes: IntellijThemeFile[],
 };
 
 /**  Optional parts of the invalidation; the symbol index is always rebuilt. */
@@ -4332,6 +4641,8 @@ export type LanguageInfo_Deserialize = {
 	filenames?: string[],
 	/**  First-line regex of the definition (shebangs, `<?php`). */
 	firstLine?: string | null,
+	/**  Content of a new scratch file; `$END$` marks where the caret goes. */
+	scratchTemplate?: string | null,
 };
 
 /**  The UI-facing view of a language. */
@@ -4351,6 +4662,8 @@ export type LanguageInfo_Serialize = {
 	filenames?: string[],
 	/**  First-line regex of the definition (shebangs, `<?php`). */
 	firstLine?: string | null,
+	/**  Content of a new scratch file; `$END$` marks where the caret goes. */
+	scratchTemplate?: string | null,
 };
 
 export type LanguageServerSettings = LanguageServerSettings_Serialize | LanguageServerSettings_Deserialize;
@@ -4462,6 +4775,10 @@ export type Launch = {
 	newProjects: boolean,
 	/**  Where to place the caret in some of `files` (`openidea --line 12 --column 5 <file>`). */
 	positions?: FilePosition[],
+	/**  Comparison windows: the revisions to compare (boxed: most launches have none). */
+	comparison?: ComparisonLaunch | null,
+	/**  Deployment windows: the server and local selection to compare. */
+	deployment?: DeploymentLaunch | null,
 };
 
 export type LaunchConfig = {
@@ -4616,6 +4933,22 @@ export type Location = {
 	uri?: string | null,
 };
 
+export type LogDetails = {
+	message: string,
+	containingBranches: string[],
+	/**  Git's verification code: G/U good, B bad, E error, N unsigned, X/Y expired, R revoked. */
+	signature: string,
+	signer: string,
+	key: string,
+	fingerprint: string,
+};
+
+export type LogIndexProgress = {
+	indexed: number,
+	total: number,
+	running: boolean,
+};
+
 export type LogLevel = "debug" | "info" | "warn" | "error";
 
 export type LogLocation = {
@@ -4629,11 +4962,19 @@ export type LogOrder =
 /**  `--topo-order`: lines of history are not intermixed. */
 "topo" | 
 /**  `--date-order`: commit time, but never a parent before its children. */
-"date";
+"date" | "standard";
 
 export type LogQuery = {
+	speedSearch?: string | null,
+	searchFields?: string[],
+	/**  Jump directly to an indexed window containing this commit (50 rows of context). */
+	seek?: string | null,
+	retainUntil?: string | null,
 	branch: string | null,
 	path: IpcPath | null,
+	paths?: IpcPath[],
+	/**  File history follows renames; structure filters retain fixed paths. */
+	follow?: boolean,
 	author: string | null,
 	text: string | null,
 	skip: number,
@@ -4643,6 +4984,8 @@ export type LogQuery = {
 	 *  not the left). Takes precedence over `branch`.
 	 */
 	range?: string | null,
+	/**  Additional ranges unioned with each other and with selected branches. */
+	ranges?: string[],
 	/**  `text` is a regular expression (Log filter `.*`). */
 	textRegex?: boolean,
 	/**  `text` matches case-sensitively (Log filter `Cc`). */
@@ -4651,6 +4994,7 @@ export type LogQuery = {
 	branches?: string[],
 	/**  More author needles next to `author`; a commit matches any of them (Log User filter). */
 	authors?: string[],
+	authorsExact?: boolean,
 	order?: LogOrder,
 	/**  Follow only the first parent of merges (`--first-parent`). */
 	firstParent?: boolean,
@@ -4663,15 +5007,14 @@ export type LogQuery = {
 	 */
 	sinceMs?: number | null,
 	untilMs?: number | null,
+	request?: RequestId | null,
+	summaryOnly?: boolean,
+	/**  Inclusive refresh boundary. Clients join only verified linear prefixes. */
+	stopAt?: string | null,
 };
 
 export type LspRefreshKind = "inlayHints" | "semanticTokens" | "codeLens";
 
-/**
- *  Main toolbar entries per side, in order: title widget ids (`project`,
- *  `vcs.branch`…) or `action:<id>`. Widgets in neither list nor `hidden`
- *  (registered later) keep their default place.
- */
 export type MainToolbarSettings = {
 	left?: string[],
 	right?: string[],
@@ -4697,6 +5040,8 @@ export type MarkdownSettings = {
 export type MarketPlugin = {
 	/**  Installed version, if any. */
 	installed: string | null,
+	/**  Whether this IDE can load `entry` (the newest version it can, else the newest). */
+	compatible: boolean,
 } & IndexEntry;
 
 export type Markup = {
@@ -4792,6 +5137,16 @@ export type MavenSettings = {
 	userSettings?: string,
 	/**  Local repository (`-Dmaven.repo.local`); empty = from `settings.xml`. */
 	localRepository?: string,
+	/**
+	 *  Run Maven through the Maven Daemon (`mvnd`) for faster builds. mvnd embeds
+	 *  its own Maven, so `home` and the project's `mvnw` are bypassed when it is on.
+	 */
+	daemon?: boolean,
+	/**
+	 *  Maven Daemon home (or its `mvnd` executable); empty = `$MVND_HOME`, else
+	 *  `mvnd` on `PATH` / common install dirs. Only used when `daemon` is on.
+	 */
+	mvndHome?: string,
 };
 
 export type MemoryCategory = 
@@ -5017,6 +5372,12 @@ export type OutputChunk = { kind: "stdout"; text: string } | { kind: "stderr"; t
 /**  System message from the IDE (command line echo, exit code). */
 { kind: "system"; text: string };
 
+/**  A text file of a package the UI generated, at its `/`-separated path in the package. */
+export type PackageFile = {
+	path: string,
+	text: string,
+};
+
 /**  A file of a partial commit: which of its changes against HEAD to commit. */
 export type PartialCommitFile = {
 	path: IpcPath,
@@ -5049,9 +5410,55 @@ export type PathCompletion = {
 	dir: boolean,
 };
 
+/**  A PHP version and where it comes from. */
+export type PhpLanguageLevel = {
+	/**  `X.Y.Z`. */
+	version: string,
+	source: PhpLevelSource,
+};
+
+/**
+ *  The PHP language level of the project `path` belongs to (a workspace member, by path, as
+ *  the language server configuration picks it).
+ */
+export type PhpLanguageLevels = {
+	/**  The one Intelephense checks against; `None`: its default. */
+	effective: PhpLanguageLevel | null,
+	/**  The one Auto picks, from `composer.json`. */
+	auto: PhpLanguageLevel | null,
+	/**
+	 *  The workspace member `path` belongs to: its own settings choose the level, not the
+	 *  workspace's. `None`: the opened project.
+	 */
+	member: IpcPath | null,
+};
+
+export type PhpLevelSource = 
+/**  `languages.php.languageLevel`. */
+"settings" | 
+/**  `config.platform.php` of `composer.json`. */
+"platform" | 
+/**  The lowest version `require.php` of `composer.json` allows. */
+"require";
+
 export type PhpSettings = {
 	/**  `php` CLI executable; empty = the one on `PATH`. */
 	interpreter?: string,
+	/**
+	 *  PHP version the language server checks the code against (`7.4`); empty = from
+	 *  `composer.json` (`config.platform.php`, else the lowest version `require.php` allows).
+	 */
+	languageLevel?: string,
+	/**
+	 *  Folders outside the project whose code the language server indexes too (a platform a
+	 *  module extends); absolute, `~/`, or relative to the project.
+	 */
+	includePaths?: string[],
+	/**
+	 *  Intelephense stub sets loaded on top of its defaults and the `ext-*` entries of
+	 *  `composer.json` (`wordpress`).
+	 */
+	stubs?: string[],
 };
 
 /**  The focused editor when a plugin command is invoked. */
@@ -5064,7 +5471,12 @@ export type PluginEditor = {
 /**  Backend → UI notifications (Tauri event `ide://plugin`). */
 export type PluginEvent = 
 /**  Plugins, their status or their contributions changed: re-fetch `plugin_list`. */
-{ type: "commandsChanged" } | { type: "notification"; pluginId: string; level: NotificationLevel; title: string; body: string } | 
+{ type: "commandsChanged" } | 
+/**
+ *  The marketplace offers newer versions of installed plugins (announced
+ *  once per set of versions).
+ */
+{ type: "updatesAvailable"; updates: PluginUpdate[] } | { type: "notification"; pluginId: string; level: NotificationLevel; title: string; body: string } | 
 /**  A plugin's status bar item was set (`item`) or removed. */
 { type: "statusItemChanged"; pluginId: string; id: string; item: StatusItem | null } | 
 /**  A plugin began a task: show it with the background tasks. */
@@ -5084,7 +5496,7 @@ export type PluginEvent =
 /**  For the script of a view's `html` body. */
 { type: "viewMessage"; pluginId: string; view: string; message: string } | 
 /**  Open a terminal running `program` (already approved and verified). */
-{ type: "openTerminal"; pluginId: string; title: string; program: IpcPath; args: string[]; cwd: IpcPath } | 
+{ type: "openTerminal"; pluginId: string; title: string; program: IpcPath; args: string[]; cwd: IpcPath } | { type: "openLocation"; pluginId: string; path: IpcPath; line: number; column: number } | 
 /**
  *  Plugin languages, or the servers they may start, changed: re-fetch
  *  `languages` (the host re-detects open documents: [`crate::Host::plugin_languages_changed`]).
@@ -5173,6 +5585,13 @@ export type PluginStatusItem = {
 	item: StatusItem,
 };
 
+/**  A newer version of an installed plugin in the marketplace. */
+export type PluginUpdate = {
+	id: string,
+	name: string,
+	version: string,
+};
+
 export type PluginsSnapshot = {
 	plugins: PluginInfo[],
 	activeTheme: ActiveTheme | null,
@@ -5283,6 +5702,10 @@ export type PreparedRequest = {
 	body: string | null,
 };
 
+export type ProblemSeverity = "info" | "warning" | "error" | 
+/**  The refactoring can't run at all; there is no edit. */
+"fatal";
+
 /**  Memory of one row of the breakdown. */
 export type ProcessMemory = {
 	category: MemoryCategory,
@@ -5372,6 +5795,7 @@ export type ProjectInfo_Deserialize = {
 	isGit: boolean,
 	settings: Settings_Deserialize,
 	workspace?: Workspace_Deserialize | null,
+	unity?: UnityProjectInfo | null,
 };
 
 export type ProjectInfo_Serialize = {
@@ -5381,6 +5805,7 @@ export type ProjectInfo_Serialize = {
 	isGit: boolean,
 	settings: Settings_Serialize,
 	workspace?: Workspace_Serialize | null,
+	unity?: UnityProjectInfo | null,
 };
 
 export type ProjectRoots = {
@@ -5539,6 +5964,11 @@ export type RecentProject = {
 	branch: string | null,
 };
 
+export type RefactoringProblem = {
+	severity: ProblemSeverity,
+	message: string,
+};
+
 export type ReferenceAccess = "read" | "write" | "readWrite" | "unknown";
 
 export type ReferenceKind = "getter" | "setter" | "field" | "unknown";
@@ -6884,6 +7314,13 @@ export type UndoOutcome = {
 	conflicts: IpcPath[],
 };
 
+export type UnityProjectInfo = {
+	editorVersion: string | null,
+	/**  File names relative to the Unity root, in stable order. */
+	solutions: string[],
+	projects: string[],
+};
+
 export type UpdateCheck = {
 	/**  False when no update endpoint is configured (no request was made). */
 	enabled: boolean,
diff --git a/src/editor/core/cm/prefs.ts b/src/editor/core/cm/prefs.ts
index 99aa6507..333a054b 100644
--- a/src/editor/core/cm/prefs.ts
+++ b/src/editor/core/cm/prefs.ts
@@ -432,6 +432,7 @@ export const GUTTER_ICON_GROUPS = [
   { id: "bookmarks", gutterClass: "cm-openidea-bookmarks" },
   { id: "inheritors", gutterClass: "cm-openidea-gutter-lineMarkers" },
   { id: "supers", gutterClass: "cm-openidea-gutter-lineMarkers" },
+  { id: "colors", gutterClass: "cm-openidea-gutter-colors" },
 ] as const;
 
 export interface PrefsOptions {
diff --git a/src/editor/core/cm/setup.ts b/src/editor/core/cm/setup.ts
index 3197fb1f..87e6df7d 100644
--- a/src/editor/core/cm/setup.ts
+++ b/src/editor/core/cm/setup.ts
@@ -319,15 +319,23 @@ export interface SetupOptions {
 }
 
 /**
- * Tooltips (hints, docs, completion) stay below the editor's top edge: one
- * above the first lines flips below them instead of hiding under the tabs.
+ * Tooltips (hints, docs, completion) stay inside the editor horizontally and
+ * below its top edge. WebKit positions them `absolute` within `.cm-editor`, so
+ * a window-wide right bound makes CodeMirror skip the shift left and the
+ * browser squeezes the box into the space left of the editor's edge.
  */
-const tooltipSpace = tooltips({
-  tooltipSpace: (view) => {
-    const top = view.scrollDOM.getBoundingClientRect().top;
-    return { top, left: 0, right: window.innerWidth, bottom: window.innerHeight };
-  },
-});
+export function tooltipBounds(view: { scrollDOM: Element; dom: Element }) {
+  const { top } = view.scrollDOM.getBoundingClientRect();
+  const { left, right } = view.dom.getBoundingClientRect();
+  return {
+    top,
+    left: Math.max(0, left),
+    right: Math.min(window.innerWidth, right),
+    bottom: window.innerHeight,
+  };
+}
+
+const tooltipSpace = tooltips({ tooltipSpace: tooltipBounds });
 
 export function baseExtensions(o: SetupOptions): Extension {
   return [
diff --git a/src/editor/core/cm/theme.ts b/src/editor/core/cm/theme.ts
index 82ce7acc..8bb129fa 100644
--- a/src/editor/core/cm/theme.ts
+++ b/src/editor/core/cm/theme.ts
@@ -83,8 +83,7 @@ export const openideaTheme = EditorView.theme({
   },
   "&.cm-focused": { outline: "none" },
   ".cm-scroller": {
-    // The workbench body uses the arrow cursor; the text area gets the I-beam (also past the last line).
-    cursor: "text",
+    // The scroll container keeps the arrow cursor so its scrollbar does not turn into the I-beam.
     fontFamily: "var(--openidea-editor-font, var(--font-mono))",
     fontWeight: "var(--fw-code, 400)",
     fontSize: "var(--openidea-editor-font-size, var(--fs-code))",
@@ -95,6 +94,7 @@ export const openideaTheme = EditorView.theme({
   ".cm-content": {
     padding: "4px 0 8px 0",
     caretColor: "var(--caret, var(--fg-strong))",
+    cursor: "text",
   },
   ".cm-line": { padding: "0 16px 0 6px" },
   ...caretStyles,
@@ -104,9 +104,10 @@ export const openideaTheme = EditorView.theme({
   "&.cm-openidea-methodSeparators .cm-openidea-methodSeparator": {
     boxShadow: "inset 0 1px 0 var(--border-method-separator, var(--border))",
   },
-  "&.cm-openidea-hideGutter-run .cm-openidea-gutter-run, &.cm-openidea-hideGutter-bookmarks .cm-openidea-bookmarks": {
-    display: "none !important",
-  },
+  "&.cm-openidea-hideGutter-run .cm-openidea-gutter-run, &.cm-openidea-hideGutter-bookmarks .cm-openidea-bookmarks, &.cm-openidea-hideGutter-colors .cm-openidea-gutter-colors":
+    {
+      display: "none !important",
+    },
   // Inheritance markers share one gutter: each group hides its own icons.
   "&.cm-openidea-hideGutter-inheritors :is(.cm-openidea-lineMarker-implemented, .cm-openidea-lineMarker-overridden), &.cm-openidea-hideGutter-supers :is(.cm-openidea-lineMarker-implementing, .cm-openidea-lineMarker-overriding)":
     { display: "none" },
@@ -248,6 +249,9 @@ export const openideaTheme = EditorView.theme({
 
   // Overlays
   ".cm-tooltip": {
+    // Natural width, so a measurement taken while squeezed is not fed back (#1188).
+    width: "max-content",
+    maxWidth: "100%",
     backgroundColor: "var(--bg-popup)",
     color: "var(--fg)",
     border: "1px solid var(--border-popup)",
diff --git a/src/editor/core/cm/tooltipBounds.test.ts b/src/editor/core/cm/tooltipBounds.test.ts
new file mode 100644
index 00000000..b24cf170
--- /dev/null
+++ b/src/editor/core/cm/tooltipBounds.test.ts
@@ -0,0 +1,24 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { tooltipBounds } from "./setup";
+
+const el = (r: Partial<DOMRect>) => ({ getBoundingClientRect: () => r as DOMRect }) as Element;
+const original = window.innerWidth;
+
+beforeEach(() => {
+  Object.defineProperty(window, "innerWidth", { value: 1200, configurable: true });
+});
+afterEach(() => {
+  Object.defineProperty(window, "innerWidth", { value: original, configurable: true });
+});
+
+describe("tooltipBounds", () => {
+  it.each([
+    ["editor flush with the right edge", { left: 300, right: 1200 }, 300, 1200],
+    ["narrow split pane", { left: 0, right: 400 }, 0, 400],
+    ["editor in the middle", { left: 250, right: 750 }, 250, 750],
+    ["editor spilling outside the window", { left: -20, right: 1500 }, 0, 1200],
+  ])("%s", (_, rect, left, right) => {
+    const b = tooltipBounds({ scrollDOM: el({ top: 80 }), dom: el(rect) });
+    expect(b).toMatchObject({ top: 80, left, right });
+  });
+});
diff --git a/src/editor/core/controller.test.ts b/src/editor/core/controller.test.ts
index 085a9e29..09cb1b05 100644
--- a/src/editor/core/controller.test.ts
+++ b/src/editor/core/controller.test.ts
@@ -21,6 +21,51 @@ afterEach(() => {
 });
 
 describe("EditorController", () => {
+  it("autosaves on blur, but not while focus is in a popup over the editor", async () => {
+    const backend = createMemoryBackend({ "/p/a.c": "int main() {\n    \n}\n" });
+    const save = vi.spyOn(backend, "save");
+    ctrl = new EditorController(backend);
+    ctrl.start();
+    await ctrl.openFile("/p/a.c", { focus: false });
+    const slot = ctrl.activeSlot!;
+    const host = document.createElement("div");
+    const popup = document.createElement("div");
+    popup.setAttribute("data-popup", "");
+    const popupList = document.createElement("button");
+    popup.appendChild(popupList);
+    const elsewhere = document.createElement("button");
+    document.body.append(host, popup, elsewhere);
+    try {
+      const view = slot.mount(host);
+      ctrl.onMounted(slot);
+      const type = () => view.dispatch({ changes: { from: 0, insert: "x" }, userEvent: "input.type" });
+      // Into a popup (⌥↵ intentions): nothing is saved while it is open.
+      view.focus();
+      type();
+      popupList.focus();
+      await new Promise((r) => setTimeout(r, 20));
+      expect(save).not.toHaveBeenCalled();
+      // Back to the editor (popup closed): still nothing.
+      view.focus();
+      await new Promise((r) => setTimeout(r, 20));
+      expect(save).not.toHaveBeenCalled();
+      // From the popup elsewhere: saved then.
+      popupList.focus();
+      await new Promise((r) => setTimeout(r, 20));
+      elsewhere.focus();
+      await vi.waitFor(() => expect(save).toHaveBeenCalledTimes(1));
+      // Straight elsewhere: saved.
+      view.focus();
+      type();
+      elsewhere.focus();
+      await vi.waitFor(() => expect(save).toHaveBeenCalledTimes(2));
+    } finally {
+      host.remove();
+      popup.remove();
+      elsewhere.remove();
+    }
+  });
+
   it("leaves modified Enter to a non-text editor after switching from a focused file", async () => {
     ctrl = new EditorController(createMemoryBackend({ "/p/a.ts": "one\ntwo\n" }));
     ctrl.start();
diff --git a/src/editor/core/controller.ts b/src/editor/core/controller.ts
index 723a27d5..6faa65f5 100644
--- a/src/editor/core/controller.ts
+++ b/src/editor/core/controller.ts
@@ -24,6 +24,7 @@ import {
   notifications,
   resolveFileEditor,
   useContributions,
+  useStandaloneEditor,
   type EditorCloseSession,
   type EditorInput,
   type OpenOptions,
@@ -143,7 +144,7 @@ export interface EditorStatus {
 export const useEditorStatus = create<{ status: EditorStatus | null }>(() => ({ status: null }));
 /** Per-tab open errors (file missing, too large…). */
 export const useTabErrors = create<Record<string, string>>(() => ({}));
-/** Per-pane find bar state (open / replace mode); the bar keeps its own query. */
+/** Per-tab find bar state (open / replace mode), like IDEA's per-editor search session. */
 export const useFindBars = create<Record<string, { replace: boolean; seq: number } | undefined>>(() => ({}));
 export const useGotoLine = create<{ open: boolean }>(() => ({ open: false }));
 
@@ -193,7 +194,7 @@ export function tabTitle(input: EditorInput, kinds: EditorKinds): string {
 }
 
 export function tabIcon(input: EditorInput, kinds: EditorKinds): string {
-  if (input.kind === "file") return fileIconName(basename(input.path ?? ""));
+  if (input.kind === "file") return fileIconName(basename(input.path ?? ""), input.path ?? null);
   if (input.kind === "virtual") return fileIconName(tabTitle(input, kinds));
   const kind = kinds.get(input.kind);
   try {
@@ -230,6 +231,7 @@ export class EditorController implements SlotHost {
   private closeSession: EditorCloseSession | null = null;
   private closeCommitted = false;
   private projectGeneration = 0;
+  private replacingProject = false;
   private admissionGeneration = 0;
   private openSequence = 0;
   private selectionRequests = new Map<string, number>();
@@ -255,7 +257,14 @@ export class EditorController implements SlotHost {
     _provideOpenEditorPaths(() => openFilePaths(useTabs.getState()));
     let prevTabs = useTabs.getState();
     this.disposers.push(
-      useTabs.subscribe((s) => {
+      useTabs.subscribe((s, previous) => {
+        const open = openKeys(s);
+        const closed = new Map<string, EditorInput>();
+        for (const pane of Object.values(previous.panes))
+          for (const tab of pane.tabs) if (!open.has(tab.input.key)) closed.set(tab.input.key, tab.input);
+        if (!this.replacingProject)
+          for (const input of closed.values())
+            useContributions.getState().editorKinds.get(input.kind)?.onClose?.(input);
         const prev = prevTabs;
         prevTabs = s;
         if (
@@ -265,6 +274,11 @@ export class EditorController implements SlotHost {
           ++this.activationGeneration;
         this.stampActive(s);
         this.onTabsChanged(prev, s);
+        const kinds = useContributions.getState().editorKinds;
+        const standalone = Object.values(s.panes)
+          .flatMap((pane) => pane.tabs)
+          .find((tab) => kinds.get(tab.input.kind)?.standalone);
+        useStandaloneEditor.setState({ title: standalone ? tabTitle(standalone.input, kinds) : null });
       }),
     );
     tabOptions.activateOnClose = editorPrefs().tabs.activateOnClose as typeof tabOptions.activateOnClose;
@@ -299,7 +313,12 @@ export class EditorController implements SlotHost {
           const documents = customDocuments(useTabs.getState(), useContributions.getState().editorKinds);
           // The guard decided already. Disposal must never prompt or autosave
           // custom documents after the backend has replaced their project.
-          useTabs.setState(initialTabsState(), true);
+          this.replacingProject = true;
+          try {
+            useTabs.setState(initialTabsState(), true);
+          } finally {
+            this.replacingProject = false;
+          }
           this.closeSession = null;
           this.closeCommitted = false;
           this.preparedDocuments.clear();
@@ -367,6 +386,7 @@ export class EditorController implements SlotHost {
     this.selectionRequests.clear();
     this.manager.stop();
     useTabs.setState(initialTabsState(), true);
+    useStandaloneEditor.setState({ title: null });
     void this.releaseDocuments(documents.values()).catch((e) => this.documentError(e));
   }
 
@@ -387,6 +407,8 @@ export class EditorController implements SlotHost {
         slot.dispose();
       }
     }
+    const bars = Object.entries(useFindBars.getState()).filter(([id, bar]) => bar && !live.has(id));
+    if (bars.length) useFindBars.setState(Object.fromEntries(bars.map(([id]) => [id, undefined])));
     for (const id of Object.keys(useTabErrors.getState()))
       if (!live.has(id))
         useTabErrors.setState((s) => {
@@ -588,7 +610,21 @@ export class EditorController implements SlotHost {
 
   onBlur(slot: EditorSlot) {
     setContext("editorTextFocus", false);
-    if (this.autoSave()) void slot.model.save("auto").catch(() => {});
+    if (!this.autoSave()) return;
+    const save = () => void slot.model.save("auto").catch(() => {});
+    if (typeof document === "undefined") return save();
+    // A popup (intentions, completion, …) belongs to the editor: saving under it would change
+    // the text (save cleanup) its items were computed for. Save once focus leaves it elsewhere.
+    setTimeout(() => {
+      if (slot.view?.hasFocus) return;
+      if (!inPopup(document.activeElement)) return save();
+      const onFocusIn = (e: FocusEvent) => {
+        if (inPopup(e.target)) return;
+        document.removeEventListener("focusin", onFocusIn);
+        if (!slot.view?.hasFocus) save();
+      };
+      document.addEventListener("focusin", onFocusIn);
+    });
   }
 
   onSelection(slot: EditorSlot, navigatedFrom?: { line: number; col: number }) {
@@ -615,9 +651,8 @@ export class EditorController implements SlotHost {
   }
 
   onEscape(slot: EditorSlot): boolean {
-    const loc = this.locateTab(slot.tabId);
-    if (loc && useFindBars.getState()[loc.paneId]) {
-      useFindBars.setState({ [loc.paneId]: undefined });
+    if (useFindBars.getState()[slot.tabId]) {
+      useFindBars.setState({ [slot.tabId]: undefined });
       return true;
     }
     return false;
@@ -670,7 +705,8 @@ export class EditorController implements SlotHost {
       {
         label: "Copy / Paste Special",
         submenu: [
-          { label: "Copy Path", run: () => void navigator.clipboard?.writeText(slot.model.path) },
+          { kind: "action", action: "editor.copyReference" },
+          { kind: "action", action: "code.pasteAsPlainText" },
           { kind: "action", action: "code.pasteFromHistory" },
         ],
       },
@@ -716,6 +752,8 @@ export class EditorController implements SlotHost {
           { kind: "action", action: "refactor.extractConstant" },
           { kind: "action", action: "refactor.extractMethod" },
           { kind: "action", action: "refactor.inline" },
+          { kind: "action", action: "refactor.pullMembersUp" },
+          { kind: "action", action: "refactor.pushMembersDown" },
           { kind: "separator" },
           { kind: "action", action: "refactor.safeDelete" },
         ],
@@ -883,8 +921,18 @@ export class EditorController implements SlotHost {
     return generation;
   }
 
+  /**
+   * A decision to leave that was authorized, but whose project change or window close never
+   * came (the window stayed with its project): released, so the window can open files and
+   * be left again instead of refusing both until it is restarted.
+   */
+  private releaseStaleClose() {
+    if (this.closeSession && this.closeCommitted && !useProject.getState().opening) this.closeSession.cancel();
+  }
+
   private checkOpening(generation: { project: number; admission: number }) {
     if (generation.project !== this.projectGeneration) throw new Error("The project changed while opening the editor");
+    this.releaseStaleClose();
     if (generation.admission !== this.admissionGeneration || this.closeSession || this.closeRequests)
       throw new Error("The project is closing");
   }
@@ -1316,8 +1364,8 @@ export class EditorController implements SlotHost {
     this.apply((s) => (s.panes[paneId] ? promoteTab(s, paneId, tabId) : s));
   }
   /** Drag & drop; the tab keeps its id (and slot) when moved within a pane. */
-  moveTab(fromPane: string, tabId: string, toPane: string, index: number) {
-    this.apply((s) => moveTab(s, fromPane, tabId, toPane, index));
+  moveTab(fromPane: string, tabId: string, toPane: string, index: number, pin?: boolean) {
+    this.apply((s) => moveTab(s, fromPane, tabId, toPane, index, pin));
   }
   /** Drag & drop onto an editor edge: the tab moves into a new split on that side. */
   moveTabToSplit(fromPane: string, tabId: string, targetPane: string, edge: SplitEdge) {
@@ -1612,6 +1660,7 @@ export class EditorController implements SlotHost {
     ++this.admissionGeneration;
     ++this.closeRequests;
     return this.enqueueRemoval(async () => {
+      this.releaseStaleClose();
       if (this.closeSession) throw new Error("An editor close decision is already pending");
       const generation = this.projectGeneration;
       const documents = [...customDocuments(useTabs.getState(), useContributions.getState().editorKinds).values()];
@@ -1820,6 +1869,7 @@ function gitMenu(path: string): MenuItem {
       { kind: "action", action: "vcs.showDiff", arg: [path], label: "Show Diff" },
       { kind: "action", action: "vcs.compareWithBranch", arg: { path }, label: "Compare with Branch…" },
       { kind: "action", action: "vcs.showHistory", arg: [path], label: "Show History" },
+      { kind: "action", action: "vcs.showHistoryForSelection", label: "Show History for Selection" },
       { kind: "action", action: "vcs.rollback", arg: [path], label: "Rollback…" },
       { kind: "separator" },
       { kind: "action", action: "vcs.push", label: "Push…" },
@@ -1879,3 +1929,7 @@ function revealLabel(): string {
   const os = usePlatform.getState().os;
   return os === "macos" ? "Finder" : os === "windows" ? "Explorer" : "Files";
 }
+
+function inPopup(target: EventTarget | null): boolean {
+  return target instanceof Element && !!target.closest("[data-popup]");
+}
diff --git a/src/editor/core/customDocuments.test.ts b/src/editor/core/customDocuments.test.ts
index b9f8a699..cb56d13b 100644
--- a/src/editor/core/customDocuments.test.ts
+++ b/src/editor/core/customDocuments.test.ts
@@ -631,6 +631,30 @@ describe("custom editor document lifetime", () => {
     expect(b.saved).toBe("edited");
   });
 
+  it("releases an authorized decision to leave when the project never changed", async () => {
+    const doc = await open();
+    const session = await ctrl.prepareClose();
+    session.commit();
+    expect(doc.frozen).toBe(true);
+    // The window stayed with its project: files open again, and it can be left again.
+    await open("b");
+    expect(findTab(useTabs.getState(), input("b").key)).not.toBeNull();
+    expect(doc.frozen).toBe(false);
+    const again = await ctrl.prepareClose();
+    expect(() => session.commit()).toThrow();
+    again.cancel();
+  });
+
+  it("keeps an authorized decision while the project it leaves for is opening", async () => {
+    await open();
+    const session = await ctrl.prepareClose();
+    session.commit();
+    useProject.setState({ opening: true });
+    await expect(open("b")).rejects.toThrow("The project is closing");
+    await expect(ctrl.prepareClose()).rejects.toThrow("already pending");
+    useProject.setState({ opening: false });
+  });
+
   it("rejects authorization from a cancelled project close session", async () => {
     const doc = await open();
     const session = await ctrl.prepareClose();
diff --git a/src/editor/core/embeddedDocuments.test.ts b/src/editor/core/embeddedDocuments.test.ts
new file mode 100644
index 00000000..23bc57e8
--- /dev/null
+++ b/src/editor/core/embeddedDocuments.test.ts
@@ -0,0 +1,46 @@
+import { afterEach, expect, it, vi } from "vitest";
+import { EditorView } from "@codemirror/view";
+import { attachDocument } from "@/editor/api";
+import { useProject } from "@/platform/project";
+import { _resetLanguages } from "./cm/languages";
+import { ipcBackend, type MemoryBackend } from "./backend";
+import { activateEmbeddedDocuments } from "./embeddedDocuments";
+
+vi.mock("./backend", async (original) => {
+  const module = await original<typeof import("./backend")>();
+  return { ...module, ipcBackend: module.createMemoryBackend({ "/p/a.txt": "original\n", "/p/b.txt": "other\n" }) };
+});
+
+afterEach(() => useProject.setState({ settings: null }));
+
+it("retains local changes when another comparison row is selected and saves before releasing document references", async () => {
+  _resetLanguages();
+  useProject.setState({ settings: { files: { autoSave: false } } as never });
+  const documents = activateEmbeddedDocuments();
+  const backend = ipcBackend as MemoryBackend;
+  const first = await attachDocument("/p/a.txt");
+  const view = new EditorView({ doc: first.text(), extensions: [first.extension] });
+  try {
+    view.dispatch({ changes: { from: 0, insert: "changed " } });
+    view.destroy();
+    first.release();
+    const second = await attachDocument("/p/b.txt");
+    const otherView = new EditorView({ doc: second.text(), extensions: [second.extension] });
+    otherView.dispatch({ changes: { from: 0, insert: "pending " } });
+    otherView.destroy();
+    second.release();
+    expect(documents.dirty()).toBe(true);
+    expect(backend.files.get("/p/a.txt")).toBe("original\n");
+    expect(backend.docs.size).toBe(2);
+    await documents.savePaths(["/p/a.txt"]);
+    expect(backend.files.get("/p/a.txt")).toBe("changed original\n");
+    expect(backend.files.get("/p/b.txt")).toBe("other\n");
+    expect(documents.dirty()).toBe(true);
+    await documents.save();
+    expect(backend.files.get("/p/b.txt")).toBe("pending other\n");
+    expect(documents.dirty()).toBe(false);
+  } finally {
+    await documents.dispose();
+  }
+  expect(backend.docs.size).toBe(0);
+});
diff --git a/src/editor/core/embeddedDocuments.ts b/src/editor/core/embeddedDocuments.ts
new file mode 100644
index 00000000..eaebc451
--- /dev/null
+++ b/src/editor/core/embeddedDocuments.ts
@@ -0,0 +1,49 @@
+/** Live document services for a native comparison window, without editor tabs or session restoration. */
+import { _provideCodePreview, _provideDocumentAttacher } from "@/editor/api";
+import { useProject } from "@/platform/project";
+import { notifications } from "@/workbench/contributions";
+import { ipcBackend } from "./backend";
+import { previewExtensions } from "./cm/preview";
+import { installColorScheme } from "./colorSchemeRuntime";
+import { attachDocument } from "./model/attachment";
+import { DocumentManager, type DocModel } from "./model/document";
+
+class EmbeddedDocumentManager extends DocumentManager {
+  // Keep files visited in this comparison until it closes, including unsaved
+  // edits in a row that is no longer selected. No project tab/session is made.
+  override release(_model: DocModel) {}
+}
+
+export function activateEmbeddedDocuments() {
+  const manager = new EmbeddedDocumentManager(ipcBackend, {
+    settings: () => useProject.getState().settings,
+    notify: (message) => notifications().notify(message),
+  });
+  manager.start();
+  _provideDocumentAttacher((path) => attachDocument(manager, path));
+  _provideCodePreview((path) => previewExtensions(path, useProject.getState().settings?.editor, ipcBackend));
+  const offColor = installColorScheme();
+  const offSettings = useProject.subscribe((s, prev) => {
+    if (s.settings !== prev.settings) manager.applySettings();
+  });
+  return {
+    dirty: () => [...manager.byPath.values()].some((model) => model.getMeta().dirty),
+    save: () => manager.saveAll("explicit"),
+    savePaths: (paths: readonly string[]) =>
+      Promise.all(paths.map((path) => manager.get(path)?.save("explicit"))).then(() => {}),
+    async dispose() {
+      _provideDocumentAttacher(null);
+      _provideCodePreview(null);
+      offSettings();
+      offColor();
+      manager.stop();
+      for (const model of manager.byPath.values()) {
+        await model.sync.whenIdle();
+        model.dispose();
+        await ipcBackend.close(model.doc);
+      }
+      manager.byPath.clear();
+      manager.byId.clear();
+    },
+  };
+}
diff --git a/src/editor/core/inputClose.test.ts b/src/editor/core/inputClose.test.ts
new file mode 100644
index 00000000..8fe0e86a
--- /dev/null
+++ b/src/editor/core/inputClose.test.ts
@@ -0,0 +1,37 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { registerEditorKind } from "@/workbench/contributions";
+import { EditorController, useTabs } from "./controller";
+import { createMemoryBackend } from "./backend";
+import { initialTabsState } from "./model/tabs";
+let controller: EditorController | null = null;
+afterEach(() => {
+  controller?.stop();
+  controller = null;
+  useTabs.setState(initialTabsState(), true);
+});
+describe("custom editor close lifecycle", () => {
+  it("notifies once when the last split showing an input closes", async () => {
+    const close = vi.fn();
+    const dispose = registerEditorKind({
+      kind: "close-probe",
+      title: () => "Probe",
+      component: () => null,
+      onClose: close,
+    });
+    controller = new EditorController(createMemoryBackend({}));
+    controller.start();
+    const input = { kind: "close-probe", key: "close-probe:1" };
+    try {
+      await controller.openInput(input);
+      controller.split(useTabs.getState().activePane, "row");
+      const panes = Object.values(useTabs.getState().panes);
+      expect(panes).toHaveLength(2);
+      await controller.closeTab(panes[0]!.id, panes[0]!.tabs[0]!.id);
+      expect(close).not.toHaveBeenCalled();
+      await controller.closeInput(input.key);
+      expect(close).toHaveBeenCalledExactlyOnceWith(input);
+    } finally {
+      dispose();
+    }
+  });
+});
diff --git a/src/editor/core/model/model.test.ts b/src/editor/core/model/model.test.ts
index 062afa2c..0041fbed 100644
--- a/src/editor/core/model/model.test.ts
+++ b/src/editor/core/model/model.test.ts
@@ -321,3 +321,33 @@ describe("camel humps", () => {
     expect(stops("  value2Go", "right")).toEqual([7, 8, 10]);
   });
 });
+
+describe("moveTab between the pinned row and the other row", () => {
+  // a^ b^ | c d e   (^ = pinned)
+  const setup = () => {
+    let s = initialTabsState();
+    for (const p of ["a", "b", "c", "d", "e"]) s = open(s, p);
+    const id = (p: string) => findTab(s, `file:${p}`, s.activePane)!.tab.id;
+    s = togglePin(s, s.activePane, id("a"));
+    s = togglePin(s, s.activePane, id("b"));
+    return { s, id };
+  };
+
+  it.each([
+    ["a plain tab onto the pinned row", "d", 1, true, ["a^", "d^", "b^", "c", "e"]],
+    ["a plain tab to the front of the pinned row", "e", 0, true, ["e^", "a^", "b^", "c", "d"]],
+    ["a plain tab to the end of the pinned row", "c", 2, true, ["a^", "b^", "c^", "d", "e"]],
+    ["a pinned tab onto the other row", "a", 4, false, ["b^", "c", "d", "a", "e"]],
+    ["a pinned tab to the start of the other row", "b", 2, false, ["a^", "b", "c", "d", "e"]],
+    ["a plain tab inside the other row keeps it plain", "c", 5, false, ["a^", "b^", "d", "e", "c"]],
+    ["an index past the pinned group stays in it", "d", 4, true, ["a^", "b^", "d^", "c", "e"]],
+  ])("%s", (_, path, index, pin, expected) => {
+    const { s, id } = setup();
+    expect(labels(moveTab(s, s.activePane, id(path), s.activePane, index, pin))).toEqual(expected);
+  });
+
+  it("leaves the pinned state alone without a target row", () => {
+    const { s, id } = setup();
+    expect(labels(moveTab(s, s.activePane, id("d"), s.activePane, 0))).toEqual(["d", "a^", "b^", "c", "e"]);
+  });
+});
diff --git a/src/editor/core/model/tabs.ts b/src/editor/core/model/tabs.ts
index 56cf6a83..b582a928 100644
--- a/src/editor/core/model/tabs.ts
+++ b/src/editor/core/model/tabs.ts
@@ -363,15 +363,32 @@ export function cycleTab(s: TabsState, delta: number, paneId = s.activePane): Ta
 }
 
 /** Moves a tab (drag & drop) within or across panes. */
-export function moveTab(s: TabsState, fromPane: string, tabId: string, toPane: string, index: number): TabsState {
+/**
+ * Moves a tab to `index` of `toPane`. `pin` set (a drop on the pinned or the other row of a
+ * split tab bar): the tab takes that state and lands inside the matching group.
+ */
+export function moveTab(
+  s: TabsState,
+  fromPane: string,
+  tabId: string,
+  toPane: string,
+  index: number,
+  pin?: boolean,
+): TabsState {
   const src = paneOf(s, fromPane);
   const tab = src.tabs.find((t) => t.id === tabId);
   if (!tab) return s;
+  const place = (tabs: Tab[], at: number): Tab[] => {
+    const moved = pin === undefined ? tab : { ...tab, pinned: pin, preview: pin ? false : tab.preview };
+    const pins = tabs.filter((t) => t.pinned).length;
+    const clamped = Math.max(0, Math.min(at, tabs.length));
+    tabs.splice(pin === undefined ? clamped : pin ? Math.min(clamped, pins) : Math.max(clamped, pins), 0, moved);
+    return tabs;
+  };
   if (fromPane === toPane) {
     const tabs = src.tabs.filter((t) => t.id !== tabId);
-    const at = Math.max(0, Math.min(index > src.tabs.indexOf(tab) ? index - 1 : index, tabs.length));
-    tabs.splice(at, 0, tab);
-    return { ...withPane(s, touch({ ...src, tabs }, tabId)), activePane: toPane };
+    const next = place(tabs, index > src.tabs.indexOf(tab) ? index - 1 : index);
+    return { ...withPane(s, touch({ ...src, tabs: next }, tabId)), activePane: toPane };
   }
   const dst = paneOf(s, toPane);
   const dup = dst.tabs.find((t) => t.input.key === tab.input.key);
@@ -379,9 +396,7 @@ export function moveTab(s: TabsState, fromPane: string, tabId: string, toPane: s
   next = { ...next, closed: s.closed };
   if (dup) return { ...activateTab(next, toPane, dup.id), activePane: toPane };
   const dstNow = paneOf(next, toPane);
-  const tabs = [...dstNow.tabs];
-  tabs.splice(Math.max(0, Math.min(index, tabs.length)), 0, tab);
-  return { ...withPane(next, touch({ ...dstNow, tabs }, tab.id)), activePane: toPane };
+  return { ...withPane(next, touch({ ...dstNow, tabs: place([...dstNow.tabs], index) }, tab.id)), activePane: toPane };
 }
 
 // --- splits -----------------------------------------------------------------
diff --git a/src/editor/core/sync/DocSync.test.ts b/src/editor/core/sync/DocSync.test.ts
index e693f5cf..2fa7933d 100644
--- a/src/editor/core/sync/DocSync.test.ts
+++ b/src/editor/core/sync/DocSync.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from "vitest";
 import { ChangeSet, Text } from "@codemirror/state";
 import type { TextChange } from "@/platform/ipc";
 import { DocSync, toTextChanges } from "./DocSync";
-import { minimalChange } from "./diff";
+import { minimalChanges } from "./diff";
 
 function apply(text: string, changes: TextChange[]) {
   let out = "";
@@ -14,6 +14,10 @@ function apply(text: string, changes: TextChange[]) {
   return out + text.slice(pos);
 }
 
+function numberedLines(count: number) {
+  return Array.from({ length: count }, (_, i) => `line ${i}\n`).join("");
+}
+
 class OutOfSync extends Error {
   kind = "outOfSync";
 }
@@ -226,6 +230,46 @@ describe("DocSync", () => {
     expect(sync.idle).toBe(true);
   });
 
+  it("a hard resync touches only the regions that differ", async () => {
+    const initial = numberedLines(40);
+    const { server, view, type, frame, host } = setup(initial);
+    server.failNext = { kind: "permissionDenied", message: "read-only" };
+    type(initial.indexOf("line 2\n"), initial.indexOf("line 2\n"), "#");
+    type(view.text.toString().indexOf("line 37\n"), view.text.toString().indexOf("line 37\n"), "#");
+    frame();
+    await server.processAll();
+    await flushMicrotasks();
+    expect(view.text.toString()).toBe(initial);
+    const touched: number[] = [];
+    host.applyRemote.mock.calls[0]![0].iterChanges((fromA) => touched.push(fromA));
+    expect(touched).toHaveLength(2);
+  });
+
+  it("a snapshot resync patches each region a lost event changed", async () => {
+    vi.useFakeTimers();
+    try {
+      const initial = numberedLines(40);
+      const { server, view, type, frame, host } = setup(initial);
+      type(initial.length, initial.length, "tail\n");
+      frame();
+      const lost = [
+        { from: initial.indexOf("line 2\n"), to: initial.indexOf("line 2\n"), insert: "#" },
+        { from: initial.indexOf("line 37\n"), to: initial.indexOf("line 37\n"), insert: "#" },
+      ];
+      server.patch(lost);
+      await server.processAll();
+      await vi.advanceTimersByTimeAsync(100);
+      await server.processAll();
+      await flushMicrotasks();
+      expect(view.text.toString()).toBe(server.text);
+      const touched: number[] = [];
+      host.applyRemote.mock.calls[0]![0].iterChanges((fromA) => touched.push(fromA));
+      expect(touched).toHaveLength(2);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   it("whenIdle resolves after everything is acked", async () => {
     const { server, sync, type } = setup("");
     type(0, 0, "a");
@@ -279,10 +323,22 @@ describe("DocSync", () => {
   });
 });
 
-describe("minimalChange", () => {
+describe("minimalChanges", () => {
   it("trims common prefix and suffix", () => {
-    expect(minimalChange("hello world", "hello brave world")).toEqual({ from: 6, to: 6, insert: "brave " });
-    expect(minimalChange("abc", "abc")).toBeNull();
-    expect(minimalChange("aaa", "a")).toEqual({ from: 1, to: 3, insert: "" });
+    expect(minimalChanges("hello world", "hello brave world")).toEqual([{ from: 6, to: 6, insert: "brave " }]);
+    expect(minimalChanges("abc", "abc")).toEqual([]);
+    expect(apply("aaa", minimalChanges("aaa", "a"))).toBe("a");
+  });
+
+  it("keeps distant edits apart", () => {
+    const before = numberedLines(40);
+    const after = before.replace("line 2\n", "line two\n").replace("line 37\n", "line thirty-seven\n");
+    const changes = minimalChanges(before, after);
+    expect(changes).toHaveLength(2);
+    expect(apply(before, changes)).toBe(after);
+  });
+
+  it("rebuilds text across astral characters", () => {
+    expect(apply("a😀b\n😁c", minimalChanges("a😀b\n😁c", "a😁b\n😀c"))).toBe("a😁b\n😀c");
   });
 });
diff --git a/src/editor/core/sync/DocSync.ts b/src/editor/core/sync/DocSync.ts
index b0bb67c3..b200c730 100644
--- a/src/editor/core/sync/DocSync.ts
+++ b/src/editor/core/sync/DocSync.ts
@@ -26,7 +26,7 @@
  */
 import { ChangeSet, Text } from "@codemirror/state";
 import type { TextChange } from "@/platform/ipc";
-import { minimalChange } from "./diff";
+import { minimalChanges } from "./diff";
 
 export interface SyncTransport {
   edit(baseVersion: number, changes: TextChange[]): Promise<number>;
@@ -258,9 +258,9 @@ export class DocSync {
     }
     if (gen !== this.generation || this.disposed) return;
     if (snap.version > this.serverVersion) {
-      const change = minimalChange(this.confirmed.toString(), snap.text);
+      const changes = minimalChanges(this.confirmed.toString(), snap.text);
       this.pendingRemote = this.pendingRemote.filter((p) => p.version > snap.version);
-      this.applyRemoteNow({ baseVersion: this.serverVersion, version: snap.version, changes: change ? [change] : [] });
+      this.applyRemoteNow({ baseVersion: this.serverVersion, version: snap.version, changes });
       this.drainRemote();
     }
     this.resend();
@@ -329,9 +329,9 @@ export class DocSync {
     this.pendingRemote = this.pendingRemote.filter((p) => p.version > snap.version);
     this.confirmed = Text.of(snap.text.split("\n"));
     this.serverVersion = snap.version;
-    const change = minimalChange(local, snap.text);
-    if (change) {
-      const cs = ChangeSet.of([change], local.length);
+    const changes = minimalChanges(local, snap.text);
+    if (changes.length) {
+      const cs = ChangeSet.of(changes, local.length);
       this.localText = this.confirmed;
       this.host.applyRemote(cs);
     }
diff --git a/src/editor/core/sync/diff.ts b/src/editor/core/sync/diff.ts
index 0e49eb7e..8f8a91e2 100644
--- a/src/editor/core/sync/diff.ts
+++ b/src/editor/core/sync/diff.ts
@@ -1,20 +1,11 @@
+import { diff } from "@codemirror/merge";
 import type { TextChange } from "@/platform/ipc";
 
 /**
- * The single replacement turning `a` into `b` (common prefix / suffix
- * trimmed), or null when equal. Linear time; used for resyncs, where the
- * backend's own patches are already minimal.
+ * The changes turning `a` into `b`, one per changed region; empty when equal. Used for resyncs:
+ * a single change spanning two distant edits would drag the caret and view to the first one.
+ * The timeout keeps a huge file from stalling the UI; past it the regions only get coarser.
  */
-export function minimalChange(a: string, b: string): TextChange | null {
-  if (a === b) return null;
-  const max = Math.min(a.length, b.length);
-  let start = 0;
-  while (start < max && a.charCodeAt(start) === b.charCodeAt(start)) start++;
-  let endA = a.length;
-  let endB = b.length;
-  while (endA > start && endB > start && a.charCodeAt(endA - 1) === b.charCodeAt(endB - 1)) {
-    endA--;
-    endB--;
-  }
-  return { from: start, to: endA, insert: b.slice(start, endB) };
+export function minimalChanges(a: string, b: string): TextChange[] {
+  return diff(a, b, { timeout: 50 }).map((c) => ({ from: c.fromA, to: c.toA, insert: b.slice(c.fromB, c.toB) }));
 }
diff --git a/src/editor/core/view/EditorArea.tsx b/src/editor/core/view/EditorArea.tsx
index 68ca7cd8..2dccfd9e 100644
--- a/src/editor/core/view/EditorArea.tsx
+++ b/src/editor/core/view/EditorArea.tsx
@@ -223,24 +223,23 @@ function PaneView({ paneId }: { paneId: string }) {
   const pinnedCount = tabs.filter((t) => t.pinned).length;
   // Settings › Editor Tabs › Tab placement Left / Right: a vertical, scrolling column.
   const vertical = tabPrefs.placement === "left" || tabPrefs.placement === "right";
-  const pinnedRow =
-    tabPrefs.pinnedSeparateRow && (vertical || !tabPrefs.multipleRows) && pinnedCount > 0 && pinnedCount < tabs.length;
+  const pinnedRow = tabPrefs.pinnedSeparateRow && pinnedCount > 0 && pinnedCount < tabs.length;
   const dnd = useMemo(() => {
     // A tab released outside the window detaches into a forced new window.
     const dropOutside = (raw: string) => {
       const p = parseTabPayload(raw);
       if (p) void ctrl.detachTab(p.paneId, p.tabId);
     };
-    const strip = (offset: number): TabsDnd => ({
+    const strip = (offset: number, pin?: boolean): TabsDnd => ({
       type: EDITOR_TAB_MIME,
       payload: (tabId) => JSON.stringify({ paneId, tabId }),
       onDrop: (raw, index) => {
         const p = parseTabPayload(raw);
-        if (p) ctrl.moveTab(p.paneId, p.tabId, paneId, index + offset);
+        if (p) ctrl.moveTab(p.paneId, p.tabId, paneId, index + offset, pin);
       },
       onDropOutside: dropOutside,
     });
-    return { all: strip(0), rest: strip(pinnedCount) };
+    return { all: strip(0), pinned: strip(0, true), rest: strip(pinnedCount, false) };
   }, [ctrl, paneId, pinnedCount]);
 
   // Dropping a tab or project files on the editor: an edge splits, the middle opens / moves here.
@@ -343,7 +342,7 @@ function PaneView({ paneId }: { paneId: string }) {
       {pinnedRow ? (
         // Settings › Editor Tabs › Show pinned tabs in a separate row.
         <div className={clsx(styles.tabRows, hidden && styles.tabsHidden)}>
-          {strip(items.slice(0, pinnedCount), dnd.all, vertical ? actions : undefined)}
+          {strip(items.slice(0, pinnedCount), dnd.pinned, vertical ? actions : undefined)}
           {strip(items.slice(pinnedCount), dnd.rest, vertical ? undefined : actions)}
         </div>
       ) : (
diff --git a/src/editor/core/view/FindBar.test.tsx b/src/editor/core/view/FindBar.test.tsx
index fbe16630..20edece8 100644
--- a/src/editor/core/view/FindBar.test.tsx
+++ b/src/editor/core/view/FindBar.test.tsx
@@ -9,7 +9,7 @@ import { getContext } from "@/platform/context";
 import { provideFindResults } from "@/workbench/contributions";
 import { registerEditorActions } from "../actions";
 import { findExtension, findResultLines } from "../cm/find";
-import { FindPanel, useFindOptions, useFindPreferences, type FindTarget } from "./FindBar";
+import { FindPanel, seedFind, useFindOptions, useFindPreferences, useFindSessions, type FindTarget } from "./FindBar";
 
 const disposers: Array<() => void> = [];
 afterEach(() => {
@@ -18,6 +18,7 @@ afterEach(() => {
     .reverse()
     .forEach((dispose) => dispose());
   useFindOptions.setState({ search: "", regexp: false, caseSensitive: false, wholeWord: false });
+  useFindSessions.setState({}, true);
   useFindPreferences.setState({ scrollToResults: true });
   useKeymap.setState({ preset: "intellij-macos", overrides: {} });
 });
@@ -147,3 +148,66 @@ describe("Find bar More actions", () => {
     expect(view.state.selection.main.empty).toBe(false);
   });
 });
+
+describe("Find bars on different editors", () => {
+  function editor(id: string, doc: string) {
+    const view = new EditorView({
+      parent: document.body,
+      state: EditorState.create({ doc, extensions: [findExtension()] }),
+    });
+    const target: FindTarget = { id, view: () => view, watch: () => () => {}, isOpen: () => true };
+    disposers.push(() => view.destroy());
+    return { view, target };
+  }
+  const panel = (target: FindTarget) => {
+    const r = render(
+      <FindPanel key={target.id} target={target} version={target.id} replace={false} seq={0} onClose={() => {}} />,
+    );
+    return { ...r, field: screen.getByRole("textbox", { name: "Find" }) };
+  };
+
+  it("keeps each editor's query and caret", () => {
+    const a = editor("a", "alpha\nbeta\nalpha");
+    const b = editor("b", "one\ntwo\nalpha\nthree");
+    disposers.push(registerEditorActions(), installKeyboardDispatcher());
+
+    seedFind(a.target, false);
+    const barA = panel(a.target);
+    setSearch(barA.field, "alpha");
+    expect(a.view.state.sliceDoc(a.view.state.selection.main.from, a.view.state.selection.main.to)).toBe("alpha");
+    barA.unmount();
+
+    // B has its caret on "two"; opening its bar starts from A's search without moving the caret.
+    b.view.dispatch({ selection: { anchor: 5 } });
+    seedFind(b.target, false);
+    const barB = panel(b.target);
+    expect(barB.field).toHaveValue("alpha");
+    expect(b.view.state.selection.main.head).toBe(5);
+    setSearch(barB.field, "three");
+    expect(b.view.state.sliceDoc(b.view.state.selection.main.from, b.view.state.selection.main.to)).toBe("three");
+    barB.unmount();
+
+    // Back on A: its own query, and showing the bar again leaves the caret where it was.
+    a.view.dispatch({ selection: { anchor: 8 } });
+    const againA = panel(a.target);
+    expect(againA.field).toHaveValue("alpha");
+    expect(a.view.state.selection.main.head).toBe(8);
+    expect(screen.getByText("?/2")).toBeInTheDocument();
+    againA.unmount();
+    expect(useFindSessions.getState().b?.search).toBe("three");
+    // A new bar starts from the last search, from whichever editor it came.
+    expect(useFindOptions.getState().search).toBe("three");
+  });
+
+  it("re-seeds an open bar from a new selection without touching other bars", () => {
+    const a = editor("a", "alpha beta");
+    const b = editor("b", "gamma");
+    seedFind(b.target, false);
+    act(() => useFindSessions.setState({ b: { ...useFindSessions.getState().b!, search: "gamma" } }));
+    seedFind(a.target, false);
+    a.view.dispatch({ selection: { anchor: 6, head: 10 } });
+    seedFind(a.target, false);
+    expect(useFindSessions.getState().a?.search).toBe("beta");
+    expect(useFindSessions.getState().b?.search).toBe("gamma");
+  });
+});
diff --git a/src/editor/core/view/FindBar.tsx b/src/editor/core/view/FindBar.tsx
index 438bee70..e7139b43 100644
--- a/src/editor/core/view/FindBar.tsx
+++ b/src/editor/core/view/FindBar.tsx
@@ -39,9 +39,19 @@ import { setContext } from "@/platform/context";
 import { showFindResults, type FindResultsSource } from "@/workbench/contributions";
 import { relativePath, useProject } from "@/platform/project";
 import { tx } from "@/platform/i18n";
-import { bindingsFor, hasPrimaryModifier, normalizeBinding, registerKeyClaim, shortcutLabel } from "@/platform/keymap";
+import {
+  bindingsFor,
+  formatBinding,
+  hasPrimaryModifier,
+  normalizeBinding,
+  registerKeyClaim,
+  shortcutLabel,
+} from "@/platform/keymap";
 
-/** The query is shared by all panes and survives closing the bar, like IDEA. */
+/**
+ * The last search (IDEA's find-in-file model): a newly opened bar starts from it and ⌘G
+ * uses it without a bar. Each open bar then keeps its own copy (`useFindSessions`).
+ */
 export const useFindOptions = create<Required<FindOptions>>(() => ({
   search: "",
   caseSensitive: false,
@@ -51,6 +61,21 @@ export const useFindOptions = create<Required<FindOptions>>(() => ({
   context: "any",
   preserveCase: false,
 }));
+/** The query and options of each open bar, by target id: bars on other files don't share them. */
+export const useFindSessions = create<Record<string, Required<FindOptions> | undefined>>(() => ({}));
+
+function optionsOf(id: string): Required<FindOptions> {
+  return useFindSessions.getState()[id] ?? useFindOptions.getState();
+}
+
+/** Changes a bar's options; like IDEA, the last search follows them. */
+function updateOptions(id: string, patch: (o: Required<FindOptions>) => Partial<FindOptions>) {
+  const current = optionsOf(id);
+  const next = { ...current, ...patch(current) };
+  useFindSessions.setState({ [id]: next });
+  useFindOptions.setState(next);
+}
+
 interface Counts {
   total: number;
   current: number;
@@ -76,31 +101,26 @@ export interface FindTarget {
   results?(options: FindOptions): FindResultsSource | null;
 }
 
-function activeView(paneId: string): EditorView | null {
-  const pane = useTabs.getState().panes[paneId];
-  if (!pane?.active) return null;
-  return editorController().slotFor(pane.active)?.view ?? null;
-}
+const activeTab = (paneId: string) => useTabs.getState().panes[paneId]?.active ?? null;
 
-const paneTargets = new Map<string, FindTarget>();
+const tabTargets = new Map<string, FindTarget>();
 
-function paneTarget(paneId: string): FindTarget {
-  let target = paneTargets.get(paneId);
+/** The editor of a tab: each tab has its own bar, like IDEA's per-editor search session. */
+function tabTarget(tabId: string): FindTarget {
+  let target = tabTargets.get(tabId);
   if (!target) {
     target = {
-      id: paneId,
-      view: () => activeView(paneId),
+      id: tabId,
+      view: () => editorController().slotFor(tabId)?.view ?? null,
       watch(fn) {
-        const tab = useTabs.getState().panes[paneId]?.active;
-        const slot = tab ? editorController().slotFor(tab) : null;
+        const slot = editorController().slotFor(tabId);
         if (!slot) return () => {};
         slot.listeners.add(fn);
         return () => void slot.listeners.delete(fn);
       },
-      isOpen: () => !!useFindBars.getState()[paneId],
+      isOpen: () => !!useFindBars.getState()[tabId],
       results(options) {
-        const tab = useTabs.getState().panes[paneId]?.active;
-        const slot = tab ? editorController().slotFor(tab) : null;
+        const slot = editorController().slotFor(tabId);
         if (!slot) return null;
         const state = slot.currentState();
         const scope = state.field(findScope, false) ?? { from: 0, to: state.doc.length };
@@ -136,7 +156,7 @@ function paneTarget(paneId: string): FindTarget {
         };
       },
     };
-    paneTargets.set(paneId, target);
+    tabTargets.set(tabId, target);
   }
   return target;
 }
@@ -151,19 +171,16 @@ export function findPanelTarget(arg?: unknown): FindTarget | undefined {
 
 export function openFindBarResults(arg?: unknown) {
   const target = findPanelTarget(arg);
-  const opts = useFindOptions.getState();
+  if (!target) return;
+  const opts = optionsOf(target.id);
   if (!opts.search || (opts.regexp && !regexValid(opts.search))) return;
-  const source = target?.results?.({ ...opts });
+  const source = target.results?.({ ...opts });
   if (source?.read().matches.length) {
-    rememberQuery(false);
+    rememberQuery(target.id, false);
     showFindResults(source);
   }
 }
 
-export function closeFindBar(paneId: string) {
-  useFindBars.setState({ [paneId]: undefined });
-}
-
 /** Longest selection that becomes the query. */
 const MAX_QUERY = 10_000;
 
@@ -174,48 +191,59 @@ const MAX_QUERY = 10_000;
  * multi-line query isn't kept for a later search without a selection.
  */
 export function openFindBar(paneId: string, replace: boolean) {
-  seedFind(paneTarget(paneId), replace);
-  useFindBars.setState((s) => ({ [paneId]: { replace, seq: (s[paneId]?.seq ?? 0) + 1 } }));
+  const tabId = activeTab(paneId);
+  if (!tabId) return;
+  seedFind(tabTarget(tabId), replace);
+  useFindBars.setState((s) => ({ [tabId]: { replace, seq: (s[tabId]?.seq ?? 0) + 1 } }));
 }
 
-/** The query and scope a bar opening over `target`'s selection starts with (see openFindBar). */
+/**
+ * The query and scope a bar opening over `target`'s selection starts with (see openFindBar).
+ * As in IDEA, a new bar copies the last search; an open one keeps its own query.
+ */
 export function seedFind(target: FindTarget, replace: boolean) {
   const view = target.view();
   const sel = view?.state.selection.main;
+  const open = !!useFindSessions.getState()[target.id];
+  const set = (patch: (o: Required<FindOptions>) => Partial<FindOptions>) => {
+    if (open) updateOptions(target.id, patch);
+    else
+      useFindSessions.setState({ [target.id]: { ...useFindOptions.getState(), ...patch(useFindOptions.getState()) } });
+  };
   if (view && sel && !sel.empty) {
     const text = view.state.sliceDoc(sel.from, sel.to);
     const multiline = text.includes("\n");
     openSelections.set(target.id, { from: sel.from, to: sel.to });
     if (multiline && replace) {
       view.dispatch({ effects: setFindScope.of({ from: sel.from, to: sel.to }) });
-      useFindOptions.setState({ search: "" });
+      set(() => ({ search: "" }));
     } else {
       view.dispatch({ effects: setFindScope.of(null) });
       if (text.length < MAX_QUERY)
-        useFindOptions.setState((o) => ({ search: o.regexp ? text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : text }));
+        set((o) => ({ search: o.regexp ? text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : text }));
+      else set(() => ({}));
     }
-  } else if (useFindOptions.getState().search.includes("\n")) {
-    useFindOptions.setState({ search: "" });
-  }
+  } else set((o) => (o.search.includes("\n") ? { search: "" } : {}));
 }
 
 /** Show / Hide Replace on the open bar, keeping its query and scope. */
-function setReplaceShown(paneId: string, replace: boolean) {
-  useFindBars.setState((s) => ({ [paneId]: { replace, seq: s[paneId]?.seq ?? 0 } }));
+function setReplaceShown(tabId: string, replace: boolean) {
+  useFindBars.setState((s) => ({ [tabId]: { replace, seq: s[tabId]?.seq ?? 0 } }));
 }
 
-/** ⌘G / ⇧⌘G: next / previous occurrence of the last search, with or without the bar. */
+/** ⌘G / ⇧⌘G: next / previous occurrence of the bar's search, or of the last one without a bar. */
 export function findAgain(paneId: string, forward: boolean) {
-  const target = paneTarget(paneId);
-  const view = target.view();
-  if (!view) return;
+  const tabId = activeTab(paneId);
+  if (!tabId) return;
+  const target = tabTarget(tabId);
+  if (!target.view()) return;
   if (!searchAgain(target, forward)) openFindBar(paneId, false);
 }
 
-/** Next / previous occurrence of the last search in `target`; false without a usable query. */
+/** Next / previous occurrence of `target`'s search; false without a usable query. */
 export function searchAgain(target: FindTarget, forward: boolean): boolean {
   const view = target.view();
-  const opts = useFindOptions.getState();
+  const opts = optionsOf(target.id);
   if (!view || !opts.search || (opts.regexp && !regexValid(opts.search))) return false;
   setQuery(view, opts);
   if (forward) findNext(view);
@@ -244,7 +272,7 @@ function toggleScope(target: FindTarget) {
 function recount(target: FindTarget) {
   const view = target.view();
   if (!view) return;
-  const opts = useFindOptions.getState();
+  const opts = optionsOf(target.id);
   const r = countMatches(view.state);
   const { from, to } = view.state.selection.main;
   useFindCounts.setState({ [target.id]: opts.search ? { ...r, excluded: isExcluded(view.state, from, to) } : null });
@@ -252,26 +280,28 @@ function recount(target: FindTarget) {
   view.dispatch({ effects: setFindMarks.of(opts.search ? r.starts : []) });
 }
 
-function rememberQuery(replace: boolean) {
-  const o = useFindOptions.getState();
+function rememberQuery(id: string, replace: boolean) {
+  const o = optionsOf(id);
   rememberSearch("find", o.search);
   if (replace) rememberSearch("replace", o.replace);
 }
 
 export function FindBar({ paneId }: { paneId: string }) {
-  const bar = useFindBars((s) => s[paneId]);
-  const activeTab = useTabs((s) => s.panes[paneId]?.active ?? null);
-  if (!bar) return null;
+  const tabId = useTabs((s) => s.panes[paneId]?.active ?? null);
+  const bar = useFindBars((s) => (tabId ? s[tabId] : undefined));
+  if (!tabId || !bar) return null;
+  const target = tabTarget(tabId);
   return (
     <FindPanel
-      target={paneTarget(paneId)}
-      version={activeTab}
+      key={tabId}
+      target={target}
+      version={tabId}
       replace={bar.replace}
       seq={bar.seq}
-      onReplaceShown={(replace) => setReplaceShown(paneId, replace)}
+      onReplaceShown={(replace) => setReplaceShown(tabId, replace)}
       onClose={() => {
-        closeFindBar(paneId);
-        activeView(paneId)?.focus();
+        useFindBars.setState({ [tabId]: undefined });
+        target.view()?.focus();
       }}
     />
   );
@@ -292,7 +322,8 @@ export interface FindPanelProps {
 
 export function FindPanel({ target, version, replace, seq, onReplaceShown, onClose }: FindPanelProps) {
   const id = target.id;
-  const opts = useFindOptions();
+  const lastOptions = useFindOptions();
+  const opts = useFindSessions((s) => s[id]) ?? lastOptions;
   const count = useFindCounts((s) => s[id] ?? null);
   const scoped = useFindScoped((s) => !!s[id]);
   const inputRef = useRef<HTMLInputElement>(null);
@@ -306,7 +337,7 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
   const filterRef = useRef<HTMLButtonElement>(null);
   const [historyMenu, setHistoryMenu] = useState<"find" | "replace" | null>(null);
   const [filterMenu, setFilterMenu] = useState(false);
-  const setOpts = (patch: Partial<FindOptions>) => useFindOptions.setState(patch);
+  const setOpts = (patch: Partial<FindOptions>) => updateOptions(id, () => patch);
 
   useLayoutEffect(() => {
     panelTargets.set(id, target);
@@ -353,14 +384,19 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
     inputRef.current?.select();
   }, [seq]);
 
-  // Push the query into the editor; incremental search selects the nearest match.
+  // Push the query into the editor. Like IDEA, only a change of the query (typing, options)
+  // selects the nearest match: showing the bar again over its editor leaves the caret alone.
+  const shown = useRef<{ target: FindTarget; version: unknown; opts: FindOptions } | null>(null);
   useEffect(() => {
     const view = target.view();
     if (!view) return;
+    const prev = shown.current;
+    const changed = prev?.target === target && prev.version === version && prev.opts !== opts;
+    shown.current = { target, version, opts };
     const valid = !opts.regexp || regexValid(opts.search);
     setQuery(view, valid ? opts : { ...opts, search: "" });
     view.dispatch({ effects: setFindOpen.of(true) });
-    if (valid && opts.search && useFindPreferences.getState().scrollToResults) {
+    if (changed && valid && opts.search && useFindPreferences.getState().scrollToResults) {
       const from = view.state.selection.main.from;
       view.dispatch({ selection: { anchor: from } });
       findNext(view);
@@ -385,13 +421,16 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
   // Closing clears highlights, marks and the selection scope (not React's dev-mode remount).
   useEffect(
     () => () => {
-      if (!target.isOpen()) target.view()?.dispatch({ effects: [setFindOpen.of(false)] });
+      if (target.isOpen()) return;
+      target.view()?.dispatch({ effects: [setFindOpen.of(false)] });
+      useFindSessions.setState({ [target.id]: undefined });
+      tabTargets.delete(target.id);
     },
     [target],
   );
 
   const close = () => {
-    rememberQuery(replace);
+    rememberQuery(id, replace);
     onClose();
   };
   const run = (cmd: (v: EditorView) => boolean) => {
@@ -400,15 +439,15 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
     recount(target);
   };
   const doReplace = () => {
-    rememberQuery(true);
+    rememberQuery(id, true);
     run((v) => replaceNext(v, opts.preserveCase));
   };
   const doReplaceAll = () => {
-    rememberQuery(true);
+    rememberQuery(id, true);
     run((v) => replaceAll(v, opts.preserveCase));
   };
   const toggle = (key: "caseSensitive" | "wholeWord" | "regexp" | "preserveCase") =>
-    useFindOptions.setState((o) => ({ [key]: !o[key] }));
+    updateOptions(id, (o) => ({ [key]: !o[key] }));
 
   const onKeyDown = (e: KeyboardEvent, field: "find" | "replace") => {
     const input = e.target as HTMLTextAreaElement | HTMLInputElement;
@@ -428,7 +467,7 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
         if (hasPrimaryModifier(e)) doReplaceAll();
         else doReplace();
       } else {
-        if (e.key === "Enter") rememberQuery(false);
+        if (e.key === "Enter") rememberQuery(id, false);
         run(back ? findPrevious : findNext);
       }
     } else if (e.altKey && !e.metaKey && !e.ctrlKey) {
@@ -484,7 +523,12 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
       : [{ label: kind === "find" ? "No recent searches" : "No recent replacements", disabled: true }];
   };
   const filterItems: MenuItem[] = [
-    { label: "Search In Selection", shortcut: "⌥E", checked: scoped || undefined, run: () => toggleScope(target) },
+    {
+      label: "Search In Selection",
+      shortcut: formatBinding("Alt+E"),
+      checked: scoped || undefined,
+      run: () => toggleScope(target),
+    },
     { kind: "separator" },
     { kind: "header", label: "Search Scope" },
     ...SEARCH_CONTEXTS.map((c) => ({
@@ -563,7 +607,7 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
               id: "case",
               icon: "case",
               title: "Match Case",
-              shortcut: "⌥C",
+              shortcut: formatBinding("Alt+C"),
               pressed: opts.caseSensitive,
               onToggle: () => toggle("caseSensitive"),
             },
@@ -571,7 +615,7 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
               id: "word",
               icon: "word",
               title: "Words",
-              shortcut: "⌥W",
+              shortcut: formatBinding("Alt+W"),
               pressed: opts.wholeWord,
               onToggle: () => toggle("wholeWord"),
             },
@@ -579,7 +623,7 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
               id: "regex",
               icon: "regex",
               title: "Regex",
-              shortcut: "⌥X",
+              shortcut: formatBinding("Alt+X"),
               pressed: opts.regexp,
               onToggle: () => toggle("regexp"),
             },
@@ -593,11 +637,17 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
         <IconButton
           icon="arrow-up"
           title="Previous Occurrence"
-          shortcut="⇧↵"
+          shortcut={formatBinding("Shift+Enter")}
           size="small"
           onClick={() => run(findPrevious)}
         />
-        <IconButton icon="arrow-down" title="Next Occurrence" shortcut="↵" size="small" onClick={() => run(findNext)} />
+        <IconButton
+          icon="arrow-down"
+          title="Next Occurrence"
+          shortcut={formatBinding("Enter")}
+          size="small"
+          onClick={() => run(findNext)}
+        />
         <IconButton
           ref={filterRef}
           icon="filter"
@@ -633,15 +683,27 @@ export function FindPanel({ target, version, replace, seq, onReplaceShown, onClo
             />
           </div>
           <div className={styles.replaceButtons}>
-            <Button size="small" title="Replace (⌥P)" onClick={doReplace} disabled={!canReplace}>
+            <Button
+              size="small"
+              title={tx`Replace (${formatBinding("Alt+P")})`}
+              onClick={doReplace}
+              disabled={!canReplace}
+            >
               <T>Replace</T>
             </Button>
-            <Button size="small" title="Replace All (⌥A)" onClick={doReplaceAll} disabled={!canReplace}>
+            <Button
+              size="small"
+              title={tx`Replace All (${formatBinding("Alt+A")})`}
+              onClick={doReplaceAll}
+              disabled={!canReplace}
+            >
               <T>Replace All</T>
             </Button>
             <Button
               size="small"
-              title={count?.excluded ? "Include (⌥L)" : "Exclude (⌥L)"}
+              title={
+                count?.excluded ? tx`Include (${formatBinding("Alt+L")})` : tx`Exclude (${formatBinding("Alt+L")})`
+              }
               onClick={() => run(excludeCurrent)}
               disabled={!canReplace || (!count?.total && !count?.excluded)}
             >
diff --git a/src/editor/core/view/pinnedTabsRow.test.tsx b/src/editor/core/view/pinnedTabsRow.test.tsx
new file mode 100644
index 00000000..55bb45c0
--- /dev/null
+++ b/src/editor/core/view/pinnedTabsRow.test.tsx
@@ -0,0 +1,72 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { cleanup, render, screen, within } from "@testing-library/react";
+import { useProject } from "@/platform/project";
+import { useTabs } from "../controller";
+import type { Tab } from "../model/tabs";
+import { EditorAreaView } from "./EditorArea";
+
+vi.mock("../controller", async (original) => ({
+  ...(await original<object>()),
+  editorController: () => ({ publishContext: vi.fn(), tabMenu: () => [] }),
+}));
+vi.mock("./TextEditorHost", () => ({ TextEditorHost: () => <input aria-label="Source" /> }));
+vi.mock("./FindBar", () => ({ FindBar: () => null }));
+vi.mock("./Banner", () => ({ EditorBanners: () => null, VirtualBanner: () => null }));
+vi.mock("./StatusItems", () => ({ CodeBreadcrumbs: () => null }));
+
+const tab = (n: number, pinned: boolean): Tab => ({
+  id: `t${n}`,
+  input: { kind: "file", key: `/p/f${n}.txt`, path: `/p/f${n}.txt` },
+  preview: false,
+  pinned,
+});
+const originalTabs = useTabs.getState();
+const originalProject = useProject.getState();
+
+function seed(pinned: boolean[], tabs: Record<string, unknown>) {
+  const list = pinned.map((p, i) => tab(i + 1, p));
+  useTabs.setState({
+    layout: { kind: "pane", paneId: "p1" },
+    panes: { p1: { id: "p1", tabs: list, active: list[0]!.id, mru: list.map((t) => t.id) } },
+    activePane: "p1",
+    closed: [],
+  });
+  useProject.setState({ settings: { editor: { tabs } } as never });
+}
+
+beforeEach(() => cleanup());
+afterEach(() => {
+  cleanup();
+  useTabs.setState(originalTabs, true);
+  useProject.setState(originalProject, true);
+});
+
+describe("pinned tabs in a separate row", () => {
+  it.each([
+    { placement: "top", multipleRows: true, pinnedSeparateRow: true, rows: 2 },
+    { placement: "bottom", multipleRows: true, pinnedSeparateRow: true, rows: 2 },
+    { placement: "top", multipleRows: false, pinnedSeparateRow: true, rows: 2 },
+    { placement: "left", multipleRows: false, pinnedSeparateRow: true, rows: 2 },
+    { placement: "top", multipleRows: true, pinnedSeparateRow: false, rows: 1 },
+    { placement: "top", multipleRows: false, pinnedSeparateRow: false, rows: 1 },
+  ])("$placement multipleRows=$multipleRows pinnedRow=$pinnedSeparateRow → $rows strip(s)", (c) => {
+    const { rows, ...tabs } = c;
+    seed([true, true, false, false, false], tabs);
+    render(<EditorAreaView />);
+    const lists = screen.getAllByRole("tablist", { name: "Editor tabs" });
+    expect(lists).toHaveLength(rows);
+    if (rows === 2) {
+      expect(within(lists[0]!).getAllByRole("tab")).toHaveLength(2);
+      expect(within(lists[1]!).getAllByRole("tab")).toHaveLength(3);
+    }
+  });
+
+  it.each([
+    ["every tab pinned", [true, true, true]],
+    ["no tab pinned", [false, false, false]],
+  ])("%s → one strip", (_, pinned) => {
+    seed(pinned, { placement: "top", multipleRows: true, pinnedSeparateRow: true });
+    render(<EditorAreaView />);
+    expect(screen.getAllByRole("tablist", { name: "Editor tabs" })).toHaveLength(1);
+  });
+});
diff --git a/src/editor/lineTokens.tsx b/src/editor/lineTokens.tsx
index 7fa21dff..0468f997 100644
--- a/src/editor/lineTokens.tsx
+++ b/src/editor/lineTokens.tsx
@@ -3,12 +3,13 @@
  * `ChunkExtractor`: each file is parsed whole once, so a line inside a block
  * comment or a multi-line string is coloured as such.
  */
-import { useEffect, useState, type ReactNode } from "react";
+import { useEffect, useState } from "react";
 import { Text } from "@codemirror/state";
 import { editorsFor } from "@/editor/api";
 import { codeHighlighter, highlightTokens, languageForPath, type CodeToken } from "@/editor/lsp/markdown";
 import { call, commands } from "@/platform/ipc";
 import { isVirtualUri, virtualDocument } from "@/platform/virtualDocs";
+import type { SourceColorizer } from "@/ui/SourcePreview";
 
 export type { CodeToken };
 
@@ -135,33 +136,7 @@ export function useLineTokens(source: LineSource | undefined, text: string): Cod
   return loaded?.key === key ? loaded.tokens : peekLineTokens({ path, line, col }, text);
 }
 
-/**
- * `text` between `from` and `to` as spans with the tokens' `tok-*` classes
- * (styled by the caller); `key` prefixes the React keys.
- */
-export function tokenSpans(
-  text: string,
-  from: number,
-  to: number,
-  tokens: readonly CodeToken[] | null,
-  key = "",
-): ReactNode[] {
-  if (!tokens?.length) return [text.slice(from, to)];
-  const out: ReactNode[] = [];
-  let pos = from;
-  for (const t of tokens) {
-    if (t.to <= pos) continue;
-    if (t.from >= to) break;
-    const s = Math.max(t.from, pos);
-    const e = Math.min(t.to, to);
-    if (s > pos) out.push(text.slice(pos, s));
-    out.push(
-      <span key={`${key}${s}`} className={t.cls}>
-        {text.slice(s, e)}
-      </span>,
-    );
-    pos = e;
-  }
-  if (pos < to) out.push(text.slice(pos, to));
-  return out;
-}
+export { tokenSpans } from "@/ui/tokenSpans";
+
+/** Whole-file syntax colours for `SourcePreview` (its `colorize` prop). */
+export const previewColors: SourceColorizer = (text, path) => codeHighlighter(text, languageForPath(path));
diff --git a/src/editor/lsp/Popups.tsx b/src/editor/lsp/Popups.tsx
index 25986f0d..2c8288ef 100644
--- a/src/editor/lsp/Popups.tsx
+++ b/src/editor/lsp/Popups.tsx
@@ -488,7 +488,7 @@ function DefinitionPopup({ popup }: { popup: Extract<LspPopup, { kind: "definiti
     <Popup open anchor={popup.anchor} onClose={closePopup} aria-label="Definition" className={styles.defPopup}>
       <div className={styles.defFrame} tabIndex={-1} data-autofocus onKeyDown={onKeyDown}>
         <div className={styles.defHeader}>
-          <Icon name={fileIconName(basename(location.path))} size={14} />
+          <Icon name={fileIconName(basename(location.path), location.path)} size={14} />
           {many ? (
             <Select
               variant="ghost"
@@ -579,7 +579,7 @@ function PreviewDialog({ popup }: { popup: Extract<LspPopup, { kind: "preview" }
         <ul className={styles.previewList} aria-label={tx("Changes")}>
           {summary.entries.map((e) => (
             <li key={e.path} className={styles.previewRow}>
-              <Icon name={fileIconName(basename(e.path))} size={14} className={styles.itemIcon} />
+              <Icon name={fileIconName(basename(e.path), e.path)} size={14} className={styles.itemIcon} />
               <span className={styles.previewName}>{basename(e.path)}</span>
               <span className={styles.previewPath}>{relativePath(root, e.path)}</span>
               <span className={styles.spacer} />
diff --git a/src/editor/lsp/actions.ts b/src/editor/lsp/actions.ts
index 2765aca5..40cc2cfb 100644
--- a/src/editor/lsp/actions.ts
+++ b/src/editor/lsp/actions.ts
@@ -19,7 +19,13 @@ import { workflowSettings, type ActionsOnSaveValid } from "@/platform/workflowSe
 import { startRename } from "./rename";
 import { formatDocument, reformatDialog } from "./format";
 import { showHint } from "./hint";
-import { refactorThis, runRefactoring, safeDelete, showNothingHere } from "@/editor/refactor";
+import {
+  refactorThis,
+  runRefactoring,
+  safeDelete,
+  showNothingHere,
+  startHierarchyRefactoring,
+} from "@/editor/refactor";
 import { evaluateWhen } from "@/platform/context";
 
 /** Editor actions apply to the active text editor unless a tool window or popup owns the keyboard. */
@@ -314,6 +320,12 @@ export function registerLspActions(): () => void {
       { keyWhen: GENERATE_KEY_WHEN },
     ),
     editorAction("refactor.inline", "Inline…", "Refactor", (v) => runRefactoring(v, "inline")),
+    editorAction("refactor.pullMembersUp", "Pull Members Up…", "Refactor", (v) =>
+      startHierarchyRefactoring(v, "pullUp"),
+    ),
+    editorAction("refactor.pushMembersDown", "Push Members Down…", "Refactor", (v) =>
+      startHierarchyRefactoring(v, "pushDown"),
+    ),
     // Implement / Override Methods: the server's code actions for them (jdtls "Override/Implement
     // Methods…", rust-analyzer "Implement missing members", TS "Implement interface"…).
     editorAction("code.implementMethods", "Implement Methods…", "Code", (v) =>
diff --git a/src/editor/lsp/features.test.ts b/src/editor/lsp/features.test.ts
index 357d35ec..0d23cf9b 100644
--- a/src/editor/lsp/features.test.ts
+++ b/src/editor/lsp/features.test.ts
@@ -44,6 +44,18 @@ describe("semanticRanges", () => {
     expect(semanticRanges(doc, input)).toEqual([{ from: 0, to: 3, className: "cm-sem-function" }]);
   });
 
+  it("marks globals (lua-language-server's `global` modifier)", () => {
+    const input = {
+      tokenTypes: ["variable", "function"],
+      tokenModifiers: ["global"],
+      data: [0, 0, 3, 0, 1, 0, 4, 3, 1, 1],
+    };
+    expect(semanticRanges(doc, input)).toEqual([
+      { from: 0, to: 3, className: "cm-sem-global" },
+      { from: 4, to: 7, className: "cm-sem-function cm-sem-global" },
+    ]);
+  });
+
   it("colours a constructor (jdtls: class + `constructor`) as a function", () => {
     const input = { tokenTypes: ["class"], tokenModifiers: ["constructor", "declaration"], data: [0, 0, 3, 0, 0b11] };
     expect(semanticRanges(doc, input)[0]?.className).toBe("cm-sem-function cm-sem-declaration");
diff --git a/src/editor/lsp/index.ts b/src/editor/lsp/index.ts
index 0b8cc1f1..8816b715 100644
--- a/src/editor/lsp/index.ts
+++ b/src/editor/lsp/index.ts
@@ -39,6 +39,7 @@ import { DOCUMENTATION_WINDOW } from "./docs";
 import { prefetchMarkdown } from "./markdown";
 import { outsideProjectBanner } from "./outsideProject";
 import { implementationGutter, registerNavigationActions } from "@/editor/navigation";
+import { HierarchyDialog } from "@/editor/refactor";
 
 export function lspExtensions(ctx: EditorDocContext): Extension[] {
   return [
@@ -74,6 +75,7 @@ export function activate(): () => void {
     // After the templates (order 90): live template / postfix expansion keeps ⇥ first.
     registerEditorContribution({ id: "lsp.parameterTab", order: 95, extensions: () => parameterTabKeys }),
     registerOverlay({ id: "editor-lsp.popups", component: LspPopups }),
+    registerOverlay({ id: "editor-lsp.hierarchyDialog", component: HierarchyDialog }),
     registerEditorBanner(outsideProjectBanner),
     registerStatusItem({ id: "editor-lsp.usagesStatus", align: "left", priority: 10, component: UsagesStatus }),
     // IDEA's Documentation tool window: right side, listed once F1 moved documentation there.
diff --git a/src/editor/lsp/links.test.ts b/src/editor/lsp/links.test.ts
index f4c47d79..801d3b61 100644
--- a/src/editor/lsp/links.test.ts
+++ b/src/editor/lsp/links.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { Text } from "@codemirror/state";
-import { fragmentOffset, linkReference, looksLikePath, textReference } from "./links";
+import { fragmentOffset, linkReference, looksLikePath, resolvePath, textReference } from "./links";
 
 const at = (src: string, marker = "|") => {
   const offset = src.indexOf(marker);
@@ -28,6 +28,20 @@ describe("text references", () => {
     expect(textReference(text, offset)).toMatchObject({ kind: "path", value: "img/logo.svg" });
   });
 
+  it("finds fragment-only link targets", () => {
+    for (const source of ["[artist::order](#Artist-or|der)", '<a href="#Artist-or|der">order</a>']) {
+      const { text, offset } = at(source);
+      expect(textReference(text, offset)).toMatchObject({ kind: "path", value: "#Artist-order" });
+    }
+  });
+
+  it("does not treat arbitrary fragment strings as links", () => {
+    for (const source of ['const color = "#ff|f"', '<a id="Artist-or|der">', "url(#ic|on)"]) {
+      const { text, offset } = at(source);
+      expect(textReference(text, offset)).toBeNull();
+    }
+  });
+
   it("ignores prose and identifiers", () => {
     expect(looksLikePath("hello world.txt")).toBe(false);
     expect(looksLikePath("utf-8")).toBe(false);
@@ -41,6 +55,18 @@ describe("text references", () => {
 });
 
 describe("links and fragments", () => {
+  it("resolves local fragments without probing the filesystem", async () => {
+    const ref = { kind: "path" as const, from: 5, to: 20, value: "#Artist%2Dorder" };
+    expect(await resolvePath(ref, "/p/notes.md")).toEqual({
+      kind: "file",
+      from: 5,
+      to: 20,
+      path: "/p/notes.md",
+      fragment: "Artist-order",
+    });
+    expect(await resolvePath({ ...ref, value: "#bad%" }, "/p/notes.md")).toBeNull();
+  });
+
   it("picks the server link around the offset", () => {
     const text = Text.of(['<a href="b.html#top">']);
     const range = { start: { line: 0, col: 9 }, end: { line: 0, col: 19 } };
@@ -55,6 +81,12 @@ describe("links and fragments", () => {
     const html = '<p>\n<div class="x" id="main">';
     expect(fragmentOffset(html, "/i.html", "main")).toBe(html.indexOf("id="));
     expect(fragmentOffset("# Intro\n\n## Getting Started!\n", "/r.md", "getting-started")).toBe(9);
+    for (const path of ["/r.md", "/r.markdown", "/r.mdx"]) {
+      for (const attr of ["id", "name"]) {
+        const source = `[artist::order](#Artist-order)\n\n<a ${attr}="Artist-order"></a>`;
+        expect(fragmentOffset(source, path, "Artist-order")).toBe(source.indexOf(`${attr}=`));
+      }
+    }
     expect(fragmentOffset("x", "/i.html", "nope")).toBeNull();
   });
 });
diff --git a/src/editor/lsp/links.ts b/src/editor/lsp/links.ts
index 675862c7..4deb9695 100644
--- a/src/editor/lsp/links.ts
+++ b/src/editor/lsp/links.ts
@@ -87,14 +87,19 @@ export function textReference(text: Text, offset: number): Reference | null {
       return { kind: "url", from: line.from + m.index, to: line.from + m.index + m[0].length, url: m[0] };
   }
   const strings = [
-    ...[...line.text.matchAll(QUOTED_RE)].map((m) => ({ value: m[1] ?? m[2] ?? m[3] ?? "", from: m.index + 1 })),
+    ...[...line.text.matchAll(QUOTED_RE)].map((m) => ({
+      value: m[1] ?? m[2] ?? m[3] ?? "",
+      from: m.index + 1,
+      fragment: /\bhref\s*=\s*$/i.test(line.text.slice(0, m.index)),
+    })),
     ...[...line.text.matchAll(BARE_RE)].map((m) => {
       const value = m[1] ?? m[2] ?? "";
-      return { value, from: m.index + m[0].indexOf(value) };
+      return { value, from: m.index + m[0].indexOf(value), fragment: m[1] !== undefined };
     }),
   ];
-  for (const { value, from } of strings) {
-    if (col < from || col > from + value.length || !looksLikePath(value)) continue;
+  for (const { value, from, fragment } of strings) {
+    if (col < from || col > from + value.length || (!looksLikePath(value) && !(fragment && /^#[^\s]+$/.test(value))))
+      continue;
     return { kind: "path", from: line.from + from, to: line.from + from + value.length, value };
   }
   return null;
@@ -113,6 +118,13 @@ async function isFile(path: string): Promise<boolean> {
 /** Resolves a `path` reference (in the backend, like IDEA's file references); null when nothing exists there. */
 export async function resolvePath(ref: Reference, from: string): Promise<Reference | null> {
   if (ref.kind !== "path") return ref;
+  if (ref.value.startsWith("#")) {
+    try {
+      return { kind: "file", from: ref.from, to: ref.to, path: from, fragment: decodeURIComponent(ref.value.slice(1)) };
+    } catch {
+      return null;
+    }
+  }
   if (!isTauri()) return null;
   const path = await call(commands.fsResolveReference(from, ref.value)).catch(() => null);
   if (!path) return null;
@@ -142,7 +154,6 @@ export function fragmentOffset(text: string, path: string, fragment: string): nu
       if (h && slug(h[1]!) === fragment.toLowerCase()) return offset;
       offset += l.length + 1;
     }
-    return null;
   }
   const m = new RegExp(`\\b(?:id|name)\\s*=\\s*["']?${esc}(?=["'\\s>])`).exec(text);
   return m ? m.index : null;
diff --git a/src/editor/lsp/markdown.test.ts b/src/editor/lsp/markdown.test.ts
index d73575a6..c3b5e2f5 100644
--- a/src/editor/lsp/markdown.test.ts
+++ b/src/editor/lsp/markdown.test.ts
@@ -7,6 +7,39 @@ async function freshMarkdown() {
 }
 
 describe("markdown rendering", () => {
+  it.each([
+    "<style>body{outline:7px solid red}</style>",
+    '<form action="https://example.com/x"><button>go</button></form>',
+    '<div style="position:fixed">x</div>',
+    '<link rel="stylesheet" href="https://example.com/x.css">',
+    '<meta http-equiv="refresh" content="0;url=https://example.com">',
+    '<base href="https://example.com/">',
+    '<iframe src="https://example.com"></iframe>',
+    '<button formaction="https://example.com/x">go</button>',
+  ])("keeps raw markup from reaching the page: %s", async (raw) => {
+    const md = await freshMarkdown();
+    await md.loadMarkdown();
+    const root = document.createElement("div");
+    root.innerHTML = md.markupToHtml({ kind: "markdown", value: `text\n\n${raw}\n` });
+    expect(root.querySelector("style, form, link, meta, base, iframe, [style], [formaction]")).toBeNull();
+    expect(root.textContent).not.toContain("outline");
+  });
+
+  it("keeps the links and tables comments and docs rely on", async () => {
+    const md = await freshMarkdown();
+    await md.loadMarkdown();
+    const root = document.createElement("div");
+    root.innerHTML = md.markupToHtml({
+      kind: "markdown",
+      value: "[doc](jdt://contents/a.class) [web](https://example.com)\n\n| A |\n| - |\n| 1 |\n",
+    });
+    expect([...root.querySelectorAll("a")].map((a) => a.getAttribute("href"))).toEqual([
+      "jdt://contents/a.class",
+      "https://example.com",
+    ]);
+    expect(root.querySelector("td")?.textContent).toBe("1");
+  });
+
   it("shows plain text until the parser loads, then the rendered markup", async () => {
     const md = await freshMarkdown();
     const el = md.renderMarkup({ kind: "markdown", value: "**bold** <img src=x onerror=alert(1)>" });
diff --git a/src/editor/lsp/markdownParser.ts b/src/editor/lsp/markdownParser.ts
index 2f4698aa..e4473eda 100644
--- a/src/editor/lsp/markdownParser.ts
+++ b/src/editor/lsp/markdownParser.ts
@@ -9,5 +9,11 @@ const marked = new Marked({ gfm: true, breaks: false });
 
 export function markdownToSafeHtml(markdown: string): string {
   const html = marked.parse(markdown, { async: false }) as string;
-  return DOMPurify.sanitize(html, { USE_PROFILES: { html: true }, ALLOWED_URI_REGEXP: ALLOWED_URI });
+  // Comments and docs come from anyone; a `<style>` here would restyle the whole IDE.
+  return DOMPurify.sanitize(html, {
+    USE_PROFILES: { html: true },
+    ALLOWED_URI_REGEXP: ALLOWED_URI,
+    FORBID_TAGS: ["style", "form"],
+    FORBID_ATTR: ["style"],
+  });
 }
diff --git a/src/editor/lsp/navigation.ts b/src/editor/lsp/navigation.ts
index 23d7b657..6b27c97e 100644
--- a/src/editor/lsp/navigation.ts
+++ b/src/editor/lsp/navigation.ts
@@ -50,7 +50,15 @@ import { showHint, showPendingHint } from "./hint";
 import { outsideProjectReason } from "./outsideProject";
 import { caretAnchor, openPopup, type ListPopupItem } from "./popupStore";
 import { readManyFileLines, targetLabel } from "./files";
-import { documentLinks, followReference, knownLinks, linkReference, referenceAt, textReference } from "./links";
+import {
+  documentLinks,
+  followReference,
+  fragmentOffset,
+  knownLinks,
+  linkReference,
+  referenceAt,
+  textReference,
+} from "./links";
 import { featureBackoff } from "./availability";
 import { requestHover, showPhpConstructDocumentation } from "./hover";
 import { declarationSummary, renderCode } from "./markdown";
@@ -118,7 +126,7 @@ export async function locationItems(locs: readonly DeclarationTarget[]): Promise
       label: name ?? basename(l.path),
       detail: name ? `${basename(l.path)} · ${where}` : where,
       preview,
-      icon: fileIconName(basename(l.path)),
+      icon: fileIconName(basename(l.path), l.path),
       run: () => navigateTo(l),
     };
   });
@@ -277,6 +285,14 @@ async function followReferenceAt(view: EditorView, doc: EditorDocContext, offset
   const ref = await referenceAt(view, doc, offset);
   if (!ref) return false;
   try {
+    if (ref.kind === "file" && ref.path === doc.path && ref.fragment) {
+      const target = fragmentOffset(view.state.doc.toString(), doc.path, ref.fragment);
+      if (target !== null) {
+        view.dispatch({ selection: EditorSelection.cursor(target), effects: EditorView.scrollIntoView(target) });
+        view.focus();
+        return true;
+      }
+    }
     await followReference(ref);
   } catch (e) {
     showHint(view, e instanceof Error ? e.message : String(e), { tone: "error" });
diff --git a/src/editor/lsp/outsideProject.test.ts b/src/editor/lsp/outsideProject.test.ts
index df0514b2..72296903 100644
--- a/src/editor/lsp/outsideProject.test.ts
+++ b/src/editor/lsp/outsideProject.test.ts
@@ -1,4 +1,5 @@
-import { expect, it } from "vitest";
+import { afterEach, expect, it } from "vitest";
+import { useProject } from "@/platform/project";
 import { outsideProjectNotice } from "./outsideProject";
 
 const text = (message: string) => outsideProjectNotice(message)?.text ?? null;
@@ -36,7 +37,22 @@ it("recognizes each server's report that a file is outside its projects", () =>
   expect(outsideProjectNotice("No packages found for open file x.go.")?.reload).toBeFalsy();
 });
 
+afterEach(() => useProject.setState({ project: null }));
+
+const openProject = (root: string, projects?: string[]) =>
+  useProject.setState({
+    project: {
+      root,
+      name: "p",
+      trusted: true,
+      isGit: false,
+      settings: {},
+      ...(projects && { workspace: { version: 1, name: "p", projects } }),
+    },
+  });
+
 it("shows a banner while the server reports the file, with the build reloads available", async () => {
+  openProject("/p");
   const { renderHook, act } = await import("@testing-library/react");
   const { setFileDiagnostics } = await import("./diagnostics");
   const { registerActions } = await import("@/platform/actions");
@@ -64,3 +80,39 @@ it("shows a banner while the server reports the file, with the build reloads ava
     setFileDiagnostics(path, "jdtls", []);
   }
 });
+
+it("offers a build reload only for files of the open project", async () => {
+  const { renderHook, act } = await import("@testing-library/react");
+  const { setFileDiagnostics } = await import("./diagnostics");
+  const { registerActions } = await import("@/platform/actions");
+  const { outsideProjectBanner } = await import("./outsideProject");
+  const off = registerActions([{ id: "maven.reload", title: "Reload All Maven Projects", run: () => {} }]);
+  openProject("/ws", ["/p"]);
+  // A scratch lives in the app data dir; a module the import missed lives in the project.
+  const cases: [string, string[]][] = [
+    ["/data/scratches/scratch.java", []],
+    ["/p/tools/Gen.java", ["Reload Maven Projects"]],
+    ["/ws/Gen.java", ["Reload Maven Projects"]],
+  ];
+  try {
+    for (const [path, labels] of cases) {
+      const { result } = renderHook(() => outsideProjectBanner.useBanner(path));
+      const warning = {
+        range: { start: { line: 0, col: 0 }, end: { line: 0, col: 1 } },
+        severity: "warning" as const,
+        message: `${path.split("/").pop()} is a non-project file, only syntax errors are reported`,
+        source: "Java",
+        code: "32",
+      };
+      act(() => setFileDiagnostics(path, "jdtls", [warning]));
+      expect(result.current?.text, path).toMatch(/only JDK classes resolve/);
+      expect(
+        result.current?.actions?.map((a) => a.label),
+        path,
+      ).toEqual(labels);
+      act(() => setFileDiagnostics(path, "jdtls", []));
+    }
+  } finally {
+    off();
+  }
+});
diff --git a/src/editor/lsp/outsideProject.ts b/src/editor/lsp/outsideProject.ts
index 7ce7ec88..9d8c8e85 100644
--- a/src/editor/lsp/outsideProject.ts
+++ b/src/editor/lsp/outsideProject.ts
@@ -6,10 +6,15 @@
  */
 import { useSyncExternalStore } from "react";
 import { executeAction, getAction, isActionEnabled } from "@/platform/actions";
+import { isSameOrInside } from "@/platform/paths";
+import { useProject } from "@/platform/project";
 import type { EditorBannerContribution } from "@/workbench/contributions";
 import { diagnosticsFor, subscribeDiagnostics } from "./diagnostics";
 
-/** `reload`: a build reload may bring the file into a project (a module the import missed). */
+/**
+ * `reload`: a build reload may bring the file into a project (a module the import missed); offered
+ * only for files inside the open project.
+ */
 const NOTICES: readonly { test: RegExp; text: string; reload?: boolean }[] = [
   // jdtls: "Foo.java is not on the classpath of project app, only syntax errors are reported"
   {
@@ -17,10 +22,11 @@ const NOTICES: readonly { test: RegExp; text: string; reload?: boolean }[] = [
     text: "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.",
     reload: true,
   },
-  // jdtls: "Foo.java is a non-project file, only syntax errors are reported"
+  // jdtls: "Foo.java is a non-project file, only syntax errors are reported". jdtls still completes
+  // and navigates JDK classes in such a file (a scratch, a file opened from outside the project).
   {
     test: /is a non-project file, only syntax errors are reported/,
-    text: "This file does not belong to an imported Java project: only syntax errors are reported, and navigation and completion don't work.",
+    text: "This file does not belong to an imported Java project: only syntax errors are reported, and only JDK classes resolve.",
     reload: true,
   },
   // gopls, before its generic "No packages found" below.
@@ -73,13 +79,17 @@ export const outsideProjectBanner: EditorBannerContribution = {
       (l) => subscribeDiagnostics(path, l),
       () => noticeFor(path),
     );
+    const inProject = useProject(({ project }) =>
+      [project?.root, ...(project?.workspace?.projects ?? [])].some((root) => !!root && isSameOrInside(path, root)),
+    );
     if (!notice) return null;
-    const actions = notice.reload
-      ? RELOADS.filter(({ id }) => {
-          const action = getAction(id);
-          return action && isActionEnabled(action);
-        }).map(({ id, label }) => ({ label, run: () => void executeAction(id) }))
-      : [];
+    const actions =
+      notice.reload && inProject
+        ? RELOADS.filter(({ id }) => {
+            const action = getAction(id);
+            return action && isActionEnabled(action);
+          }).map(({ id, label }) => ({ label, run: () => void executeAction(id) }))
+        : [];
     return { text: notice.text, level: "warning", actions };
   },
 };
diff --git a/src/editor/lsp/semantic.ts b/src/editor/lsp/semantic.ts
index a1e497b8..9b3d3e95 100644
--- a/src/editor/lsp/semantic.ts
+++ b/src/editor/lsp/semantic.ts
@@ -56,6 +56,7 @@ const MODIFIER_CLASS: Record<string, string> = {
   declaration: "declaration",
   definition: "declaration",
   defaultLibrary: "builtin",
+  global: "global",
 };
 
 /** Number of `--syn-rainbow-<n>` colours (IDEA's five semantic highlighting colours). */
diff --git a/src/editor/lsp/syntaxFallback.test.ts b/src/editor/lsp/syntaxFallback.test.ts
index 4aa131f4..07aaa304 100644
--- a/src/editor/lsp/syntaxFallback.test.ts
+++ b/src/editor/lsp/syntaxFallback.test.ts
@@ -82,15 +82,12 @@ const local = (over: Partial<Extract<Locals, { status: "local" }>["symbol"]> = {
 });
 
 const views: EditorView[] = [];
-function editor(doc: string, language = "typescript", anchor = 0) {
+function editor(doc: string, language = "typescript", anchor = 0, path = "/p/a.ts") {
   const view = new EditorView({
     state: EditorState.create({
       doc,
       selection: { anchor },
-      extensions: [
-        lspDoc.of({ doc: 7, path: "/p/a.ts", language, uiMode: null, readOnly: false }),
-        navigationExtension(),
-      ],
+      extensions: [lspDoc.of({ doc: 7, path, language, uiMode: null, readOnly: false }), navigationExtension()],
     }),
     parent: document.body,
   });
@@ -670,3 +667,16 @@ describe("modifier-hover navigation recovery", () => {
     expect(view.dom.querySelector(".cm-lsp-link")?.textContent).toBe("bar");
   });
 });
+
+describe("same-document fragment navigation", () => {
+  it.each(["definition", "declaration"] as const)(
+    "follows Markdown HTML anchors through %s without a server",
+    async (kind) => {
+      const source = '[artist::order](#Artist-order)\n\n<a id="Artist-order"></a>';
+      const view = editor(source, "markdown", source.indexOf("#Artist"), "/p/notes.md");
+      await gotoTargets(view, kind);
+      expect(view.state.selection.main.head).toBe(source.indexOf("id="));
+      expect(openFile).not.toHaveBeenCalled();
+    },
+  );
+});
diff --git a/src/editor/lsp/theme.ts b/src/editor/lsp/theme.ts
index 51b019d5..aff186e7 100644
--- a/src/editor/lsp/theme.ts
+++ b/src/editor/lsp/theme.ts
@@ -361,6 +361,8 @@ export const lspTheme = EditorView.theme({
   ".cm-sem-parameter": { color: "var(--syn-param, var(--syn-variable))" },
   ".cm-sem-self": { color: "var(--syn-self, var(--syn-keyword))" },
   ".cm-sem-keyword": { color: "var(--syn-keyword)", fontWeight: "var(--syn-keyword-bold, inherit)" },
+  // Before the builtin rule: library globals (`print`, `string`) keep the predefined colour.
+  ".cm-sem-global:not(.cm-sem-function)": { color: "var(--syn-global, inherit)" },
   ".cm-sem-builtin:not(.cm-sem-function)": { color: "var(--syn-builtin, inherit)" },
   ".cm-sem-static": { fontStyle: "var(--syn-static-italic, italic)" },
   ".cm-sem-python-static": { fontStyle: "var(--syn-python-static-italic, normal)" },
diff --git a/src/editor/navigation/implementationGutter.ts b/src/editor/navigation/implementationGutter.ts
index dec5ce53..3a99aa62 100644
--- a/src/editor/navigation/implementationGutter.ts
+++ b/src/editor/navigation/implementationGutter.ts
@@ -9,6 +9,9 @@
  * document symbols (as Super Method, ⌘U). Only declarations in and near the
  * viewport are asked, in one debounced pass after edits / scrolling; results
  * are cached per document text, and markers follow their lines in between.
+ * The cache outlives the editor view (switching tabs remounts it) until other
+ * files change or a language server settles: on some servers (jdtls) every
+ * implementation search walks the whole workspace, so asking again is costly.
  */
 import { RangeSet, StateEffect, StateField, type Extension, type Text } from "@codemirror/state";
 import { EditorView, GutterMarker, ViewPlugin, gutter, type ViewUpdate } from "@codemirror/view";
@@ -22,6 +25,7 @@ import {
   commands,
   isCancelled,
   nextRequestId,
+  onIdeEvent,
   type HierarchyItem,
   type Location,
   type OutlineItem,
@@ -50,6 +54,69 @@ const MARGIN_LINES = 60;
 const MAX_PER_PASS = 60;
 const DEBOUNCE_MS = 500;
 const gutterBackoff = featureBackoff();
+const MAX_CACHED_DOCS = 32;
+
+interface DocMarkers {
+  doc: Text;
+  cache: MarkerCache;
+  outline: { items: OutlineItem[]; candidates: MarkerCandidate[] } | null;
+  /** `changes` when the cache was started. */
+  changes: number;
+}
+
+/** Marker caches by path, most recently used last. */
+const docMarkers = new Map<string, DocMarkers>();
+/**
+ * Bumped when other files may have changed (edited in an editor; saved, created or removed
+ * on disk): every document's cached answers may be stale then.
+ */
+let changes = 0;
+const live = new Set<MarkersPlugin>();
+let watching = false;
+
+/** Build output and tool folders: their changes add no implementations. */
+const OUTPUT_PATH =
+  /(?:^|[\\/])(?:\.git|\.gradle|\.idea|\.openidea|node_modules|target|build|out|bin)(?:[\\/]|$)|\.class$/;
+
+/** Whether changes to `paths` can invalidate cached markers. */
+export function affectsMarkers(paths: readonly string[]): boolean {
+  return paths.some((p) => !OUTPUT_PATH.test(p));
+}
+
+/** Subscribes once per window and stays subscribed, so the settle echo guard survives remounts. */
+function watchChanges() {
+  if (watching) return;
+  watching = true;
+  onIdeEvent("fsChanged", (e) => {
+    if (affectsMarkers([...e.created, ...e.modified, ...e.removed])) changes++;
+  });
+  // Answers (outlines too) given while a server was starting or indexing may be incomplete.
+  onServerSettled(() => {
+    docMarkers.clear();
+    for (const plugin of live) plugin.refreshSoon();
+  });
+}
+
+/** The cache for `doc` at `path`: kept while its text and other files are unchanged. */
+export function markersOf(path: string, doc: Text): DocMarkers {
+  let entry = docMarkers.get(path);
+  if (!entry || entry.doc !== doc) entry = { doc, cache: emptyCache(), outline: null, changes };
+  else if (entry.changes !== changes) entry = { ...entry, cache: emptyCache(), changes };
+  docMarkers.delete(path);
+  docMarkers.set(path, entry);
+  if (docMarkers.size > MAX_CACHED_DOCS) docMarkers.delete(docMarkers.keys().next().value!);
+  return entry;
+}
+
+function markersStale(path: string, doc: Text): boolean {
+  const entry = docMarkers.get(path);
+  return !entry || entry.doc !== doc || entry.changes !== changes;
+}
+
+/** Records that other files may have changed (tests). */
+export function noteOtherChanges() {
+  changes++;
+}
 
 /** Settings › Editor › General › Gutter Icons groups that are on. */
 export function enabledGroups(prefs: Pick<EditorExtras, "showGutterIcons" | "gutterIconsDisabled">): Set<MarkerGroup> {
@@ -227,40 +294,36 @@ function markerSet(placed: readonly PlacedMarker[]): RangeSet<GutterMarker> {
 
 class MarkersPlugin {
   private refresh = debounce(() => void this.run(), DEBOUNCE_MS);
-  private cache = emptyCache();
-  private cacheDoc: Text | null = null;
-  private outline: { doc: Text; items: OutlineItem[]; candidates: MarkerCandidate[] } | null = null;
   private generation = 0;
   private request: RequestId | null = null;
   private offSettings: () => void;
-  private offServers: () => void;
 
   constructor(private view: EditorView) {
+    live.add(this);
+    watchChanges();
     this.refresh();
     this.offSettings = useProject.subscribe((s, prev) => {
       if (s.settings !== prev.settings) this.refresh();
     });
-    // Answers given while a server was starting or indexing may be incomplete.
-    this.offServers = onServerSettled(() => {
-      this.invalidate();
-      this.refresh();
-    });
+  }
+
+  refreshSoon() {
+    this.refresh();
   }
 
   update(u: ViewUpdate) {
-    if (u.docChanged || u.viewportChanged) this.refresh();
+    if (u.docChanged) {
+      // Other documents' markers may depend on this one.
+      changes++;
+      this.refresh();
+    } else if (u.viewportChanged) this.refresh();
     // Other files may have changed meanwhile (a new implementation).
     else if (u.focusChanged && u.view.hasFocus) {
-      this.invalidate();
-      this.refresh();
+      const ctx = docOf(u.view);
+      if (ctx && markersStale(ctx.path, u.view.state.doc)) this.refresh();
     }
   }
 
-  private invalidate() {
-    this.cacheDoc = null;
-    this.outline = null;
-  }
-
   private cancelRequest() {
     if (this.request === null) return;
     void commands.cancelRequest(this.request).catch(() => {});
@@ -286,30 +349,26 @@ class MarkersPlugin {
     }
     const text = view.state.doc;
     const stale = () => gen !== this.generation || view.state.doc !== text;
-    if (this.cacheDoc !== text) {
-      this.cache = emptyCache();
-      this.cacheDoc = text;
-    }
+    const entry = markersOf(ctx.path, text);
     try {
-      if (this.outline?.doc !== text) {
+      if (!entry.outline) {
         const items = await lspRequest(() => commands.docOutline(ctx.doc));
         if (stale()) return;
-        this.outline = {
-          doc: text,
+        entry.outline = {
           items,
           candidates: markerCandidates(items, (l) => (l < text.lines ? text.line(l + 1).text : "")),
         };
       }
-      const { candidates, items } = this.outline;
+      const { candidates, items } = entry.outline;
       const { from, to } = view.viewport;
       const first = text.lineAt(from).number - 1 - MARGIN_LINES;
       const last = text.lineAt(to).number - 1 + MARGIN_LINES;
       const visible = candidates.filter((c) => c.line >= first && c.line <= last).slice(0, MAX_PER_PASS);
       const request = (this.request = nextRequestId());
-      await fillMarkers(ctx.path, visible, groups, markerDeps(ctx, items, request, this.cache), this.cache);
+      await fillMarkers(ctx.path, visible, groups, markerDeps(ctx, items, request, entry.cache), entry.cache);
       if (this.request === request) this.request = null;
       if (stale()) return;
-      this.show(place(text, cachedMarkers(candidates, groups, this.cache)));
+      this.show(place(text, cachedMarkers(candidates, groups, entry.cache)));
     } catch (e) {
       if (isUnavailable(e)) gutterBackoff.mark(ctx.doc);
       else if (!isCancelled(e)) console.debug("[lineMarkers]", e);
@@ -320,8 +379,8 @@ class MarkersPlugin {
     this.refresh.cancel();
     this.cancelRequest();
     this.offSettings();
-    this.offServers();
     this.generation++;
+    live.delete(this);
   }
 }
 
diff --git a/src/editor/navigation/lineMarkers.test.ts b/src/editor/navigation/lineMarkers.test.ts
index 11f3ecc0..2ee75408 100644
--- a/src/editor/navigation/lineMarkers.test.ts
+++ b/src/editor/navigation/lineMarkers.test.ts
@@ -20,11 +20,15 @@ vi.mock("@/editor/lsp/popupStore", async (orig) => ({
 }));
 
 import { candidateKey, markerCandidates, type MarkerCandidate } from "./lineMarkers";
+import { Text } from "@codemirror/state";
 import {
+  affectsMarkers,
   cachedMarkers,
   emptyCache,
   enabledGroups,
   fillMarkers,
+  markersOf,
+  noteOtherChanges,
   openMarkerTargets,
   type MarkerDeps,
 } from "./implementationGutter";
@@ -299,6 +303,34 @@ describe("markers from server answers", () => {
   });
 });
 
+describe("marker cache across views", () => {
+  it("keeps a document's answers until its text or other files change", () => {
+    const doc = Text.of(["interface Shape {", "  double area();", "}"]);
+    const first = markersOf("/p/Shape.java", doc);
+    first.cache.entries.set("k", { inheritors: null });
+    // A remounted editor (tab switch) with the same text reuses the answers.
+    expect(markersOf("/p/Shape.java", doc).cache.entries.has("k")).toBe(true);
+    // Edited text starts over.
+    const edited = Text.of(["interface Shape {", "  double area();", "  double perimeter();", "}"]);
+    expect(markersOf("/p/Shape.java", edited).cache.entries.size).toBe(0);
+    // Other files changed: the answers are asked again, the outline is kept.
+    const again = markersOf("/p/Shape.java", edited);
+    again.cache.entries.set("k", { inheritors: null });
+    again.outline = { items: [], candidates: [] };
+    noteOtherChanges();
+    const after = markersOf("/p/Shape.java", edited);
+    expect(after.cache.entries.size).toBe(0);
+    expect(after.outline).toBe(again.outline);
+  });
+
+  it("ignores changes to build output", () => {
+    expect(affectsMarkers(["/p/target/classes/a/Shape.class"])).toBe(false);
+    expect(affectsMarkers(["/p/build/tmp/x.txt", "/p/.git/index", "C:\\p\\out\\Main.class"])).toBe(false);
+    expect(affectsMarkers(["/p/target/classes/a/Shape.class", "/p/src/main/java/a/Circle.java"])).toBe(true);
+    expect(affectsMarkers(["/p/src/builder/Shape.java"])).toBe(true);
+  });
+});
+
 describe("settings", () => {
   it("follows Settings › Gutter Icons", () => {
     expect([...enabledGroups({ showGutterIcons: true, gutterIconsDisabled: [] })]).toEqual(["inheritors", "supers"]);
diff --git a/src/editor/refactor/HierarchyDialog.module.css b/src/editor/refactor/HierarchyDialog.module.css
new file mode 100644
index 00000000..67aabcd9
--- /dev/null
+++ b/src/editor/refactor/HierarchyDialog.module.css
@@ -0,0 +1,80 @@
+.body {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 14px;
+  font-size: var(--fs-ui);
+  color: var(--fg);
+}
+
+.field {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.targets {
+  color: var(--fg-muted);
+  overflow-wrap: anywhere;
+}
+
+.table {
+  display: flex;
+  flex-direction: column;
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  min-height: 0;
+}
+
+.head,
+.row {
+  display: grid;
+  grid-template-columns: 1fr 110px;
+  align-items: center;
+  gap: 8px;
+  padding: 0 8px;
+  min-height: var(--h-list-row);
+}
+
+.head {
+  color: var(--fg-muted);
+  border-bottom: 1px solid var(--border);
+}
+
+.rows {
+  max-height: 280px;
+  overflow: auto;
+}
+
+.row:hover {
+  background: var(--bg-hover);
+}
+
+.member {
+  min-width: 0;
+}
+
+.label {
+  font-family: var(--font-mono);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.hint {
+  color: var(--fg-subtle);
+  font-size: var(--fs-small);
+}
+
+.error {
+  color: var(--danger);
+  font-size: var(--fs-small);
+  overflow-wrap: anywhere;
+}
+
+.busy {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  color: var(--fg-muted);
+}
diff --git a/src/editor/refactor/HierarchyDialog.tsx b/src/editor/refactor/HierarchyDialog.tsx
new file mode 100644
index 00000000..97a0601c
--- /dev/null
+++ b/src/editor/refactor/HierarchyDialog.tsx
@@ -0,0 +1,143 @@
+/** IDEA's Pull Members Up and Push Members Down dialogs (`hierarchy.ts`). */
+import { useState } from "react";
+import { Checkbox, Dialog, Select, Spinner, T } from "@/ui";
+import { useTx } from "@/platform/i18n";
+import {
+  abstractForced,
+  choicesOf,
+  initialRows,
+  refactorHierarchy,
+  titleOf,
+  useHierarchyDialog,
+  type HierarchyRequest,
+  type MemberRow,
+} from "./hierarchy";
+import styles from "./HierarchyDialog.module.css";
+
+export function HierarchyDialog() {
+  const request = useHierarchyDialog((s) => s.request);
+  if (!request) return null;
+  return <HierarchyDialogInner key={request.seq} request={request} />;
+}
+
+function HierarchyDialogInner({ request }: { request: HierarchyRequest }) {
+  const tx = useTx();
+  const { kind, info } = request;
+  const pullUp = kind === "pullUp";
+  const [target, setTarget] = useState<string | null>(info.targets[0]?.id ?? null);
+  const [rows, setRows] = useState<MemberRow[]>(() => initialRows(info));
+  const [busy, setBusy] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const toInterface = pullUp && !!info.targets.find((t) => t.id === target)?.interface;
+  const ready = rows.some((r) => r.checked) && (!pullUp || !!target) && !busy;
+
+  const close = () => {
+    useHierarchyDialog.setState({ request: null });
+    request.view.focus();
+  };
+  const update = (id: string, change: Partial<MemberRow>) =>
+    setRows((all) => all.map((r) => (r.id === id ? { ...r, ...change } : r)));
+  const submit = async (preview: boolean) => {
+    if (!ready) return;
+    setBusy(true);
+    setError(null);
+    const outcome = await refactorHierarchy(
+      request,
+      pullUp ? target : null,
+      choicesOf(rows, kind, toInterface),
+      preview,
+    );
+    if (useHierarchyDialog.getState().request !== request) return;
+    setBusy(false);
+    if (outcome.status === "done") close();
+    else if (outcome.error) setError(outcome.error);
+  };
+
+  return (
+    <Dialog
+      open
+      onClose={close}
+      title={titleOf(kind)}
+      width={560}
+      buttons={[
+        { label: "Preview", role: "extra", disabled: !ready, onClick: () => void submit(true) },
+        { label: "Refactor", role: "default", disabled: !ready, onClick: () => void submit(false) },
+        { label: "Cancel", role: "cancel" },
+      ]}
+      footerStart={
+        busy ? (
+          <span className={styles.busy}>
+            <Spinner size={12} />
+            <T>Checking for conflicts…</T>
+          </span>
+        ) : undefined
+      }
+    >
+      <div className={styles.body}>
+        {pullUp ? (
+          <label className={styles.field}>
+            <span>{tx`Pull up members of ${info.className} to:`}</span>
+            <Select
+              aria-label="Destination class"
+              value={target}
+              options={info.targets.map((t) => ({
+                value: t.id,
+                label: t.qualifiedName,
+                icon: t.interface ? "interface" : "class",
+              }))}
+              onChange={setTarget}
+            />
+          </label>
+        ) : (
+          <div className={styles.field}>
+            <span>{tx`Push members of ${info.className} down to:`}</span>
+            <span className={styles.targets}>{info.targets.map((t) => t.name).join(", ")}</span>
+          </div>
+        )}
+        <div
+          className={styles.table}
+          role="table"
+          aria-label={pullUp ? tx("Members to be pulled up") : tx("Members to be pushed down")}
+        >
+          <div className={styles.head} role="row">
+            <span role="columnheader">
+              <T>Member</T>
+            </span>
+            <span role="columnheader">{pullUp ? <T>Make abstract</T> : <T>Keep abstract</T>}</span>
+          </div>
+          <div className={styles.rows}>
+            {rows.map((row) => {
+              const forced = abstractForced(row, kind, toInterface);
+              return (
+                <div key={row.id} className={styles.row} role="row">
+                  <Checkbox
+                    className={styles.member}
+                    checked={row.checked}
+                    onChange={(checked) => update(row.id, { checked })}
+                    label={<span className={styles.label}>{row.label}</span>}
+                  />
+                  <Checkbox
+                    aria-label={pullUp ? "Make abstract" : "Keep abstract"}
+                    checked={row.checked && (forced || (row.abstractable && row.makeAbstract))}
+                    disabled={!row.checked || forced || !row.abstractable}
+                    onChange={(makeAbstract) => update(row.id, { makeAbstract })}
+                  />
+                </div>
+              );
+            })}
+          </div>
+        </div>
+        {toInterface && (
+          <span className={styles.hint}>
+            <T>Methods pulled up to an interface are declared abstract there.</T>
+          </span>
+        )}
+        {error && (
+          <span className={styles.error} role="alert">
+            {tx(error)}
+          </span>
+        )}
+      </div>
+    </Dialog>
+  );
+}
diff --git a/src/editor/refactor/catalog.ts b/src/editor/refactor/catalog.ts
index 2074331a..c421f821 100644
--- a/src/editor/refactor/catalog.ts
+++ b/src/editor/refactor/catalog.ts
@@ -2,6 +2,7 @@
  * IDEA's refactorings and how language-server code actions map onto them:
  * `refactor.extract.*` → Extract Method / Introduce Variable…, `refactor.inline*`
  * → Inline, `refactor.move*` → Move, signature rewrites → Change Signature.
+ * Pull Members Up / Push Members Down come from the Java extension, not code actions.
  * Pure; used by Refactor This (⌃T) and the Refactor menu actions.
  */
 import type { CodeAction } from "@/bindings";
@@ -16,7 +17,9 @@ export type RefactoringId =
   | "extractConstant"
   | "extractField"
   | "extractParameter"
-  | "inline";
+  | "inline"
+  | "pullMembersUp"
+  | "pushMembersDown";
 
 export interface Refactoring {
   id: RefactoringId;
@@ -94,8 +97,25 @@ export const REFACTORINGS: readonly Refactoring[] = [
       sel ? "Selected block should represent an expression" : "Caret should be inside an expression in a function",
   },
   { id: "inline", action: "refactor.inline", label: "Inline…", kind: "refactor.inline", reason: () => AT_NAME },
+  {
+    id: "pullMembersUp",
+    action: "refactor.pullMembersUp",
+    label: "Pull Members Up…",
+    kind: null,
+    reason: () => "Caret should be inside a class that has members to pull up",
+  },
+  {
+    id: "pushMembersDown",
+    action: "refactor.pushMembersDown",
+    label: "Push Members Down…",
+    kind: null,
+    reason: () => "Caret should be inside a class that has members to push down",
+  },
 ];
 
+/** Refactorings of the class hierarchy, run by the app-owned Java extension (`hierarchy.ts`). */
+export const HIERARCHY_REFACTORINGS: ReadonlySet<RefactoringId> = new Set(["pullMembersUp", "pushMembersDown"]);
+
 export function refactoring(id: RefactoringId): Refactoring {
   return REFACTORINGS.find((r) => r.id === id)!;
 }
diff --git a/src/editor/refactor/hierarchy.test.ts b/src/editor/refactor/hierarchy.test.ts
new file mode 100644
index 00000000..3708fe60
--- /dev/null
+++ b/src/editor/refactor/hierarchy.test.ts
@@ -0,0 +1,237 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { EditorState } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+import type { HierarchyMembers, HierarchyRefactored, WorkspaceEdit } from "@/bindings";
+
+type Result = { status: "ok"; data: unknown } | { status: "error"; error: { kind: string; message: string } };
+const ok = (data: unknown): Result => ({ status: "ok", data });
+const refused = (message: string): Result => ({ status: "error", error: { kind: "invalidInput", message } });
+
+let members: Result = ok(null);
+let refactored: Result = ok(null);
+const lspHierarchyMembers = vi.fn(async () => members);
+const lspHierarchyRefactor = vi.fn(async () => refactored);
+const applyWorkspaceEdit = vi.fn(async () => ok(null));
+vi.mock("@/platform/ipc", async (orig) => {
+  const actual = await orig<typeof import("@/platform/ipc")>();
+  return {
+    ...actual,
+    isTauri: () => true,
+    commands: {
+      ...actual.commands,
+      lspHierarchyMembers,
+      lspHierarchyRefactor,
+      applyWorkspaceEdit,
+      cancelRequest: vi.fn(async () => undefined),
+    },
+  };
+});
+const showHint = vi.fn();
+vi.mock("@/editor/lsp/hint", () => ({ showHint }));
+let answer = "continue";
+const ask = vi.fn(async () => ({ button: answer }));
+vi.mock("@/workbench/messages", () => ({ ask }));
+
+const {
+  abstractForced,
+  choicesOf,
+  conflicts,
+  fatalProblem,
+  initialRows,
+  refactorHierarchy,
+  startHierarchyRefactoring,
+  useHierarchyDialog,
+} = await import("./hierarchy");
+const { useLspPopup, closePopup } = await import("@/editor/lsp/popupStore");
+const { lspDoc } = await import("@/editor/lsp/lsp");
+
+const INFO: HierarchyMembers = {
+  className: "Dog",
+  targets: [
+    { id: "animal", name: "Animal", qualifiedName: "zoo.Animal", interface: false },
+    { id: "speaker", name: "Speaker", qualifiedName: "zoo.Speaker", interface: true },
+  ],
+  members: [
+    { id: "tail", label: "tail : int", kind: "field", selected: false, abstractable: false },
+    { id: "bark", label: "bark() : String", kind: "method", selected: true, abstractable: true },
+  ],
+};
+const at = (line: number) => ({ start: { line, col: 0 }, end: { line, col: 0 } });
+const EDIT = {
+  files: [
+    { kind: "edit", path: "/p/Dog.java", edits: [{ range: at(1), new_text: "" }] },
+    { kind: "edit", path: "/p/Animal.java", edits: [{ range: at(2), new_text: "String bark() {}" }] },
+  ],
+} as WorkspaceEdit;
+const done = (problems: HierarchyRefactored["problems"], edit: WorkspaceEdit | null = EDIT): Result =>
+  ok({ problems, edit } satisfies HierarchyRefactored);
+
+let view: EditorView | null = null;
+function editor(readOnly = false) {
+  view = new EditorView({
+    state: EditorState.create({
+      doc: 'class Dog extends Animal { String bark() { return ""; } }',
+      selection: { anchor: 30 },
+      extensions: [lspDoc.of({ doc: 7, path: "/p/Dog.java", language: "java", uiMode: null, readOnly })],
+    }),
+  });
+  return view;
+}
+
+afterEach(() => {
+  view?.destroy();
+  view = null;
+  closePopup();
+  useHierarchyDialog.setState({ request: null });
+  answer = "continue";
+  vi.clearAllMocks();
+});
+
+describe("member choices", () => {
+  it("starts from the member at the caret and sends what is checked", () => {
+    const rows = initialRows(INFO);
+    expect(rows.map((r) => [r.id, r.checked])).toEqual([
+      ["tail", false],
+      ["bark", true],
+    ]);
+    rows[0]!.checked = true;
+    rows[1]!.makeAbstract = true;
+    expect(choicesOf(rows, "pullUp", false)).toEqual([
+      { id: "tail", makeAbstract: false },
+      { id: "bark", makeAbstract: true },
+    ]);
+  });
+
+  it("declares methods abstract in an interface, and never abstracts a field", () => {
+    const rows = initialRows(INFO).map((r) => ({ ...r, checked: true, makeAbstract: true }));
+    const [field, method] = rows;
+    expect(abstractForced(method!, "pullUp", true)).toBe(true);
+    expect(abstractForced(method!, "pushDown", true)).toBe(false);
+    expect(abstractForced(field!, "pullUp", true)).toBe(false);
+    rows[1]!.makeAbstract = false;
+    expect(choicesOf(rows, "pullUp", true)).toEqual([
+      { id: "tail", makeAbstract: false },
+      { id: "bark", makeAbstract: true },
+    ]);
+    expect(choicesOf(rows, "pushDown", false)[1]).toEqual({ id: "bark", makeAbstract: false });
+  });
+
+  it("separates fatal problems from the ones the user may accept", () => {
+    const problems = [
+      { severity: "info", message: "i" },
+      { severity: "warning", message: "w" },
+      { severity: "error", message: "e" },
+    ] as const;
+    expect(fatalProblem([...problems])).toBeNull();
+    expect(conflicts([...problems])).toEqual(["w", "e"]);
+    expect(fatalProblem([...problems, { severity: "fatal", message: "f" }])).toBe("f");
+  });
+});
+
+describe("Pull Members Up / Push Members Down", () => {
+  it("opens the dialog with the server's members, at the caret", async () => {
+    members = ok(INFO);
+    const v = editor();
+    await startHierarchyRefactoring(v, "pullUp");
+    expect(lspHierarchyMembers).toHaveBeenCalledWith(expect.any(Number), 7, { line: 0, col: 30 }, "pullUp");
+    const request = useHierarchyDialog.getState().request;
+    expect(request?.info.className).toBe("Dog");
+    expect(request?.kind).toBe("pullUp");
+  });
+
+  it("says why when the class can't be refactored, or the file is read-only", async () => {
+    members = refused("Type has no super types.");
+    await startHierarchyRefactoring(editor(), "pullUp");
+    expect(showHint).toHaveBeenCalledWith(expect.anything(), "Cannot perform refactoring. Type has no super types");
+    expect(useHierarchyDialog.getState().request).toBeNull();
+    view!.destroy();
+    await startHierarchyRefactoring(editor(true), "pushDown");
+    expect(showHint).toHaveBeenLastCalledWith(expect.anything(), "Cannot perform refactoring. The file is read-only");
+    expect(lspHierarchyMembers).toHaveBeenCalledOnce();
+  });
+
+  it("applies a clean edit at once", async () => {
+    members = ok(INFO);
+    refactored = done([{ severity: "info", message: "fine" }]);
+    await startHierarchyRefactoring(editor(), "pullUp");
+    const request = useHierarchyDialog.getState().request!;
+    const choices = [{ id: "bark", makeAbstract: false }];
+    expect(await refactorHierarchy(request, "animal", choices, false)).toEqual({ status: "done" });
+    expect(lspHierarchyRefactor).toHaveBeenCalledWith(
+      expect.any(Number),
+      7,
+      { line: 0, col: 30 },
+      "pullUp",
+      "animal",
+      choices,
+    );
+    expect(ask).not.toHaveBeenCalled();
+    expect(applyWorkspaceEdit).toHaveBeenCalledWith(EDIT);
+  });
+
+  it("asks about conflicts first; Cancel changes nothing and keeps the dialog", async () => {
+    members = ok(INFO);
+    refactored = done([{ severity: "error", message: "Field 'tail' is not accessible from type 'Animal'" }]);
+    await startHierarchyRefactoring(editor(), "pullUp");
+    const request = useHierarchyDialog.getState().request!;
+    answer = "cancel";
+    expect(await refactorHierarchy(request, "animal", [{ id: "bark", makeAbstract: false }], false)).toEqual({
+      status: "stay",
+    });
+    expect(ask).toHaveBeenCalledWith(expect.objectContaining({ title: "Problems Detected" }));
+    expect(applyWorkspaceEdit).not.toHaveBeenCalled();
+    answer = "continue";
+    expect((await refactorHierarchy(request, "animal", [{ id: "bark", makeAbstract: false }], false)).status).toBe(
+      "done",
+    );
+    expect(applyWorkspaceEdit).toHaveBeenCalledOnce();
+  });
+
+  it("keeps the dialog with the reason when nothing can be done", async () => {
+    members = ok(INFO);
+    await startHierarchyRefactoring(editor(), "pushDown");
+    const request = useHierarchyDialog.getState().request!;
+    refactored = done([{ severity: "fatal", message: "No subclasses" }], null);
+    expect(await refactorHierarchy(request, null, [{ id: "bark", makeAbstract: true }], false)).toEqual({
+      status: "stay",
+      error: "No subclasses",
+    });
+    refactored = refused("The class changed; open the dialog again");
+    expect(await refactorHierarchy(request, null, [{ id: "bark", makeAbstract: true }], false)).toEqual({
+      status: "stay",
+      error: "The class changed; open the dialog again",
+    });
+    expect(applyWorkspaceEdit).not.toHaveBeenCalled();
+  });
+
+  it("refuses a request whose position an edit has moved", async () => {
+    members = ok(INFO);
+    const v = editor();
+    await startHierarchyRefactoring(v, "pullUp");
+    v.dispatch({ changes: { from: 0, insert: "// moved\n" } });
+    const request = useHierarchyDialog.getState().request!;
+    expect(await refactorHierarchy(request, "animal", [{ id: "bark", makeAbstract: false }], false)).toEqual({
+      status: "stay",
+      error: "The file changed; open the dialog again",
+    });
+    expect(lspHierarchyRefactor).not.toHaveBeenCalled();
+  });
+
+  it("previews the edit before applying it when asked", async () => {
+    members = ok(INFO);
+    refactored = done([]);
+    await startHierarchyRefactoring(editor(), "pullUp");
+    const request = useHierarchyDialog.getState().request!;
+    expect((await refactorHierarchy(request, "animal", [{ id: "bark", makeAbstract: false }], true)).status).toBe(
+      "done",
+    );
+    const popup = useLspPopup.getState().popup;
+    expect(popup?.kind).toBe("preview");
+    if (popup?.kind !== "preview") return;
+    expect(popup.title).toBe("Pull Members Up from 'Dog'");
+    expect(popup.summary.files).toBe(2);
+    expect(applyWorkspaceEdit).not.toHaveBeenCalled();
+    popup.onConfirm();
+    await vi.waitFor(() => expect(applyWorkspaceEdit).toHaveBeenCalledWith(EDIT));
+  });
+});
diff --git a/src/editor/refactor/hierarchy.ts b/src/editor/refactor/hierarchy.ts
new file mode 100644
index 00000000..2ff9bfcd
--- /dev/null
+++ b/src/editor/refactor/hierarchy.ts
@@ -0,0 +1,207 @@
+/**
+ * Pull Members Up / Push Members Down, IDEA's class-hierarchy refactorings. The
+ * language server (the app-owned JDT extension) lists the class's members and
+ * destinations, checks the chosen move and computes the edit; the dialog
+ * (`HierarchyDialog.tsx`) picks the members, problems are confirmed like IDEA's
+ * "Problems Detected", and the edit is applied as one change (or previewed first).
+ */
+import type { Text } from "@codemirror/state";
+import type { EditorView } from "@codemirror/view";
+import { create } from "zustand";
+import type {
+  HierarchyChoice,
+  HierarchyMemberKind,
+  HierarchyMembers,
+  HierarchyRefactoring,
+  Pos,
+  RefactoringProblem,
+  WorkspaceEdit,
+} from "@/bindings";
+import { commands, isCancelled, nextRequestId, unavailableText } from "@/platform/ipc";
+import { tx } from "@/platform/i18n";
+import { whenAllSynced, whenSynced } from "@/editor/api";
+import { ask } from "@/workbench/messages";
+import { docOf, isUnavailable, lspRequest, reportLspError } from "@/editor/lsp/lsp";
+import { offsetToPos } from "@/editor/lsp/positions";
+import { showHint } from "@/editor/lsp/hint";
+import { openPopup } from "@/editor/lsp/popupStore";
+import { summarizeWorkspaceEdit } from "@/editor/lsp/workspaceEdit";
+import { cannotPerform } from "./catalog";
+
+export interface MemberRow {
+  id: string;
+  label: string;
+  kind: HierarchyMemberKind;
+  checked: boolean;
+  /** Pull up: declare abstract in the destination. Push down: keep an abstract declaration. */
+  makeAbstract: boolean;
+  abstractable: boolean;
+}
+
+export function initialRows(info: HierarchyMembers): MemberRow[] {
+  return info.members.map((m) => ({
+    id: m.id,
+    label: m.label,
+    kind: m.kind,
+    checked: m.selected,
+    makeAbstract: false,
+    abstractable: m.abstractable,
+  }));
+}
+
+/** A method pulled up to an interface is only declared there (JDT, like IDEA, never moves its body). */
+export function abstractForced(row: MemberRow, kind: HierarchyRefactoring, toInterface: boolean): boolean {
+  return kind === "pullUp" && toInterface && row.kind === "method";
+}
+
+export function choicesOf(
+  rows: readonly MemberRow[],
+  kind: HierarchyRefactoring,
+  toInterface: boolean,
+): HierarchyChoice[] {
+  return rows
+    .filter((r) => r.checked)
+    .map((r) => ({
+      id: r.id,
+      makeAbstract: abstractForced(r, kind, toInterface) || (r.abstractable && r.makeAbstract),
+    }));
+}
+
+/** The first fatal problem: nothing can be done. */
+export function fatalProblem(problems: readonly RefactoringProblem[]): string | null {
+  return problems.find((p) => p.severity === "fatal")?.message ?? null;
+}
+
+/** Problems the user confirms before the change is made (IDEA lists errors and warnings). */
+export function conflicts(problems: readonly RefactoringProblem[]): string[] {
+  return problems.filter((p) => p.severity === "error" || p.severity === "warning").map((p) => p.message);
+}
+
+export function titleOf(kind: HierarchyRefactoring): string {
+  return kind === "pullUp" ? "Pull Members Up" : "Push Members Down";
+}
+
+export interface HierarchyRequest {
+  seq: number;
+  view: EditorView;
+  kind: HierarchyRefactoring;
+  doc: number;
+  pos: Pos;
+  /** The document `pos` refers to. */
+  text: Text;
+  info: HierarchyMembers;
+}
+
+export const useHierarchyDialog = create<{ request: HierarchyRequest | null }>(() => ({ request: null }));
+let seq = 0;
+let running: AbortController | null = null;
+
+function errorText(e: unknown): string {
+  if (isUnavailable(e)) return unavailableText(e, "No language server available");
+  return e instanceof Error ? e.message : String(e);
+}
+
+/** Pull Members Up… / Push Members Down…: asks the server what can move, then opens the dialog. */
+export async function startHierarchyRefactoring(view: EditorView, kind: HierarchyRefactoring): Promise<void> {
+  const ctx = docOf(view);
+  if (!ctx) return;
+  if (ctx.readOnly) {
+    showHint(view, cannotPerform("The file is read-only"));
+    return;
+  }
+  running?.abort();
+  const run = (running = new AbortController());
+  await whenSynced(view);
+  const state = view.state;
+  const pos = offsetToPos(state.doc, state.selection.main.head);
+  const request = nextRequestId();
+  const abort = () => void commands.cancelRequest(request);
+  run.signal.addEventListener("abort", abort);
+  try {
+    const info = await lspRequest(() => commands.lspHierarchyMembers(request, ctx.doc, pos, kind));
+    if (run.signal.aborted || view.state.doc !== state.doc) return;
+    useHierarchyDialog.setState({ request: { seq: ++seq, view, kind, doc: ctx.doc, pos, text: state.doc, info } });
+  } catch (e) {
+    if (isCancelled(e) || run.signal.aborted) return;
+    showHint(view, cannotPerform(errorText(e)));
+  } finally {
+    run.signal.removeEventListener("abort", abort);
+    if (running === run) running = null;
+  }
+}
+
+async function applyEdit(view: EditorView, edit: WorkspaceEdit) {
+  try {
+    await whenAllSynced();
+    await lspRequest(() => commands.applyWorkspaceEdit(edit));
+  } catch (e) {
+    reportLspError(view, e, true);
+  }
+}
+
+/** IDEA's "Problems Detected": true to go on anyway. */
+async function confirmConflicts(messages: readonly string[]): Promise<boolean> {
+  const { button } = await ask({
+    title: "Problems Detected",
+    icon: "warning",
+    body: messages.join("\n"),
+    buttons: [
+      { id: "continue", label: "Continue", primary: true },
+      { id: "cancel", label: "Cancel" },
+    ],
+  });
+  return button === "continue";
+}
+
+export type RefactorOutcome =
+  /** The edit was applied or handed to the preview: close the dialog. */
+  | { status: "done" }
+  /** Stay in the dialog (the user cancelled at the problems); `error` says why nothing can be done. */
+  | { status: "stay"; error?: string };
+
+/**
+ * Checks the chosen move, confirms its problems and applies the edit, or opens the
+ * preview with `preview`. The dialog stays open until the change is made.
+ */
+export async function refactorHierarchy(
+  request: HierarchyRequest,
+  target: string | null,
+  choices: HierarchyChoice[],
+  preview: boolean,
+): Promise<RefactorOutcome> {
+  const { view, kind } = request;
+  // The position names the class: after an edit it may name another one.
+  if (view.state.doc !== request.text) return { status: "stay", error: "The file changed; open the dialog again" };
+  let refactored;
+  try {
+    await whenSynced(view);
+    refactored = await lspRequest(() =>
+      commands.lspHierarchyRefactor(nextRequestId(), request.doc, request.pos, kind, target, choices),
+    );
+  } catch (e) {
+    if (isCancelled(e)) return { status: "stay" };
+    return { status: "stay", error: errorText(e) };
+  }
+  const fatal = fatalProblem(refactored.problems);
+  if (fatal || !refactored.edit) return { status: "stay", error: fatal ?? "Nothing to change" };
+  const found = conflicts(refactored.problems);
+  if (found.length && !(await confirmConflicts(found))) return { status: "stay" };
+  const edit = refactored.edit;
+  const summary = summarizeWorkspaceEdit(edit);
+  if (!summary.files) return { status: "stay", error: "Nothing to change" };
+  if (preview) {
+    openPopup({
+      kind: "preview",
+      title:
+        kind === "pullUp"
+          ? tx`Pull Members Up from '${request.info.className}'`
+          : tx`Push Members Down from '${request.info.className}'`,
+      summary,
+      confirmLabel: "Do Refactor",
+      onConfirm: () => void applyEdit(view, edit),
+    });
+  } else {
+    await applyEdit(view, edit);
+  }
+  return { status: "done" };
+}
diff --git a/src/editor/refactor/index.ts b/src/editor/refactor/index.ts
index 00c2a85a..ce3600a7 100644
--- a/src/editor/refactor/index.ts
+++ b/src/editor/refactor/index.ts
@@ -1,2 +1,4 @@
 export { refactorThis, runRefactoring, showNothingHere } from "./refactorThis";
 export { askUsagesDetected, fileUsages, safeDelete, viewUsages } from "./safeDelete";
+export { startHierarchyRefactoring } from "./hierarchy";
+export { HierarchyDialog } from "./HierarchyDialog";
diff --git a/src/editor/refactor/refactorThis.test.ts b/src/editor/refactor/refactorThis.test.ts
index f49a316f..35ec6962 100644
--- a/src/editor/refactor/refactorThis.test.ts
+++ b/src/editor/refactor/refactorThis.test.ts
@@ -64,6 +64,8 @@ vi.mock("./introduce", () => ({
 }));
 const safeDelete = vi.fn();
 vi.mock("./safeDelete", () => ({ safeDelete }));
+const startHierarchyRefactoring = vi.fn();
+vi.mock("./hierarchy", () => ({ startHierarchyRefactoring }));
 
 const { classifyAction, kindAdvertised, cannotPerform } = await import("./catalog");
 const { refactorThis, runRefactoring } = await import("./refactorThis");
@@ -88,13 +90,19 @@ const answer =
     ok({ actions, advertisedKinds } satisfies CodeActionQuery);
 
 let view: EditorView | null = null;
-function editor(text = "fn main() { let total = price * 2; }") {
+function editor(text = "fn main() { let total = price * 2; }", language = "rust") {
   view = new EditorView({
     state: EditorState.create({
       doc: text,
       selection: { anchor: text.indexOf("price") + 1 },
       extensions: [
-        lspDoc.of({ doc: 1, path: "/p/a.rs", language: "rust", uiMode: null, readOnly: false }),
+        lspDoc.of({
+          doc: 1,
+          path: `/p/a.${language === "java" ? "java" : "rs"}`,
+          language,
+          uiMode: null,
+          readOnly: false,
+        }),
         inplaceRenameExtension(),
       ],
     }),
@@ -179,6 +187,24 @@ describe("Refactor This", () => {
     expect(lspCodeActionQuery.mock.calls[0]![3]).toEqual(["refactor"]);
   });
 
+  it("offers Pull Members Up / Push Members Down in Java files, after IDEA's other refactorings", async () => {
+    query = answer([action("Convert to switch expression", "refactor.rewrite")]);
+    const v = editor("class Dog extends Animal { int price; }", "java");
+    await refactorThis(v, vi.fn());
+    expect(labels()).toEqual(["Pull Members Up…", "Push Members Down…", "Convert to switch expression"]);
+    const items = (useLspPopup.getState().popup as { items: { label: string; run: () => void }[] }).items;
+    items.find((i) => i.label === "Push Members Down…")!.run();
+    expect(startHierarchyRefactoring).toHaveBeenCalledWith(v, "pushDown");
+    closePopup();
+    v.destroy();
+    // Other languages have no server for them; nor does Java while its server is down.
+    await refactorThis(editor(), vi.fn());
+    expect(labels()).not.toContain("Pull Members Up…");
+    query = async () => unavailable;
+    await refactorThis(editor("class Dog {}", "java"), vi.fn());
+    expect(labels()).toEqual(["Nothing here"]);
+  });
+
   it("runs the mapped server action, Rename and Safe Delete", async () => {
     prepare = ok({ start: { line: 0, col: 0 }, end: { line: 0, col: 1 } });
     query = answer([action("Inline variable", "refactor.inline")]);
diff --git a/src/editor/refactor/refactorThis.ts b/src/editor/refactor/refactorThis.ts
index b19ec601..25e26f27 100644
--- a/src/editor/refactor/refactorThis.ts
+++ b/src/editor/refactor/refactorThis.ts
@@ -20,6 +20,7 @@ import { caretAnchor, openPopup, type ListPopupItem } from "@/editor/lsp/popupSt
 import { applyCodeAction } from "@/editor/lsp/intentions";
 import { planLocalRename } from "@/editor/lsp/syntaxFallback";
 import {
+  HIERARCHY_REFACTORINGS,
   REFACTORINGS,
   cannotPerform,
   classifyAction,
@@ -38,6 +39,10 @@ import {
   introducesName,
 } from "./serverIntroduce";
 import { safeDelete } from "./safeDelete";
+import { startHierarchyRefactoring } from "./hierarchy";
+
+/** Languages whose server runs the class-hierarchy refactorings (the app-owned JDT extension). */
+const HIERARCHY_LANGUAGES = new Set(["java"]);
 
 /** Outcome of the server query: its answer, or why there is none. */
 export type ServerAnswer =
@@ -214,8 +219,12 @@ async function expressionAtCaret(view: EditorView, signal: AbortSignal): Promise
 export function refactorThisItems(
   view: EditorView,
   answer: ServerAnswer,
-  facts: { symbol: boolean; expression: boolean },
-  run: { rename: (view: EditorView) => unknown; safeDelete: (view: EditorView) => unknown },
+  facts: { symbol: boolean; expression: boolean; hierarchy?: boolean },
+  run: {
+    rename: (view: EditorView) => unknown;
+    safeDelete: (view: EditorView) => unknown;
+    hierarchy?: (view: EditorView, kind: "pullUp" | "pushDown") => unknown;
+  },
 ): ListPopupItem[] {
   const { mapped, other } = groupActions(answer.status === "ok" ? answer.query.actions : []);
   const serverUsable = answer.status === "ok";
@@ -231,6 +240,8 @@ export function refactorThisItems(
     else if (actions.length) go = () => runActions(view, r.label.replace(/…$/, ""), actions, r.id);
     else if (r.id === "rename" && facts.symbol) go = () => run.rename(view);
     else if (r.id === "safeDelete" && facts.symbol && !docOf(view)?.readOnly) go = () => run.safeDelete(view);
+    else if (HIERARCHY_REFACTORINGS.has(r.id) && facts.hierarchy && serverUsable && run.hierarchy)
+      go = () => run.hierarchy!(view, r.id === "pullMembersUp" ? "pullUp" : "pushDown");
     else if (INTRODUCE[r.id] && facts.expression && !serverUsable)
       go = () => introduceFallback(view, INTRODUCE[r.id]!, answer.status === "notReady" ? "notReady" : "error");
     if (!go) continue;
@@ -266,7 +277,13 @@ export async function refactorThis(view: EditorView, rename: (view: EditorView)
       symbolAtCaret(view, answer.status !== "notReady"),
       expressionAtCaret(view, run.signal),
     ]);
-    items = refactorThisItems(view, answer, { symbol, expression }, { rename, safeDelete });
+    const hierarchy = HIERARCHY_LANGUAGES.has(ctx.language) && !ctx.readOnly;
+    items = refactorThisItems(
+      view,
+      answer,
+      { symbol, expression, hierarchy },
+      { rename, safeDelete, hierarchy: startHierarchyRefactoring },
+    );
   } catch (e) {
     if (isCancelled(e)) return;
     throw e;
diff --git a/src/features/agents/Composer.tsx b/src/features/agents/Composer.tsx
index 15ca6b5c..cab5ec1b 100644
--- a/src/features/agents/Composer.tsx
+++ b/src/features/agents/Composer.tsx
@@ -1,6 +1,6 @@
 /**
- * The message box of the New Task page and of sessions: `@` file references (project file
- * search), `/` agent commands, ↑ / ↓ history, pasted or dropped images, Shift+Tab to cycle
+ * The message box of the New Task page and of sessions: `@` file and folder references
+ * (project index search), `/` agent commands, ↑ / ↓ history, pasted or dropped images, Shift+Tab to cycle
  * the agent's mode. Its draft lives in the store under `id`.
  */
 import { useEffect, useLayoutEffect, useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
@@ -19,6 +19,7 @@ import {
   applyCompletion,
   atEdgeLine,
   isPathQuery,
+  mergeMatches,
   resolveTyped,
   completionAt,
   imageFromDataUrl,
@@ -129,14 +130,15 @@ export function Composer(props: ComposerProps) {
           .catch(() => alive && setFiles([]));
         return;
       }
-      call(commands.findFiles(query, MAX_ITEMS))
-        .then((found) => {
+      Promise.all([call(commands.findFiles(query, MAX_ITEMS)), call(commands.findDirs(query, MAX_ITEMS))])
+        .then(([found, dirs]) => {
           if (!alive) return;
           setFiles(
-            found.map((f) => ({
+            mergeMatches(found, dirs, MAX_ITEMS).map((f) => ({
               kind: "file",
-              rel: f.relPath,
-              path: root === projectRoot ? f.path : `${root}/${f.relPath}`,
+              rel: f.rel,
+              dir: f.dir,
+              path: root === projectRoot ? f.path : `${root}/${f.rel}`,
             })),
           );
         })
@@ -171,19 +173,20 @@ export function Composer(props: ComposerProps) {
     }
   };
 
-  const accept = (item: Item | undefined) => {
+  /** Enter or a click references the item; Tab on a folder keeps completing inside it. */
+  const accept = (item: Item | undefined, descend = false) => {
     if (!item || !completion) return;
-    if (item.kind === "file" && item.dir) {
-      // Descend: keep completing inside the folder.
-      const insert = `${mentionOf(item.rel)}/`;
-      setText(text.slice(0, completion.from) + insert + text.slice(completion.to), completion.from + insert.length);
-      return;
-    }
     if (item.kind === "file") {
-      const mention = mentionOf(item.rel);
-      const next = applyCompletion(text, completion, mention);
+      const rel = item.dir ? `${item.rel}/` : item.rel;
+      // A folder stays referenced while its `@folder/` is left as typed (`toPrompt`).
       const current = composerDraft(id);
-      updateComposer(id, { files: [...current.files, { path: item.path, rel: item.rel } satisfies FileRef] });
+      updateComposer(id, { files: [...current.files, { path: item.path, rel } satisfies FileRef] });
+      if (item.dir && descend) {
+        const insert = mentionOf(rel);
+        setText(text.slice(0, completion.from) + insert + text.slice(completion.to), completion.from + insert.length);
+        return;
+      }
+      const next = applyCompletion(text, completion, mentionOf(rel));
       setText(next.text, next.caret);
     } else {
       const next = applyCompletion(text, completion, `/${item.command.name}`);
@@ -266,7 +269,7 @@ export function Composer(props: ComposerProps) {
       }
       if (e.key === "Enter" || e.key === "Tab") {
         e.preventDefault();
-        accept(items[active]);
+        accept(items[active], e.key === "Tab");
         return;
       }
       if (e.key === "Escape") {
@@ -344,8 +347,11 @@ export function Composer(props: ComposerProps) {
               >
                 {item.kind === "file" ? (
                   <>
-                    <Icon name={item.dir ? "folder" : fileIconName(basename(item.rel))} size={16} />
-                    <span className={styles.itemName}>{basename(item.rel)}</span>
+                    <Icon name={item.dir ? "folder" : fileIconName(basename(item.rel), item.rel)} size={16} />
+                    <span className={styles.itemName}>
+                      {basename(item.rel)}
+                      {item.dir && "/"}
+                    </span>
                     <span className={styles.itemDetail}>{item.rel}</span>
                   </>
                 ) : (
diff --git a/src/features/agents/HomeEditor.tsx b/src/features/agents/HomeEditor.tsx
index e909aa5e..85a55293 100644
--- a/src/features/agents/HomeEditor.tsx
+++ b/src/features/agents/HomeEditor.tsx
@@ -99,7 +99,9 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
           id={HOME}
           autoFocus
           placeholder={
-            docked ? "Describe a task…" : "Describe a task for the agent. @ references a file, / runs a command"
+            docked
+              ? "Describe a task…"
+              : "Describe a task for the agent. @ references a file or folder, / runs a command"
           }
           root={root}
           projectRoot={root}
@@ -168,7 +170,8 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
               onChange={(isolation) => updateDraft({ isolation, isolationChosen: true })}
             />
           )}
-          {isolation === "local" && current && (
+          {/* A folder that isn't a repository has no branch: the one Git found below it isn't where the agent runs. */}
+          {isolation === "local" && isGit && current && (
             <>
               {!docked && (
                 <span className={styles.note}>
diff --git a/src/features/agents/Markdown.test.tsx b/src/features/agents/Markdown.test.tsx
index faed3174..4d98e26c 100644
--- a/src/features/agents/Markdown.test.tsx
+++ b/src/features/agents/Markdown.test.tsx
@@ -11,6 +11,37 @@ vi.mock("@/platform/openUrl", () => ({ openExternalUrl }));
 
 beforeEach(() => vi.clearAllMocks());
 
+it.each([
+  "<style>body{outline:7px solid red}</style>",
+  '<form action="https://example.com/x"><button>go</button></form>',
+  '<div style="position:fixed">x</div>',
+  '<link rel="stylesheet" href="https://example.com/x.css">',
+  '<meta http-equiv="refresh" content="0;url=https://example.com">',
+  '<base href="https://example.com/">',
+  '<iframe src="https://example.com"></iframe>',
+  '<button formaction="https://example.com/x">go</button>',
+])("keeps raw markup from reaching the page: %s", (raw) => {
+  const { container } = render(<Markdown text={`text\n\n${raw}`} cwd="/repo" />);
+  expect(container.querySelector("style, form, link, meta, base, iframe, [style], [formaction]")).toBeNull();
+  expect(container.textContent).not.toContain("outline");
+});
+
+it("ignores data attributes written in a reply, keeping its own", () => {
+  const { container } = render(
+    <Markdown
+      text={'<button data-copy="evil">x</button>\n\n<code data-path="/etc/passwd">y</code>\n\n```ts\nconst a = 1;\n```'}
+      cwd="/repo"
+    />,
+  );
+  expect(container.querySelector("code[data-path]")).toBeNull();
+  fireEvent.click(screen.getByRole("button", { name: "x" }));
+  fireEvent.click(container.querySelector("code")!);
+  expect(openFile).not.toHaveBeenCalled();
+  expect(
+    [...container.querySelectorAll<HTMLElement>("button[data-copy]")].map((button) => button.dataset.copy),
+  ).toEqual(["const a = 1;"]);
+});
+
 it.each([
   ["/Users/thomas/vmos-shots/tiktok-home.jpg", "/Users/thomas/vmos-shots/tiktok-home.jpg", undefined],
   ["images/home.jpg", "/repo/images/home.jpg", undefined],
diff --git a/src/features/agents/Markdown.tsx b/src/features/agents/Markdown.tsx
index fe80c682..a0da3f50 100644
--- a/src/features/agents/Markdown.tsx
+++ b/src/features/agents/Markdown.tsx
@@ -19,7 +19,15 @@ const marked = new Marked({ gfm: true, breaks: true });
 
 export function markdownHtml(text: string): string {
   const html = marked.parse(text, { async: false }) as string;
-  const root = DOMPurify.sanitize(html, { USE_PROFILES: { html: true }, RETURN_DOM: true }) as HTMLElement;
+  // Replies can quote repository content. Styles would reach the whole IDE, and the click
+  // handlers below trust `data-copy` / `data-path`, which only `enhance` may set.
+  const root = DOMPurify.sanitize(html, {
+    USE_PROFILES: { html: true },
+    RETURN_DOM: true,
+    FORBID_TAGS: ["style", "form"],
+    FORBID_ATTR: ["style"],
+    ALLOW_DATA_ATTR: false,
+  }) as HTMLElement;
   root.querySelectorAll("li").forEach(wrapLooseText);
   return root.innerHTML;
 }
diff --git a/src/features/agents/Session.module.css b/src/features/agents/Session.module.css
index 7df8308d..d1a7e801 100644
--- a/src/features/agents/Session.module.css
+++ b/src/features/agents/Session.module.css
@@ -262,6 +262,7 @@
   background: var(--bg-elev);
 }
 .markdown :global(pre) {
+  margin: 0 0 8px;
   padding: 8px 10px;
   border-radius: var(--radius-small);
   background: var(--bg-elev);
@@ -306,44 +307,6 @@
   text-decoration: underline;
 }
 
-/* Lezer classHighlighter tokens in fenced code (same colours as the Markdown preview). */
-.markdown :global(.tok-keyword),
-.markdown :global(.tok-modifier),
-.markdown :global(.tok-controlKeyword),
-.markdown :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.markdown :global(.tok-string),
-.markdown :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.markdown :global(.tok-number),
-.markdown :global(.tok-bool),
-.markdown :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.markdown :global(.tok-typeName),
-.markdown :global(.tok-className),
-.markdown :global(.tok-namespace) {
-  color: var(--syn-type);
-}
-.markdown :global(.tok-comment) {
-  color: var(--syn-comment);
-}
-.markdown :global(.tok-meta),
-.markdown :global(.tok-macroName) {
-  color: var(--syn-annotation);
-}
-.markdown :global(.tok-propertyName) {
-  color: var(--syn-property);
-}
-.markdown :global(.tok-variableName.tok-definition) {
-  color: var(--syn-function);
-}
-.markdown :global(.tok-punctuation),
-.markdown :global(.tok-operator) {
-  color: var(--syn-punct);
-}
 .markdown :global(ul),
 .markdown :global(ol) {
   margin: 0 0 8px;
@@ -352,6 +315,60 @@
 .markdown :global(a) {
   color: var(--link);
 }
+.markdown :global(table) {
+  display: block;
+  margin: 0 0 8px;
+  overflow: auto;
+  border-collapse: collapse;
+}
+.markdown :global(th),
+.markdown :global(td) {
+  /* `overflow-wrap: anywhere` from .markdown would otherwise squeeze a column to a few letters. */
+  min-width: 6em;
+  border: 1px solid var(--border);
+  padding: 4px 8px;
+}
+.markdown :global(h1),
+.markdown :global(h2),
+.markdown :global(h3),
+.markdown :global(h4),
+.markdown :global(h5),
+.markdown :global(h6) {
+  margin: 12px 0 6px;
+  color: var(--fg-strong);
+  font-size: 1em;
+  line-height: 1.3;
+}
+.markdown :global(h1) {
+  font-size: 1.15em;
+}
+.markdown :global(h2) {
+  font-size: 1.08em;
+}
+.markdown :global(blockquote) {
+  margin: 0 0 8px;
+  padding: 0 10px;
+  border-left: 3px solid var(--border-strong);
+  color: var(--fg-secondary);
+}
+.markdown :global(hr) {
+  margin: 8px 0;
+  border: 0;
+  border-top: 1px solid var(--border);
+}
+.markdown :global(img) {
+  max-width: 100%;
+}
+.markdown :global(li:has(> input[type="checkbox"])) {
+  margin-left: -20px;
+  list-style: none;
+}
+.markdown > :global(:first-child) {
+  margin-top: 0;
+}
+.markdown > :global(:last-child) {
+  margin-bottom: 0;
+}
 
 .thought summary,
 .toolDetails > summary {
@@ -463,6 +480,14 @@
 .permissionLine > .muted {
   flex: none;
 }
+.permissionAnswers {
+  flex: 1 1 160px;
+  min-width: 0;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 2px 12px;
+  margin-left: 6px;
+}
 
 .error {
   display: flex;
diff --git a/src/features/agents/SessionEditor.tsx b/src/features/agents/SessionEditor.tsx
index ff57ff3a..b74a2b4c 100644
--- a/src/features/agents/SessionEditor.tsx
+++ b/src/features/agents/SessionEditor.tsx
@@ -1147,7 +1147,45 @@ function WorkingSubagents({ entries, onOpen }: { entries: AgentEntry[] | null; o
 /** Agent-written titles with the task's own folder dropped from paths. */
 const shortTitle = (task: AgentTask, title: string) => title.replaceAll(`${task.cwd}/`, "");
 
-function PermissionLine({ task, entry }: { task: AgentTask; entry: Extract<AgentEntry, { type: "permission" }> }) {
+type PermissionEntry = Extract<AgentEntry, { type: "permission" }>;
+
+/**
+ * The answers to an open permission request. A request without options (some agents send
+ * none) can still be cancelled, so the agent doesn't wait for an answer it can't get.
+ */
+function PermissionAnswers({
+  task,
+  entry,
+  className,
+}: {
+  task: AgentTask;
+  entry: PermissionEntry;
+  className?: string;
+}) {
+  const [busy, setBusy] = useState(false);
+  const answer = (option: string | null) => {
+    setBusy(true);
+    void respond(task.id, entry.id, option).finally(() => setBusy(false));
+  };
+  return (
+    <span className={className}>
+      {entry.options.length ? (
+        entry.options.map((o) => (
+          <button key={o.id} type="button" className={styles.bannerLink} disabled={busy} onClick={() => answer(o.id)}>
+            {o.name}
+          </button>
+        ))
+      ) : (
+        <button type="button" className={styles.bannerLink} disabled={busy} onClick={() => answer(null)}>
+          <T>Cancel</T>
+        </button>
+      )}
+    </span>
+  );
+}
+
+/** A permission request in the conversation; while open, answered right there as in the banner. */
+function PermissionLine({ task, entry }: { task: AgentTask; entry: PermissionEntry }) {
   return (
     <div className={styles.permissionLine}>
       <Icon name={!entry.chosen ? "warning" : entry.chosen === "Cancelled" ? "minus" : "check"} size={13} />
@@ -1155,32 +1193,20 @@ function PermissionLine({ task, entry }: { task: AgentTask; entry: Extract<Agent
         {shortTitle(task, entry.title)}
       </span>
       <span className={styles.muted}>{entry.chosen ?? <T>Waiting for your answer</T>}</span>
+      {!entry.chosen && <PermissionAnswers task={task} entry={entry} className={styles.permissionAnswers} />}
     </div>
   );
 }
 
 /** The open permission request, as an editor notification banner above the conversation. */
 function PermissionBanner({ task, entries }: { task: AgentTask; entries: AgentEntry[] | null }) {
-  const [busy, setBusy] = useState(false);
-  const entry = entries?.find(
-    (e): e is Extract<AgentEntry, { type: "permission" }> => e.type === "permission" && !e.chosen,
-  );
+  const entry = entries?.find((e): e is PermissionEntry => e.type === "permission" && !e.chosen);
   if (!entry) return null;
-  const answer = (option: string | null) => {
-    setBusy(true);
-    void respond(task.id, entry.id, option).finally(() => setBusy(false));
-  };
   return (
     <div className={styles.banner} role="alert" aria-label={entry.title}>
       <Icon name="warning" size={16} />
       <span className={styles.bannerText}>{shortTitle(task, entry.title)}</span>
-      <span className={styles.bannerActions}>
-        {entry.options.map((o) => (
-          <button key={o.id} type="button" className={styles.bannerLink} disabled={busy} onClick={() => answer(o.id)}>
-            {o.name}
-          </button>
-        ))}
-      </span>
+      <PermissionAnswers task={task} entry={entry} className={styles.bannerActions} />
     </div>
   );
 }
@@ -1408,7 +1434,7 @@ function ChangesPane({
             onActivate={(c) => void openChangeDiff(task, c.path)}
             renderNode={(c) => (
               <span className={styles.change} title={c.relPath}>
-                <Icon name={fileIconName(basename(c.path))} size={16} />
+                <Icon name={fileIconName(basename(c.path), c.path)} size={16} />
                 <span className={styles.changeName} style={{ color: KIND_COLOR[c.kind] }}>
                   {basename(c.path)}
                 </span>
diff --git a/src/features/agents/agents.test.ts b/src/features/agents/agents.test.ts
index 018f3465..57a66e7b 100644
--- a/src/features/agents/agents.test.ts
+++ b/src/features/agents/agents.test.ts
@@ -15,6 +15,7 @@ import {
   nextValue,
   recall,
   toPrompt,
+  mergeMatches,
   retryParts,
   usageLabel,
   limitLabel,
@@ -67,6 +68,27 @@ const option = (category: string, values: string[], current: string | null): Age
   via: "option",
 });
 
+describe("mergeMatches", () => {
+  it("ranks folders among files by score, files first on a tie", () => {
+    const merged = mergeMatches(
+      [
+        { path: "/p/src/agents.ts", relPath: "src/agents.ts", score: 50 },
+        { path: "/p/x.ts", relPath: "x.ts", score: 10 },
+      ],
+      [
+        { path: "/p/src/agents", relPath: "src/agents/", score: 50 },
+        { path: "/p/docs", relPath: "docs/", score: 70 },
+      ],
+      3,
+    );
+    expect(merged).toEqual([
+      { path: "/p/docs", rel: "docs", dir: true, score: 70 },
+      { path: "/p/src/agents.ts", rel: "src/agents.ts", dir: false, score: 50 },
+      { path: "/p/src/agents", rel: "src/agents", dir: true, score: 50 },
+    ]);
+  });
+});
+
 describe("agent composer", () => {
   it("completes @files anywhere and /commands as the first word", () => {
     expect(completionAt("fix @src/le", 11)).toEqual({ kind: "file", query: "src/le", from: 4, to: 11 });
@@ -111,6 +133,11 @@ describe("agent composer", () => {
     });
     expect(prompt).toEqual({ text: "look at @src/a.rs:3-5 and @b.rs", files: ["/w/src/a.rs", "/w/b.rs"], images: [] });
     expect(mentionOf("a.rs", { from: 3, to: 3 })).toBe("@a.rs:3");
+    // A folder counts while `@src/` is left as typed, not once a file inside it was picked.
+    const folder = { path: "/w/src", rel: "src/" };
+    expect(toPrompt({ text: "explain @src/ please", files: [folder], images: [] }).files).toEqual(["/w/src"]);
+    expect(toPrompt({ text: "explain @src/", files: [folder], images: [] }).files).toEqual(["/w/src"]);
+    expect(toPrompt({ text: "explain @src/a.rs", files: [folder], images: [] }).files).toEqual([]);
     expect(canSend({ text: " ", files: [], images: [] })).toBe(false);
   });
 
diff --git a/src/features/agents/composerFolders.test.tsx b/src/features/agents/composerFolders.test.tsx
new file mode 100644
index 00000000..3e619361
--- /dev/null
+++ b/src/features/agents/composerFolders.test.tsx
@@ -0,0 +1,84 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+
+const findFiles = vi.fn();
+const findDirs = vi.fn();
+const pathCompletions = vi.fn();
+
+vi.mock("@/platform/ipc", async (importOriginal) => {
+  const real = await importOriginal<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    isTauri: vi.fn(() => false),
+    commands: {
+      ...real.commands,
+      findFiles: (query: string, limit: number) => findFiles(query, limit),
+      findDirs: (query: string, limit: number) => findDirs(query, limit),
+      pathCompletions: (base: string, typed: string) => pathCompletions(base, typed),
+    },
+  };
+});
+
+import { Composer } from "./Composer";
+import { composerDraft, updateComposer } from "./store";
+import { emptyDraft, toPrompt } from "./composerModel";
+
+const ID = "folders-test";
+const ok = <T,>(data: T) => Promise.resolve({ status: "ok", data });
+
+function renderComposer() {
+  render(
+    <Composer
+      id={ID}
+      placeholder="Ask"
+      root="/p"
+      projectRoot="/p"
+      commands={[]}
+      history={[]}
+      config={[]}
+      onSubmit={() => {}}
+    />,
+  );
+  return screen.getByPlaceholderText("Ask") as HTMLTextAreaElement;
+}
+
+beforeEach(() => {
+  updateComposer(ID, emptyDraft());
+  const match = (path: string, relPath: string, score: number) => ({ path, relPath, score, indices: [] });
+  findFiles.mockReset().mockReturnValue(ok([match("/p/src/agents.ts", "src/agents.ts", 40)]));
+  findDirs.mockReset().mockReturnValue(ok([match("/p/src/agents", "src/agents/", 90)]));
+  pathCompletions.mockReset().mockReturnValue(ok([{ name: "lib", dir: true }]));
+});
+
+describe("Composer @ folders", () => {
+  it("lists index folders among files and references one on Enter", async () => {
+    const box = renderComposer();
+    await userEvent.type(box, "see @agen");
+    const options = await screen.findAllByRole("option");
+    expect(options.map((o) => o.textContent)).toEqual(["agents/src/agents", "agents.tssrc/agents.ts"]);
+    await userEvent.keyboard("{Enter}");
+    expect(box.value).toBe("see @src/agents/ ");
+    expect(toPrompt(composerDraft(ID)).files).toEqual(["/p/src/agents"]);
+  });
+
+  it("keeps completing inside a folder on Tab, which drops the folder once a file is picked", async () => {
+    const box = renderComposer();
+    await userEvent.type(box, "@agen");
+    await screen.findAllByRole("option");
+    await userEvent.keyboard("{Tab}");
+    expect(box.value).toBe("@src/agents/");
+    expect(toPrompt(composerDraft(ID)).files).toEqual(["/p/src/agents"]);
+    await userEvent.type(box, "x.ts ");
+    expect(toPrompt(composerDraft(ID)).files).toEqual([]);
+  });
+
+  it("references a folder of a typed path", async () => {
+    const box = renderComposer();
+    await userEvent.type(box, "@./");
+    await screen.findByRole("option");
+    await userEvent.keyboard("{Enter}");
+    expect(box.value).toBe("@./lib/ ");
+    expect(toPrompt(composerDraft(ID)).files).toEqual(["/p/lib"]);
+  });
+});
diff --git a/src/features/agents/composerModel.ts b/src/features/agents/composerModel.ts
index fdc93c01..a0aafd41 100644
--- a/src/features/agents/composerModel.ts
+++ b/src/features/agents/composerModel.ts
@@ -94,6 +94,29 @@ export function resolveTyped(root: string, rel: string): string {
   return isDrive(out[0]) ? out.join("/") : `/${out.join("/")}`;
 }
 
+interface IndexMatch {
+  path: string;
+  relPath: string;
+  score: number;
+}
+
+/**
+ * Index file and folder matches as one list, best first (files first on a tie); folders'
+ * `rel` loses the trailing `/` the index gives them.
+ */
+export function mergeMatches(
+  files: readonly IndexMatch[],
+  dirs: readonly IndexMatch[],
+  limit: number,
+): { path: string; rel: string; dir: boolean; score: number }[] {
+  return [
+    ...files.map((f) => ({ path: f.path, rel: f.relPath, dir: false, score: f.score })),
+    ...dirs.map((d) => ({ path: d.path, rel: d.relPath.replace(/\/$/, ""), dir: true, score: d.score })),
+  ]
+    .sort((a, b) => b.score - a.score || Number(a.dir) - Number(b.dir))
+    .slice(0, limit);
+}
+
 /** `@rel` with a line range suffix when given ("@src/a.rs:10-20"). */
 export function mentionOf(rel: string, lines?: { from: number; to: number }): string {
   if (!lines) return `@${rel}`;
diff --git a/src/features/agents/sessionState.test.tsx b/src/features/agents/sessionState.test.tsx
index 9348c369..9d0a361f 100644
--- a/src/features/agents/sessionState.test.tsx
+++ b/src/features/agents/sessionState.test.tsx
@@ -135,6 +135,47 @@ describe("a pending question", () => {
   });
 });
 
+describe("a pending permission request in the conversation", () => {
+  it("is answered from its line too, and one without options can be cancelled", async () => {
+    backend.entries.set("A", [
+      {
+        type: "permission",
+        id: 3,
+        title: "ls d:/project",
+        options: [
+          { id: "once", name: "Allow once", kind: "allow_once" },
+          { id: "reject", name: "Reject", kind: "reject_once" },
+        ],
+        chosen: null,
+      },
+    ]);
+    backend.entries.set("B", [
+      { type: "permission", id: 4, title: "The agent asks for permission", options: [], chosen: null },
+    ]);
+    backend.answers = [];
+    useAgents.setState({ entries: new Map(backend.entries) });
+    const { unmount } = render(<SessionEditor input={input("A")} />);
+    const line = (await screen.findAllByText("ls d:/project")).find((e) =>
+      e.classList.contains(styles.permissionTitle!),
+    )!.parentElement!;
+    const answers = within(line.querySelector<HTMLElement>(`.${styles.permissionAnswers}`)!).getAllByRole("button");
+    expect(answers.map((b) => b.textContent)).toEqual(["Allow once", "Reject"]);
+    fireEvent.click(answers[0]!);
+    await waitFor(() => expect(backend.answers).toEqual([["A", 3, "once"]]));
+    unmount();
+
+    render(<SessionEditor input={input("B")} />);
+    const banner = await screen.findByRole("alert", { name: "The agent asks for permission" });
+    fireEvent.click(within(banner).getByRole("button", { name: "Cancel" }));
+    await waitFor(() =>
+      expect(backend.answers).toEqual([
+        ["A", 3, "once"],
+        ["B", 4, null],
+      ]),
+    );
+  });
+});
+
 describe("session state across tasks and hosts", () => {
   it("returns to the task conversation when the docked task changes after opening a subagent", async () => {
     const dispose = registerActions(taskActions);
diff --git a/src/features/analysis/DuplicatesView.tsx b/src/features/analysis/DuplicatesView.tsx
index 82e90dc1..a6923589 100644
--- a/src/features/analysis/DuplicatesView.tsx
+++ b/src/features/analysis/DuplicatesView.tsx
@@ -41,7 +41,7 @@ function FragmentPane({ fragment }: { fragment: Fragment }) {
         onClick={() => openFragment(fragment)}
         title={tx("Open in editor")}
       >
-        <Icon name={fileIconName(basename(fragment.path))} size={16} className={styles.fileIcon} />
+        <Icon name={fileIconName(basename(fragment.path), fragment.path)} size={16} className={styles.fileIcon} />
         <span className={styles.strong}>{basename(fragment.path)}</span>
         <span className={styles.muted}>
           {fragment.range.start.line + 1}–{fragment.range.end.line + 1}
@@ -111,7 +111,11 @@ export function DuplicatesView() {
                 </span>
               ) : (
                 <span className={styles.row}>
-                  <Icon name={fileIconName(basename(n.fragment.path))} size={16} className={styles.fileIcon} />
+                  <Icon
+                    name={fileIconName(basename(n.fragment.path), n.fragment.path)}
+                    size={16}
+                    className={styles.fileIcon}
+                  />
                   <span>{basename(n.fragment.path)}</span>
                   <span className={styles.muted}>
                     :{n.fragment.range.start.line + 1}–{n.fragment.range.end.line + 1}
diff --git a/src/features/analysis/InspectionView.tsx b/src/features/analysis/InspectionView.tsx
index 71474b94..bb8219bf 100644
--- a/src/features/analysis/InspectionView.tsx
+++ b/src/features/analysis/InspectionView.tsx
@@ -301,7 +301,7 @@ export function InspectionView() {
       case "file":
         return (
           <span className={clsx(styles.row, off)}>
-            <Icon name={fileIconName(basename(n.path))} size={16} className={styles.fileIcon} />
+            <Icon name={fileIconName(basename(n.path), n.path)} size={16} className={styles.fileIcon} />
             <span className={state.selected ? styles.strong : undefined}>{basename(n.path)}</span>
             <span className={styles.muted}>{relativeDir(root, n.path)}</span>
             <span className={styles.count}>{n.count}</span>
diff --git a/src/features/app/closeGuard.ts b/src/features/app/closeGuard.ts
index 2eedcb92..c08195de 100644
--- a/src/features/app/closeGuard.ts
+++ b/src/features/app/closeGuard.ts
@@ -12,6 +12,7 @@ import { t } from "@/platform/i18n";
 import { closeProject, provideLeaveProjectGuard, useProject } from "@/platform/project";
 import { maybeEditorService, notifications, type EditorCloseSession } from "@/workbench/contributions";
 import { ask, type Ask } from "@/workbench/messages";
+import { AUX_CLOSED, auxiliaryWindow, closeDocumentWindows, type AuxCloseResult } from "@/platform/auxWindow";
 
 /** Document ids the backend reports dirty in this window. */
 const dirtyDocs = new Set<number>();
@@ -108,6 +109,10 @@ async function onCloseRequested(deps: CloseDeps): Promise<boolean> {
   closing = true;
   try {
     const ctx = await commands.windowCloseContext();
+    if (!(await closeDocumentWindows())) {
+      await (ctx.quitting ? commands.appCancelQuit() : commands.windowGroupCancelClose());
+      return false;
+    }
     const s = useProject.getState();
     // Closing the last project (or LightEdit) window closes its project and shows the welcome
     // screen (to open another one); closing the welcome screen, or quitting, closes the window.
@@ -137,13 +142,16 @@ async function onCloseRequested(deps: CloseDeps): Promise<boolean> {
   }
 }
 
-/** Unsaved changes before this window opens another project in place or closes it. */
-export function confirmLeave(deps: CloseDeps = defaultDeps): Promise<boolean> {
-  const s = useProject.getState();
-  return decideClose(
-    { quitting: false, windows: 2, confirmExit: false, dirty: dirtyCount(), project: s.project?.name ?? null },
-    deps,
-  );
+/**
+ * Unsaved changes before this window opens another project in place or closes it. `project` names
+ * the project in the prompt when this window doesn't hold it (a comparison window).
+ */
+export async function confirmLeave(
+  deps: CloseDeps = defaultDeps,
+  project = useProject.getState().project?.name ?? null,
+): Promise<boolean> {
+  if (!(await closeDocumentWindows())) return false;
+  return decideClose({ quitting: false, windows: 2, confirmExit: false, dirty: dirtyCount(), project }, deps);
 }
 
 /** Quit: confirm once (if enabled), then let the backend close every window. */
@@ -174,11 +182,26 @@ export function installCloseGuard(deps: CloseDeps = defaultDeps): () => void {
   let disposed = false;
   if (isTauri()) {
     void import("@tauri-apps/api/window").then(async ({ getCurrentWindow }) => {
+      // Documents an auxiliary window released are no longer dirty unless this window edits them too.
+      const offAux = await getCurrentWindow().listen<AuxCloseResult>(AUX_CLOSED, ({ payload }) => {
+        if (
+          !payload.closed ||
+          auxiliaryWindow(payload.label)?.parent !== getCurrentWindow().label ||
+          !Array.isArray(payload.documents)
+        )
+          return;
+        const own = new Set(maybeEditorService()?.dirtyDocumentIds?.() ?? []);
+        for (const doc of payload.documents) if (!own.has(doc)) dirtyDocs.delete(doc);
+      });
       const off = await getCurrentWindow().onCloseRequested(async (event) => {
         if (!(await onCloseRequested(deps))) event.preventDefault();
       });
-      if (disposed) off();
-      else unlisten = off;
+      const stop = () => {
+        off();
+        offAux();
+      };
+      if (disposed) stop();
+      else unlisten = stop;
     });
   }
   return () => {
diff --git a/src/features/app/index.ts b/src/features/app/index.ts
index 57cffc85..d86eef2c 100644
--- a/src/features/app/index.ts
+++ b/src/features/app/index.ts
@@ -20,8 +20,11 @@ import { installLaunchHandling, installLightEditAutoClose, windowActions } from
 import { WorkspaceDialogHost } from "./WorkspaceDialog";
 import { installWindowGroups } from "@/platform/windowGroups";
 
-/** The UI locale of a secondary (Settings) window. */
+/** The UI locale of a secondary (Settings, comparison) window. */
 export const activateLocale = installLocaleSync;
+/** Native menu items of a secondary window that runs actions itself (comparison). */
+export const activateMenuBridge = installMenuBridge;
+export { confirmLeave } from "./closeGuard";
 
 export function activate(): () => void {
   const disposers = [
diff --git a/src/features/build-tools/BuildToolView.tsx b/src/features/build-tools/BuildToolView.tsx
index fe4f9697..898ebd1f 100644
--- a/src/features/build-tools/BuildToolView.tsx
+++ b/src/features/build-tools/BuildToolView.tsx
@@ -21,6 +21,7 @@ import {
 import {
   gradleChildren,
   gradleRoots,
+  gradleProjectKey,
   gradleTaskConfig,
   isRunnable,
   mavenChildren,
@@ -56,7 +57,7 @@ export function GradleView() {
 /** The run configuration a runnable node (or several of one project) starts. */
 export function nodeConfig(
   nodes: readonly BuildNode[],
-  model: { maven?: MavenModel | null; gradle?: GradleModel | null },
+  model: { maven?: MavenModel | null; gradle?: readonly GradleModel[] },
 ) {
   const settings = useBuild.getState().settings;
   const first = nodes[0];
@@ -71,13 +72,17 @@ export function nodeConfig(
     const goals = same.map((n) => (n.kind === "phase" ? n.phase : `${n.plugin.prefix}:${n.goal}`));
     return mavenGoalConfig(first.project, goals, model.maven, settings.maven);
   }
-  if (first.kind === "task" && model.gradle) {
+  if (first.kind === "task") {
+    const build = model.gradle?.find((g) => g.dir === first.build.dir);
+    const project = build?.projects.find((p) => p.path === first.project.path);
+    if (!build || !project) return null;
     const same = nodes.filter(
-      (n): n is Extract<BuildNode, { kind: "task" }> => n.kind === "task" && n.project.path === first.project.path,
+      (n): n is Extract<BuildNode, { kind: "task" }> =>
+        n.kind === "task" && n.build.dir === first.build.dir && n.project.path === first.project.path,
     );
     return gradleTaskConfig(
-      model.gradle,
-      first.project,
+      build,
+      project,
       same.map((n) => n.task.name),
       settings.gradle,
     );
@@ -89,8 +94,9 @@ export function nodeConfig(
 function childrenOf(
   tool: BuildTool,
   maven: MavenModel | null,
-  gradle: GradleModel | null,
+  gradle: readonly GradleModel[],
   configs: readonly RunConfig[],
+  root: string,
 ) {
   const cache = new Map<string, BuildNode[] | undefined>();
   return (n: BuildNode) => {
@@ -101,7 +107,7 @@ function childrenOf(
           ? mavenChildren(n, maven, configs)
           : undefined
         : gradle
-          ? gradleChildren(n, gradle, configs)
+          ? gradleChildren(n, gradle, configs, root)
           : undefined;
     cache.set(n.key, kids);
     return kids;
@@ -110,7 +116,8 @@ function childrenOf(
 
 /** Maven `pom` / Gradle project path of the project a node belongs to. */
 function nodeProject(n: BuildNode): string | undefined {
-  if ("project" in n) return "pom" in n.project ? n.project.pom : n.project.path;
+  if ("project" in n)
+    return "pom" in n.project ? n.project.pom : "build" in n ? gradleProjectKey(n.build, n.project) : undefined;
   return undefined;
 }
 
@@ -118,9 +125,8 @@ function Toolbar({ tool, selection }: { tool: BuildTool; selection: BuildNode[]
   const syncing = useBuild((s) => !!s.syncing[tool]);
   const settings = useBuild((s) => s.settings);
   const model = useBuild((s) => s.model);
-  const runnable = selection.filter(isRunnable);
+  const config = model && nodeConfig(selection.filter(isRunnable), model);
   const runSelected = () => {
-    const config = model && nodeConfig(runnable, model);
     if (config) runConfig(config, "run");
   };
   const maven = tool === "maven";
@@ -131,14 +137,14 @@ function Toolbar({ tool, selection }: { tool: BuildTool; selection: BuildNode[]
       ) : (
         <IconButton icon="refresh" size="small" iconSize={16} action={`${tool}.reload`} />
       )}
-      {maven && <IconButton icon="plus" size="small" iconSize={16} action="maven.addProjects" />}
+      <IconButton icon="plus" size="small" iconSize={16} action={maven ? "maven.addProjects" : "gradle.linkProjects"} />
       <span className={styles.sep} />
       <IconButton
         icon="run"
         size="small"
         iconSize={16}
         title={maven ? "Run Maven Build" : "Run Gradle Task"}
-        disabled={!runnable.length}
+        disabled={!config}
         onClick={runSelected}
       />
       <IconButton
@@ -154,7 +160,12 @@ function Toolbar({ tool, selection }: { tool: BuildTool; selection: BuildNode[]
         action={`${tool}.toggleOffline`}
         pressed={maven ? settings.maven.offline : settings.gradle.offline}
       />
-      {maven && <IconButton icon="build-dependencies" size="small" iconSize={16} action="maven.analyzeDependencies" />}
+      <IconButton
+        icon="build-dependencies"
+        size="small"
+        iconSize={16}
+        action={maven ? "maven.analyzeDependencies" : "gradle.analyzeDependencies"}
+      />
       {maven && (
         <IconButton
           icon="skip-tests"
@@ -176,7 +187,8 @@ function Toolbar({ tool, selection }: { tool: BuildTool; selection: BuildNode[]
 
 function Banner({ tool }: { tool: BuildTool }) {
   const sync = useBuild((s) => s.syncing[tool]);
-  const info = useBuild((s) => (tool === "maven" ? s.model?.maven : s.model?.gradle));
+  const model = useBuild((s) => s.model);
+  const infos = tool === "maven" ? (model?.maven ? [model.maven] : []) : (model?.gradle ?? []);
   if (sync)
     return (
       <div className={styles.banner} role="status">
@@ -185,7 +197,10 @@ function Banner({ tool }: { tool: BuildTool }) {
         {sync.fraction != null && <span className={styles.bannerPct}>{Math.round(sync.fraction * 100)}%</span>}
       </div>
     );
-  if (!info) return null;
+  return infos.map((info) => <BuildBanner key={"dir" in info ? info.dir : "maven"} info={info} tool={tool} />);
+}
+
+function BuildBanner({ info, tool }: { info: MavenModel | GradleModel; tool: BuildTool }) {
   if (info.stale)
     return (
       <div className={styles.banner}>
@@ -193,7 +208,7 @@ function Banner({ tool }: { tool: BuildTool }) {
         <span className={styles.bannerText}>
           <T>Build files changed since the last reload</T>
         </span>
-        <Button size="small" variant="ghost" onClick={() => void syncTool(tool)}>
+        <Button size="small" variant="ghost" onClick={() => void syncTool(tool, "dir" in info ? info.dir : null)}>
           {tool === "maven" ? "Load Maven Changes" : "Load Gradle Changes"}
         </Button>
       </div>
@@ -255,15 +270,18 @@ function BuildToolView({ tool }: { tool: BuildTool }) {
   const root = useProject((s) => s.project?.root ?? "");
   const [selection, setSelection] = useState<BuildNode[]>([]);
   const maven = model?.maven ?? null;
-  const gradle = model?.gradle ?? null;
+  const gradle = model?.gradle;
 
   const roots = useMemo(
-    () => (tool === "maven" ? (maven ? mavenRoots(maven) : []) : gradle ? gradleRoots(gradle) : []),
+    () => (tool === "maven" ? (maven ? mavenRoots(maven) : []) : gradleRoots(gradle ?? [])),
     [tool, maven, gradle],
   );
-  const getChildren = useMemo(() => childrenOf(tool, maven, gradle, configs), [tool, maven, gradle, configs]);
+  const getChildren = useMemo(
+    () => childrenOf(tool, maven, gradle ?? [], configs, root),
+    [tool, maven, gradle, configs, root],
+  );
 
-  const hasModel = tool === "maven" ? !!maven : !!gradle;
+  const hasModel = tool === "maven" ? !!maven : !!gradle?.length;
   useEffect(() => {
     if (model && hasModel && useBuild.getState().expanded[tool].size === 0)
       setExpanded(tool, initialExpanded(tool, model));
@@ -326,11 +344,22 @@ function BuildToolView({ tool }: { tool: BuildTool }) {
         items.push({
           label: tx`Open ${file.split("/").pop()}`,
           icon: "file-gradle",
-          run: () => void editorService().openFile(`${root}/${file}`),
+          run: () => void editorService().openFile(/^(?:[A-Za-z]:[\\/]|\/)/.test(file) ? file : `${root}/${file}`),
         });
+      if (node.project.path === ":")
+        items.push({ kind: "action", action: "gradle.unlinkProjects", arg: { buildDir: node.build.dir } });
       items.push(
-        { kind: "action", action: "gradle.reload", label: "Reload All Gradle Projects" },
-        { kind: "action", action: "gradle.executeTask" },
+        { kind: "action", action: "gradle.reload", label: "Reload Gradle Project", arg: { buildDir: node.build.dir } },
+        {
+          kind: "action",
+          action: "gradle.executeTask",
+          arg: { projectKey: gradleProjectKey(node.build, node.project) },
+        },
+        {
+          kind: "action",
+          action: "gradle.analyzeDependencies",
+          arg: { buildDir: node.build.dir, gradlePath: node.project.path },
+        },
       );
     }
     if (node.kind === "dependency") {
diff --git a/src/features/build-tools/DependencyAnalyzer.module.css b/src/features/build-tools/DependencyAnalyzer.module.css
index 8cda334a..7df8f685 100644
--- a/src/features/build-tools/DependencyAnalyzer.module.css
+++ b/src/features/build-tools/DependencyAnalyzer.module.css
@@ -20,7 +20,7 @@
   max-width: 260px;
 }
 .search {
-  flex: 1 1 200px;
+  flex: 1 1 140px;
   min-width: 140px;
   max-width: 360px;
 }
@@ -203,3 +203,10 @@
 .stepTarget {
   color: var(--fg-strong);
 }
+
+.errorText {
+  max-width: 560px;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  color: var(--fg-muted);
+}
diff --git a/src/features/build-tools/DependencyAnalyzer.test.tsx b/src/features/build-tools/DependencyAnalyzer.test.tsx
index deb09ba0..0cb9d1bd 100644
--- a/src/features/build-tools/DependencyAnalyzer.test.tsx
+++ b/src/features/build-tools/DependencyAnalyzer.test.tsx
@@ -1,20 +1,26 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { act, fireEvent, render, screen } from "@testing-library/react";
+import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { executeAction } from "@/platform/actions";
 import { setContext } from "@/platform/context";
-import type { BuildModel, MavenDependency } from "@/platform/ipc";
+import type { BuildModel, GradleDependency, GradleModel, MavenDependency } from "@/platform/ipc";
 import { menuGroupItems, provideEditorService, type EditorService } from "@/workbench/contributions";
 import { DependencyAnalyzer } from "./DependencyAnalyzer";
 import { activate } from "./index";
 import { ANALYZER_KIND, useAnalyzer, useBuild } from "./store";
 
-const ipc = vi.hoisted(() => ({ exclude: vi.fn(), declaration: vi.fn() }));
+const ipc = vi.hoisted(() => ({ exclude: vi.fn(), declaration: vi.fn(), gradle: vi.fn(), cancel: vi.fn() }));
 vi.mock("@/platform/ipc", async (original) => {
   const real = await original<typeof import("@/platform/ipc")>();
   return {
     ...real,
     call: (value: unknown) => value,
-    commands: { ...real.commands, mavenExcludeDependency: ipc.exclude, mavenDependencyDeclaration: ipc.declaration },
+    commands: {
+      ...real.commands,
+      mavenExcludeDependency: ipc.exclude,
+      mavenDependencyDeclaration: ipc.declaration,
+      gradleDependencies: ipc.gradle,
+      cancelRequest: ipc.cancel,
+    },
   };
 });
 
@@ -66,7 +72,7 @@ const model: BuildModel = {
     stale: false,
     syncError: null,
   },
-  gradle: null,
+  gradle: [],
 };
 
 describe("dependency analyzer", () => {
@@ -88,7 +94,7 @@ describe("dependency analyzer", () => {
   it("opens as an editor tab from the action and from a pom.xml's menus", async () => {
     await executeAction("maven.analyzeDependencies", { pom: "pom.xml" });
     expect(openInput).toHaveBeenCalledWith(expect.objectContaining({ kind: ANALYZER_KIND }), { focus: true });
-    expect(useAnalyzer.getState().pom).toBe("pom.xml");
+    expect(useAnalyzer.getState().module).toBe("pom.xml");
     for (const menu of ["editor", "projectView", "editorTab"] as const) {
       const items = menuGroupItems(menu, { paths: ["/p/pom.xml"] });
       expect(items[0]).toMatchObject({ action: "maven.analyzeDependencies", arg: { pom: "pom.xml" } });
@@ -116,3 +122,119 @@ describe("dependency analyzer", () => {
     );
   });
 });
+
+function gradleDep(coords: string, selected: string | null, children: GradleDependency[] = []): GradleDependency {
+  const [group, name, requested] = coords.split(":");
+  return {
+    group: group!,
+    name: name!,
+    requested: requested ?? null,
+    selected,
+    project: false,
+    repeated: false,
+    constraint: false,
+    unresolved: false,
+    children,
+  };
+}
+
+const gradle: GradleModel = {
+  dir: "",
+  projects: [
+    { path: ":", name: "demo", dir: "", buildFile: "build.gradle", tasks: [] },
+    { path: ":app", name: "app", dir: "app", buildFile: "app/build.gradle.kts", tasks: [] },
+  ],
+  javaVersion: null,
+  command: "gradle",
+  env: {},
+  syncedAt: null,
+  stale: false,
+  syncError: null,
+};
+
+describe("dependency analyzer for Gradle", () => {
+  let dispose: () => void = () => {};
+  const openInput = vi.fn(() => Promise.resolve());
+  beforeEach(() => {
+    provideEditorService({ openInput, activePath: () => null } as unknown as EditorService);
+    setContext("projectOpen", true);
+    dispose = activate();
+    act(() => useBuild.setState({ root: "/g", model: { maven: null, gradle: [gradle] } }));
+  });
+  afterEach(() => {
+    dispose();
+    setContext("projectOpen", false);
+    vi.clearAllMocks();
+  });
+
+  it("opens for a project from the action and from its build script's menus", async () => {
+    await executeAction("gradle.analyzeDependencies", { gradlePath: ":app" });
+    expect(openInput).toHaveBeenCalledWith(expect.objectContaining({ kind: ANALYZER_KIND }), { focus: true });
+    expect(useAnalyzer.getState().module).toBe('gradle:["",":app"]');
+    const items = menuGroupItems("projectView", { paths: ["/g/app/build.gradle.kts"] });
+    expect(items).toContainEqual(
+      expect.objectContaining({ action: "gradle.analyzeDependencies", arg: { path: "/g/app/build.gradle.kts" } }),
+    );
+    await executeAction("gradle.analyzeDependencies", { path: "/g/build.gradle" });
+    expect(useAnalyzer.getState().module).toBe('gradle:["",":"]');
+    expect(menuGroupItems("editor", { paths: ["/g/other/build.gradle"] })).toEqual([]);
+  });
+
+  it("reads the configuration's report and marks versions Gradle replaced", async () => {
+    ipc.gradle.mockResolvedValue([
+      gradleDep("org.springframework.boot:spring-boot-starter-json", "3.2.0", [
+        gradleDep("com.fasterxml.jackson.core:jackson-databind:2.15.0", "2.15.3"),
+      ]),
+      gradleDep("com.fasterxml.jackson.core:jackson-databind:2.15.3", null),
+    ]);
+    act(() => useAnalyzer.setState({ module: 'gradle:["",":app"]' }));
+    render(<DependencyAnalyzer input={{ kind: ANALYZER_KIND, key: ANALYZER_KIND }} />);
+    expect(ipc.gradle).toHaveBeenCalledWith(":app", "runtimeClasspath", false, expect.any(Number), "");
+    await screen.findByText("com.fasterxml.jackson.core:jackson-databind");
+    fireEvent.click(screen.getByRole("checkbox", { name: "Show conflicts only" }));
+    expect(screen.queryByText("org.springframework.boot:spring-boot-starter-json")).toBeNull();
+    fireEvent.mouseDown(screen.getByText("com.fasterxml.jackson.core:jackson-databind").closest("[role=treeitem]")!, {
+      button: 0,
+    });
+    expect(screen.getByText("requested 2.15.0")).toBeTruthy();
+    expect(screen.getByText("org.springframework.boot:spring-boot-starter-json:3.2.0")).toBeTruthy();
+    // Exclude and Jump to Source edit a pom.xml: not offered for Gradle.
+    expect(screen.queryByRole("button", { name: "Exclude" })).toBeNull();
+    expect(screen.queryByRole("button", { name: "Jump to Source" })).toBeNull();
+  });
+
+  it("routes identical project paths and report caches by linked build", async () => {
+    const builds = ["one", "two"].map((dir) => ({
+      ...gradle,
+      dir,
+      syncedAt: 1,
+      projects: gradle.projects.map((p) => ({ ...p, dir: `${dir}/${p.dir}`, buildFile: `${dir}/${p.buildFile}` })),
+    }));
+    ipc.gradle.mockResolvedValue([]);
+    act(() => {
+      useBuild.setState({ model: { maven: null, gradle: builds } });
+      useAnalyzer.setState({ module: 'gradle:["one",":app"]' });
+    });
+    render(<DependencyAnalyzer input={{ kind: ANALYZER_KIND, key: ANALYZER_KIND }} />);
+    await waitFor(() =>
+      expect(ipc.gradle).toHaveBeenCalledWith(":app", "runtimeClasspath", false, expect.any(Number), "one"),
+    );
+    act(() => useAnalyzer.setState({ module: 'gradle:["two",":app"]' }));
+    await waitFor(() =>
+      expect(ipc.gradle).toHaveBeenLastCalledWith(":app", "runtimeClasspath", false, expect.any(Number), "two"),
+    );
+    expect(ipc.gradle).toHaveBeenCalledTimes(2);
+  });
+
+  it("shows why Gradle could not resolve the configuration", async () => {
+    ipc.gradle.mockRejectedValue(new Error("Could not resolve all files for configuration ':app:runtimeClasspath'."));
+    act(() => useAnalyzer.setState({ module: 'gradle:["",":"]' }));
+    render(<DependencyAnalyzer input={{ kind: ANALYZER_KIND, key: ANALYZER_KIND }} />);
+    expect(await screen.findByText("Cannot resolve dependencies")).toBeTruthy();
+    expect(screen.getByText(/Could not resolve all files/)).toBeTruthy();
+    ipc.gradle.mockResolvedValue([]);
+    await act(async () => fireEvent.click(screen.getByRole("button", { name: "Retry" })));
+    expect(ipc.gradle).toHaveBeenCalledTimes(2);
+    expect(await screen.findByText("No dependencies")).toBeTruthy();
+  });
+});
diff --git a/src/features/build-tools/DependencyAnalyzer.tsx b/src/features/build-tools/DependencyAnalyzer.tsx
index 89c7b91c..2b48e5bf 100644
--- a/src/features/build-tools/DependencyAnalyzer.tsx
+++ b/src/features/build-tools/DependencyAnalyzer.tsx
@@ -1,11 +1,20 @@
 /**
- * Dependency Analyzer editor tab: a Maven module's resolved artifacts (flat list or
- * the transitive tree) with conflicts marked, and for the selected artifact every
- * path that brings it in, with Exclude / Jump to Source / Copy Coordinates.
+ * Dependency Analyzer editor tab: a Maven module's or a Gradle project's resolved
+ * artifacts (flat list or the transitive tree) with conflicts marked, and for the
+ * selected artifact every path that brings it in, with Exclude / Jump to Source (Maven)
+ * and Copy Coordinates. Gradle trees are read per configuration, on demand.
  */
-import { useMemo, useState, type MouseEvent } from "react";
+import { useEffect, useMemo, useRef, useState, type MouseEvent } from "react";
 import clsx from "clsx";
-import { call, commands, type MavenDependency, type MavenProject } from "@/platform/ipc";
+import {
+  call,
+  commands,
+  isCancelled,
+  nextRequestId,
+  type GradleModel,
+  type MavenDependency,
+  type MavenProject,
+} from "@/platform/ipc";
 import { useTx, useTxTemplate, tx } from "@/platform/i18n";
 import { editorService, notifications, type EditorInput } from "@/workbench/contributions";
 import {
@@ -34,6 +43,8 @@ import {
   exclusionFor,
   filterArtifacts,
   filterTree,
+  fromGradle,
+  isBuildProject,
   scopesOf,
   sortedUsages,
   statusText,
@@ -42,6 +53,7 @@ import {
   type DependencyTreeNode,
   type DependencyUsage,
 } from "./analyzer";
+import { gradleProjectKey } from "./model";
 import { syncTool, useAnalyzer, useBuild } from "./store";
 import styles from "./DependencyAnalyzer.module.css";
 
@@ -51,6 +63,66 @@ type Node =
   | { kind: "node"; key: string; node: DependencyTreeNode; children: Node[] };
 
 const ALL_SCOPES = "*";
+const GRADLE = "gradle:";
+/** The resolvable configurations of the Java plugins. */
+const CONFIGURATIONS = ["compileClasspath", "runtimeClasspath", "testCompileClasspath", "testRuntimeClasspath"];
+
+type GradleTree = { deps: MavenDependency[] | null; error: string | null; loading: boolean };
+/** Reports already read in this session, by workspace, build, project and configuration: reopening the tab doesn't run Gradle again. */
+const gradleTrees = new Map<string, MavenDependency[]>();
+
+/** The `dependencies` report of `path` for `configuration`, cached; a new `generation` runs Gradle again. */
+function useGradleTree(path: string | null, buildDir: string | null, configuration: string, generation: number) {
+  const root = useBuild((s) => s.root);
+  const key = path && root ? JSON.stringify([root, buildDir, path, configuration]) : null;
+  const [state, setState] = useState<GradleTree & { key: string | null }>({
+    key: null,
+    deps: null,
+    error: null,
+    loading: false,
+  });
+  const served = useRef(generation);
+  const running = useRef<number | null>(null);
+  useEffect(() => {
+    if (!key || !path) return;
+    const forced = served.current !== generation;
+    served.current = generation;
+    const cached = gradleTrees.get(key);
+    if (cached && !forced) {
+      setState({ key, deps: cached, error: null, loading: false });
+      return;
+    }
+    const request = nextRequestId();
+    running.current = request;
+    // Answers of a run this effect no longer owns (a cancelled one included) are dropped.
+    let live = true;
+    let done = false;
+    setState({ key, deps: cached ?? null, error: null, loading: true });
+    const offline = useBuild.getState().settings.gradle.offline;
+    call(commands.gradleDependencies(path, configuration, offline, request, buildDir))
+      .then((deps) => {
+        const tree = fromGradle(deps);
+        gradleTrees.set(key, tree);
+        if (live) setState({ key, deps: tree, error: null, loading: false });
+      })
+      .catch((e) => {
+        if (live) setState({ key, deps: cached ?? null, error: isCancelled(e) ? null : errorText(e), loading: false });
+      })
+      .finally(() => {
+        done = true;
+        if (running.current === request) running.current = null;
+      });
+    return () => {
+      live = false;
+      if (!done) void commands.cancelRequest(request).catch(() => {});
+    };
+  }, [key, path, buildDir, configuration, generation]);
+  const current: GradleTree = state.key === key ? state : { deps: null, error: null, loading: !!key };
+  const cancel = () => {
+    if (running.current != null) void commands.cancelRequest(running.current).catch(() => {});
+  };
+  return { ...current, cancel };
+}
 
 function errorText(e: unknown) {
   return e instanceof Error ? e.message : String(e);
@@ -91,17 +163,34 @@ function versionLabel(d: MavenDependency) {
   return d.version ?? "";
 }
 
-function moduleOptions(projects: readonly MavenProject[]): SelectOption[] {
-  return projects
-    .filter((p) => p.packaging !== "pom" || p.dependencies.length > 0)
-    .map((p) => ({ value: p.pom, label: p.displayName, detail: p.pom, icon: "maven-project" }));
+function moduleOptions(maven: readonly MavenProject[], gradle: readonly GradleModel[]): SelectOption[] {
+  return [
+    ...maven
+      .filter((p) => p.packaging !== "pom" || p.dependencies.length > 0)
+      .map((p) => ({ value: p.pom, label: p.displayName, detail: p.pom, icon: "maven-project" })),
+    // buildSrc's tasks can't be run from the build.
+    ...gradle.flatMap((build) =>
+      build.projects
+        .filter((p) => !p.build?.endsWith(":buildSrc"))
+        .map((p) => ({
+          value: gradleProjectKey(build, p),
+          label: p.name,
+          detail: `${build.dir || "."} ${p.path}`,
+          icon: p.path === ":" ? "gradle-project" : "gradle-module",
+        })),
+    ),
+  ];
 }
 
 function ArtifactRow({ artifact, selected }: { artifact: AnalyzedArtifact; selected: boolean }) {
   const tx = useTx();
   return (
     <span className={styles.row}>
-      <Icon name={artifact.conflict ? "warning" : "library"} size={16} className={styles.icon} />
+      <Icon
+        name={artifact.conflict ? "warning" : isBuildProject(artifact) ? "gradle-module" : "library"}
+        size={16}
+        className={styles.icon}
+      />
       <span className={clsx(styles.label, artifact.conflict && styles.conflict, selected && styles.selectedLabel)}>
         {artifact.key}
       </span>
@@ -120,7 +209,11 @@ function TreeRow({ node, conflict, selected }: { node: DependencyTreeNode; confl
   const status = statusText(usageStatus(d));
   return (
     <span className={clsx(styles.row, d.omitted != null && styles.omitted)}>
-      <Icon name={conflict ? "warning" : "library"} size={16} className={styles.icon} />
+      <Icon
+        name={conflict ? "warning" : isBuildProject(d) ? "gradle-module" : "library"}
+        size={16}
+        className={styles.icon}
+      />
       <span className={clsx(styles.label, conflict && styles.conflict, selected && styles.selectedLabel)}>
         {artifactKey(d)}
       </span>
@@ -131,17 +224,36 @@ function TreeRow({ node, conflict, selected }: { node: DependencyTreeNode; confl
   );
 }
 
-function UsageBlock({ usage, module, pom }: { usage: DependencyUsage; module: MavenProject; pom: string }) {
+function UsageBlock({
+  usage,
+  moduleName,
+  moduleIcon,
+  pom,
+}: {
+  usage: DependencyUsage;
+  moduleName: string;
+  moduleIcon: string;
+  /** The Maven module's pom; `null` for Gradle (no Exclude / Jump to Source). */
+  pom: string | null;
+}) {
   const tx = useTxTemplate();
   const status = usageStatus(usage.dependency);
   const text = statusText(status);
   const direct = usage.path[0]!;
-  const canExclude = !!exclusionFor(usage);
+  const canExclude = pom != null && !!exclusionFor(usage);
   return (
     <section className={styles.usage} aria-label={coordinates(usage.dependency)}>
       <div className={styles.usageHeader}>
         <Icon
-          name={status.kind === "conflict" ? "warning" : status.kind === "resolved" ? "success" : "info"}
+          name={
+            status.kind === "conflict" ||
+            status.kind === "unresolved" ||
+            (status.kind === "resolved" && status.requested)
+              ? "warning"
+              : status.kind === "resolved"
+                ? "success"
+                : "info"
+          }
           size={16}
           className={styles.icon}
         />
@@ -155,17 +267,19 @@ function UsageBlock({ usage, module, pom }: { usage: DependencyUsage; module: Ma
             Exclude
           </Button>
         )}
-        <IconButton
-          icon="autoscroll-to-source"
-          size="small"
-          title="Jump to Source"
-          onClick={() => void jumpToDeclaration(pom, direct)}
-        />
+        {pom != null && (
+          <IconButton
+            icon="autoscroll-to-source"
+            size="small"
+            title="Jump to Source"
+            onClick={() => void jumpToDeclaration(pom, direct)}
+          />
+        )}
       </div>
       <ol className={styles.path}>
         <li className={styles.step} style={{ paddingLeft: 0 }}>
-          <Icon name="maven-project" size={16} className={styles.icon} />
-          <span className={styles.stepLabel}>{module.displayName}</span>
+          <Icon name={moduleIcon} size={16} className={styles.icon} />
+          <span className={styles.stepLabel}>{moduleName}</span>
         </li>
         {usage.path.map((d, i) => (
           <li key={i} className={styles.step} style={{ paddingLeft: (i + 1) * 16 }}>
@@ -183,12 +297,14 @@ function UsageBlock({ usage, module, pom }: { usage: DependencyUsage; module: Ma
 
 function UsagesPane({
   artifact,
-  module,
+  moduleName,
+  moduleIcon,
   pom,
 }: {
   artifact: AnalyzedArtifact | null;
-  module: MavenProject;
-  pom: string;
+  moduleName: string;
+  moduleIcon: string;
+  pom: string | null;
 }) {
   if (!artifact) return <EmptyState title="Select a dependency to see its usages" />;
   const usages = sortedUsages(artifact.usages);
@@ -209,7 +325,7 @@ function UsagesPane({
       )}
       <div className={styles.usageList} aria-label={tx("Usages")}>
         {usages.map((u, i) => (
-          <UsageBlock key={i} usage={u} module={module} pom={pom} />
+          <UsageBlock key={i} usage={u} moduleName={moduleName} moduleIcon={moduleIcon} pom={pom} />
         ))}
       </div>
     </div>
@@ -219,25 +335,41 @@ function UsagesPane({
 export function DependencyAnalyzer(_props: { input: EditorInput }) {
   const tx = useTx();
   const maven = useBuild((s) => s.model?.maven ?? null);
+  const gradle = useBuild((s) => s.model?.gradle);
   const syncing = useBuild((s) => s.syncing.maven);
-  const chosen = useAnalyzer((s) => s.pom);
+  const chosen = useAnalyzer((s) => s.module);
   const [query, setQuery] = useState("");
   const [conflictsOnly, setConflictsOnly] = useState(false);
   const [scope, setScope] = useState<string>(ALL_SCOPES);
+  const [configuration, setConfiguration] = useState("runtimeClasspath");
+  const [generation, setGeneration] = useState(0);
   const [mode, setMode] = useState<Mode>("list");
   const [selectedKey, setSelectedKey] = useState<string | null>(null);
 
-  const options = useMemo(() => moduleOptions(maven?.projects ?? []), [maven]);
-  const pom = options.some((o) => o.value === chosen) ? chosen! : (options[0]?.value ?? null);
-  const module = maven?.projects.find((p) => p.pom === pom) ?? null;
-  const artifacts = useMemo(() => analyze(module?.dependencies ?? []), [module]);
+  const options = useMemo(() => moduleOptions(maven?.projects ?? [], gradle ?? []), [maven, gradle]);
+  const value = options.some((o) => o.value === chosen) ? chosen! : (options[0]?.value ?? null);
+  const selectedGradle = value?.startsWith(GRADLE)
+    ? (gradle ?? [])
+        .flatMap((build) => build.projects.map((project) => ({ build, project })))
+        .find(({ build, project }) => gradleProjectKey(build, project) === value)
+    : null;
+  const gradlePath = selectedGradle?.project.path ?? null;
+  const pom = value != null && gradlePath == null ? value : null;
+  const module = pom ? (maven?.projects.find((p) => p.pom === pom) ?? null) : null;
+  const gradleProject = selectedGradle?.project ?? null;
+  const report = useGradleTree(gradlePath, selectedGradle?.build.dir ?? null, configuration, generation);
+  const deps = useMemo(
+    () => (gradlePath != null ? (report.deps ?? []) : (module?.dependencies ?? [])),
+    [gradlePath, report.deps, module],
+  );
+  const artifacts = useMemo(() => analyze(deps), [deps]);
   const conflicted = useMemo(() => new Set(artifacts.filter((a) => a.conflict).map((a) => a.key)), [artifacts]);
   const filter = useMemo(
-    () => ({ query, conflictsOnly, scope: scope === ALL_SCOPES ? null : scope }),
-    [query, conflictsOnly, scope],
+    () => ({ query, conflictsOnly, scope: scope === ALL_SCOPES || gradlePath != null ? null : scope }),
+    [query, conflictsOnly, scope, gradlePath],
   );
   const listed = useMemo(() => filterArtifacts(artifacts, filter), [artifacts, filter]);
-  const tree = useMemo(() => filterTree(module?.dependencies ?? [], filter, conflicted), [module, filter, conflicted]);
+  const tree = useMemo(() => filterTree(deps, filter, conflicted), [deps, filter, conflicted]);
   const roots: Node[] = useMemo(() => {
     const toNode = (node: DependencyTreeNode): Node => ({
       kind: "node",
@@ -251,7 +383,7 @@ export function DependencyAnalyzer(_props: { input: EditorInput }) {
   }, [mode, listed, tree]);
 
   // A narrowing filter opens the tree down to its matches until the user expands or collapses.
-  const filterId = `${mode}|${filter.query}|${filter.conflictsOnly}|${filter.scope}|${pom}`;
+  const filterId = `${mode}|${filter.query}|${filter.conflictsOnly}|${filter.scope}|${value}|${configuration}`;
   const [manual, setManual] = useState<{ id: string; keys: Set<string> } | null>(null);
   const expanded = useMemo(() => {
     if (manual?.id === filterId) return manual.keys;
@@ -274,6 +406,7 @@ export function DependencyAnalyzer(_props: { input: EditorInput }) {
     { value: ALL_SCOPES, label: tx("All scopes") },
     ...scopesOf(artifacts).map((s) => ({ value: s, label: s })),
   ];
+  const configurationOptions: SelectOption[] = CONFIGURATIONS.map((c) => ({ value: c, label: c }));
 
   const nodeArtifactKey = (n: Node) => (n.kind === "artifact" ? n.artifact.key : artifactKey(n.node.dependency));
   /** The usage a row stands for: a tree node's own, else the artifact's direct (or first) one. */
@@ -286,19 +419,71 @@ export function DependencyAnalyzer(_props: { input: EditorInput }) {
   };
 
   const contextMenu = (n: Node | null, _sel: Set<string>, e: MouseEvent) => {
-    if (!n || !pom) return;
+    if (!n || !value) return;
     e.preventDefault();
     const usage = usageOf(n);
     if (!usage) return;
-    const items: MenuItem[] = [
-      { label: "Jump to Source", icon: "autoscroll-to-source", run: () => void jumpToDeclaration(pom, usage.path[0]!) },
-    ];
-    if (exclusionFor(usage)) items.push({ label: "Exclude", run: () => void exclude(pom, usage) });
+    const items: MenuItem[] = [];
+    if (pom) {
+      items.push({
+        label: "Jump to Source",
+        icon: "autoscroll-to-source",
+        run: () => void jumpToDeclaration(pom, usage.path[0]!),
+      });
+      if (exclusionFor(usage)) items.push({ label: "Exclude", run: () => void exclude(pom, usage) });
+    }
     items.push({ label: "Copy Coordinates", icon: "copy", run: () => void copyText(coordinates(usage.dependency)) });
     showContextMenu({ x: e.clientX, y: e.clientY }, items);
   };
 
-  if (!maven) return <EmptyState title="No Maven projects" />;
+  if (!maven && !gradle?.length) return <EmptyState title="No Maven or Gradle projects" />;
+
+  const treeView = (
+    <div className={styles.body}>
+      <SplitGroup orientation="horizontal" id="maven-dependency-analyzer-split">
+        <SplitPanel id="dependencies" minSize={200} className={styles.panel}>
+          <Tree<Node>
+            aria-label="Dependencies"
+            roots={roots}
+            getKey={(n) => n.key}
+            getLabel={(n) => (n.kind === "artifact" ? n.artifact.key : artifactKey(n.node.dependency))}
+            getChildren={(n) => (n.kind === "node" ? n.children : undefined)}
+            isExpandable={(n) => n.kind === "node" && n.node.children.length > 0}
+            expanded={expanded}
+            onExpandedChange={(next) => setManual({ id: filterId, keys: next })}
+            onSelectionChange={(_keys, lead) => setSelectedKey(lead ? nodeArtifactKey(lead) : null)}
+            renderNode={(n, state) =>
+              n.kind === "artifact" ? (
+                <ArtifactRow artifact={n.artifact} selected={state.selected} />
+              ) : (
+                <TreeRow
+                  node={n.node}
+                  conflict={conflicted.has(artifactKey(n.node.dependency))}
+                  selected={state.selected}
+                />
+              )
+            }
+            onActivate={(n) => {
+              const usage = usageOf(n);
+              if (usage && pom) void jumpToDeclaration(pom, usage.path[0]!);
+            }}
+            onContextMenu={contextMenu}
+            multiSelect={false}
+            empty={<EmptyState title={artifacts.length ? "No dependencies match the filter" : "No dependencies"} />}
+          />
+        </SplitPanel>
+        <SplitHandle />
+        <SplitPanel id="usages" minSize={240} className={styles.panel}>
+          <UsagesPane
+            artifact={selected}
+            moduleName={module?.displayName ?? gradleProject?.name ?? ""}
+            moduleIcon={pom ? "maven-project" : gradlePath === ":" ? "gradle-project" : "gradle-module"}
+            pom={pom}
+          />
+        </SplitPanel>
+      </SplitGroup>
+    </div>
+  );
 
   return (
     <div className={styles.view}>
@@ -306,10 +491,10 @@ export function DependencyAnalyzer(_props: { input: EditorInput }) {
         <Select
           aria-label="Module"
           className={styles.module}
-          value={pom}
+          value={value}
           options={options}
           onChange={(v) => {
-            useAnalyzer.setState({ pom: v });
+            useAnalyzer.setState({ module: v });
             setSelectedKey(null);
           }}
         />
@@ -322,7 +507,26 @@ export function DependencyAnalyzer(_props: { input: EditorInput }) {
           clearable
         />
         <Checkbox checked={conflictsOnly} onChange={setConflictsOnly} label="Show conflicts only" />
-        <Select aria-label="Scope" className={styles.scope} value={scope} options={scopeOptions} onChange={setScope} />
+        {gradlePath != null ? (
+          <Select
+            aria-label="Configuration"
+            className={styles.scope}
+            value={configuration}
+            options={configurationOptions}
+            onChange={(c) => {
+              setConfiguration(c);
+              setSelectedKey(null);
+            }}
+          />
+        ) : (
+          <Select
+            aria-label="Scope"
+            className={styles.scope}
+            value={scope}
+            options={scopeOptions}
+            onChange={setScope}
+          />
+        )}
         <span className={styles.sep} />
         <IconButton
           icon="list"
@@ -341,79 +545,100 @@ export function DependencyAnalyzer(_props: { input: EditorInput }) {
           onClick={() => setMode("tree")}
         />
         <span className={styles.sep} />
-        {syncing ? (
+        {gradlePath != null ? (
+          report.loading ? (
+            <IconButton icon="stop" size="small" iconSize={16} title="Stop" onClick={report.cancel} />
+          ) : (
+            <IconButton
+              icon="refresh"
+              size="small"
+              iconSize={16}
+              title="Refresh"
+              onClick={() => setGeneration((g) => g + 1)}
+            />
+          )
+        ) : syncing ? (
           <IconButton icon="stop" size="small" iconSize={16} action="maven.cancelReload" />
         ) : (
           <IconButton icon="refresh" size="small" iconSize={16} action="maven.reload" />
         )}
       </div>
-      {syncing ? (
-        <div className={styles.banner} role="status">
-          <Spinner size={12} />
-          <span className={styles.bannerText}>{syncing.message}</span>
-        </div>
-      ) : maven.stale && maven.syncedAt != null ? (
-        <div className={styles.banner}>
-          <Icon name="maven-load-changes" size={16} />
-          <span className={styles.bannerText}>
-            <T>Dependency trees may be out of date</T>
-          </span>
-          <Button size="small" variant="ghost" onClick={() => void syncTool("maven")}>
-            Load Maven Changes
-          </Button>
-        </div>
-      ) : null}
-      {maven.syncedAt == null ? (
-        <EmptyState
-          title="Dependency trees are read when Maven projects are reloaded"
-          actions={
-            <Button size="small" onClick={() => void syncTool("maven")} disabled={!!syncing}>
-              Reload All Maven Projects
-            </Button>
-          }
-        />
-      ) : !module || !pom ? (
+      {gradlePath != null ? (
+        <>
+          {report.loading ? (
+            <div className={styles.banner} role="status">
+              <Spinner size={12} />
+              <span className={styles.bannerText}>
+                <T>Resolving dependencies…</T>
+              </span>
+            </div>
+          ) : report.error && report.deps ? (
+            <div className={styles.banner} role="alert" title={report.error}>
+              <Icon name="warning" size={16} />
+              <span className={styles.bannerText}>
+                <T>Cannot resolve dependencies</T>: {report.error}
+              </span>
+            </div>
+          ) : null}
+          {report.error && !report.deps ? (
+            <EmptyState
+              title="Cannot resolve dependencies"
+              actions={
+                <Button size="small" onClick={() => setGeneration((g) => g + 1)}>
+                  Retry
+                </Button>
+              }
+            >
+              <span className={styles.errorText}>{report.error}</span>
+            </EmptyState>
+          ) : report.deps ? (
+            treeView
+          ) : report.loading ? null : (
+            <EmptyState
+              title="Stopped"
+              actions={
+                <Button size="small" onClick={() => setGeneration((g) => g + 1)}>
+                  Retry
+                </Button>
+              }
+            />
+          )}
+        </>
+      ) : !maven ? (
         <EmptyState title="No Maven modules" />
       ) : (
-        <div className={styles.body}>
-          <SplitGroup orientation="horizontal" id="maven-dependency-analyzer-split">
-            <SplitPanel id="dependencies" minSize={200} className={styles.panel}>
-              <Tree<Node>
-                aria-label="Dependencies"
-                roots={roots}
-                getKey={(n) => n.key}
-                getLabel={(n) => (n.kind === "artifact" ? n.artifact.key : artifactKey(n.node.dependency))}
-                getChildren={(n) => (n.kind === "node" ? n.children : undefined)}
-                isExpandable={(n) => n.kind === "node" && n.node.children.length > 0}
-                expanded={expanded}
-                onExpandedChange={(next) => setManual({ id: filterId, keys: next })}
-                onSelectionChange={(_keys, lead) => setSelectedKey(lead ? nodeArtifactKey(lead) : null)}
-                renderNode={(n, state) =>
-                  n.kind === "artifact" ? (
-                    <ArtifactRow artifact={n.artifact} selected={state.selected} />
-                  ) : (
-                    <TreeRow
-                      node={n.node}
-                      conflict={conflicted.has(artifactKey(n.node.dependency))}
-                      selected={state.selected}
-                    />
-                  )
-                }
-                onActivate={(n) => {
-                  const usage = usageOf(n);
-                  if (usage) void jumpToDeclaration(pom, usage.path[0]!);
-                }}
-                onContextMenu={contextMenu}
-                multiSelect={false}
-                empty={<EmptyState title={artifacts.length ? "No dependencies match the filter" : "No dependencies"} />}
-              />
-            </SplitPanel>
-            <SplitHandle />
-            <SplitPanel id="usages" minSize={240} className={styles.panel}>
-              <UsagesPane artifact={selected} module={module} pom={pom} />
-            </SplitPanel>
-          </SplitGroup>
-        </div>
+        <>
+          {syncing ? (
+            <div className={styles.banner} role="status">
+              <Spinner size={12} />
+              <span className={styles.bannerText}>{syncing.message}</span>
+            </div>
+          ) : maven.stale && maven.syncedAt != null ? (
+            <div className={styles.banner}>
+              <Icon name="maven-load-changes" size={16} />
+              <span className={styles.bannerText}>
+                <T>Dependency trees may be out of date</T>
+              </span>
+              <Button size="small" variant="ghost" onClick={() => void syncTool("maven")}>
+                Load Maven Changes
+              </Button>
+            </div>
+          ) : null}
+          {maven.syncedAt == null ? (
+            <EmptyState
+              title="Dependency trees are read when Maven projects are reloaded"
+              actions={
+                <Button size="small" onClick={() => void syncTool("maven")} disabled={!!syncing}>
+                  Reload All Maven Projects
+                </Button>
+              }
+            />
+          ) : !module || !pom ? (
+            <EmptyState title="No Maven modules" />
+          ) : (
+            treeView
+          )}
+        </>
       )}
     </div>
   );
diff --git a/src/features/build-tools/ExecutePopup.tsx b/src/features/build-tools/ExecutePopup.tsx
index 7327a929..a4ac9485 100644
--- a/src/features/build-tools/ExecutePopup.tsx
+++ b/src/features/build-tools/ExecutePopup.tsx
@@ -8,7 +8,7 @@ import { useMemo, useState, type KeyboardEvent } from "react";
 import clsx from "clsx";
 import type { BuildTool } from "@/platform/ipc";
 import { HighlightedText, Input, List, Popup, Select, listNavigate, T } from "@/ui";
-import { goalCompletions, taskCompletions, type Completion } from "./model";
+import { goalCompletions, gradleProjectForKey, gradleProjectKey, taskCompletions, type Completion } from "./model";
 import { executeBuildLine } from "./runAnything";
 import { readHistory, useBuild } from "./store";
 import styles from "./BuildTools.module.css";
@@ -32,7 +32,13 @@ function ExecutePopup({ tool }: { tool: BuildTool }) {
     () =>
       tool === "maven"
         ? (maven?.projects ?? []).map((p) => ({ value: p.pom, label: p.displayName, detail: p.dir || "." }))
-        : (gradle?.projects ?? []).map((p) => ({ value: p.path, label: p.name, detail: p.path })),
+        : (gradle ?? []).flatMap((build) =>
+            build.projects.map((p) => ({
+              value: gradleProjectKey(build, p),
+              label: p.name,
+              detail: `${build.dir || "."} ${p.path}`,
+            })),
+          ),
     [tool, maven, gradle],
   );
   const [project, setProject] = useState<string | null>(() =>
@@ -44,7 +50,8 @@ function ExecutePopup({ tool }: { tool: BuildTool }) {
       const p = maven?.projects.find((x) => x.pom === project);
       return goalCompletions(line, p?.plugins ?? [], history).slice(0, 200);
     }
-    return gradle ? taskCompletions(line, gradle, history).slice(0, 200) : [];
+    const selected = gradleProjectForKey(gradle ?? [], project);
+    return selected ? taskCompletions(line, selected.build, history).slice(0, 200) : [];
   }, [tool, maven, gradle, project, line, history]);
 
   const close = () => useBuild.setState({ executeOpen: null });
diff --git a/src/features/build-tools/actions.test.tsx b/src/features/build-tools/actions.test.tsx
index af8ffa03..9944b0f0 100644
--- a/src/features/build-tools/actions.test.tsx
+++ b/src/features/build-tools/actions.test.tsx
@@ -36,7 +36,7 @@ const mavenModel: BuildModel = {
     stale: true,
     syncError: null,
   },
-  gradle: null,
+  gradle: [],
 };
 
 describe("build tools feature", () => {
@@ -62,7 +62,7 @@ describe("build tools feature", () => {
     expect(getContext()["build.maven"]).toBe(true);
     expect(toolWindows()).not.toContain("gradle");
 
-    act(() => useBuild.setState({ model: { maven: null, gradle: null } }));
+    act(() => useBuild.setState({ model: { maven: null, gradle: [] } }));
     expect(toolWindows()).not.toContain("maven");
     expect(getContext()["build.maven"]).toBe(false);
   });
diff --git a/src/features/build-tools/analyzer.test.ts b/src/features/build-tools/analyzer.test.ts
index db281189..8e3fde03 100644
--- a/src/features/build-tools/analyzer.test.ts
+++ b/src/features/build-tools/analyzer.test.ts
@@ -1,11 +1,12 @@
 import { describe, expect, it } from "vitest";
-import type { MavenDependency } from "@/platform/ipc";
+import type { GradleDependency, MavenDependency } from "@/platform/ipc";
 import {
   analyze,
   coordinates,
   exclusionFor,
   filterArtifacts,
   filterTree,
+  fromGradle,
   scopesOf,
   sortedUsages,
   statusText,
@@ -122,3 +123,47 @@ describe("dependency analyzer", () => {
     expect(coordinates(dep("g:a:1"))).toBe("g:a:1");
   });
 });
+
+describe("Gradle reports", () => {
+  const g = (coords: string, extra: Partial<GradleDependency> = {}): GradleDependency => {
+    const [group, name, requested] = coords.split(":");
+    return {
+      group: group!,
+      name: name!,
+      requested: requested ?? null,
+      selected: null,
+      project: false,
+      repeated: false,
+      constraint: false,
+      unresolved: false,
+      children: [],
+      ...extra,
+    };
+  };
+
+  it("keeps dependencies, drops constraints and marks only exact requests that lost as conflicts", () => {
+    const deps = fromGradle([
+      g("a:replaced:1.0", { selected: "1.1" }),
+      g("a:strict:{strictly 2.0}", { selected: "2.0" }),
+      g("a:dynamic:1.+", { selected: "1.5" }),
+      g("a:platform", { selected: "3.0" }),
+      g("a:constraint:4.0", { constraint: true }),
+      g("a:legacy:1.0", { selected: ":legacy", project: true }),
+      g("a:missing:9", { unresolved: true }),
+      g("x:y", { group: "", name: ":core", project: true }),
+    ]);
+    const artifacts = analyze(deps);
+    expect(artifacts.map((a) => [a.key, a.version, a.conflict])).toEqual([
+      [":core", "", false],
+      ["a:dynamic", "1.5", false],
+      ["a:legacy", "project :legacy", false],
+      ["a:missing", "9", false],
+      ["a:platform", "3.0", false],
+      ["a:replaced", "1.1", true],
+      ["a:strict", "2.0", false],
+    ]);
+    expect(artifacts.find((a) => a.key === "a:replaced")!.requested).toEqual(["1.0"]);
+    expect(statusText(usageStatus(deps[0]!))).toBe("requested 1.0");
+    expect(statusText(usageStatus(deps[5]!))).toBe("not resolved");
+  });
+});
diff --git a/src/features/build-tools/analyzer.ts b/src/features/build-tools/analyzer.ts
index 2f82006d..f38a5250 100644
--- a/src/features/build-tools/analyzer.ts
+++ b/src/features/build-tools/analyzer.ts
@@ -1,9 +1,10 @@
 /**
  * Dependency Analyzer model: the artifacts of a Maven module's dependency tree
  * (read with `dependency:tree -Dverbose`, so it also lists the occurrences Maven
- * omitted), which of them conflict, and every path that brings them in.
+ * omitted) or of a Gradle configuration (`dependencies` report), which of them
+ * conflict, and every path that brings them in.
  */
-import type { ArtifactKey, MavenDependency } from "@/platform/ipc";
+import type { ArtifactKey, GradleDependency, MavenDependency } from "@/platform/ipc";
 
 /** One occurrence of an artifact in the tree, with the path from a direct dependency down to it. */
 export interface DependencyUsage {
@@ -36,6 +37,10 @@ export interface AnalyzerFilter {
   scope: string | null;
 }
 
+/** A Gradle project of the build (`project :core`): no group, its path as the name. */
+export const isBuildProject = (d: Pick<MavenDependency, "groupId" | "artifactId">) =>
+  !d.groupId && d.artifactId.startsWith(":");
+
 export const artifactKey = (d: Pick<MavenDependency, "groupId" | "artifactId" | "classifier">) =>
   [d.groupId, d.artifactId, d.classifier].filter(Boolean).join(":");
 
@@ -44,10 +49,50 @@ export function coordinates(d: Pick<MavenDependency, "groupId" | "artifactId" |
   return [d.groupId, d.artifactId, d.classifier, d.version].filter(Boolean).join(":");
 }
 
+/**
+ * A Gradle occurrence in the analyzer's terms: `version` is the one Gradle selected,
+ * `requested` the one this path asked for when conflict resolution replaced it.
+ */
+type GradleOccurrence = MavenDependency & { requested?: string | null; unresolved?: boolean };
+
 const isResolved = (d: MavenDependency) => d.omitted == null;
 
-/** The version a usage asked for: before `<dependencyManagement>` replaced it, if it did. */
-export const requestedVersion = (d: MavenDependency) => d.managedFrom ?? d.version ?? null;
+/** The version a usage asked for: before `<dependencyManagement>` (or Gradle) replaced it, if it did. */
+export const requestedVersion = (d: MavenDependency) =>
+  (d as GradleOccurrence).requested ?? d.managedFrom ?? d.version ?? null;
+
+/** `{strictly 1.0}` / `{require 1.0}` / `{prefer 1.0}` → `1.0`. */
+const plainVersion = (v: string) => v.replace(/^\{(?:strictly|require|prefer) ([^}]*)\}$/, "$1");
+
+/** A version that names one release (not a range or dynamic version). */
+const isExact = (v: string) => !/[[\](),+{}]|latest\./.test(v);
+
+/**
+ * A Gradle configuration's report as analyzer dependencies. Constraints (`(c)`) are left
+ * out: they are not dependencies. A path whose exact request lost to another version
+ * (`1.0 -> 1.1`) is a conflict.
+ */
+export function fromGradle(deps: readonly GradleDependency[]): MavenDependency[] {
+  return deps
+    .filter((d) => !d.constraint)
+    .map((d): GradleOccurrence => {
+      const requested = d.requested ? plainVersion(d.requested) : null;
+      // A project of the build has no version (`""`, not `null`: it isn't omitted).
+      const version = d.project ? (d.selected ? `project ${d.selected}` : "") : (d.selected ?? requested);
+      return {
+        groupId: d.group,
+        artifactId: d.name,
+        version,
+        type: "jar",
+        classifier: null,
+        scope: "compile",
+        optional: false,
+        children: fromGradle(d.children),
+        requested: !d.project && requested && version && requested !== version && isExact(requested) ? requested : null,
+        unresolved: d.unresolved,
+      };
+    });
+}
 
 /** Every artifact of `deps` (a module's dependency tree), sorted by key. */
 export function analyze(deps: readonly MavenDependency[]): AnalyzedArtifact[] {
@@ -78,7 +123,7 @@ export function analyze(deps: readonly MavenDependency[]): AnalyzedArtifact[] {
       }
       const requested = requestedVersion(d);
       if (requested && !a.requested.includes(requested)) a.requested.push(requested);
-      if (d.omitted === "conflict") a.conflict = true;
+      if (d.omitted === "conflict" || (d as GradleOccurrence).requested) a.conflict = true;
       walk(d.children, path);
     }
   };
@@ -138,13 +183,16 @@ export function filterTree(
 }
 
 export type UsageStatus =
-  | { kind: "resolved"; version: string | null; managedFrom: string | null }
+  | { kind: "resolved"; version: string | null; managedFrom: string | null; requested: string | null }
+  | { kind: "unresolved"; version: string | null }
   | { kind: "conflict"; version: string | null; winner: string | null }
   | { kind: "duplicate"; version: string | null }
   | { kind: "cycle"; version: string | null };
 
 export function usageStatus(d: MavenDependency): UsageStatus {
   const version = d.version ?? null;
+  const gradle = d as GradleOccurrence;
+  if (gradle.unresolved) return { kind: "unresolved", version };
   switch (d.omitted) {
     case "conflict":
       return { kind: "conflict", version, winner: d.conflictWith ?? null };
@@ -153,7 +201,7 @@ export function usageStatus(d: MavenDependency): UsageStatus {
     case "cycle":
       return { kind: "cycle", version };
     default:
-      return { kind: "resolved", version, managedFrom: d.managedFrom ?? null };
+      return { kind: "resolved", version, managedFrom: d.managedFrom ?? null, requested: gradle.requested ?? null };
   }
 }
 
@@ -166,7 +214,10 @@ export function statusText(s: UsageStatus): string | null {
       return "omitted for duplicate";
     case "cycle":
       return "omitted for cycle";
+    case "unresolved":
+      return "not resolved";
     default:
+      if (s.requested) return `requested ${s.requested}`;
       return s.managedFrom ? `version managed from ${s.managedFrom}` : null;
   }
 }
diff --git a/src/features/build-tools/autoReload.test.ts b/src/features/build-tools/autoReload.test.ts
index 90eaa015..1109e295 100644
--- a/src/features/build-tools/autoReload.test.ts
+++ b/src/features/build-tools/autoReload.test.ts
@@ -28,7 +28,7 @@ vi.mock("@tauri-apps/api/core", async (original) => ({
 
 const maven = (stale: boolean) =>
   ({ syncedAt: 1, stale, syncError: null, profiles: [], projects: [] }) as unknown as MavenModel;
-const model = (stale: boolean): BuildModel => ({ maven: maven(stale), gradle: null });
+const model = (stale: boolean): BuildModel => ({ maven: maven(stale), gradle: [] });
 
 beforeEach(() => {
   vi.clearAllMocks();
diff --git a/src/features/build-tools/index.ts b/src/features/build-tools/index.ts
index aab16b65..16dd1313 100644
--- a/src/features/build-tools/index.ts
+++ b/src/features/build-tools/index.ts
@@ -14,16 +14,20 @@ import {
   registerOverlay,
   registerRunAnythingProvider,
   registerToolWindow,
+  toolWindowService,
 } from "@/workbench/contributions";
 import { lazyComponent } from "@/ui";
 import { GradleView, MavenView } from "./BuildToolView";
 import { ExecutePopupHost } from "./ExecutePopup";
 import { buildToolsRunAnything } from "./runAnything";
 import { versionCatalogExtension } from "./versionCatalog";
-import { expandableKeys, gradleChildren, gradleRoots, mavenChildren, mavenRoots } from "./model";
+import { expandableKeys, gradleChildren, gradleRoots, mavenChildren, mavenRoots, gradleProjectKey } from "./model";
 import {
   ANALYZER_KIND,
   addProjects,
+  linkGradleProjects,
+  unlinkGradleProjects,
+  requestSync,
   unlinkProjects,
   cancelSync,
   loadModel,
@@ -33,6 +37,7 @@ import {
   openAnalyzer,
   resetBuild,
   setExpanded,
+  setCurrentProject,
   syncTool,
   toggleGradleOffline,
   toggleMavenOffline,
@@ -55,7 +60,7 @@ function expandAll(tool: BuildTool) {
       tool,
       expandableKeys(mavenRoots(m), (n) => mavenChildren(n, m, configs)),
     );
-  } else if (tool === "gradle" && model?.gradle) {
+  } else if (tool === "gradle" && model?.gradle?.length) {
     const g = model.gradle;
     setExpanded(
       tool,
@@ -81,15 +86,37 @@ function analyzerPom(arg: unknown): string | null {
   return current.maven ?? null;
 }
 
+/** The analyzer module of a Gradle project from an action argument: `{ gradlePath }`, or `{ path }` of its build script. */
+function analyzerGradle(arg: unknown): string | null {
+  const { model, root } = useBuild.getState();
+  const a = (arg ?? {}) as { buildDir?: unknown; gradlePath?: unknown; path?: unknown };
+  for (const build of model?.gradle ?? []) {
+    const project = build.projects.find((p) => {
+      if (typeof a.gradlePath === "string")
+        return p.path === a.gradlePath && (a.buildDir === undefined || a.buildDir === build.dir);
+      const file = p.buildFile;
+      return (
+        typeof a.path === "string" &&
+        root &&
+        file &&
+        (/^(?:[A-Za-z]:[\\/]|\/)/.test(file) ? file : `${root}/${file}`) === a.path
+      );
+    });
+    if (project) return gradleProjectKey(build, project);
+  }
+  return null;
+}
+
 const synced = new Set<string>();
 
 /** Registers / unregisters the tool windows to match the model; first sync of a never-synced build. */
 function apply(model: BuildModel | null, registered: Partial<Record<BuildTool, () => void>>) {
-  const has: Record<BuildTool, boolean> = { maven: !!model?.maven, gradle: !!model?.gradle };
+  const has: Record<BuildTool, boolean> = { maven: !!model?.maven, gradle: !!model?.gradle?.length };
   setContext("build.maven", has.maven);
   setContext("build.gradle", has.gradle);
   for (const tool of ["maven", "gradle"] as const) {
-    if (has[tool] && !registered[tool]) {
+    const visible = has[tool] || (tool === "gradle" && model !== null && !!registered.gradle);
+    if (visible && !registered[tool]) {
       registered[tool] =
         tool === "maven"
           ? registerToolWindow({
@@ -108,25 +135,40 @@ function apply(model: BuildModel | null, registered: Partial<Record<BuildTool, (
               order: 11,
               component: GradleView,
             });
-    } else if (!has[tool] && registered[tool]) {
+    } else if (!visible && registered[tool]) {
       registered[tool]!();
       delete registered[tool];
     }
   }
-  // IDEA imports a build when the project is first opened.
+  // Import each independent build once; linking another build must not be hidden by the first sync.
   const root = useBuild.getState().root;
-  for (const tool of ["maven", "gradle"] as const) {
-    const info = tool === "maven" ? model?.maven : model?.gradle;
-    const key = `${tool}:${root}`;
-    if (info && (tool !== "maven" || model?.maven?.projects.length) && info.syncedAt == null && !synced.has(key)) {
+  const mavenKey = `maven:${root}`;
+  if (model?.maven?.projects.length && model.maven.syncedAt == null && !synced.has(mavenKey)) {
+    synced.add(mavenKey);
+    requestSync("maven");
+  }
+  for (const build of model?.gradle ?? []) {
+    const key = JSON.stringify([root, build.dir]);
+    if (build.syncedAt == null && !synced.has(key)) {
       synced.add(key);
-      void syncTool(tool);
+      requestSync("gradle", build.dir);
     }
   }
 }
 
 export function activate(): () => void {
   const registered: Partial<Record<BuildTool, () => void>> = {};
+  const showGradle = () => {
+    registered.gradle ??= registerToolWindow({
+      id: "gradle",
+      title: "Gradle",
+      icon: "toolwindow-gradle",
+      anchor: "right",
+      order: 11,
+      component: GradleView,
+    });
+    toolWindowService().show("gradle", true);
+  };
   let timer: ReturnType<typeof setTimeout> | undefined;
   const scheduleLoad = () => {
     clearTimeout(timer);
@@ -143,6 +185,19 @@ export function activate(): () => void {
       icon: () => "build-dependencies",
       restorable: true,
     }),
+    // A Gradle build script in the editor, its tab and the project view: that project's dependencies.
+    registerMenuGroup({
+      id: "gradle.analyzeDependencies",
+      menus: ["editor", "editorTab", "projectView"],
+      order: 30,
+      items: (_menu, { paths, dirs }) => {
+        const path = paths.length === 1 && !dirs?.[0] ? paths[0]! : null;
+        if (!path || !/\/build\.gradle(\.kts)?$/.test(path) || !analyzerGradle({ path })) return [];
+        return [
+          { kind: "action", action: "gradle.analyzeDependencies", arg: { path }, label: "Analyze Dependencies…" },
+        ];
+      },
+    }),
     // pom.xml in the editor, its tab and the project view: Analyze Dependencies of that module.
     registerMenuGroup({
       id: "maven.analyzeDependencies",
@@ -162,6 +217,7 @@ export function activate(): () => void {
     }),
     useProject.subscribe((s, prev) => {
       if (s.project?.root === prev.project?.root && s.project?.trusted === prev.project?.trusted) return;
+      synced.clear();
       resetBuild();
       if (s.project) void loadModel();
     }),
@@ -182,6 +238,30 @@ export function activate(): () => void {
       if (e.key === "languages" || e.key.startsWith("languages.java")) scheduleLoad();
     }),
     registerActions([
+      {
+        id: "gradle.linkProjects",
+        title: "Link Gradle Projects",
+        category: "Gradle",
+        icon: "plus",
+        when: "projectOpen && !workspaceOpen",
+        run: async () => {
+          showGradle();
+          await linkGradleProjects();
+        },
+      },
+      {
+        id: "gradle.unlinkProjects",
+        title: "Unlink Gradle Project",
+        category: "Gradle",
+        hidden: true,
+        when: `${GRADLE_WHEN} && !workspaceOpen`,
+        run: async ({ arg }) => {
+          const dir = (arg as { buildDir?: unknown } | undefined)?.buildDir;
+          const root = useBuild.getState().root;
+          if (await unlinkGradleProjects(typeof dir === "string" ? dir : null))
+            synced.delete(JSON.stringify([root, dir]));
+        },
+      },
       {
         id: "maven.addProjects",
         title: "Add Maven Projects",
@@ -294,7 +374,21 @@ export function activate(): () => void {
         icon: "refresh",
         when: GRADLE_WHEN,
         keywords: ["gradle", "sync", "refresh"],
-        run: () => syncTool("gradle"),
+        run: ({ arg }) => {
+          const dir = (arg as { buildDir?: unknown } | undefined)?.buildDir;
+          requestSync("gradle", typeof dir === "string" ? dir : null);
+        },
+      },
+      {
+        id: "gradle.analyzeDependencies",
+        title: "Analyze Dependencies…",
+        description:
+          "Shows a Gradle project's resolved dependencies per configuration, version conflicts and where each library comes from",
+        category: "Gradle",
+        icon: "build-dependencies",
+        when: GRADLE_WHEN,
+        keywords: ["gradle", "dependency", "dependencies", "conflict", "tree", "configuration", "analyzer"],
+        run: ({ arg }) => openAnalyzer(analyzerGradle(arg)),
       },
       {
         id: "gradle.cancelReload",
@@ -312,7 +406,11 @@ export function activate(): () => void {
         icon: "run-anything",
         when: GRADLE_WHEN,
         keywords: ["gradle", "task", "run anything"],
-        run: () => openExecute("gradle"),
+        run: ({ arg }) => {
+          const key = (arg as { projectKey?: unknown } | undefined)?.projectKey;
+          if (typeof key === "string") setCurrentProject("gradle", key);
+          openExecute("gradle");
+        },
       },
       {
         id: "gradle.toggleOffline",
@@ -352,6 +450,7 @@ export function activate(): () => void {
     for (const d of Object.values(registered)) d?.();
     setContext("build.maven", false);
     setContext("build.gradle", false);
+    synced.clear();
     resetBuild();
   };
 }
diff --git a/src/features/build-tools/linkage.test.tsx b/src/features/build-tools/linkage.test.tsx
index cb156d22..c51c5ac8 100644
--- a/src/features/build-tools/linkage.test.tsx
+++ b/src/features/build-tools/linkage.test.tsx
@@ -1,11 +1,13 @@
 import { afterEach, beforeEach, expect, it, vi } from "vitest";
 import { act, fireEvent, render, screen } from "@testing-library/react";
-import { executeAction } from "@/platform/actions";
+import { executeAction, registerAction, allActions, isActionEnabled } from "@/platform/actions";
 import { setContext } from "@/platform/context";
-import type { BuildModel, ProjectInfo } from "@/platform/ipc";
+import type { BuildModel, GradleModel, ProjectInfo, RunConfig } from "@/platform/ipc";
 import { useProject } from "@/platform/project";
-import { MavenView } from "./BuildToolView";
+import { GradleView, MavenView } from "./BuildToolView";
 import { activate } from "./index";
+import { expandableKeys, gradleChildren, gradleRoots, gradleProjectKey } from "./model";
+import { executeBuildLine } from "./runAnything";
 import { useBuild } from "./store";
 
 const mocks = vi.hoisted(() => ({
@@ -16,6 +18,10 @@ const mocks = vi.hoisted(() => ({
   open: vi.fn(),
   confirm: vi.fn(),
   menu: vi.fn(),
+  link: vi.fn(),
+  unlink: vi.fn(),
+  show: vi.fn(),
+  sync: vi.fn(),
 }));
 vi.mock("@/platform/ipc", async (original) => {
   const real = await original<typeof import("@/platform/ipc")>();
@@ -29,9 +35,23 @@ vi.mock("@/platform/ipc", async (original) => {
       settingsSet: mocks.set,
       buildModel: mocks.model,
       runConfigs: mocks.configs,
+      gradleLinkProjects: mocks.link,
+      gradleUnlinkProjects: mocks.unlink,
+      buildSync: mocks.sync,
+      cancelRequest: () => Promise.resolve(),
     },
   };
 });
+vi.mock("@tauri-apps/api/core", async (original) => ({
+  ...(await original<typeof import("@tauri-apps/api/core")>()),
+  Channel: class {
+    onmessage: unknown = null;
+  },
+}));
+vi.mock("@/workbench/contributions", async (original) => ({
+  ...(await original<typeof import("@/workbench/contributions")>()),
+  toolWindowService: () => ({ show: mocks.show }),
+}));
 vi.mock("@tauri-apps/plugin-dialog", () => ({ open: mocks.open }));
 vi.mock("@/workbench/messages", () => ({ confirm: mocks.confirm }));
 vi.mock("@/ui", async (original) => ({
@@ -40,7 +60,7 @@ vi.mock("@/ui", async (original) => ({
 }));
 
 const model: BuildModel = {
-  gradle: null,
+  gradle: [],
   maven: {
     syncedAt: 1,
     stale: false,
@@ -81,6 +101,7 @@ beforeEach(async () => {
   mocks.confirm.mockResolvedValue(true);
   useProject.setState({ project: { root: "/p" } as ProjectInfo });
   setContext("projectOpen", true);
+  setContext("workspaceOpen", false);
   await act(async () => {
     dispose = activate();
   });
@@ -204,3 +225,147 @@ it.each([null, "/outside/pom.xml", "/p/a/build.xml", "/p/../outside/pom.xml", "/
     expect(mocks.set).not.toHaveBeenCalled();
   },
 );
+
+const gradleBuild = (dir: string): GradleModel => ({
+  dir,
+  command: `/p/${dir}/gradlew`,
+  env: { JAVA_HOME: `/${dir}/jdk` },
+  javaVersion: 21,
+  syncedAt: 1,
+  stale: false,
+  syncError: null,
+  projects: [
+    { path: ":", name: dir, dir, buildFile: `${dir}/build.gradle`, tasks: [] },
+    {
+      path: ":app",
+      name: "app",
+      dir: `${dir}/app`,
+      buildFile: `${dir}/app/build.gradle`,
+      tasks: [{ name: "test", group: "verification", description: null }],
+    },
+  ],
+});
+
+it("links from the toolbar and keeps Link available after unlinking the final build", async () => {
+  const build = gradleBuild("first");
+  const linked: BuildModel = { maven: null, gradle: [build] };
+  mocks.link.mockResolvedValue(linked);
+  mocks.unlink.mockResolvedValue({ maven: null, gradle: [] });
+  mocks.open.mockResolvedValue(["/p/first/settings.gradle"]);
+  act(() => useBuild.setState({ model: { maven: null, gradle: [] } }));
+  render(<GradleView />);
+  await act(async () => fireEvent.click(screen.getByRole("button", { name: "Link Gradle Projects" })));
+  expect(mocks.link).toHaveBeenCalledWith(["/p/first/settings.gradle"]);
+  expect(screen.getByText("first")).toBeTruthy();
+  fireEvent.contextMenu(screen.getByText("first"));
+  expect(mocks.menu).toHaveBeenCalledWith(
+    expect.anything(),
+    expect.arrayContaining([expect.objectContaining({ action: "gradle.unlinkProjects", arg: { buildDir: "first" } })]),
+  );
+  await act(async () => executeAction("gradle.unlinkProjects", { buildDir: "first" }));
+  expect(mocks.unlink).toHaveBeenCalledWith(["first"]);
+  expect(mocks.confirm).toHaveBeenCalledWith(
+    expect.objectContaining({ message: expect.stringContaining("Files will remain") }),
+  );
+  expect(screen.getByText("No Gradle projects")).toBeTruthy();
+  expect(screen.getByRole("button", { name: "Link Gradle Projects" })).toBeTruthy();
+  expect(useBuild.getState().model?.gradle).toEqual([]);
+});
+
+it("leaves links unchanged when unlink is cancelled or a module is targeted", async () => {
+  act(() => useBuild.setState({ model: { maven: null, gradle: [gradleBuild("first")] } }));
+  mocks.confirm.mockResolvedValue(false);
+  await executeAction("gradle.unlinkProjects", { buildDir: "first" });
+  await executeAction("gradle.unlinkProjects", { buildDir: "first/app" });
+  expect(mocks.unlink).not.toHaveBeenCalled();
+  expect(useBuild.getState().model?.gradle).toHaveLength(1);
+});
+
+it("runs duplicate task paths with the selected build's wrapper, cwd and offline setting", async () => {
+  const builds = [gradleBuild("first"), gradleBuild("second")];
+  const model: BuildModel = { maven: null, gradle: builds };
+  const roots = gradleRoots(builds);
+  const expanded = expandableKeys(roots, (n) => gradleChildren(n, builds, [], "/p"));
+  act(() =>
+    useBuild.setState({
+      model,
+      expanded: { maven: new Set(), gradle: expanded },
+      current: { gradle: gradleProjectKey(builds[1]!, builds[1]!.projects[1]!) },
+      settings: { ...useBuild.getState().settings, gradle: { offline: true } },
+    }),
+  );
+  const started: RunConfig[] = [];
+  const off = registerAction({
+    id: "run.runConfig",
+    title: "Run",
+    hidden: true,
+    run: ({ arg }) => {
+      started.push((arg as { config: RunConfig }).config);
+    },
+  });
+  render(<GradleView />);
+  const tasks = screen.getAllByText("test");
+  expect(tasks).toHaveLength(2);
+  await act(async () => fireEvent.doubleClick(tasks[1]!));
+  expect(executeBuildLine("gradle", "test")).toBe(true);
+  off();
+  expect(started).toHaveLength(2);
+  for (const config of started)
+    expect(config).toMatchObject({
+      command: "/p/second/gradlew",
+      cwd: "second",
+      args: [":app:test", "--offline"],
+      env: { JAVA_HOME: "/second/jdk" },
+    });
+});
+
+it("drops a late link result after the user changes projects", async () => {
+  let finish!: (model: BuildModel) => void;
+  mocks.open.mockResolvedValue("/p/first/build.gradle");
+  mocks.link.mockImplementation(
+    () =>
+      new Promise<BuildModel>((resolve) => {
+        finish = resolve;
+      }),
+  );
+  const pending = executeAction("gradle.linkProjects");
+  await vi.waitFor(() => expect(mocks.link).toHaveBeenCalled());
+  await act(async () => {
+    useProject.setState({ project: { root: "/other", trusted: false } as ProjectInfo });
+    finish({ maven: null, gradle: [gradleBuild("first")] });
+    await pending;
+  });
+  expect(useBuild.getState().model).toBeNull();
+});
+
+it("routes Reload to the chosen independent build", async () => {
+  const model: BuildModel = { maven: null, gradle: [gradleBuild("first"), gradleBuild("second")] };
+  mocks.sync.mockResolvedValue(model);
+  act(() => useBuild.setState({ model }));
+  await executeAction("gradle.reload", { buildDir: "second" });
+  await vi.waitFor(() =>
+    expect(mocks.sync).toHaveBeenCalledWith("gradle", expect.any(Number), false, [], "second", expect.anything()),
+  );
+});
+
+it("does not offer Link or Unlink for a native Workspace window", async () => {
+  act(() =>
+    useProject.setState({
+      project: { root: "/p", workspace: { version: 1, name: "workspace", projects: ["/p/first"] } } as ProjectInfo,
+    }),
+  );
+  setContext("workspaceOpen", true);
+  for (const id of ["gradle.linkProjects", "gradle.unlinkProjects"])
+    expect(isActionEnabled(allActions().find((a) => a.id === id)!)).toBe(false);
+  await executeAction("gradle.linkProjects");
+  expect(mocks.open).not.toHaveBeenCalled();
+  expect(mocks.link).not.toHaveBeenCalled();
+});
+
+it("does not link or start Gradle imports in an untrusted project", async () => {
+  act(() => useProject.setState({ project: { root: "/p", trusted: false } as ProjectInfo }));
+  await executeAction("gradle.linkProjects");
+  expect(mocks.open).not.toHaveBeenCalled();
+  expect(mocks.link).not.toHaveBeenCalled();
+  expect(mocks.sync).not.toHaveBeenCalled();
+});
diff --git a/src/features/build-tools/model.test.ts b/src/features/build-tools/model.test.ts
index 40754abc..ec0fa2a5 100644
--- a/src/features/build-tools/model.test.ts
+++ b/src/features/build-tools/model.test.ts
@@ -5,6 +5,8 @@ import {
   goalCompletions,
   gradleChildren,
   gradleRoots,
+  gradleRunConfigs,
+  gradleProjectKey,
   gradleTaskConfig,
   isRunnable,
   mavenChildren,
@@ -284,10 +286,10 @@ describe("Gradle tree and runs", () => {
     syncError: null,
   };
   const kids = (n: BuildNode) =>
-    gradleChildren(n, gradle, [runConfig({ id: "g", name: "app [run]", kind: "gradle" })]) ?? [];
+    gradleChildren(n, [gradle], [runConfig({ id: "g", name: "app [run]", kind: "gradle" })]) ?? [];
 
   it("nests subprojects and groups tasks, other last", () => {
-    const roots = gradleRoots(gradle);
+    const roots = gradleRoots([gradle]);
     expect(labels(roots)).toEqual(["gradle-demo"]);
     expect(labels(kids(roots[0]!))).toEqual(["Tasks", "Run Configurations", "app", "core"]);
     const app = kids(roots[0]!)[2]!;
@@ -315,6 +317,65 @@ describe("Gradle tree and runs", () => {
     ]);
   });
 
+  it("keeps identical project paths and tasks of independent builds distinct", () => {
+    const builds = ["first", "second"].map((dir) => ({
+      ...gradle,
+      dir,
+      command: `/p/${dir}/gradlew`,
+      env: { JAVA_HOME: `/${dir}/jdk` },
+      projects: gradle.projects.map((p) => ({ ...p, dir: `${dir}/${p.dir}`.replace(/\/$/, "") })),
+    }));
+    const roots = gradleRoots(builds);
+    expect(new Set(roots.map((n) => n.key)).size).toBe(2);
+    const tasks = roots.map((r) => {
+      const app = gradleChildren(r, builds, [])!.find((n) => n.kind === "gradleProject" && n.project.path === ":app")!;
+      const folder = gradleChildren(app, builds, [])![0]!;
+      const group = gradleChildren(folder, builds, [])!.find(
+        (n) => n.kind === "taskGroup" && n.group === "verification",
+      )!;
+      return gradleChildren(group, builds, [])![0]!;
+    });
+    expect(tasks[0]!.key).not.toBe(tasks[1]!.key);
+    const runs = builds.map((b) => gradleTaskConfig(b, b.projects[1]!, ["test"], { offline: true }));
+    expect(runs[0]!.id).not.toBe(runs[1]!.id);
+    expect(runs[1]).toMatchObject({
+      command: "/p/second/gradlew",
+      cwd: "second",
+      env: { JAVA_HOME: "/second/jdk" },
+      args: [":app:test", "--offline"],
+    });
+    expect(gradleProjectKey(builds[1]!, builds[1]!.projects[1]!)).toBe('gradle:["second",":app"]');
+  });
+
+  it("shows run configurations only under their owning linked build", () => {
+    const nested = {
+      ...gradle,
+      dir: "nested",
+      projects: gradle.projects.map((p) => ({ ...p, dir: `nested/${p.dir}` })),
+    };
+    const configs = [
+      runConfig({ id: "root", kind: "gradle", cwd: "app" }),
+      runConfig({ id: "nested", kind: "gradle", cwd: "nested/app" }),
+      runConfig({ id: "absolute", kind: "gradle", cwd: "/p/nested/app" }),
+      runConfig({ id: "other", kind: "maven", cwd: "nested" }),
+    ];
+    expect(gradleRunConfigs(gradle, [gradle, nested], configs, "/p").map((c) => c.id)).toEqual(["root"]);
+    expect(gradleRunConfigs(nested, [gradle, nested], configs, "/p").map((c) => c.id)).toEqual(["nested", "absolute"]);
+  });
+
+  it("places a saved run under its directly linked root instead of a longer sibling composite", () => {
+    const composite = {
+      ...gradle,
+      dir: "very-long-composite",
+      projects: [{ ...gradle.projects[1]!, path: ":b:app", dir: "b/app", build: ":b" }],
+    };
+    const direct = { ...gradle, dir: "b", projects: [{ ...gradle.projects[1]!, dir: "b/app" }] };
+    const saved = runConfig({ id: "saved", kind: "gradle", cwd: "b/app" });
+    const builds = [composite, direct];
+    expect(gradleRunConfigs(composite, builds, [saved], "/p")).toEqual([]);
+    expect(gradleRunConfigs(direct, builds, [saved], "/p")).toEqual([saved]);
+  });
+
   it("completes task names and paths", () => {
     const labelsOf = taskCompletions("ru", gradle).map((c) => c.label);
     expect(labelsOf).toEqual([":app:run"]);
diff --git a/src/features/build-tools/model.ts b/src/features/build-tools/model.ts
index c448ee94..398dc653 100644
--- a/src/features/build-tools/model.ts
+++ b/src/features/build-tools/model.ts
@@ -67,10 +67,10 @@ export type BuildNode =
   | { kind: "dependency"; key: string; dependency: MavenDependency }
   | { kind: "runConfigs"; key: string; configs: RunConfig[] }
   | { kind: "runConfig"; key: string; config: RunConfig }
-  | { kind: "gradleProject"; key: string; project: GradleProject }
-  | { kind: "tasks"; key: string; project: GradleProject }
-  | { kind: "taskGroup"; key: string; project: GradleProject; group: string; tasks: GradleTask[] }
-  | { kind: "task"; key: string; project: GradleProject; task: GradleTask };
+  | { kind: "gradleProject"; key: string; build: GradleModel; project: GradleProject }
+  | { kind: "tasks"; key: string; build: GradleModel; project: GradleProject }
+  | { kind: "taskGroup"; key: string; build: GradleModel; project: GradleProject; group: string; tasks: GradleTask[] }
+  | { kind: "task"; key: string; build: GradleModel; project: GradleProject; task: GradleTask };
 
 /** Options applied to every Maven run (toolbar toggles, Profiles checkboxes). */
 export interface MavenRunOptions {
@@ -133,9 +133,28 @@ export function mavenRunConfigs(project: MavenProject, configs: readonly RunConf
   return configs.filter((c) => c.kind === "maven" && normalizeDir(c.cwd) === project.dir);
 }
 
-/** Run configurations of a Gradle build: every `gradle` config. */
-export function gradleRunConfigs(configs: readonly RunConfig[]): RunConfig[] {
-  return configs.filter((c) => c.kind === "gradle");
+/** Run configurations under this build, with nested independent builds owning their own runs. */
+export function gradleRunConfigs(
+  model: GradleModel,
+  models: readonly GradleModel[],
+  configs: readonly RunConfig[],
+  root: string,
+): RunConfig[] {
+  const absolute = (path: string) =>
+    /^(?:[A-Za-z]:[\\/]|\/)/.test(path) ? normalizeDir(path) : normalizeDir(`${root}/${path}`);
+  return configs.filter((c) => {
+    if (c.kind !== "gradle") return false;
+    const cwd = absolute(c.cwd ?? "");
+    const contains = (dir: string) => cwd === dir || cwd.startsWith(`${dir}/`);
+    const ownerDepth = (build: GradleModel) => {
+      const dir = absolute(build.dir);
+      return contains(dir) ? dir.split("/").length : 0;
+    };
+    const owners = models
+      .filter((build) => [build.dir, ...build.projects.map((p) => p.dir)].some((dir) => contains(absolute(dir))))
+      .sort((a, b) => ownerDepth(b) - ownerDepth(a));
+    return owners[0]?.dir === model.dir;
+  });
 }
 
 function normalizeDir(cwd: string | null | undefined): string {
@@ -230,9 +249,26 @@ export function gradleTaskGroups(project: GradleProject): Array<{ group: string;
     .map(([group, tasks]) => ({ group, tasks: [...tasks].sort((a, b) => a.name.localeCompare(b.name)) }));
 }
 
-export function gradleRoots(model: GradleModel): BuildNode[] {
-  const root = model.projects.find((p) => p.path === ":") ?? model.projects[0];
-  return root ? [{ kind: "gradleProject", key: `gradle:${root.path}`, project: root }] : [];
+/** Identity of a project within one independently linked build. */
+export const gradleProjectKey = (build: Pick<GradleModel, "dir">, project: Pick<GradleProject, "path">) =>
+  `gradle:${JSON.stringify([build.dir, project.path])}`;
+
+export function gradleProjectForKey(models: readonly GradleModel[], key: string | null | undefined) {
+  for (const build of models) {
+    const project = build.projects.find((p) => gradleProjectKey(build, p) === key);
+    if (project) return { build, project };
+  }
+  if (key != null) return null;
+  const build = models[0];
+  const project = build?.projects[0];
+  return build && project ? { build, project } : null;
+}
+
+export function gradleRoots(models: readonly GradleModel[]): BuildNode[] {
+  return models.flatMap((build) => {
+    const root = build.projects.find((p) => p.path === ":") ?? build.projects[0];
+    return root ? [{ kind: "gradleProject" as const, key: gradleProjectKey(build, root), build, project: root }] : [];
+  });
 }
 
 /** Direct subprojects of `path` (`:a` and `:b` under `:`, `:a:x` under `:a`). */
@@ -248,31 +284,39 @@ export function gradleSubprojects(model: GradleModel, path: string): GradleProje
 
 export function gradleChildren(
   node: BuildNode,
-  model: GradleModel,
+  models: readonly GradleModel[],
   configs: readonly RunConfig[],
+  root = "",
 ): BuildNode[] | undefined {
   switch (node.kind) {
     case "gradleProject": {
       const p = node.project;
-      const out: BuildNode[] = [{ kind: "tasks", key: `${node.key}:tasks`, project: p }];
+      const out: BuildNode[] = [{ kind: "tasks", key: `${node.key}:tasks`, build: node.build, project: p }];
       if (p.path === ":") {
-        const runs = gradleRunConfigs(configs);
+        const runs = gradleRunConfigs(node.build, models, configs, root);
         if (runs.length) out.push({ kind: "runConfigs", key: `${node.key}:runs`, configs: runs });
       }
-      for (const sub of gradleSubprojects(model, p.path))
-        out.push({ kind: "gradleProject", key: `gradle:${sub.path}`, project: sub });
+      for (const sub of gradleSubprojects(node.build, p.path))
+        out.push({ kind: "gradleProject", key: gradleProjectKey(node.build, sub), build: node.build, project: sub });
       return out;
     }
     case "tasks":
       return gradleTaskGroups(node.project).map(({ group, tasks }) => ({
         kind: "taskGroup",
         key: `${node.key}:${group}`,
+        build: node.build,
         project: node.project,
         group,
         tasks,
       }));
     case "taskGroup":
-      return node.tasks.map((task) => ({ kind: "task", key: `${node.key}:${task.name}`, project: node.project, task }));
+      return node.tasks.map((task) => ({
+        kind: "task",
+        key: `${node.key}:${task.name}`,
+        build: node.build,
+        project: node.project,
+        task,
+      }));
     case "runConfigs":
       return node.configs.map((config) => ({ kind: "runConfig", key: `${node.key}:${config.id}`, config }));
     default:
@@ -456,7 +500,7 @@ export function gradleTaskConfig(
   if (options.offline && !args.includes("--offline")) args.push("--offline");
   const names = tasks.filter((t) => !t.startsWith("-"));
   return {
-    id: `gradle:task:${project.path}:${tasks.join(" ")}`,
+    id: `gradle:task:${JSON.stringify([model.dir, project.path])}:${tasks.join(" ")}`,
     name: `${project.name} [${names.join(",")}]`,
     kind: "gradle",
     command: model.command,
diff --git a/src/features/build-tools/profileReload.test.ts b/src/features/build-tools/profileReload.test.ts
index 6f2bf0d1..5bc318ea 100644
--- a/src/features/build-tools/profileReload.test.ts
+++ b/src/features/build-tools/profileReload.test.ts
@@ -37,7 +37,7 @@ const maven = {
   ],
   projects: [],
 } as unknown as MavenModel;
-const model: BuildModel = { maven, gradle: null };
+const model: BuildModel = { maven, gradle: [] };
 
 /** The `-P` entries each sync was started with. */
 const syncedProfiles = () => mocks.sync.mock.calls.map((c) => c[3] as string[]);
diff --git a/src/features/build-tools/runAnything.ts b/src/features/build-tools/runAnything.ts
index 146b6c1c..0861ccbe 100644
--- a/src/features/build-tools/runAnything.ts
+++ b/src/features/build-tools/runAnything.ts
@@ -8,6 +8,7 @@ import type { RunAnythingItem, RunAnythingProvider } from "@/workbench/contribut
 import {
   goalCompletions,
   gradleTaskConfig,
+  gradleProjectForKey,
   mavenGoalConfig,
   parseGoalLine,
   parseTaskLine,
@@ -25,19 +26,20 @@ const WORD: Record<BuildTool, string> = { maven: "mvn", gradle: "gradle" };
 export function lineTool(line: string): BuildTool | null {
   const model = useBuild.getState().model;
   if (model?.maven && COMMANDS.maven.test(line)) return "maven";
-  if (model?.gradle && COMMANDS.gradle.test(line)) return "gradle";
+  if (model?.gradle?.length && COMMANDS.gradle.test(line)) return "gradle";
   return null;
 }
 
 /** The project a line runs in: the given one, else the tool window's current one, else the first. */
-function projectFor(tool: BuildTool, key?: string | null) {
+function mavenProjectFor(key?: string | null) {
   const { model, current } = useBuild.getState();
-  if (tool === "maven") {
-    const projects = model?.maven?.projects ?? [];
-    return projects.find((p) => p.pom === (key ?? current.maven)) ?? projects[0];
-  }
-  const projects = model?.gradle?.projects ?? [];
-  return projects.find((p) => p.path === (key ?? current.gradle)) ?? projects[0];
+  const projects = model?.maven?.projects ?? [];
+  return projects.find((p) => p.pom === (key ?? current.maven)) ?? projects[0];
+}
+
+function gradleProjectFor(key?: string | null) {
+  const { model, current } = useBuild.getState();
+  return gradleProjectForKey(model?.gradle ?? [], key ?? current.gradle);
 }
 
 /** Runs goals / tasks typed for `tool` in a project; false when there is nothing to run. */
@@ -45,28 +47,27 @@ export function executeBuildLine(tool: BuildTool, text: string, projectKey?: str
   const { model, settings } = useBuild.getState();
   if (tool === "maven") {
     const maven = model?.maven;
-    const project = projectFor("maven", projectKey);
+    const project = mavenProjectFor(projectKey);
     const goals = parseGoalLine(text);
     if (!maven || !project || !("pom" in project) || !goals.length) return false;
     runConfig(mavenGoalConfig(project, goals, maven, settings.maven), "run");
   } else {
-    const gradle = model?.gradle;
-    const project = projectFor("gradle", projectKey);
+    const selected = gradleProjectFor(projectKey);
     const tasks = parseTaskLine(text);
-    if (!gradle || !project || "pom" in project || !tasks.length) return false;
-    runConfig(gradleTaskConfig(gradle, project, tasks, settings.gradle), "run");
+    if (!selected || !tasks.length) return false;
+    runConfig(gradleTaskConfig(selected.build, selected.project, tasks, settings.gradle), "run");
   }
   pushHistory(tool, text.replace(COMMANDS[tool], "").trim());
   return true;
 }
 
 function completions(tool: BuildTool, rest: string) {
-  const model = useBuild.getState().model;
   if (tool === "maven") {
-    const project = projectFor("maven");
+    const project = mavenProjectFor();
     return goalCompletions(rest, project && "pom" in project ? project.plugins : [], readHistory("maven"));
   }
-  return model?.gradle ? taskCompletions(rest, model.gradle, readHistory("gradle")) : [];
+  const selected = gradleProjectFor();
+  return selected ? taskCompletions(rest, selected.build, readHistory("gradle")) : [];
 }
 
 export const buildToolsRunAnything: RunAnythingProvider = {
diff --git a/src/features/build-tools/store.ts b/src/features/build-tools/store.ts
index 6afd30dc..47212ccc 100644
--- a/src/features/build-tools/store.ts
+++ b/src/features/build-tools/store.ts
@@ -27,7 +27,7 @@ import { useBuildModel } from "@/platform/buildModel";
 import { useProject } from "@/platform/project";
 import { editorService, notifications } from "@/workbench/contributions";
 import { cancelTask, removeTask, upsertTask, useTasks } from "@/workbench/tasks";
-import { profilesList, type GradleRunOptions, type MavenRunOptions } from "./model";
+import { gradleRoots, profilesList, type GradleRunOptions, type MavenRunOptions } from "./model";
 
 export interface BuildSettings {
   maven: MavenRunOptions;
@@ -58,7 +58,7 @@ interface BuildState {
   expanded: Record<BuildTool, Set<string>>;
   /** Execute Goal / Task popup. */
   executeOpen: BuildTool | null;
-  /** Project selected in each tree (Maven `pom`, Gradle path): where Execute Goal runs. */
+  /** Project selected in each tree (Maven `pom`, Gradle build/project key): where commands run. */
   current: Partial<Record<BuildTool, string>>;
 }
 
@@ -198,9 +198,6 @@ export function changedOutsideIde(paths: readonly string[], now = Date.now()): b
   return external;
 }
 
-/** Root whose never-synced Gradle build was imported on open (once per open). */
-let autoImported: string | null = null;
-
 /** Re-reads the build model (and the run configurations) of the open project. */
 export async function loadModel(): Promise<void> {
   const root = useProject.getState().project?.root ?? null;
@@ -230,11 +227,6 @@ export async function loadModel(): Promise<void> {
       const maven = model.maven;
       if (maven?.stale && maven.syncedAt !== null && !useBuild.getState().syncing.maven) void syncTool("maven");
     }
-    // Like IDEA, a Gradle build is imported when first opened; later changes wait for Reload.
-    if (model.gradle && model.gradle.syncedAt === null && autoImported !== root) {
-      autoImported = root;
-      void syncTool("gradle");
-    }
   } catch (e) {
     if (gen === generation) useBuild.setState({ loading: false, error: e instanceof Error ? e.message : String(e) });
   }
@@ -291,30 +283,96 @@ export async function addProjects() {
   await setLinked(root, pom, true);
 }
 
+/** Links independent Gradle builds without changing their files or build scripts. */
+export async function linkGradleProjects() {
+  const gen = generation;
+  const root = useProject.getState().project?.root;
+  if (
+    !root ||
+    useProject.getState().project?.workspace ||
+    useProject.getState().project?.trusted === false ||
+    !isTauri()
+  )
+    return;
+  const { open } = await import("@tauri-apps/plugin-dialog");
+  const picked = await open({
+    title: tx`Link Gradle Projects`,
+    directory: false,
+    multiple: true,
+    defaultPath: root,
+    filters: [{ name: "Gradle build files", extensions: ["gradle", "kts"] }],
+  });
+  const paths = typeof picked === "string" ? [picked] : picked;
+  if (!paths?.length || useProject.getState().project?.root !== root || gen !== generation) return;
+  const model = await call(commands.gradleLinkProjects(paths));
+  if (useProject.getState().project?.root !== root || gen !== generation) return;
+  const configs = await call(commands.runConfigs()).catch(() => useBuild.getState().configs);
+  if (useProject.getState().project?.root === root && gen === generation)
+    useBuild.setState((s) => ({
+      model,
+      configs,
+      expanded: {
+        ...s.expanded,
+        gradle: new Set([...s.expanded.gradle, ...initialExpanded("gradle", model)]),
+      },
+    }));
+}
+
+export async function unlinkGradleProjects(buildDir: string | null) {
+  const expectedGeneration = generation;
+  const { root, model } = useBuild.getState();
+  const build = model?.gradle?.find((g) => g.dir === buildDir);
+  if (
+    !root ||
+    useProject.getState().project?.workspace ||
+    !build ||
+    !(await confirm({
+      title: "Unlink Gradle project?",
+      message:
+        "Remove this build from Gradle? Files will remain in the Project view; link its build file again to restore it.",
+      ok: "Unlink",
+    }))
+  )
+    return;
+  if (useProject.getState().project?.root !== root || expectedGeneration !== generation) return;
+  const gen = ++generation;
+  queuedSyncs.delete("gradle");
+  cancelSync("gradle");
+  const next = await call(commands.gradleUnlinkProjects([build.dir]));
+  if (useProject.getState().project?.root !== root || gen !== generation) return;
+  const configs = await call(commands.runConfigs()).catch(() => useBuild.getState().configs);
+  if (useProject.getState().project?.root !== root || gen !== generation) return;
+  useBuild.setState({ model: next, configs, current: { ...useBuild.getState().current, gradle: undefined } });
+  return true;
+}
+
 /** Tree keys expanded on first show: the top-level projects. */
 export function initialExpanded(tool: BuildTool, model: BuildModel): Set<string> {
   if (tool === "maven")
     return new Set(model.maven?.projects.filter((p) => !p.aggregated).map((p) => `mvn:${p.pom}`) ?? []);
-  return new Set(model.gradle ? ["gradle::"] : []);
+  return new Set(gradleRoots(model.gradle ?? []).map((n) => n.key));
 }
 
 const TITLES: Record<BuildTool, string> = { maven: "Syncing Maven projects", gradle: "Syncing Gradle projects" };
 
 /** Tools to sync again once their running sync ends: its options changed meanwhile. */
-const queuedSyncs = new Set<BuildTool>();
+const queuedSyncs = new Map<BuildTool, Set<string | null>>();
 
 /** Syncs `tool` now, or right after the sync in progress (which used the previous options). */
-export function requestSync(tool: BuildTool) {
-  if (useBuild.getState().syncing[tool]) queuedSyncs.add(tool);
-  else void syncTool(tool);
+export function requestSync(tool: BuildTool, buildDir: string | null = null) {
+  if (useBuild.getState().syncing[tool]) {
+    const queued = queuedSyncs.get(tool) ?? new Set<string | null>();
+    queued.add(buildDir);
+    queuedSyncs.set(tool, queued);
+  } else void syncTool(tool, buildDir);
 }
 
-/** Reloads all projects of `tool` from the build tool itself (effective POM, dependency tree, task list). */
-export async function syncTool(tool: BuildTool): Promise<void> {
+/** Reloads the build tool model; `buildDir` limits a Gradle reload to one linked build. */
+export async function syncTool(tool: BuildTool, buildDir: string | null = null): Promise<void> {
   const state = useBuild.getState();
   const gen = generation;
   const root = state.root;
-  if (!root || !isTauri() || state.syncing[tool]) return;
+  if (!root || useProject.getState().project?.trusted === false || !isTauri() || state.syncing[tool]) return;
   const request = nextRequestId();
   const taskId = `build-sync:${tool}`;
   const cancel = () => void commands.cancelRequest(request);
@@ -331,11 +389,18 @@ export async function syncTool(tool: BuildTool): Promise<void> {
   const profiles = tool === "maven" && model?.maven ? profilesList(model.maven.profiles, settings.maven.profiles) : [];
   const offline = tool === "maven" ? settings.maven.offline : settings.gradle.offline;
   try {
-    const next = await call(commands.buildSync(tool, request, offline, profiles, channel));
+    const next = await call(commands.buildSync(tool, request, offline, profiles, buildDir, channel));
     if (useBuild.getState().root !== root || gen !== generation) return;
     const configs = await call(commands.runConfigs()).catch(() => useBuild.getState().configs);
+    if (useBuild.getState().root !== root || gen !== generation) return;
     useBuild.setState({ model: next, configs });
-    const error = tool === "maven" ? next.maven?.syncError : next.gradle?.syncError;
+    const error =
+      tool === "maven"
+        ? next.maven?.syncError
+        : (next.gradle ?? [])
+            .map((g) => g.syncError)
+            .filter(Boolean)
+            .join("\n");
     if (error)
       notifications().notify({
         group: "run",
@@ -355,13 +420,22 @@ export async function syncTool(tool: BuildTool): Promise<void> {
         key: `build-sync-${tool}`,
       });
   } finally {
-    if (useBuild.getState().syncing[tool]?.request === request) setSync(undefined);
-    upsertTask({ id: taskId, title: TITLES[tool], message: null, fraction: 1, done: true });
-    if (queuedSyncs.delete(tool) && gen === generation) void syncTool(tool);
+    if (useBuild.getState().syncing[tool]?.request === request) {
+      setSync(undefined);
+      upsertTask({ id: taskId, title: TITLES[tool], message: null, fraction: 1, done: true });
+      const queued = queuedSyncs.get(tool);
+      const next = queued?.values().next();
+      if (next && !next.done && useBuild.getState().root === root) {
+        queued!.delete(next.value);
+        if (!queued!.size) queuedSyncs.delete(tool);
+        void syncTool(tool, next.value);
+      }
+    }
   }
 }
 
 export function cancelSync(tool: BuildTool) {
+  queuedSyncs.delete(tool);
   const s = useBuild.getState().syncing[tool];
   if (!s) return;
   const taskId = `build-sync:${tool}`;
@@ -374,7 +448,7 @@ export function resetBuild() {
   clearTimeout(profileReload);
   profileReload = undefined;
   queuedSyncs.clear();
-  useAnalyzer.setState({ pom: null });
+  useAnalyzer.setState({ module: null });
   for (const tool of ["maven", "gradle"] as const) {
     cancelSync(tool);
     removeTask(`build-sync:${tool}`);
@@ -418,11 +492,14 @@ export function setCurrentProject(tool: BuildTool, id: string | undefined) {
 
 export const ANALYZER_KIND = "maven.dependencyAnalyzer";
 
-/** Module the Dependency Analyzer shows (`pom`, project-relative); `null` = the first one. */
-export const useAnalyzer = create<{ pom: string | null }>(() => ({ pom: null }));
+/**
+ * Module the Dependency Analyzer shows: a Maven `pom` or a Gradle build/project key;
+ * `null` = the first one.
+ */
+export const useAnalyzer = create<{ module: string | null }>(() => ({ module: null }));
 
-/** Opens (or focuses) the Dependency Analyzer tab, showing the module `pom` when given. */
-export async function openAnalyzer(pom: string | null) {
-  if (pom) useAnalyzer.setState({ pom });
+/** Opens (or focuses) the Dependency Analyzer tab, showing `module` when given. */
+export async function openAnalyzer(module: string | null) {
+  if (module) useAnalyzer.setState({ module });
   await editorService().openInput({ kind: ANALYZER_KIND, key: ANALYZER_KIND, data: {} }, { focus: true });
 }
diff --git a/src/features/build/Build.module.css b/src/features/build/Build.module.css
index 708d9504..a6a6c6fe 100644
--- a/src/features/build/Build.module.css
+++ b/src/features/build/Build.module.css
@@ -81,7 +81,7 @@
   color: var(--fg);
   background: var(--bg-app);
   -webkit-user-select: text;
-  cursor: text;
+  cursor: default;
   -webkit-user-select: text;
   user-select: text;
   outline: none;
@@ -91,6 +91,7 @@
   position: relative;
   width: 100%;
   min-width: max-content;
+  cursor: text;
 }
 .line {
   position: absolute;
diff --git a/src/features/build/BuildView.tsx b/src/features/build/BuildView.tsx
index 3d726c8a..8448b1e0 100644
--- a/src/features/build/BuildView.tsx
+++ b/src/features/build/BuildView.tsx
@@ -135,7 +135,7 @@ function BuildTree() {
         .join(", ");
       return (
         <span className={styles.row}>
-          <Icon name={fileIconName(basename(n.path))} size={16} className={styles.fileIcon} />
+          <Icon name={fileIconName(basename(n.path), n.path)} size={16} className={styles.fileIcon} />
           <span className={clsx(styles.strong, errors > 0 && styles.fileError, state.selected && styles.selected)}>
             {basename(n.path)}
           </span>
diff --git a/src/features/code-insight/ProblemsView.tsx b/src/features/code-insight/ProblemsView.tsx
index 3d86949b..abcde083 100644
--- a/src/features/code-insight/ProblemsView.tsx
+++ b/src/features/code-insight/ProblemsView.tsx
@@ -4,6 +4,7 @@ import { create } from "zustand";
 import clsx from "clsx";
 import type { Diagnostic, Severity } from "@/bindings";
 import { useEditorRegistry } from "@/editor/api";
+import { previewColors } from "@/editor/lineTokens";
 import { executeAction } from "@/platform/actions";
 import { formatBinding, hasPrimaryModifier, hostBinding, shortcutLabel } from "@/platform/keymap";
 import { basename, relativeDir, useProject } from "@/platform/project";
@@ -301,7 +302,7 @@ export function ProblemsView() {
       );
       return (
         <span className={styles.row}>
-          <Icon name={fileIconName(basename(n.path))} size={16} className={styles.fileIcon} />
+          <Icon name={fileIconName(basename(n.path), n.path)} size={16} className={styles.fileIcon} />
           <span
             className={clsx(styles.fileName, c.error > 0 && styles.fileError, state.selected && styles.selectedText)}
           >
@@ -409,6 +410,7 @@ export function ProblemsView() {
                 line={selected?.d.range.start.line ?? 0}
                 highlights={selected ? [diagHighlight(selected.d)] : []}
                 load={previewText}
+                colorize={previewColors}
               />
             </SplitPanel>
           </SplitGroup>
diff --git a/src/features/code-insight/UsagesPopup.tsx b/src/features/code-insight/UsagesPopup.tsx
index dd34938c..0d072c85 100644
--- a/src/features/code-insight/UsagesPopup.tsx
+++ b/src/features/code-insight/UsagesPopup.tsx
@@ -192,7 +192,7 @@ function UsagesPopupInner() {
             }
             renderItem={(u) => (
               <div className={styles.row}>
-                <Icon name={fileIconName(basename(u.path))} size={14} className={styles.icon} />
+                <Icon name={fileIconName(basename(u.path), u.path)} size={14} className={styles.icon} />
                 <UsagePreview usage={u} />
                 <span className={styles.spacer} />
                 <span className={styles.where}>
diff --git a/src/features/code-insight/UsagesView.module.css b/src/features/code-insight/UsagesView.module.css
index 2b53680e..3a5dd124 100644
--- a/src/features/code-insight/UsagesView.module.css
+++ b/src/features/code-insight/UsagesView.module.css
@@ -95,40 +95,6 @@
   color: var(--fg-search-match, inherit);
   border-radius: 2px;
 }
-/* Lezer classHighlighter tokens of usage lines (same colours as Find in Files results). */
-.preview :global(.tok-keyword),
-.preview :global(.tok-modifier),
-.preview :global(.tok-controlKeyword),
-.preview :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.preview :global(.tok-string),
-.preview :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.preview :global(.tok-number),
-.preview :global(.tok-bool),
-.preview :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.preview :global(.tok-typeName),
-.preview :global(.tok-className),
-.preview :global(.tok-namespace) {
-  color: var(--syn-type);
-}
-.preview :global(.tok-comment) {
-  color: var(--syn-comment);
-}
-.preview :global(.tok-meta),
-.preview :global(.tok-macroName) {
-  color: var(--syn-annotation);
-}
-.preview :global(.tok-propertyName) {
-  color: var(--syn-property);
-}
-.preview :global(.tok-variableName.tok-definition) {
-  color: var(--syn-function);
-}
 
 .note {
   min-width: 0;
diff --git a/src/features/code-insight/UsagesView.tsx b/src/features/code-insight/UsagesView.tsx
index 0f779505..1f6faeb2 100644
--- a/src/features/code-insight/UsagesView.tsx
+++ b/src/features/code-insight/UsagesView.tsx
@@ -5,7 +5,7 @@
 import { useCallback, useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
 import clsx from "clsx";
 import { create } from "zustand";
-import { tokenSpans, useLineTokens } from "@/editor/lineTokens";
+import { previewColors, tokenSpans, useLineTokens } from "@/editor/lineTokens";
 import { formatMessage, useTx } from "@/platform/i18n";
 import { shortcutLabel } from "@/platform/keymap";
 import { basename, relativeDir, useProject } from "@/platform/project";
@@ -230,7 +230,7 @@ export function UsagesView() {
       const path = n.group.path;
       return (
         <span className={clsx(styles.row, isExcluded(n) && styles.excluded)}>
-          <Icon name={fileIconName(basename(path))} size={16} className={styles.icon} />
+          <Icon name={fileIconName(basename(path), path)} size={16} className={styles.icon} />
           <span className={styles.file}>{basename(path)}</span>
           <span className={styles.muted}>{relativeDir(root, path)}</span>
           <span className={styles.count}>
@@ -399,6 +399,12 @@ function UsagesPreview({ node }: { node: Node | null }) {
     return (group?.usages ?? []).map((u) => ({ line: u.line, ranges: [[u.col, u.endCol] as const] }));
   }, [usage, search?.groups]);
   return (
-    <SourcePreview path={usage?.path ?? null} line={usage?.line ?? 0} highlights={highlights} load={previewText} />
+    <SourcePreview
+      path={usage?.path ?? null}
+      line={usage?.line ?? 0}
+      highlights={highlights}
+      load={previewText}
+      colorize={previewColors}
+    />
   );
 }
diff --git a/src/features/color-preview/ColorPreview.module.css b/src/features/color-preview/ColorPreview.module.css
new file mode 100644
index 00000000..a3d0df89
--- /dev/null
+++ b/src/features/color-preview/ColorPreview.module.css
@@ -0,0 +1,35 @@
+/* Editor gutter color swatches. */
+.gutter :global(.cm-gutterElement) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.swatch {
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  border: 1px solid var(--border-strong);
+  border-radius: var(--radius-small);
+  overflow: hidden;
+}
+.swatch > span {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.editable {
+  cursor: pointer;
+}
+.editable:hover {
+  border-color: var(--fg-muted);
+}
+/* The native color input only anchors the system picker. */
+.picker {
+  position: fixed;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  border: 0;
+  opacity: 0;
+  pointer-events: none;
+}
diff --git a/src/features/color-preview/colors.test.ts b/src/features/color-preview/colors.test.ts
new file mode 100644
index 00000000..bd7951bd
--- /dev/null
+++ b/src/features/color-preview/colors.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from "vitest";
+import { findColors, formatColor, fromHex6, parseComputed, toHex6, type ColorMatch } from "./colors";
+
+const NAMES = new Set(["red", "rebeccapurple", "white"]);
+const isName = (w: string) => NAMES.has(w.toLowerCase());
+const texts = (line: string, language: string) => findColors(line, language, isName).map((c) => c.text);
+
+describe("findColors", () => {
+  it("finds every format in style sheets", () => {
+    expect(texts("  background-color: #1b766c;", "css")).toEqual(["#1b766c"]);
+    expect(texts("  border: 1px solid #FFF8;", "scss")).toEqual(["#FFF8"]);
+    expect(texts("  color: rgba(0, 0, 0, .5); fill: hsl(210deg 40% 50% / 0.3);", "css")).toEqual([
+      "rgba(0, 0, 0, .5)",
+      "hsl(210deg 40% 50% / 0.3)",
+    ]);
+    expect(texts("  color: red; outline: 2px solid RebeccaPurple;", "less")).toEqual(["red", "RebeccaPurple"]);
+    expect(findColors("a { color: #abc }", "css", isName)[0]).toMatchObject({ from: 11, to: 15, format: "hex" });
+  });
+
+  it("skips names that are no property value, keywords and non-colors", () => {
+    expect(texts(".red, #main { white-space: nowrap; color: inherit }", "css")).toEqual([]);
+    expect(texts("@media screen { }", "css")).toEqual([]);
+    expect(texts("  color: $white; background: var(--off-white) off-white;", "scss")).toEqual([]);
+    expect(texts("  color: #12345;", "css")).toEqual([]);
+  });
+
+  it("takes only quoted hex values in code, and no names", () => {
+    expect(texts(`const accent = "#1b766c"; // see #123 and #add`, "typescript")).toEqual(["#1b766c"]);
+    expect(texts("color = 'rgb(255, 0, 0)'  # red", "python")).toEqual(["rgb(255, 0, 0)"]);
+    expect(texts('<div style="color: #fff">', "html")).toEqual(["#fff"]);
+  });
+
+  it("leaves prose alone", () => {
+    expect(texts("Fixed in #123, color `#fff`", "markdown")).toEqual([]);
+  });
+});
+
+describe("formatColor", () => {
+  const match = (text: string, format: ColorMatch["format"]): ColorMatch => ({
+    from: 0,
+    to: text.length,
+    text,
+    format,
+  });
+
+  it("keeps hex case, length and alpha", () => {
+    expect(formatColor([255, 0, 0, 1], match("#abc", "hex"))).toBe("#f00");
+    expect(formatColor([18, 52, 86, 1], match("#ABC", "hex"))).toBe("#123456");
+    expect(formatColor([18, 52, 86, 1], match("#1B766C", "hex"))).toBe("#123456".toUpperCase());
+    expect(formatColor([18, 52, 86, 0.5], match("#1b766c80", "hex"))).toBe("#12345680");
+    expect(formatColor([18, 52, 86, 1], match("red", "name"))).toBe("#123456");
+  });
+
+  it("keeps a function's name and separators", () => {
+    expect(formatColor([1, 2, 3, 1], match("rgb(0, 0, 0)", "rgb"))).toBe("rgb(1, 2, 3)");
+    expect(formatColor([1, 2, 3, 0.5], match("rgba(0, 0, 0, .5)", "rgb"))).toBe("rgba(1, 2, 3, 0.5)");
+    expect(formatColor([1, 2, 3, 1], match("rgb(0 0 0 / 50%)", "rgb"))).toBe("rgb(1 2 3 / 1)");
+    expect(formatColor([255, 0, 0, 1], match("hsl(0, 0%, 0%)", "hsl"))).toBe("hsl(0, 100%, 50%)");
+  });
+});
+
+describe("conversions", () => {
+  it("round-trips the color input's hex and reads computed colors", () => {
+    expect(toHex6([27, 118, 108, 1])).toBe("#1b766c");
+    expect(fromHex6("#1b766c", 0.5)).toEqual([27, 118, 108, 0.5]);
+    expect(parseComputed("rgb(27, 118, 108)")).toEqual([27, 118, 108, 1]);
+    expect(parseComputed("rgba(0, 0, 0, 0.25)")).toEqual([0, 0, 0, 0.25]);
+    expect(parseComputed("color(display-p3 1 0 0)")).toBeNull();
+  });
+});
diff --git a/src/features/color-preview/colors.ts b/src/features/color-preview/colors.ts
new file mode 100644
index 00000000..110a49a8
--- /dev/null
+++ b/src/features/color-preview/colors.ts
@@ -0,0 +1,137 @@
+/**
+ * Color literals of a line for the gutter's color preview: `#rgb` / `#rrggbb` (with alpha),
+ * `rgb()` / `rgba()` / `hsl()` / `hsla()`, and CSS named colors in style sheets. Pure; the
+ * names are checked by the caller (the browser knows them).
+ */
+
+export type ColorFormat = "hex" | "rgb" | "hsl" | "name";
+
+export interface ColorMatch {
+  /** UTF-16 offsets in the line. */
+  from: number;
+  to: number;
+  text: string;
+  format: ColorFormat;
+}
+
+/** Red, green, blue 0–255 and alpha 0–1. */
+export type Rgba = [number, number, number, number];
+
+/** Style sheet languages: named colors and unquoted hex values are colors there. */
+const STYLE_SHEETS = new Set(["css", "scss", "sass", "less", "stylus", "postcss"]);
+/** Markup that embeds style sheets (`<style>`, `style="…"`): unquoted hex values too. */
+const MARKUP = new Set(["html", "vue", "svelte", "astro", "xml", "xhtml"]);
+/** Prose: `#123` is an issue, `#fab` a heading or a tag. */
+const PROSE = new Set(["markdown", "plaintext", "text", "restructuredtext", "asciidoc", "git-commit"]);
+
+const HEX = String.raw`#(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{6}|[0-9a-fA-F]{3,4})(?![\w-])`;
+const NUMBER = String.raw`[-+]?(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?`;
+const FUNCTION = String.raw`\b(?:rgba?|hsla?)\(\s*${NUMBER}(?:deg|%)?(?:\s*[,\s]\s*${NUMBER}%?){2}(?:\s*[,/]\s*${NUMBER}%?)?\s*\)`;
+// No lookbehind (WebKit before 16.4 can't parse it): a name's preceding character is checked in code.
+const COLOR_RE = new RegExp(`${FUNCTION}|${HEX}|[a-zA-Z]{3,20}(?![\\w(-])`, "g");
+/** Before a name, these make it part of a selector, variable or longer word (`.red`, `$white`, `off-white`). */
+const NAME_PREFIX = /[\w.#$@-]/;
+
+/** Global keywords and words that are valid colors but say nothing about one. */
+const NOT_COLORS = new Set(["inherit", "initial", "unset", "revert", "currentcolor", "transparent"]);
+
+/**
+ * The colors on `line` of a document in `language`. Outside style sheets and markup, only quoted hex
+ * values (`"#1b766c"`) and color functions count: `#add` may be a comment, `#123` an issue.
+ */
+export function findColors(line: string, language: string, isColorName: (word: string) => boolean): ColorMatch[] {
+  if (PROSE.has(language)) return [];
+  const sheet = STYLE_SHEETS.has(language);
+  const looseHex = sheet || MARKUP.has(language);
+  const out: ColorMatch[] = [];
+  for (const m of line.matchAll(COLOR_RE)) {
+    const text = m[0];
+    const from = m.index;
+    const format: ColorFormat = text.startsWith("#")
+      ? "hex"
+      : text.includes("(")
+        ? /^r/i.test(text)
+          ? "rgb"
+          : "hsl"
+        : "name";
+    if (format === "name") {
+      // A property value (`color: red`), not a property, selector or at-rule.
+      if (
+        !sheet ||
+        (from > 0 && NAME_PREFIX.test(line[from - 1]!)) ||
+        NOT_COLORS.has(text.toLowerCase()) ||
+        !/:\s*(?:\S+\s+)*$/.test(line.slice(0, from))
+      )
+        continue;
+      if (!isColorName(text)) continue;
+    } else if (format === "hex" && !looseHex && !/["'`]$/.test(line.slice(0, from))) continue;
+    out.push({ from, to: from + text.length, text, format });
+  }
+  return out;
+}
+
+const clamp = (v: number, lo: number, hi: number) => Math.min(hi, Math.max(lo, v));
+const hex2 = (v: number) =>
+  Math.round(clamp(v, 0, 255))
+    .toString(16)
+    .padStart(2, "0");
+const round = (v: number, digits = 2) => String(Number(v.toFixed(digits)));
+
+/** `#rrggbb` of `rgba`, as `<input type=color>` takes it. */
+export function toHex6([r, g, b]: Rgba): string {
+  return `#${hex2(r)}${hex2(g)}${hex2(b)}`;
+}
+
+/** `#rrggbb` → its components with `alpha`. */
+export function fromHex6(hex: string, alpha: number): Rgba | null {
+  const m = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(hex);
+  return m ? [Number.parseInt(m[1]!, 16), Number.parseInt(m[2]!, 16), Number.parseInt(m[3]!, 16), alpha] : null;
+}
+
+/** Components of the browser's computed color (`rgb(1, 2, 3)` / `rgba(1, 2, 3, 0.5)`), null for other spaces. */
+export function parseComputed(color: string): Rgba | null {
+  const m = /^rgba?\(\s*([\d.]+)[,\s]+([\d.]+)[,\s]+([\d.]+)(?:\s*[,/]\s*([\d.]+%?))?\s*\)$/.exec(color.trim());
+  if (!m) return null;
+  const a = m[4] === undefined ? 1 : m[4].endsWith("%") ? Number.parseFloat(m[4]) / 100 : Number(m[4]);
+  return [Number(m[1]), Number(m[2]), Number(m[3]), a];
+}
+
+function toHsl([r, g, b]: Rgba): [number, number, number] {
+  const [R, G, B] = [r / 255, g / 255, b / 255];
+  const max = Math.max(R, G, B);
+  const min = Math.min(R, G, B);
+  const l = (max + min) / 2;
+  const d = max - min;
+  if (d === 0) return [0, 0, l * 100];
+  const s = d / (1 - Math.abs(2 * l - 1));
+  const h = max === R ? ((G - B) / d) % 6 : max === G ? (B - R) / d + 2 : (R - G) / d + 4;
+  return [(h * 60 + 360) % 360, s * 100, l * 100];
+}
+
+/**
+ * `rgba` written in the original's format: hex keeps its case and whether it had alpha, a function
+ * keeps its name and separators; a named color becomes hex.
+ */
+export function formatColor(rgba: Rgba, original: ColorMatch): string {
+  const alpha = rgba[3];
+  const hasAlpha = alpha < 1;
+  if (original.format === "hex" || original.format === "name") {
+    const short = original.text.length === 4 || original.text.length === 5;
+    const hadAlpha = original.format === "hex" && (original.text.length === 5 || original.text.length === 9);
+    let hex = toHex6(rgba) + (hadAlpha || hasAlpha ? hex2(alpha * 255) : "");
+    // `#abc` stays short when the new color has a short form.
+    if (short && /^#(?:([0-9a-f])\1)+$/.test(hex)) hex = `#${hex.slice(1).replace(/(.)\1/g, "$1")}`;
+    return /[A-F]/.test(original.text) ? hex.toUpperCase() : hex;
+  }
+  const name = /^\w+/.exec(original.text)![0];
+  const commas = original.text.includes(",");
+  // The original's fourth component is its alpha.
+  const withAlpha = hasAlpha || (original.text.match(new RegExp(NUMBER, "g"))?.length ?? 0) > 3;
+  const parts =
+    original.format === "rgb"
+      ? rgba.slice(0, 3).map((v) => String(Math.round(clamp(v, 0, 255))))
+      : toHsl(rgba).map((v, i) => (i === 0 ? round(v, 0) : `${round(v, 1)}%`));
+  const a = round(alpha);
+  if (commas) return `${name}(${parts.join(", ")}${withAlpha ? `, ${a}` : ""})`;
+  return `${name}(${parts.join(" ")}${withAlpha ? ` / ${a}` : ""})`;
+}
diff --git a/src/features/color-preview/gutter.ts b/src/features/color-preview/gutter.ts
new file mode 100644
index 00000000..4454c439
--- /dev/null
+++ b/src/features/color-preview/gutter.ts
@@ -0,0 +1,130 @@
+/**
+ * Color preview gutter: a swatch on each line with a color literal (the first one), as IDEA's
+ * color gutter icons. Clicking it in an editable file opens the system color picker; the picked
+ * color replaces the literal in its own format (alpha kept, the picker has none).
+ */
+import type { Extension } from "@codemirror/state";
+import { GutterMarker, gutter, type EditorView } from "@codemirror/view";
+import type { EditorDocContext } from "@/editor/api";
+import { findColors, formatColor, fromHex6, parseComputed, toHex6, type ColorMatch, type Rgba } from "./colors";
+import styles from "./ColorPreview.module.css";
+
+/** Longer lines (minified style sheets) are not scanned. */
+const MAX_LINE = 2000;
+
+const names = new Map<string, boolean>();
+function isColorName(word: string): boolean {
+  let known = names.get(word);
+  if (known === undefined) {
+    known = typeof CSS !== "undefined" && CSS.supports("color", word);
+    names.set(word, known);
+  }
+  return known;
+}
+
+let probe: HTMLElement | null = null;
+/** The literal's components, as the browser parses it. */
+function rgbaOf(text: string): Rgba | null {
+  if (!probe?.isConnected) {
+    probe = document.createElement("span");
+    probe.hidden = true;
+    document.body.append(probe);
+  }
+  probe.style.color = "";
+  probe.style.color = text;
+  return probe.style.color ? parseComputed(getComputedStyle(probe).color) : null;
+}
+
+class Swatch extends GutterMarker {
+  constructor(
+    readonly color: ColorMatch,
+    readonly editable: boolean,
+  ) {
+    super();
+  }
+  override eq(other: GutterMarker): boolean {
+    return (
+      other instanceof Swatch &&
+      other.color.text === this.color.text &&
+      other.color.from === this.color.from &&
+      other.editable === this.editable
+    );
+  }
+  override toDOM() {
+    const el = document.createElement("span");
+    el.className = this.editable ? `${styles.swatch} ${styles.editable}` : `${styles.swatch}`;
+    el.title = this.color.text;
+    const fill = document.createElement("span");
+    fill.style.background = this.color.text;
+    el.append(fill);
+    return el;
+  }
+}
+
+function lineColor(view: EditorView, pos: number, language: string): ColorMatch | null {
+  const line = view.state.doc.lineAt(pos);
+  if (line.length > MAX_LINE) return null;
+  return findColors(line.text, language, isColorName)[0] ?? null;
+}
+
+let picker: HTMLInputElement | null = null;
+
+/** Opens the system color picker for `color` at `from`; each pick replaces the literal. */
+function pickColor(view: EditorView, from: number, color: ColorMatch, at: { x: number; y: number }) {
+  const rgba = rgbaOf(color.text);
+  if (!rgba) return;
+  picker?.remove();
+  const input = document.createElement("input");
+  picker = input;
+  input.type = "color";
+  input.className = `${styles.picker}`;
+  input.style.left = `${at.x}px`;
+  input.style.top = `${at.y}px`;
+  input.value = toHex6(rgba);
+  document.body.append(input);
+  let current = color.text;
+  const apply = () => {
+    const next = fromHex6(input.value, rgba[3]);
+    // The literal changed meanwhile: leave it alone.
+    if (!next || view.state.sliceDoc(from, from + current.length) !== current) return;
+    const text = formatColor(next, color);
+    if (text === current) return;
+    view.dispatch({ changes: { from, to: from + current.length, insert: text }, userEvent: "input.color" });
+    current = text;
+  };
+  input.addEventListener("input", apply);
+  input.addEventListener("change", () => {
+    apply();
+    input.remove();
+  });
+  try {
+    input.showPicker();
+  } catch {
+    input.click();
+  }
+}
+
+export function colorPreviewGutter(ctx: EditorDocContext): Extension {
+  return gutter({
+    class: `${styles.gutter} cm-openidea-gutter-colors`,
+    lineMarker: (view, block) => {
+      const color = lineColor(view, block.from, ctx.language);
+      return color ? new Swatch(color, !view.state.readOnly) : null;
+    },
+    lineMarkerChange: (update) => update.docChanged || update.startState.readOnly !== update.state.readOnly,
+    domEventHandlers: {
+      mousedown: (view, block, event) => {
+        const e = event as MouseEvent;
+        const swatch = e.target instanceof Element ? e.target.closest(`.${styles.swatch}`) : null;
+        if (e.button !== 0 || !swatch || view.state.readOnly) return false;
+        const line = view.state.doc.lineAt(block.from);
+        const color = lineColor(view, block.from, ctx.language);
+        if (!color) return false;
+        e.preventDefault();
+        const rect = swatch.getBoundingClientRect();
+        pickColor(view, line.from + color.from, color, { x: rect.left, y: rect.bottom + 2 });
+        return true;
+      },
+    },
+  });
+}
diff --git a/src/features/color-preview/index.ts b/src/features/color-preview/index.ts
new file mode 100644
index 00000000..834401bd
--- /dev/null
+++ b/src/features/color-preview/index.ts
@@ -0,0 +1,7 @@
+/** Color swatches in the editor gutter for color literals (Settings › Editor › General › Gutter Icons). */
+import { registerEditorContribution } from "@/editor/api";
+import { colorPreviewGutter } from "./gutter";
+
+export function activate(): () => void {
+  return registerEditorContribution({ id: "colorPreview.gutter", order: 59, extensions: colorPreviewGutter });
+}
diff --git a/src/features/database/DataView.tsx b/src/features/database/DataView.tsx
index 11423947..ec98a55e 100644
--- a/src/features/database/DataView.tsx
+++ b/src/features/database/DataView.tsx
@@ -20,6 +20,7 @@ import {
   type LocalSort,
 } from "./resultView";
 import { openDialog } from "./store";
+import { hasLineBreak } from "./cellPreview";
 import styles from "./Database.module.css";
 import { tx } from "@/platform/i18n";
 
@@ -346,17 +347,30 @@ function RecordField(props: { column: GridColumn; cell: Cell; editable: boolean;
         {c.name}
         {c.type && c.type !== "NULL" && <span className={styles.treeType}>{c.type}</span>}
       </span>
-      <Input
-        mono
-        value={text}
-        readOnly={!props.editable}
-        placeholder={props.cell === null ? "<null>" : undefined}
-        onChange={(e) => setText(e.target.value)}
-        onBlur={commit}
-        onKeyDown={(e) => {
-          if (e.key === "Enter") commit();
-        }}
-      />
+      {hasLineBreak(props.cell ?? "") ? (
+        // A single-line field would drop the line breaks on the first edit.
+        <textarea
+          className={styles.recordText}
+          rows={Math.min(8, (props.cell ?? "").split(/\r\n|\r|\n/).length)}
+          value={text}
+          readOnly={!props.editable}
+          spellCheck={false}
+          onChange={(e) => setText(e.target.value)}
+          onBlur={commit}
+        />
+      ) : (
+        <Input
+          mono
+          value={text}
+          readOnly={!props.editable}
+          placeholder={props.cell === null ? "<null>" : undefined}
+          onChange={(e) => setText(e.target.value)}
+          onBlur={commit}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") commit();
+          }}
+        />
+      )}
     </label>
   );
 }
diff --git a/src/features/database/Database.module.css b/src/features/database/Database.module.css
index d620be9e..e8d349d4 100644
--- a/src/features/database/Database.module.css
+++ b/src/features/database/Database.module.css
@@ -107,6 +107,9 @@
   color: var(--fg-muted);
   font-style: italic;
 }
+.lineBreak {
+  color: var(--fg-muted);
+}
 .cellEditor {
   min-width: 0;
   height: 24px;
@@ -534,11 +537,12 @@
   background: var(--bg-editor);
   -webkit-user-select: text;
   user-select: text;
-  cursor: text;
+  cursor: default;
 }
 .outputLine {
   white-space: pre-wrap;
   word-break: break-word;
+  cursor: text;
 }
 .outputTime {
   color: var(--link);
@@ -668,6 +672,11 @@
   font-size: var(--fs-small);
   color: var(--fg-secondary);
 }
+/* SQL types (INT, VARCHAR) read as keywords, as in the SQL editor. */
+.sqlPreview :global(.tok-typeName),
+.codeText :global(.tok-typeName) {
+  color: var(--syn-keyword);
+}
 .sqlPreview {
   margin: 0;
   padding: 8px 10px;
@@ -686,41 +695,6 @@
   -webkit-user-select: text;
   user-select: text;
 }
-.sqlPreview :global(.tok-keyword),
-.codeText :global(.tok-keyword),
-.sqlPreview :global(.tok-operatorKeyword),
-.codeText :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.sqlPreview :global(.tok-string),
-.codeText :global(.tok-string),
-.sqlPreview :global(.tok-string2),
-.codeText :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.sqlPreview :global(.tok-number),
-.codeText :global(.tok-number),
-.sqlPreview :global(.tok-bool),
-.codeText :global(.tok-bool),
-.sqlPreview :global(.tok-atom),
-.codeText :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.sqlPreview :global(.tok-typeName),
-.codeText :global(.tok-typeName) {
-  color: var(--syn-keyword);
-}
-.sqlPreview :global(.tok-comment),
-.codeText :global(.tok-comment) {
-  color: var(--syn-comment);
-  font-style: italic;
-}
-.sqlPreview :global(.tok-punctuation),
-.codeText :global(.tok-punctuation),
-.sqlPreview :global(.tok-operator),
-.codeText :global(.tok-operator) {
-  color: var(--syn-punct);
-}
 .modifyBody {
   display: flex;
   flex-direction: column;
@@ -958,10 +932,23 @@
   font-family: var(--openidea-editor-font, var(--font-mono));
   font-size: var(--fs-code);
 }
-.valueText:focus {
+.valueText:focus,
+.recordText:focus {
   outline: none;
   border-color: var(--focus-ring);
 }
+.recordText {
+  resize: vertical;
+  padding: 3px 6px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-control);
+  background: var(--bg-input);
+  color: var(--fg-strong);
+  font-family: var(--openidea-editor-font, var(--font-mono));
+  font-size: var(--fs-code);
+  -webkit-user-select: text;
+  user-select: text;
+}
 .aggregates {
   width: 100%;
   border-collapse: collapse;
diff --git a/src/features/database/DatabaseView.tsx b/src/features/database/DatabaseView.tsx
index 63367cd8..36abea84 100644
--- a/src/features/database/DatabaseView.tsx
+++ b/src/features/database/DatabaseView.tsx
@@ -432,6 +432,11 @@ export function DatabaseView() {
                   </span>
                 )}
                 <span className={labelClass}>{label(n)}</span>
+                {n.kind === "source" && n.source.global && (
+                  <span className={styles.treeDetail} title={tx("Available in all projects")}>
+                    {tx("global")}
+                  </span>
+                )}
                 {d && (
                   <span
                     className={
diff --git a/src/features/database/Grid.test.tsx b/src/features/database/Grid.test.tsx
index 200defe8..3898d161 100644
--- a/src/features/database/Grid.test.tsx
+++ b/src/features/database/Grid.test.tsx
@@ -130,3 +130,48 @@ describe("large database cells", () => {
     expect(screen.getByRole("gridcell").textContent).toBe("<null>");
   });
 });
+
+describe("multi-line database cells", () => {
+  const columns = [{ name: "note", type: "text" }];
+  const multi = "first line\nsecond line\r\nthird";
+
+  it("shows line breaks as markers on one line", () => {
+    render(<Grid columns={columns} rowCount={1} value={() => multi} />);
+    expect(screen.getByRole("gridcell").textContent).toBe("first line↵second line↵third");
+  });
+
+  it.each([
+    ["LF", "a\nb", "a\nb\nc"],
+    ["CRLF, kept although the textarea uses LF", "a\r\nb", "a\r\nb\r\nc"],
+  ])("edits a multi-line value (%s) in the multi-line editor and keeps its line breaks", (_, value, saved) => {
+    const onEdit = vi.fn();
+    render(<Grid columns={columns} rowCount={1} value={() => value} editable onEdit={onEdit} />);
+    fireEvent.doubleClick(screen.getByRole("gridcell"));
+    const editor = screen.getByRole("textbox") as HTMLTextAreaElement;
+    expect(editor.tagName).toBe("TEXTAREA");
+    fireEvent.change(editor, { target: { value: "a\nb\nc" } });
+    fireEvent.keyDown(editor, { key: "Enter", metaKey: true });
+    expect(onEdit).toHaveBeenCalledWith(0, 0, saved);
+  });
+
+  it("opens the multi-line editor with Shift+Enter, from the grid and from the inline editor", () => {
+    const onEdit = vi.fn();
+    render(<Grid columns={columns} rowCount={1} value={() => "one"} editable onEdit={onEdit} />);
+    fireEvent.mouseDown(screen.getByRole("gridcell"), { button: 0 });
+    fireEvent.mouseUp(window);
+    fireEvent.keyDown(screen.getByRole("grid"), { key: "Enter", shiftKey: true });
+    expect((screen.getByRole("textbox") as HTMLTextAreaElement).tagName).toBe("TEXTAREA");
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+
+    fireEvent.doubleClick(screen.getByRole("gridcell"));
+    const inline = screen.getByRole("textbox");
+    expect(inline.tagName).toBe("INPUT");
+    fireEvent.change(inline, { target: { value: "one two" } });
+    fireEvent.keyDown(inline, { key: "Enter", shiftKey: true });
+    fireEvent.blur(inline);
+    const editor = screen.getByRole("textbox") as HTMLTextAreaElement;
+    expect(editor.tagName).toBe("TEXTAREA");
+    expect(editor.value).toBe("one two");
+    expect(onEdit).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/features/database/Grid.tsx b/src/features/database/Grid.tsx
index aefd0f1d..6b2f918e 100644
--- a/src/features/database/Grid.tsx
+++ b/src/features/database/Grid.tsx
@@ -10,7 +10,7 @@ import { Dialog, Icon, showContextMenu, type MenuItem } from "@/ui";
 import { parseDelimited, toCsv, toTsv, type Cell } from "./model";
 import styles from "./Database.module.css";
 import { tx } from "@/platform/i18n";
-import { CELL_PREVIEW_LIMIT, cellPreview } from "./cellPreview";
+import { CELL_PREVIEW_LIMIT, cellPreview, hasLineBreak } from "./cellPreview";
 
 export interface GridColumn {
   name: string;
@@ -83,6 +83,22 @@ function initialWidth(c: GridColumn, sample: Cell[], decorations: number): numbe
 /** SQLite renders whole REALs as `3108.0`; IDEA shows `3108`. */
 const displayed = (v: string, numeric: boolean) => (numeric && /^-?\d+\.0$/.test(v) ? v.slice(0, -2) : v);
 
+/** A cell's text on one line: each line break shows as a muted `↵`. */
+function cellText(value: string) {
+  const parts = cellPreview(value).split(/\r\n|\r|\n/);
+  if (parts.length === 1) return parts[0];
+  return parts.flatMap((part, i) =>
+    i === 0
+      ? [part]
+      : [
+          <span key={i} className={styles.lineBreak}>
+            ↵
+          </span>,
+          part,
+        ],
+  );
+}
+
 function norm(s: Sel) {
   return {
     top: Math.min(s.r0, s.r1),
@@ -105,6 +121,11 @@ export function Grid(props: GridProps) {
     return () => window.removeEventListener("mouseup", stop);
   }, []);
   const [editing, setEditing] = useState<{ row: number; col: number; text: string; dialog: boolean } | null>(null);
+  /** The inline editor is being swapped for the multi-line one: its blur must not commit. */
+  const maximizing = useRef(false);
+  useEffect(() => {
+    if (!editing?.dialog) maximizing.current = false;
+  }, [editing?.dialog]);
   const columnKey = columns.map((c) => c.name).join("\u0000");
   const [widths, setWidths] = useState<number[]>([]);
   const [numeric, setNumeric] = useState<boolean[]>([]);
@@ -163,17 +184,23 @@ export function Grid(props: GridProps) {
   const commit = () => {
     if (!editing) return;
     const prev = value(editing.row, editing.col);
-    if (editing.text !== (prev ?? "") || prev === null) {
-      if (!(prev === null && editing.text === "")) onEdit?.(editing.row, editing.col, editing.text);
+    // A textarea turns CRLF into LF; a value that used CRLF throughout keeps it.
+    const text =
+      prev && prev.includes("\r\n") && !/(^|[^\r])\n/.test(prev)
+        ? editing.text.replace(/\r?\n/g, "\r\n")
+        : editing.text;
+    if (text !== (prev ?? "") || prev === null) {
+      if (!(prev === null && text === "")) onEdit?.(editing.row, editing.col, text);
     }
     setEditing(null);
     scrollRef.current?.focus();
   };
 
-  const startEdit = (row: number, col: number) => {
+  /** `maximized` (⇧Enter): the multi-line editor, which multi-line and long values always use. */
+  const startEdit = (row: number, col: number, maximized = false) => {
     if (!editable || props.rowState?.(row) === "deleted") return;
     const text = value(row, col) ?? "";
-    setEditing({ row, col, text, dialog: text.length > CELL_PREVIEW_LIMIT });
+    setEditing({ row, col, text, dialog: maximized || text.length > CELL_PREVIEW_LIMIT || hasLineBreak(text) });
   };
 
   const onKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
@@ -192,7 +219,7 @@ export function Grid(props: GridProps) {
     if (!sel) return;
     if ((e.key === "Enter" || e.key === "F2") && editable) {
       e.preventDefault();
-      startEdit(sel.r1, sel.c1);
+      startEdit(sel.r1, sel.c1, e.key === "Enter" && e.shiftKey);
       return;
     }
     const moves: Record<string, [number, number]> = {
@@ -325,7 +352,13 @@ export function Grid(props: GridProps) {
             wrap="soft"
             onContextMenu={(e) => e.stopPropagation()}
             onChange={(e) => setEditing({ ...editing, text: e.target.value })}
-            onKeyDown={(e) => e.stopPropagation()}
+            onKeyDown={(e) => {
+              e.stopPropagation();
+              if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+                e.preventDefault();
+                commit();
+              }
+            }}
           />
         </Dialog>
       )}
@@ -404,9 +437,18 @@ export function Grid(props: GridProps) {
                       aria-label={`Edit ${columns[c]!.name}`}
                       value={editing.text}
                       onChange={(e) => setEditing({ ...editing, text: e.target.value })}
-                      onBlur={commit}
+                      onBlur={() => {
+                        if (!maximizing.current) commit();
+                      }}
                       onKeyDown={(e) => {
                         e.stopPropagation();
+                        if (e.key === "Enter" && e.shiftKey) {
+                          // A line break can't be typed in a single-line field: continue in the multi-line editor.
+                          e.preventDefault();
+                          maximizing.current = true;
+                          setEditing({ ...editing, dialog: true });
+                          return;
+                        }
                         if (e.key === "Enter") commit();
                         if (e.key === "Escape") {
                           setEditing(null);
@@ -437,7 +479,7 @@ export function Grid(props: GridProps) {
                     {val === null ? (
                       <span className={styles.null}>&lt;null&gt;</span>
                     ) : (
-                      cellPreview(displayed(val, !!numeric[c]))
+                      cellText(displayed(val, !!numeric[c]))
                     )}
                   </div>
                 );
diff --git a/src/features/database/ObjectDialogs.tsx b/src/features/database/ObjectDialogs.tsx
index 08fb56d4..648e7ec1 100644
--- a/src/features/database/ObjectDialogs.tsx
+++ b/src/features/database/ObjectDialogs.tsx
@@ -269,6 +269,7 @@ const TYPES: Record<DbDriver, string[]> = {
     "bit",
     "varbinary(max)",
   ],
+  clickhouse: ["UInt64", "Int64", "Float64", "String", "Bool", "Date", "DateTime", "UUID", "Nullable(String)"],
 };
 
 interface ModifyProps {
@@ -328,7 +329,8 @@ function ModifyTableForm({
   const driver = driverOf(id);
   const [name, setName] = useState(table ?? "table_name");
   const [columns, setColumns] = useState<ColumnDraft[]>(() => {
-    if (!initial) return [{ ...blankColumn(driver, 1), name: "id", primaryKey: true, notNull: true }];
+    if (!initial)
+      return [{ ...blankColumn(driver, 1), name: "id", primaryKey: driver !== "clickhouse", notNull: true }];
     const drafts = initial.map(draftOf);
     if (addColumn) drafts.push(blankColumn(driver, drafts.length + 1));
     return drafts;
@@ -448,14 +450,18 @@ function ModifyTableForm({
                   disabled={current.dropped || locked}
                   onChange={(e) => patch({ dataType: e.target.value })}
                 />
-                <span />
-                <Checkbox
-                  checked={current.notNull}
-                  disabled={current.dropped || locked}
-                  onChange={(notNull) => patch({ notNull })}
-                  label="Not null"
-                />
-                {!table && (
+                {driver !== "clickhouse" && (
+                  <>
+                    <span />
+                    <Checkbox
+                      checked={current.notNull}
+                      disabled={current.dropped || locked}
+                      onChange={(notNull) => patch({ notNull })}
+                      label="Not null"
+                    />
+                  </>
+                )}
+                {!table && driver !== "clickhouse" && (
                   <>
                     <span />
                     <Checkbox
diff --git a/src/features/database/SourceDialog.test.tsx b/src/features/database/SourceDialog.test.tsx
new file mode 100644
index 00000000..e2cce12f
--- /dev/null
+++ b/src/features/database/SourceDialog.test.tsx
@@ -0,0 +1,21 @@
+import { fireEvent, render, screen, within } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { SourceDialog } from "./SourceDialog";
+
+const savePassword = () => screen.getByRole("checkbox", { name: "Save password" }) as HTMLInputElement;
+
+describe("new data source", () => {
+  it("does not save the database password unless asked to", () => {
+    render(<SourceDialog initial={null} />);
+    expect(savePassword().checked).toBe(false);
+  });
+
+  it("does not save the SSH tunnel password unless asked to", () => {
+    render(<SourceDialog initial={null} />);
+    fireEvent.click(screen.getByRole("tab", { name: "SSH/SSL" }));
+    fireEvent.click(screen.getByRole("checkbox", { name: "Use SSH tunnel" }));
+    fireEvent.click(screen.getByRole("button", { name: "SSH authentication type" }));
+    fireEvent.click(within(screen.getByRole("listbox")).getByText("Password"));
+    expect(savePassword().checked).toBe(false);
+  });
+});
diff --git a/src/features/database/SourceDialog.tsx b/src/features/database/SourceDialog.tsx
index 8bc85a99..e42153cb 100644
--- a/src/features/database/SourceDialog.tsx
+++ b/src/features/database/SourceDialog.tsx
@@ -73,6 +73,10 @@ const SSH_AUTH: Array<SelectOption<SshAuth>> = [
 
 /** Driver property names the Advanced tab suggests, and what the backend does with them. */
 const PROPERTIES: Record<string, { names: string[]; hint: string }> = {
+  clickhouse: {
+    names: ["max_execution_time", "max_threads", "connect_timeout"],
+    hint: "ClickHouse settings sent with each HTTP request. connect_timeout is in seconds.",
+  },
   postgres: {
     names: [
       "statement_timeout",
@@ -106,7 +110,7 @@ const blankSsh = (): DbSsh => ({
   user: "",
   auth: "openSsh",
   keyFile: "",
-  saveSecret: true,
+  saveSecret: false,
 });
 
 const blankOptions = (): DbOptions => ({
@@ -151,7 +155,7 @@ function blank(): DataSource {
     user: "",
     file: null,
     ssl: "prefer",
-    savePassword: true,
+    savePassword: false,
     readOnly: false,
     color: null,
     comment: "",
@@ -376,6 +380,7 @@ export function SourceDialog({
   const vendor = vendorOf(s);
   const sqlite = s.driver === "sqlite";
   const postgres = s.driver === "postgres";
+  const clickhouse = s.driver === "clickhouse";
   const urlOnly = !sqlite && !!s.urlOnly;
   const parsedUrl = urlOnly ? parseSourceUrl(s.url ?? "") : null;
   const urlValid = !!parsedUrl && parsedUrl.source.driver === s.driver;
@@ -398,7 +403,20 @@ export function SourceDialog({
     setS((x) => {
       const old = vendorOf(x);
       const port = x.port == null || x.port === old.port ? v.port : x.port;
-      return { ...x, driver: v.driver, vendor: v.id === v.driver ? "" : v.id, port, ssl: v.ssl ?? x.ssl };
+      return {
+        ...x,
+        driver: v.driver,
+        vendor: v.id === v.driver ? "" : v.id,
+        port,
+        ssl: v.ssl ?? (v.driver === "clickhouse" ? "disable" : x.ssl),
+        ...(v.driver === "clickhouse"
+          ? {
+              user: x.user || "default",
+              database: x.database || "default",
+              options: { ...blankOptions(), ...x.options, transaction: "auto" as const },
+            }
+          : {}),
+      };
     });
   };
 
@@ -614,8 +632,9 @@ export function SourceDialog({
       <Select
         aria-label="Transaction control"
         className={styles.narrowSelect}
-        value={options.transaction ?? "auto"}
-        options={TX}
+        value={clickhouse ? "auto" : (options.transaction ?? "auto")}
+        options={clickhouse ? TX.filter((option) => option.value === "auto") : TX}
+        disabled={clickhouse}
         onChange={(transaction) => setOptions({ transaction })}
       />
       {postgres && (
@@ -640,7 +659,9 @@ export function SourceDialog({
             id="db-time-zone"
             value={options.timeZone ?? ""}
             placeholder={
-              postgres ? "Server default, e.g. UTC or Europe/Berlin" : "UTC (+00:00), e.g. Europe/Berlin or +08:00"
+              postgres || clickhouse
+                ? "Server default, e.g. UTC or Europe/Berlin"
+                : "UTC (+00:00), e.g. Europe/Berlin or +08:00"
             }
             onChange={(e) => setOptions({ timeZone: e.target.value })}
           />
@@ -679,9 +700,11 @@ export function SourceDialog({
         placeholder={
           postgres
             ? "SET statement_timeout = '30s';"
-            : sqlite
-              ? "PRAGMA foreign_keys = ON;"
-              : "SET SESSION sql_mode = 'ANSI';"
+            : clickhouse
+              ? "SET max_execution_time = 30;"
+              : sqlite
+                ? "PRAGMA foreign_keys = ON;"
+                : "SET SESSION sql_mode = 'ANSI';"
         }
         onChange={(e) => setOptions({ startupScript: e.target.value })}
       />
@@ -834,8 +857,17 @@ export function SourceDialog({
         aria-label="SSL mode"
         className={styles.narrowSelect}
         value={s.ssl ?? "prefer"}
-        options={SSL}
-        onChange={(ssl) => set({ ssl })}
+        options={clickhouse ? SSL.filter((mode) => mode.value !== "prefer") : SSL}
+        onChange={(ssl) => {
+          const secure = ssl !== "disable" && ssl !== "prefer";
+          const oldSecure = s.ssl !== "disable" && s.ssl !== "prefer";
+          set({
+            ssl,
+            ...(clickhouse && (s.port == null || s.port === (oldSecure ? 8443 : 8123))
+              ? { port: secure ? 8443 : 8123 }
+              : {}),
+          });
+        }}
       />
       <FileField
         id="db-ssl-ca"
@@ -1037,6 +1069,10 @@ export function SourceDialog({
               </span>
             )}
           />
+          {/* IDEA's Make Global: stored with the IDE and listed in every project. */}
+          <span title={tx("Available in all projects")}>
+            <Checkbox checked={!!s.global} onChange={(global) => set({ global })} label="Global" />
+          </span>
         </div>
         <span />
         {showComment ? (
diff --git a/src/features/database/TableEditor.tsx b/src/features/database/TableEditor.tsx
index 65adc30e..59945684 100644
--- a/src/features/database/TableEditor.tsx
+++ b/src/features/database/TableEditor.tsx
@@ -89,7 +89,8 @@ export function TableEditor({ input }: { input: EditorInput }) {
   const names = columns.map((c) => c.name);
   const pk = page?.details.columns.filter((c) => c.primaryKey).map((c) => c.name) ?? [];
   const fkColumns = new Set(page?.details.foreignKeys.flatMap((k) => k.columns) ?? []);
-  const editable = pk.length > 0 && !sourceById(ref.id)?.readOnly;
+  const source = sourceById(ref.id);
+  const editable = pk.length > 0 && !source?.readOnly && source?.driver !== "clickhouse";
   const loaded = page?.result.rows.length ?? 0;
   const rowCount = loaded + edits.inserts.length;
   const gridColumns = useMemo(
@@ -149,7 +150,7 @@ export function TableEditor({ input }: { input: EditorInput }) {
     });
 
   const submit = async () => {
-    if (!page) return;
+    if (!page || !editable) return;
     try {
       const n = await call(
         commands.dbApplyEdits(ref.id, ref.schema, ref.table, buildRowEdits(names, page.result.rows, pk, edits)),
@@ -300,7 +301,11 @@ export function TableEditor({ input }: { input: EditorInput }) {
       </div>
       {page && !editable && (
         <div className={styles.notice}>
-          {pk.length ? tx("Read-only data source.") : tx("Read-only: the table has no primary key to identify rows.")}
+          {source?.driver === "clickhouse"
+            ? tx("Use the query console to change ClickHouse data.")
+            : pk.length
+              ? tx("Read-only data source.")
+              : tx("Read-only: the table has no primary key to identify rows.")}
         </div>
       )}
       {error ? (
diff --git a/src/features/database/cellPreview.ts b/src/features/database/cellPreview.ts
index c0a69b4d..53b7d91d 100644
--- a/src/features/database/cellPreview.ts
+++ b/src/features/database/cellPreview.ts
@@ -8,3 +8,6 @@ export function cellPreview(value: string): string {
   if (last >= 0xd800 && last <= 0xdbff) end--;
   return value.slice(0, end) + "\u2026";
 }
+
+/** Whether the value spans several lines (a single-line field would drop its line breaks). */
+export const hasLineBreak = (value: string) => /[\r\n]/.test(value);
diff --git a/src/features/database/console.tsx b/src/features/database/console.tsx
index b770dfc4..5a0e8334 100644
--- a/src/features/database/console.tsx
+++ b/src/features/database/console.tsx
@@ -230,6 +230,7 @@ function ConsoleBar({ path, view }: { path: string; view: EditorView }) {
   const pending = useDatabase((s) => !!bound && s.pendingTx.has(bound));
   const databases = useDatabase((s) => s.databases);
   const boundId = bound ? splitTarget(bound).id : null;
+  const supportsTransactions = sourceById(boundId)?.driver !== "clickhouse";
   useEffect(() => {
     if (boundId && listsDatabases(sourceById(boundId)) && !useDatabase.getState().databases[boundId])
       void loadDatabases(boundId);
@@ -291,18 +292,22 @@ function ConsoleBar({ path, view }: { path: string; view: EditorView }) {
         options={ROW_LIMITS.map((v) => ({ value: v, label: tx`${Number(v).toLocaleString("en")} rows` }))}
         onChange={(v) => useDatabase.setState({ maxRows: Number(v) })}
       />
-      <span className={styles.toolbarSeparator} />
-      <Select
-        aria-label="Transaction mode"
-        value={manual ? "manual" : "auto"}
-        options={[
-          { value: "auto", label: "Tx: Auto" },
-          { value: "manual", label: "Tx: Manual" },
-        ]}
-        onChange={(v) => bound && void setManualCommit(bound, v === "manual")}
-        disabled={!bound}
-      />
-      {manual && (
+      {supportsTransactions && (
+        <>
+          <span className={styles.toolbarSeparator} />
+          <Select
+            aria-label="Transaction mode"
+            value={manual ? "manual" : "auto"}
+            options={[
+              { value: "auto", label: "Tx: Auto" },
+              { value: "manual", label: "Tx: Manual" },
+            ]}
+            onChange={(v) => bound && void setManualCommit(bound, v === "manual")}
+            disabled={!bound}
+          />
+        </>
+      )}
+      {supportsTransactions && manual && (
         <>
           <IconButton
             icon="commit"
diff --git a/src/features/database/database.test.ts b/src/features/database/database.test.ts
index 72c4cb60..2f421f8b 100644
--- a/src/features/database/database.test.ts
+++ b/src/features/database/database.test.ts
@@ -102,6 +102,12 @@ describe("export formats", () => {
     );
   });
 
+  it("preserves backslashes in ClickHouse SQL exports", () => {
+    expect(exportData("sql", { ...data, driver: "clickhouse", rows: [["1", "C:\\new\\file's"]] })).toBe(
+      `INSERT INTO "order items" (id, name) VALUES (1, 'C:\\\\new\\\\file''s');`,
+    );
+  });
+
   it("writes a Markdown table, numbers right-aligned", () => {
     expect(exportData("markdown", { ...data, rows: [["1", "a|b"]] })).toBe(
       "| id | name |\n| --: | --- |\n| 1 | a\\|b |",
@@ -184,7 +190,9 @@ describe("data source types", () => {
     });
     expect(vendorPreset(vendorById("postgres")!)).toEqual({ driver: "postgres", vendor: "", port: 5432 });
     expect(vendorPreset(vendorById("supabase")!).ssl).toBe("require");
-    expect(VENDORS.every((v) => ["postgres", "mysql", "sqlite", "sqlServer"].includes(v.driver))).toBe(true);
+    expect(VENDORS.every((v) => ["postgres", "mysql", "sqlite", "sqlServer", "clickhouse"].includes(v.driver))).toBe(
+      true,
+    );
     const labels = VENDORS.map((v) => v.label);
     expect(labels).toEqual([...labels].sort((a, b) => a.localeCompare(b)));
   });
@@ -227,6 +235,36 @@ describe("data source types", () => {
     expect(parseSourceUrl("redshift://r.example:5439/dev")?.source.vendor).toBe("redshift");
     expect(parseSourceUrl("postgresql://h:70000/db")).toBeNull();
   });
+
+  it("adds ClickHouse with native HTTP defaults and HTTPS cloud URLs", () => {
+    expect(vendorPreset(vendorById("clickhouse")!)).toEqual({
+      driver: "clickhouse",
+      vendor: "",
+      port: 8123,
+      user: "default",
+      database: "default",
+      ssl: "disable",
+    });
+    expect(sourceUrl({ driver: "clickhouse", host: "localhost", database: "default" })).toBe(
+      "http://localhost:8123/default",
+    );
+    expect(sourceUrl({ driver: "clickhouse", host: "db.example", ssl: "verifyFull", database: "analytics" })).toBe(
+      "https://db.example:8443/analytics",
+    );
+    const parsed = parseSourceUrl("https://reader:s%40cret@db.example:8443/analytics?max_execution_time=30");
+    expect(parsed?.source).toMatchObject({
+      driver: "clickhouse",
+      host: "db.example",
+      port: 8443,
+      database: "analytics",
+      user: "reader",
+      ssl: "verifyFull",
+    });
+    expect(parsed?.password).toBe("s@cret");
+    expect(parseSourceUrl("http://localhost/default")?.source.ssl).toBe("disable");
+    expect(parseSourceUrl("jdbc:clickhouse://localhost/default")?.source.driver).toBe("clickhouse");
+    expect(parseSourceUrl("https://db.example/default?sslmode=disable")?.source.ssl).toBe("verifyFull");
+  });
 });
 
 describe("Schemas tab", () => {
diff --git a/src/features/database/export.ts b/src/features/database/export.ts
index 09277d39..0aea5bb6 100644
--- a/src/features/database/export.ts
+++ b/src/features/database/export.ts
@@ -79,7 +79,11 @@ export function exportData(
     }
     case "sql": {
       const literal = (v: Cell, i: number) =>
-        v === null ? "NULL" : numeric[i] && Number.isFinite(Number(v)) ? v : `'${v.replace(/'/g, "''")}'`;
+        v === null
+          ? "NULL"
+          : numeric[i] && Number.isFinite(Number(v))
+            ? v
+            : `'${(d.driver === "clickhouse" ? v.replace(/\\/g, "\\\\") : v).replace(/'/g, "''")}'`;
       const head = `INSERT INTO ${quoteIdent(d.table, d.driver)} (${names.map((n) => quoteIdent(n, d.driver)).join(", ")}) VALUES`;
       return d.rows.map((r) => `${head} (${r.map(literal).join(", ")});`).join("\n");
     }
diff --git a/src/features/database/model.ts b/src/features/database/model.ts
index df89c13d..397144bf 100644
--- a/src/features/database/model.ts
+++ b/src/features/database/model.ts
@@ -390,6 +390,10 @@ export function parseSourceUrl(raw: string): { source: Partial<DataSource>; pass
     }
   }
   source.user = user;
+  if (vendor.driver === "clickhouse") {
+    if (m[1]!.toLowerCase() === "https") source.ssl = "verifyFull";
+    else if (m[1]!.toLowerCase() === "http") source.ssl = "disable";
+  }
   if (properties.length) source.properties = properties;
   return { source, password };
 }
diff --git a/src/features/database/objects.test.ts b/src/features/database/objects.test.ts
index 1d3265e7..229c67fa 100644
--- a/src/features/database/objects.test.ts
+++ b/src/features/database/objects.test.ts
@@ -2,6 +2,8 @@ import { describe, expect, it } from "vitest";
 import type { DbColumnInfo } from "@/platform/ipc";
 import {
   alterTableSql,
+  canDrop,
+  canModifyTable,
   createTableSql,
   draftOf,
   dropSql,
@@ -10,6 +12,7 @@ import {
   renameSql,
   scriptSql,
   truncateSql,
+  quoteIdent,
   type ColumnDraft,
 } from "./objects";
 
@@ -29,6 +32,51 @@ const users = [
 ];
 
 describe("database object SQL", () => {
+  it("uses ClickHouse object syntax and escapes identifiers", () => {
+    expect(quoteIdent("clickhouse", 'a\\b"c')).toBe('"a\\\\b\\"c"');
+    expect(ident("clickhouse", "price$usd")).toBe('"price$usd"');
+    expect(renameSql("clickhouse", { kind: "table", schema: "default", name: "users" }, "people")).toBe(
+      'rename table "default".users to "default".people;',
+    );
+    expect(
+      dropSql("clickhouse", { kind: "schema", schema: "", name: "analytics" }, { ifExists: true, cascade: true }),
+    ).toBe("drop database if exists analytics;");
+    expect(
+      dropSql(
+        "clickhouse",
+        { kind: "materializedView", schema: "default", name: "totals" },
+        { ifExists: true, cascade: true },
+      ),
+    ).toBe('drop table if exists "default".totals;');
+    expect(truncateSql("clickhouse", "default", "users", { restartIdentity: true, cascade: true })).toBe(
+      'truncate table "default".users;',
+    );
+    expect(canDrop("clickhouse", { kind: "index", schema: "default", name: "ix" })).toBe(false);
+    expect(canModifyTable("clickhouse")).toBe(false);
+    expect(alterTableSql("clickhouse", "default", "users", "people", users.map(draftOf))).toEqual([]);
+  });
+
+  it("creates ClickHouse MergeTree tables without a relational primary key", () => {
+    const drafts = [col("id", "UInt64", { primaryKey: true, nullable: false }), col("name", "Nullable(String)")].map(
+      draftOf,
+    );
+    expect(createTableSql("clickhouse", "default", "people", drafts)).toBe(
+      'create table "default".people\n(\n    id UInt64,\n    name Nullable(String)\n)\nengine = MergeTree\norder by tuple();\n',
+    );
+  });
+
+  it("writes guarded ClickHouse mutation templates without unique key assumptions", () => {
+    expect(scriptSql("clickhouse", "update", "default", "users", users)).toBe(
+      'alter table "default".users\nupdate email = ?,\n       name = ?\nwhere 1 = 0;\n',
+    );
+    expect(scriptSql("clickhouse", "delete", "default", "users", users)).toBe(
+      'alter table "default".users\ndelete\nwhere 1 = 0;\n',
+    );
+    expect(() => scriptSql("clickhouse", "update", "default", "users", users.slice(0, 1))).toThrow(
+      "ClickHouse sorting key columns cannot be updated.",
+    );
+  });
+
   it("quotes only when needed", () => {
     expect(ident("postgres", "users")).toBe("users");
     expect(ident("postgres", "Users")).toBe('"Users"');
diff --git a/src/features/database/objects.ts b/src/features/database/objects.ts
index 6b0b9820..d2fc8fb3 100644
--- a/src/features/database/objects.ts
+++ b/src/features/database/objects.ts
@@ -6,6 +6,7 @@
 import type { DbColumnInfo, DbDriver } from "@/platform/ipc";
 
 export function quoteIdent(driver: DbDriver, name: string): string {
+  if (driver === "clickhouse") return `"${name.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
   if (driver === "mysql") return `\`${name.replace(/`/g, "``")}\``;
   if (driver === "sqlServer") return `[${name.replace(/]/g, "]]")}]`;
   return `"${name.replace(/"/g, '""')}"`;
@@ -13,7 +14,12 @@ export function quoteIdent(driver: DbDriver, name: string): string {
 
 /** Quotes only when needed: lower-case (PostgreSQL) / plain words stay bare, like IDEA's generated SQL. */
 export function ident(driver: DbDriver, name: string): string {
-  const plain = driver === "postgres" ? /^[a-z_][a-z0-9_$]*$/ : /^[A-Za-z_][A-Za-z0-9_$]*$/;
+  const plain =
+    driver === "postgres"
+      ? /^[a-z_][a-z0-9_$]*$/
+      : driver === "clickhouse"
+        ? /^[A-Za-z_][A-Za-z0-9_]*$/
+        : /^[A-Za-z_][A-Za-z0-9_$]*$/;
   return plain.test(name) && !RESERVED.has(name.toUpperCase()) ? name : quoteIdent(driver, name);
 }
 
@@ -83,7 +89,8 @@ export function renameSql(driver: DbDriver, o: DbObjectRef, to: string): string
       if (driver === "postgres") return `alter view ${q} rename to ${ident(driver, to)};`;
       return `rename table ${q} to ${qualifiedName(driver, o.schema, to)};`;
     default:
-      if (driver === "mysql") return `rename table ${q} to ${qualifiedName(driver, o.schema, to)};`;
+      if (driver === "mysql" || driver === "clickhouse")
+        return `rename table ${q} to ${qualifiedName(driver, o.schema, to)};`;
       return `alter table ${q} rename to ${ident(driver, to)};`;
   }
 }
@@ -94,7 +101,12 @@ export interface DropOptions {
   cascade: boolean;
 }
 
-export const canDrop = (driver: DbDriver, o: DbObjectRef) => !(o.kind === "schema" && driver === "sqlite");
+export const canDrop = (driver: DbDriver, o: DbObjectRef) =>
+  driver === "clickhouse"
+    ? ["table", "view", "materializedView", "column", "schema"].includes(o.kind)
+    : !(o.kind === "schema" && driver === "sqlite");
+
+export const canModifyTable = (driver: DbDriver) => driver !== "clickhouse";
 
 /** IDEA's Confirm Drop preview. */
 export function dropSql(driver: DbDriver, o: DbObjectRef, opts: DropOptions): string {
@@ -108,8 +120,9 @@ export function dropSql(driver: DbDriver, o: DbObjectRef, opts: DropOptions): st
         return `drop index ${ident(driver, o.name)} on ${qualifiedName(driver, o.schema, o.table ?? "")};`;
       return `drop index ${ifExists}${qualifiedName(driver, o.schema, o.name)}${cascade};`;
     case "schema":
-      return `drop ${driver === "mysql" ? "database" : "schema"} ${ifExists}${ident(driver, o.name)}${cascade};`;
+      return `drop ${driver === "mysql" || driver === "clickhouse" ? "database" : "schema"} ${ifExists}${ident(driver, o.name)}${cascade};`;
     case "materializedView":
+      if (driver === "clickhouse") return `drop table ${ifExists}${qualifiedName(driver, o.schema, o.name)};`;
       return `drop materialized view ${ifExists}${qualifiedName(driver, o.schema, o.name)}${cascade};`;
     case "function":
     case "procedure": {
@@ -134,7 +147,7 @@ export function truncateSql(
 ): string {
   const q = qualifiedName(driver, schema, table);
   if (driver === "sqlite") return `delete from ${q};`;
-  if (driver === "mysql" || driver === "sqlServer") return `truncate table ${q};`;
+  if (driver === "mysql" || driver === "sqlServer" || driver === "clickhouse") return `truncate table ${q};`;
   return `truncate table ${q}${opts.restartIdentity ? " restart identity" : ""}${opts.cascade ? " cascade" : ""};`;
 }
 
@@ -169,9 +182,14 @@ export function scriptSql(
       return `insert into ${q} (${names.join(", ")})\nvalues (${names.map(() => "?").join(", ")});\n`;
     case "update": {
       const set = columns.filter((c) => !c.primaryKey).map((c) => `${ident(driver, c.name)} = ?`);
+      if (driver === "clickhouse") {
+        if (!set.length) throw new Error("ClickHouse sorting key columns cannot be updated.");
+        return `alter table ${q}\nupdate ${set.join(",\n       ")}\nwhere 1 = 0;\n`;
+      }
       return `update ${q}\nset ${(set.length ? set : names.map((n) => `${n} = ?`)).join(",\n    ")}\nwhere ${where};\n`;
     }
     case "delete":
+      if (driver === "clickhouse") return `alter table ${q}\ndelete\nwhere 1 = 0;\n`;
       return `delete\nfrom ${q}\nwhere ${where};\n`;
   }
 }
@@ -205,9 +223,9 @@ export function draftOf(c: DbColumnInfo, key: number): ColumnDraft {
 }
 
 function columnDefinition(driver: DbDriver, c: ColumnDraft): string {
-  let s = `${ident(driver, c.name)} ${c.dataType.trim() || (driver === "sqlite" ? "TEXT" : "text")}`;
+  let s = `${ident(driver, c.name)} ${c.dataType.trim() || (driver === "clickhouse" ? "String" : driver === "sqlite" ? "TEXT" : "text")}`;
   if (c.default.trim()) s += ` default ${c.default.trim()}`;
-  if (c.notNull) s += " not null";
+  if (c.notNull && driver !== "clickhouse") s += " not null";
   return s;
 }
 
@@ -221,8 +239,8 @@ export function createTableSql(
   const live = columns.filter((c) => !c.dropped && c.name.trim());
   const keys = live.filter((c) => c.primaryKey).map((c) => ident(driver, c.name));
   const items = live.map((c) => `    ${columnDefinition(driver, c)}`);
-  if (keys.length) items.push(`    primary key (${keys.join(", ")})`);
-  return `create table ${qualifiedName(driver, schema, name)}\n(\n${items.join(",\n")}\n);\n`;
+  if (keys.length && driver !== "clickhouse") items.push(`    primary key (${keys.join(", ")})`);
+  return `create table ${qualifiedName(driver, schema, name)}\n(\n${items.join(",\n")}\n)${driver === "clickhouse" ? "\nengine = MergeTree\norder by tuple()" : ""};\n`;
 }
 
 /** Whether `alterTableSql` can express changing column `c` (SQLite only renames, adds and drops). */
@@ -242,6 +260,7 @@ export function alterTableSql(
   name: string,
   columns: readonly ColumnDraft[],
 ): string[] {
+  if (!canModifyTable(driver)) return [];
   const out: string[] = [];
   const q = () => qualifiedName(driver, schema, table);
   for (const c of columns) {
diff --git a/src/features/database/sql/analyze.ts b/src/features/database/sql/analyze.ts
index fb0332e3..a984796b 100644
--- a/src/features/database/sql/analyze.ts
+++ b/src/features/database/sql/analyze.ts
@@ -174,7 +174,7 @@ export function analyze(text: string, pos: number, driver: DbDriver, lexed: Lexe
   blocks.forEach((g, depth) => {
     // Within an enclosing block, the "caret" is the paren of the block nested in it.
     const [ra, rb] = blockRange(st, parens, g, depth === 0 ? nb : blocks[depth - 1]!);
-    for (const r of parseRefs(st, parens, g, ra, rb, ctes, depth)) {
+    for (const r of parseRefs(st, parens, g, ra, rb, ctes, depth, driver)) {
       refs.push(r.ref);
       if (depth === 0) refEnds.set(r.end, r.ref);
     }
@@ -362,6 +362,7 @@ function parseRefs(
   b: number,
   ctes: TableRef[],
   depth: number,
+  driver: DbDriver,
 ): Array<{ ref: TableRef; end: number }> {
   const out: Array<{ ref: TableRef; end: number }> = [];
   const level = parens.level(g, a, b);
@@ -409,7 +410,10 @@ function parseRefs(
     const name = identName(last);
     const schema = parts.length > 1 ? identName(parts.at(-2)!) : null;
     const al = alias(st, k, b);
-    const cte = schema === null ? ctes.find((c) => c.name.toLowerCase() === name.toLowerCase()) : undefined;
+    const cte =
+      schema === null
+        ? ctes.find((c) => (driver === "clickhouse" ? c.name === name : c.name.toLowerCase() === name.toLowerCase()))
+        : undefined;
     out.push({
       ref: {
         schema,
diff --git a/src/features/database/sql/complete.ts b/src/features/database/sql/complete.ts
index 0ef084d4..f2adf046 100644
--- a/src/features/database/sql/complete.ts
+++ b/src/features/database/sql/complete.ts
@@ -7,7 +7,15 @@
  */
 import type { DbCompletion, DbCompletionColumn, DbCompletionTable, DbDriver } from "@/platform/ipc";
 import type { Analysis, Clause, TableRef } from "./analyze";
-import { DATA_TYPES, functions, isReserved, joinKeywords, predicateKeywords, statementStarters } from "./dialect";
+import {
+  DATA_TYPES,
+  functions,
+  isReserved,
+  joinKeywords,
+  nameMatcher,
+  predicateKeywords,
+  statementStarters,
+} from "./dialect";
 
 export type CandidateKind =
   | "table"
@@ -55,13 +63,16 @@ export function shouldAutoCompleteSql(analysis: Analysis): boolean {
 
 const MAX_ALL_COLUMNS = 3000;
 
-const eq = (a: string | null | undefined, b: string | null | undefined) =>
-  !!a && !!b && a.toLowerCase() === b.toLowerCase();
-
 /** `name`, quoted when the dialect needs it (case, characters, reserved words). */
 export function quoteIdent(name: string, driver: DbDriver): string {
-  const plain = driver === "postgres" ? /^[a-z_][a-z0-9_$]*$/ : /^[A-Za-z_][A-Za-z0-9_$]*$/;
+  const plain =
+    driver === "postgres"
+      ? /^[a-z_][a-z0-9_$]*$/
+      : driver === "clickhouse"
+        ? /^[A-Za-z_][A-Za-z0-9_]*$/
+        : /^[A-Za-z_][A-Za-z0-9_$]*$/;
   if (plain.test(name) && !isReserved(name)) return name;
+  if (driver === "clickhouse") return `"${name.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
   const q = driver === "mysql" ? "`" : '"';
   return q + name.split(q).join(q + q) + q;
 }
@@ -94,6 +105,7 @@ export interface CompletionInput {
 }
 
 export function sqlCandidates({ model, analysis: a, driver, sourceName }: CompletionInput): SqlCandidate[] {
+  const eq = nameMatcher(driver);
   const ctx = a.context;
   if (ctx.kind === "none") return [];
   const typedLower = /[a-z]/.test(a.prefix.text) && !/[A-Z]/.test(a.prefix.text);
@@ -224,7 +236,7 @@ export function sqlCandidates({ model, analysis: a, driver, sourceName }: Comple
       else {
         if (ctx.ref.viaJoin) {
           out.push(
-            ...conditionCandidates(a, model, ctx.ref, kw).map((c) => ({
+            ...conditionCandidates(a, model, ctx.ref, kw, driver).map((c) => ({
               ...c,
               label: `${kw("ON")} ${c.label}`,
               insert: `${kw("ON")} ${c.insert ?? c.label}`,
@@ -238,7 +250,7 @@ export function sqlCandidates({ model, analysis: a, driver, sourceName }: Comple
     }
 
     case "joinCondition":
-      out.push(...conditionCandidates(a, model, ctx.ref, kw));
+      out.push(...conditionCandidates(a, model, ctx.ref, kw, driver));
       columnContext("on");
       return out;
 
@@ -322,7 +334,7 @@ export function sqlCandidates({ model, analysis: a, driver, sourceName }: Comple
       if (!visible.some((r) => eq(r.name, c.name))) out.push({ label: c.name, kind: "table", tail: "(CTE)", boost: 0 });
     const fnBoost = clause === "select" || clause === "having" ? 15 : 8;
     for (const f of functions(driver)) {
-      const name = lower ? f.name : f.name.toUpperCase();
+      const name = lower || driver === "clickhouse" ? f.name : f.name.toUpperCase();
       out.push({
         label: name,
         kind: "function",
@@ -372,7 +384,7 @@ function clauseKeywords(clause: Clause, driver: DbDriver, a: Analysis): string[]
     case "returning":
       return ["AS"];
     default:
-      return [...pred, ...DATA_TYPES[driver].map((t) => t.toUpperCase())];
+      return [...pred, ...DATA_TYPES[driver].map((t) => (driver === "clickhouse" ? t : t.toUpperCase()))];
   }
 }
 
@@ -390,6 +402,7 @@ function joinCandidates(
   kw: Kw,
 ): SqlCandidate[] {
   if (!model) return [];
+  const eq = nameMatcher(driver);
   const out: SqlCandidate[] = [];
   const q = (n: string) => quoteIdent(n, driver);
   const seen = new Set<string>();
@@ -446,8 +459,15 @@ function joinCandidates(
 }
 
 /** `JOIN t x ON |` → conditions relating `ref` to the other tables in scope. */
-function conditionCandidates(a: Analysis, model: DbCompletion | null, ref: TableRef, kw: Kw): SqlCandidate[] {
+function conditionCandidates(
+  a: Analysis,
+  model: DbCompletion | null,
+  ref: TableRef,
+  kw: Kw,
+  driver: DbDriver,
+): SqlCandidate[] {
   if (!model || ref.kind !== "table") return [];
+  const eq = nameMatcher(driver);
   const out: SqlCandidate[] = [];
   const find = (r: TableRef) =>
     model.tables.find((t) => eq(t.name, r.name) && (r.schema ? eq(t.schema, r.schema) : true));
diff --git a/src/features/database/sql/dialect.ts b/src/features/database/sql/dialect.ts
index e66afaaf..ca7c01e9 100644
--- a/src/features/database/sql/dialect.ts
+++ b/src/features/database/sql/dialect.ts
@@ -24,6 +24,9 @@ export function isReserved(word: string): boolean {
   return RESERVED.has(word.toUpperCase());
 }
 
+export const nameMatcher = (driver: DbDriver) => (a: string | null | undefined, b: string | null | undefined) =>
+  !!a && !!b && (driver === "clickhouse" ? a === b : a.toLowerCase() === b.toLowerCase());
+
 /** Clause keywords: a word in this set ends a table alias or expression. */
 export const CLAUSE_WORDS = new Set(
   (
@@ -34,6 +37,30 @@ export const CLAUSE_WORDS = new Set(
 );
 
 export function statementStarters(driver: DbDriver): string[] {
+  if (driver === "clickhouse")
+    return [
+      "SELECT",
+      "INSERT INTO",
+      "WITH",
+      "CREATE TABLE",
+      "CREATE VIEW",
+      "CREATE MATERIALIZED VIEW",
+      "CREATE DATABASE",
+      "ALTER TABLE",
+      "DROP TABLE",
+      "DROP VIEW",
+      "DROP DATABASE",
+      "RENAME TABLE",
+      "TRUNCATE TABLE",
+      "EXPLAIN",
+      "SHOW DATABASES",
+      "SHOW TABLES",
+      "SHOW CREATE TABLE",
+      "DESCRIBE TABLE",
+      "USE",
+      "SET",
+      "OPTIMIZE TABLE",
+    ];
   const common = [
     "SELECT",
     "INSERT INTO",
@@ -177,6 +204,33 @@ export const DATA_TYPES: Record<DbDriver, string[]> = {
     "VARBINARY",
     "XML",
   ],
+  clickhouse: [
+    "UInt64",
+    "UInt32",
+    "UInt16",
+    "UInt8",
+    "Int64",
+    "Int32",
+    "Float64",
+    "Float32",
+    "Decimal",
+    "String",
+    "FixedString",
+    "Bool",
+    "Date",
+    "Date32",
+    "DateTime",
+    "DateTime64",
+    "UUID",
+    "IPv4",
+    "IPv6",
+    "Array",
+    "Tuple",
+    "Map",
+    "Nullable",
+    "LowCardinality",
+    "JSON",
+  ],
 };
 
 const f = (name: string, params: string, returns?: string, aggregate?: boolean): SqlFunction => ({
@@ -297,6 +351,38 @@ const FUNCTIONS: Record<DbDriver, SqlFunction[]> = {
     f("row_number", "", "bigint"),
     f("rank", "", "bigint"),
   ],
+  clickhouse: [
+    f("count", "*", "UInt64", true),
+    f("sum", "expr", undefined, true),
+    f("avg", "expr", "Float64", true),
+    f("min", "expr", undefined, true),
+    f("max", "expr", undefined, true),
+    f("uniq", "expr", "UInt64", true),
+    f("uniqExact", "expr", "UInt64", true),
+    f("groupArray", "expr", "Array", true),
+    f("argMax", "arg, value", undefined, true),
+    f("coalesce", "value, ..."),
+    f("ifNull", "a, b"),
+    f("nullIf", "a, b"),
+    f("lower", "text", "String"),
+    f("upper", "text", "String"),
+    f("length", "value", "UInt64"),
+    f("concat", "value, ...", "String"),
+    f("substring", "text, start, length", "String"),
+    f("replaceAll", "text, pattern, replacement", "String"),
+    f("abs", "number"),
+    f("round", "number, digits"),
+    f("toString", "expr", "String"),
+    f("toUInt64", "expr", "UInt64"),
+    f("toDate", "expr", "Date"),
+    f("toDateTime", "expr", "DateTime"),
+    f("toStartOfDay", "datetime", "DateTime"),
+    f("now", "", "DateTime"),
+    f("today", "", "Date"),
+    f("arrayJoin", "array"),
+    f("tuple", "value, ...", "Tuple"),
+    f("cast", "expr AS type"),
+  ],
 };
 
 export function functions(driver: DbDriver): SqlFunction[] {
diff --git a/src/features/database/sql/lexer.ts b/src/features/database/sql/lexer.ts
index 3072ff2f..b4137450 100644
--- a/src/features/database/sql/lexer.ts
+++ b/src/features/database/sql/lexer.ts
@@ -16,6 +16,7 @@ export interface Token {
   to: number;
   /** Upper-cased `text` of words, for keyword checks. */
   upper: string;
+  value?: string;
 }
 
 export interface Lexed {
@@ -30,13 +31,23 @@ const TWO_CHAR = new Set(["::", "<=", ">=", "<>", "!=", "||", "->", "=>", ":="])
 
 export function lex(text: string, driver: DbDriver = "sqlite"): Lexed {
   const mysql = driver === "mysql";
+  const clickhouse = driver === "clickhouse";
   const tokens: Token[] = [];
   const comments: Lexed["comments"] = [];
   const n = text.length;
   let i = 0;
   const push = (kind: TokenKind, from: number, to: number) => {
     const t = text.slice(from, to);
-    tokens.push({ kind, text: t, from, to, upper: kind === "word" ? t.toUpperCase() : t });
+    tokens.push({
+      kind,
+      text: t,
+      from,
+      to,
+      upper: kind === "word" ? t.toUpperCase() : t,
+      ...(kind === "quoted" && clickhouse
+        ? { value: t.slice(1, t.endsWith(t[0]!) ? -1 : undefined).replace(/\\([\\'"`])/g, "$1") }
+        : {}),
+    });
   };
   /** End of a quoted run starting at `i` (closing char doubled = escaped). */
   const quoted = (start: number, close: string, backslash: boolean): number => {
@@ -67,15 +78,15 @@ export function lex(text: string, driver: DbDriver = "sqlite"): Lexed {
       comments.push({ from: i, to, open: end < 0 });
       i = to;
     } else if (c === "'") {
-      const to = quoted(i, "'", mysql);
+      const to = quoted(i, "'", mysql || clickhouse);
       push("string", i, to);
       i = to;
     } else if (c === '"') {
-      const to = quoted(i, '"', false);
+      const to = quoted(i, '"', clickhouse);
       push(mysql ? "string" : "quoted", i, to);
       i = to;
-    } else if (c === "`" && mysql) {
-      const to = quoted(i, "`", false);
+    } else if (c === "`" && (mysql || clickhouse)) {
+      const to = quoted(i, "`", clickhouse);
       push("quoted", i, to);
       i = to;
     } else if (c === "$" && driver === "postgres") {
@@ -146,6 +157,7 @@ function closed(t: Token): boolean {
 /** The identifier a word / quoted token names (quotes removed, doubled quotes collapsed). */
 export function identName(t: Token): string {
   if (t.kind !== "quoted") return t.text;
+  if (t.value !== undefined) return t.value;
   const q = t.text[0]!;
   const body = t.text.endsWith(q) && t.text.length > 1 ? t.text.slice(1, -1) : t.text.slice(1);
   return body.split(q + q).join(q);
diff --git a/src/features/database/sql/params.ts b/src/features/database/sql/params.ts
index c773c8b8..8c82e78d 100644
--- a/src/features/database/sql/params.ts
+++ b/src/features/database/sql/params.ts
@@ -21,7 +21,18 @@ export function findParams(text: string, driver: DbDriver, numbered = 0): SqlPar
   const toks = lex(text, driver).tokens;
   const out: SqlParam[] = [];
   let positional = numbered;
+  let typedEnd = -1;
   toks.forEach((t, i) => {
+    if (t.from < typedEnd) return;
+    if (driver === "clickhouse" && t.kind === "punct" && t.text === "{") {
+      const end = toks.slice(i + 1).find((candidate) => candidate.kind === "punct" && candidate.text === "}");
+      const name = end ? text.slice(t.from, end.to) : "";
+      if (end && /^\{[A-Za-z_][A-Za-z0-9_]*\s*:\s*[^{}]+\}$/.test(name)) {
+        out.push({ name, from: t.from, to: end.to });
+        typedEnd = end.to;
+        return;
+      }
+    }
     if (t.kind === "param") {
       // MySQL `@var` / `@@var` are session variables.
       if (driver === "mysql" && t.text.startsWith("@")) return;
diff --git a/src/features/database/sql/resolve.ts b/src/features/database/sql/resolve.ts
index 4287f0c2..6c160ee7 100644
--- a/src/features/database/sql/resolve.ts
+++ b/src/features/database/sql/resolve.ts
@@ -7,7 +7,7 @@
  */
 import type { DbCompletion, DbCompletionColumn, DbCompletionTable, DbDriver } from "@/platform/ipc";
 import { analyze, type TableRef } from "./analyze";
-import { CLAUSE_WORDS, DATA_TYPES, functions, isReserved } from "./dialect";
+import { CLAUSE_WORDS, DATA_TYPES, functions, isReserved, nameMatcher } from "./dialect";
 import { identName, lex, type Lexed, type Token } from "./lexer";
 
 export type SqlSymbol =
@@ -49,14 +49,13 @@ const NOT_COLUMNS = new Set(
   ).split(" "),
 );
 
-const eq = (a: string | null | undefined, b: string | null | undefined) =>
-  !!a && !!b && a.toLowerCase() === b.toLowerCase();
-
 export function findTable(
   model: DbCompletion | null,
   schema: string | null,
   name: string,
+  driver: DbDriver = "sqlite",
 ): DbCompletionTable | undefined {
+  const eq = nameMatcher(driver);
   const tables = model?.tables ?? [];
   if (schema) return tables.find((t) => eq(t.schema, schema) && eq(t.name, name));
   return (
@@ -126,6 +125,7 @@ export class SqlResolver {
 
   /** Resolves token `i`; `null` when it is no name (keywords, function names…). */
   resolve(i: number): Resolved | null {
+    const eq = nameMatcher(this.driver);
     const toks = this.lexed.tokens;
     const t = toks[i]!;
     if (!isName(t) || (t.kind === "word" && CLAUSE_WORDS.has(t.upper))) return null;
@@ -166,7 +166,7 @@ export class SqlResolver {
         const schema = qualifier?.at(-1) ?? null;
         const cte = schema ? undefined : a.ctes.find((c) => eq(c.name, name));
         if (cte) return { ...span, symbol: { kind: "cte", name: cte.name, def: { from: cte.from, to: cte.to } } };
-        const table = findTable(this.model, schema, name);
+        const table = findTable(this.model, schema, name, this.driver);
         if (table) return { ...span, symbol: { kind: "table", table } };
         if (!loaded || (a.verb !== "DROP" && a.verb !== "ALTER" && !checked)) return { ...span, symbol: null };
         if (schema && !this.model!.tables.some((x) => eq(x.schema, schema))) return { ...span, symbol: null };
@@ -228,7 +228,7 @@ export class SqlResolver {
       clause !== "other" &&
       clause !== "values" &&
       clause !== "limit" &&
-      !this.outputAliases(i).has(name.toLowerCase());
+      !this.outputAliases(i).has(this.driver === "clickhouse" ? name : name.toLowerCase());
     return judged
       ? { ...span, symbol: null, problem: `Unable to resolve column '${name}'` }
       : { ...span, symbol: null };
@@ -247,15 +247,17 @@ export class SqlResolver {
   }
 
   private schema(name: string, span: Span): Resolved {
+    const eq = nameMatcher(this.driver);
     return { ...span, symbol: this.model?.tables.some((x) => eq(x.schema, name)) ? { kind: "schema", name } : null };
   }
 
   private findRef(refs: readonly TableRef[], schema: string | null, name: string): TableRef | undefined {
+    const eq = nameMatcher(this.driver);
     return refs.find((r) => (r.alias ? eq(r.alias, name) : eq(r.name, name) && (!schema || eq(r.schema, schema))));
   }
 
   private refSymbol(ref: TableRef): SqlSymbol {
-    const table = ref.kind === "table" ? findTable(this.model, ref.schema, ref.name) : undefined;
+    const table = ref.kind === "table" ? findTable(this.model, ref.schema, ref.name, this.driver) : undefined;
     if (ref.alias && ref.aliasAt) return { kind: "alias", name: ref.alias, def: ref.aliasAt, table };
     if (table) return { kind: "table", table };
     return { kind: "cte", name: ref.name, def: { from: ref.from, to: ref.to } };
@@ -264,12 +266,12 @@ export class SqlResolver {
   /** Columns of a FROM item; `null` when unknown (not in the model, `select *` subqueries). */
   private columnsOf(ref: TableRef): Array<{ name: string; column?: DbCompletionColumn }> | null {
     if (ref.columns) return ref.columns.length ? ref.columns.map((name) => ({ name })) : null;
-    const table = findTable(this.model, ref.schema, ref.name);
+    const table = findTable(this.model, ref.schema, ref.name, this.driver);
     return table ? table.columns.map((c) => ({ name: c.name, column: c })) : null;
   }
 
   private columnSymbol(ref: TableRef, col: { name: string; column?: DbCompletionColumn }): SqlSymbol {
-    const table = ref.kind === "table" ? findTable(this.model, ref.schema, ref.name) : undefined;
+    const table = ref.kind === "table" ? findTable(this.model, ref.schema, ref.name, this.driver) : undefined;
     return { kind: "column", name: col.name, column: col.column, table, owner: ref.alias ?? ref.name };
   }
 
@@ -287,7 +289,7 @@ export class SqlResolver {
         prev.kind === "number" ||
         prev.kind === "string"
       )
-        out.add(identName(t).toLowerCase());
+        out.add(this.driver === "clickhouse" ? identName(t) : identName(t).toLowerCase());
     }
     return out;
   }
diff --git a/src/features/database/sql/sql.test.ts b/src/features/database/sql/sql.test.ts
index 907ea5f0..ec745776 100644
--- a/src/features/database/sql/sql.test.ts
+++ b/src/features/database/sql/sql.test.ts
@@ -1,8 +1,9 @@
 import { describe, expect, it } from "vitest";
-import type { DbCompletion } from "@/platform/ipc";
+import type { DbCompletion, DbDriver } from "@/platform/ipc";
 import { analyze, templateContexts, valuesSlot } from "./analyze";
 import { aliasFor, quoteIdent, sqlCandidates, type SqlCandidate } from "./complete";
-import { inLiteral, lex } from "./lexer";
+import { identName, inLiteral, lex } from "./lexer";
+import { DATA_TYPES, statementStarters } from "./dialect";
 import { bindParams, findParams } from "./params";
 import { SqlResolver } from "./resolve";
 
@@ -65,17 +66,13 @@ const model: DbCompletion = {
 };
 
 /** Analysis at the `|` of `sql`. */
-function at(sql: string, driver: "sqlite" | "postgres" | "mysql" = "sqlite") {
+function at(sql: string, driver: DbDriver = "sqlite") {
   const pos = sql.indexOf("|");
   const text = sql.slice(0, pos) + sql.slice(pos + 1);
   return analyze(text, pos, driver);
 }
 
-function complete(
-  sql: string,
-  driver: "sqlite" | "postgres" | "mysql" = "sqlite",
-  m: DbCompletion = model,
-): SqlCandidate[] {
+function complete(sql: string, driver: DbDriver = "sqlite", m: DbCompletion = model): SqlCandidate[] {
   return sqlCandidates({ model: m, analysis: at(sql, driver), driver, sourceName: "shop" }).sort(
     (a, b) => b.boost - a.boost,
   );
@@ -83,6 +80,14 @@ function complete(
 const labels = (c: SqlCandidate[], kind?: string) => c.filter((x) => !kind || x.kind === kind).map((x) => x.label);
 
 describe("lexer", () => {
+  it("reads ClickHouse backticks and escaped quotes without exposing literal parameters", () => {
+    const sql = String.raw`select "a\\b\"c", ` + "`my column`" + String.raw`, 'it\'s ?; text', ?`;
+    const tokens = lex(sql, "clickhouse").tokens;
+    expect(identName(tokens[1]!)).toBe('a\\b"c');
+    expect(tokens.filter((t) => t.kind === "quoted").map(identName)).toEqual(['a\\b"c', "my column"]);
+    expect(findParams(sql, "clickhouse").map((p) => p.name)).toEqual(["?1"]);
+  });
+
   it("skips comments and knows literals", () => {
     const l = lex("select 'a;b', \"Col\" -- c\nfrom t /* x */ where a::int = $1", "postgres");
     expect(l.tokens.map((t) => t.text)).toEqual([
@@ -164,6 +169,42 @@ describe("analysis", () => {
 });
 
 describe("completion candidates", () => {
+  it("keeps ClickHouse schema, table and column names distinct by case", () => {
+    const catalog: DbCompletion = {
+      defaultSchema: "analytics",
+      foreignKeys: [],
+      tables: [
+        { schema: "analytics", name: "Events", kind: "table", columns: [col("UpperOnly")] },
+        { schema: "analytics", name: "events", kind: "table", columns: [col("Value"), col("value")] },
+        { schema: "Analytics", name: "events", kind: "table", columns: [col("OtherSchema")] },
+      ],
+    };
+    expect(labels(complete("select e.| from events e", "clickhouse", catalog))).toEqual(["Value", "value"]);
+    expect(labels(complete("select e.| from Events e", "clickhouse", catalog))).toEqual(["UpperOnly"]);
+    expect(labels(complete("select e.| from Analytics.events e", "clickhouse", catalog))).toEqual(["OtherSchema"]);
+    const problems = (sql: string) => new SqlResolver(sql, "clickhouse", catalog).problems().map((p) => p.message);
+    expect(problems("select Value, value from events")).toEqual([]);
+    expect(problems("select VALUE from events")).toEqual(["Unable to resolve column 'VALUE'"]);
+    expect(problems("select UpperOnly from events")).toEqual(["Unable to resolve column 'UpperOnly'"]);
+    expect(problems("select OtherSchema from Analytics.events")).toEqual([]);
+    expect(problems("select OtherSchema from analytics.events")).toEqual(["Unable to resolve column 'OtherSchema'"]);
+    expect(
+      at("with Events as (select 1 as UpperOnly) select | from events e", "clickhouse").refs.find(
+        (ref) => ref.name === "events",
+      )?.kind,
+    ).toBe("table");
+  });
+
+  it("offers ClickHouse SQL and keeps case-sensitive function and type names", () => {
+    expect(statementStarters("clickhouse")).toEqual(expect.arrayContaining(["SHOW DATABASES", "ALTER TABLE"]));
+    expect(statementStarters("clickhouse")).not.toEqual(expect.arrayContaining(["BEGIN", "SET search_path TO"]));
+    expect(DATA_TYPES.clickhouse).toContain("UInt64");
+    expect(complete("SELECT | FROM users", "clickhouse").find((c) => c.label === "toDateTime")).toMatchObject({
+      snippet: "toDateTime(${})",
+    });
+    expect(quoteIdent('a\\b"c', "clickhouse")).toBe('"a\\\\b\\"c"');
+  });
+
   it("offers statement starters in the user's case", () => {
     expect(labels(complete("|"))).toContain("SELECT");
     expect(labels(complete("select 1; ins|"))).toContain("insert into");
@@ -388,6 +429,15 @@ describe("resolve", () => {
 });
 
 describe("params", () => {
+  it("binds whole ClickHouse typed parameters without treating their types as names", () => {
+    const sql = "select {value:UInt64}, {label: Nullable(String)}, '{skip:String}'";
+    const params = findParams(sql, "clickhouse");
+    expect(params.map((p) => p.name)).toEqual(["{value:UInt64}", "{label: Nullable(String)}"]);
+    expect(bindParams(sql, params, { "{value:UInt64}": "12", "{label: Nullable(String)}": "'test'" })).toBe(
+      "select 12, 'test', '{skip:String}'",
+    );
+  });
+
   it("finds parameters per dialect and binds values", () => {
     const names = (sql: string, driver: "sqlite" | "postgres" | "mysql" = "sqlite", n = 0) =>
       findParams(sql, driver, n).map((p) => p.name);
diff --git a/src/features/database/store.ts b/src/features/database/store.ts
index 654475dd..e5e13317 100644
--- a/src/features/database/store.ts
+++ b/src/features/database/store.ts
@@ -353,7 +353,11 @@ const lastUsed = new Map<string, number>();
 
 /** Options › Transaction control: a manual data source's consoles start in manual commit. */
 function applyConnectDefaults(id: string) {
-  if (sourceById(id)?.options?.transaction === "manual" && !useDatabase.getState().manualCommit.has(id))
+  if (
+    sourceById(id)?.driver !== "clickhouse" &&
+    sourceById(id)?.options?.transaction === "manual" &&
+    !useDatabase.getState().manualCommit.has(id)
+  )
     void setManualCommit(id, true).catch(() => {});
 }
 
@@ -944,6 +948,7 @@ function setPending(id: string, pending: boolean) {
 
 /** Commits or rolls back the open transaction of a manual-commit data source. */
 export async function finishTransaction(id: string, commit: boolean): Promise<boolean> {
+  if (sourceById(id)?.driver === "clickhouse") return false;
   try {
     await call(commands.dbFinishTransaction(id, commit));
     log("statement", commit ? "commit" : "rollback", `${promptOf(id)}>`);
@@ -975,6 +980,7 @@ async function askEndTransaction(source: DataSource): Promise<boolean | null> {
  * whether to commit or roll them back.
  */
 export async function setManualCommit(id: string, manual: boolean): Promise<void> {
+  if (sourceById(id)?.driver === "clickhouse" && manual) return;
   const st = useDatabase.getState();
   if (manual === st.manualCommit.has(id)) return;
   if (!manual && st.pendingTx.has(id)) {
diff --git a/src/features/database/table-editor.test.tsx b/src/features/database/table-editor.test.tsx
new file mode 100644
index 00000000..98c1da0c
--- /dev/null
+++ b/src/features/database/table-editor.test.tsx
@@ -0,0 +1,90 @@
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { DbDriver, DbTablePage } from "@/platform/ipc";
+import { TableEditor } from "./TableEditor";
+import { tableInput } from "./tableInput";
+
+const backend = vi.hoisted(() => ({
+  driver: "clickhouse" as DbDriver,
+  page: vi.fn(),
+  applyEdits: vi.fn(),
+}));
+
+vi.mock("@/platform/ipc", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/platform/ipc")>();
+  return { ...actual, commands: { ...actual.commands, dbTablePage: backend.page, dbApplyEdits: backend.applyEdits } };
+});
+
+vi.mock("./store", () => ({
+  sourceById: () => ({ driver: backend.driver, readOnly: false }),
+  withConnection: (_id: string, run: () => unknown) => run(),
+  openDialog: vi.fn(),
+}));
+
+vi.mock("@tanstack/react-virtual", () => ({
+  useVirtualizer: ({ count }: { count: number }) => ({
+    getTotalSize: () => count * 24,
+    getVirtualItems: () => Array.from({ length: count }, (_, index) => ({ index, start: index * 24, key: index })),
+    scrollToIndex: () => {},
+  }),
+}));
+
+const page: DbTablePage = {
+  result: {
+    statement: "select * from users",
+    columns: [
+      { name: "id", typeName: "UInt64" },
+      { name: "name", typeName: "String" },
+    ],
+    rows: [["1", "Ann"]],
+    affected: null,
+    hasMore: false,
+    elapsedMs: 1,
+    executionMs: 1,
+  },
+  details: {
+    columns: [
+      { name: "id", dataType: "UInt64", primaryKey: true, nullable: false, default: null },
+      { name: "name", dataType: "String", primaryKey: false, nullable: false, default: null },
+    ],
+    indexes: [],
+    foreignKeys: [],
+    triggers: [],
+  },
+  offset: 0,
+};
+
+beforeEach(() => {
+  backend.driver = "clickhouse";
+  backend.page.mockResolvedValue({ status: "ok", data: page });
+  backend.applyEdits.mockClear();
+});
+
+describe("table editor capabilities", () => {
+  it("keeps ClickHouse rows read-only even when metadata marks a primary key", async () => {
+    await act(async () => {
+      render(<TableEditor input={tableInput("source", "default", "users")} />);
+    });
+    const cell = await screen.findByRole("gridcell", { name: "Ann" });
+    fireEvent.doubleClick(cell);
+    expect(screen.queryByRole("textbox", { name: "Edit name" })).toBeNull();
+    expect(screen.queryByRole("button", { name: "Add Row" })).toBeNull();
+    expect(screen.queryByRole("button", { name: "Submit" })).toBeNull();
+    expect(screen.getByText("Use the query console to change ClickHouse data.")).toBeTruthy();
+    fireEvent.mouseDown(cell, { button: 0 });
+    fireEvent.paste(screen.getByRole("grid"), { clipboardData: { getData: () => "Changed" } });
+    expect(screen.getByRole("gridcell", { name: "Ann" })).toBeTruthy();
+    expect(backend.applyEdits).not.toHaveBeenCalled();
+  });
+
+  it("keeps keyed PostgreSQL rows editable", async () => {
+    backend.driver = "postgres";
+    await act(async () => {
+      render(<TableEditor input={tableInput("source", "public", "users")} />);
+    });
+    fireEvent.doubleClick(await screen.findByRole("gridcell", { name: "Ann" }));
+    expect(screen.getByRole("textbox", { name: "Edit name" })).toBeTruthy();
+    expect(screen.getByRole("button", { name: "Add Row" })).toBeTruthy();
+    expect(screen.getByRole("button", { name: "Submit" })).toBeTruthy();
+  });
+});
diff --git a/src/features/database/treeActions.ts b/src/features/database/treeActions.ts
index 629b392c..5a902278 100644
--- a/src/features/database/treeActions.ts
+++ b/src/features/database/treeActions.ts
@@ -8,7 +8,7 @@ import { registerActions, type Action } from "@/platform/actions";
 import { editorService, notifications, showServiceView, toolWindowService } from "@/workbench/contributions";
 import { splitTarget } from "./model";
 import { nodeTarget, objectOf, schemaObjectOf, tableFolder, tableOf, type DbNode } from "./nodes";
-import { canDrop, canRename, reference, scriptSql, type ScriptKind } from "./objects";
+import { canDrop, canModifyTable, canRename, reference, scriptSql, type ScriptKind } from "./objects";
 import {
   DB_TOOL_WINDOW,
   OUTPUT_TAB,
@@ -134,7 +134,15 @@ export async function insertScript(n: DbNode, kind: ScriptKind) {
   if (useDatabase.getState().details[key]?.status !== "ok") await loadDetails(t.id, t.schema, t.table);
   const d = useDatabase.getState().details[key];
   const columns = d?.status === "ok" ? d.value.columns : [];
-  await openConsoleWith(t.id, scriptSql(driverOf(t.id), kind, t.schema, t.table, columns));
+  try {
+    await openConsoleWith(t.id, scriptSql(driverOf(t.id), kind, t.schema, t.table, columns));
+  } catch (e) {
+    notifications().notify({
+      level: "error",
+      title: "Cannot generate the SQL script",
+      body: e instanceof Error ? e.message : String(e),
+    });
+  }
 }
 
 /** SQL Scripts › Run SQL Script…: picks a `.sql` file and runs all its statements. */
@@ -319,7 +327,7 @@ export function registerDatabaseTreeActions(): () => void {
       run: ({ arg }) => {
         const n = nodeFrom(arg);
         const t = n && tableOf(n);
-        if (!t || t.view) return;
+        if (!t || t.view || !canModifyTable(driverOf(t.id))) return;
         openDialog({
           kind: "modifyTable",
           id: t.id,
@@ -351,7 +359,7 @@ export function registerDatabaseTreeActions(): () => void {
       run: ({ arg }) => {
         const n = nodeFrom(arg);
         const t = n && tableOf(n);
-        if (t && !t.view)
+        if (t && !t.view && canModifyTable(driverOf(t.id)))
           openDialog({ kind: "modifyTable", id: t.id, schema: t.schema, table: t.table, addColumn: true });
       },
     }),
@@ -362,7 +370,7 @@ export function registerDatabaseTreeActions(): () => void {
       keywords: ["csv", "tsv", "load data"],
       run: ({ arg }) => {
         const n = nodeFrom(arg);
-        if (n?.kind === "table" && n.table.kind === "table")
+        if (n?.kind === "table" && n.table.kind === "table" && driverOf(n.id) !== "clickhouse")
           openDialog({ kind: "import", id: n.id, schema: n.schema, table: n.table.name });
       },
     }),
diff --git a/src/features/database/treeMenu.ts b/src/features/database/treeMenu.ts
index c28e8bf8..ce7e7a0e 100644
--- a/src/features/database/treeMenu.ts
+++ b/src/features/database/treeMenu.ts
@@ -4,7 +4,7 @@ import { notifications } from "@/workbench/contributions";
 import { fileSourceName, parseSourceUrl } from "./model";
 import { VENDORS, vendorPreset } from "./vendors";
 import { nodeTarget, objectOf, tableOf, type DbNode } from "./nodes";
-import { SCRIPT_LABELS, canDrop, canRename, type ScriptKind } from "./objects";
+import { SCRIPT_LABELS, canDrop, canModifyTable, canRename, type ScriptKind } from "./objects";
 import { connectedTargets, openDialog, openSourceDialog, sourceById, useDatabase } from "./store";
 
 const act = (
@@ -150,9 +150,17 @@ export function nodeMenu(n: DbNode | null): MenuItem[] {
         {
           label: "New",
           icon: "plus",
-          submenu: [newConsole, sep, act("db.newColumn", n, { disabled: view }), act("db.newTable", n)],
+          submenu: [
+            newConsole,
+            sep,
+            act("db.newColumn", n, { disabled: view || !canModifyTable(driver) }),
+            act("db.newTable", n),
+          ],
         },
-        act("db.modifyTable", n, { label: column ? "Modify Column…" : "Modify Table…", disabled: view }),
+        act("db.modifyTable", n, {
+          label: column ? "Modify Column…" : "Modify Table…",
+          disabled: view || !canModifyTable(driver),
+        }),
         { label: "Copy/Paste", submenu: [copyRef] },
         act("db.editData", n),
         refresh,
@@ -165,7 +173,7 @@ export function nodeMenu(n: DbNode | null): MenuItem[] {
         sqlScripts(n, true),
         ...(n.kind === "table" && !view
           ? [
-              { label: "Import/Export", submenu: [act("db.importData", n)] },
+              { label: "Import/Export", submenu: [act("db.importData", n, { disabled: driver === "clickhouse" })] },
               { label: "Object Actions", submenu: [act("db.truncate", n)] },
             ]
           : []),
@@ -203,7 +211,7 @@ export function nodeMenu(n: DbNode | null): MenuItem[] {
     case "key":
       return [
         ...(n.kind === "group" && n.group === "columns"
-          ? [{ label: "New", icon: "plus", submenu: [act("db.newColumn", n)] }]
+          ? [{ label: "New", icon: "plus", submenu: [act("db.newColumn", n, { disabled: !canModifyTable(driver) })] }]
           : []),
         refresh,
         sep,
diff --git a/src/features/database/vendors.ts b/src/features/database/vendors.ts
index a5cd56af..b92ac83f 100644
--- a/src/features/database/vendors.ts
+++ b/src/features/database/vendors.ts
@@ -28,6 +28,14 @@ export const VENDORS: readonly DbVendor[] = [
     scheme: "redshift",
     ssl: "require",
   },
+  {
+    id: "clickhouse",
+    label: "ClickHouse",
+    driver: "clickhouse",
+    port: 8123,
+    icon: "db-clickhouse",
+    scheme: "clickhouse",
+  },
   {
     id: "cockroachdb",
     label: "CockroachDB",
@@ -101,11 +109,19 @@ export const vendorById = (id: string): DbVendor | undefined => BY_ID.get(id);
 export function vendorPreset(v: DbVendor): Partial<DataSource> {
   const preset: Partial<DataSource> = { driver: v.driver, vendor: v.id === v.driver ? "" : v.id, port: v.port };
   if (v.ssl) preset.ssl = v.ssl;
+  if (v.driver === "clickhouse") {
+    preset.user = "default";
+    preset.database = "default";
+    preset.ssl = "disable";
+  }
   return preset;
 }
 
 /** URL schemes (besides the JDBC ones) that name a type. */
 const SCHEMES: Record<string, string> = {
+  clickhouse: "clickhouse",
+  http: "clickhouse",
+  https: "clickhouse",
   postgres: "postgres",
   postgresql: "postgres",
   pgsql: "postgres",
@@ -136,5 +152,9 @@ export function sourceUrl(s: DataSource): string {
   const host = bracketed(s.host?.trim() || "localhost");
   const port = s.port ?? v.port;
   const db = s.database ? `/${encodeURIComponent(s.database)}` : "";
+  if (v.driver === "clickhouse") {
+    const secure = s.ssl != null && s.ssl !== "disable" && s.ssl !== "prefer";
+    return `${secure ? "https" : "http"}://${host}:${s.port ?? (secure ? 8443 : 8123)}${db}`;
+  }
   return `jdbc:${v.scheme}://${host}${port ? `:${port}` : ""}${db}`;
 }
diff --git a/src/features/debugger/__tests__/java.test.ts b/src/features/debugger/__tests__/java.test.ts
index 1bc17d92..a4a16b2a 100644
--- a/src/features/debugger/__tests__/java.test.ts
+++ b/src/features/debugger/__tests__/java.test.ts
@@ -54,7 +54,7 @@ const { isJavaDebuggable, javaAttachConfig, javaLaunchConfig } = await import(".
 const app: RunConfig = {
   id: "application:a.Main",
   name: "Main",
-  kind: "spring-boot",
+  kind: "application",
   command: "java",
   args: ["-Xmx1g", "-cp", "${classpath}", "a.Main", "--port", "8081 x"],
   cwd: "api",
@@ -93,6 +93,17 @@ describe("Java debugging (java-debug through jdtls)", () => {
     });
   });
 
+  it("debugs Spring Boot with coloured console output, as Run does", async () => {
+    const boot = { ...app, kind: "spring-boot" };
+    expect(JSON.parse((await javaLaunchConfig(boot, "/p")).extraJson!).vmArgs).toBe(
+      "-Dspring.output.ansi.enabled=always -Xmx1g",
+    );
+    const own = { ...boot, args: ["-Dspring.output.ansi.enabled=never", ...app.args] };
+    expect(JSON.parse((await javaLaunchConfig(own, "/p")).extraJson!).vmArgs).toBe(
+      "-Dspring.output.ansi.enabled=never -Xmx1g",
+    );
+  });
+
   it("passes the configuration's VM options to java-debug's vmArgs, before the main class", async () => {
     const args = [
       "-Ddemo.flag=on",
diff --git a/src/features/debugger/__tests__/launch.test.ts b/src/features/debugger/__tests__/launch.test.ts
index d52afa22..baa4e8c9 100644
--- a/src/features/debugger/__tests__/launch.test.ts
+++ b/src/features/debugger/__tests__/launch.test.ts
@@ -79,6 +79,27 @@ describe("run config → launch config", () => {
     expect(extra(globalPytest).python).toBe("python3");
   });
 
+  it("debugpy: uv / poetry run the debuggee in the project's environment", () => {
+    const debug = (command: string, args: string[]) =>
+      launchConfigFor(rc({ kind: "python", command, args, debugAdapter: "debugpy" }), "/p")!;
+
+    const script = debug("uv", ["run", "python", "main.py", "-v"]);
+    expect(script.program).toBe("/p/main.py");
+    expect(script.args).toEqual(["-v"]);
+    expect(extra(script)).toMatchObject({ python: ["uv", "run", "python"], debugLauncherPython: "python3" });
+    expect(extra(script).module).toBeUndefined();
+
+    const mod = debug("poetry", ["run", "python3", "-m", "app"]);
+    expect(extra(mod)).toMatchObject({ module: "app", python: ["poetry", "run", "python3"] });
+
+    const tool = debug("uv", ["run", "pytest", "-x"]);
+    expect(extra(tool)).toMatchObject({ module: "pytest", python: ["uv", "run", "python"] });
+    expect(tool.args).toEqual(["-x"]);
+
+    const django = debug("pdm", ["run", "python", "manage.py", "runserver"]);
+    expect(extra(django)).toMatchObject({ django: true, python: ["pdm", "run", "python"] });
+  });
+
   it("js-debug: npm scripts run through the package manager, node scripts directly", () => {
     const npm = launchConfigFor(
       rc({ kind: "npm", command: "pnpm", args: ["run", "dev"], cwd: "web", debugAdapter: "js-debug" }),
diff --git a/src/features/debugger/__tests__/relisten.test.ts b/src/features/debugger/__tests__/relisten.test.ts
new file mode 100644
index 00000000..a301eaca
--- /dev/null
+++ b/src/features/debugger/__tests__/relisten.test.ts
@@ -0,0 +1,81 @@
+import { beforeEach, expect, it, vi } from "vitest";
+import { useProject } from "@/platform/project";
+import type { LaunchConfig } from "@/platform/ipc";
+import {
+  provideNotificationService,
+  provideToolWindowService,
+  type ToolWindowService,
+} from "@/workbench/contributions";
+import { adoptSession, handleDebugEvent, startSession, useDebug } from "../state";
+
+const ipc = vi.hoisted(() => ({
+  debugStart: vi.fn(),
+}));
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  return { ...real, isTauri: () => true, commands: { ...real.commands, ...ipc } };
+});
+
+const attach: LaunchConfig = {
+  name: "AppKt",
+  adapter: "kotlin-debug-adapter",
+  request: "attach",
+  program: null,
+  args: [],
+  cwd: "/p",
+  env: {},
+  extraJson: JSON.stringify({ hostName: "127.0.0.1", port: 35549 }),
+};
+const notify = vi.fn();
+
+beforeEach(() => {
+  useDebug.setState({ sessions: {}, active: null, console: {} });
+  useProject.setState({ project: { root: "/p" } as never });
+  provideNotificationService({ notify });
+  provideToolWindowService({ show: vi.fn() } as unknown as ToolWindowService);
+  vi.clearAllMocks();
+  // The adapter's session announces itself, then the attach fails: the JVM is gone.
+  ipc.debugStart.mockImplementation(async () => {
+    handleDebugEvent(43, { kind: "started", name: "AppKt", adapter: "kotlin-debug-adapter", parent: null });
+    return { status: "error", error: { kind: "internal", message: "attach failed: Internal error.", data: null } };
+  });
+});
+
+/** A finished session that debugged a JVM of run 7. */
+function finished(endedAgoMs: number) {
+  adoptSession(1, { name: "AppKt", process: 7 });
+  handleDebugEvent(1, { kind: "terminated" });
+  useDebug.setState((s) => ({
+    sessions: { ...s.sessions, 1: { ...s.sessions[1]!, endedAt: Date.now() - endedAgoMs } },
+  }));
+}
+
+it("ignores a failed attach to the port a JVM announced as its debugger detached", async () => {
+  finished(100);
+  expect(await startSession(attach, { process: 7, rerunnable: false })).toBeNull();
+  expect(notify).not.toHaveBeenCalled();
+  const { sessions, active } = useDebug.getState();
+  expect(Object.keys(sessions)).toEqual(["1"]);
+  expect(active).toBe(1);
+});
+
+it("reports a failed attach to a JVM of another run, or long after the last session ended", async () => {
+  finished(100);
+  await startSession(attach, { process: 8, rerunnable: false });
+  expect(notify).toHaveBeenCalledWith(expect.objectContaining({ title: "Cannot start debugger for AppKt" }));
+
+  notify.mockClear();
+  useDebug.setState({ sessions: {}, active: null, console: {} });
+  finished(60_000);
+  await startSession(attach, { process: 7, rerunnable: false });
+  expect(notify).toHaveBeenCalledWith(expect.objectContaining({ title: "Cannot start debugger for AppKt" }));
+  expect(useDebug.getState().sessions[1]).toBeUndefined();
+});
+
+it("replaces the finished session once an attach soon after it succeeds", async () => {
+  finished(100);
+  ipc.debugStart.mockResolvedValueOnce({ status: "ok", data: 44 });
+  expect(await startSession(attach, { process: 7, rerunnable: false })).toBe(44);
+  expect(Object.keys(useDebug.getState().sessions)).toEqual(["44"]);
+  expect(notify).not.toHaveBeenCalled();
+});
diff --git a/src/features/debugger/__tests__/toolWindow.test.tsx b/src/features/debugger/__tests__/toolWindow.test.tsx
index 415ccdea..21448416 100644
--- a/src/features/debugger/__tests__/toolWindow.test.tsx
+++ b/src/features/debugger/__tests__/toolWindow.test.tsx
@@ -13,6 +13,13 @@ vi.mock("@/platform/ipc", async (importOriginal) => {
         ok([
           { name: "count", value: "3", typeName: "int", variablesReference: 0, evaluateName: "count" },
           { name: "label", value: "'hi'", typeName: "str", variablesReference: 0, evaluateName: "label" },
+          {
+            name: "bar",
+            value: "high    7.86\nlow     7.66\nName: 772, dtype: object",
+            typeName: "Series",
+            variablesReference: 0,
+            evaluateName: "bar",
+          },
         ]),
     },
   };
@@ -72,5 +79,7 @@ describe("debug tool window", () => {
     expect(screen.getByPlaceholderText("Evaluate expression (↩) or add a watch (⇧⌘↩)")).toBeTruthy();
     expect(await screen.findByText("{int}")).toBeTruthy();
     expect(screen.getByText("'hi'")).toBeTruthy();
+    // A multi-line rendering stays on its row.
+    expect(screen.getByText(/dtype: object/).textContent).toBe("high    7.86 low     7.66 Name: 772, dtype: object");
   });
 });
diff --git a/src/features/debugger/java.ts b/src/features/debugger/java.ts
index 33cd3d64..8420f841 100644
--- a/src/features/debugger/java.ts
+++ b/src/features/debugger/java.ts
@@ -7,6 +7,7 @@
 import { executeAction } from "@/platform/actions";
 import { call, commands, IpcError, nextRequestId, type LaunchConfig, type RunConfig } from "@/platform/ipc";
 import {
+  consoleVmArgs,
   formatCompileErrors,
   isJvmApplication,
   joinJavaArgs,
@@ -117,7 +118,7 @@ export async function javaLaunchConfig(
         classPaths,
         modulePaths: info.modulePaths,
         javaExec: resolved.command,
-        vmArguments: parsed.vmArgs,
+        vmArguments: [...consoleVmArgs(rc), ...parsed.vmArgs],
         programArgs: parsed.programArgs,
       }),
     };
@@ -139,7 +140,7 @@ export async function javaLaunchConfig(
       classPaths,
       modulePaths: info.modulePaths,
       javaExec: resolved.command === "java" ? undefined : resolved.command,
-      vmArgs: joinJavaArgs(parsed.vmArgs),
+      vmArgs: joinJavaArgs([...consoleVmArgs(rc), ...parsed.vmArgs]),
       args: joinJavaArgs(parsed.programArgs),
       // java-debug spawns the JVM itself: it must shorten a classpath too long for the OS the same way Run does.
       shortenCommandLine: info.shortenCommandLine ?? "none",
diff --git a/src/features/debugger/launch.ts b/src/features/debugger/launch.ts
index 86b039a6..a7b66774 100644
--- a/src/features/debugger/launch.ts
+++ b/src/features/debugger/launch.ts
@@ -58,15 +58,20 @@ function cargoLaunch(rc: RunConfig, cwd: string, adapter: string): LaunchConfig
   };
 }
 
+const PYTHON_NAME = /^python[\d.]*(\.exe)?$/;
+
 function pythonFor(rc: RunConfig, cwd: string): string {
   const cmd = rc.command;
   const name = cmd.split("/").pop() ?? cmd;
-  if (/^python[\d.]*(\.exe)?$/.test(name)) return resolveCommand(cmd, cwd);
+  if (PYTHON_NAME.test(name)) return resolveCommand(cmd, cwd);
   // A venv tool such as `.venv/bin/pytest`: use the interpreter next to it.
   if (cmd.includes("/")) return resolveCommand(cmd.slice(0, cmd.lastIndexOf("/") + 1) + "python", cwd);
   return "python3";
 }
 
+/** Project managers whose `run` executes in the project's environment (`uv run python …`). */
+const PYTHON_RUNNERS = new Set(["uv", "poetry", "pdm", "pipenv", "hatch", "rye"]);
+
 function debugpyLaunch(rc: RunConfig, cwd: string): LaunchConfig {
   const out = base(rc, "debugpy", cwd);
   const dbg = workflowSettings().debugger;
@@ -78,19 +83,29 @@ function debugpyLaunch(rc: RunConfig, cwd: string): LaunchConfig {
     redirectOutput: true,
   };
   if (dbg.python.gevent) extra.gevent = true;
-  const name = rc.command.split("/").pop() ?? rc.command;
-  const isPython = /^python[\d.]*(\.exe)?$/.test(name);
-  if (!isPython) {
+  const name = (rc.command.split("/").pop() ?? rc.command).replace(/\.exe$/, "");
+  let args = rc.args;
+  let tool: string | null = PYTHON_NAME.test(name) ? null : name;
+  if (PYTHON_RUNNERS.has(name) && args[0] === "run" && args[1]) {
+    // The debuggee runs through the manager (`uv run python <debugpy> …`) to get the project's
+    // environment; the adapter and its launcher need a plain interpreter.
+    const python = PYTHON_NAME.test(args[1]) ? args[1] : "python";
+    extra.python = [resolveCommand(rc.command, cwd), "run", python];
+    extra.debugLauncherPython = "python3";
+    tool = PYTHON_NAME.test(args[1]) ? null : args[1];
+    args = args.slice(2);
+  }
+  if (tool) {
     // A console script (`pytest`, `uvicorn`, …): run it as a module.
-    extra.module = name.replace(/\.exe$/, "");
-    out.args = [...rc.args];
-  } else if (rc.args[0] === "-m" && rc.args[1]) {
-    extra.module = rc.args[1];
-    out.args = rc.args.slice(2);
-  } else if (rc.args[0]) {
-    out.program = join(cwd, rc.args[0]);
-    out.args = rc.args.slice(1);
-    if (rc.args[0].endsWith("manage.py")) extra.django = true;
+    extra.module = tool;
+    out.args = [...args];
+  } else if (args[0] === "-m" && args[1]) {
+    extra.module = args[1];
+    out.args = args.slice(2);
+  } else if (args[0]) {
+    out.program = join(cwd, args[0]);
+    out.args = args.slice(1);
+    if (args[0].endsWith("manage.py")) extra.django = true;
   }
   out.extraJson = JSON.stringify(extra);
   return out;
diff --git a/src/features/debugger/state.ts b/src/features/debugger/state.ts
index e910ff0c..130e533d 100644
--- a/src/features/debugger/state.ts
+++ b/src/features/debugger/state.ts
@@ -38,6 +38,8 @@ export interface DebugSession {
   /** Originating configuration, retained for toolbar targeting and prepared debug reruns. */
   runConfig?: RunConfig;
   startedAt?: number;
+  /** When it terminated. */
+  endedAt?: number;
   adapter: string;
   parent: DebugSessionId | null;
   /** Launch configuration (root sessions), used by Rerun. */
@@ -223,16 +225,58 @@ function ownSession(id: DebugSessionId, event: DebugEvent): DebugSession | null
   return event.kind === "started" ? adoptSession(id, { name: event.name, adapter: event.adapter }) : adoptSession(id);
 }
 
-/** A start finished (`id` on success): sessions no start claimed are failed starts' leftovers. */
-function settleStart(id: DebugSessionId | null) {
+/**
+ * A start finished (`id` on success): sessions no start claimed are failed starts' leftovers,
+ * kept as terminated or, with `discard`, removed.
+ */
+function settleStart(id: DebugSessionId | null, discard = false) {
   pendingStarts = Math.max(0, pendingStarts - 1);
   if (id != null) provisional.delete(id);
   if (pendingStarts > 0) return;
   const leftovers = [...provisional];
   provisional.clear();
+  if (discard) {
+    useDebug.setState((st) => {
+      const sessions = { ...st.sessions };
+      const console = { ...st.console };
+      for (const s of leftovers) {
+        delete sessions[s];
+        delete console[s];
+        ansiStreams.delete(s);
+      }
+      return { sessions, console, active: st.active != null && sessions[st.active] ? st.active : null };
+    });
+    publishContext();
+    return;
+  }
   for (const s of leftovers) if (isLive(useDebug.getState().sessions[s])) markTerminated(s);
 }
 
+/** Drops finished sessions; running ones stay (multiple concurrent sessions are fine). */
+function dropFinished() {
+  useDebug.setState((s) => {
+    const sessions = Object.fromEntries(Object.entries(s.sessions).filter(([, v]) => isLive(v)));
+    const consoleLines = Object.fromEntries(Object.entries(s.console).filter(([k]) => sessions[+k]));
+    for (const id of ansiStreams.keys()) if (!sessions[id]) ansiStreams.delete(id);
+    return { sessions, console: consoleLines, active: s.active != null && sessions[s.active] ? s.active : null };
+  });
+  publishContext();
+}
+
+/**
+ * A JDWP agent in server mode listens again, on a new port, when its debugger detaches; a
+ * debugger that detaches as the JVM exits leaves an announcement of a JVM about to be gone.
+ * An attach to `process` this soon after a session on it ended may be to such a JVM.
+ */
+const RELISTEN_MS = 3000;
+function justDetached(process: RunId | null | undefined): boolean {
+  if (process == null) return false;
+  const now = Date.now();
+  return Object.values(useDebug.getState().sessions).some(
+    (s) => s.process === process && s.status === "terminated" && s.endedAt != null && now - s.endedAt < RELISTEN_MS,
+  );
+}
+
 export function publishContext() {
   const s = activeSession();
   const retained = Object.values(useDebug.getState().sessions);
@@ -460,14 +504,10 @@ export async function startSession(
     notifications().notify({ group: "run", level: "warning", title: "Debugging needs the desktop app" });
     return null;
   }
-  // Drop finished sessions; keep running ones (multiple concurrent sessions are fine).
-  useDebug.setState((s) => {
-    const sessions = Object.fromEntries(Object.entries(s.sessions).filter(([, v]) => isLive(v)));
-    const consoleLines = Object.fromEntries(Object.entries(s.console).filter(([k]) => sessions[+k]));
-    for (const id of ansiStreams.keys()) if (!sessions[id]) ansiStreams.delete(id);
-    return { sessions, console: consoleLines, active: s.active != null && sessions[s.active] ? s.active : null };
-  });
-  publishContext();
+  // Attaching to a JVM that may be gone: the finished session stays until the attach succeeds.
+  const afterDetach = justDetached(options.process);
+  const previousActive = useDebug.getState().active;
+  if (!afterDetach) dropFinished();
   try {
     if (workflowSettings().run.showOnStart) toolWindowService().show("debug");
   } catch {
@@ -482,6 +522,7 @@ export async function startSession(
     const id = await call(commands.debugStart(launch));
     console.info("Debug adapter started", { name: launch.name, ms: performance.now() - adapterStarted });
     owned.add(id);
+    if (afterDetach) dropFinished();
     if (options.preparation?.signal.aborted) {
       await call(commands.debugStop(id)).catch(() => undefined);
       settleStart(id);
@@ -526,7 +567,16 @@ export async function startSession(
     void syncSpecial();
     return id;
   } catch (e) {
-    settleStart(null);
+    settleStart(null, afterDetach);
+    if (afterDetach) {
+      // The JVM that announced the port ended as its previous debugger detached.
+      console.info("Debugger not attached: the JVM is gone", { name: launch.name, error: e });
+      const { sessions, active } = useDebug.getState();
+      if (active == null && previousActive != null && sessions[previousActive])
+        useDebug.setState({ active: previousActive });
+      publishContext();
+      return null;
+    }
     if (options.preparation?.signal.aborted || isCancelled(e)) return null;
     if (options.preparation)
       appendConsole(options.preparation.id, "stderr", (e instanceof Error ? e.message : String(e)) + "\n");
@@ -612,7 +662,7 @@ export function sessionSupports(cap: keyof DebugCapabilities, s: DebugSession |
 }
 
 function markTerminated(id: DebugSessionId) {
-  patch(id, { status: "terminated", frames: [], selectedFrame: null, stoppedThread: null });
+  patch(id, { status: "terminated", endedAt: Date.now(), frames: [], selectedFrame: null, stoppedThread: null });
   const st = useDebug.getState();
   if (st.active === id) {
     // Prefer another live session (e.g. the parent of a finished child).
diff --git a/src/features/debugger/ui/DebugConsole.tsx b/src/features/debugger/ui/DebugConsole.tsx
index 083735fa..3b98217b 100644
--- a/src/features/debugger/ui/DebugConsole.tsx
+++ b/src/features/debugger/ui/DebugConsole.tsx
@@ -4,6 +4,7 @@ import { useVirtualizer } from "@tanstack/react-virtual";
 import { copySelectionOnKeyDown } from "@/ui/selectableText";
 import { EmptyState, IconButton, showContextMenu, T, type MenuItem } from "@/ui";
 import { tx } from "@/platform/i18n";
+import { useWorkflowSettings } from "@/platform/workflowSettings";
 import { spanStyle } from "@/ui/ansi";
 import ansi from "@/ui/ansi.module.css";
 import { appendConsole, clearConsole, evaluate, isLive, useDebug, type DebugSession } from "../state";
@@ -23,7 +24,14 @@ export function DebugServiceConsole({ sessionId }: { sessionId: number }) {
 export function DebugConsole({ session, interactive = true }: { session: DebugSession; interactive?: boolean }) {
   const lines = useDebug((s) => s.console[session.id]);
   const scroller = useRef<HTMLDivElement>(null);
+  // Scroll to End: follows new output; scrolling up turns it off, back to the end turns it on.
+  const [follow, setFollow] = useState(true);
   const stick = useRef(true);
+  stick.current = follow;
+  // Settings › Console › Use soft wraps is the default; the toggle overrides it for this console.
+  const defaultWrap = useWorkflowSettings((s) => s.console.softWrap);
+  const [wrapOverride, setWrapOverride] = useState<boolean | null>(null);
+  const softWrap = wrapOverride ?? defaultWrap;
   const programmatic = useRef(false);
   const [input, setInput] = useState("");
   const history = useRef<string[]>(readHistory("console"));
@@ -39,14 +47,21 @@ export function DebugConsole({ session, interactive = true }: { session: DebugSe
     getItemKey: (i) => lines?.[i]?.id ?? i,
   });
 
+  // Wrapping changes every row's height; the end is pinned again below.
+  useLayoutEffect(() => virtualizer.measure?.(), [softWrap, virtualizer]);
+
   useLayoutEffect(() => {
     const el = scroller.current;
     if (!el || !stick.current || !lines?.length) return;
     programmatic.current = true;
     virtualizer.scrollToIndex(lines.length - 1, { align: "end" });
     el.scrollTop = el.scrollHeight;
-    requestAnimationFrame(() => (programmatic.current = false));
-  }, [lines, virtualizer]);
+    // Rows measured after this frame grow the content: pin the end once more.
+    requestAnimationFrame(() => {
+      if (stick.current) el.scrollTop = el.scrollHeight;
+      requestAnimationFrame(() => (programmatic.current = false));
+    });
+  }, [lines, virtualizer, follow, softWrap]);
 
   const submit = async () => {
     const e = input.trim();
@@ -101,11 +116,12 @@ export function DebugConsole({ session, interactive = true }: { session: DebugSe
     <div className={styles.console}>
       <div
         ref={scroller}
-        className={clsx(styles.consoleOutput, ansi.palette)}
+        className={clsx(styles.consoleOutput, ansi.palette, !softWrap && styles.noWrap)}
         onScroll={(e) => {
           if (programmatic.current) return;
           const el = e.currentTarget;
-          stick.current = el.scrollHeight - el.scrollTop - el.clientHeight < 24;
+          const atEnd = el.scrollHeight - el.scrollTop - el.clientHeight < 24;
+          if (atEnd !== stick.current) setFollow(atEnd);
         }}
         onContextMenu={(e) => {
           e.preventDefault();
@@ -170,6 +186,22 @@ export function DebugConsole({ session, interactive = true }: { session: DebugSe
             {completion.popup}
           </>
         )}
+        <IconButton
+          icon="arrow-down"
+          title="Scroll to End"
+          size="small"
+          iconSize={12}
+          pressed={follow}
+          onClick={() => setFollow((v) => !v)}
+        />
+        <IconButton
+          icon="soft-wrap"
+          title="Soft-Wrap"
+          size="small"
+          iconSize={12}
+          pressed={softWrap}
+          onClick={() => setWrapOverride(!softWrap)}
+        />
         <IconButton
           icon="trash"
           title="Clear Console"
diff --git a/src/features/debugger/ui/DebugToolWindow.module.css b/src/features/debugger/ui/DebugToolWindow.module.css
index a5e878be..ed9bebbb 100644
--- a/src/features/debugger/ui/DebugToolWindow.module.css
+++ b/src/features/debugger/ui/DebugToolWindow.module.css
@@ -238,7 +238,7 @@
   white-space: pre-wrap;
   word-break: break-word;
   -webkit-user-select: text;
-  cursor: text;
+  cursor: default;
   -webkit-user-select: text;
   user-select: text;
   outline: none;
@@ -248,6 +248,13 @@
 .consoleInner {
   position: relative;
   width: 100%;
+  cursor: text;
+}
+
+/* Soft-Wrap off: long lines scroll horizontally. */
+.noWrap {
+  white-space: pre;
+  word-break: normal;
 }
 
 .out {
diff --git a/src/features/debugger/ui/VariablesView.tsx b/src/features/debugger/ui/VariablesView.tsx
index b073a2b4..ae54b1ca 100644
--- a/src/features/debugger/ui/VariablesView.tsx
+++ b/src/features/debugger/ui/VariablesView.tsx
@@ -9,7 +9,7 @@ import { addFieldWatchpoint } from "../breakpoints/special";
 import { methodAt } from "../breakpoints/symbols";
 import { activeSession, addWatch, removeWatch, revealFrame, sessionSupports, setVariableValue } from "../state";
 import { blurDebugView, focusDebugView } from "./focusedView";
-import { classifyValue, sortVariables } from "../values";
+import { classifyValue, oneLine, sortVariables } from "../values";
 import { workflowSettings } from "@/platform/workflowSettings";
 import styles from "./VariablesView.module.css";
 
@@ -428,11 +428,11 @@ function VarRow({ node, changed }: { node: VarNode; changed: boolean }) {
       </span>
       <span className={styles.eq}>=</span>
       {node.error ? (
-        <span className={styles.error}>{node.error}</span>
+        <span className={styles.error}>{oneLine(node.error)}</span>
       ) : (
         <>
           {node.typeName && <span className={styles.type}>{`{${node.typeName}}`}</span>}
-          <span className={clsx(styles.value, kind && styles[kind])}>{node.value}</span>
+          <span className={clsx(styles.value, kind && styles[kind])}>{oneLine(node.value)}</span>
         </>
       )}
     </span>
diff --git a/src/features/debugger/values.ts b/src/features/debugger/values.ts
index 86d02c8f..d983a87f 100644
--- a/src/features/debugger/values.ts
+++ b/src/features/debugger/values.ts
@@ -33,9 +33,14 @@ export function classifyValue(value: string, typeName?: string | null): ValueKin
   return "plain";
 }
 
+/** The value on one line: a multi-line rendering (a pandas Series, a pretty-printed object) joined with spaces. */
+export function oneLine(value: string): string {
+  return value.replace(/\s*\n\s*/g, " ");
+}
+
 /** Single-line, length-limited value for inline display. */
 export function inlineValue(value: string, max = 60): string {
-  const flat = value.replace(/\s*\n\s*/g, " ");
+  const flat = oneLine(value);
   return flat.length > max ? flat.slice(0, max - 1) + "…" : flat;
 }
 
diff --git a/src/features/deployment/Deployment.module.css b/src/features/deployment/Deployment.module.css
index 6b52c57c..42be83c7 100644
--- a/src/features/deployment/Deployment.module.css
+++ b/src/features/deployment/Deployment.module.css
@@ -80,21 +80,136 @@
 }
 
 /* Sync dialog */
+.nativeWindow {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  min-width: 0;
+  overflow: hidden;
+  background: var(--bg-dialog, var(--bg-elev));
+  color: var(--fg);
+}
+.nativeBody {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+}
+.nativeFooter {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 10px 16px;
+  flex: none;
+}
+.syncWindow {
+  height: calc(100vh - 48px);
+}
+.syncWindow [data-dialog-body] {
+  overflow: hidden;
+}
 .sync {
   display: flex;
   flex-direction: column;
   gap: 8px;
-  min-height: 360px;
+  height: 100%;
+  min-height: 0;
+  padding: 8px 10px 0;
+}
+.comparisonToolbar {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  flex: none;
+  gap: 4px;
+}
+.separator {
+  height: 20px;
+  border-left: 1px solid var(--border);
+  margin: 0 5px;
+}
+.filterButton {
+  width: 28px;
+  height: 26px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: var(--radius-control, 4px);
+  color: var(--fg-muted);
+  background: transparent;
+  font-size: 19px;
+  cursor: pointer;
+}
+.filterButton[aria-pressed="true"] {
+  background: var(--bg-tree-hover);
+  border-color: var(--border);
+  color: var(--accent);
+}
+.filterButton:focus-visible {
+  outline: 2px solid var(--focus-ring);
+}
+.compareBy,
+.fileFilter {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  white-space: nowrap;
+}
+.compareBy select {
+  height: 26px;
+  color: var(--fg);
+  background: var(--bg-input, var(--bg-island));
+  border: 1px solid var(--border);
+  border-radius: var(--radius-control, 4px);
+  font: inherit;
+}
+.fileFilter {
+  margin-left: auto;
+  width: clamp(180px, 30%, 480px);
+}
+.fileFilter > input {
+  width: 100%;
+  min-width: 0;
+}
+.comparisonRoots {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 18px;
+  flex: none;
+}
+.comparisonRoots > span {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-control, 4px);
+  padding: 5px 8px;
+}
+.comparisonRoots > span > span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.comparisonSplit {
+  flex: 1;
+  min-height: 0;
+}
+.fileList {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  min-height: 0;
 }
 .syncTableHost {
   flex: 1;
-  max-height: 460px;
+  min-height: 0;
   overflow: auto;
   border: 1px solid var(--border);
   border-radius: var(--radius-control, 4px);
 }
 .syncTable {
   width: 100%;
+  min-width: 900px;
   border-collapse: collapse;
   table-layout: fixed;
 }
@@ -123,17 +238,28 @@
 .syncTable tbody tr:hover {
   background: var(--bg-tree-hover);
 }
-.choiceCol {
-  width: 128px;
+.syncTable tbody tr[aria-selected="true"] {
+  background: var(--bg-tree-selected, var(--accent-soft));
+}
+.fileName {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.operationCol {
+  width: 108px;
+}
+.operationCell {
+  border-left: 1px solid var(--border);
+  border-right: 1px solid var(--border);
 }
 .sizeCol {
   width: 80px;
 }
 .timeCol {
-  width: 128px;
-}
-.statusCol {
-  width: 112px;
+  width: 148px;
 }
 .num {
   text-align: right;
@@ -169,6 +295,28 @@
 .status-same {
   color: var(--fg-subtle);
 }
+.listHint {
+  flex: none;
+  color: var(--fg-subtle);
+  font-size: var(--fs-small);
+  padding: 3px 6px;
+  text-align: right;
+}
+.preview {
+  height: 100%;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  border: 1px solid var(--border);
+}
+.previewMessage {
+  padding: 18px;
+  display: flex;
+  align-items: flex-start;
+  flex-direction: column;
+  gap: 12px;
+}
 
 /* SSH password prompt */
 .secret {
diff --git a/src/features/deployment/Dialogs.test.tsx b/src/features/deployment/Dialogs.test.tsx
index 15ce2319..372e6eb7 100644
--- a/src/features/deployment/Dialogs.test.tsx
+++ b/src/features/deployment/Dialogs.test.tsx
@@ -1,18 +1,27 @@
-import { afterEach, describe, expect, it } from "vitest";
-import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { act, cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
 import type { SyncEntry } from "@/platform/ipc";
+import { useProject } from "@/platform/project";
+import { DEFAULT_DEPLOYMENT_SERVER } from "@/platform/remoteSettings";
+
+const mocks = vi.hoisted(() => ({ equal: vi.fn(), sync: vi.fn(), refresh: vi.fn() }));
+vi.mock("./comparison", () => ({ createDeploymentComparison: () => ({ equal: mocks.equal, preview: vi.fn() }) }));
+vi.mock("./SyncPreview", () => ({
+  SyncPreview: ({ entry }: { entry: SyncEntry | null }) => <div data-testid="preview">{entry?.remotePath}</div>,
+}));
+vi.mock("./actions", () => ({ closeSync: vi.fn(), runSync: mocks.sync, openSync: mocks.refresh }));
 import { DeploymentDialogs } from "./Dialogs";
 import { initialSyncChoices } from "./model";
 import { useDeployment } from "./store";
+import { SyncDialog } from "./SyncDialog";
 
 const entry = (path: string, status: SyncEntry["status"]): SyncEntry => ({
   path,
   remotePath: `/srv/app/${path}`,
   local: status === "remoteOnly" ? null : { size: 2048, mtime: 1_700_000_000 },
-  remote: status === "localOnly" ? null : { size: 10, mtime: 1_700_000_100 },
+  remote: status === "localOnly" ? null : { size: 2048, mtime: 1_700_000_100 },
   status,
 });
-
 function openSync(entries: SyncEntry[]) {
   useDeployment.setState({
     sync: {
@@ -29,31 +38,132 @@ function openSync(entries: SyncEntry[]) {
     },
   });
 }
-
+beforeEach(() => {
+  vi.clearAllMocks();
+  mocks.equal.mockResolvedValue(false);
+  useProject.setState({
+    project: { root: "/work/app" } as never,
+    settings: {
+      deployment: { servers: [{ ...DEFAULT_DEPLOYMENT_SERVER, id: "s1", name: "Staging" }] },
+    } as never,
+  });
+});
 afterEach(() => {
   cleanup();
   useDeployment.setState({ sync: null });
 });
+const table = () => screen.getByRole("grid", { name: "Files to synchronize" });
+const row = (path: string) =>
+  within(table())
+    .getByRole("combobox", { name: `Action ${path}` })
+    .closest("tr")!;
 
-describe("Sync dialog", () => {
-  it("lists the differing files with their default actions and hides identical ones", () => {
+describe("deployment directory and content comparison", () => {
+  it("fills a secondary window without creating an in-page modal and saves local edits before synchronization", async () => {
+    let saved!: () => void;
+    const beforeSynchronize = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          saved = resolve;
+        }),
+    );
+    openSync([entry("a.php", "localOnly")]);
+    render(<SyncDialog standalone beforeSynchronize={beforeSynchronize} />);
+    expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+    expect(screen.getByRole("region", { name: "Diff Between 'local files' and 'files on Staging'" })).toContainElement(
+      table(),
+    );
+    fireEvent.click(screen.getByRole("button", { name: "Synchronize All" }));
+    expect(screen.getByRole("button", { name: "Synchronize All" })).toBeDisabled();
+    expect(mocks.sync).not.toHaveBeenCalled();
+    await act(async () => saved());
+    expect(mocks.sync).toHaveBeenCalledWith([{ path: "a.php", action: "upload" }]);
+  });
+  it("shows mirrored metadata and previews the selected file, with identical rows filtered", () => {
     openSync([entry("a.php", "localOnly"), entry("b.php", "remoteNewer"), entry("c.php", "same")]);
     render(<DeploymentDialogs />);
-    expect(screen.getByText("a.php")).toBeTruthy();
-    expect(screen.queryByText("c.php")).toBeNull();
-    expect((screen.getByLabelText("Action a.php") as HTMLSelectElement).value).toBe("upload");
-    expect((screen.getByLabelText("Action b.php") as HTMLSelectElement).value).toBe("download");
-
-    fireEvent.click(screen.getByLabelText(/Hide identical files/));
-    expect(screen.getByText("c.php")).toBeTruthy();
-    expect((screen.getByLabelText("Action c.php") as HTMLSelectElement).value).toBe("skip");
+    expect(within(table()).getByRole("columnheader", { name: "Local name" })).toBeInTheDocument();
+    expect(within(table()).getByRole("columnheader", { name: "Remote name" })).toBeInTheDocument();
+    expect(screen.queryByRole("combobox", { name: "Action c.php" })).not.toBeInTheDocument();
+    expect(screen.getByTestId("preview")).toHaveTextContent("/srv/app/a.php");
+    fireEvent.click(row("b.php"));
+    expect(row("b.php")).toHaveAttribute("aria-selected", "true");
+    expect(screen.getByTestId("preview")).toHaveTextContent("/srv/app/b.php");
+    fireEvent.click(screen.getByRole("button", { name: "Show identical files" }));
+    expect(screen.getByRole("combobox", { name: "Action c.php" })).toHaveValue("skip");
   });
-
-  it("updates the choice of a row", () => {
+  it("filters by name and category, navigates with arrows and cycles operations with Space", () => {
+    openSync([entry("a.php", "localOnly"), entry("b.php", "remoteNewer")]);
+    render(<DeploymentDialogs />);
+    fireEvent.keyDown(table(), { key: "ArrowDown" });
+    expect(row("b.php")).toHaveAttribute("aria-selected", "true");
+    fireEvent.keyDown(table(), { key: " " });
+    expect(screen.getByRole("combobox", { name: "Action b.php" })).toHaveValue("deleteRemote");
+    fireEvent.keyDown(screen.getByLabelText("Filter by name"), { key: "Enter" });
+    expect(mocks.sync).not.toHaveBeenCalled();
+    fireEvent.change(screen.getByLabelText("Filter by name"), { target: { value: "b.php" } });
+    expect(screen.queryByRole("combobox", { name: "Action a.php" })).not.toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Show different files" }));
+    expect(screen.getByText("No matching differences")).toBeInTheDocument();
+  });
+  it("updates a row's operation and only applies explicit synchronization", () => {
     openSync([entry("a.php", "localOnly")]);
     render(<DeploymentDialogs />);
     fireEvent.change(screen.getByLabelText("Action a.php"), { target: { value: "skip" } });
+    expect(screen.getByRole("button", { name: "Synchronize All" })).toBeDisabled();
+    fireEvent.change(screen.getByLabelText("Action a.php"), { target: { value: "upload" } });
+    fireEvent.click(screen.getByRole("button", { name: "Synchronize All" }));
+    expect(mocks.sync).toHaveBeenCalledWith([{ path: "a.php", action: "upload" }]);
+  });
+  it("finds content hidden by identical metadata and skips byte-identical files", async () => {
+    mocks.equal.mockImplementation(async (e: SyncEntry) => e.path === "a.php");
+    openSync([entry("a.php", "localNewer"), entry("b.php", "same")]);
+    render(<DeploymentDialogs />);
+    fireEvent.change(screen.getByLabelText("Compare by"), { target: { value: "content" } });
+    await waitFor(() => expect(screen.getByLabelText("Action b.php")).toHaveValue("upload"));
+    expect(screen.queryByLabelText("Action a.php")).not.toBeInTheDocument();
     expect(useDeployment.getState().sync?.choices["a.php"]).toBe("skip");
-    expect((screen.getByRole("button", { name: "Synchronize" }) as HTMLButtonElement).disabled).toBe(true);
+    expect(mocks.equal).toHaveBeenCalledTimes(2);
+    fireEvent.change(screen.getByLabelText("Compare by"), { target: { value: "metadata" } });
+    expect(screen.getByLabelText("Action a.php")).toHaveValue("upload");
+  });
+  it("synchronizes only the current row from the toolbar or Enter, and disables skipped selections", async () => {
+    openSync([entry("a.php", "localOnly"), entry("b.php", "remoteNewer")]);
+    render(<DeploymentDialogs />);
+    fireEvent.click(row("b.php"));
+    fireEvent.click(screen.getByRole("button", { name: "Synchronize Selected" }));
+    expect(mocks.sync).toHaveBeenCalledWith([{ path: "b.php", action: "download" }], "selected");
+    await act(async () => {});
+    mocks.sync.mockClear();
+    fireEvent.click(row("a.php"));
+    fireEvent.keyDown(table(), { key: "Enter" });
+    expect(mocks.sync).toHaveBeenCalledWith([{ path: "a.php", action: "upload" }], "selected");
+    await act(async () => {});
+    mocks.sync.mockClear();
+    fireEvent.change(screen.getByLabelText("Action a.php"), { target: { value: "skip" } });
+    expect(screen.getByRole("button", { name: "Synchronize Selected" })).toBeDisabled();
+    expect(screen.getByRole("button", { name: "Synchronize All" })).toBeEnabled();
+    fireEvent.keyDown(table(), { key: "Enter" });
+    expect(mocks.sync).not.toHaveBeenCalled();
+  });
+  it("preserves manual choices, reports failures, and ignores a cancelled scan", async () => {
+    let finish!: (value: boolean) => void;
+    mocks.equal.mockReturnValueOnce(
+      new Promise<boolean>((resolve) => {
+        finish = resolve;
+      }),
+    );
+    openSync([entry("a.php", "localNewer")]);
+    render(<DeploymentDialogs />);
+    fireEvent.change(screen.getByLabelText("Action a.php"), { target: { value: "skip" } });
+    fireEvent.change(screen.getByLabelText("Compare by"), { target: { value: "content" } });
+    await waitFor(() => expect(mocks.equal).toHaveBeenCalledOnce());
+    fireEvent.click(screen.getByRole("button", { name: "Stop content comparison" }));
+    await act(async () => finish(true));
+    expect(screen.getByLabelText("Action a.php")).toHaveValue("skip");
+    mocks.equal.mockRejectedValueOnce(new Error("Permission denied"));
+    fireEvent.change(screen.getByLabelText("Compare by"), { target: { value: "content" } });
+    expect(await screen.findByRole("alert")).toHaveTextContent("Permission denied");
+    expect(screen.getByLabelText("Action a.php")).toHaveValue("skip");
   });
 });
diff --git a/src/features/deployment/Dialogs.tsx b/src/features/deployment/Dialogs.tsx
index 982a1cda..a60893de 100644
--- a/src/features/deployment/Dialogs.tsx
+++ b/src/features/deployment/Dialogs.tsx
@@ -1,173 +1,11 @@
-/** Deployment dialogs: Sync with Deployed and the SSH password prompt. */
+/** Deployment comparison and SSH password prompt. */
 import { useState } from "react";
-import clsx from "clsx";
-import type { SyncEntry, SyncStatus } from "@/platform/ipc";
-import { useTx, useTxTemplate } from "@/platform/i18n";
-import { relativePath, useProject } from "@/platform/project";
-import { Checkbox, Dialog, Input, Spinner, T } from "@/ui";
-import { closeSync, runSync } from "./actions";
-import { formatSize, formatTime, syncChoices, syncSteps, type SyncChoice } from "./model";
-import { patchSync, useDeployment } from "./store";
+import { Checkbox, Dialog, Input } from "@/ui";
+import { useDeployment } from "./store";
+import { SyncDialog } from "./SyncDialog";
 import styles from "./Deployment.module.css";
 
-const STATUS_LABELS: Record<SyncStatus, string> = {
-  localOnly: "Local only",
-  remoteOnly: "Remote only",
-  localNewer: "Local is newer",
-  remoteNewer: "Remote is newer",
-  different: "Different size",
-  same: "Identical",
-};
-
-const CHOICE_LABELS: Record<SyncChoice, string> = {
-  skip: "Skip",
-  upload: "Upload",
-  download: "Download",
-  deleteRemote: "Delete remote",
-  deleteLocal: "Delete local",
-};
-
-function SyncRow({
-  entry,
-  choice,
-  onChoice,
-  disabled,
-}: {
-  entry: SyncEntry;
-  choice: SyncChoice;
-  onChoice: (c: SyncChoice) => void;
-  disabled: boolean;
-}) {
-  const tx = useTx();
-  return (
-    <tr className={clsx(choice === "skip" && styles.skipped)}>
-      <td>
-        <select
-          className={styles.choice}
-          value={choice}
-          disabled={disabled}
-          aria-label={`${tx("Action")} ${entry.path}`}
-          onChange={(e) => onChoice(e.target.value as SyncChoice)}
-        >
-          {syncChoices(entry).map((c) => (
-            <option key={c} value={c}>
-              {tx(CHOICE_LABELS[c])}
-            </option>
-          ))}
-        </select>
-      </td>
-      <td className={styles.mono} title={entry.remotePath}>
-        {entry.path}
-      </td>
-      <td className={styles.num}>{entry.local ? formatSize(entry.local.size) : ""}</td>
-      <td>{formatTime(entry.local?.mtime)}</td>
-      <td className={styles.num}>{entry.remote ? formatSize(entry.remote.size) : ""}</td>
-      <td>{formatTime(entry.remote?.mtime)}</td>
-      <td className={styles[`status-${entry.status}`]}>{tx(STATUS_LABELS[entry.status])}</td>
-    </tr>
-  );
-}
-
-function SyncDialog() {
-  const sync = useDeployment((s) => s.sync);
-  const root = useProject((s) => s.project?.root ?? null);
-  const tx = useTx();
-  const txt = useTxTemplate();
-  if (!sync) return null;
-  const entries = sync.entries;
-  const shown = entries?.filter((e) => !sync.hideSame || e.status !== "same") ?? [];
-  const steps = syncSteps(sync.choices);
-  const same = entries?.filter((e) => e.status === "same").length ?? 0;
-  const where = sync.paths.map((path) => (root ? relativePath(root, path) || "/" : path)).join(", ");
-
-  return (
-    <Dialog
-      open
-      title={txt(`Sync with ${sync.serverName}`)}
-      onClose={closeSync}
-      width={920}
-      footerStart={
-        entries && (
-          <Checkbox
-            checked={sync.hideSame}
-            onChange={(hideSame) => patchSync({ hideSame })}
-            label={txt(`Hide identical files (${same})`)}
-          />
-        )
-      }
-      buttons={[
-        { label: "Cancel", role: "cancel" },
-        {
-          label: "Synchronize",
-          role: "default",
-          disabled: !entries || sync.running || steps.length === 0,
-          onClick: () => void runSync(steps),
-        },
-      ]}
-    >
-      <div className={styles.sync}>
-        <div className={styles.note}>
-          <span className={styles.mono}>{where}</span>
-          {entries && <> · {txt(`${steps.length} of ${entries.length} files will change`)}</>}
-        </div>
-        {!!sync.skipped?.length && (
-          <div className={styles.note}>
-            {txt(`Skipped: ${sync.skipped.length}`)}:{" "}
-            {sync.skipped.map((s) => (root ? relativePath(root, s.path) : s.path)).join(", ")}
-          </div>
-        )}
-        {sync.error && <div className={styles.error}>{sync.error}</div>}
-        {!entries && !sync.error && (
-          <div className={styles.center}>
-            <Spinner /> <T>Comparing local and remote files…</T>
-          </div>
-        )}
-        {entries && (
-          <div className={styles.syncTableHost}>
-            <table className={styles.syncTable} aria-label={tx("Files to synchronize")}>
-              <thead>
-                <tr>
-                  <th className={styles.choiceCol}>{tx("Action")}</th>
-                  <th>{tx("Path")}</th>
-                  <th className={styles.sizeCol}>{tx("Local size")}</th>
-                  <th className={styles.timeCol}>{tx("Local modified")}</th>
-                  <th className={styles.sizeCol}>{tx("Remote size")}</th>
-                  <th className={styles.timeCol}>{tx("Remote modified")}</th>
-                  <th className={styles.statusCol}>{tx("Status")}</th>
-                </tr>
-              </thead>
-              <tbody>
-                {shown.length === 0 && (
-                  <tr>
-                    <td colSpan={7} className={styles.emptyCell}>
-                      <T>Local and remote files are identical</T>
-                    </td>
-                  </tr>
-                )}
-                {shown.map((e) => (
-                  <SyncRow
-                    key={e.path}
-                    entry={e}
-                    choice={sync.choices[e.path] ?? "skip"}
-                    disabled={sync.running}
-                    onChoice={(c) => patchSync({ choices: { ...sync.choices, [e.path]: c } })}
-                  />
-                ))}
-              </tbody>
-            </table>
-          </div>
-        )}
-        {sync.running && (
-          <div className={styles.center}>
-            <Spinner /> <T>Synchronizing…</T>
-          </div>
-        )}
-      </div>
-    </Dialog>
-  );
-}
-
-function SecretDialog() {
+export function SecretDialog() {
   const prompt = useDeployment((s) => s.secret);
   const [secret, setSecret] = useState("");
   const [save, setSave] = useState(false);
diff --git a/src/features/deployment/SyncDialog.tsx b/src/features/deployment/SyncDialog.tsx
new file mode 100644
index 00000000..0d100e5a
--- /dev/null
+++ b/src/features/deployment/SyncDialog.tsx
@@ -0,0 +1,522 @@
+/** Deployment directory diff: mirrored file lists above an embedded content diff. */
+import { useEffect, useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import clsx from "clsx";
+import type { SyncEntry, SyncStatus, SyncStep } from "@/platform/ipc";
+import { useTx, useTxTemplate } from "@/platform/i18n";
+import { useProject } from "@/platform/project";
+import { useWorkflowSettings } from "@/platform/workflowSettings";
+import {
+  Dialog,
+  DialogButtons,
+  Icon,
+  IconButton,
+  Input,
+  Spinner,
+  SplitGroup,
+  SplitHandle,
+  SplitPanel,
+  T,
+  fileIconName,
+  type DialogProps,
+} from "@/ui";
+import { TitleBar } from "@/workbench/TitleBar";
+import { usePlatform } from "@/platform/platformInfo";
+import { closeSync, openSync, runSync, type SyncRunMode } from "./actions";
+import { createDeploymentComparison, type DeploymentComparison } from "./comparison";
+import { defaultSyncAction, formatSize, formatTime, syncChoices, syncSteps, type SyncChoice } from "./model";
+import { patchSync, useDeployment, type SyncDialogState } from "./store";
+import { SyncPreview } from "./SyncPreview";
+import styles from "./Deployment.module.css";
+
+const STATUS: Record<SyncStatus, string> = {
+  localOnly: "Local only",
+  remoteOnly: "Remote only",
+  localNewer: "Local is newer",
+  remoteNewer: "Remote is newer",
+  different: "Contents differ",
+  same: "Identical",
+};
+const CHOICES: Record<SyncChoice, [string, string]> = {
+  skip: ["—", "Skip"],
+  upload: ["→", "Upload"],
+  download: ["←", "Download"],
+  deleteRemote: ["× →", "Delete remote"],
+  deleteLocal: ["← ×", "Delete local"],
+};
+type CompareBy = "metadata" | "content";
+const NO_VERIFIED: Record<string, boolean> = {};
+const NO_ERRORS: Record<string, string> = {};
+interface ContentScan {
+  comparison: DeploymentComparison;
+  entries: SyncEntry[];
+  verified: Record<string, boolean>;
+  errors: Record<string, string>;
+  progress: number | null;
+}
+
+function ComparisonFrame({ standalone, ...props }: DialogProps & { standalone: boolean }) {
+  const ownTitleBar = usePlatform((s) => s.overlayTitleBar || s.framelessTitleBar);
+  if (!standalone) return <Dialog {...props} />;
+  return (
+    <section className={styles.nativeWindow} aria-label={typeof props.title === "string" ? props.title : undefined}>
+      {ownTitleBar && <TitleBar minimal title={props.title as string} />}
+      <div className={styles.nativeBody}>{props.children}</div>
+      <footer className={styles.nativeFooter}>
+        {props.footerStart as ReactNode}
+        <DialogButtons buttons={props.buttons ?? []} onCancel={props.onClose} />
+      </footer>
+    </section>
+  );
+}
+
+function SyncComparison({
+  sync,
+  standalone,
+  beforeSynchronize,
+}: {
+  sync: SyncDialogState;
+  standalone: boolean;
+  beforeSynchronize?: (steps: SyncStep[]) => Promise<void>;
+}) {
+  const root = useProject((s) => s.project?.root ?? null);
+  const server = useWorkflowSettings((s) => s.deployment.servers.find((item) => item.id === sync.server));
+  const tx = useTx();
+  const txt = useTxTemplate();
+  const [selectedPath, setSelectedPath] = useState<string | null>(null);
+  const [filter, setFilter] = useState("");
+  const [showLocal, setShowLocal] = useState(true);
+  const [showDifferent, setShowDifferent] = useState(true);
+  const [showRemote, setShowRemote] = useState(true);
+  const [compareBy, setCompareBy] = useState<CompareBy>("metadata");
+  const [scan, setScan] = useState<ContentScan | null>(null);
+  const [generation, setGeneration] = useState(0);
+  const touched = useRef(new Set<string>());
+  const synchronizing = useRef(false);
+  const comparison = useMemo(
+    () => (server && root ? { ...createDeploymentComparison(server, root), generation, entries: sync.entries } : null),
+    [server, root, generation, sync.entries],
+  );
+  const entries = sync.entries;
+  const activeScan =
+    compareBy === "content" && scan?.comparison === comparison && scan.entries === entries ? scan : null;
+  const verified = activeScan?.verified ?? NO_VERIFIED;
+  const checkErrors = activeScan?.errors ?? NO_ERRORS;
+  const progress = compareBy === "content" && entries && comparison ? (activeScan ? activeScan.progress : 0) : null;
+  const changeCompareBy = (mode: CompareBy) => {
+    setScan(null);
+    setCompareBy(mode);
+  };
+
+  useEffect(() => {
+    const abort = new AbortController();
+    if (!entries || !comparison) return;
+    const suggest = (entry: SyncEntry, status: SyncStatus) => {
+      const current = useDeployment.getState().sync;
+      if (current?.entries !== entries || touched.current.has(entry.path)) return;
+      patchSync({ choices: { ...current.choices, [entry.path]: defaultSyncAction(status) } });
+    };
+    if (compareBy === "metadata") {
+      entries.forEach((entry) => suggest(entry, entry.status));
+      return;
+    }
+    void (async () => {
+      await Promise.resolve();
+      const verified: Record<string, boolean> = {};
+      const errors: Record<string, string> = {};
+      for (let i = 0; i < entries.length; i++) {
+        if (abort.signal.aborted) return;
+        const entry = entries[i]!;
+        try {
+          if (entry.local && entry.remote) {
+            const equal = await comparison.equal(entry, abort.signal);
+            if (abort.signal.aborted) return;
+            verified[entry.path] = equal;
+            suggest(entry, equal ? "same" : entry.status === "same" ? "different" : entry.status);
+          }
+        } catch (e) {
+          if (abort.signal.aborted) return;
+          errors[entry.path] = e instanceof Error ? e.message : String(e);
+        }
+        if (abort.signal.aborted) return;
+        setScan({ comparison, entries, verified: { ...verified }, errors: { ...errors }, progress: i + 1 });
+      }
+      if (!abort.signal.aborted) setScan({ comparison, entries, verified, errors, progress: null });
+    })();
+    return () => abort.abort();
+  }, [entries, comparison, compareBy]);
+
+  const compared = useMemo(
+    () =>
+      entries?.map((entry) =>
+        verified[entry.path] === undefined
+          ? entry
+          : {
+              ...entry,
+              status: verified[entry.path] ? ("same" as const) : ("different" as const),
+            },
+      ) ?? [],
+    [entries, verified],
+  );
+  const shown = useMemo(() => {
+    const query = filter.trim().toLocaleLowerCase();
+    return compared.filter(
+      (entry) =>
+        entry.path.toLocaleLowerCase().includes(query) &&
+        (checkErrors[entry.path] ||
+          (entry.status === "same"
+            ? !sync.hideSame
+            : entry.status === "localOnly"
+              ? showLocal
+              : entry.status === "remoteOnly"
+                ? showRemote
+                : showDifferent)),
+    );
+  }, [compared, filter, checkErrors, sync.hideSame, showLocal, showRemote, showDifferent]);
+  const selected = shown.find((entry) => entry.path === selectedPath) ?? shown[0] ?? null;
+  const previewEntry = entries?.find((entry) => entry.path === selected?.path) ?? null;
+  const steps = syncSteps(sync.choices);
+  const selectedSteps = steps.filter((step) => step.path === selected?.path);
+  const busy = sync.running || !entries || progress !== null;
+  const synchronize = async (mode: SyncRunMode) => {
+    const selectedOperations = mode === "selected" ? selectedSteps : steps;
+    if (busy || synchronizing.current || !selectedOperations.length) return;
+    synchronizing.current = true;
+    if (mode === "selected") selectedOperations.forEach((step) => touched.current.add(step.path));
+    try {
+      if (beforeSynchronize) {
+        patchSync({ running: true });
+        await beforeSynchronize(selectedOperations);
+        if (useDeployment.getState().sync?.paths !== sync.paths) return;
+      }
+      const report = await (mode === "selected" ? runSync(selectedOperations, mode) : runSync(selectedOperations));
+      if (mode === "selected" && report?.files && !report.errors.length && !report.skipped) {
+        const index = shown.findIndex((entry) => entry.path === selected?.path);
+        const choices = useDeployment.getState().sync?.choices;
+        const next = [...shown.slice(index + 1), ...shown.slice(0, index)].find(
+          (entry) => choices?.[entry.path] && choices[entry.path] !== "skip",
+        );
+        if (next) setSelectedPath((current) => (current === selectedPath ? next.path : current));
+      }
+    } catch (error) {
+      if (useDeployment.getState().sync?.paths === sync.paths)
+        patchSync({ running: false, error: error instanceof Error ? error.message : String(error) });
+    } finally {
+      synchronizing.current = false;
+    }
+  };
+  const choose = (entry: SyncEntry, choice: SyncChoice) => {
+    if (sync.running) return;
+    touched.current.add(entry.path);
+    setSelectedPath(entry.path);
+    patchSync({ choices: { ...useDeployment.getState().sync?.choices, [entry.path]: choice } });
+  };
+  const onTableKey = (event: KeyboardEvent<HTMLTableElement>) => {
+    if ((event.target as HTMLElement).closest("select, button, input")) return;
+    const index = shown.findIndex((entry) => entry.path === selected?.path);
+    if (event.key === "ArrowDown" || event.key === "ArrowUp") {
+      event.preventDefault();
+      const next = shown[Math.max(0, Math.min(shown.length - 1, index + (event.key === "ArrowDown" ? 1 : -1)))];
+      if (next) {
+        setSelectedPath(next.path);
+        document.getElementById(`deploy-row-${shown.indexOf(next)}`)?.scrollIntoView({ block: "nearest" });
+      }
+    } else if (
+      event.key === "Enter" &&
+      !event.altKey &&
+      !event.ctrlKey &&
+      !event.metaKey &&
+      !event.shiftKey &&
+      !event.nativeEvent.isComposing
+    ) {
+      event.preventDefault();
+      void synchronize("selected");
+    } else if (event.key === " " && selected && !busy) {
+      event.preventDefault();
+      const choices = syncChoices(selected);
+      choose(selected, choices[(choices.indexOf(sync.choices[selected.path] ?? "skip") + 1) % choices.length]!);
+    }
+  };
+  const refresh = () => {
+    if (!server || busy) return;
+    touched.current.clear();
+    setGeneration((n) => n + 1);
+    void openSync(server, sync.paths);
+  };
+
+  return (
+    <ComparisonFrame
+      standalone={standalone}
+      open
+      title={txt(`Diff Between 'local files' and 'files on ${sync.serverName}'`)}
+      onClose={standalone ? () => void getCurrentWebviewWindow().close() : closeSync}
+      width="calc(100vw - 48px)"
+      className={styles.syncWindow}
+      resizable="both"
+      footerStart={
+        <span className={styles.note}>{entries && txt(`${steps.length} of ${entries.length} files will change`)}</span>
+      }
+      buttons={[
+        { label: "Cancel", role: "cancel" },
+        {
+          label: "Synchronize All",
+          role: "extra",
+          disabled: busy || steps.length === 0,
+          onClick: () => void synchronize("all"),
+        },
+      ]}
+    >
+      <div className={styles.sync}>
+        <div className={styles.comparisonToolbar} role="toolbar" aria-label={tx("Deployment comparison options")}>
+          <IconButton
+            icon="refresh"
+            title="Refresh comparison"
+            size="small"
+            disabled={busy || !server}
+            onClick={refresh}
+          />
+          <span className={styles.separator} />
+          <button
+            className={styles.filterButton}
+            aria-label={tx("Show local-only files")}
+            aria-pressed={showLocal}
+            onClick={() => setShowLocal(!showLocal)}
+          >
+            →
+          </button>
+          <button
+            className={styles.filterButton}
+            aria-label={tx("Show different files")}
+            aria-pressed={showDifferent}
+            onClick={() => setShowDifferent(!showDifferent)}
+          >
+            ≠
+          </button>
+          <button
+            className={styles.filterButton}
+            aria-label={tx("Show identical files")}
+            aria-pressed={!sync.hideSame}
+            onClick={() => patchSync({ hideSame: !sync.hideSame })}
+          >
+            =
+          </button>
+          <button
+            className={styles.filterButton}
+            aria-label={tx("Show remote-only files")}
+            aria-pressed={showRemote}
+            onClick={() => setShowRemote(!showRemote)}
+          >
+            ←
+          </button>
+          <span className={styles.separator} />
+          <label className={styles.compareBy}>
+            <T>Compare by:</T>
+            <select
+              aria-label={tx("Compare by")}
+              value={compareBy}
+              disabled={sync.running}
+              onChange={(e) => changeCompareBy(e.target.value as CompareBy)}
+            >
+              <option value="metadata">{tx("Size and Timestamp")}</option>
+              <option value="content">{tx("Binary Content")}</option>
+            </select>
+          </label>
+          <span className={styles.separator} />
+          <IconButton
+            icon="run"
+            title="Synchronize Selected"
+            shortcut="Enter"
+            size="small"
+            disabled={busy || !selectedSteps.length}
+            onClick={() => void synchronize("selected")}
+          />
+          {progress !== null && (
+            <>
+              <Spinner size={14} />
+              <span className={styles.note} role="status">
+                {txt(`Comparing contents: ${progress} of ${entries?.length ?? 0}`)}
+              </span>
+              <IconButton
+                icon="stop"
+                title="Stop content comparison"
+                size="small"
+                onClick={() => changeCompareBy("metadata")}
+              />
+            </>
+          )}
+          <label className={styles.fileFilter}>
+            <T>Filter:</T>
+            <Input aria-label={tx("Filter by name")} value={filter} onChange={(e) => setFilter(e.target.value)} />
+          </label>
+        </div>
+        <div className={styles.comparisonRoots}>
+          <span title={root ?? ""}>
+            <Icon name="folder" size={14} />
+            <span>{root ?? tx("Local files")}</span>
+          </span>
+          <span title={server?.rootPath}>
+            <Icon name="web" size={14} />
+            <span>
+              {sync.serverName}: {server?.rootPath || "/"}
+            </span>
+          </span>
+        </div>
+        {sync.error && (
+          <div className={styles.error} role="alert">
+            {sync.error}
+          </div>
+        )}
+        {!!sync.skipped?.length && (
+          <div className={styles.note}>
+            {txt(`Skipped: ${sync.skipped.length}`)}: {sync.skipped.map((item) => item.path).join(", ")}
+          </div>
+        )}
+        {!entries && !sync.error && (
+          <div className={styles.center} role="status">
+            <Spinner />
+            <T>Comparing local and remote files…</T>
+          </div>
+        )}
+        {sync.running && (
+          <div className={styles.center} role="status">
+            <Spinner size={14} />
+            <T>Synchronizing…</T>
+          </div>
+        )}
+        {entries && (
+          <SplitGroup orientation="vertical" className={styles.comparisonSplit}>
+            <SplitPanel defaultSize="32%" minSize="100px">
+              <div className={styles.fileList}>
+                <div className={styles.syncTableHost}>
+                  <table
+                    className={styles.syncTable}
+                    role="grid"
+                    tabIndex={0}
+                    aria-label={tx("Files to synchronize")}
+                    aria-activedescendant={selected ? `deploy-row-${shown.indexOf(selected)}` : undefined}
+                    onKeyDown={onTableKey}
+                  >
+                    <colgroup>
+                      <col />
+                      <col className={styles.sizeCol} />
+                      <col className={styles.timeCol} />
+                      <col className={styles.operationCol} />
+                      <col className={styles.timeCol} />
+                      <col className={styles.sizeCol} />
+                      <col />
+                    </colgroup>
+                    <thead>
+                      <tr>
+                        <th>{tx("Local name")}</th>
+                        <th>{tx("Size")}</th>
+                        <th>{tx("Date")}</th>
+                        <th aria-label={tx("Action")}>↔</th>
+                        <th>{tx("Date")}</th>
+                        <th>{tx("Size")}</th>
+                        <th>{tx("Remote name")}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {!shown.length && (
+                        <tr>
+                          <td colSpan={7} className={styles.emptyCell}>
+                            <T>No matching differences</T>
+                          </td>
+                        </tr>
+                      )}
+                      {shown.map((entry, index) => (
+                        <tr
+                          key={entry.path}
+                          id={`deploy-row-${index}`}
+                          aria-selected={selected?.path === entry.path}
+                          className={clsx(
+                            styles[`status-${entry.status}`],
+                            sync.choices[entry.path] === "skip" && styles.skipped,
+                          )}
+                          onClick={(event) => {
+                            setSelectedPath(entry.path);
+                            if (!(event.target as HTMLElement).closest("select, button, input"))
+                              event.currentTarget.closest("table")?.focus({ preventScroll: true });
+                          }}
+                        >
+                          <td title={entry.local && root ? `${root}/${entry.path}` : tx("(does not exist)")}>
+                            {entry.local && (
+                              <span className={styles.fileName}>
+                                <Icon name={fileIconName(entry.path)} size={14} />
+                                {entry.path}
+                              </span>
+                            )}
+                          </td>
+                          <td className={styles.num}>{entry.local ? formatSize(entry.local.size) : ""}</td>
+                          <td>{formatTime(entry.local?.mtime)}</td>
+                          <td className={styles.operationCell}>
+                            <select
+                              className={styles.choice}
+                              aria-label={`${tx("Action")} ${entry.path}`}
+                              title={checkErrors[entry.path] ?? tx(STATUS[entry.status])}
+                              value={sync.choices[entry.path] ?? "skip"}
+                              disabled={busy}
+                              onChange={(e) => choose(entry, e.target.value as SyncChoice)}
+                            >
+                              {syncChoices(entry).map((choice) => (
+                                <option key={choice} value={choice} title={tx(CHOICES[choice][1])}>
+                                  {CHOICES[choice][0]} {tx(CHOICES[choice][1])}
+                                </option>
+                              ))}
+                            </select>
+                          </td>
+                          <td>{formatTime(entry.remote?.mtime)}</td>
+                          <td className={styles.num}>{entry.remote ? formatSize(entry.remote.size) : ""}</td>
+                          <td title={entry.remotePath}>
+                            {entry.remote && (
+                              <span className={styles.fileName}>
+                                <Icon name={fileIconName(entry.path)} size={14} />
+                                {entry.path}
+                              </span>
+                            )}
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
+                </div>
+                <div className={styles.listHint}>
+                  <T>
+                    Space changes the selected operation. Enter synchronizes the selected file. Synchronize All applies
+                    all chosen operations.
+                  </T>
+                </div>
+              </div>
+            </SplitPanel>
+            <SplitHandle aria-label={tx("Resize file list and diff preview")} />
+            <SplitPanel defaultSize="68%" minSize="160px">
+              {selected && checkErrors[selected.path] && (
+                <div className={styles.error} role="alert">
+                  {checkErrors[selected.path]}
+                </div>
+              )}
+              {comparison ? (
+                <SyncPreview key={selected?.path ?? "empty"} entry={previewEntry} comparison={comparison} />
+              ) : (
+                <div className={styles.center}>
+                  <T>The deployment server or project is no longer available</T>
+                </div>
+              )}
+            </SplitPanel>
+          </SplitGroup>
+        )}
+      </div>
+    </ComparisonFrame>
+  );
+}
+
+export function SyncDialog({
+  standalone = false,
+  beforeSynchronize,
+}: {
+  standalone?: boolean;
+  beforeSynchronize?: (steps: SyncStep[]) => Promise<void>;
+}) {
+  const sync = useDeployment((s) => s.sync);
+  return sync ? <SyncComparison sync={sync} standalone={standalone} beforeSynchronize={beforeSynchronize} /> : null;
+}
diff --git a/src/features/deployment/SyncPreview.test.tsx b/src/features/deployment/SyncPreview.test.tsx
new file mode 100644
index 00000000..6765e852
--- /dev/null
+++ b/src/features/deployment/SyncPreview.test.tsx
@@ -0,0 +1,72 @@
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import type { SyncEntry } from "@/platform/ipc";
+import { registerEditorKind } from "@/workbench/contributions";
+import type { DeploymentComparison, DeploymentPreview } from "./comparison";
+import { SyncPreview } from "./SyncPreview";
+
+// The diff viewer comes from the vcs feature through its editor kind.
+registerEditorKind({
+  kind: "diff",
+  title: () => "diff",
+  component: ({ input }) => (
+    <div data-testid="diff" data-mode={(input.data as { mode?: string }).mode}>
+      {JSON.stringify(input.data)}
+    </div>
+  ),
+});
+
+const entry = (path: string) => ({ path, remotePath: `/srv/${path}` }) as SyncEntry;
+const result = (text: string): DeploymentPreview => ({
+  kind: "text",
+  data: {
+    path: "/work/file.php",
+    title: "file.php",
+    left: { type: "text", text: "local", label: "Local" },
+    right: { type: "text", text, label: "Remote" },
+  },
+});
+
+describe("deployment diff preview", () => {
+  it("ignores a late response for a file that is no longer selected", async () => {
+    let finish!: (value: DeploymentPreview) => void;
+    const preview = vi
+      .fn()
+      .mockReturnValueOnce(
+        new Promise<DeploymentPreview>((resolve) => {
+          finish = resolve;
+        }),
+      )
+      .mockResolvedValue(result("current"));
+    const comparison: DeploymentComparison = { preview, equal: vi.fn() };
+    const mounted = render(<SyncPreview entry={entry("first.php")} comparison={comparison} />);
+    const firstSignal = preview.mock.calls[0]![1] as AbortSignal;
+    mounted.rerender(<SyncPreview entry={entry("second.php")} comparison={comparison} />);
+    expect(firstSignal.aborted).toBe(true);
+    expect(await screen.findByTestId("diff")).toHaveTextContent("current");
+    await act(async () => finish(result("stale")));
+    expect(screen.getByTestId("diff")).not.toHaveTextContent("stale");
+    expect(screen.getByTestId("diff")).toHaveAttribute("data-mode", "split");
+  });
+  it("shows read errors and allows retrying without closing the comparison", async () => {
+    const preview = vi.fn().mockRejectedValueOnce(new Error("Offline")).mockResolvedValue(result("recovered"));
+    render(<SyncPreview entry={entry("file.php")} comparison={{ preview, equal: vi.fn() }} />);
+    expect(await screen.findByRole("alert")).toHaveTextContent("Offline");
+    fireEvent.click(screen.getByRole("button", { name: "Retry" }));
+    expect(await screen.findByTestId("diff")).toHaveTextContent("recovered");
+  });
+  it.each(["binary", "tooLarge"] as const)("explains why %s files have no text preview", async (kind) => {
+    render(
+      <SyncPreview
+        entry={entry("file.bin")}
+        comparison={{ preview: vi.fn().mockResolvedValue({ kind }), equal: vi.fn() }}
+      />,
+    );
+    expect(
+      await screen.findByText(
+        kind === "binary" ? "Binary files cannot be shown as text" : /too large for the text preview/,
+      ),
+    ).toBeInTheDocument();
+    expect(screen.queryByTestId("diff")).not.toBeInTheDocument();
+  });
+});
diff --git a/src/features/deployment/SyncPreview.tsx b/src/features/deployment/SyncPreview.tsx
new file mode 100644
index 00000000..8e009928
--- /dev/null
+++ b/src/features/deployment/SyncPreview.tsx
@@ -0,0 +1,93 @@
+import { Suspense, useEffect, useState } from "react";
+import type { SyncEntry } from "@/platform/ipc";
+import { txTemplate } from "@/platform/i18n";
+import { Button, Spinner, T } from "@/ui";
+import { useContributions } from "@/workbench/contributions";
+import type { DeploymentComparison, DeploymentDiff, DeploymentPreview } from "./comparison";
+import styles from "./Deployment.module.css";
+
+/** An input of the diff viewer (editor kind `diff`), embedded and side by side. */
+function diffInput(data: DeploymentDiff) {
+  return {
+    kind: "diff",
+    key: `deployment:${data.path}`,
+    path: data.path,
+    data: { ...data, embedded: true, mode: "split" },
+  };
+}
+
+export function SyncPreview({ entry, comparison }: { entry: SyncEntry | null; comparison: DeploymentComparison }) {
+  const [loaded, setLoaded] = useState<{
+    comparison: DeploymentComparison;
+    entry: SyncEntry;
+    attempt: number;
+    result: DeploymentPreview | null;
+    error: string | null;
+  } | null>(null);
+  const [attempt, setAttempt] = useState(0);
+  const current =
+    loaded?.comparison === comparison && loaded.entry === entry && loaded.attempt === attempt ? loaded : null;
+  const result = current?.result;
+  const error = current?.error;
+  const diffViewer = useContributions((s) => s.editorKinds.get("diff"));
+  useEffect(() => {
+    const abort = new AbortController();
+    if (entry)
+      void comparison.preview(entry, abort.signal).then(
+        (value) => {
+          if (!abort.signal.aborted) setLoaded({ comparison, entry, attempt, result: value, error: null });
+        },
+        (e: unknown) => {
+          if (!abort.signal.aborted)
+            setLoaded({
+              comparison,
+              entry,
+              attempt,
+              result: null,
+              error: txTemplate(e instanceof Error ? e.message : String(e)),
+            });
+        },
+      );
+    return () => abort.abort();
+  }, [entry, comparison, attempt]);
+
+  return (
+    <div className={styles.preview} aria-label="Deployment content comparison">
+      {!entry ? (
+        <div className={styles.center}>
+          <T>Select a file to compare its contents</T>
+        </div>
+      ) : error ? (
+        <div className={styles.previewMessage} role="alert">
+          <div className={styles.error}>{error}</div>
+          <Button size="small" onClick={() => setAttempt((n) => n + 1)}>
+            Retry
+          </Button>
+        </div>
+      ) : !result ? (
+        <div className={styles.center} role="status">
+          <Spinner size={14} />
+          <T>Loading file contents…</T>
+        </div>
+      ) : result.kind === "binary" ? (
+        <div className={styles.center}>
+          <T>Binary files cannot be shown as text</T>
+        </div>
+      ) : result.kind === "tooLarge" ? (
+        <div className={styles.center}>
+          <T>This file is too large for the text preview. Use Binary Content to compare it.</T>
+        </div>
+      ) : (
+        <Suspense
+          fallback={
+            <div className={styles.center}>
+              <Spinner size={14} />
+            </div>
+          }
+        >
+          {diffViewer && <diffViewer.component input={diffInput(result.data)} />}
+        </Suspense>
+      )}
+    </div>
+  );
+}
diff --git a/src/features/deployment/actions.test.tsx b/src/features/deployment/actions.test.tsx
index f3a1ae48..63ab8cdb 100644
--- a/src/features/deployment/actions.test.tsx
+++ b/src/features/deployment/actions.test.tsx
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { DeploymentServerValid } from "@/platform/remoteSettings";
+import type { SyncEntry } from "@/platform/ipc";
 
 const mocks = vi.hoisted(() => ({
   actions: [] as { id: string; run: (context: { arg: string[] }) => unknown }[],
@@ -9,6 +10,17 @@ const mocks = vi.hoisted(() => ({
   notify: vi.fn(),
   upload: vi.fn(),
   compare: vi.fn(),
+  sync: vi.fn(),
+  save: vi.fn(),
+  release: vi.fn(),
+  attachedPaths: [] as string[],
+  desktop: false,
+  openWindow: vi.fn(),
+}));
+vi.mock("./windowBridge", () => ({ showDeploymentComparison: mocks.openWindow }));
+vi.mock("@/editor/api", () => ({
+  editorsFor: (path: string) => (mocks.attachedPaths.includes(path) ? [{}] : []),
+  attachDocument: async () => ({ save: mocks.save, release: mocks.release }),
 }));
 vi.mock("@/platform/actions", () => ({
   executeAction: vi.fn(),
@@ -38,13 +50,15 @@ vi.mock("@/platform/ipc", () => ({
   call: (value: unknown) => value,
   nextRequestId: () => 1,
   isCancelled: () => false,
+  isTauri: () => mocks.desktop,
   commands: {
     deployCoverage: async () => mocks.coverage,
     deployUpload: mocks.upload,
     deployCompare: mocks.compare,
+    deploySync: mocks.sync,
   },
 }));
-import { registerDeploymentActions } from "./actions";
+import { registerDeploymentActions, runSync } from "./actions";
 import { useDeployment } from "./store";
 
 async function run(id: string, paths = ["/project/a", "/project/b"]) {
@@ -69,10 +83,53 @@ beforeEach(() => {
   mocks.choose.mockResolvedValue(null);
   mocks.upload.mockResolvedValue({ files: 1, skipped: 1, errors: [] });
   mocks.compare.mockResolvedValue([]);
+  mocks.sync.mockResolvedValue({ files: 1, skipped: 0, errors: [] });
+  mocks.save.mockResolvedValue(undefined);
+  mocks.attachedPaths = [];
+  mocks.desktop = false;
+  mocks.openWindow.mockResolvedValue(undefined);
   useDeployment.setState({ sync: null });
   registerDeploymentActions();
 });
 describe("deployment eligibility", () => {
+  it("keeps upstream's server-specific explanation when only one server is configured", async () => {
+    mocks.servers = [mocks.servers[0]!];
+    mocks.coverage[0]!.paths = [];
+    await run("deployment.uploadTo");
+    expect(mocks.notify).toHaveBeenCalledWith(
+      expect.objectContaining({ title: "No selected paths can be deployed to one" }),
+    );
+    expect(mocks.notify.mock.calls[0]![0].body.props.report.errors).toEqual(mocks.coverage[0]!.skipped);
+  });
+  it("opens the selected server and paths in a native window on desktop without an in-page comparison", async () => {
+    mocks.desktop = true;
+    mocks.choose.mockResolvedValue("one");
+    await run("deployment.syncWith");
+    await vi.waitFor(() => expect(mocks.openWindow).toHaveBeenCalledWith("one", ["/project/a", "/project/b"]));
+    expect(useDeployment.getState().sync).toBeNull();
+    expect(mocks.compare).not.toHaveBeenCalled();
+  });
+  it("saves edits made in the local diff before synchronization and stops if saving fails", async () => {
+    await run("deployment.syncWith");
+    mocks.choose.mockResolvedValue("one");
+    await run("deployment.syncWith");
+    await vi.waitFor(() => expect(useDeployment.getState().sync?.entries).toEqual([]));
+    const sync = useDeployment.getState().sync!;
+    mocks.attachedPaths = ["/project/a"];
+    await runSync([
+      { path: "a", action: "upload" },
+      { path: "b", action: "download" },
+    ]);
+    expect(mocks.save).toHaveBeenCalledOnce();
+    expect(mocks.release).toHaveBeenCalledOnce();
+    expect(mocks.save.mock.invocationCallOrder[0]).toBeLessThan(mocks.sync.mock.invocationCallOrder[0]!);
+    useDeployment.setState({ sync });
+    mocks.sync.mockClear();
+    mocks.save.mockRejectedValueOnce(new Error("Cannot save local file"));
+    await runSync([{ path: "a", action: "upload" }]);
+    expect(mocks.sync).not.toHaveBeenCalled();
+    expect(useDeployment.getState().sync?.error).toBe("Cannot save local file");
+  });
   it.each(["deployment.uploadTo", "deployment.downloadFrom", "deployment.syncWith"])(
     "filters %s and keeps a single option visible",
     async (id) => {
@@ -80,17 +137,24 @@ describe("deployment eligibility", () => {
       expect(mocks.choose).toHaveBeenCalledWith(expect.objectContaining({ items: ["one"] }));
     },
   );
-  it("explains an empty match and links settings", async () => {
-    mocks.coverage[0]!.paths = [];
-    await run("deployment.uploadTo");
-    expect(mocks.choose).not.toHaveBeenCalled();
-    expect(mocks.notify).toHaveBeenCalledWith(
-      expect.objectContaining({
-        title: "No deployment server covers the selected paths",
-        actions: [expect.objectContaining({ label: "Configure…" })],
-      }),
-    );
-  });
+  it.each(["deployment.uploadTo", "deployment.downloadFrom", "deployment.syncWith"])(
+    "explains the rejected paths for %s and links settings",
+    async (id) => {
+      mocks.coverage[0]!.paths = [];
+      await run(id);
+      expect(mocks.choose).not.toHaveBeenCalled();
+      expect(mocks.notify).toHaveBeenCalledWith(
+        expect.objectContaining({
+          title: "No deployment server covers the selected paths",
+          actions: [expect.objectContaining({ label: "Configure…" })],
+        }),
+      );
+      expect(mocks.notify.mock.calls[0]![0].body.props.report.errors).toEqual([
+        { path: "/project/b", message: "one: Not covered by this server's mappings" },
+      ]);
+      expect(mocks.compare).not.toHaveBeenCalled();
+    },
+  );
   it("explains why the default cannot deploy the named file", async () => {
     mocks.coverage[0]!.paths = [];
     await run("deployment.uploadToDefault");
@@ -104,4 +168,64 @@ describe("deployment eligibility", () => {
     await vi.waitFor(() => expect(mocks.compare).toHaveBeenCalledTimes(2));
     expect(useDeployment.getState().sync?.skipped?.[0]?.path).toBe("/project/b");
   });
+  it("keeps the comparison and other choices after synchronizing a single file, then supports the next file", async () => {
+    mocks.choose.mockResolvedValue("one");
+    await run("deployment.syncWith");
+    await vi.waitFor(() => expect(useDeployment.getState().sync?.entries).toEqual([]));
+    const entries: SyncEntry[] = ["a", "b"].map((path) => ({
+      path,
+      remotePath: `/remote/${path}`,
+      local: { size: 10, mtime: 2 },
+      remote: { size: 5, mtime: 1 },
+      status: "localNewer",
+    }));
+    useDeployment.setState((state) => ({
+      sync: { ...state.sync!, entries, choices: { a: "upload", b: "deleteRemote" } },
+    }));
+    const refreshed = { ...entries[0]!, remote: entries[0]!.local, status: "same" as const };
+    mocks.compare.mockResolvedValueOnce([refreshed]);
+    await runSync([{ path: "a", action: "upload" }], "selected");
+    expect(mocks.sync).toHaveBeenLastCalledWith([{ path: "a", action: "upload" }], "one", 1);
+    expect(mocks.compare).toHaveBeenLastCalledWith("/project/a", "one", 1);
+    expect(useDeployment.getState().sync).toMatchObject({
+      running: false,
+      request: null,
+      choices: { a: "skip", b: "deleteRemote" },
+      entries: [refreshed, entries[1]],
+    });
+    mocks.compare.mockResolvedValueOnce([{ ...entries[1]!, remote: null, status: "localOnly" }]);
+    await runSync([{ path: "b", action: "deleteRemote" }], "selected");
+    expect(useDeployment.getState().sync?.choices).toEqual({ a: "skip", b: "skip" });
+    expect(useDeployment.getState().sync?.entries).toHaveLength(2);
+  });
+  it("retains failed selected operations for retry and does not change pending files when refresh fails", async () => {
+    mocks.choose.mockResolvedValue("one");
+    await run("deployment.syncWith");
+    await vi.waitFor(() => expect(useDeployment.getState().sync?.entries).toEqual([]));
+    const entries: SyncEntry[] = ["a", "b"].map((path) => ({
+      path,
+      remotePath: `/remote/${path}`,
+      local: { size: 10, mtime: 2 },
+      remote: null,
+      status: "localOnly",
+    }));
+    useDeployment.setState((state) => ({ sync: { ...state.sync!, entries, choices: { a: "upload", b: "upload" } } }));
+    mocks.sync.mockResolvedValueOnce({ files: 0, skipped: 0, errors: [{ path: "a", message: "Permission denied" }] });
+    mocks.compare.mockResolvedValueOnce([entries[0]]);
+    await runSync([{ path: "a", action: "upload" }], "selected");
+    expect(useDeployment.getState().sync).toMatchObject({
+      running: false,
+      choices: { a: "upload", b: "upload" },
+      error: "a: Permission denied",
+    });
+    mocks.compare.mockRejectedValueOnce(new Error("Connection lost"));
+    await runSync([{ path: "a", action: "upload" }], "selected");
+    expect(useDeployment.getState().sync).toMatchObject({
+      running: false,
+      request: null,
+      choices: { a: "skip", b: "upload" },
+      entries,
+    });
+    expect(useDeployment.getState().sync?.error).toContain("Could not refresh comparison: a: Connection lost");
+  });
 });
diff --git a/src/features/deployment/actions.tsx b/src/features/deployment/actions.tsx
index 9a9dbcfe..2c558afb 100644
--- a/src/features/deployment/actions.tsx
+++ b/src/features/deployment/actions.tsx
@@ -1,8 +1,18 @@
 /** Deployment actions: upload / download / delete / sync / open the deployed URL. */
 import { executeAction, registerActions } from "@/platform/actions";
+import { attachDocument, editorsFor } from "@/editor/api";
 import { getContext } from "@/platform/context";
-import { call, commands, isCancelled, nextRequestId, type SyncAction, type TransferReport } from "@/platform/ipc";
-import { txTemplate, useTxTemplate } from "@/platform/i18n";
+import {
+  call,
+  commands,
+  isCancelled,
+  isTauri,
+  nextRequestId,
+  type TransferReport,
+  type SyncEntry,
+  type SyncStep,
+} from "@/platform/ipc";
+import { tx, txTemplate, useTxTemplate } from "@/platform/i18n";
 import { openExternalUrl } from "@/platform/openUrl";
 import { relativePath, useProject } from "@/platform/project";
 import type { AutoUploadValid, DeploymentServerValid } from "@/platform/remoteSettings";
@@ -14,6 +24,7 @@ import { initialSyncChoices, resolveServer, serverLabel, summarizeReport, target
 import { withSsh } from "./ssh";
 import { REMOTE_HOST_WINDOW, patchSync, useDeployment } from "./store";
 import styles from "./Deployment.module.css";
+import { showDeploymentComparison } from "./windowBridge";
 
 const GROUP = "tools";
 const CATEGORY = "Deployment";
@@ -90,8 +101,17 @@ async function pickServer(title: string, paths: string[]): Promise<DeploymentSer
   const servers = configured.filter((server) => coverage.some((c) => c.server === server.id && c.paths.length));
   if (!servers.length) {
     // One server: say why, as an explicit upload to it would.
-    if (configured.length === 1) notifyNoCoverage(configured[0], coverage[0]?.skipped);
-    else notifyNoCoverage();
+    if (configured.length === 1)
+      notifyNoCoverage(configured[0], coverage.find((c) => c.server === configured[0]!.id)?.skipped);
+    else {
+      const skipped = configured.flatMap((server) =>
+        (coverage.find((c) => c.server === server.id)?.skipped ?? []).map((error) => ({
+          ...error,
+          message: `${serverLabel(server)}: ${error.message}`,
+        })),
+      );
+      notifyNoCoverage(undefined, skipped);
+    }
     return null;
   }
   const labels = servers.map(serverLabel);
@@ -250,20 +270,86 @@ export function closeSync() {
   useDeployment.setState({ sync: null });
 }
 
-export async function runSync(steps: { path: string; action: SyncAction }[]) {
+export type SyncRunMode = "all" | "selected";
+
+export async function runSync(steps: SyncStep[], mode: SyncRunMode = "all") {
   const sync = useDeployment.getState().sync;
   const server = sync && deployment().servers.find((s) => s.id === sync.server);
-  if (!sync || !server) return;
+  if (!sync || !server || !steps.length) return;
   const request = nextRequestId();
-  patchSync({ running: true, request });
+  patchSync({ running: true, request, error: null });
   try {
+    // The embedded diff can edit the local side. Flush those live documents
+    // before uploading, so the server receives the content the user reviewed.
+    const root = projectRoot();
+    for (const step of steps) {
+      if (step.action !== "upload" || !root) continue;
+      const path = `${root.replace(/\/$/, "")}/${step.path}`;
+      if (!editorsFor(path).length) continue;
+      const document = await attachDocument(path);
+      try {
+        await document.save();
+      } finally {
+        document.release();
+      }
+    }
+    if (useDeployment.getState().sync?.request !== request) return;
     const report = await withSsh(server.kind === "sftp" ? server.sshConfig : "", () =>
       call(commands.deploySync(steps, server.id, request)),
     );
-    useDeployment.setState({ sync: null });
-    report.skipped += sync.skipped.length;
+    if (useDeployment.getState().sync?.request !== request) return;
+    if (mode === "selected" && root) {
+      const refreshed = new Map<string, SyncEntry>();
+      const checked = new Set<string>();
+      const refreshErrors: string[] = [];
+      for (const step of steps) {
+        if (useDeployment.getState().sync?.request !== request) return;
+        try {
+          const entries = await withSsh(server.kind === "sftp" ? server.sshConfig : "", () =>
+            call(commands.deployCompare(`${root.replace(/\/$/, "")}/${step.path}`, server.id, request)),
+          );
+          checked.add(step.path);
+          const entry = entries.find((entry) => entry.path === step.path);
+          if (entry) refreshed.set(step.path, entry);
+        } catch (error) {
+          if (isCancelled(error)) throw error;
+          refreshErrors.push(`${step.path}: ${errorText(error)}`);
+        }
+      }
+      const current = useDeployment.getState().sync;
+      if (current?.request !== request) return;
+      const failed = new Set(report.errors.map((error) => error.path));
+      // A skipped or interrupted batch does not identify every completed file.
+      const completed = report.skipped === 0 && report.files === steps.length - failed.size;
+      const choices = { ...current.choices };
+      if (completed) for (const step of steps) if (!failed.has(step.path)) choices[step.path] = "skip";
+      const entries =
+        current.entries?.flatMap((entry) => {
+          if (!checked.has(entry.path)) return [entry];
+          const updated = refreshed.get(entry.path);
+          if (updated) return [updated];
+          delete choices[entry.path];
+          return [];
+        }) ?? null;
+      patchSync({
+        entries,
+        choices,
+        running: false,
+        request: null,
+        error:
+          [
+            ...report.errors.map((error) => `${error.path}: ${error.message}`),
+            ...refreshErrors.map((error) => tx`Could not refresh comparison: ${error}`),
+          ].join("\n") || null,
+      });
+    } else {
+      useDeployment.setState({ sync: null });
+      report.skipped += sync.skipped.length;
+    }
     showReport(report, "sync", server);
+    return report;
   } catch (e) {
+    if (useDeployment.getState().sync?.request !== request) return;
     if (isCancelled(e)) patchSync({ running: false, request: null });
     else patchSync({ running: false, request: null, error: errorText(e) });
   }
@@ -367,7 +453,15 @@ export function registerDeploymentActions(): () => void {
         const target = paths[0] ?? projectRoot();
         if (!target) return;
         const targets = paths.length ? paths : [target];
-        void pickServer("Sync with Deployed to", targets).then((server) => server && openSync(server, targets));
+        void pickServer("Sync with Deployed to", targets).then(async (server) => {
+          if (!server) return;
+          if (!isTauri()) return openSync(server, targets);
+          try {
+            await showDeploymentComparison(server.id, targets);
+          } catch (error) {
+            showFailure("Cannot open comparison for {server}", server, error);
+          }
+        });
       },
     },
     {
diff --git a/src/features/deployment/comparison.test.ts b/src/features/deployment/comparison.test.ts
new file mode 100644
index 00000000..6df84c50
--- /dev/null
+++ b/src/features/deployment/comparison.test.ts
@@ -0,0 +1,117 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { SyncEntry } from "@/platform/ipc";
+import { DEFAULT_DEPLOYMENT_SERVER } from "@/platform/remoteSettings";
+
+const mocks = vi.hoisted(() => ({ remote: vi.fn(), probe: vi.fn(), text: vi.fn(), range: vi.fn() }));
+vi.mock("@/platform/ipc", () => ({
+  call: (value: unknown) => value,
+  commands: { remoteOpen: mocks.remote, fsProbe: mocks.probe, fsReadText: mocks.text, fsReadRange: mocks.range },
+}));
+vi.mock("./ssh", () => ({ withSsh: (_: unknown, run: () => unknown) => run() }));
+import { createDeploymentComparison } from "./comparison";
+
+const server = { ...DEFAULT_DEPLOYMENT_SERVER, id: "s1", name: "Staging", sshConfig: "ssh" };
+const entry = (patch: Partial<SyncEntry> = {}): SyncEntry => ({
+  path: "src/a.php",
+  remotePath: "/srv/app/src/a.php",
+  status: "same",
+  local: { size: 4, mtime: 1 },
+  remote: { size: 4, mtime: 1 },
+  ...patch,
+});
+const signal = () => new AbortController().signal;
+beforeEach(() => {
+  vi.resetAllMocks();
+  mocks.remote.mockResolvedValue("/cache/a.php");
+  mocks.probe.mockResolvedValue({ size: 4, binary: false, tooLarge: false });
+  mocks.text.mockResolvedValue("old\n");
+  mocks.range.mockResolvedValue({ total: 4, data: "b2xkCg==" });
+});
+
+describe("deployment content snapshots", () => {
+  it("keeps the local document live and the remote side immutable, sharing one downloaded snapshot", async () => {
+    const compare = createDeploymentComparison(server, "/work/app/");
+    expect(await compare.preview(entry(), signal())).toMatchObject({
+      kind: "text",
+      data: {
+        path: "/work/app/src/a.php",
+        left: { type: "file", path: "/work/app/src/a.php" },
+        right: { type: "text", text: "old\n", label: "Staging: /srv/app/src/a.php" },
+      },
+    });
+    expect(mocks.remote).toHaveBeenCalledWith({ kind: "sftp", ssh: "ssh" }, "/srv/app/src/a.php");
+    expect(mocks.text).toHaveBeenCalledWith("/cache/a.php");
+    await compare.equal(entry(), signal());
+    expect(mocks.remote).toHaveBeenCalledTimes(1);
+  });
+  it("represents missing sides without reading missing files", async () => {
+    const compare = createDeploymentComparison(server, "/work/app");
+    expect(await compare.preview(entry({ remote: null }), signal())).toMatchObject({
+      data: { right: { type: "text", text: "", label: expect.stringContaining("does not exist") } },
+    });
+    expect(mocks.remote).not.toHaveBeenCalled();
+    expect(mocks.text).not.toHaveBeenCalled();
+    mocks.probe.mockClear();
+    expect(await compare.preview(entry({ local: null }), signal())).toMatchObject({
+      data: { left: { type: "text", text: "" }, right: { text: "old\n" } },
+    });
+    expect(mocks.probe).toHaveBeenCalledExactlyOnceWith("/cache/a.php");
+  });
+  it("does not decode binaries or download oversized text previews", async () => {
+    const compare = createDeploymentComparison(server, "/work/app");
+    expect(await compare.preview(entry({ local: { size: 20_000_000, mtime: 1 } }), signal())).toEqual({
+      kind: "tooLarge",
+    });
+    expect(mocks.remote).not.toHaveBeenCalled();
+    mocks.probe.mockResolvedValue({ size: 4, binary: true });
+    expect(await compare.preview(entry(), signal())).toEqual({ kind: "binary" });
+    expect(mocks.text).not.toHaveBeenCalled();
+  });
+  it("compares bytes even when size and timestamps match", async () => {
+    const compare = createDeploymentComparison(server, "/work/app");
+    mocks.range.mockImplementation(async (path: string) => ({
+      total: 4,
+      data: path.startsWith("/work") ? "bmV3Cg==" : "b2xkCg==",
+    }));
+    expect(await compare.equal(entry(), signal())).toBe(false);
+    mocks.range.mockResolvedValue({ total: 4, data: "b2xkCg==" });
+    expect(await compare.equal(entry({ remote: { size: 4, mtime: 99 } }), signal())).toBe(true);
+  });
+  it("uses bounded reads and stops at the first differing block", async () => {
+    const compare = createDeploymentComparison(server, "/work/app");
+    const large = entry({ local: { size: 150_000, mtime: 1 }, remote: { size: 150_000, mtime: 1 } });
+    mocks.range.mockImplementation(async (path: string, offset: number) => ({
+      total: 150_000,
+      data: offset >= 65_536 ? path : "same",
+    }));
+    expect(await compare.equal(large, signal())).toBe(false);
+    expect(mocks.range).toHaveBeenCalledTimes(4);
+    expect(mocks.range.mock.calls.every(([, , len]) => len === 65_536)).toBe(true);
+  });
+  it("detects changed sizes during comparison and handles empty files", async () => {
+    const compare = createDeploymentComparison(server, "/work/app");
+    mocks.range.mockResolvedValue({ total: 5, data: "changed" });
+    await expect(compare.equal(entry(), signal())).rejects.toThrow("changed during comparison");
+    mocks.range.mockResolvedValue({ total: 0, data: "" });
+    expect(await compare.equal(entry({ local: { size: 0, mtime: 1 }, remote: { size: 0, mtime: 1 } }), signal())).toBe(
+      true,
+    );
+    mocks.remote.mockClear();
+    expect(await compare.equal(entry({ remote: { size: 8, mtime: 1 } }), signal())).toBe(false);
+    expect(mocks.remote).not.toHaveBeenCalled();
+  });
+  it("does not continue after selection is cancelled and retries failed downloads", async () => {
+    const compare = createDeploymentComparison(server, "/work/app");
+    const abort = new AbortController();
+    mocks.remote.mockImplementationOnce(async () => {
+      abort.abort();
+      return "/cache/a.php";
+    });
+    await expect(compare.preview(entry(), abort.signal)).rejects.toMatchObject({ name: "AbortError" });
+    expect(mocks.text).not.toHaveBeenCalled();
+    const retry = createDeploymentComparison(server, "/work/app");
+    mocks.remote.mockRejectedValueOnce(new Error("Offline"));
+    await expect(retry.preview(entry(), signal())).rejects.toThrow("Offline");
+    await expect(retry.preview(entry(), signal())).resolves.toMatchObject({ kind: "text" });
+  });
+});
diff --git a/src/features/deployment/comparison.ts b/src/features/deployment/comparison.ts
new file mode 100644
index 00000000..67b71ce0
--- /dev/null
+++ b/src/features/deployment/comparison.ts
@@ -0,0 +1,91 @@
+/** Read-only remote snapshots for the deployment comparison; project files are never downloaded over. */
+import { call, commands, type SyncEntry } from "@/platform/ipc";
+import { tx } from "@/platform/i18n";
+import { deploymentConnection, type DeploymentServerValid } from "@/platform/remoteSettings";
+import { withSsh } from "./ssh";
+
+const PREVIEW_LIMIT = 8 * 1024 * 1024;
+const BLOCK_SIZE = 64 * 1024;
+
+/** The data of a `diff` editor input (the diff viewer's): the local file, editable, next to the server's text. */
+export interface DeploymentDiff {
+  path: string;
+  title: string;
+  left: { type: "file"; path: string; label: string } | { type: "text"; text: string; label: string };
+  right: { type: "text"; text: string; label: string };
+}
+
+export type DeploymentPreview = { kind: "text"; data: DeploymentDiff } | { kind: "binary" } | { kind: "tooLarge" };
+
+export function createDeploymentComparison(server: DeploymentServerValid, root: string) {
+  // Only the downloaded path is cached, never a live remote document. The diff
+  // receives immutable text, so its merge controls cannot save to the server.
+  const snapshots = new Map<string, Promise<string>>();
+  const localPath = (entry: SyncEntry) => `${root.replace(/\/$/, "")}/${entry.path}`;
+  const remoteSnapshot = (entry: SyncEntry) => {
+    let pending = snapshots.get(entry.remotePath);
+    if (!pending) {
+      pending = withSsh(server.kind === "sftp" ? server.sshConfig : "", () =>
+        call(commands.remoteOpen(deploymentConnection(server), entry.remotePath)),
+      );
+      snapshots.set(entry.remotePath, pending);
+      void pending.catch(() => snapshots.delete(entry.remotePath));
+    }
+    return pending;
+  };
+
+  return {
+    async preview(entry: SyncEntry, signal: AbortSignal): Promise<DeploymentPreview> {
+      signal.throwIfAborted();
+      if (Math.max(entry.local?.size ?? 0, entry.remote?.size ?? 0) > PREVIEW_LIMIT) return { kind: "tooLarge" };
+      const remote = entry.remote ? await remoteSnapshot(entry) : null;
+      signal.throwIfAborted();
+      const probes = await Promise.all(
+        [entry.local ? localPath(entry) : null, remote].map((path) => (path ? call(commands.fsProbe(path)) : null)),
+      );
+      signal.throwIfAborted();
+      if (probes.some((p) => p?.binary)) return { kind: "binary" };
+      if (probes.some((p) => p?.tooLarge || (p?.size ?? 0) > PREVIEW_LIMIT)) return { kind: "tooLarge" };
+      const text = remote ? await call(commands.fsReadText(remote)) : "";
+      signal.throwIfAborted();
+      return {
+        kind: "text",
+        data: {
+          path: localPath(entry),
+          title: entry.path,
+          left: entry.local
+            ? { type: "file", path: localPath(entry), label: tx`Local: ${entry.path}` }
+            : { type: "text", text: "", label: tx("Local: (does not exist)") },
+          right: {
+            type: "text",
+            text,
+            label: `${server.name || server.id}: ${entry.remote ? entry.remotePath : tx("(does not exist)")}`,
+          },
+        },
+      };
+    },
+
+    /** Exact byte comparison, including binary files and line endings, in bounded reads. */
+    async equal(entry: SyncEntry, signal: AbortSignal): Promise<boolean> {
+      signal.throwIfAborted();
+      if (!entry.local || !entry.remote || entry.local.size !== entry.remote.size) return false;
+      const remote = await remoteSnapshot(entry);
+      signal.throwIfAborted();
+      // Read once for empty files too, to detect files changed since the listing.
+      for (let offset = 0; offset === 0 || offset < entry.local.size; offset += BLOCK_SIZE) {
+        signal.throwIfAborted();
+        const [a, b] = await Promise.all(
+          [localPath(entry), remote].map((path) => call(commands.fsReadRange(path, offset, BLOCK_SIZE))),
+        );
+        signal.throwIfAborted();
+        if (a!.total !== entry.local.size || b!.total !== entry.remote.size)
+          throw new Error("A file changed during comparison. Refresh and compare again.");
+        if (a!.data !== b!.data) return false;
+        if (entry.local.size === 0) break;
+      }
+      return true;
+    },
+  };
+}
+
+export type DeploymentComparison = ReturnType<typeof createDeploymentComparison>;
diff --git a/src/features/deployment/index.ts b/src/features/deployment/index.ts
index 31411439..e45ef8f3 100644
--- a/src/features/deployment/index.ts
+++ b/src/features/deployment/index.ts
@@ -15,6 +15,9 @@ import { autoUploadOn, registerDeploymentActions } from "./actions";
 import { DeploymentDialogs } from "./Dialogs";
 import { transferMenuEntries } from "./model";
 import { REMOTE_HOST_WINDOW, useDeployment } from "./store";
+import { installDeploymentEditorHost } from "./windowBridge";
+
+export { activateDeploymentWindow, DeploymentWindow } from "./window";
 
 /** Deployed URL of the path the last menu was prepared for. */
 let webUrlFor: { path: string; url: string | null } | null = null;
@@ -70,6 +73,7 @@ export function activate(): () => void {
     unsubFocus,
     unsubProject,
     registerDeploymentActions(),
+    installDeploymentEditorHost(),
     registerToolWindow({
       id: REMOTE_HOST_WINDOW,
       title: "Remote Host",
diff --git a/src/features/deployment/window.test.ts b/src/features/deployment/window.test.ts
new file mode 100644
index 00000000..fa314353
--- /dev/null
+++ b/src/features/deployment/window.test.ts
@@ -0,0 +1,107 @@
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { useProject } from "@/platform/project";
+import { useDeployment } from "./store";
+import { DEFAULT_DEPLOYMENT_SERVER } from "@/platform/remoteSettings";
+
+const mocks = vi.hoisted(() => ({
+  launch: vi.fn(),
+  project: vi.fn(),
+  open: vi.fn(),
+  cancel: vi.fn(),
+  ask: vi.fn(),
+  error: vi.fn(),
+  dirty: vi.fn(),
+  save: vi.fn(),
+  dispose: vi.fn(),
+  destroy: vi.fn(),
+  close: vi.fn(),
+  title: vi.fn(),
+  emit: vi.fn(async () => {}),
+  closeRequested: null as null | ((event: { preventDefault(): void }) => Promise<void>),
+}));
+vi.mock("@tauri-apps/api/webviewWindow", () => ({
+  getCurrentWebviewWindow: () => ({
+    label: "deployment-project-2",
+    listen: async () => () => {},
+    onCloseRequested: async (callback: typeof mocks.closeRequested) => {
+      mocks.closeRequested = callback;
+      return () => {};
+    },
+    setTitle: mocks.title,
+    close: mocks.close,
+    destroy: mocks.destroy,
+  }),
+}));
+vi.mock("@/platform/ipc", () => ({
+  isTauri: () => true,
+  commands: { windowTakeLaunch: mocks.launch, projectCurrent: mocks.project },
+}));
+vi.mock("@tauri-apps/api/event", () => ({ emitTo: mocks.emit }));
+vi.mock("@/editor/core/embeddedDocuments", () => ({
+  activateEmbeddedDocuments: () => ({ dirty: mocks.dirty, save: mocks.save, dispose: mocks.dispose }),
+}));
+vi.mock("@/workbench/messages", () => ({ ask: mocks.ask, showError: mocks.error }));
+vi.mock("./actions", () => ({ openSync: mocks.open, closeSync: mocks.cancel }));
+vi.mock("./windowBridge", () => ({ openDeploymentSource: vi.fn() }));
+vi.mock("./Dialogs", () => ({ SecretDialog: () => null }));
+vi.mock("./SyncDialog", () => ({ SyncDialog: () => null }));
+vi.mock("@/workbench/OverlayHost", () => ({ OverlayHost: () => null }));
+vi.mock("@/workbench/TitleBar", () => ({ TitleBar: () => null }));
+
+import { activateDeploymentWindow } from "./window";
+
+let stop: (() => void) | undefined;
+beforeEach(() => {
+  vi.clearAllMocks();
+  mocks.launch.mockResolvedValue(null);
+  mocks.dirty.mockReturnValue(false);
+  mocks.save.mockResolvedValue(undefined);
+  mocks.dispose.mockResolvedValue(undefined);
+  mocks.ask.mockResolvedValue({ button: "cancel" });
+  useProject.setState({ project: null, settings: { files: { autoSave: false } } as never });
+  useDeployment.setState({ sync: null });
+});
+afterEach(() => {
+  stop?.();
+  stop = undefined;
+});
+
+it("loads the parent project before comparing the launched server and local selection", async () => {
+  const server = { ...DEFAULT_DEPLOYMENT_SERVER, id: "s2", name: "Second project" };
+  const project = { root: "/second", settings: { deployment: { servers: [server] } } };
+  mocks.project.mockResolvedValue(project);
+  mocks.launch.mockResolvedValueOnce({ deployment: { server: "s2", paths: ["/second/a.php"] } });
+  mocks.open.mockImplementation(async () => useDeployment.setState({ sync: { server: "s2" } as never }));
+  stop = activateDeploymentWindow("project-2");
+  await vi.waitFor(() =>
+    expect(mocks.open).toHaveBeenCalledWith(expect.objectContaining({ id: "s2" }), ["/second/a.php"]),
+  );
+  expect(useProject.getState().project).toBe(project);
+});
+
+it("keeps the window and unsaved local edits when closing is cancelled or saving fails", async () => {
+  mocks.dirty.mockReturnValue(true);
+  stop = activateDeploymentWindow("project-2");
+  const event = { preventDefault: vi.fn() };
+  await mocks.closeRequested!(event);
+  expect(event.preventDefault).toHaveBeenCalled();
+  expect(mocks.save).not.toHaveBeenCalled();
+  expect(mocks.destroy).not.toHaveBeenCalled();
+  // The project window waiting to close stops.
+  expect(mocks.emit).toHaveBeenCalledWith(
+    "project-2",
+    "openidea://auxiliary/closed",
+    expect.objectContaining({ label: "deployment-project-2", closed: false }),
+  );
+  mocks.ask.mockResolvedValue({ button: "save" });
+  mocks.save.mockRejectedValueOnce(new Error("Disk full"));
+  await mocks.closeRequested!(event);
+  expect(mocks.error).toHaveBeenCalledWith("Cannot close deployment comparison", "Disk full");
+  expect(mocks.dispose).not.toHaveBeenCalled();
+  expect(mocks.destroy).not.toHaveBeenCalled();
+  await mocks.closeRequested!(event);
+  expect(mocks.cancel).toHaveBeenCalledOnce();
+  expect(mocks.dispose).toHaveBeenCalledOnce();
+  expect(mocks.destroy).toHaveBeenCalledOnce();
+  expect(mocks.save.mock.invocationCallOrder.at(-1)).toBeLessThan(mocks.destroy.mock.invocationCallOrder[0]!);
+});
diff --git a/src/features/deployment/window.tsx b/src/features/deployment/window.tsx
new file mode 100644
index 00000000..076febfa
--- /dev/null
+++ b/src/features/deployment/window.tsx
@@ -0,0 +1,187 @@
+/**
+ * The Sync with Deployed window (`deployment-<parent>`): one per project window, sharing that
+ * project's documents.
+ */
+import { useSyncExternalStore } from "react";
+import { emitTo } from "@tauri-apps/api/event";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { activateEmbeddedDocuments } from "@/editor/core/embeddedDocuments";
+import { AUX_CLOSED, type AuxCloseResult } from "@/platform/auxWindow";
+import { commands, type SyncStep } from "@/platform/ipc";
+import { useProject } from "@/platform/project";
+import { workflowSettings } from "@/platform/workflowSettings";
+import { isImeKey } from "@/platform/ime";
+import { useApplyTheme } from "@/workbench/theme";
+import { OverlayHost } from "@/workbench/OverlayHost";
+import { TitleBar } from "@/workbench/TitleBar";
+import { usePlatform } from "@/platform/platformInfo";
+import { WindowResizeHandles } from "@/workbench/WindowResizeHandles";
+import { provideEditorService } from "@/workbench/contributions";
+import { ask, showError } from "@/workbench/messages";
+import { Spinner, T, isPopupOpen } from "@/ui";
+import { closeSync, openSync } from "./actions";
+import { SecretDialog } from "./Dialogs";
+import { SyncDialog } from "./SyncDialog";
+import { patchSync, useDeployment } from "./store";
+import styles from "./Deployment.module.css";
+import { openDeploymentSource } from "./windowBridge";
+
+const LAUNCH_EVENT = "openidea://launch";
+
+let startupError: string | null = null;
+const startupListeners = new Set<() => void>();
+let saveSyncDocuments: ((steps: SyncStep[]) => Promise<void>) | undefined;
+const subscribeStartup = (listener: () => void) => {
+  startupListeners.add(listener);
+  return () => {
+    startupListeners.delete(listener);
+  };
+};
+function fail(error: unknown) {
+  if (useDeployment.getState().sync) {
+    patchSync({ error: error instanceof Error ? error.message : String(error) });
+    return;
+  }
+  startupError = error instanceof Error ? error.message : String(error);
+  startupListeners.forEach((listener) => listener());
+}
+
+export function activateDeploymentWindow(parent: string): () => void {
+  const native = getCurrentWebviewWindow();
+  const documents = activateEmbeddedDocuments();
+  provideEditorService({
+    openFile: (path, options) => openDeploymentSource(parent, path, options),
+    openInput: (input, options) => (input.path ? openDeploymentSource(parent, input.path, options) : Promise.resolve()),
+    activePath: () => null,
+    activeCursor: () => null,
+    saveAll: documents.save,
+  });
+  saveSyncDocuments = (steps) => {
+    const root = useProject.getState().project?.root;
+    return root
+      ? documents.savePaths(steps.map((step) => `${root.replace(/\/$/, "")}/${step.path}`))
+      : Promise.resolve();
+  };
+  let disposed = false;
+  let closing = false;
+  let queue = Promise.resolve();
+  const disposers: Array<() => void> = [];
+  // Tells the project window this window stays open, so it stops closing (see `closeDocumentWindows`).
+  const stayOpen = () => {
+    const result: AuxCloseResult = { label: native.label, closed: false, documents: [] };
+    void emitTo(parent, AUX_CLOSED, result).catch(() => {});
+  };
+  const listen = (ready: Promise<() => void>) => void ready.then((off) => (disposed ? off() : disposers.push(off)));
+  const launch = () => {
+    queue = queue
+      .then(async () => {
+        if (disposed || closing) return;
+        const pending = await commands.windowTakeLaunch();
+        if (!pending?.deployment) return;
+        if (useDeployment.getState().sync?.running) {
+          await showError(
+            "Deployment comparison",
+            "Wait for synchronization to finish before opening another comparison.",
+          );
+          return;
+        }
+        const project = await commands.projectCurrent();
+        if (!project) throw new Error("The project is no longer open.");
+        useProject.setState({ project, settings: project.settings });
+        const server = workflowSettings().deployment.servers.find((item) => item.id === pending.deployment!.server);
+        if (!server) throw new Error("The deployment server is no longer available.");
+        await native.setTitle(`Diff Between 'local files' and 'files on ${server.name || server.id}'`);
+        await openSync(server, pending.deployment.paths);
+        if (!useDeployment.getState().sync && !closing)
+          throw new Error("No selected files are mapped to this deployment server.");
+      })
+      .catch(fail);
+  };
+  listen(
+    native.listen(LAUNCH_EVENT, launch).then((off) => {
+      launch();
+      return off;
+    }),
+  );
+  listen(
+    native.onCloseRequested(async (event) => {
+      event.preventDefault();
+      if (closing) return;
+      closing = true;
+      try {
+        if (documents.dirty() && useProject.getState().settings?.files?.autoSave === false) {
+          const answer = await ask({
+            title: "Save local changes?",
+            body: "Save the local files edited in this comparison before closing.",
+            buttons: [{ id: "save", label: "Save and Close", primary: true }],
+          });
+          if (answer.button !== "save") return stayOpen();
+        }
+        await documents.save();
+        closeSync();
+        useDeployment.getState().secret?.resolve(null);
+        await documents.dispose();
+        await native.destroy();
+      } catch (error) {
+        stayOpen();
+        await showError("Cannot close deployment comparison", error instanceof Error ? error.message : String(error));
+      } finally {
+        closing = false;
+      }
+    }),
+  );
+  disposers.push(
+    useDeployment.subscribe((s, prev) => {
+      if (prev.sync && !s.sync && !closing) void native.close();
+    }),
+  );
+  const onKey = (event: KeyboardEvent) => {
+    if (event.defaultPrevented || isImeKey(event)) return;
+    if (
+      (event.key === "Escape" && !isPopupOpen()) ||
+      ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === "w")
+    ) {
+      event.preventDefault();
+      void native.close();
+    } else if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === "s") {
+      event.preventDefault();
+      void documents.save().catch(fail);
+    }
+  };
+  window.addEventListener("keydown", onKey);
+  disposers.push(() => window.removeEventListener("keydown", onKey));
+  return () => {
+    disposed = true;
+    saveSyncDocuments = undefined;
+    disposers.reverse().forEach((off) => off());
+  };
+}
+
+export function DeploymentWindow() {
+  useApplyTheme();
+  const sync = useDeployment((s) => s.sync);
+  const error = useSyncExternalStore(subscribeStartup, () => startupError);
+  const ownTitleBar = usePlatform((s) => s.overlayTitleBar || s.framelessTitleBar);
+  return (
+    <>
+      {sync ? (
+        <SyncDialog standalone beforeSynchronize={(steps) => saveSyncDocuments?.(steps) ?? Promise.resolve()} />
+      ) : (
+        <div className={styles.nativeWindow}>
+          {ownTitleBar && <TitleBar minimal title="Deployment Comparison" />}
+          <div className={styles.center} role={error ? "alert" : "status"}>
+            {error || (
+              <>
+                <Spinner />
+                <T>Opening deployment comparison…</T>
+              </>
+            )}
+          </div>
+        </div>
+      )}
+      <SecretDialog />
+      <OverlayHost />
+      <WindowResizeHandles />
+    </>
+  );
+}
diff --git a/src/features/deployment/windowBridge.ts b/src/features/deployment/windowBridge.ts
new file mode 100644
index 00000000..9dab0cde
--- /dev/null
+++ b/src/features/deployment/windowBridge.ts
@@ -0,0 +1,40 @@
+import { emitTo } from "@tauri-apps/api/event";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { call, commands, isTauri } from "@/platform/ipc";
+import { useProject } from "@/platform/project";
+import { editorService, type OpenOptions } from "@/workbench/contributions";
+import { windowBackgroundHex } from "@/workbench/theme";
+
+const OPEN_SOURCE = "openidea://deployment/open-source";
+
+export function showDeploymentComparison(server: string, paths: string[]) {
+  return call(commands.windowOpenDeployment(server, paths, windowBackgroundHex()));
+}
+
+export function openDeploymentSource(parent: string, path: string, options?: OpenOptions) {
+  return emitTo(parent, OPEN_SOURCE, { path, options });
+}
+
+/** Jump to Source from the comparison opens the local file in its project's editor. */
+export function installDeploymentEditorHost(): () => void {
+  if (!isTauri()) return () => {};
+  let disposed = false;
+  let unlisten: (() => void) | undefined;
+  void getCurrentWebviewWindow()
+    .listen<{ path: string; options?: OpenOptions }>(OPEN_SOURCE, ({ payload }) => {
+      const root = useProject.getState().project?.root;
+      if (root && payload.path.startsWith(`${root}/`)) {
+        void editorService()
+          .openFile(payload.path, payload.options)
+          .then(() => getCurrentWebviewWindow().setFocus());
+      }
+    })
+    .then((off) => {
+      if (disposed) off();
+      else unlisten = off;
+    });
+  return () => {
+    disposed = true;
+    unlisten?.();
+  };
+}
diff --git a/src/features/graphql/EnvironmentDialog.tsx b/src/features/graphql/EnvironmentDialog.tsx
new file mode 100644
index 00000000..6ffdd080
--- /dev/null
+++ b/src/features/graphql/EnvironmentDialog.tsx
@@ -0,0 +1,106 @@
+/**
+ * GraphQL Environment Variables (IDEA's dialog): the `${NAME}` variables a graphql-config
+ * uses, one row each with its value; Copy / Paste exchange them as `NAME=value` lines.
+ */
+import { useState } from "react";
+import { readClipboardText } from "@/platform/clipboard";
+import { useTx } from "@/platform/i18n";
+import { Dialog, IconButton, T } from "@/ui";
+import { copyText } from "@/ui/selectableText";
+import { closeEnvironmentDialog, environmentOf, saveEnvironment, useGraphQL } from "./store";
+import styles from "./GraphQL.module.css";
+
+/** `NAME=value` lines (a `.env` file's shape). */
+export function formatEnvironment(names: readonly string[], values: Readonly<Record<string, string>>): string {
+  return names.map((n) => `${n}=${values[n] ?? ""}`).join("\n");
+}
+
+/** Values of `names` found in `NAME=value` lines; other lines are ignored. */
+export function parseEnvironment(text: string, names: readonly string[]): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const line of text.split(/\r?\n/)) {
+    const at = line.indexOf("=");
+    if (at <= 0) continue;
+    const name = line.slice(0, at).trim();
+    if (names.includes(name)) out[name] = line.slice(at + 1).trim();
+  }
+  return out;
+}
+
+export function EnvironmentDialogOverlay() {
+  const dialog = useGraphQL((s) => s.envDialog);
+  return dialog ? <EnvironmentDialog key={dialog.configPath} {...dialog} /> : null;
+}
+
+function EnvironmentDialog({ configPath, variables }: { configPath: string; variables: string[] }) {
+  const tx = useTx();
+  const [values, setValues] = useState(() => ({ ...environmentOf(configPath) }));
+  const ok = () => {
+    saveEnvironment(configPath, values);
+    closeEnvironmentDialog(true);
+  };
+  return (
+    <Dialog
+      open
+      title="GraphQL Environment Variables"
+      onClose={() => closeEnvironmentDialog(false)}
+      width={480}
+      buttons={[
+        { label: "OK", role: "default", onClick: ok },
+        { label: "Cancel", role: "cancel" },
+      ]}
+    >
+      <div className={styles.envBox}>
+        <div className={styles.envToolbar} role="toolbar" aria-label={tx("Environment variables actions")}>
+          <IconButton
+            icon="copy"
+            size="small"
+            title="Copy"
+            onClick={() => void copyText(formatEnvironment(variables, values))}
+          />
+          <IconButton
+            icon="paste"
+            size="small"
+            title="Paste"
+            onClick={() =>
+              void readClipboardText().then((text) =>
+                setValues((v) => ({ ...v, ...parseEnvironment(text, variables) })),
+              )
+            }
+          />
+        </div>
+        <table className={styles.envTable} aria-label={tx("Environment variables")}>
+          <thead>
+            <tr>
+              <th>
+                <T>Name</T>
+              </th>
+              <th>
+                <T>Value</T>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {variables.map((name) => (
+              <tr key={name}>
+                <td className={styles.envName}>{name}</td>
+                <td>
+                  <input
+                    className={styles.envValue}
+                    aria-label={name}
+                    spellCheck={false}
+                    value={values[name] ?? ""}
+                    onChange={(e) => setValues((v) => ({ ...v, [name]: e.target.value }))}
+                    onKeyDown={(e) => {
+                      if (e.key === "Enter") ok();
+                    }}
+                  />
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </Dialog>
+  );
+}
diff --git a/src/features/graphql/GraphQL.module.css b/src/features/graphql/GraphQL.module.css
new file mode 100644
index 00000000..c6057e0d
--- /dev/null
+++ b/src/features/graphql/GraphQL.module.css
@@ -0,0 +1,323 @@
+.view {
+  height: 100%;
+  display: flex;
+  min-height: 0;
+}
+.tabs {
+  min-width: 0;
+  border: 0;
+  background: none;
+}
+.toolbar {
+  flex: none;
+  width: 32px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 2px;
+  padding: 4px 0;
+  border-right: 1px solid var(--border);
+}
+.toolbarSep {
+  width: 16px;
+  height: 1px;
+  margin: 3px 0;
+  background: var(--border);
+}
+.body {
+  flex: 1;
+  min-width: 0;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+}
+.tree {
+  flex: 1;
+  min-height: 0;
+}
+.status {
+  height: 26px;
+  flex: none;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 0 10px;
+  font-size: var(--fs-ui);
+  color: var(--fg-subtle);
+  white-space: nowrap;
+}
+.row {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding-right: 10px;
+  white-space: nowrap;
+}
+.label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.muted {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: var(--fg-subtle);
+}
+.ok {
+  color: var(--success);
+}
+.code {
+  font-weight: 600;
+}
+.result {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+.resultHeader {
+  height: 28px;
+  flex: none;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 0 10px;
+  white-space: nowrap;
+  border-bottom: 1px solid var(--border);
+}
+/* Result header: ✓ on success, a red dot with errors (IDEA). */
+.dotFailed {
+  flex: none;
+  width: 7px;
+  height: 7px;
+  margin: 0 4px;
+  border-radius: 50%;
+  background: var(--danger);
+}
+/* The response with line numbers, scrolling together (IDEA's result editor). */
+.outputBox {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  align-items: flex-start;
+  overflow: auto;
+  background: var(--bg-editor);
+}
+.outputGutter,
+.output {
+  margin: 0;
+  padding: 6px 10px;
+  font-family: var(--font-mono);
+  font-size: var(--fs-ui);
+  line-height: 1.6;
+}
+.outputGutter {
+  position: sticky;
+  left: 0;
+  flex: none;
+  min-width: 36px;
+  min-height: 100%;
+  padding-left: 8px;
+  background: var(--bg-editor);
+  color: var(--fg-line-number);
+  text-align: right;
+  user-select: none;
+}
+.output {
+  flex: 1;
+  white-space: pre;
+  user-select: text;
+}
+
+/* Editor header. */
+.editorToolbar {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  height: var(--h-header);
+  padding: 0 8px;
+  background: var(--bg-editor);
+  border-bottom: 1px solid var(--border);
+  font-family: var(--font-ui);
+  font-size: var(--fs-ui);
+  color: var(--fg-secondary);
+}
+.editorToolbarSep {
+  width: 1px;
+  height: 16px;
+  margin: 0 4px;
+  background: var(--border);
+}
+.endpoint {
+  min-width: 160px;
+  max-width: 420px;
+}
+.variablesBox {
+  position: relative;
+  border-bottom: 1px solid var(--border);
+  background: var(--bg-editor);
+}
+.variablesLayer,
+.variables {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 6px 10px;
+  border: 0;
+  font-family: var(--font-mono);
+  font-size: var(--fs-ui);
+  line-height: 1.5;
+  white-space: pre;
+  tab-size: 2;
+}
+.variablesLayer {
+  position: absolute;
+  inset: 0;
+  overflow: hidden;
+  color: var(--fg);
+  pointer-events: none;
+}
+.variables {
+  position: relative;
+  display: block;
+  width: 100%;
+  height: 96px;
+  min-height: 48px;
+  resize: vertical;
+  overflow: auto;
+  outline: none;
+  background: transparent;
+  color: transparent;
+  caret-color: var(--fg);
+}
+.variables::placeholder {
+  color: var(--fg-subtle);
+}
+.variables::selection {
+  background: var(--bg-editor-selection);
+  color: transparent;
+}
+
+/*
+ * graphql-config gutter: ▶ on each endpoint. As wide as the run gutter plus the Spring
+ * icon gutter beside it in Spring files (14px each), so ▶ keeps the same gap to the VCS bar.
+ */
+.runGutter {
+  width: 28px;
+}
+.runGutter :global(.cm-gutterElement) {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.runMarker {
+  width: 14px;
+  height: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: var(--radius-small);
+  cursor: pointer;
+}
+.runMarker:hover {
+  background: var(--bg-hover);
+}
+
+/* Query result and variables: JSON in the editor's syntax colours. */
+.output :global(.tok-propertyName),
+.variablesLayer :global(.tok-propertyName) {
+  color: var(--syn-property);
+}
+.output :global(.tok-string),
+.variablesLayer :global(.tok-string),
+.output :global(.tok-string2),
+.variablesLayer :global(.tok-string2) {
+  color: var(--syn-string);
+}
+.output :global(.tok-number),
+.variablesLayer :global(.tok-number) {
+  color: var(--syn-number);
+}
+.output :global(.tok-bool),
+.variablesLayer :global(.tok-bool),
+.output :global(.tok-null),
+.variablesLayer :global(.tok-null),
+.output :global(.tok-atom),
+.variablesLayer :global(.tok-atom),
+.output :global(.tok-keyword),
+.variablesLayer :global(.tok-keyword) {
+  color: var(--syn-keyword);
+}
+.output :global(.tok-punctuation),
+.variablesLayer :global(.tok-punctuation),
+.output :global(.tok-separator),
+.variablesLayer :global(.tok-separator),
+.output :global(.tok-squareBracket),
+.variablesLayer :global(.tok-squareBracket),
+.output :global(.tok-brace),
+.variablesLayer :global(.tok-brace) {
+  color: var(--syn-punct);
+}
+
+/* Text the last Execute GraphQL did not send (IDEA greys it out). */
+.unusedContext {
+  opacity: 0.45;
+}
+
+/* GraphQL Environment Variables dialog: a Name / Value table (IDEA). */
+.envBox {
+  display: flex;
+  flex-direction: column;
+  height: 300px;
+  border: 1px solid var(--border);
+}
+.envToolbar {
+  flex: none;
+  display: flex;
+  gap: 2px;
+  padding: 2px 4px;
+  border-bottom: 1px solid var(--border);
+}
+.envTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+  font-size: var(--fs-ui);
+}
+.envTable th {
+  height: 24px;
+  padding: 0 8px;
+  text-align: left;
+  font-weight: normal;
+  color: var(--fg-secondary);
+  border-bottom: 1px solid var(--border);
+}
+.envTable th + th {
+  border-left: 1px solid var(--border);
+}
+.envTable td {
+  height: 24px;
+  padding: 0;
+}
+.envName {
+  padding: 0 8px !important;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.envValue {
+  box-sizing: border-box;
+  width: 100%;
+  height: 24px;
+  padding: 0 8px;
+  border: 0;
+  outline: none;
+  background: transparent;
+  color: var(--fg);
+  font: inherit;
+  font-family: var(--font-mono);
+}
+.envValue:focus {
+  background: var(--bg-selected);
+}
diff --git a/src/features/graphql/GraphQLView.tsx b/src/features/graphql/GraphQLView.tsx
new file mode 100644
index 00000000..e6d787a3
--- /dev/null
+++ b/src/features/graphql/GraphQLView.tsx
@@ -0,0 +1,371 @@
+/**
+ * GraphQL tool window (IDEA's): "Schemas and Project Structure" lists each schema
+ * with its discovery summary, the errors the language server reports for its
+ * files and its endpoints; "Query Result" shows the last query's response.
+ */
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { Diagnostic } from "@/bindings";
+import { diagnosticsFor, subscribeDiagnostics } from "@/editor/lsp/diagnostics";
+import { highlightInto } from "@/editor/lsp/markdown";
+import { formatMessage, useTx } from "@/platform/i18n";
+import { openExternalUrl } from "@/platform/openUrl";
+import { basename, relativeDir, useProject } from "@/platform/project";
+import { EmptyState, Icon, IconButton, Spinner, Tabs, Tree, fileIconName, T } from "@/ui";
+import { editorService } from "@/workbench/contributions";
+import {
+  childNodes,
+  formatBody,
+  formatSize,
+  projectNodes,
+  responseErrorCount,
+  schemaProblems,
+  schemaStats,
+  type SchemaNode,
+} from "./model";
+import { configurationFor, discoverSchemasNow, openConfiguration, useGraphQL, type GraphQLTab } from "./store";
+import styles from "./GraphQL.module.css";
+
+const HELP_URL = "https://the-guild.dev/graphql/config/docs/user/usage";
+
+export function GraphQLTabs() {
+  const tab = useGraphQL((s) => s.tab);
+  return (
+    <Tabs
+      variant="compact"
+      aria-label="GraphQL views"
+      className={styles.tabs}
+      activeId={tab}
+      onSelect={(id) => useGraphQL.setState({ tab: id as GraphQLTab })}
+      items={[
+        { id: "schemas", label: "Schemas and Project Structure" },
+        { id: "result", label: "Query Result" },
+      ]}
+    />
+  );
+}
+
+export function GraphQLView() {
+  const tab = useGraphQL((s) => s.tab);
+  return tab === "result" ? <QueryResultView /> : <SchemasView />;
+}
+
+function expandableKeys(nodes: readonly SchemaNode[], children: (n: SchemaNode) => SchemaNode[] | undefined): string[] {
+  return nodes.flatMap((n) => {
+    const c = children(n);
+    return c?.length ? [n.key, ...expandableKeys(c, children)] : [];
+  });
+}
+
+type DiagnosticsByPath = ReadonlyMap<string, readonly Diagnostic[]>;
+
+function readDiagnostics(paths: readonly string[]): DiagnosticsByPath {
+  return new Map(paths.map((p) => [p, diagnosticsFor(p)]));
+}
+
+/** Diagnostics of `paths`, updated as the language server reports them. */
+function useDiagnostics(paths: readonly string[]): DiagnosticsByPath {
+  const [diagnostics, setDiagnostics] = useState(() => readDiagnostics(paths));
+  useEffect(() => {
+    const update = () => setDiagnostics(readDiagnostics(paths));
+    update();
+    const offs = paths.map((p) => subscribeDiagnostics(p, update));
+    return () => offs.forEach((off) => off());
+  }, [paths]);
+  return diagnostics;
+}
+
+function SchemasView() {
+  const tx = useTx();
+  const root = useProject((s) => s.project?.root ?? "");
+  const projects = useGraphQL((s) => s.projects);
+  const discovering = useGraphQL((s) => s.discovering);
+  const expanded = useGraphQL((s) => s.expanded);
+
+  useEffect(() => {
+    if (root && !projects && !discovering) void discoverSchemasNow();
+  }, [root, projects, discovering]);
+
+  const paths = useMemo(() => (projects ?? []).flatMap((p) => p.files.map((f) => f.path)), [projects]);
+  const diagnostics = useDiagnostics(paths);
+  const problemsOf = useCallback((path: string) => diagnostics.get(path) ?? [], [diagnostics]);
+  const children = useCallback((n: SchemaNode) => childNodes(n, problemsOf), [problemsOf]);
+  const roots = useMemo(() => projectNodes(projects ?? []), [projects]);
+  // IDEA opens each schema with its errors and endpoints.
+  const defaultExpanded = useMemo(
+    () => new Set(roots.flatMap((n) => [n.key, `${n.key}#errors`, `${n.key}#endpoints`])),
+    [roots],
+  );
+  const effectiveExpanded = expanded ?? defaultExpanded;
+
+  const renderNode = (n: SchemaNode) => {
+    switch (n.kind) {
+      case "project": {
+        const p = n.project;
+        return (
+          <span className={styles.row}>
+            <Icon name={p.configPath ? fileIconName(basename(p.configPath)) : "file-graphql"} size={16} />
+            <span className={styles.label}>{p.configPath ? basename(p.root) : tx("Default project-wide schema")}</span>
+            <span className={styles.muted}>{p.root}</span>
+          </span>
+        );
+      }
+      case "summary": {
+        const p = n.project;
+        const detail = p.dynamic
+          ? tx("the configuration is code and is not evaluated")
+          : !p.files.length && !p.remote.length
+            ? tx("schema is empty")
+            : formatMessage(tx("{types} types, {inputs} inputs, {enums} enums, {directives} directives"), {
+                ...schemaStats(p),
+              });
+        return (
+          <span className={styles.row}>
+            <Icon name="text" size={16} />
+            <span className={styles.label}>{tx("Schema discovery summary")}</span>
+            <span className={styles.muted}>- {detail}</span>
+          </span>
+        );
+      }
+      case "file":
+        return (
+          <span className={styles.row}>
+            <Icon name={fileIconName(basename(n.file.path))} size={16} />
+            <span className={styles.label}>{basename(n.file.path)}</span>
+            <span className={styles.muted}>{relativeDir(root, n.file.path)}</span>
+          </span>
+        );
+      case "remote":
+        return (
+          <span className={styles.row}>
+            <Icon name="web" size={16} />
+            <span className={styles.label}>{n.url}</span>
+          </span>
+        );
+      case "errors": {
+        const count = schemaProblems(n.project, problemsOf).length;
+        return (
+          <span className={styles.row}>
+            <Icon name="folder" size={16} />
+            <span className={styles.label}>{tx("Schema errors")}</span>
+            {count > 0 && <span className={styles.muted}>{count}</span>}
+          </span>
+        );
+      }
+      case "error": {
+        const d = n.diagnostic;
+        return (
+          <span className={styles.row}>
+            <Icon name={d.severity === "error" ? "error" : "warning"} size={16} />
+            <span className={styles.label}>{d.message}</span>
+            <span className={styles.muted}>
+              {basename(n.path)}:{d.range.start.line + 1}
+            </span>
+          </span>
+        );
+      }
+      case "noErrors":
+        return (
+          <span className={styles.row}>
+            <Icon name="check" size={16} className={styles.ok} />
+            <span className={styles.label}>{tx("No errors found")}</span>
+          </span>
+        );
+      case "endpoints":
+        return (
+          <span className={styles.row}>
+            <Icon name="folder" size={16} />
+            <span className={styles.label}>{tx("Endpoints")}</span>
+          </span>
+        );
+      case "endpoint":
+        return (
+          <span className={styles.row}>
+            <span className={styles.label}>{n.endpoint.name}</span>
+            <span className={styles.muted}>{n.endpoint.url}</span>
+          </span>
+        );
+      case "noEndpoints":
+        return (
+          <span className={styles.row}>
+            <Icon name="info" size={16} />
+            <span className={styles.label}>
+              {n.project.configPath
+                ? tx("No endpoints available in this schema")
+                : tx("No endpoints available in the default schema")}
+            </span>
+          </span>
+        );
+    }
+  };
+
+  const labelOf = (n: SchemaNode): string => {
+    switch (n.kind) {
+      case "project":
+        return n.project.configPath ? basename(n.project.root) : tx("Default project-wide schema");
+      case "summary":
+        return tx("Schema discovery summary");
+      case "file":
+        return basename(n.file.path);
+      case "remote":
+        return n.url;
+      case "errors":
+        return tx("Schema errors");
+      case "error":
+        return n.diagnostic.message;
+      case "noErrors":
+        return tx("No errors found");
+      case "endpoints":
+        return tx("Endpoints");
+      case "endpoint":
+        return n.endpoint.name;
+      case "noEndpoints":
+        return tx("No endpoints available in the default schema");
+    }
+  };
+
+  return (
+    <div className={styles.view}>
+      <div className={styles.toolbar} role="toolbar" aria-orientation="vertical" aria-label={tx("GraphQL actions")}>
+        <IconButton icon="plus" size="small" iconSize={16} action="graphql.addConfiguration" />
+        <span className={styles.toolbarSep} />
+        <IconButton
+          icon="settings"
+          size="small"
+          iconSize={16}
+          title="Open Configuration File"
+          disabled={!configurationFor(projects)}
+          onClick={() => void openConfiguration()}
+        />
+        <IconButton
+          icon="refresh"
+          size="small"
+          iconSize={16}
+          action="graphql.restartDiscovery"
+          disabled={discovering}
+        />
+        <IconButton
+          icon="help"
+          size="small"
+          iconSize={16}
+          title="Help"
+          onClick={() => void openExternalUrl(HELP_URL)}
+        />
+        <span className={styles.toolbarSep} />
+        <IconButton
+          icon="expand-all"
+          size="small"
+          iconSize={16}
+          title="Expand All"
+          disabled={!roots.length}
+          onClick={() => useGraphQL.setState({ expanded: new Set(expandableKeys(roots, children)) })}
+        />
+        <IconButton
+          icon="collapse-all"
+          size="small"
+          iconSize={16}
+          title="Collapse All"
+          disabled={!roots.length}
+          onClick={() => useGraphQL.setState({ expanded: new Set() })}
+        />
+      </div>
+      <div className={styles.body}>
+        {!projects ? (
+          <div className={styles.status} role="status">
+            <Spinner size={12} /> <T>Discovering GraphQL schemas</T>…
+          </div>
+        ) : (
+          <Tree<SchemaNode>
+            aria-label="GraphQL schemas"
+            className={styles.tree}
+            roots={roots}
+            getKey={(n) => n.key}
+            getLabel={labelOf}
+            getChildren={children}
+            isExpandable={(n) => !!children(n)?.length}
+            expanded={effectiveExpanded}
+            onExpandedChange={(next) => useGraphQL.setState({ expanded: next })}
+            renderNode={renderNode}
+            multiSelect={false}
+            onActivate={(n) => {
+              if (n.kind === "project" && n.project.configPath) void editorService().openFile(n.project.configPath);
+              else if (n.kind === "file") void editorService().openFile(n.file.path);
+              else if (n.kind === "error") {
+                const { start } = n.diagnostic.range;
+                void editorService().openFile(n.path, { selection: { line: start.line, col: start.col } });
+              }
+            }}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
+
+function QueryResultView() {
+  const tx = useTx();
+  const result = useGraphQL((s) => s.result);
+  const running = useGraphQL((s) => s.running !== null);
+  if (!result) {
+    return (
+      <EmptyState title={running ? "Running GraphQL query" : "No query results"}>
+        {!running && (
+          <span>
+            <T>Run a query with Execute GraphQL in the toolbar of a GraphQL file.</T>
+          </span>
+        )}
+      </EmptyState>
+    );
+  }
+  const errors = responseErrorCount(result.body);
+  const failed = !!result.error || errors > 0 || (result.status !== null && result.status >= 400);
+  const ms = result.totalMs === null ? "?" : Math.round(result.totalMs);
+  const size = formatSize(result.size ?? result.body?.length ?? 0);
+  return (
+    <div className={styles.result}>
+      <div className={styles.resultHeader} title={`${result.endpoint.name} - ${result.endpoint.url}`}>
+        {running ? (
+          <Spinner size={12} />
+        ) : failed ? (
+          <span className={styles.dotFailed} aria-hidden />
+        ) : (
+          <Icon name="check" size={16} className={styles.ok} />
+        )}
+        <span className={styles.label}>
+          {result.error
+            ? formatMessage(tx("{name}: {error}"), { name: basename(result.path), error: result.error })
+            : formatMessage(tx("{file}: {ms} ms execution time, {size} response"), {
+                file: basename(result.path),
+                ms,
+                size,
+              })}
+          {!result.error && errors === 1 && tx(", 1 error")}
+          {!result.error && errors > 1 && formatMessage(tx(", {count} errors"), { count: errors })}
+        </span>
+      </div>
+      <ResultBody text={result.error ?? formatBody(result.body)} json={!result.error} />
+    </div>
+  );
+}
+
+/** The response in the editor's colours (JSON), like IDEA's result viewer. */
+function ResultBody({ text, json }: { text: string; json: boolean }) {
+  const tx = useTx();
+  const ref = useRef<HTMLPreElement>(null);
+  useEffect(() => {
+    const el = ref.current;
+    if (!el) return;
+    el.textContent = text;
+    if (json) void highlightInto(el, text, "JSON");
+  }, [text, json]);
+  const lines = text.split("\n").length;
+  return (
+    <div className={styles.outputBox}>
+      <div className={styles.outputGutter} aria-hidden>
+        {Array.from({ length: lines }, (_, i) => (
+          <div key={i}>{i + 1}</div>
+        ))}
+      </div>
+      <pre ref={ref} className={styles.output} aria-label={tx("Query result")} />
+    </div>
+  );
+}
diff --git a/src/features/graphql/editor.tsx b/src/features/graphql/editor.tsx
new file mode 100644
index 00000000..61adbf3e
--- /dev/null
+++ b/src/features/graphql/editor.tsx
@@ -0,0 +1,284 @@
+/**
+ * GraphQL in editors, after IDEA's GraphQL plugin (JetBrains/js-graphql-intellij-plugin):
+ * - the toolbar above GraphQL files: Open Configuration File, Edit Environment Variables,
+ *   Toggle Variables Editor, the endpoint, Execute GraphQL, Rerun Introspection Query and
+ *   Open Introspection Schema; the variables editor (JSON) shows below it;
+ * - schema files re-checked as they are edited (unresolved types);
+ * - in graphql-config files, ▶ on each endpoint runs its introspection query.
+ */
+import { RangeSet, StateEffect, StateField, type EditorState, type Extension } from "@codemirror/state";
+import {
+  Decoration,
+  EditorView,
+  GutterMarker,
+  ViewPlugin,
+  gutter,
+  showPanel,
+  type DecorationSet,
+  type Panel,
+  type ViewUpdate,
+} from "@codemirror/view";
+import { useEffect, useRef } from "react";
+import { createRoot } from "react-dom/client";
+import type { EditorDocContext } from "@/editor/api";
+import { highlightInto } from "@/editor/lsp/markdown";
+import { useTx } from "@/platform/i18n";
+import { shortcutLabel } from "@/platform/keymap";
+import { basename } from "@/platform/project";
+import { isVirtualUri } from "@/platform/virtualDocs";
+import { IconButton, Select, gutterIconMarkup } from "@/ui";
+import { endpointLines, isConfigFile, outsideRanges, queryContext } from "./model";
+import {
+  chooseEndpoint,
+  configurationFor,
+  discoverSchemasNow,
+  editEnvironmentVariables,
+  endpointFor,
+  introspectEndpoint,
+  openConfiguration,
+  openIntrospectionSchema,
+  rerunIntrospection,
+  revalidateFile,
+  runQuery,
+  schemaOf,
+  setVariables,
+  toggleVariables,
+  useGraphQL,
+} from "./store";
+import styles from "./GraphQL.module.css";
+
+export const GRAPHQL_LANGUAGE = "graphql";
+
+// --- query context: what Execute GraphQL sent, the rest greyed out (IDEA) ---------------------
+
+const setSentRanges = StateEffect.define<Array<{ from: number; to: number }>>();
+const unusedMark = Decoration.mark({ class: styles.unusedContext ?? "" });
+
+/** Greys out the text the last Execute GraphQL left out, until the text or selection changes. */
+const unusedContext = StateField.define<DecorationSet>({
+  create: () => Decoration.none,
+  update(value, tr) {
+    for (const e of tr.effects)
+      if (e.is(setSentRanges))
+        return Decoration.set(
+          outsideRanges(tr.state.doc.length, e.value)
+            .filter((r) => r.to > r.from)
+            .map((r) => unusedMark.range(r.from, r.to)),
+        );
+    return tr.docChanged || tr.selection ? Decoration.none : value;
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+/** Execute GraphQL in `view`: the selection, else the operation at the caret (with its fragments). */
+export function runFromView(path: string, view: EditorView): Promise<void> {
+  const { state } = view;
+  const { from, to } = state.selection.main;
+  const context = queryContext(state.doc.toString(), { from, to });
+  if (view.state.field(unusedContext, false) !== undefined)
+    view.dispatch({ effects: setSentRanges.of(context.ranges) });
+  return runQuery(path, context.text);
+}
+
+function Toolbar({ path, view }: { path: string; view: EditorView }) {
+  const tx = useTx();
+  const projects = useGraphQL((s) => s.projects);
+  const discovering = useGraphQL((s) => s.discovering);
+  const running = useGraphQL((s) => s.running !== null);
+  const endpoint = useGraphQL((s) => endpointFor(s, path));
+  const variablesShown = useGraphQL((s) => s.variablesShown.has(path));
+  useEffect(() => {
+    if (!projects && !discovering) void discoverSchemasNow();
+  }, [projects, discovering]);
+
+  const config = configurationFor(projects, path);
+  const schema = projects ? schemaOf(projects, path) : null;
+  const endpoints = schema?.endpoints ?? [];
+  return (
+    <div className={styles.editorToolbar} role="toolbar" aria-label={tx("GraphQL editor actions")}>
+      <IconButton
+        icon="settings"
+        title="Open Configuration File"
+        disabled={!config}
+        onClick={() => void openConfiguration(path)}
+      />
+      <IconButton
+        icon="sliders"
+        title="Edit Environment Variables"
+        disabled={!schema?.variables.length}
+        onClick={() => void editEnvironmentVariables(path)}
+      />
+      <span className={styles.editorToolbarSep} />
+      <IconButton
+        icon="graphql-variables"
+        title="Toggle Variables Editor"
+        pressed={variablesShown}
+        onClick={() => toggleVariables(path)}
+      />
+      <Select
+        aria-label="GraphQL endpoint"
+        className={styles.endpoint}
+        value={endpoint?.name ?? null}
+        placeholder={tx("No endpoints")}
+        disabled={!endpoints.length}
+        options={endpoints.map((e) => ({ value: e.name, label: `${e.name} - ${e.url}` }))}
+        onChange={(name) => chooseEndpoint(path, name)}
+      />
+      <IconButton
+        icon="run"
+        title="Execute GraphQL"
+        shortcut={shortcutLabel("graphql.runQuery")}
+        disabled={!endpoint || running}
+        onClick={() => void runFromView(path, view)}
+      />
+      <IconButton
+        icon="refresh"
+        title="Rerun Introspection Query"
+        disabled={!endpoint || running}
+        onClick={() => void rerunIntrospection(path)}
+      />
+      <IconButton
+        icon="external-link"
+        title="Open Introspection Schema"
+        disabled={!schema}
+        onClick={() => void openIntrospectionSchema(path)}
+      />
+    </div>
+  );
+}
+
+/** The variables editor: JSON in the editor's colours (a highlighted layer under a transparent textarea). */
+function VariablesEditor({ path }: { path: string }) {
+  const tx = useTx();
+  const shown = useGraphQL((s) => s.variablesShown.has(path));
+  const text = useGraphQL((s) => s.variables[path] ?? "");
+  const layer = useRef<HTMLPreElement>(null);
+  useEffect(() => {
+    const el = layer.current;
+    if (!el) return;
+    // A trailing newline keeps the layer as tall as the textarea's last (empty) line.
+    const shownText = `${text}\n`;
+    el.textContent = shownText;
+    if (text) void highlightInto(el, shownText, "JSON");
+  }, [text, shown]);
+  if (!shown) return null;
+  return (
+    <div className={styles.variablesBox}>
+      <pre ref={layer} className={styles.variablesLayer} aria-hidden />
+      <textarea
+        className={styles.variables}
+        aria-label={tx("GraphQL variables")}
+        placeholder='{ "code": "VN" }'
+        spellCheck={false}
+        value={text}
+        onChange={(e) => setVariables(path, e.target.value)}
+        onScroll={(e) => {
+          const el = layer.current;
+          if (!el) return;
+          el.scrollTop = e.currentTarget.scrollTop;
+          el.scrollLeft = e.currentTarget.scrollLeft;
+        }}
+      />
+    </div>
+  );
+}
+
+function headerPanel(path: string) {
+  return (view: EditorView): Panel => {
+    const dom = document.createElement("div");
+    const root = createRoot(dom);
+    root.render(
+      <>
+        <Toolbar path={path} view={view} />
+        <VariablesEditor path={path} />
+      </>,
+    );
+    return { dom, top: true, destroy: () => queueMicrotask(() => root.unmount()) };
+  };
+}
+
+const REVALIDATE_DELAY = 300;
+
+/** Re-checks the schema from the editor's text as it is edited. */
+function revalidation(path: string) {
+  return ViewPlugin.fromClass(
+    class {
+      timer: ReturnType<typeof setTimeout> | undefined;
+      constructor(readonly view: EditorView) {}
+      update(u: ViewUpdate) {
+        if (!u.docChanged) return;
+        clearTimeout(this.timer);
+        this.timer = setTimeout(() => revalidateFile(path, this.view.state.doc.toString()), REVALIDATE_DELAY);
+      }
+      destroy() {
+        clearTimeout(this.timer);
+      }
+    },
+  );
+}
+
+// --- graphql-config: ▶ on each endpoint (Get GraphQL Schema from Endpoint) -------------------
+
+class EndpointMarker extends GutterMarker {
+  constructor(readonly endpoint: string) {
+    super();
+  }
+  override eq(other: GutterMarker): boolean {
+    return other instanceof EndpointMarker && other.endpoint === this.endpoint;
+  }
+  override toDOM(): Node {
+    const el = document.createElement("div");
+    el.className = styles.runMarker ?? "";
+    el.title = "Run Introspection Query";
+    el.setAttribute("role", "button");
+    el.setAttribute("aria-label", el.title);
+    el.innerHTML = gutterIconMarkup("gutter-run") ?? "";
+    return el;
+  }
+}
+
+function endpointMarkers(name: string) {
+  const compute = (state: EditorState) =>
+    RangeSet.of(
+      endpointLines(name, state.doc.toString())
+        .filter((e) => e.line < state.doc.lines)
+        .map((e) => new EndpointMarker(e.endpoint).range(state.doc.line(e.line + 1).from)),
+      true,
+    );
+  return StateField.define<RangeSet<GutterMarker>>({
+    create: compute,
+    update: (value, tr) => (tr.docChanged ? compute(tr.state) : value),
+  });
+}
+
+function configExtension(path: string): Extension {
+  const field = endpointMarkers(basename(path));
+  return [
+    field,
+    gutter({
+      class: `${styles.runGutter} cm-openidea-gutter-graphql`,
+      markers: (view) => view.state.field(field),
+      initialSpacer: () => new EndpointMarker(""),
+      domEventHandlers: {
+        mousedown: (view, block, event) => {
+          if ((event as MouseEvent).button !== 0) return false;
+          let endpoint: string | null = null;
+          view.state.field(field).between(block.from, block.from, (_from, _to, m) => {
+            endpoint = (m as EndpointMarker).endpoint;
+          });
+          if (endpoint === null) return false;
+          event.preventDefault();
+          void introspectEndpoint(path, endpoint);
+          return true;
+        },
+      },
+    }),
+  ];
+}
+
+export function graphqlEditorExtension(ctx: EditorDocContext): Extension {
+  if (ctx.virtual || isVirtualUri(ctx.path)) return [];
+  if (isConfigFile(basename(ctx.path))) return configExtension(ctx.path);
+  if (ctx.language !== GRAPHQL_LANGUAGE) return [];
+  return [showPanel.of(headerPanel(ctx.path)), revalidation(ctx.path), unusedContext];
+}
diff --git a/src/features/graphql/graphql.test.ts b/src/features/graphql/graphql.test.ts
new file mode 100644
index 00000000..0f2dd24a
--- /dev/null
+++ b/src/features/graphql/graphql.test.ts
@@ -0,0 +1,458 @@
+import { describe, expect, it } from "vitest";
+import type { Diagnostic } from "@/bindings";
+import {
+  analyzeSchema,
+  childNodes,
+  endpointLines,
+  expandEndpoint,
+  discoverSchemas,
+  globToRegExp,
+  httpRequestText,
+  introspectionTarget,
+  introspectionToSdl,
+  jsonWithoutTemplates,
+  parseConfig,
+  parseVariables,
+  outsideRanges,
+  parseYaml,
+  projectNodes,
+  queryContext,
+  queryText,
+  responseErrorCount,
+  schemaStats,
+  unresolvedTypes,
+  type SchemaFile,
+} from "./model";
+import { schemaOf } from "./store";
+
+describe("parseYaml", () => {
+  it("reads nested maps, lists and flow lists", () => {
+    expect(
+      parseYaml(`# graphql-config
+schema:
+  - schema.graphql   # main
+  - 'types/**/*.graphql'
+documents: [a.graphql, "b.graphql"]
+extensions:
+  endpoints:
+    default:
+      url: http://localhost:4000/graphql
+      headers:
+        Authorization: Bearer x
+`),
+    ).toEqual({
+      schema: ["schema.graphql", "types/**/*.graphql"],
+      documents: ["a.graphql", "b.graphql"],
+      extensions: {
+        endpoints: {
+          default: { url: "http://localhost:4000/graphql", headers: { Authorization: "Bearer x" } },
+        },
+      },
+    });
+  });
+
+  it("reads lists of maps", () => {
+    expect(parseYaml("items:\n  - name: a\n    url: x\n  - b\n")).toEqual({ items: [{ name: "a", url: "x" }, "b"] });
+  });
+});
+
+describe("parseConfig", () => {
+  it("reads schema pointers and endpoints from YAML", () => {
+    const c = parseConfig(
+      "graphql.config.yml",
+      "schema: schema.graphql\nextensions:\n  endpoints:\n    local: http://localhost/graphql\n",
+    );
+    expect(c).toEqual({
+      schema: ["schema.graphql"],
+      endpoints: [{ name: "local", url: "http://localhost/graphql", headers: {} }],
+      dynamic: false,
+      variables: [],
+    });
+  });
+
+  it("reads JSON, a `.graphqlrc` holding JSON and the legacy schemaPath", () => {
+    expect(parseConfig("graphql.config.json", '{"schema":["a.graphql"]}').schema).toEqual(["a.graphql"]);
+    expect(parseConfig(".graphqlrc", '{ "schemaPath": "s.graphqls" }').schema).toEqual(["s.graphqls"]);
+  });
+
+  it("takes the keys of a schema map as pointers", () => {
+    expect(parseConfig(".graphqlrc.json", '{"schema":{"https://api.dev/graphql":{"headers":{}}}}').schema).toEqual([
+      "https://api.dev/graphql",
+    ]);
+  });
+
+  it("does not evaluate JS/TS configs and survives broken ones", () => {
+    expect(parseConfig("graphql.config.ts", "export default {}").dynamic).toBe(true);
+    expect(parseConfig("graphql.config.json", "{").schema).toEqual([]);
+  });
+});
+
+describe("globToRegExp", () => {
+  it("matches graphql-config globs", () => {
+    expect(globToRegExp("**/*.graphql").test("schema.graphql")).toBe(true);
+    expect(globToRegExp("**/*.graphql").test("a/b/c.graphql")).toBe(true);
+    expect(globToRegExp("src/*.{graphql,gql}").test("src/q.gql")).toBe(true);
+    expect(globToRegExp("src/*.graphql").test("src/a/q.graphql")).toBe(false);
+    expect(globToRegExp("./schema.graphql").test("schema.graphql")).toBe(true);
+  });
+});
+
+describe("analyzeSchema", () => {
+  const text = `
+"""
+type NotAType
+"""
+type Query { a(x: In): Int, color: Color }
+# type Commented
+extend type Query { b: [Missing!]! }
+enum Color { RED }
+input In { x: Int, d: Date }
+scalar Date
+union U = Query | Gone
+directive @auth on FIELD_DEFINITION
+`;
+
+  it("counts definitions as IDEA's summary does, not comments or descriptions", () => {
+    const a = analyzeSchema(text);
+    expect(a.stats).toEqual({ types: 3, inputs: 1, enums: 1, directives: 1 });
+    expect(a.defined.sort()).toEqual(["Color", "Date", "In", "Query", "U"]);
+  });
+
+  it("reports types used but defined nowhere, at their position", () => {
+    const file: SchemaFile = { path: "/p/s.graphql", ...analyzeSchema(text) };
+    const [project] = discoverSchemas("/p", [], [file]);
+    const errors = unresolvedTypes(project!).map((e) => [e.diagnostic.message, e.diagnostic.range.start]);
+    expect(errors).toEqual([
+      ["The field type 'Missing' is not present when resolving type 'Query'", { line: 6, col: 24 }],
+      ["The field type 'Gone' is not present when resolving type 'U'", { line: 10, col: 18 }],
+    ]);
+    expect(schemaStats(project!).types).toBe(3);
+  });
+});
+
+const file = (path: string): SchemaFile => ({
+  path,
+  stats: { types: 0, inputs: 0, enums: 0, directives: 0 },
+  defined: [],
+  references: [],
+});
+const files = [file("/p/schema.graphql"), file("/p/api/user.graphqls"), file("/p/web/query.graphql")];
+
+describe("discoverSchemas", () => {
+  it("puts every file in the default schema without a config", () => {
+    const p = discoverSchemas("/p", [], files)[0]!;
+    expect(p.configPath).toBeNull();
+    expect(p.files.map((f) => f.path)).toEqual(["/p/api/user.graphqls", "/p/schema.graphql", "/p/web/query.graphql"]);
+  });
+
+  it("picks a config's files by its globs, relative to its folder", () => {
+    const p = discoverSchemas(
+      "/p",
+      [
+        {
+          path: "/p/api/.graphqlrc.yml",
+          config: { schema: ["*.graphqls", "https://x.dev/graphql"], endpoints: [], dynamic: false, variables: [] },
+        },
+      ],
+      files,
+    )[0]!;
+    expect(p.root).toBe("/p/api");
+    expect(p.files.map((f) => f.path)).toEqual(["/p/api/user.graphqls"]);
+    expect(p.remote).toEqual(["https://x.dev/graphql"]);
+  });
+});
+
+describe("tree", () => {
+  const diag = (severity: Diagnostic["severity"]): Diagnostic => ({
+    range: { start: { line: 1, col: 2 }, end: { line: 1, col: 4 } },
+    severity,
+    message: "Unknown type",
+    source: "graphql",
+    code: null,
+  });
+
+  it("shows IDEA's sections: summary, errors and endpoints", () => {
+    const root = projectNodes(discoverSchemas("/p", [], []))[0]!;
+    const none = () => [];
+    const [summary, errors, endpoints] = childNodes(root, none)!;
+    expect([summary!.kind, errors!.kind, endpoints!.kind]).toEqual(["summary", "errors", "endpoints"]);
+    expect(childNodes(summary!, none)).toEqual([]);
+    expect(childNodes(errors!, none)?.map((n) => n.kind)).toEqual(["noErrors"]);
+    expect(childNodes(endpoints!, none)?.map((n) => n.kind)).toEqual(["noEndpoints"]);
+  });
+
+  it("lists errors and warnings of the schema's files", () => {
+    const root = projectNodes(discoverSchemas("/p", [], files))[0]!;
+    const errors = childNodes(root, () => [])![1]!;
+    const found = childNodes(errors, (path) =>
+      path === "/p/schema.graphql" ? [diag("error"), diag("hint"), diag("warning")] : [],
+    );
+    expect(found?.map((n) => (n.kind === "error" ? n.diagnostic.severity : n.kind))).toEqual(["error", "warning"]);
+  });
+});
+
+describe("queries", () => {
+  it("runs the selection, else the document", () => {
+    expect(queryText("  { a }\n", null)).toBe("{ a }");
+    expect(queryText("{ a } { b }", { from: 6, to: 11 })).toBe("{ b }");
+    expect(queryText("{ a }", { from: 2, to: 2 })).toBe("{ a }");
+  });
+
+  it("runs the operation around the caret with the fragments it uses, as IDEA does", () => {
+    const doc = `# { not: "this" }
+query A { ...F }
+query B($id: ID!) { node(id: $id) { ... on User { name } ...G } }
+fragment F on Query { x }
+fragment G on Node { id ...H }
+fragment H on Node { "}" }
+`;
+    const inB = doc.indexOf("node(");
+    expect(queryText(doc, { from: inB, to: inB })).toBe(
+      'query B($id: ID!) { node(id: $id) { ... on User { name } ...G } }\n\nfragment G on Node { id ...H }\n\nfragment H on Node { "}" }',
+    );
+    const inA = doc.indexOf("...F");
+    expect(queryText(doc, { from: inA, to: inA })).toBe("query A { ...F }\n\nfragment F on Query { x }");
+    // Outside every operation (in the comment): the whole document.
+    expect(queryText(doc, { from: 3, to: 3 })).toBe(doc.trim());
+  });
+
+  it("reports what was sent so the rest can be greyed out", () => {
+    const doc = "query A { a }\nquery B { b }\n";
+    expect(queryContext(doc, { from: 2, to: 5 }).ranges).toEqual([{ from: 2, to: 5 }]);
+    const inB = doc.indexOf("b }");
+    expect(queryContext(doc, { from: inB, to: inB }).ranges).toEqual([{ from: 14, to: 27 }]);
+    expect(outsideRanges(doc.length, [{ from: 14, to: 27 }])).toEqual([
+      { from: 0, to: 14 },
+      { from: 27, to: 28 },
+    ]);
+  });
+
+  it("counts the errors of a GraphQL response", () => {
+    expect(responseErrorCount('{"errors":[{"message":"a"},{"message":"b"}]}')).toBe(2);
+    expect(responseErrorCount('{"data":{}}')).toBe(0);
+    expect(responseErrorCount("<html>")).toBe(0);
+  });
+
+  it("escapes braces in strings so the HTTP client does not expand them", () => {
+    const json = jsonWithoutTemplates({ query: "{ a { b }}", variables: { o: { p: 1 } } });
+    expect(json).not.toContain("{{");
+    expect(JSON.parse(json)).toEqual({ query: "{ a { b }}", variables: { o: { p: 1 } } });
+  });
+
+  it("reads variables as a JSON object", () => {
+    expect(parseVariables("  ")).toEqual({ variables: null });
+    expect(parseVariables('{"code":"VN"}')).toEqual({ variables: { code: "VN" } });
+    expect("error" in parseVariables("[1]")).toBe(true);
+    expect("error" in parseVariables("{")).toBe(true);
+  });
+
+  it("posts the query as JSON with the endpoint's headers", () => {
+    expect(
+      httpRequestText({ name: "x", url: "http://h/graphql", headers: { Authorization: "Bearer t" } }, "{ a }"),
+    ).toBe(
+      'POST http://h/graphql\nContent-Type: application/json\nAuthorization: Bearer t\n\n{"query":"\\u007b a \\u007d"}\n',
+    );
+  });
+
+  it("uses the schema listing the file, else the closest config folder", () => {
+    const projects = discoverSchemas(
+      "/p",
+      [
+        {
+          path: "/p/.graphqlrc.yml",
+          config: { schema: ["schema.graphql"], endpoints: [], dynamic: false, variables: [] },
+        },
+        {
+          path: "/p/api/.graphqlrc.yml",
+          config: { schema: ["*.graphqls"], endpoints: [], dynamic: false, variables: [] },
+        },
+      ],
+      files,
+    );
+    expect(schemaOf(projects, "/p/schema.graphql")?.configPath).toBe("/p/.graphqlrc.yml");
+    expect(schemaOf(projects, "/p/api/ops/q.graphql")?.configPath).toBe("/p/api/.graphqlrc.yml");
+  });
+});
+
+describe("introspection", () => {
+  const ref = (name: string, kind = "OBJECT") => ({ kind, name, ofType: null });
+  const nonNull = (t: object) => ({ kind: "NON_NULL", name: null, ofType: t });
+  const list = (t: object) => ({ kind: "LIST", name: null, ofType: t });
+  const body = JSON.stringify({
+    data: {
+      __schema: {
+        queryType: { name: "Query" },
+        mutationType: null,
+        subscriptionType: null,
+        directives: [{ name: "include", locations: ["FIELD"], args: [] }],
+        types: [
+          {
+            kind: "OBJECT",
+            name: "Query",
+            description: "Root",
+            interfaces: [],
+            fields: [
+              {
+                name: "countries",
+                args: [{ name: "filter", type: ref("Filter", "INPUT_OBJECT"), defaultValue: null }],
+                type: nonNull(list(nonNull(ref("Country")))),
+              },
+              {
+                name: "old",
+                args: [],
+                type: ref("String", "SCALAR"),
+                isDeprecated: true,
+                deprecationReason: "Use countries",
+              },
+            ],
+          },
+          {
+            kind: "OBJECT",
+            name: "Country",
+            interfaces: [],
+            fields: [{ name: "code", args: [], type: nonNull(ref("ID", "SCALAR")) }],
+          },
+          {
+            kind: "INPUT_OBJECT",
+            name: "Filter",
+            inputFields: [{ name: "code", type: ref("String", "SCALAR"), defaultValue: '"VN"' }],
+          },
+          { kind: "ENUM", name: "Color", enumValues: [{ name: "RED" }] },
+          { kind: "SCALAR", name: "String" },
+          { kind: "OBJECT", name: "__Type", fields: [] },
+        ],
+      },
+    },
+  });
+
+  it("prints the schema as IDEA writes it: header, kinds then names, sorted fields", () => {
+    expect(introspectionToSdl(body)).toBe(`# This file was generated. Do not edit manually.
+
+schema {
+    query: Query
+}
+
+type Country {
+    code: ID!
+}
+
+"Root"
+type Query {
+    countries(filter: Filter): [Country!]!
+    old: String @deprecated(reason: "Use countries")
+}
+
+enum Color {
+    RED
+}
+
+input Filter {
+    code: String = "VN"
+}
+`);
+  });
+
+  it("fails on a response without a schema", () => {
+    expect(() => introspectionToSdl('{"errors":[{"message":"Introspection disabled"}]}')).toThrow(
+      "Introspection disabled",
+    );
+  });
+
+  it("writes to the config's first schema file, else schema.graphql", () => {
+    const [p] = discoverSchemas(
+      "/p",
+      [
+        {
+          path: "/p/graphql.config.yml",
+          config: { schema: ["types/*.graphqls", "./api.graphql"], endpoints: [], dynamic: false, variables: [] },
+        },
+      ],
+      [],
+    );
+    expect(introspectionTarget(p!)).toBe("/p/api.graphql");
+    const [d] = discoverSchemas("/p", [], []);
+    expect(introspectionTarget(d!)).toBe("/p/schema.graphql");
+  });
+});
+
+describe("endpointLines", () => {
+  it("finds each endpoint's line in YAML and JSON configs", () => {
+    const yaml = `schema: s.graphql
+extensions:
+  endpoints:
+    countries:
+      url: https://c/
+    local: http://l/
+`;
+    expect(endpointLines("graphql.config.yml", yaml)).toEqual([
+      { endpoint: "countries", line: 3 },
+      { endpoint: "local", line: 5 },
+    ]);
+    const json = `{
+  "extensions": {
+    "endpoints": {
+      "dev": "http://d/"
+    }
+  }
+}`;
+    expect(endpointLines("graphql.config.json", json)).toEqual([{ endpoint: "dev", line: 3 }]);
+    expect(endpointLines("graphql.config.yml", "schema: s.graphql")).toEqual([]);
+  });
+});
+
+describe("environment variables", () => {
+  it("lists the ${NAME} variables a config uses and expands endpoints with them", () => {
+    const c = parseConfig(
+      "graphql.config.yml",
+      `extensions:
+  endpoints:
+    api:
+      url: \${API_URL:http://localhost:4000}/graphql
+      headers:
+        Authorization: Bearer \${TOKEN}
+`,
+    );
+    expect(c.variables).toEqual(["API_URL", "TOKEN"]);
+    const api = c.endpoints[0]!;
+    expect(expandEndpoint(api, { TOKEN: "t" })).toEqual({
+      name: "api",
+      url: "http://localhost:4000/graphql",
+      headers: { Authorization: "Bearer t" },
+    });
+    expect(expandEndpoint(api, { API_URL: "https://x.dev" }).url).toBe("https://x.dev/graphql");
+  });
+});
+
+describe("environment variables dialog", () => {
+  it("copies and pastes values as NAME=value lines", async () => {
+    const { formatEnvironment, parseEnvironment } = await import("./EnvironmentDialog");
+    const names = ["API_TOKEN", "COUNTRIES_HOST"];
+    expect(formatEnvironment(names, { API_TOKEN: "t" })).toBe("API_TOKEN=t\nCOUNTRIES_HOST=");
+    expect(parseEnvironment("# comment\nAPI_TOKEN = a=b\r\nOTHER=x\nCOUNTRIES_HOST=https://h\n", names)).toEqual({
+      API_TOKEN: "a=b",
+      COUNTRIES_HOST: "https://h",
+    });
+  });
+});
+
+describe("running an endpoint with environment variables", () => {
+  it("needs the variables that have neither a value nor a default", async () => {
+    const { missingVariables } = await import("./model");
+    const endpoint = {
+      name: "env",
+      url: "${HOST:https://h}/graphql",
+      headers: { Authorization: "Bearer ${TOKEN}", "X-Team": "${TEAM}" },
+    };
+    expect(missingVariables(endpoint, {})).toEqual(["TOKEN", "TEAM"]);
+    expect(missingVariables(endpoint, { TOKEN: "t" })).toEqual(["TEAM"]);
+    expect(missingVariables(endpoint, { TOKEN: "t", TEAM: "a" })).toEqual([]);
+    // An empty value counts as not set.
+    expect(missingVariables(endpoint, { TOKEN: "", TEAM: "a" })).toEqual(["TOKEN"]);
+  });
+
+  it("shows sizes as IDEA does", async () => {
+    const { formatSize } = await import("./model");
+    expect(formatSize(286)).toBe("286 bytes");
+    expect(formatSize(1741)).toBe("1.7 kb");
+  });
+});
diff --git a/src/features/graphql/index.ts b/src/features/graphql/index.ts
new file mode 100644
index 00000000..7ef869eb
--- /dev/null
+++ b/src/features/graphql/index.ts
@@ -0,0 +1,125 @@
+/**
+ * GraphQL (IDEA's GraphQL plugin, scoped): the GraphQL tool window listing the
+ * project's schemas from graphql-config (or the default project-wide schema),
+ * their errors and endpoints, and running a query against an endpoint. Editing
+ * support (completion, diagnostics, navigation) comes from `graphql-lsp`,
+ * declared in `languages/graphql.toml`.
+ */
+import { activeEditor, registerEditorContribution } from "@/editor/api";
+import { registerActions } from "@/platform/actions";
+import { onFileOperation } from "@/platform/fileOps";
+import { basename, useProject } from "@/platform/project";
+import { registerOverlay, registerToolWindow, toolWindowService } from "@/workbench/contributions";
+import { EnvironmentDialogOverlay } from "./EnvironmentDialog";
+import { GRAPHQL_LANGUAGE, graphqlEditorExtension, runFromView } from "./editor";
+import { GraphQLTabs, GraphQLView } from "./GraphQLView";
+import { isConfigFile, isSchemaFile } from "./model";
+import {
+  TOOL_WINDOW,
+  addSchemaConfiguration,
+  discoverSchemasNow,
+  openConfiguration,
+  rerunIntrospection,
+  resetGraphQL,
+  useGraphQL,
+} from "./store";
+
+function activeGraphQLEditor() {
+  const e = activeEditor();
+  return e && e.ctx.language === GRAPHQL_LANGUAGE ? e : null;
+}
+
+export function activate(): () => void {
+  const disposers = [
+    registerToolWindow({
+      id: TOOL_WINDOW,
+      title: "GraphQL",
+      icon: "toolwindow-graphql",
+      anchor: "bottom",
+      // IDEA's stripe: right above Git (order 5).
+      order: 4,
+      stripe: "onUse",
+      component: GraphQLView,
+      headerContent: GraphQLTabs,
+    }),
+    registerEditorContribution({ id: "graphql.toolbar", order: 58, extensions: graphqlEditorExtension }),
+    registerOverlay({ id: "graphql.environment", component: EnvironmentDialogOverlay }),
+    // A reopened project starts over.
+    useProject.subscribe((s, prev) => {
+      if (s.project?.root !== prev.project?.root) resetGraphQL();
+    }),
+    // New or deleted schema / config files change what discovery finds.
+    onFileOperation((op) => {
+      if (!useGraphQL.getState().projects) return;
+      if (op.paths.some((p) => isSchemaFile(basename(p)) || isConfigFile(basename(p)))) void discoverSchemasNow();
+    }),
+    registerActions([
+      {
+        id: "graphql.showToolWindow",
+        title: "GraphQL",
+        category: "Tools",
+        icon: "toolwindow-graphql",
+        keywords: ["schema", "endpoints", "graphql-config"],
+        when: "projectOpen",
+        run: () => toolWindowService().show(TOOL_WINDOW, true),
+      },
+      {
+        id: "graphql.addConfiguration",
+        title: "Add Schema Configuration",
+        description: "Open the project's graphql-config, creating graphql.config.yml when there is none",
+        category: "Tools",
+        icon: "plus",
+        keywords: ["graphql", "graphql-config", "graphqlrc", "schema"],
+        when: "projectOpen",
+        run: () => addSchemaConfiguration(),
+      },
+      {
+        id: "graphql.editConfiguration",
+        title: "Open Configuration File",
+        description: "Opens the GraphQL config file for the current file's schema",
+        category: "Tools",
+        icon: "settings",
+        keywords: ["graphql", "graphql-config", "graphqlrc", "settings"],
+        when: "projectOpen",
+        run: () => openConfiguration(activeGraphQLEditor()?.ctx.path),
+      },
+      {
+        id: "graphql.introspect",
+        title: "Rerun Introspection Query",
+        description: "Reruns the latest introspection query to update the local schema file",
+        category: "Tools",
+        icon: "refresh",
+        keywords: ["graphql", "introspection", "schema", "endpoint", "download"],
+        when: "editorLangId == graphql",
+        run: async () => {
+          const e = activeGraphQLEditor();
+          if (e) await rerunIntrospection(e.ctx.path);
+        },
+      },
+      {
+        id: "graphql.restartDiscovery",
+        title: "Restart Schema Discovery",
+        description: "Find the project's GraphQL schemas and configurations again",
+        category: "Tools",
+        icon: "refresh",
+        keywords: ["graphql", "schema", "refresh", "reload"],
+        when: "projectOpen",
+        run: () => discoverSchemasNow(),
+      },
+      {
+        id: "graphql.runQuery",
+        title: "Execute GraphQL",
+        description: "Executes the current GraphQL file against the specified GraphQL endpoint",
+        category: "Run",
+        icon: "run",
+        keywords: ["graphql", "run", "execute", "query", "endpoint"],
+        when: "editorTextFocus && editorLangId == graphql",
+        run: async () => {
+          const e = activeGraphQLEditor();
+          if (e) await runFromView(e.ctx.path, e.view);
+        },
+      },
+    ]),
+  ];
+  return () => disposers.forEach((d) => d());
+}
diff --git a/src/features/graphql/model.ts b/src/features/graphql/model.ts
new file mode 100644
index 00000000..088b5074
--- /dev/null
+++ b/src/features/graphql/model.ts
@@ -0,0 +1,882 @@
+/**
+ * GraphQL schema discovery (IDEA's GraphQL plugin, scoped): which files make up
+ * a schema, read from graphql-config files (`.graphqlrc*`, `graphql.config.*`)
+ * or, without one, every GraphQL file of the project ("Default project-wide
+ * schema"), and which endpoints a configuration declares. Pure: the store reads
+ * the files, this module interprets them.
+ */
+import type { Diagnostic } from "@/bindings";
+import { tx } from "@/platform/i18n";
+
+export const SCHEMA_EXTENSIONS = ["graphql", "graphqls", "gql"];
+
+/** graphql-config file names, most specific first (as `languages/graphql.toml` root markers). */
+export const CONFIG_NAMES = [
+  "graphql.config.yml",
+  "graphql.config.yaml",
+  "graphql.config.json",
+  "graphql.config.js",
+  "graphql.config.ts",
+  ".graphqlrc",
+  ".graphqlrc.yml",
+  ".graphqlrc.yaml",
+  ".graphqlrc.json",
+];
+
+/** Written by "Add Schema Configuration" (IDEA's template). */
+export const CONFIG_TEMPLATE = `schema: schema.graphql
+documents: '**/*.graphql'
+`;
+
+export interface Endpoint {
+  name: string;
+  url: string;
+  headers: Record<string, string>;
+}
+
+export interface GraphQLConfig {
+  /** Globs (relative to the config's folder) or URLs of introspected schemas. */
+  schema: string[];
+  endpoints: Endpoint[];
+  /** A JS/TS config: its contents are code and are not evaluated. */
+  dynamic: boolean;
+  /** Environment variables it uses (`${NAME}`, `${NAME:default}`). */
+  variables: string[];
+}
+
+/** Definitions counted the way IDEA's "Schema discovery summary" reports them. */
+export interface SchemaStats {
+  /** Object, interface, union and scalar types. */
+  types: number;
+  inputs: number;
+  enums: number;
+  directives: number;
+}
+
+/** A named type a definition refers to, checked against the whole schema. */
+export interface TypeReference {
+  name: string;
+  /** The type declaring the field (or the union / implementing type). */
+  owner: string;
+  line: number;
+  col: number;
+}
+
+export interface SchemaFile {
+  path: string;
+  stats: SchemaStats;
+  /** Type names it defines. */
+  defined: string[];
+  references: TypeReference[];
+}
+
+/** One schema: a config file's, or the project-wide default one. */
+export interface SchemaProject {
+  key: string;
+  /** The config file; null for the default schema. */
+  configPath: string | null;
+  /** The folder its globs are relative to. */
+  root: string;
+  /** The config's local schema pointers (globs or files), relative to `root`. */
+  pointers: string[];
+  files: SchemaFile[];
+  /** Schema pointers that are URLs (introspected remotely, not read here). */
+  remote: string[];
+  endpoints: Endpoint[];
+  dynamic: boolean;
+  /** Environment variables its config uses. */
+  variables: string[];
+}
+
+export function isSchemaFile(name: string): boolean {
+  const dot = name.lastIndexOf(".");
+  return dot > 0 && SCHEMA_EXTENSIONS.includes(name.slice(dot + 1).toLowerCase());
+}
+
+export function isConfigFile(name: string): boolean {
+  return CONFIG_NAMES.includes(name);
+}
+
+// --- config parsing --------------------------------------------------------------------------
+
+type Value = string | Value[] | { [key: string]: Value };
+
+/** The YAML a graphql-config uses: nested maps, `-` lists, scalars and flow lists. */
+export function parseYaml(text: string): Value {
+  const lines = text
+    .split(/\r?\n/)
+    .map((raw) => ({ indent: raw.search(/\S/), text: stripComment(raw).trim() }))
+    .filter((l) => l.indent >= 0 && l.text && l.text !== "---");
+  let i = 0;
+  const isItem = (t: string) => t === "-" || t.startsWith("- ");
+
+  function block(indent: number): Value {
+    const line = lines[i];
+    if (!line || line.indent < indent) return "";
+    return isItem(line.text) ? list(line.indent) : map(line.indent);
+  }
+
+  function list(indent: number): Value[] {
+    const out: Value[] = [];
+    for (let line = lines[i]; line && line.indent === indent && isItem(line.text); line = lines[i]) {
+      const rest = line.text.slice(1).trim();
+      if (!rest) {
+        i++;
+        out.push(block(indent + 1));
+      } else if (keyOf(rest)) {
+        // "- key: value" opens a map whose further keys are indented past the dash.
+        lines[i] = { indent: indent + 2, text: rest };
+        out.push(map(indent + 2));
+      } else {
+        i++;
+        out.push(scalar(rest));
+      }
+    }
+    return out;
+  }
+
+  function map(indent: number): Value {
+    const out: { [key: string]: Value } = {};
+    for (let line = lines[i]; line && line.indent === indent; line = lines[i]) {
+      const kv = keyOf(line.text);
+      if (!kv) break;
+      i++;
+      out[kv.key] = kv.value ? scalar(kv.value) : block(indent + 1);
+    }
+    return out;
+  }
+
+  return block(0);
+}
+
+function stripComment(line: string): string {
+  let quote: string | null = null;
+  for (let i = 0; i < line.length; i++) {
+    const c = line[i];
+    if (quote) {
+      if (c === quote) quote = null;
+    } else if (c === "'" || c === '"') quote = c;
+    else if (c === "#" && (i === 0 || /\s/.test(line[i - 1] ?? ""))) return line.slice(0, i);
+  }
+  return line;
+}
+
+function keyOf(text: string): { key: string; value: string } | null {
+  const m = /^("[^"]*"|'[^']*'|[^\s:'"][^:]*?)\s*:(?:\s+(.*))?$/.exec(text);
+  return m ? { key: unquote(m[1] ?? ""), value: m[2]?.trim() ?? "" } : null;
+}
+
+function scalar(text: string): Value {
+  if (text.startsWith("[") && text.endsWith("]")) {
+    const inner = text.slice(1, -1).trim();
+    return inner ? inner.split(",").map((s) => unquote(s.trim())) : [];
+  }
+  return unquote(text);
+}
+
+function unquote(s: string): string {
+  return s.length >= 2 && (s[0] === '"' || s[0] === "'") && s.at(-1) === s[0] ? s.slice(1, -1) : s;
+}
+
+function asStrings(v: unknown): string[] {
+  if (typeof v === "string") return v ? [v] : [];
+  if (Array.isArray(v)) return v.flatMap(asStrings);
+  // `schema: { "https://api/graphql": { headers } }`: the pointer is the key.
+  if (v && typeof v === "object") return Object.keys(v);
+  return [];
+}
+
+function asHeaders(v: unknown): Record<string, string> {
+  if (!v || typeof v !== "object" || Array.isArray(v)) return {};
+  return Object.fromEntries(Object.entries(v).filter((e): e is [string, string] => typeof e[1] === "string"));
+}
+
+function asEndpoints(v: unknown): Endpoint[] {
+  if (!v || typeof v !== "object" || Array.isArray(v)) return [];
+  return Object.entries(v).flatMap(([name, e]): Endpoint[] => {
+    if (typeof e === "string") return [{ name, url: e, headers: {} }];
+    if (e && typeof e === "object" && !Array.isArray(e) && typeof (e as { url?: unknown }).url === "string") {
+      const { url, headers } = e as { url: string; headers?: unknown };
+      return [{ name, url, headers: asHeaders(headers) }];
+    }
+    return [];
+  });
+}
+
+/** Reads a graphql-config file (graphql-config v3+, and the legacy `schemaPath`). */
+export function parseConfig(name: string, text: string): GraphQLConfig {
+  const variables = [...new Set([...text.matchAll(ENV_VARIABLE)].map((m) => m[1] ?? ""))];
+  const empty = { schema: [], endpoints: [], variables };
+  if (/\.(js|ts)$/.test(name)) return { ...empty, dynamic: true };
+  let data: unknown;
+  try {
+    data = name.endsWith(".json") || /^\s*\{/.test(text) ? JSON.parse(text) : parseYaml(text);
+  } catch {
+    return { ...empty, dynamic: false };
+  }
+  if (!data || typeof data !== "object" || Array.isArray(data)) return { ...empty, dynamic: false };
+  const o = data as Record<string, unknown>;
+  const extensions = (o.extensions ?? {}) as Record<string, unknown>;
+  return {
+    schema: [...asStrings(o.schema), ...asStrings(o.schemaPath)],
+    endpoints: asEndpoints(extensions.endpoints),
+    dynamic: false,
+    variables,
+  };
+}
+
+/** graphql-config's environment variables: `${NAME}` or `${NAME:default}`. */
+const ENV_VARIABLE = /\$\{([A-Za-z_]\w*)(?::([^}]*))?\}/g;
+
+/** `text` with its `${NAME}` / `${NAME:default}` replaced from `values` (else the default, else ""). */
+export function expandVariables(text: string, values: Readonly<Record<string, string>>): string {
+  return text.replace(ENV_VARIABLE, (_m, name: string, fallback?: string) => values[name] ?? fallback ?? "");
+}
+
+/** Variables `endpoint` uses that have neither a value nor a default: it cannot run before they are set. */
+export function missingVariables(endpoint: Endpoint, values: Readonly<Record<string, string>>): string[] {
+  const missing = new Set<string>();
+  for (const text of [endpoint.url, ...Object.values(endpoint.headers)])
+    for (const [, name = "", fallback] of text.matchAll(ENV_VARIABLE))
+      if (!values[name] && fallback === undefined) missing.add(name);
+  return [...missing];
+}
+
+/** A response size as IDEA's result header shows it: "286 bytes", "1.7 kb". */
+export function formatSize(bytes: number): string {
+  return bytes < 1024 ? `${bytes} bytes` : `${(bytes / 1024).toFixed(1)} kb`;
+}
+
+/** `endpoint` with its URL and headers expanded. */
+export function expandEndpoint(endpoint: Endpoint, values: Readonly<Record<string, string>>): Endpoint {
+  return {
+    ...endpoint,
+    url: expandVariables(endpoint.url, values),
+    headers: Object.fromEntries(Object.entries(endpoint.headers).map(([k, v]) => [k, expandVariables(v, values)])),
+  };
+}
+
+/** 0-based lines declaring the endpoints of a config file, for its ▶ gutter (YAML or JSON). */
+export function endpointLines(name: string, text: string): Array<{ endpoint: string; line: number }> {
+  const endpoints = parseConfig(name, text).endpoints;
+  if (!endpoints.length) return [];
+  const lines = text.split(/\r?\n/);
+  const section = lines.findIndex((l) => /^\s*["']?endpoints["']?\s*:/.test(l));
+  if (section < 0) return [];
+  const escape = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return endpoints.flatMap(({ name: endpoint }) => {
+    const key = new RegExp(`^\\s*["']?${escape(endpoint)}["']?\\s*:`);
+    const at = lines.findIndex((l, i) => i > section && key.test(l));
+    return at < 0 ? [] : [{ endpoint, line: at }];
+  });
+}
+
+// --- schema files ----------------------------------------------------------------------------
+
+/** `**`, `*`, `?` and `{a,b}` globs, matched against a `/`-separated relative path. */
+export function globToRegExp(pattern: string): RegExp {
+  const glob = pattern.replace(/^\.\//, "");
+  let re = "";
+  for (let i = 0; i < glob.length; i++) {
+    const c = glob.charAt(i);
+    if (c === "*" && glob[i + 1] === "*") {
+      i++;
+      if (glob[i + 1] === "/") {
+        i++;
+        re += "(?:.*/)?";
+      } else re += ".*";
+    } else if (c === "*") re += "[^/]*";
+    else if (c === "?") re += "[^/]";
+    else if (c === "{") {
+      const end = glob.indexOf("}", i);
+      if (end < 0) re += "\\{";
+      else {
+        re += `(?:${glob
+          .slice(i + 1, end)
+          .split(",")
+          .map((s) => s.replace(/[.+^$()|[\]\\]/g, "\\$&"))
+          .join("|")})`;
+        i = end;
+      }
+    } else re += c.replace(/[.+^$()|[\]\\]/g, "\\$&");
+  }
+  return new RegExp(`^${re}$`);
+}
+
+export function isUrl(pointer: string): boolean {
+  return /^https?:\/\//i.test(pointer);
+}
+
+const BUILTIN_TYPES = ["String", "Int", "Float", "Boolean", "ID"];
+
+const DEFINITION =
+  /\b(extend[ \t]+)?(type|interface|enum|input|union|scalar)[ \t]+([_A-Za-z]\w*)|\bdirective[ \t]+@([_A-Za-z]\w*)/g;
+
+/** Comments and strings blanked out, offsets kept (so positions still match `text`). */
+function codeOnly(text: string): string {
+  const blank = (s: string) => s.replace(/[^\n]/g, " ");
+  return text.replace(/"""[\s\S]*?"""|"(?:[^"\\\n]|\\.)*"|#[^\n]*/g, blank);
+}
+
+/** The body of the `{ … }` block starting at `open`, or "" when there is none. */
+function blockAt(code: string, open: number): { body: string; start: number } {
+  const close = code.indexOf("}", open);
+  return close < 0 ? { body: "", start: open } : { body: code.slice(open + 1, close), start: open + 1 };
+}
+
+/** Definitions and type references of a schema file (a light parse, enough for discovery). */
+export function analyzeSchema(text: string): Pick<SchemaFile, "stats" | "defined" | "references"> {
+  const code = codeOnly(text);
+  const lineStarts = [0];
+  for (let i = 0; i < code.length; i++) if (code[i] === "\n") lineStarts.push(i + 1);
+  const position = (offset: number) => {
+    let line = 0;
+    while (line + 1 < lineStarts.length && (lineStarts[line + 1] ?? Infinity) <= offset) line++;
+    return { line, col: offset - (lineStarts[line] ?? 0) };
+  };
+  const stats: SchemaStats = { types: 0, inputs: 0, enums: 0, directives: 0 };
+  const defined = new Set<string>();
+  const references: TypeReference[] = [];
+  const refer = (name: string, owner: string, offset: number) => references.push({ name, owner, ...position(offset) });
+
+  for (const m of code.matchAll(DEFINITION)) {
+    const [whole, extend, kind, name, directive] = m;
+    const at = m.index ?? 0;
+    if (directive) {
+      stats.directives++;
+      continue;
+    }
+    if (!kind || !name) continue;
+    if (!extend && !defined.has(name)) {
+      defined.add(name);
+      if (kind === "input") stats.inputs++;
+      else if (kind === "enum") stats.enums++;
+      else stats.types++;
+    }
+    const after = at + whole.length;
+    const headerEnd = (() => {
+      const brace = code.indexOf("{", after);
+      const next = code
+        .slice(after)
+        .search(/\n[ \t]*(?:extend\b|type\b|interface\b|enum\b|input\b|union\b|scalar\b|directive\b|schema\b)/);
+      const nextAt = next < 0 ? code.length : after + next;
+      return brace >= 0 && brace < nextAt ? brace : nextAt;
+    })();
+    const header = code.slice(after, headerEnd);
+    if (kind === "union" || /\bimplements\b/.test(header)) {
+      const list =
+        kind === "union" ? header.slice(header.indexOf("=") + 1) : header.slice(header.indexOf("implements") + 10);
+      const listAt = after + header.length - list.length;
+      for (const r of list.matchAll(/[_A-Za-z]\w*/g)) refer(r[0], name, listAt + (r.index ?? 0));
+    }
+    if (kind === "enum" || kind === "scalar" || kind === "union" || code[headerEnd] !== "{") continue;
+    // Field and argument types: the name after each `:` (past `[`) in the block.
+    const { body, start } = blockAt(code, headerEnd);
+    for (const r of body.matchAll(/:\s*\[*\s*([_A-Za-z]\w*)/g)) {
+      const typeName = r[1] ?? "";
+      refer(typeName, name, start + (r.index ?? 0) + r[0].length - typeName.length);
+    }
+  }
+  return { stats, defined: [...defined], references };
+}
+
+/** Named types used but defined nowhere in the schema (IDEA's "Schema errors"). */
+export function unresolvedTypes(project: SchemaProject): Array<{ path: string; diagnostic: Diagnostic }> {
+  const known = new Set([...BUILTIN_TYPES, ...project.files.flatMap((f) => f.defined)]);
+  return project.files.flatMap((f) =>
+    f.references
+      .filter((r) => !known.has(r.name))
+      .map((r) => ({
+        path: f.path,
+        diagnostic: {
+          range: { start: { line: r.line, col: r.col }, end: { line: r.line, col: r.col + r.name.length } },
+          severity: "error" as const,
+          message: tx`The field type '${r.name}' is not present when resolving type '${r.owner}'`,
+          source: "graphql",
+          code: null,
+        },
+      })),
+  );
+}
+
+export function schemaStats(project: SchemaProject): SchemaStats {
+  const total: SchemaStats = { types: 0, inputs: 0, enums: 0, directives: 0 };
+  for (const f of project.files) {
+    total.types += f.stats.types;
+    total.inputs += f.stats.inputs;
+    total.enums += f.stats.enums;
+    total.directives += f.stats.directives;
+  }
+  return total;
+}
+
+function relativeTo(root: string, path: string): string | null {
+  if (root === "/") return path.replace(/^\//, "");
+  return path.startsWith(root + "/") ? path.slice(root.length + 1) : null;
+}
+
+/**
+ * The schemas of a project: one per config file, its `schema` globs picking files under
+ * the config's folder; with no config, every GraphQL file is in the default schema.
+ */
+export function discoverSchemas(
+  root: string,
+  configs: ReadonlyArray<{ path: string; config: GraphQLConfig }>,
+  files: readonly SchemaFile[],
+): SchemaProject[] {
+  if (!configs.length) {
+    return [
+      {
+        key: "default",
+        configPath: null,
+        root,
+        pointers: [],
+        files: [...files].sort((a, b) => a.path.localeCompare(b.path)),
+        remote: [],
+        endpoints: [],
+        dynamic: false,
+        variables: [],
+      },
+    ];
+  }
+  return [...configs]
+    .sort((a, b) => a.path.localeCompare(b.path))
+    .map(({ path, config }) => {
+      const dir = path.slice(0, path.lastIndexOf("/")) || "/";
+      const globs = config.schema.filter((p) => !isUrl(p)).map(globToRegExp);
+      return {
+        key: path,
+        configPath: path,
+        root: dir,
+        pointers: config.schema.filter((p) => !isUrl(p)),
+        files: files
+          .filter((f) => {
+            const rel = relativeTo(dir, f.path);
+            return rel !== null && globs.some((g) => g.test(rel));
+          })
+          .sort((a, b) => a.path.localeCompare(b.path)),
+        remote: config.schema.filter(isUrl),
+        endpoints: config.endpoints,
+        dynamic: config.dynamic,
+        variables: config.variables,
+      };
+    });
+}
+
+// --- tool window tree ------------------------------------------------------------------------
+
+export type SchemaNode =
+  | { kind: "project"; key: string; project: SchemaProject }
+  | { kind: "summary"; key: string; project: SchemaProject }
+  | { kind: "file"; key: string; file: SchemaFile }
+  | { kind: "remote"; key: string; url: string }
+  | { kind: "errors"; key: string; project: SchemaProject }
+  | { kind: "error"; key: string; path: string; diagnostic: Diagnostic }
+  | { kind: "noErrors"; key: string }
+  | { kind: "endpoints"; key: string; project: SchemaProject }
+  | { kind: "endpoint"; key: string; endpoint: Endpoint }
+  | { kind: "noEndpoints"; key: string; project: SchemaProject };
+
+export function projectNodes(projects: readonly SchemaProject[]): SchemaNode[] {
+  return projects.map((project) => ({ kind: "project", key: project.key, project }));
+}
+
+/**
+ * A schema's errors: unresolved types found by discovery, and the errors and warnings
+ * the language server reports for its open files (the same problem only once).
+ */
+export function schemaProblems(
+  project: SchemaProject,
+  diagnosticsFor: (path: string) => readonly Diagnostic[],
+): Array<{ path: string; diagnostic: Diagnostic }> {
+  const own = unresolvedTypes(project);
+  const seen = new Set(own.map(({ path, diagnostic: d }) => `${path}:${d.range.start.line}:${d.range.start.col}`));
+  const reported = project.files.flatMap((f) =>
+    diagnosticsFor(f.path)
+      .filter((d) => d.severity === "error" || d.severity === "warning")
+      .filter((d) => !seen.has(`${f.path}:${d.range.start.line}:${d.range.start.col}`))
+      .map((diagnostic) => ({ path: f.path, diagnostic })),
+  );
+  return [...own, ...reported];
+}
+
+export function childNodes(
+  node: SchemaNode,
+  diagnosticsFor: (path: string) => readonly Diagnostic[],
+): SchemaNode[] | undefined {
+  const k = node.key;
+  switch (node.kind) {
+    case "project":
+      return [
+        { kind: "summary", key: `${k}#summary`, project: node.project },
+        { kind: "errors", key: `${k}#errors`, project: node.project },
+        { kind: "endpoints", key: `${k}#endpoints`, project: node.project },
+      ];
+    case "summary":
+      return [
+        ...node.project.files.map((file): SchemaNode => ({ kind: "file", key: `${k}:${file.path}`, file })),
+        ...node.project.remote.map((url): SchemaNode => ({ kind: "remote", key: `${k}:${url}`, url })),
+      ];
+    case "errors": {
+      const problems = schemaProblems(node.project, diagnosticsFor);
+      if (!problems.length) return [{ kind: "noErrors", key: `${k}:none` }];
+      return problems.map(({ path, diagnostic: d }, i) => ({
+        kind: "error",
+        key: `${k}:${i}:${path}:${d.range.start.line}:${d.range.start.col}`,
+        path,
+        diagnostic: d,
+      }));
+    }
+    case "endpoints":
+      if (!node.project.endpoints.length) return [{ kind: "noEndpoints", key: `${k}:none`, project: node.project }];
+      return node.project.endpoints.map((endpoint) => ({ kind: "endpoint", key: `${k}:${endpoint.name}`, endpoint }));
+    default:
+      return undefined;
+  }
+}
+
+// --- query execution -------------------------------------------------------------------------
+
+/** A top-level definition of an executable document. */
+export interface Definition {
+  kind: "operation" | "fragment" | "other";
+  name: string | null;
+  from: number;
+  to: number;
+}
+
+/** Top-level definitions of `doc`, found by brace matching outside comments and strings. */
+export function topLevelDefinitions(doc: string): Definition[] {
+  const code = codeOnly(doc);
+  const out: Definition[] = [];
+  let i = 0;
+  while (i < code.length) {
+    while (i < code.length && /[\s,]/.test(code.charAt(i))) i++;
+    if (i >= code.length) break;
+    const from = i;
+    const open = code.indexOf("{", i);
+    if (open < 0) break;
+    let depth = 0;
+    let j = open;
+    for (; j < code.length; j++) {
+      if (code[j] === "{") depth++;
+      else if (code[j] === "}" && --depth === 0) break;
+    }
+    const to = Math.min(j + 1, code.length);
+    const header = code.slice(from, open).trim();
+    const m = /^(query|mutation|subscription|fragment)\b\s*([_A-Za-z]\w*)?/.exec(header);
+    const kind = !header || (m && m[1] !== "fragment") ? "operation" : m ? "fragment" : "other";
+    out.push({ kind, name: m?.[2] ?? null, from, to });
+    i = to;
+  }
+  return out;
+}
+
+export interface QueryContext {
+  /** What is sent. */
+  text: string;
+  /** The parts of the document it comes from (the rest is greyed out, as in IDEA). */
+  ranges: Array<{ from: number; to: number }>;
+}
+
+/**
+ * What Execute GraphQL sends, as IDEA's GraphQL plugin picks it: the selection; else the
+ * operation around the caret with the fragments it uses; else the whole document.
+ */
+export function queryContext(doc: string, selection: { from: number; to: number } | null): QueryContext {
+  if (selection && selection.to > selection.from)
+    return { text: doc.slice(selection.from, selection.to).trim(), ranges: [selection] };
+  const whole = { text: doc.trim(), ranges: [{ from: 0, to: doc.length }] };
+  const defs = topLevelDefinitions(doc);
+  const caret = selection?.from ?? -1;
+  const op = defs.find((d) => d.kind === "operation" && d.from <= caret && caret <= d.to);
+  if (!op) return whole;
+  const code = codeOnly(doc);
+  const fragments = new Map(defs.filter((d) => d.kind === "fragment" && d.name).map((d) => [d.name!, d]));
+  const used = new Set<string>();
+  const visit = (d: Definition) => {
+    for (const s of code.slice(d.from, d.to).matchAll(/\.\.\.\s*([_A-Za-z]\w*)/g)) {
+      const name = s[1] ?? "";
+      const fragment = fragments.get(name);
+      if (name === "on" || !fragment || used.has(name)) continue;
+      used.add(name);
+      visit(fragment);
+    }
+  };
+  visit(op);
+  const sent = defs.filter((d) => d === op || (d.kind === "fragment" && used.has(d.name ?? "")));
+  return {
+    text: sent.map((d) => doc.slice(d.from, d.to)).join("\n\n"),
+    ranges: sent.map(({ from, to }) => ({ from, to })),
+  };
+}
+
+export function queryText(doc: string, selection: { from: number; to: number } | null): string {
+  return queryContext(doc, selection).text;
+}
+
+/** The parts of `[0, length)` outside `ranges` (sorted, non-overlapping). */
+export function outsideRanges(
+  length: number,
+  ranges: ReadonlyArray<{ from: number; to: number }>,
+): Array<{ from: number; to: number }> {
+  const out: Array<{ from: number; to: number }> = [];
+  let pos = 0;
+  for (const r of [...ranges].sort((a, b) => a.from - b.from)) {
+    if (r.from > pos) out.push({ from: pos, to: r.from });
+    pos = Math.max(pos, r.to);
+  }
+  if (pos < length) out.push({ from: pos, to: length });
+  return out;
+}
+
+/** Errors in a GraphQL response body (`errors` array), 0 when it is not a GraphQL response. */
+export function responseErrorCount(body: string | null): number {
+  if (!body) return 0;
+  try {
+    const errors = (JSON.parse(body) as { errors?: unknown }).errors;
+    return Array.isArray(errors) ? errors.length : 0;
+  } catch {
+    return 0;
+  }
+}
+
+/** An `.http` request posting `query` (and `variables`) to `endpoint`, for the HTTP client to execute. */
+export function httpRequestText(
+  endpoint: Endpoint,
+  query: string,
+  variables: Record<string, unknown> | null = null,
+): string {
+  const headers = { "Content-Type": "application/json", ...endpoint.headers };
+  return [
+    `POST ${endpoint.url}`,
+    ...Object.entries(headers).map(([k, v]) => `${k}: ${v}`),
+    "",
+    jsonWithoutTemplates(variables ? { query, variables } : { query }),
+    "",
+  ].join("\n");
+}
+
+/**
+ * JSON the HTTP client sends as written: it expands `{{name}}`, which a GraphQL
+ * selection (`{ a { b }}`) can contain, so braces inside strings are escaped.
+ */
+export function jsonWithoutTemplates(value: unknown): string {
+  return JSON.stringify(value).replace(/"(?:[^"\\]|\\.)*"/g, (s) =>
+    s.replace(/[{}]/g, (c) => (c === "{" ? "\\u007b" : "\\u007d")),
+  );
+}
+
+/** The variables editor's text: empty, or a JSON object. */
+export function parseVariables(text: string): { variables: Record<string, unknown> | null } | { error: string } {
+  if (!text.trim()) return { variables: null };
+  try {
+    const v: unknown = JSON.parse(text);
+    if (v && typeof v === "object" && !Array.isArray(v)) return { variables: v as Record<string, unknown> };
+  } catch (e) {
+    return { error: e instanceof Error ? e.message : String(e) };
+  }
+  return { error: "Variables must be a JSON object" };
+}
+
+/** Pretty-prints a JSON body; other bodies are shown as received. */
+export function formatBody(body: string | null): string {
+  if (body === null) return "";
+  try {
+    return JSON.stringify(JSON.parse(body), null, 2);
+  } catch {
+    return body;
+  }
+}
+
+// --- introspection ---------------------------------------------------------------------------
+
+/** graphql-js `getIntrospectionQuery()` with descriptions. */
+export const INTROSPECTION_QUERY = `query IntrospectionQuery {
+  __schema {
+    queryType { name }
+    mutationType { name }
+    subscriptionType { name }
+    types { ...FullType }
+    directives { name description locations args { ...InputValue } }
+  }
+}
+fragment FullType on __Type {
+  kind name description
+  fields(includeDeprecated: true) {
+    name description args { ...InputValue } type { ...TypeRef } isDeprecated deprecationReason
+  }
+  inputFields { ...InputValue }
+  interfaces { ...TypeRef }
+  enumValues(includeDeprecated: true) { name description isDeprecated deprecationReason }
+  possibleTypes { ...TypeRef }
+}
+fragment InputValue on __InputValue { name description type { ...TypeRef } defaultValue }
+fragment TypeRef on __Type {
+  kind name ofType { kind name ofType { kind name ofType { kind name ofType {
+    kind name ofType { kind name ofType { kind name ofType { kind name } } } } } } }
+}`;
+
+interface TypeRef {
+  kind: string;
+  name: string | null;
+  ofType?: TypeRef | null;
+}
+interface InputValue {
+  name: string;
+  description?: string | null;
+  type: TypeRef;
+  defaultValue?: string | null;
+}
+interface Deprecation {
+  isDeprecated?: boolean;
+  deprecationReason?: string | null;
+}
+interface Field extends Deprecation {
+  name: string;
+  description?: string | null;
+  args?: InputValue[];
+  type: TypeRef;
+}
+interface EnumValue extends Deprecation {
+  name: string;
+  description?: string | null;
+}
+interface FullType {
+  kind: string;
+  name: string;
+  description?: string | null;
+  fields?: Field[] | null;
+  inputFields?: InputValue[] | null;
+  interfaces?: TypeRef[] | null;
+  enumValues?: EnumValue[] | null;
+  possibleTypes?: TypeRef[] | null;
+}
+interface IntrospectionSchema {
+  queryType?: { name: string } | null;
+  mutationType?: { name: string } | null;
+  subscriptionType?: { name: string } | null;
+  types: FullType[];
+  directives?: Array<{ name: string; description?: string | null; locations: string[]; args?: InputValue[] }>;
+}
+
+const BUILTIN_SCALARS = new Set(["String", "Int", "Float", "Boolean", "ID"]);
+/** Spec directives every server has; `@oneOf` is printed, as IDEA does. */
+const BUILTIN_DIRECTIVES = new Set(["include", "skip", "deprecated", "specifiedBy"]);
+
+/** First line of a schema file written by "Get GraphQL Schema from Endpoint" (IDEA's). */
+export const GENERATED_HEADER = "# This file was generated. Do not edit manually.";
+
+/** IDEA (graphql-java's SchemaPrinter) indents by four spaces. */
+const INDENT = "    ";
+
+/** IDEA prints types grouped by kind, each group by name. */
+const KIND_ORDER = ["INTERFACE", "UNION", "OBJECT", "ENUM", "SCALAR", "INPUT_OBJECT"];
+
+const byName = <T extends { name: string }>(list: readonly T[] | null | undefined): T[] =>
+  [...(list ?? [])].sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+
+function printTypeRef(t: TypeRef): string {
+  if (t.kind === "NON_NULL" && t.ofType) return `${printTypeRef(t.ofType)}!`;
+  if (t.kind === "LIST" && t.ofType) return `[${printTypeRef(t.ofType)}]`;
+  return t.name ?? "";
+}
+
+function printDescription(text: string | null | undefined, indent: string): string {
+  if (!text) return "";
+  if (!text.includes("\n")) return `${indent}${JSON.stringify(text)}\n`;
+  const body = text
+    .replace(/"""/g, '\\"""')
+    .split("\n")
+    .map((l) => (l ? indent + l : l))
+    .join("\n");
+  return `${indent}"""\n${body}\n${indent}"""\n`;
+}
+
+function printDeprecated(d: Deprecation): string {
+  if (!d.isDeprecated) return "";
+  return d.deprecationReason && d.deprecationReason !== "No longer supported"
+    ? ` @deprecated(reason: ${JSON.stringify(d.deprecationReason)})`
+    : " @deprecated";
+}
+
+function printInputValue(v: InputValue): string {
+  return `${v.name}: ${printTypeRef(v.type)}${v.defaultValue != null ? ` = ${v.defaultValue}` : ""}`;
+}
+
+function printArgs(list: InputValue[] | undefined): string {
+  return list?.length ? `(${list.map(printInputValue).join(", ")})` : "";
+}
+
+function printBlock(lines: string[]): string {
+  return lines.length ? ` {\n${lines.join("\n")}\n}` : "";
+}
+
+function printType(t: FullType): string {
+  const head = printDescription(t.description, "");
+  switch (t.kind) {
+    case "SCALAR":
+      return `${head}scalar ${t.name}`;
+    case "OBJECT":
+    case "INTERFACE": {
+      const impl = t.interfaces?.length ? ` implements ${t.interfaces.map(printTypeRef).join(" & ")}` : "";
+      const fields = byName(t.fields).map(
+        (f) =>
+          `${printDescription(f.description, INDENT)}${INDENT}${f.name}${printArgs(f.args)}: ${printTypeRef(f.type)}${printDeprecated(f)}`,
+      );
+      return `${head}${t.kind === "OBJECT" ? "type" : "interface"} ${t.name}${impl}${printBlock(fields)}`;
+    }
+    case "UNION":
+      return `${head}union ${t.name} = ${(t.possibleTypes ?? []).map(printTypeRef).join(" | ")}`;
+    case "ENUM":
+      return `${head}enum ${t.name}${printBlock(
+        (t.enumValues ?? []).map(
+          (v) => `${printDescription(v.description, INDENT)}${INDENT}${v.name}${printDeprecated(v)}`,
+        ),
+      )}`;
+    case "INPUT_OBJECT":
+      return `${head}input ${t.name}${printBlock(
+        byName(t.inputFields).map((v) => `${printDescription(v.description, INDENT)}${INDENT}${printInputValue(v)}`),
+      )}`;
+    default:
+      return "";
+  }
+}
+
+/**
+ * The schema file "Get GraphQL Schema from Endpoint" writes for an introspection response
+ * body (`{"data":{"__schema":…}}`), laid out as IDEA writes it. Throws when there is no schema.
+ */
+export function introspectionToSdl(body: string): string {
+  const json = JSON.parse(body) as { data?: { __schema?: IntrospectionSchema }; errors?: Array<{ message: string }> };
+  const schema = json.data?.__schema;
+  if (!schema) throw new Error(json.errors?.map((e) => e.message).join("\n") || "The response has no __schema");
+  const roots: Array<[string, string | undefined]> = [
+    ["query", schema.queryType?.name],
+    ["mutation", schema.mutationType?.name],
+    ["subscription", schema.subscriptionType?.name],
+  ];
+  const ops = roots.filter(([, name]) => name).map(([op, name]) => `${INDENT}${op}: ${name}`);
+  const parts = [`schema {\n${ops.join("\n")}\n}`];
+  for (const d of byName(schema.directives)) {
+    if (BUILTIN_DIRECTIVES.has(d.name)) continue;
+    parts.push(
+      `${printDescription(d.description, "")}directive @${d.name}${printArgs(d.args)} on ${d.locations.join(" | ")}`,
+    );
+  }
+  const types = schema.types.filter(
+    (t) => !t.name.startsWith("__") && !(t.kind === "SCALAR" && BUILTIN_SCALARS.has(t.name)),
+  );
+  for (const kind of KIND_ORDER) for (const t of byName(types.filter((x) => x.kind === kind))) parts.push(printType(t));
+  return `${GENERATED_HEADER}\n\n${parts.filter(Boolean).join("\n\n")}\n`;
+}
+
+/**
+ * Where "Get GraphQL Schema from Endpoint" writes (IDEA): the config's first schema
+ * pointer naming a file, else `schema.graphql` next to the config.
+ */
+export function introspectionTarget(project: SchemaProject): string {
+  const file = project.pointers.find((p) => !/[*?{[]/.test(p)) ?? "schema.graphql";
+  const base = project.root === "/" ? "" : project.root;
+  return `${base}/${file.replace(/^\.\//, "")}`;
+}
diff --git a/src/features/graphql/store.test.ts b/src/features/graphql/store.test.ts
new file mode 100644
index 00000000..4158b3d9
--- /dev/null
+++ b/src/features/graphql/store.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it, vi } from "vitest";
+import { EditorState } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+import { _addEditor, _removeEditor, type TextEditorHandle } from "@/editor/api";
+
+let onOpen: (path: string) => void = () => {};
+const openFile = vi.fn(async (path: string) => onOpen(path));
+vi.mock("@/workbench/contributions", async (orig) => {
+  const actual = await orig<typeof import("@/workbench/contributions")>();
+  return { ...actual, editorService: () => ({ openFile }) };
+});
+
+const { replaceFileText } = await import("./store");
+
+function editorOf(path: string, text: string): TextEditorHandle {
+  const view = new EditorView({ state: EditorState.create({ doc: text }) });
+  return { view, ctx: { path } as TextEditorHandle["ctx"] };
+}
+
+describe("replaceFileText", () => {
+  it("replaces the text once the tab just opened has created its editor", async () => {
+    const editor = editorOf("/p/schema.graphql", "type Query { a: Int }");
+    // The tab mounts its editor after openFile resolves, as for a file that was not open.
+    onOpen = () => void setTimeout(() => _addEditor(editor), 10);
+    try {
+      expect(await replaceFileText("/p/schema.graphql", "type Query { b: Int }")).toBe(true);
+      expect(editor.view.state.doc.toString()).toBe("type Query { b: Int }");
+    } finally {
+      _removeEditor(editor);
+      editor.view.destroy();
+    }
+  });
+
+  it("reports when no editor shows the file", async () => {
+    onOpen = () => {};
+    expect(await replaceFileText("/p/missing.graphql", "x", 50)).toBe(false);
+  });
+});
diff --git a/src/features/graphql/store.ts b/src/features/graphql/store.ts
new file mode 100644
index 00000000..227de3b4
--- /dev/null
+++ b/src/features/graphql/store.ts
@@ -0,0 +1,507 @@
+/**
+ * GraphQL state: discovered schemas, the tool window's tab and last query result, and
+ * per file the endpoint and variables the editor toolbar runs queries with.
+ */
+import { create } from "zustand";
+import { editorsFor, useEditorRegistry, type TextEditorHandle } from "@/editor/api";
+import { setFileDiagnostics } from "@/editor/lsp/diagnostics";
+import { tx } from "@/platform/i18n";
+import type { Diagnostic } from "@/bindings";
+import { call, commands, isCancelled, nextRequestId, type RequestId } from "@/platform/ipc";
+import { basename, dirname, useProject } from "@/platform/project";
+import { editorService, notifications, toolWindowService } from "@/workbench/contributions";
+import { confirm, showError } from "@/workbench/messages";
+import {
+  CONFIG_NAMES,
+  CONFIG_TEMPLATE,
+  GENERATED_HEADER,
+  INTROSPECTION_QUERY,
+  analyzeSchema,
+  discoverSchemas,
+  expandEndpoint,
+  missingVariables,
+  httpRequestText,
+  introspectionTarget,
+  introspectionToSdl,
+  isConfigFile,
+  isSchemaFile,
+  parseConfig,
+  parseVariables,
+  unresolvedTypes,
+  type Endpoint,
+  type SchemaFile,
+  type SchemaProject,
+} from "./model";
+
+export const TOOL_WINDOW = "graphql";
+
+export type GraphQLTab = "schemas" | "result";
+
+export interface QueryResult {
+  /** The GraphQL file the query came from. */
+  path: string;
+  endpoint: Endpoint;
+  status: number | null;
+  totalMs: number | null;
+  body: string | null;
+  /** Response size in bytes. */
+  size: number | null;
+  error: string | null;
+}
+
+interface GraphQLState {
+  tab: GraphQLTab;
+  /** null until the first discovery of the open project. */
+  projects: SchemaProject[] | null;
+  discovering: boolean;
+  /** Expanded tree rows; null: the default (schemas and their sections open). */
+  expanded: Set<string> | null;
+  result: QueryResult | null;
+  running: RequestId | null;
+  /** Endpoint chosen in the editor toolbar, by schema key. */
+  endpointBySchema: Record<string, string>;
+  /** Files whose editor shows the variables editor. */
+  variablesShown: ReadonlySet<string>;
+  /** Variables editor text (JSON), by file. */
+  variables: Record<string, string>;
+  /** The last introspection, for "Rerun Introspection Query". */
+  lastIntrospection: { path: string; endpoint: string } | null;
+  /** The open GraphQL Environment Variables dialog; `done` hears whether it was confirmed. */
+  envDialog: { configPath: string; variables: string[]; done?: (ok: boolean) => void } | null;
+}
+
+const INITIAL: GraphQLState = {
+  tab: "schemas",
+  projects: null,
+  discovering: false,
+  expanded: null,
+  result: null,
+  running: null,
+  endpointBySchema: {},
+  variablesShown: new Set(),
+  variables: {},
+  lastIntrospection: null,
+  envDialog: null,
+};
+
+export const useGraphQL = create<GraphQLState>(() => ({ ...INITIAL }));
+
+export function resetGraphQL() {
+  publishSchemaDiagnostics([]);
+  useGraphQL.setState({ ...INITIAL });
+}
+
+// --- schema errors in editors ------------------------------------------------------------------
+
+const DIAGNOSTICS_SOURCE = "graphql-schema";
+let published = new Set<string>();
+
+/** Shows discovery's schema errors (unresolved types) in editors and Problems, as IDEA does. */
+function publishSchemaDiagnostics(projects: readonly SchemaProject[]) {
+  const byPath = new Map<string, Diagnostic[]>();
+  for (const p of projects)
+    for (const { path, diagnostic } of unresolvedTypes(p)) {
+      const list = byPath.get(path) ?? [];
+      list.push(diagnostic);
+      byPath.set(path, list);
+    }
+  for (const path of published) if (!byPath.has(path)) setFileDiagnostics(path, DIAGNOSTICS_SOURCE, []);
+  for (const [path, items] of byPath) setFileDiagnostics(path, DIAGNOSTICS_SOURCE, items);
+  published = new Set(byPath.keys());
+}
+
+function setProjects(projects: SchemaProject[]) {
+  useGraphQL.setState({ projects });
+  publishSchemaDiagnostics(projects);
+}
+
+/** Re-checks a schema file from its editor text while it is edited (not yet saved). */
+export function revalidateFile(path: string, text: string) {
+  const projects = useGraphQL.getState().projects;
+  if (!projects?.some((p) => p.files.some((f) => f.path === path))) return;
+  const file: SchemaFile = { path, ...analyzeSchema(text) };
+  setProjects(projects.map((p) => ({ ...p, files: p.files.map((f) => (f.path === path ? file : f)) })));
+}
+
+// --- environment variables ---------------------------------------------------------------------
+
+const ENV_KEY = "openidea.graphql.environment";
+
+function readEnvironment(): Record<string, Record<string, string>> {
+  try {
+    const raw = localStorage.getItem(ENV_KEY);
+    return raw ? (JSON.parse(raw) as Record<string, Record<string, string>>) : {};
+  } catch {
+    return {};
+  }
+}
+
+export function environmentOf(configPath: string | null): Record<string, string> {
+  return configPath ? (readEnvironment()[configPath] ?? {}) : {};
+}
+
+export function saveEnvironment(configPath: string, values: Record<string, string>) {
+  try {
+    localStorage.setItem(ENV_KEY, JSON.stringify({ ...readEnvironment(), [configPath]: values }));
+  } catch {
+    // Storage unavailable (private window): the values are not kept.
+  }
+}
+
+/** Opens IDEA's GraphQL Environment Variables dialog for a config; resolves true once confirmed. */
+function requestEnvironment(schema: SchemaProject): Promise<boolean> {
+  const configPath = schema.configPath;
+  if (!configPath || !schema.variables.length) return Promise.resolve(false);
+  useGraphQL.getState().envDialog?.done?.(false);
+  return new Promise((done) =>
+    useGraphQL.setState({ envDialog: { configPath, variables: [...schema.variables].sort(), done } }),
+  );
+}
+
+/** "Edit Environment Variables": the `${NAME}` variables of `path`'s config, in IDEA's dialog. */
+export async function editEnvironmentVariables(path: string): Promise<void> {
+  const schema = schemaOf(await ensureDiscovered(), path);
+  if (schema) await requestEnvironment(schema);
+}
+
+export function closeEnvironmentDialog(ok = false) {
+  const done = useGraphQL.getState().envDialog?.done;
+  useGraphQL.setState({ envDialog: null });
+  done?.(ok);
+}
+
+/**
+ * Before running against `endpoint`: when it uses variables with no value (and no default),
+ * asks for them as IDEA does. False when the dialog is cancelled.
+ */
+async function ensureEnvironment(endpoint: Endpoint): Promise<boolean> {
+  const schema = (useGraphQL.getState().projects ?? []).find((p) => p.endpoints.includes(endpoint));
+  if (!schema?.configPath || !missingVariables(endpoint, environmentOf(schema.configPath)).length) return true;
+  return requestEnvironment(schema);
+}
+
+/** Files are found through the file index's fuzzy search, then matched exactly. */
+const FILE_QUERIES = [".graphql", ".gql", "graphqlrc", "graphql.config"];
+const FILE_LIMIT = 10000;
+/** Schema files read for discovery; more are listed without their definitions. */
+const READ_LIMIT = 500;
+
+async function readText(path: string): Promise<string | null> {
+  try {
+    return await call(commands.fsReadText(path));
+  } catch {
+    return null;
+  }
+}
+
+let generation = 0;
+
+/** (Re)discovers the open project's schemas ("Restart Schema Discovery"). */
+export async function discoverSchemasNow(): Promise<void> {
+  const root = useProject.getState().project?.root;
+  if (!root) return;
+  const run = ++generation;
+  useGraphQL.setState({ discovering: true });
+  try {
+    const hits = await Promise.all(FILE_QUERIES.map((q) => call(commands.findFiles(q, FILE_LIMIT))));
+    const paths = [...new Set(hits.flat().map((m) => m.path))];
+    const schemaPaths = paths.filter((p) => isSchemaFile(basename(p)));
+    const configPaths = paths.filter((p) => isConfigFile(basename(p)));
+    const [files, configs] = await Promise.all([
+      Promise.all(
+        schemaPaths.map(async (path, i): Promise<SchemaFile> => {
+          const text = i < READ_LIMIT ? await readText(path) : null;
+          return { path, ...analyzeSchema(text ?? "") };
+        }),
+      ),
+      Promise.all(
+        configPaths.map(async (path) => ({ path, config: parseConfig(basename(path), (await readText(path)) ?? "") })),
+      ),
+    ]);
+    if (run !== generation) return;
+    setProjects(discoverSchemas(root, configs, files));
+  } catch (e) {
+    if (run === generation && !isCancelled(e))
+      notifications().notify({ level: "error", title: "GraphQL schema discovery failed", body: String(e) });
+  } finally {
+    if (run === generation) useGraphQL.setState({ discovering: false });
+  }
+}
+
+async function ensureDiscovered(): Promise<SchemaProject[]> {
+  if (!useGraphQL.getState().projects) await discoverSchemasNow();
+  return useGraphQL.getState().projects ?? [];
+}
+
+/** The configuration a toolbar or tool window acts on: the file's schema's, else the first one. */
+export function configurationFor(projects: readonly SchemaProject[] | null, path?: string): string | null {
+  if (!projects) return null;
+  return (path ? schemaOf(projects, path)?.configPath : null) ?? projects.find((p) => p.configPath)?.configPath ?? null;
+}
+
+/** "Edit GraphQL Configuration": opens the configuration `path` (or the project) uses. */
+export async function openConfiguration(path?: string): Promise<void> {
+  const config = configurationFor(await ensureDiscovered(), path);
+  if (config) await editorService().openFile(config);
+}
+
+/** Opens the project's graphql-config, creating IDEA's template when there is none. */
+export async function addSchemaConfiguration(): Promise<void> {
+  const root = useProject.getState().project?.root;
+  if (!root) return;
+  const existing = configurationFor(await ensureDiscovered());
+  if (existing) return editorService().openFile(existing);
+  const path = `${root}/${CONFIG_NAMES[0]}`;
+  try {
+    await call(commands.fsCreateFileBytes(path, [...new TextEncoder().encode(CONFIG_TEMPLATE)]));
+  } catch (e) {
+    notifications().notify({ level: "error", title: "Cannot create the GraphQL configuration", body: String(e) });
+    return;
+  }
+  await editorService().openFile(path);
+  await discoverSchemasNow();
+}
+
+export function showGraphQL(tab: GraphQLTab) {
+  useGraphQL.setState({ tab });
+  toolWindowService().show(TOOL_WINDOW, true);
+}
+
+/** The schema `path` belongs to: one listing it, else the closest config folder above it. */
+export function schemaOf(projects: readonly SchemaProject[], path: string): SchemaProject | null {
+  const listed = projects.find((p) => p.files.some((f) => f.path === path));
+  if (listed) return listed;
+  const dir = dirname(path);
+  return (
+    projects
+      .filter((p) => p.configPath && (dir === p.root || dir.startsWith(p.root + "/")))
+      .sort((a, b) => b.root.length - a.root.length)[0] ?? null
+  );
+}
+
+/** The endpoint the toolbar of `path` runs against: the chosen one, else the schema's first. */
+export function endpointFor(state: Pick<GraphQLState, "projects" | "endpointBySchema">, path: string) {
+  const schema = state.projects ? schemaOf(state.projects, path) : null;
+  if (!schema) return null;
+  const chosen = state.endpointBySchema[schema.key];
+  return schema.endpoints.find((e) => e.name === chosen) ?? schema.endpoints[0] ?? null;
+}
+
+export function chooseEndpoint(path: string, name: string) {
+  useGraphQL.setState((s) => {
+    const schema = s.projects ? schemaOf(s.projects, path) : null;
+    return schema ? { endpointBySchema: { ...s.endpointBySchema, [schema.key]: name } } : s;
+  });
+}
+
+export function toggleVariables(path: string) {
+  useGraphQL.setState((s) => {
+    const shown = new Set(s.variablesShown);
+    if (!shown.delete(path)) shown.add(path);
+    return { variablesShown: shown };
+  });
+}
+
+export function setVariables(path: string, text: string) {
+  useGraphQL.setState((s) => ({ variables: { ...s.variables, [path]: text } }));
+}
+
+function noEndpoint() {
+  notifications().notify({
+    level: "info",
+    title: "No GraphQL endpoint",
+    body: "Declare one under extensions.endpoints in graphql.config.yml.",
+    key: "graphql-run",
+  });
+}
+
+/** `configured` with its config's environment variables expanded. */
+function resolveEndpoint(configured: Endpoint): Endpoint {
+  const projects = useGraphQL.getState().projects ?? [];
+  const config = projects.find((p) => p.endpoints.includes(configured))?.configPath ?? null;
+  return expandEndpoint(configured, environmentOf(config));
+}
+
+/** IDEA's "GraphQL error" balloon for a request that failed, with Retry and Show error. */
+function notifyRequestFailed(configured: Endpoint, error: string, retry: () => void) {
+  const url = resolveEndpoint(configured).url;
+  notifications().notify({
+    level: "warning",
+    title: "GraphQL error",
+    body: tx`GraphQL request to ${url} failed.`,
+    actions: [
+      { label: "Retry", run: retry },
+      { label: "Show error", run: () => void showError(tx`GraphQL request to ${url} failed.`, error) },
+    ],
+  });
+}
+
+async function send(configured: Endpoint, query: string, variables: Record<string, unknown> | null) {
+  const endpoint = resolveEndpoint(configured);
+  const busy = useGraphQL.getState().running;
+  if (busy) void commands.cancelRequest(busy);
+  const request = nextRequestId();
+  useGraphQL.setState({ running: request });
+  try {
+    return await call(commands.httpExecute(request, null, httpRequestText(endpoint, query, variables), 0, null));
+  } finally {
+    if (useGraphQL.getState().running === request) useGraphQL.setState({ running: null });
+  }
+}
+
+/** "Execute GraphQL": runs `query` from `path` with its variables; the response shows in "Query Result". */
+export async function runQuery(path: string, query: string): Promise<void> {
+  if (!query) return;
+  await ensureDiscovered();
+  const endpoint = endpointFor(useGraphQL.getState(), path);
+  if (!endpoint) return noEndpoint();
+  if (!(await ensureEnvironment(endpoint))) return;
+  const parsed = parseVariables(useGraphQL.getState().variables[path] ?? "");
+  if ("error" in parsed) {
+    notifications().notify({
+      level: "error",
+      title: "Invalid GraphQL variables",
+      body: parsed.error,
+      key: "graphql-run",
+    });
+    return;
+  }
+  const retry = () => void runQuery(path, query);
+  try {
+    const ex = await send(endpoint, query, parsed.variables);
+    if (ex.entry.error) notifyRequestFailed(endpoint, ex.entry.error, retry);
+    useGraphQL.setState({
+      result: {
+        path,
+        endpoint,
+        status: ex.response?.status ?? null,
+        totalMs: ex.response?.totalMs ?? ex.entry.totalMs,
+        body: ex.response?.body ?? null,
+        size: ex.response?.size ?? null,
+        error: ex.entry.error,
+      },
+    });
+  } catch (e) {
+    if (isCancelled(e)) return;
+    notifyRequestFailed(endpoint, String(e), retry);
+    useGraphQL.setState({
+      result: { path, endpoint, status: null, totalMs: null, body: null, size: null, error: String(e) },
+    });
+  }
+  showGraphQL("result");
+}
+
+/**
+ * "Get GraphQL Schema from Endpoint": introspects an endpoint (`name`, else the one chosen for
+ * `path`) and writes the schema as SDL to the config's schema file. An existing file's text is
+ * replaced in its editor (undoable); one not written this way is only replaced once confirmed.
+ */
+export async function introspectEndpoint(path: string, name?: string): Promise<void> {
+  const projects = await ensureDiscovered();
+  const schema = schemaOf(projects, path);
+  const endpoint =
+    (name ? schema?.endpoints.find((e) => e.name === name) : null) ?? endpointFor(useGraphQL.getState(), path);
+  if (!schema || !endpoint) return noEndpoint();
+  if (!(await ensureEnvironment(endpoint))) return;
+  useGraphQL.setState({ lastIntrospection: { path, endpoint: endpoint.name } });
+  const target = introspectionTarget(schema);
+  let sdl: string;
+  try {
+    const ex = await send(endpoint, INTROSPECTION_QUERY, null);
+    if (ex.entry.error || !ex.response?.body) throw new Error(ex.entry.error ?? `HTTP ${ex.response?.status ?? "?"}`);
+    sdl = introspectionToSdl(ex.response.body);
+  } catch (e) {
+    if (!isCancelled(e))
+      notifyRequestFailed(
+        endpoint,
+        e instanceof Error ? e.message : String(e),
+        () => void introspectEndpoint(path, name),
+      );
+    return;
+  }
+  const current = await readText(target);
+  if (current !== null) {
+    const generated = current.startsWith(GENERATED_HEADER);
+    const ok =
+      generated ||
+      (await confirm({
+        title: "Get GraphQL Schema from Endpoint",
+        message: tx`Replace the contents of ${basename(target)} with the schema of ${endpoint.name}?`,
+        ok: "Replace",
+      }));
+    if (!ok) return;
+    if (!(await replaceFileText(target, sdl))) {
+      notifications().notify({
+        level: "error",
+        title: "Cannot write the GraphQL schema",
+        body: tx`${basename(target)} did not open in an editor`,
+      });
+      return;
+    }
+  } else {
+    try {
+      await call(commands.fsCreateFileBytes(target, [...new TextEncoder().encode(sdl)]));
+    } catch (e) {
+      notifications().notify({ level: "error", title: "Cannot write the GraphQL schema", body: String(e) });
+      return;
+    }
+    await editorService().openFile(target);
+  }
+  notifications().notify({
+    level: "info",
+    title: "GraphQL schema updated",
+    body: `${basename(target)} ← ${endpoint.url}`,
+    key: "graphql-introspect",
+  });
+  await discoverSchemasNow();
+}
+
+/**
+ * Opens `path` and replaces its text in the editor (one undoable edit). A file that was not open
+ * gets its editor only after `openFile` resolves, so this waits for it; false when none appears.
+ */
+export async function replaceFileText(path: string, text: string, timeoutMs = 5000): Promise<boolean> {
+  await editorService().openFile(path);
+  const editor =
+    editorsFor(path)[0] ??
+    (await new Promise<TextEditorHandle | null>((resolve) => {
+      const done = (e: TextEditorHandle | null) => {
+        clearTimeout(timer);
+        unsubscribe();
+        resolve(e);
+      };
+      const timer = setTimeout(() => done(null), timeoutMs);
+      const unsubscribe = useEditorRegistry.subscribe(() => {
+        const e = editorsFor(path)[0];
+        if (e) done(e);
+      });
+    }));
+  if (!editor) return false;
+  editor.view.dispatch({ changes: { from: 0, to: editor.view.state.doc.length, insert: text } });
+  return true;
+}
+
+/** "Rerun Introspection Query": the last introspection of this schema, else its chosen endpoint. */
+export async function rerunIntrospection(path: string): Promise<void> {
+  const projects = await ensureDiscovered();
+  const last = useGraphQL.getState().lastIntrospection;
+  const same = last && schemaOf(projects, last.path) === schemaOf(projects, path);
+  await introspectEndpoint(path, same ? last.endpoint : undefined);
+}
+
+/** "Open Introspection Schema": the schema file introspection writes for `path`'s schema. */
+export async function openIntrospectionSchema(path: string): Promise<void> {
+  const schema = schemaOf(await ensureDiscovered(), path);
+  if (!schema) return;
+  const target = introspectionTarget(schema);
+  if ((await readText(target)) === null) {
+    notifications().notify({
+      level: "info",
+      title: "No introspection schema yet",
+      body: "Run Introspection Query on an endpoint to generate it.",
+      key: "graphql-introspect",
+    });
+    return;
+  }
+  await editorService().openFile(target);
+}
diff --git a/src/features/index.ts b/src/features/index.ts
index 6286ef08..5086d779 100644
--- a/src/features/index.ts
+++ b/src/features/index.ts
@@ -12,20 +12,26 @@ import { activate as projectTree } from "./project-tree";
 import { activate as search } from "./search";
 import { activate as dependencies } from "./dependencies";
 import { activate as codeInsight } from "./code-insight";
-import { activate as vcs, activateSettingsPages as vcsPages } from "./vcs";
+import {
+  activate as vcs,
+  activateComparisonWindow,
+  activateDiffViewer,
+  activateSettingsPages as vcsPages,
+} from "./vcs";
 import { activate as terminal } from "./terminal";
 import { activate as run } from "./run";
 import { activate as runAnything } from "./run-anything";
 import { activate as macros } from "./macros";
 import { activate as debuggerFeature } from "./debugger";
 import { activate as coverage } from "./coverage";
+import { activate as colorPreview } from "./color-preview";
 import { activate as profiler } from "./profiler";
 import { activate as buildTools } from "./build-tools";
 import { activate as build } from "./build";
 import { activate as templates, activateSettingsPages as templatesPages } from "./templates";
 import { activate as todo, activateSettingsPages as todoPages } from "./todo";
-import { activate as settings, activateSettingsWindow } from "./settings";
-import { activate as app, activateLocale as appLocale } from "./app";
+import { activate as settings, activateRuntimeSettings, activateSettingsWindow } from "./settings";
+import { activate as app, activateLocale as appLocale, activateMenuBridge, confirmLeave } from "./app";
 import { activate as perf } from "./perf";
 import { activate as plugins, activateSettingsPages as pluginsPages } from "./plugins";
 import { activate as tools, activateSettingsPages as toolsPages } from "./tools";
@@ -39,7 +45,8 @@ import { activate as services } from "./services";
 import { activate as github } from "./github";
 import { activate as httpClient } from "./http-client";
 import { activate as database } from "./database";
-import { activate as deployment } from "./deployment";
+import { activate as graphql } from "./graphql";
+import { activate as deployment, activateDeploymentWindow } from "./deployment";
 import { activate as agents, activateSettingsPages as agentsPages } from "./agents";
 import { activate as vim, activateSettingsPages as vimPages } from "./vim";
 import { activate as ssh } from "./ssh";
@@ -64,6 +71,7 @@ const features: Array<[string, Activate]> = [
   ["macros", macros],
   ["debugger", debuggerFeature],
   ["coverage", coverage],
+  ["color-preview", colorPreview],
   ["profiler", profiler],
   ["build-tools", buildTools],
   ["build", build],
@@ -83,6 +91,7 @@ const features: Array<[string, Activate]> = [
   ["github", github],
   ["http-client", httpClient],
   ["database", database],
+  ["graphql", graphql],
   ["deployment", deployment],
   ["agents", agents],
   ["vim", vim],
@@ -90,20 +99,54 @@ const features: Array<[string, Activate]> = [
   ["remote-dev", remoteDev],
 ];
 
-export function activateFeatures(): () => void {
+function activateAll(what: string, list: Array<[string, Activate]>): () => void {
   const disposers: Array<() => void> = [];
-  for (const [name, activate] of features) {
+  for (const [name, activate] of list) {
     try {
       const d = activate();
       if (d) disposers.push(d);
     } catch (e) {
-      console.error(`feature ${name} failed to activate`, e);
+      console.error(`${what} of ${name} failed to activate`, e);
     }
   }
   return () => disposers.reverse().forEach((d) => d());
 }
 
-export { SettingsWindow, settingsWindowParent } from "./settings";
+export function activateFeatures(): () => void {
+  return activateAll("feature", features);
+}
+
+export { SettingsWindow } from "./settings";
+export { ComparisonWindow } from "./vcs";
+export { DeploymentWindow } from "./deployment";
+
+/**
+ * A comparison window of project window `parent`: the changed files between two revisions and
+ * their diffs, with the editor and Git but no workbench.
+ */
+export function activateComparisonWindowFeatures(parent: string): () => void {
+  return activateAll("comparison window", [
+    ["locale", appLocale],
+    ["settings", activateRuntimeSettings],
+    ["menu", activateMenuBridge],
+    ["editor", editor],
+    ["vcs", vcs],
+    ["comparison", () => activateComparisonWindow(parent, (project) => confirmLeave(undefined, project))],
+  ]);
+}
+
+/**
+ * The Sync with Deployed window of project window `parent`: local files next to their copies on a
+ * deployment server, with the diff viewer but no workbench.
+ */
+export function activateDeploymentWindowFeatures(parent: string): () => void {
+  return activateAll("deployment window", [
+    ["locale", appLocale],
+    ["settings", activateRuntimeSettings],
+    ["diff", activateDiffViewer],
+    ["deployment", () => activateDeploymentWindow(parent)],
+  ]);
+}
 
 /**
  * The native Settings window of project window `parent`: only the settings
@@ -122,14 +165,5 @@ export function activateSettingsWindowFeatures(parent: string): () => void {
     ["vim", vimPages],
     ["vcs", vcsPages],
   ];
-  const disposers: Array<() => void> = [];
-  for (const [name, activate] of pages) {
-    try {
-      const d = activate();
-      if (d) disposers.push(d);
-    } catch (e) {
-      console.error(`settings pages of ${name} failed to activate`, e);
-    }
-  }
-  return () => disposers.reverse().forEach((d) => d());
+  return activateAll("settings pages", pages);
 }
diff --git a/src/features/notebook/security.test.ts b/src/features/notebook/security.test.ts
index 6ef2b829..e8282a3e 100644
--- a/src/features/notebook/security.test.ts
+++ b/src/features/notebook/security.test.ts
@@ -4,6 +4,21 @@ import { markdownRoot, resolveMarkdownAttachments, sanitizedSvgUrl, staticOutput
 const parse = (html: string) => new DOMParser().parseFromString(html, "text/html");
 
 describe("static notebook output sanitization", () => {
+  it.each([
+    "<style>body{outline:7px solid red}</style>",
+    '<form action="https://example.com/x"><button>go</button></form>',
+    '<div style="position:fixed">x</div>',
+    '<link rel="stylesheet" href="https://example.com/x.css">',
+    '<meta http-equiv="refresh" content="0;url=https://example.com">',
+    '<base href="https://example.com/">',
+    '<iframe src="https://example.com"></iframe>',
+    '<button formaction="https://example.com/x">go</button>',
+  ])("keeps raw Markdown markup from reaching the page: %s", (raw) => {
+    const root = markdownRoot(`text\n\n${raw}\n`);
+    expect(root.querySelector("style, form, link, meta, base, iframe, [style], [formaction]")).toBeNull();
+    expect(root.textContent).not.toContain("outline");
+  });
+
   it("retains table content while removing executable, navigation and external-resource surfaces", () => {
     const document = parse(
       staticOutputDocument(`
diff --git a/src/features/plugins/IntellijThemesDialog.tsx b/src/features/plugins/IntellijThemesDialog.tsx
new file mode 100644
index 00000000..7924b639
--- /dev/null
+++ b/src/features/plugins/IntellijThemesDialog.tsx
@@ -0,0 +1,140 @@
+/**
+ * Import Theme from IntelliJ IDE: the theme plugins installed in the JetBrains
+ * IDEs on this machine, each under its plugin's heading, the plugin of the
+ * theme in use first. Importing a theme brings every theme of its plugin, as
+ * installing the plugin in IntelliJ does, and applies the chosen one
+ * (`importIntellijTheme`). A file can be chosen instead.
+ */
+import { useEffect, useState } from "react";
+import clsx from "clsx";
+import type { InstalledIntellijTheme } from "@/bindings";
+import { tx } from "@/platform/i18n";
+import { Badge, Dialog, List, Spinner, T } from "@/ui";
+import { pluginsBackend } from "./backend";
+import { closeInstalledIntellijThemes, importIntellijTheme, useIntellijThemesDialog } from "./intellijImport";
+import { errorText } from "./store";
+import styles from "./PluginsPage.module.css";
+
+type Row =
+  | { kind: "plugin"; key: string; plugin: string; ide: string; count: number; first: boolean }
+  | { kind: "theme"; key: string; theme: InstalledIntellijTheme };
+
+/** A heading per plugin (of an IDE) with its themes under it, in the order found (the one in use first). */
+function themeRows(themes: readonly InstalledIntellijTheme[]): Row[] {
+  const plugins = new Map<string, InstalledIntellijTheme[]>();
+  for (const t of themes) {
+    const key = `${t.ide}\n${t.path}`;
+    plugins.set(key, [...(plugins.get(key) ?? []), t]);
+  }
+  return [...plugins].flatMap(([key, list], i): Row[] => [
+    { kind: "plugin", key, plugin: list[0]!.plugin, ide: list[0]!.ide, count: list.length, first: i === 0 },
+    ...list.map((theme): Row => ({ kind: "theme", key: `${key}\n${theme.themeId}`, theme })),
+  ]);
+}
+
+function IntellijThemesDialog() {
+  const [themes, setThemes] = useState<InstalledIntellijTheme[] | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  // The first theme, under the first heading.
+  const [active, setActive] = useState(1);
+  useEffect(() => {
+    let live = true;
+    pluginsBackend()
+      .installedIntellijThemes()
+      .then(
+        (found) => live && setThemes(found),
+        (e: unknown) => {
+          if (!live) return;
+          setError(errorText(e));
+          setThemes([]);
+        },
+      );
+    return () => {
+      live = false;
+    };
+  }, []);
+
+  const run = (theme?: InstalledIntellijTheme) => {
+    const { onImported } = useIntellijThemesDialog.getState();
+    closeInstalledIntellijThemes();
+    void importIntellijTheme(theme?.path, theme?.themeId).then((id) => id && onImported?.(id));
+  };
+  const rows = themeRows(themes ?? []);
+  const row = rows[active];
+  const chosen = row?.kind === "theme" ? row.theme : undefined;
+
+  return (
+    <Dialog
+      open
+      title="Import Theme from IntelliJ IDE"
+      width={640}
+      onClose={closeInstalledIntellijThemes}
+      buttons={[
+        { label: "Choose File…", role: "extra", onClick: () => run() },
+        { label: "Cancel", role: "cancel" },
+        { label: "Import", role: "default", disabled: !chosen, onClick: () => chosen && run(chosen) },
+      ]}
+    >
+      <div className={styles.intellijThemes}>
+        <p className={styles.muted}>
+          <T>
+            Theme plugins installed in the JetBrains IDEs on this computer. Importing a theme brings every theme of its
+            plugin and applies the chosen one. Colours without an OpenIDEA counterpart keep the default theme colours.
+          </T>
+        </p>
+        {themes === null ? (
+          <div className={styles.intellijThemesStatus}>
+            <Spinner size={14} label="Looking for IntelliJ themes" />
+            <T>Looking for IntelliJ themes…</T>
+          </div>
+        ) : (
+          <List
+            items={rows}
+            getKey={(r) => r.key}
+            isSection={(r) => r.kind === "plugin"}
+            activeIndex={chosen ? active : -1}
+            onActiveChange={setActive}
+            rowHeight={28}
+            sectionHeight={30}
+            className={styles.intellijThemesList}
+            aria-label={tx("IntelliJ themes")}
+            empty={
+              <div className={styles.intellijThemesStatus} role="note">
+                {error ?? (
+                  <T>
+                    No theme plugins found in JetBrains IDEs on this computer. Choose a theme plugin downloaded from the
+                    JetBrains Marketplace (.jar or .zip) or a .theme.json file instead.
+                  </T>
+                )}
+              </div>
+            }
+            renderSection={(r) =>
+              r.kind === "plugin" && (
+                <div className={clsx(styles.intellijPlugin, !r.first && styles.intellijPluginNext)}>
+                  <span className={styles.intellijPluginName}>{r.plugin}</span>
+                  <span>{r.count === 1 ? tx("1 theme") : tx`${r.count} themes`}</span>
+                  <span className={styles.intellijPluginIde}>{r.ide}</span>
+                </div>
+              )
+            }
+            renderItem={(r) =>
+              r.kind === "theme" && (
+                <div className={styles.intellijTheme}>
+                  <span className={styles.itemMain}>{r.theme.themeName}</span>
+                  {r.theme.active && <Badge tone="accent">{tx("In use")}</Badge>}
+                  <span className={styles.muted}>{r.theme.dark ? tx("Dark") : tx("Light")}</span>
+                </div>
+              )
+            }
+          />
+        )}
+      </div>
+    </Dialog>
+  );
+}
+
+/** Overlay of the dialog while `showInstalledIntellijThemes` has it open. */
+export function IntellijThemesDialogHost() {
+  const open = useIntellijThemesDialog((s) => s.open);
+  return open ? <IntellijThemesDialog /> : null;
+}
diff --git a/src/features/plugins/PluginsPage.module.css b/src/features/plugins/PluginsPage.module.css
index f54100aa..90b2c739 100644
--- a/src/features/plugins/PluginsPage.module.css
+++ b/src/features/plugins/PluginsPage.module.css
@@ -369,18 +369,75 @@
   padding: 4px 8px;
 }
 
-.marketBar {
-  display: flex;
-  gap: 4px;
-  align-items: center;
+.categorySelect {
+  width: 100%;
 }
 
-.marketBar > :first-child {
-  flex: 1;
-  min-width: 0;
+.detailsNotice {
+  margin: 0 0 12px;
 }
 
 .marketOverview {
   padding: 12px 16px;
   overflow: auto;
 }
+
+/* Import Theme from IntelliJ IDE */
+.intellijThemes {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  min-width: 0;
+  padding: 14px;
+}
+.intellijThemes > p {
+  margin: 0;
+}
+/* As tall as its rows (the list sizes them), scrolling past seven. */
+.intellijThemesList {
+  max-height: 316px;
+  padding: 4px 0;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-control);
+}
+.intellijThemesStatus {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 10px;
+  color: var(--fg-muted);
+}
+.intellijTheme {
+  display: flex;
+  flex: 1;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+}
+.intellijTheme > .muted {
+  flex-shrink: 0;
+  font-size: var(--fs-small);
+}
+.intellijPlugin {
+  display: flex;
+  flex: 1;
+  align-items: center;
+  gap: 8px;
+  align-self: stretch;
+  min-width: 0;
+}
+/* A line above each plugin but the first, as in IDEA's Theme list. */
+.intellijPluginNext {
+  border-top: 1px solid var(--border);
+}
+.intellijPluginName {
+  overflow: hidden;
+  color: var(--fg-secondary);
+  font-weight: 600;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.intellijPluginIde {
+  flex-shrink: 0;
+  margin-left: auto;
+}
diff --git a/src/features/plugins/PluginsPage.tsx b/src/features/plugins/PluginsPage.tsx
index 662e7dc0..7c66e6c1 100644
--- a/src/features/plugins/PluginsPage.tsx
+++ b/src/features/plugins/PluginsPage.tsx
@@ -16,8 +16,8 @@ import {
   EmptyState,
   Icon,
   IconButton,
-  Input,
   SearchField,
+  Select,
   Spinner,
   Tabs,
   showContextMenu,
@@ -28,6 +28,7 @@ import { RISK_LABEL, sortByRisk } from "./consent";
 import { itemsOf, uiPoint } from "./projection";
 import {
   compareVersions,
+  isUpdate,
   grantPlugin,
   installFromDisk,
   installFromMarket,
@@ -41,8 +42,12 @@ import {
   setPluginCapability,
   setPluginEnabled,
   uninstallPlugin,
+  updateAllPlugins,
   usePlugins,
 } from "./store";
+import { useProject } from "@/platform/project";
+import { importIntellijTheme, showInstalledIntellijThemes } from "./intellijImport";
+import { promptInput } from "@/workbench/inputDialogs";
 import styles from "./PluginsPage.module.css";
 import { tx } from "@/platform/i18n";
 
@@ -526,11 +531,48 @@ function CatalogDetails({ entry }: { entry: CatalogPlugin }) {
   );
 }
 
-function gearMenu(plugins: readonly PluginInfo[], install: (packageFile: boolean) => void): MenuItem[] {
+interface GearActions {
+  /** Installing needs a trusted project's window (the host refuses it elsewhere). */
+  canImport: boolean;
+  install: (packageFile: boolean) => void;
+  importIntellijFile: () => void;
+  importInstalledIntellij: () => void;
+  editRepository: () => void;
+}
+
+/** Asks for the marketplace index URL; an empty one restores the default. */
+async function editMarketUrl() {
+  const url = await promptInput({
+    title: "Plugin Repository",
+    label: "Marketplace index URL:",
+    initial: usePlugins.getState().marketUrl ?? "",
+    placeholder: "https://…/index.json or a folder path",
+    okLabel: "Save",
+    validate: () => null,
+    hint: <T>Leave empty to use the default repository.</T>,
+  });
+  if (url !== null) await setMarketUrl(url);
+}
+
+function gearMenu(plugins: readonly PluginInfo[], updates: number, actions: GearActions): MenuItem[] {
   const installed = plugins.filter((p) => p.source === "installed");
   return [
-    { label: "Install Plugin from Disk…", icon: "package", run: () => install(false) },
-    { label: "Install Plugin from Package File…", run: () => install(true) },
+    {
+      label: updates > 0 ? tx`Update All Plugins (${updates})` : "Update All Plugins",
+      disabled: updates === 0,
+      run: () => void updateAllPlugins(),
+    },
+    { kind: "separator" },
+    { label: "Install Plugin from Disk…", icon: "package", run: () => actions.install(false) },
+    { label: "Install Plugin from Package File…", run: () => actions.install(true) },
+    { label: "Plugin Repository…", run: actions.editRepository },
+    ...(actions.canImport
+      ? [
+          { kind: "separator" as const },
+          { label: "Import Theme from IntelliJ IDE…", run: actions.importInstalledIntellij },
+          { label: "Import IntelliJ Theme from File…", run: actions.importIntellijFile },
+        ]
+      : []),
     { kind: "separator" },
     {
       label: "Disable All Downloaded Plugins",
@@ -555,32 +597,81 @@ function gearMenu(plugins: readonly PluginInfo[], install: (packageFile: boolean
   ];
 }
 
-/** The marketplace index URL, editable in place. */
-function MarketUrlBar() {
-  const current = usePlugins((s) => s.marketUrl);
-  const [value, setValue] = useState(current ?? "");
-  useEffect(() => setValue(current ?? ""), [current]);
+const CATEGORIES = [
+  "languages",
+  "themes",
+  "icon-themes",
+  "linters",
+  "vcs",
+  "ai",
+  "frameworks",
+  "tools",
+  "other",
+] as const;
+type Category = (typeof CATEGORIES)[number];
+
+function categoryLabel(c: Category): string {
+  switch (c) {
+    case "languages":
+      return tx("Languages");
+    case "themes":
+      return tx("Themes");
+    case "icon-themes":
+      return tx("Icon Themes");
+    case "linters":
+      return tx("Linters & Formatters");
+    case "vcs":
+      return tx("Version Control");
+    case "ai":
+      return tx("AI");
+    case "frameworks":
+      return tx("Frameworks");
+    case "tools":
+      return tx("Tools");
+    case "other":
+      return tx("Other");
+  }
+}
+
+/** A marketplace plugin's categories this IDE knows; `other` without any. */
+function categoriesOf(m: MarketPlugin): Category[] {
+  const known = CATEGORIES.filter((c) => m.categories?.includes(c));
+  return known.length > 0 ? known : ["other"];
+}
+
+/** Filters the marketplace by category; lists the categories that have plugins. */
+function CategoryFilter({
+  market,
+  value,
+  onChange,
+}: {
+  market: readonly MarketPlugin[];
+  value: Category | "all";
+  onChange: (value: Category | "all") => void;
+}) {
+  const counts = new Map<Category, number>();
+  for (const m of market) for (const c of categoriesOf(m)) counts.set(c, (counts.get(c) ?? 0) + 1);
+  const options = [
+    { value: "all" as const, label: tx("All Categories"), detail: String(market.length) },
+    ...CATEGORIES.filter((c) => counts.has(c)).map((c) => ({
+      value: c,
+      label: categoryLabel(c),
+      detail: String(counts.get(c)),
+    })),
+  ];
   return (
-    <form
-      className={styles.marketBar}
-      onSubmit={(e) => {
-        e.preventDefault();
-        void setMarketUrl(value);
-      }}
-    >
-      <Input
-        value={value}
-        placeholder="Marketplace index URL (https://…/index.json or a folder path)"
-        aria-label="Marketplace index URL"
-        onChange={(e) => setValue(e.target.value)}
-      />
-      <IconButton icon="refresh" title="Refresh Marketplace" type="submit" />
-    </form>
+    <Select
+      aria-label={tx("Category")}
+      className={styles.categorySelect}
+      value={value}
+      options={options}
+      onChange={onChange}
+    />
   );
 }
 
 function MarketRow({ entry, selected, onSelect }: { entry: MarketPlugin; selected: boolean; onSelect: () => void }) {
-  const update = entry.installed && compareVersions(entry.version, entry.installed) > 0;
+  const update = isUpdate(entry);
   return (
     <li className={clsx(styles.row, selected && styles.rowSelected)}>
       <button
@@ -603,6 +694,8 @@ function MarketRow({ entry, selected, onSelect }: { entry: MarketPlugin; selecte
         <Badge tone="accent">{tx("Update")}</Badge>
       ) : entry.installed ? (
         <Badge tone="neutral">{tx("Installed")}</Badge>
+      ) : !entry.compatible ? (
+        <Badge tone="warning">{tx("Incompatible")}</Badge>
       ) : null}
     </li>
   );
@@ -610,7 +703,7 @@ function MarketRow({ entry, selected, onSelect }: { entry: MarketPlugin; selecte
 
 function MarketDetails({ entry, onInstalled }: { entry: MarketPlugin; onInstalled: (id: string) => void }) {
   const installing = usePlugins((s) => s.installing);
-  const update = entry.installed && compareVersions(entry.version, entry.installed) > 0;
+  const update = isUpdate(entry);
   const install = async () => {
     const id = await installFromMarket(entry.id);
     if (id) onInstalled(id);
@@ -628,7 +721,7 @@ function MarketDetails({ entry, onInstalled }: { entry: MarketPlugin; onInstalle
           </div>
         </div>
         <div className={styles.headerActions}>
-          {(!entry.installed || update) && (
+          {entry.compatible && (!entry.installed || update) && (
             <Button size="small" variant="primary" disabled={installing} onClick={() => void install()}>
               {update ? tx`Update to ${entry.version}` : tx("Install")}
             </Button>
@@ -636,12 +729,22 @@ function MarketDetails({ entry, onInstalled }: { entry: MarketPlugin; onInstalle
         </div>
       </header>
       <div className={styles.marketOverview}>
+        {!entry.compatible && (
+          <p className={clsx(styles.notice, styles.detailsNotice)} role="note">
+            <Icon name="info" size={14} />
+            <span>{tx`Needs plugin API ${entry.engine}. Update OpenIDEA to install it.`}</span>
+          </p>
+        )}
         {entry.description && <p className={styles.description}>{entry.description}</p>}
         <dl className={styles.facts}>
           <dt>
             <T>Id</T>
           </dt>
           <dd className={styles.mono}>{entry.id}</dd>
+          <dt>
+            <T>Category</T>
+          </dt>
+          <dd>{categoriesOf(entry).map(categoryLabel).join(", ")}</dd>
           {entry.installed && (
             <>
               <dt>
@@ -681,13 +784,15 @@ export function PluginsPage() {
     void refreshMarket(false);
   }, []);
   const [selectedMarketId, setSelectedMarketId] = useState<string | null>(null);
+  const [category, setCategory] = useState<Category | "all">("all");
   const marketShown = useMemo(
     () =>
       (market ?? []).filter((m) => {
         const q = query.trim().toLowerCase();
+        if (category !== "all" && !categoriesOf(m).includes(category)) return false;
         return !q || matches([m.name, m.id, m.description, m.publisher, ...(m.authors ?? [])], q);
       }),
-    [market, query],
+    [market, query, category],
   );
   const selectedMarket = marketShown.find((m) => m.id === selectedMarketId) ?? null;
 
@@ -697,22 +802,30 @@ export function PluginsPage() {
   const linked = shown.filter((p) => p.source === "linked");
   const selected = shown.find((p) => p.id === selectedId) ?? shown[0] ?? null;
 
-  const catalogShown = useMemo(() => filterCatalog(catalog ?? [], query), [catalog, query]);
+  // Local packages have no categories: shown only without a category filter.
+  const catalogShown = useMemo(
+    () => (category === "all" ? filterCatalog(catalog ?? [], query) : []),
+    [catalog, query, category],
+  );
   const selectedEntry = catalogShown.find((c) => c.id === selectedCatalogId) ?? catalogShown[0] ?? null;
 
-  const install = async (packageFile = false) => {
-    const id = await installFromDisk(undefined, packageFile);
-    if (id) {
-      setTab("installed");
-      setSelectedId(id);
-    }
+  const showInstalled = (id: string | null) => {
+    if (!id) return;
+    setTab("installed");
+    setSelectedId(id);
   };
 
   const openGear = (e: MouseEvent<HTMLButtonElement>) => {
     const r = e.currentTarget.getBoundingClientRect();
     showContextMenu(
       { x: r.left, y: r.bottom + 2 },
-      gearMenu(plugins, (packageFile) => void install(packageFile)),
+      gearMenu(plugins, (market ?? []).filter(isUpdate).length, {
+        canImport: useProject.getState().project?.trusted === true,
+        install: (packageFile) => void installFromDisk(undefined, packageFile).then(showInstalled),
+        importIntellijFile: () => void importIntellijTheme().then(showInstalled),
+        importInstalledIntellij: () => showInstalledIntellijThemes(showInstalled),
+        editRepository: () => void editMarketUrl(),
+      }),
     );
   };
 
@@ -756,7 +869,7 @@ export function PluginsPage() {
             className={styles.search}
             value={query}
             onChange={setQuery}
-            placeholder={tab === "installed" ? "Search installed plugins" : "Search local plugins"}
+            placeholder={tab === "installed" ? "Search installed plugins" : "Search plugins"}
             aria-label="Filter plugins"
           />
           {tab === "installed" ? (
@@ -796,13 +909,9 @@ export function PluginsPage() {
             </ul>
           ) : (
             <ul className={styles.list} aria-label={tx("Available plugins")}>
-              <li className={styles.marketItem}>
-                <MarketUrlBar />
-              </li>
-              {!marketUrl && (
-                <li className={styles.notice} role="note">
-                  <Icon name="info" size={14} />
-                  <span>{tx`${NO_REPOSITORY}. Showing plugin packages available on this machine.`}</span>
+              {(market?.length ?? 0) > 0 && (
+                <li className={styles.marketItem}>
+                  <CategoryFilter market={market ?? []} value={category} onChange={setCategory} />
                 </li>
               )}
               {marketError && <li className={clsx(styles.listEmpty, styles.errorText)}>{marketError}</li>}
@@ -827,7 +936,7 @@ export function PluginsPage() {
                   }}
                 />
               ))}
-              {catalog && catalogShown.length === 0 && (
+              {catalog && category === "all" && catalogShown.length === 0 && (
                 <li className={styles.listEmpty}>
                   {catalog.length === 0 ? tx("No local plugin packages.") : tx("No plugins match.")}
                 </li>
@@ -858,6 +967,8 @@ export function PluginsPage() {
           />
         ) : selectedEntry ? (
           <CatalogDetails key={selectedEntry.id} entry={selectedEntry} />
+        ) : marketUrl ? (
+          <EmptyState className={styles.detailsEmpty} title="No plugin selected" />
         ) : (
           <EmptyState className={styles.detailsEmpty} title={NO_REPOSITORY}>
             <T>Install a plugin folder with</T> <code>plugin.toml</code>{" "}
diff --git a/src/features/plugins/__tests__/iconThemeResolver.test.ts b/src/features/plugins/__tests__/iconThemeResolver.test.ts
new file mode 100644
index 00000000..9ba1ac74
--- /dev/null
+++ b/src/features/plugins/__tests__/iconThemeResolver.test.ts
@@ -0,0 +1,144 @@
+import { describe, expect, it } from "vitest";
+import { iconResolver, type IconThemeMap, type IconThemePattern } from "../iconThemeResolver";
+
+const name = (icon: string) => `ext:p/t/${icon}`;
+const HIDDEN = "ext:p/t/__hidden";
+
+const SPEC: IconThemePattern = {
+  pattern: "^.*\\.spec\\.ts$",
+  icon: "test",
+  target: "file",
+  path: false,
+  ignoreCase: true,
+  group: null,
+  openIcon: null,
+};
+
+const MAP: IconThemeMap = {
+  file: "file",
+  folder: "folder",
+  folderOpen: "folder-open",
+  fileExtensions: { ts: "ts" },
+  fileNames: { "readme.md": "readme" },
+  folderNames: { docs: "folder-docs" },
+  patterns: [
+    SPEC,
+    {
+      pattern: "/fixtures/",
+      icon: "fixture",
+      target: "file",
+      path: true,
+      ignoreCase: false,
+      group: "extra",
+      openIcon: null,
+    },
+    {
+      pattern: "^src$",
+      icon: "folder-src",
+      target: "folder",
+      path: false,
+      ignoreCase: false,
+      group: null,
+      openIcon: "folder-src-open",
+    },
+    {
+      pattern: "^angular\\.json$",
+      icon: "angular",
+      target: "file",
+      path: false,
+      ignoreCase: false,
+      group: "angular",
+      openIcon: null,
+    },
+  ],
+  overrides: { "chevron-right": "arrow", "symbol-class": "klass", folder: "ui-folder", method: "meth" },
+  groups: [
+    { id: "extra", name: "Extra", enabled: true },
+    { id: "angular", name: "Angular", enabled: false },
+  ],
+  choices: [
+    {
+      id: "arrows",
+      name: "Arrows",
+      default: "plain",
+      options: [
+        { id: "plain", name: "Default", overrides: {} },
+        { id: "plus", name: "Plus", overrides: { "chevron-right": "plus" } },
+      ],
+    },
+  ],
+  accent: true,
+};
+
+const resolve = (options = {}) => iconResolver(MAP, name, () => true, { hidden: HIDDEN, options });
+
+describe("icon theme resolver", () => {
+  it("matches patterns in order before names and extensions", () => {
+    const theme = resolve();
+    expect(theme.file("A.SPEC.ts")).toBe(name("test"));
+    expect(theme.file("a.ts")).toBe(name("ts"));
+    expect(theme.file("README.md")).toBe(name("readme"));
+    expect(theme.file("x.bin")).toBe(name("file"));
+  });
+
+  it("matches path patterns against the normalized path only when one is given", () => {
+    const theme = resolve();
+    expect(theme.file("a.json", "C:\\p\\fixtures\\a.json")).toBe(name("fixture"));
+    expect(theme.file("a.json", "/p/fixtures/a.json")).toBe(name("fixture"));
+    expect(theme.file("a.json")).toBe(name("file"));
+    expect(theme.file("a.json", "/p/src/a.json")).toBe(name("file"));
+  });
+
+  it("follows the groups' defaults and the user's choice of packs", () => {
+    expect(resolve().file("angular.json")).toBe(name("file"));
+    expect(resolve({ groups: { angular: true } }).file("angular.json")).toBe(name("angular"));
+    expect(resolve({ groups: { extra: false } }).file("a.json", "/p/fixtures/a.json")).toBe(name("file"));
+  });
+
+  it("uses the open variants for folders holding open files only with hollow folders", () => {
+    expect(resolve().folder("src", false, true)).toBe(name("folder-src"));
+    expect(resolve({ hollowFolders: true }).folder("src", false, true)).toBe(name("folder-src-open"));
+    expect(resolve({ hollowFolders: true }).folder("src", true, false)).toBe(name("folder-src"));
+    expect(resolve({ hollowFolders: true }).folder("lib", false, true)).toBe(name("folder-open"));
+    expect(resolve().folder("Docs", false)).toBe(name("folder-docs"));
+    expect(resolve().folder("lib", true)).toBe(name("folder"));
+  });
+
+  it("hides file or folder icons", () => {
+    expect(resolve({ hideFiles: true }).file("a.ts")).toBe(HIDDEN);
+    expect(resolve({ hideFiles: true }).folder("src", false)).toBe(name("folder-src"));
+    expect(resolve({ hideFolders: true }).folder("src", false)).toBe(HIDDEN);
+  });
+
+  it("replaces built-in icons, the chosen option first", () => {
+    expect(resolve().icon("chevron-right")).toBe(name("arrow"));
+    expect(resolve().icon("symbol-class")).toBe(name("klass"));
+    expect(resolve({ choices: { arrows: "plus" } }).icon("chevron-right")).toBe(name("plus"));
+    expect(resolve({ choices: { arrows: "gone" } }).icon("chevron-right")).toBe(name("arrow"));
+    expect(resolve().icon("terminal")).toBeNull();
+  });
+
+  it("drops the UI or the symbol icon replacements the user turned off", () => {
+    const noUi = resolve({ hideUiIcons: true, choices: { arrows: "plus" } });
+    expect(noUi.icon("chevron-right")).toBeNull();
+    expect(noUi.icon("folder")).toBeNull();
+    expect(noUi.icon("symbol-class")).toBe(name("klass"));
+    const noPsi = resolve({ hidePsiIcons: true });
+    expect(noPsi.icon("symbol-class")).toBeNull();
+    expect(noPsi.icon("method")).toBeNull();
+    expect(noUi.icon("method")).toBe(name("meth"));
+    expect(noPsi.icon("folder")).toBe(name("ui-folder"));
+  });
+
+  it("skips icons the theme does not have and patterns the browser cannot compile", () => {
+    const map: IconThemeMap = {
+      ...MAP,
+      patterns: [
+        { ...SPEC, pattern: "(" },
+        { ...SPEC, icon: "missing" },
+      ],
+    };
+    const theme = iconResolver(map, name, (n) => n !== name("missing"), { hidden: HIDDEN, options: {} });
+    expect(theme.file("a.spec.ts")).toBe(name("ts"));
+  });
+});
diff --git a/src/features/plugins/__tests__/iconThemes.test.ts b/src/features/plugins/__tests__/iconThemes.test.ts
new file mode 100644
index 00000000..cb62bb91
--- /dev/null
+++ b/src/features/plugins/__tests__/iconThemes.test.ts
@@ -0,0 +1,105 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { waitFor } from "@testing-library/react";
+import { useProject } from "@/platform/project";
+import { useContributedIconThemes } from "@/platform/themes";
+import { fileIconName, iconMarkup, themedFolderIconName, useFileIconRevision } from "@/ui";
+import { useIconRowHeight } from "@/ui/iconAppearance";
+import { createMemoryPluginsBackend, setPluginsBackend } from "../backend";
+import { addIconTheme, selectIconTheme, trackIconTheme, useIconThemes } from "../iconThemes";
+
+const SVG = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M0 0h16v16z"/></svg>';
+const MAP = {
+  file: "file",
+  folder: "folder",
+  fileExtensions: {},
+  fileNames: {},
+  folderNames: {},
+  patterns: [
+    {
+      pattern: "^.*\\.spec\\.ts$",
+      icon: "test",
+      target: "file",
+      path: false,
+      ignoreCase: false,
+      group: null,
+      openIcon: null,
+    },
+  ],
+  overrides: { "chevron-right": "arrow" },
+  groups: [{ id: "extra", name: "Extra", enabled: false }],
+  choices: [],
+  accent: true,
+};
+
+const savedProject = useProject.getState();
+let stop: (() => void) | null = null;
+
+function setOptions(options: unknown) {
+  useProject.setState({
+    settings: { ...useProject.getState().settings, appearance: { fileIconThemeOptions: { "p/t": options } } } as never,
+  });
+}
+
+afterEach(() => {
+  stop?.();
+  stop = null;
+  useIconThemes.setState({ override: undefined, available: new Map() });
+  useContributedIconThemes.setState({ themes: [] });
+  useProject.setState(savedProject, true);
+  setPluginsBackend(null);
+});
+
+describe("plugin icon themes", () => {
+  it("applies the theme's patterns, overrides and the user's options", async () => {
+    const backend = createMemoryPluginsBackend([]);
+    setPluginsBackend({
+      ...backend,
+      assets: async () => [
+        ["iconTheme/t/map", JSON.stringify(MAP)],
+        ...["file", "folder", "test", "arrow"].map((icon) => [`iconTheme/t/svg/${icon}`, SVG] as [string, string]),
+      ],
+    });
+    addIconTheme({ pluginId: "p", id: "t", label: "T" });
+    stop = trackIconTheme();
+    await selectIconTheme("p/t");
+    await waitFor(() => expect(fileIconName("a.spec.ts")).toBe("ext:p/t/test"));
+    expect(fileIconName("a.rs")).toBe("ext:p/t/file");
+    expect(iconMarkup("chevron-right")).toContain("M0 0h16v16z");
+
+    const revision = useFileIconRevision.getState();
+    setOptions({});
+    useProject.setState({ settings: { ...useProject.getState().settings } as never });
+    expect(useFileIconRevision.getState()).toBe(revision);
+
+    setOptions({ hideFiles: true, rowHeight: 30 });
+    expect(fileIconName("a.spec.ts")).toBe("ext:p/t/__hidden");
+    expect(themedFolderIconName("src")).toBe("ext:p/t/folder");
+    expect(useIconRowHeight.getState()).toBe(30);
+
+    await selectIconTheme(null);
+    await waitFor(() => expect(fileIconName("a.spec.ts")).not.toMatch(/^ext:/));
+    expect(iconMarkup("chevron-right")).not.toContain("M0 0h16v16z");
+    expect(useIconRowHeight.getState()).toBeNull();
+  });
+
+  it("offers the theme's settings whether or not it is selected", async () => {
+    const SETTINGS = { groups: MAP.groups, choices: [], accent: true, settings: [{ title: "T", items: [] }] };
+    const requested: string[] = [];
+    setPluginsBackend({
+      ...createMemoryPluginsBackend([]),
+      assets: async (plugin, prefix) => {
+        requested.push(prefix);
+        return plugin === "acme.icons" ? [["iconTheme/t/settings", JSON.stringify(SETTINGS)]] : [];
+      },
+    });
+    const remove = addIconTheme({ pluginId: "acme.icons", id: "t", label: "T", settingsPage: "plugins.acme-icons.t" });
+    addIconTheme({ pluginId: "plain", id: "t", label: "T" });
+    const of = (id: string) => useContributedIconThemes.getState().themes.find((t) => t.id === id)!;
+    expect(of("acme.icons/t").settingsPage).toBe("plugins.acme-icons.t");
+    expect(await of("acme.icons/t").details!()).toEqual(SETTINGS);
+    expect(await of("plain/t").details!()).toBeNull();
+    expect(requested).toEqual(["iconTheme/t/settings", "iconTheme/t/settings"]);
+    remove();
+    expect(useContributedIconThemes.getState().themes.some((t) => t.id === "acme.icons/t")).toBe(false);
+  });
+});
diff --git a/src/features/plugins/__tests__/intellijImport.test.tsx b/src/features/plugins/__tests__/intellijImport.test.tsx
new file mode 100644
index 00000000..21b8ac29
--- /dev/null
+++ b/src/features/plugins/__tests__/intellijImport.test.tsx
@@ -0,0 +1,196 @@
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from "vitest";
+import { act, render, screen, waitFor, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import type { InstalledIntellijTheme, InstallPreview, IntellijThemeSource } from "@/bindings";
+import { IpcError } from "@/platform/ipc";
+import { provideNotificationService, type NotificationService } from "@/workbench/contributions";
+import { useThemeOverride } from "@/workbench/theme";
+import { createMemoryPluginsBackend, setPluginsBackend, type PluginsBackend } from "../backend";
+import { closeInstalledIntellijThemes, importIntellijTheme, showInstalledIntellijThemes } from "../intellijImport";
+import { IntellijThemesDialogHost } from "../IntellijThemesDialog";
+import { setConsentPrompt } from "../store";
+
+type Note = Parameters<NotificationService["notify"]>[0];
+const ID = "intellij.com-example-deepsea";
+const SOURCE: IntellijThemeSource = {
+  name: "Deep Sea Themes",
+  pluginId: "com.example.deepsea",
+  version: "2.3",
+  vendor: "Someone",
+  themes: [
+    { id: "deep-id", theme: '{"name":"Deep Sea","dark":true,"ui":{"*":{"background":"#101820"}}}', editorScheme: null },
+    { id: "shallow-id", theme: '{"name":"Shallow","dark":false}', editorScheme: null },
+  ],
+};
+const INSTALLED: InstalledIntellijTheme[] = [
+  {
+    ide: "IntelliJ IDEA 2025.2",
+    plugin: "Deep Sea Themes",
+    path: "/ij/plugins/DeepSea",
+    themeId: "shallow-id",
+    themeName: "Shallow",
+    dark: false,
+    active: true,
+  },
+  {
+    ide: "IntelliJ IDEA 2025.2",
+    plugin: "Deep Sea Themes",
+    path: "/ij/plugins/DeepSea",
+    themeId: "deep-id",
+    themeName: "Deep Sea",
+    dark: true,
+    active: false,
+  },
+];
+
+let notes: Note[];
+let read: Mock<PluginsBackend["readIntellijTheme"]>;
+let stage: Mock<PluginsBackend["stagePackage"]>;
+let installed: string[];
+
+function backend(overrides: Partial<PluginsBackend> = {}): PluginsBackend {
+  const base = createMemoryPluginsBackend();
+  const preview: InstallPreview = {
+    id: ID,
+    name: SOURCE.name,
+    version: "2.3.0",
+    description: "",
+    authors: ["Someone"],
+    hasCode: false,
+    capabilities: [],
+    contributions: [{ point: "themes", count: 2 }],
+    warnings: [],
+    replaces: null,
+    unsigned: true,
+    publisher: null,
+    signerChanged: false,
+    needsConsent: true,
+  };
+  return {
+    ...base,
+    readIntellijTheme: read,
+    stagePackage: stage,
+    installedIntellijThemes: async () => INSTALLED,
+    previewInstall: async () => preview,
+    installDir: async (path) => {
+      installed.push(path);
+      const [template] = (await base.list()).plugins;
+      return { ...template!, id: ID, name: SOURCE.name, hasCode: false, status: "static" };
+    },
+    ...overrides,
+  };
+}
+
+beforeEach(() => {
+  notes = [];
+  installed = [];
+  provideNotificationService({ notify: (n) => void notes.push(n) });
+  read = vi.fn<PluginsBackend["readIntellijTheme"]>(async () => SOURCE);
+  stage = vi.fn<PluginsBackend["stagePackage"]>(async () => "/app/plugins/.downloads/generated");
+  setPluginsBackend(backend());
+  setConsentPrompt(async () => ({ optional: [] }));
+  useThemeOverride.setState({ theme: null });
+});
+
+afterEach(() => {
+  closeInstalledIntellijThemes();
+  setConsentPrompt(null);
+  setPluginsBackend(null);
+  useThemeOverride.setState({ theme: null });
+});
+
+describe("IntelliJ theme import", () => {
+  it("installs the converted plugin through the install page and applies the chosen theme", async () => {
+    expect(await importIntellijTheme("/downloads/DeepSea.zip", "shallow-id")).toBe(ID);
+    expect(read).toHaveBeenCalledWith("/downloads/DeepSea.zip");
+    const [name, files] = stage.mock.calls[0]!;
+    expect(name).toBe(ID);
+    expect(files.map((f) => f.path)).toEqual([
+      "plugin.toml",
+      "themes/deep-sea.theme.json",
+      "themes/shallow.theme.json",
+    ]);
+    expect(installed).toEqual(["/app/plugins/.downloads/generated"]);
+    expect(useThemeOverride.getState().theme).toBe(`plugin:${ID}/shallow`);
+  });
+
+  it("applies the first theme without a choice, and nothing when the install is declined", async () => {
+    expect(await importIntellijTheme("/downloads/DeepSea.jar")).toBe(ID);
+    expect(useThemeOverride.getState().theme).toBe(`plugin:${ID}/deep-sea`);
+
+    useThemeOverride.setState({ theme: null });
+    setConsentPrompt(async () => null);
+    expect(await importIntellijTheme("/downloads/DeepSea.jar")).toBeNull();
+    expect(useThemeOverride.getState().theme).toBeNull();
+  });
+
+  it("asks for a file without a path, and does nothing when the picker is cancelled", async () => {
+    const pick = vi.fn(async () => null);
+    setPluginsBackend(backend({ pickIntellijTheme: pick }));
+    expect(await importIntellijTheme()).toBeNull();
+    expect(pick).toHaveBeenCalledOnce();
+    expect(read).not.toHaveBeenCalled();
+    expect(notes).toEqual([]);
+  });
+
+  it("reports a file that is not a theme plugin", async () => {
+    read.mockRejectedValueOnce(
+      new IpcError({
+        kind: "invalidInput",
+        message: "tools.jar is not a theme plugin: its plugin.xml declares no themeProvider",
+      }),
+    );
+    expect(await importIntellijTheme("/downloads/tools.jar")).toBeNull();
+    expect(stage).not.toHaveBeenCalled();
+    expect(notes).toEqual([
+      expect.objectContaining({
+        level: "error",
+        title: "Could not import the IntelliJ theme",
+        body: expect.stringContaining("not a theme plugin"),
+      }),
+    ]);
+  });
+});
+
+describe("Import Theme from IntelliJ IDE", () => {
+  it("lists the installed themes by plugin, the one in use first, and imports the chosen one", async () => {
+    const user = userEvent.setup();
+    const onImported = vi.fn();
+    render(<IntellijThemesDialogHost />);
+    act(() => showInstalledIntellijThemes(onImported));
+    const list = await screen.findByRole("listbox", { name: "IntelliJ themes" });
+    const options = await waitFor(() => {
+      const found = Array.from(list.querySelectorAll('[role="option"]'));
+      expect(found).toHaveLength(2);
+      return found;
+    });
+    // Both under their plugin's heading: importing one brings the plugin's every theme.
+    expect(within(list).getByText("Deep Sea Themes")).toBeInTheDocument();
+    expect(within(list).getByText("2 themes")).toBeInTheDocument();
+    expect(within(list).getByText("IntelliJ IDEA 2025.2")).toBeInTheDocument();
+    expect(options[0]).toHaveTextContent("Shallow");
+    expect(options[0]).toHaveTextContent("In use");
+    expect(options[1]).toHaveTextContent("Deep Sea");
+    expect(options[1]).not.toHaveTextContent("In use");
+
+    await user.click(screen.getByText("Deep Sea"));
+    await user.click(screen.getByRole("button", { name: "Import" }));
+    await waitFor(() => expect(onImported).toHaveBeenCalledWith(ID));
+    expect(read).toHaveBeenCalledWith("/ij/plugins/DeepSea");
+    expect(useThemeOverride.getState().theme).toBe(`plugin:${ID}/deep-sea`);
+    expect(screen.queryByRole("listbox", { name: "IntelliJ themes" })).toBeNull();
+  });
+
+  it("offers a file when no IDE has theme plugins", async () => {
+    const user = userEvent.setup();
+    const pick = vi.fn(async () => "/downloads/DeepSea.jar");
+    setPluginsBackend(backend({ installedIntellijThemes: async () => [], pickIntellijTheme: pick }));
+    render(<IntellijThemesDialogHost />);
+    act(() => showInstalledIntellijThemes());
+    expect(await screen.findByText(/No theme plugins found/)).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Import" })).toBeDisabled();
+    await user.click(screen.getByRole("button", { name: "Choose File…" }));
+    await waitFor(() => expect(read).toHaveBeenCalledWith("/downloads/DeepSea.jar"));
+    expect(pick).toHaveBeenCalledOnce();
+  });
+});
diff --git a/src/features/plugins/__tests__/plugins.test.tsx b/src/features/plugins/__tests__/plugins.test.tsx
index 4ba68718..72b65f4b 100644
--- a/src/features/plugins/__tests__/plugins.test.tsx
+++ b/src/features/plugins/__tests__/plugins.test.tsx
@@ -3,23 +3,27 @@ import { act, render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { EditorSelection, EditorState } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
-import type { PluginInfo } from "@/bindings";
+import type { Consent, InstallPreview, MarketPlugin, PluginInfo, ProjectInfo } from "@/bindings";
 import { _setActiveEditor } from "@/editor/api";
 import { executeAction, executeActionFrom, getAction, registerAction } from "@/platform/actions";
 import { useProject } from "@/platform/project";
+import { pluginThemeRef, useContributedIconThemes } from "@/platform/themes";
+import { ContextMenuHost, hideContextMenu } from "@/ui";
+import { InputDialogsHost } from "@/workbench/inputDialogs";
 import { provideNotificationService, type NotificationService } from "@/workbench/contributions";
-import { applyThemeAttributes, useThemeOverride } from "@/workbench/theme";
+import { applyThemeAttributes, previewTheme, useThemeOverride } from "@/workbench/theme";
 import { createMemoryPluginsBackend, sampleCatalog, setPluginsBackend, type PluginsBackend } from "../backend";
 import {
   applyPluginTheme,
   followThemeSetting,
   PLUGIN_THEME_STYLE_ID,
   handlePluginEvent,
+  providePluginThemePreviews,
   pluginActionId,
   startPluginBridge,
   syncProjection,
 } from "../bridge";
-import { iconResolver } from "../iconThemes";
+import { iconResolver, selectedIconTheme, useIconThemes } from "../iconThemes";
 import { markerIcon, placeMarkers } from "../lineMarkerGutter";
 import { SecretsDetails } from "../secrets";
 import { usePluginStatusItems } from "../runtimeUi";
@@ -27,9 +31,12 @@ import { useTasks } from "@/workbench/tasks";
 import { defineBuiltinUiPoints } from "../points";
 import { clearUiContributions, defineUiPoint, syncUiContributions } from "../projection";
 import { catalogState, filterCatalog, filterPlugins, NO_REPOSITORY, PluginsPage } from "../PluginsPage";
+import { ConsentDialogHost, provideConsentDialog } from "../consent";
 import {
+  adoptIconTheme,
   compareVersions,
   installFromDisk,
+  updateAllPlugins,
   refreshPlugins,
   runPluginCommand,
   selectPluginTheme,
@@ -387,6 +394,36 @@ describe("bridge events", () => {
     useThemeOverride.setState({ theme: null });
   });
 
+  it("previews a live plugin's theme in this window without selecting it", () => {
+    const root = document.documentElement;
+    const sheet = () => document.getElementById(PLUGIN_THEME_STYLE_ID)?.textContent ?? null;
+    const setTheme = vi.spyOn(backend, "setTheme");
+    const night = { id: "night", name: "Night", kind: "dark", tokens: { "--bg-app": "#101820" } };
+    const dawn = { id: "dawn", name: "Dawn", kind: "light" as const, tokens: { "--bg-app": "#fff8e7" } };
+    usePlugins.setState({
+      ui: [{ pluginId: "acme", point: "themes", key: "night", decl: night }],
+      activeTheme: { pluginId: "acme", theme: dawn },
+    });
+    applyPluginTheme(usePlugins.getState().activeTheme);
+    const stop = providePluginThemePreviews();
+
+    previewTheme(pluginThemeRef("acme", "night"));
+    expect(sheet()).toContain("--bg-app: #101820;");
+    expect([root.dataset.pluginTheme, root.dataset.theme]).toEqual(["acme/night", "dark"]);
+    // A built-in theme shows without the plugin's tokens.
+    previewTheme("solarized-light");
+    expect(sheet()).toBeNull();
+    expect([root.dataset.theme, root.dataset.colorTheme]).toEqual(["light", "solarized-light"]);
+    // Back to the selected one; nothing was selected on the way.
+    previewTheme(null);
+    expect(sheet()).toContain("--bg-app: #fff8e7;");
+    expect(root.dataset.pluginTheme).toBe("acme/dawn");
+    expect(setTheme).not.toHaveBeenCalled();
+
+    stop();
+    applyPluginTheme(null);
+  });
+
   it("runs commands with the focused editor's path, language and UTF-16 selections", async () => {
     const calls: unknown[] = [];
     setPluginsBackend({
@@ -462,6 +499,32 @@ describe("PluginsPage", () => {
     expect(screen.getByText("Toy (.toy)")).toBeInTheDocument();
   });
 
+  it("offers the IntelliJ theme imports only in a trusted project's window", async () => {
+    const user = userEvent.setup();
+    render(
+      <>
+        <PluginsPage />
+        <ContextMenuHost />
+      </>,
+    );
+    const imports = async () => {
+      await user.click(screen.getByRole("button", { name: "Manage Plugins" }));
+      const found = ["Import Theme from IntelliJ IDE…", "Import IntelliJ Theme from File…"].filter((name) =>
+        screen.queryByRole("menuitem", { name }),
+      );
+      act(() => hideContextMenu());
+      return found;
+    };
+    // The welcome screen: the host refuses installs without a trusted project.
+    expect(await imports()).toEqual([]);
+    const project = { trusted: false, root: "/p", name: "p", isGit: false } as unknown as ProjectInfo;
+    act(() => useProject.setState({ project }));
+    expect(await imports()).toEqual([]);
+    act(() => useProject.setState({ project: { ...project, trusted: true } }));
+    expect(await imports()).toHaveLength(2);
+    act(() => useProject.setState({ project: null }));
+  });
+
   it("restarts a failed plugin instead of disabling it", async () => {
     setPluginsBackend(createMemoryPluginsBackend([plugin({ id: "broken", status: "failed", error: "trap" })]));
     const user = userEvent.setup();
@@ -499,7 +562,6 @@ describe("PluginsPage", () => {
     render(<PluginsPage />);
     await user.click(screen.getByRole("tab", { name: /Available/ }));
     const list = await screen.findByRole("list", { name: "Available plugins" });
-    expect(within(list).getByText(new RegExp(NO_REPOSITORY))).toBeInTheDocument();
     await waitFor(() => expect(within(list).getByText("Toy Language")).toBeInTheDocument());
     await user.click(within(list).getByText("Toy Language"));
     expect(screen.getByRole("heading", { level: 2 })).toHaveTextContent("Toy Language");
@@ -508,6 +570,21 @@ describe("PluginsPage", () => {
     expect(within(list).getAllByText("Installed").length).toBeGreaterThan(0);
     expect(notes.at(-1)).toMatchObject({ title: "Installed Toy Language 0.1.0" });
   });
+
+  it("shows why the marketplace couldn't be read instead of claiming there is none", async () => {
+    // Commands without a result type reject with the backend's error object, not an Error.
+    setPluginsBackend({
+      ...createMemoryPluginsBackend([], sampleCatalog()),
+      marketUrl: () => Promise.reject({ kind: "unavailable", message: "Index unreachable", data: null }),
+    });
+    const user = userEvent.setup();
+    render(<PluginsPage />);
+    await user.click(screen.getByRole("tab", { name: /Available/ }));
+    const list = await screen.findByRole("list", { name: "Available plugins" });
+    expect(await within(list).findByText("Index unreachable")).toBeInTheDocument();
+    expect(within(list).queryByText("[object Object]")).not.toBeInTheDocument();
+    expect(within(list).queryByText(new RegExp(NO_REPOSITORY))).not.toBeInTheDocument();
+  });
 });
 
 describe("secrets", () => {
@@ -561,7 +638,9 @@ describe("marketplace", () => {
           download: "hello.oiplugin",
           digest: "x",
           capabilities: ["editor.write"],
+          engine: "^1.0",
           installed: null,
+          compatible: true,
         },
       ],
       // The memory backend installs its sample packages by path.
@@ -584,6 +663,253 @@ describe("marketplace", () => {
     expect(asked[0]).toMatchObject({ pluginId: "hello", kind: "install" });
   });
 
+  it("doesn't claim there is no repository while one is configured", async () => {
+    setPluginsBackend({
+      ...createMemoryPluginsBackend([], []),
+      marketUrl: async () => "https://plugins.example/index.json",
+      market: async () => [],
+    });
+    const user = userEvent.setup();
+    render(<PluginsPage />);
+    await user.click(screen.getByRole("tab", { name: /Available/ }));
+    expect(await screen.findByText("No plugin selected")).toBeInTheDocument();
+    expect(screen.queryByText(new RegExp(NO_REPOSITORY))).not.toBeInTheDocument();
+    expect(screen.getByRole("textbox", { name: "Filter plugins" })).toHaveAttribute("placeholder", "Search plugins");
+  });
+
+  it("edits the repository from the gear menu; an empty URL restores the default", async () => {
+    const base = createMemoryPluginsBackend([], []);
+    const set: (string | null)[] = [];
+    setPluginsBackend({
+      ...base,
+      marketUrl: async () => "https://plugins.example/index.json",
+      market: async () => [],
+      setMarketUrl: async (url) => void set.push(url),
+    });
+    const user = userEvent.setup();
+    render(
+      <>
+        <PluginsPage />
+        <ContextMenuHost />
+        <InputDialogsHost />
+      </>,
+    );
+    await user.click(screen.getByRole("tab", { name: /Available/ }));
+    expect(screen.queryByRole("textbox", { name: /Marketplace index URL/ })).not.toBeInTheDocument();
+    const edit = async (value: string) => {
+      await user.click(screen.getByRole("button", { name: "Manage Plugins" }));
+      await user.click(screen.getByRole("menuitem", { name: "Plugin Repository…" }));
+      const field = await screen.findByRole("textbox", { name: /Marketplace index URL/ });
+      await waitFor(() => expect(field).toHaveValue("https://plugins.example/index.json"));
+      await user.clear(field);
+      if (value) await user.type(field, value);
+      await user.click(screen.getByRole("button", { name: "Save" }));
+    };
+    await edit("https://mirror.example/index.json");
+    await edit("");
+    await waitFor(() => expect(set).toEqual(["https://mirror.example/index.json", null]));
+  });
+
+  it("filters the marketplace by category", async () => {
+    const entry = (id: string, name: string, categories: string[]) => ({
+      id,
+      name,
+      version: "1.0.0",
+      description: "",
+      authors: [],
+      publisher: "acme",
+      download: `${id}.oiplugin`,
+      digest: "x",
+      capabilities: [],
+      engine: "^1.0",
+      categories,
+      installed: null,
+      compatible: true,
+    });
+    setPluginsBackend({
+      ...createMemoryPluginsBackend([], sampleCatalog()),
+      marketUrl: async () => "https://plugins.example/index.json",
+      market: async () => [
+        entry("acme.dusk", "Dusk", ["themes"]),
+        entry("acme.lint", "Lint", ["linters", "tools"]),
+        entry("acme.misc", "Misc", ["robots"]),
+      ],
+    });
+    const user = userEvent.setup();
+    render(<PluginsPage />);
+    await user.click(screen.getByRole("tab", { name: /Available/ }));
+    const list = await screen.findByRole("list", { name: "Available plugins" });
+    await waitFor(() => expect(within(list).getByText("Dusk")).toBeInTheDocument());
+    await user.click(within(list).getByRole("button", { name: "Category" }));
+    const options = within(screen.getByRole("listbox"))
+      .getAllByRole("option")
+      .map((o) => o.textContent);
+    expect(options).toEqual(["All Categories3", "Themes1", "Linters & Formatters1", "Tools1", "Other1"]);
+    await user.click(within(screen.getByRole("listbox")).getByText("Tools"));
+    expect(within(list).queryByText("Dusk")).not.toBeInTheDocument();
+    expect(within(list).queryByText("Local")).not.toBeInTheDocument();
+    await user.click(within(list).getByText("Lint"));
+    expect(screen.getByText("Linters & Formatters, Tools")).toBeInTheDocument();
+  });
+
+  it("shows a plugin this IDE can't load without installing it", async () => {
+    setPluginsBackend({
+      ...createMemoryPluginsBackend([], sampleCatalog()),
+      marketUrl: async () => "https://plugins.example/index.json",
+      market: async () => [
+        {
+          id: "acme.next",
+          name: "Next",
+          version: "2.0.0",
+          description: "",
+          authors: [],
+          publisher: "acme",
+          download: "next.oiplugin",
+          digest: "x",
+          capabilities: [],
+          engine: "^9.0",
+          installed: null,
+          compatible: false,
+        },
+      ],
+    });
+    const user = userEvent.setup();
+    render(<PluginsPage />);
+    await user.click(screen.getByRole("tab", { name: /Available/ }));
+    const list = await screen.findByRole("list", { name: "Available plugins" });
+    await waitFor(() => expect(within(list).getByText("Incompatible")).toBeInTheDocument());
+    await user.click(within(list).getByText("Next"));
+    expect(screen.getByRole("note")).toHaveTextContent("Needs plugin API ^9.0. Update OpenIDEA to install it.");
+    expect(screen.queryByRole("button", { name: "Install" })).not.toBeInTheDocument();
+  });
+
+  describe("updates", () => {
+    const offered = (id: string, version: string, installed: string): MarketPlugin => ({
+      id,
+      name: id.toUpperCase(),
+      version,
+      description: "",
+      authors: [],
+      publisher: "acme",
+      download: `${id}.oiplugin`,
+      digest: "x",
+      capabilities: [],
+      engine: "^1.0",
+      installed,
+      compatible: true,
+    });
+    const preview = (id: string, version: string, extra: Partial<InstallPreview> = {}): InstallPreview => ({
+      id,
+      name: id.toUpperCase(),
+      version,
+      description: "",
+      authors: [],
+      hasCode: true,
+      capabilities: [
+        { id: "editor.read", description: "Read", risk: "low", optional: false, granted: true },
+        { id: "net:a.example", description: "Net", risk: "medium", optional: true, granted: true },
+        { id: "net:b.example", description: "Net", risk: "medium", optional: true, granted: false },
+      ],
+      contributions: [],
+      warnings: [],
+      replaces: "1.0.0",
+      unsigned: false,
+      publisher: "acme",
+      signerChanged: false,
+      needsConsent: false,
+      ...extra,
+    });
+
+    function updatesBackend(previews: Record<string, InstallPreview>) {
+      const base = createMemoryPluginsBackend([
+        plugin({ id: "a", version: "1.0.0" }),
+        plugin({ id: "b", version: "1.0.0" }),
+      ]);
+      const consents: [string, Consent][] = [];
+      setPluginsBackend({
+        ...base,
+        marketUrl: async () => "https://plugins.example/index.json",
+        market: async () => [
+          offered("a", "1.1.0", "1.0.0"),
+          offered("b", "2.0.0", "1.0.0"),
+          offered("c", "1.0.0", "1.0.0"),
+        ],
+        marketDownload: async (id) => id,
+        previewInstall: async (dir) => previews[dir]!,
+        installDir: async (dir, consent) => {
+          consents.push([dir, consent]);
+          return plugin({ id: dir, name: dir.toUpperCase(), version: previews[dir]!.version });
+        },
+      });
+      return consents;
+    }
+
+    it("installs updates with nothing to confirm without asking, keeping their grants", async () => {
+      const asked: ConsentRequest[] = [];
+      setConsentPrompt(async (req) => {
+        asked.push(req);
+        return { optional: [], signerChange: !!req.signerChanged };
+      });
+      const consents = updatesBackend({
+        a: preview("a", "1.1.0"),
+        b: preview("b", "2.0.0", { signerChanged: true, needsConsent: true }),
+      });
+      expect(await updateAllPlugins()).toBe(2);
+      // `a` with the optional capability it had; `b` asked, with the change of signer.
+      expect(asked.map((r) => [r.pluginId, r.signerChanged])).toEqual([["b", true]]);
+      expect(consents).toEqual([
+        ["a", { optional: ["net:a.example"] }],
+        ["b", { optional: [], signerChange: true }],
+      ]);
+      expect(notes.map((n) => n.title)).toEqual(["Updated 2 plugins"]);
+    });
+
+    it("warns about another signer on the install page and confirms it", async () => {
+      const consents = updatesBackend({ b: preview("b", "2.0.0", { signerChanged: true, needsConsent: true }) });
+      const stop = provideConsentDialog();
+      const user = userEvent.setup();
+      render(<ConsentDialogHost />);
+      const done = installFromDisk("b");
+      expect(await screen.findByRole("alert")).toHaveTextContent("signed with a different key");
+      await user.click(screen.getByRole("button", { name: "Install" }));
+      await done;
+      expect(consents[0]![1]).toMatchObject({ signerChange: true });
+      stop();
+    });
+
+    it("offers Update All in the gear menu while there are updates", async () => {
+      setConsentPrompt(async () => ({ optional: [] }));
+      const consents = updatesBackend({ a: preview("a", "1.1.0"), b: preview("b", "2.0.0") });
+      const user = userEvent.setup();
+      render(
+        <>
+          <PluginsPage />
+          <ContextMenuHost />
+        </>,
+      );
+      await waitFor(() => expect(usePlugins.getState().market).toHaveLength(3));
+      await user.click(screen.getByRole("button", { name: "Manage Plugins" }));
+      await user.click(screen.getByRole("menuitem", { name: "Update All Plugins (2)" }));
+      await waitFor(() => expect(consents.map(([id]) => id)).toEqual(["a", "b"]));
+    });
+
+    it("announces updates with actions to install them or show the plugins", async () => {
+      updatesBackend({ a: preview("a", "1.1.0"), b: preview("b", "2.0.0") });
+      handlePluginEvent({
+        type: "updatesAvailable",
+        updates: [
+          { id: "a", name: "A", version: "1.1.0" },
+          { id: "b", name: "B", version: "2.0.0" },
+        ],
+      });
+      const note = notes.at(-1)!;
+      expect(note).toMatchObject({ title: "2 plugin updates available", body: "A 1.1.0, B 2.0.0" });
+      expect(note.actions?.map((a) => a.label)).toEqual(["Update All", "Show Plugins"]);
+      note.actions![0]!.run();
+      await waitFor(() => expect(notes.at(-1)?.title).toBe("Updated 2 plugins"));
+    });
+  });
+
   it("offers to roll back an update", async () => {
     const base = createMemoryPluginsBackend([
       plugin({ id: "p", name: "P", version: "2.0.0", previousVersion: "1.0.0" }),
@@ -606,6 +932,42 @@ describe("marketplace", () => {
 });
 
 describe("icon themes", () => {
+  const iconThemeUi = (pluginId: string, id: string) => ({
+    pluginId,
+    point: "iconThemes",
+    key: id,
+    decl: { id, label: id.toUpperCase(), icons: 1 },
+  });
+
+  it("adopts the first icon theme of a plugin when none is selected", async () => {
+    useIconThemes.setState({ override: undefined });
+    usePlugins.setState({ ui: [iconThemeUi("q", "other"), iconThemeUi("p", "first"), iconThemeUi("p", "second")] });
+    await adoptIconTheme("p");
+    expect(selectedIconTheme()).toBe("p/first");
+    await adoptIconTheme("q");
+    expect(selectedIconTheme()).toBe("p/first");
+    useIconThemes.setState({ override: undefined });
+  });
+
+  it("names each icon theme's settings page after its plugin and theme", () => {
+    syncUiContributions([iconThemeUi("acme.icons", "atom.dark")], [plugin({ id: "acme.icons", name: "Acme" })]);
+    try {
+      expect(useContributedIconThemes.getState().themes.find((t) => t.id === "acme.icons/atom.dark")).toMatchObject({
+        label: "ATOM.DARK",
+        settingsPage: "plugins.acme-icons.atom-dark",
+      });
+    } finally {
+      clearUiContributions();
+    }
+  });
+
+  it("adopts nothing for plugins without icon themes", async () => {
+    useIconThemes.setState({ override: undefined });
+    usePlugins.setState({ ui: [iconThemeUi("q", "other")] });
+    await adoptIconTheme("p");
+    expect(selectedIconTheme()).toBeNull();
+  });
+
   it("resolves file names, then the longest extension, then the default icon", () => {
     const theme = iconResolver(
       {
diff --git a/src/features/plugins/backend.ts b/src/features/plugins/backend.ts
index 4d79330e..e0289e15 100644
--- a/src/features/plugins/backend.ts
+++ b/src/features/plugins/backend.ts
@@ -10,7 +10,9 @@ import type {
   CatalogPlugin,
   Consent,
   EventKind,
+  InstalledIntellijTheme,
   InstallPreview,
+  IntellijThemeSource,
   MarketPlugin,
   PluginEditor,
   PluginEvent,
@@ -71,6 +73,14 @@ export interface PluginsBackend {
   rollBack(id: string): Promise<PluginInfo>;
   /** File picker for a package: an `.oiplugin`, a `.zip` or a folder's `plugin.toml`; `null` when cancelled. */
   pickPackage(): Promise<string | null>;
+  /** File picker for an IntelliJ theme plugin (`.jar`, `.zip`) or `.theme.json`; `null` when cancelled. */
+  pickIntellijTheme(): Promise<string | null>;
+  /** Reads the themes of an IntelliJ theme plugin or `.theme.json`. */
+  readIntellijTheme(path: string): Promise<IntellijThemeSource>;
+  /** Theme plugins installed in the JetBrains IDEs on this machine, the ones in use first. */
+  installedIntellijThemes(): Promise<InstalledIntellijTheme[]>;
+  /** Writes a generated package (`name`: its id); the folder to install from. */
+  stagePackage(name: string, files: { path: string; text: string }[]): Promise<string>;
   /** Content of a plugin view (`doc`: the document of a custom editor). */
   renderView(pluginId: string, view: string, viewport: Viewport | null, doc: number | null): Promise<View>;
   viewEvent(pluginId: string, view: string, event: ViewEvent, doc: number | null): Promise<void>;
@@ -166,6 +176,18 @@ export const tauriPluginsBackend: PluginsBackend = {
     });
     return (Array.isArray(picked) ? picked[0] : picked) ?? null;
   },
+  pickIntellijTheme: async () => {
+    const { open } = await import("@tauri-apps/plugin-dialog");
+    const picked = await open({
+      multiple: false,
+      title: tx("Import IntelliJ Theme"),
+      filters: [{ name: tx("IntelliJ theme plugin or theme file"), extensions: ["jar", "zip", "json"] }],
+    });
+    return (Array.isArray(picked) ? picked[0] : picked) ?? null;
+  },
+  readIntellijTheme: (path) => call(commands.pluginReadIntellijTheme(path)),
+  installedIntellijThemes: () => call(commands.pluginInstalledIntellijThemes()),
+  stagePackage: (name, files) => call(commands.pluginStagePackage(name, files)),
   // A tool window's calls (no `doc`) carry the window's active editor.
   renderView: (pluginId, view, viewport, doc) =>
     call(commands.pluginViewRender(pluginId, view, viewport, doc, doc == null ? editorContext() : null)),
@@ -407,6 +429,8 @@ export function createMemoryPluginsBackend(
       replaces: plugins.find((p) => p.id === entry.id)?.version ?? null,
       unsigned: true,
       publisher: null,
+      signerChanged: false,
+      needsConsent: true,
     };
   };
   return {
@@ -488,6 +512,14 @@ export function createMemoryPluginsBackend(
       throw new IpcError({ kind: "notFound", message: `${id} has no earlier version to roll back to` });
     },
     pickPackage: async () => null,
+    pickIntellijTheme: async () => null,
+    readIntellijTheme: async (path) => {
+      throw new IpcError({ kind: "unavailable", message: `reading ${path} requires the desktop app` });
+    },
+    installedIntellijThemes: async () => [],
+    stagePackage: async () => {
+      throw new IpcError({ kind: "unavailable", message: "installing a generated plugin requires the desktop app" });
+    },
     renderView: async (pluginId, view) => ({
       toolbar: [],
       body: { kind: "message", value: `${pluginId} · ${view} (plugin views need the desktop app)` },
diff --git a/src/features/plugins/bridge.ts b/src/features/plugins/bridge.ts
index 9e4d06af..4bb97c56 100644
--- a/src/features/plugins/bridge.ts
+++ b/src/features/plugins/bridge.ts
@@ -6,13 +6,18 @@
  * variables, notifications become balloons, consent requests open the
  * permission dialog, and opened files fire `on-language` / `on-file`.
  */
-import type { ActiveTheme, PluginEvent } from "@/bindings";
+import type { ActiveTheme, PluginEvent, PluginUpdate } from "@/bindings";
 import { useEditorRegistry } from "@/editor/api";
 import { refreshLanguageInfos } from "@/editor/core/cm/languages";
 import { notifications } from "@/workbench/contributions";
 import { useProducerNames } from "@/platform/inspections";
 import { languageListChanged } from "@/platform/languageList";
-import { isThemeAvailable, parsePluginThemeRef, useContributedThemes } from "@/platform/themes";
+import {
+  isThemeAvailable,
+  parsePluginThemeRef,
+  providePluginThemePreview,
+  useContributedThemes,
+} from "@/platform/themes";
 import {
   applyThemeAttributes,
   currentThemeChoice,
@@ -22,13 +27,14 @@ import {
   useThemeOverride,
   windowBackgroundHex,
 } from "@/workbench/theme";
+import { executeAction } from "@/platform/actions";
 import { useProject } from "@/platform/project";
 import { pluginsBackend } from "./backend";
 import { trackIconTheme } from "./iconThemes";
 import { defineBuiltinUiPoints } from "./points";
 import { clearUiContributions, syncUiContributions } from "./projection";
 import { handleRuntimeEvent, refreshEventKinds, startRuntimeUi } from "./runtimeUi";
-import { grantPlugin, refreshPlugins, selectPluginTheme, usePlugins } from "./store";
+import { grantPlugin, refreshPlugins, selectPluginTheme, updateAllPlugins, usePlugins } from "./store";
 
 export { pluginActionId } from "./points";
 
@@ -92,6 +98,22 @@ export function applyPluginTheme(theme: ActiveTheme | null, root: HTMLElement =
   if (had || theme) syncWindowBackground();
 }
 
+/**
+ * Quick Switch's theme preview of plugin themes: a live plugin's theme as it
+ * contributes it, shown in this window only; nothing is selected or saved.
+ */
+export function providePluginThemePreviews(): () => void {
+  return providePluginThemePreview((ref) => {
+    const state = usePlugins.getState();
+    if (ref === "selected") return applyPluginTheme(state.activeTheme);
+    const want = ref ? parsePluginThemeRef(ref) : null;
+    const item = want
+      ? state.ui.find((c) => c.point === "themes" && c.pluginId === want.pluginId && c.key === want.themeId)
+      : undefined;
+    applyPluginTheme(item ? { pluginId: item.pluginId, theme: item.decl as ActiveTheme["theme"] } : null);
+  });
+}
+
 /** localStorage key read by public/boot.js: the selected theme's stylesheet, applied before the app loads. */
 export const PLUGIN_THEME_CACHE_KEY = "openidea.pluginTheme";
 
@@ -223,11 +245,28 @@ function trackActiveFile(): () => void {
 
 // --- events -----------------------------------------------------------------
 
+function announceUpdates(updates: readonly PluginUpdate[]) {
+  const names = updates.map((u) => `${u.name} ${u.version}`).join(", ");
+  notifications().notify({
+    group: "plugins",
+    level: "info",
+    title: updates.length === 1 ? "Plugin update available" : `${updates.length} plugin updates available`,
+    body: names,
+    actions: [
+      { label: "Update All", run: () => void updateAllPlugins() },
+      { label: "Show Plugins", run: () => void executeAction("plugins.settings") },
+    ],
+  });
+}
+
 export function handlePluginEvent(e: PluginEvent) {
   switch (e.type) {
     case "commandsChanged":
       scheduleRefresh();
       break;
+    case "updatesAvailable":
+      announceUpdates(e.updates);
+      break;
     case "notification": {
       const name = usePlugins.getState().plugins.find((p) => p.id === e.pluginId)?.name ?? e.pluginId;
       notifications().notify({ group: "plugins", level: e.level, title: e.title || name, body: e.body || undefined });
diff --git a/src/features/plugins/consent.tsx b/src/features/plugins/consent.tsx
index 017920b1..24caddfa 100644
--- a/src/features/plugins/consent.tsx
+++ b/src/features/plugins/consent.tsx
@@ -59,7 +59,7 @@ function ConsentDialog({ pending, onDone }: { pending: Pending; onDone: () => vo
         {
           label: req.kind === "install" ? tx("Install") : tx("Allow"),
           role: "default",
-          onClick: () => finish({ optional: [...accepted] }),
+          onClick: () => finish({ optional: [...accepted], signerChange: !!req.signerChanged }),
         },
       ]}
     >
@@ -69,6 +69,14 @@ function ConsentDialog({ pending, onDone }: { pending: Pending; onDone: () => vo
             <T>This package is not signed. Only continue if you trust where it came from.</T>
           </p>
         )}
+        {req.signerChanged && (
+          <p className={styles.consentWarning} role="alert">
+            <T>
+              This version is signed with a different key than the installed one, and the publisher's earlier key
+              doesn't vouch for it. Only continue if you know the publisher changed keys.
+            </T>
+          </p>
+        )}
         {caps.length === 0 ? (
           <p>
             <T>This plugin needs no special permissions.</T>
diff --git a/src/features/plugins/iconThemeResolver.ts b/src/features/plugins/iconThemeResolver.ts
new file mode 100644
index 00000000..57590529
--- /dev/null
+++ b/src/features/plugins/iconThemeResolver.ts
@@ -0,0 +1,167 @@
+import type { FileIconThemeOptions } from "@/bindings";
+import { isSymbolIcon, type FileIconTheme } from "@/ui";
+import { createPatternIndex, type IndexedPattern } from "@/ui/patternIndex";
+
+export interface IconThemePattern {
+  pattern: string;
+  icon: string;
+  target: "file" | "folder";
+  path: boolean;
+  ignoreCase: boolean;
+  group: string | null;
+  openIcon: string | null;
+}
+
+export interface IconThemeGroup {
+  id: string;
+  name: string;
+  enabled: boolean;
+}
+
+export interface IconThemeChoiceOption {
+  id: string;
+  name: string;
+  overrides: Record<string, string>;
+}
+
+export interface IconThemeChoice {
+  id: string;
+  name: string;
+  default: string;
+  options: IconThemeChoiceOption[];
+}
+
+export interface IconThemeMap {
+  file: string | null;
+  folder?: string | null;
+  folderExpanded?: string | null;
+  folderOpen?: string | null;
+  fileExtensions: Record<string, string>;
+  fileNames: Record<string, string>;
+  folderNames?: Record<string, string>;
+  patterns?: IconThemePattern[];
+  overrides?: Record<string, string>;
+  groups?: IconThemeGroup[];
+  choices?: IconThemeChoice[];
+  accent?: boolean;
+}
+
+export interface ResolverSettings {
+  hidden: string;
+  options: FileIconThemeOptions;
+}
+
+export interface ThemeResolver extends FileIconTheme {
+  icon(name: string): string | null;
+}
+
+interface Compiled extends IndexedPattern {
+  icon: string;
+  openIcon: string | null;
+}
+
+const MAX_NAME_LEN = 255;
+const MAX_PATH_LEN = 1024;
+const MAX_CACHED = 5000;
+
+const normalizePath = (path: string | null | undefined) => (path ? path.replace(/\\/g, "/") : null);
+
+function compile(map: IconThemeMap, target: IconThemePattern["target"], options: FileIconThemeOptions) {
+  const enabled = (group: string | null) => {
+    if (!group) return true;
+    return options.groups?.[group] ?? map.groups?.find((g) => g.id === group)?.enabled ?? true;
+  };
+  const compiled: Compiled[] = [];
+  (map.patterns ?? []).forEach((p, order) => {
+    if (p.target !== target || !enabled(p.group)) return;
+    try {
+      const re = new RegExp(p.pattern, p.ignoreCase ? "i" : "");
+      compiled.push({ re, source: p.pattern, path: p.path, order, icon: p.icon, openIcon: p.openIcon });
+    } catch {
+      return;
+    }
+  });
+  return createPatternIndex(compiled, (p, name, path) => {
+    const subject = p.path ? path : name;
+    if (subject === null || subject.length > (p.path ? MAX_PATH_LEN : MAX_NAME_LEN)) return false;
+    return p.re.test(subject);
+  });
+}
+
+function chosenOverrides(map: IconThemeMap, options: FileIconThemeOptions): Record<string, string> {
+  return Object.assign(
+    {},
+    ...(map.choices ?? []).map((c) => {
+      const picked = options.choices?.[c.id];
+      const option = c.options.find((o) => o.id === picked) ?? c.options.find((o) => o.id === c.default);
+      return option?.overrides ?? {};
+    }),
+  );
+}
+
+function cached(resolve: (fileName: string, path: string | null) => string | null) {
+  const cache = new Map<string, string | null>();
+  return (fileName: string, path: string | null) => {
+    const key = path ?? `\0${fileName}`;
+    const hit = cache.get(key);
+    if (hit !== undefined) return hit;
+    if (cache.size >= MAX_CACHED) cache.clear();
+    const icon = resolve(fileName, path);
+    cache.set(key, icon);
+    return icon;
+  };
+}
+
+export function iconResolver(
+  map: IconThemeMap,
+  iconName: (icon: string) => string,
+  has: (name: string) => boolean,
+  settings: ResolverSettings = { hidden: "", options: {} },
+): ThemeResolver {
+  const { options, hidden } = settings;
+  const pick = (icon: string | undefined | null) => (icon && has(iconName(icon)) ? iconName(icon) : null);
+  const files = compile(map, "file", options);
+  const folders = compile(map, "folder", options);
+  const chosen = chosenOverrides(map, options);
+  const overrides = map.overrides ?? {};
+  const replaced = (name: string) => {
+    if (isSymbolIcon(name) ? options.hidePsiIcons : options.hideUiIcons) return null;
+    if (Object.hasOwn(chosen, name)) return chosen[name];
+    return Object.hasOwn(overrides, name) ? overrides[name] : null;
+  };
+  const fileIcon = cached((fileName, path) => {
+    const lower = fileName.toLowerCase();
+    const hit = files.find(fileName, path);
+    const matched = hit && pick(hit.icon);
+    if (matched) return matched;
+    const named = pick(map.fileNames[lower]);
+    if (named) return named;
+    let rest = lower;
+    for (let dot = rest.indexOf("."); dot >= 0; dot = rest.indexOf(".")) {
+      rest = rest.slice(dot + 1);
+      const byExt = pick(map.fileExtensions[rest]);
+      if (byExt) return byExt;
+    }
+    return pick(map.file);
+  });
+  return {
+    file(fileName, path) {
+      if (options.hideFiles && hidden) return hidden;
+      return fileIcon(fileName, normalizePath(path));
+    },
+    folder(folderName, expanded, holdsOpenFile = false, path = null) {
+      if (options.hideFolders && hidden) return hidden;
+      const open = !!options.hollowFolders && holdsOpenFile;
+      const hit = folders.find(folderName, normalizePath(path));
+      const matched = hit && ((open && pick(hit.openIcon)) || pick(hit.icon));
+      if (matched) return matched;
+      const named = pick(map.folderNames?.[folderName.toLowerCase()]);
+      if (named) return named;
+      if (open && pick(map.folderOpen)) return pick(map.folderOpen);
+      return (expanded && pick(map.folderExpanded)) || pick(map.folder);
+    },
+    icon(name) {
+      return pick(replaced(name));
+    },
+  };
+}
diff --git a/src/features/plugins/iconThemes.ts b/src/features/plugins/iconThemes.ts
index 6f3cf9f4..20dafa80 100644
--- a/src/features/plugins/iconThemes.ts
+++ b/src/features/plugins/iconThemes.ts
@@ -7,10 +7,16 @@
  */
 import { create } from "zustand";
 import { call, commands, isTauri } from "@/platform/ipc";
+import { validateIconThemeOptions } from "@/platform/iconThemeOptions";
 import { useProject } from "@/platform/project";
-import { addContributedIconTheme } from "@/platform/themes";
-import { registerExternalIcons, setFileIconTheme, type FileIconTheme } from "@/ui";
+import type { FileIconThemeOptions } from "@/bindings";
+import { addContributedIconTheme, type IconThemeDetails } from "@/platform/themes";
+import { registerExternalIcons, setFileIconTheme } from "@/ui";
+import { setIconAppearance } from "@/ui/iconAppearance";
 import { pluginsBackend } from "./backend";
+import { iconResolver, type IconThemeMap } from "./iconThemeResolver";
+
+export { iconResolver } from "./iconThemeResolver";
 
 export interface IconThemeRef {
   pluginId: string;
@@ -18,15 +24,7 @@ export interface IconThemeRef {
   label: string;
   /** The plugin's name. */
   origin?: string;
-}
-
-export interface IconThemeMap {
-  file: string | null;
-  folder?: string | null;
-  folderExpanded?: string | null;
-  fileExtensions: Record<string, string>;
-  fileNames: Record<string, string>;
-  folderNames?: Record<string, string>;
+  settingsPage?: string;
 }
 
 interface IconThemesState {
@@ -47,6 +45,25 @@ export const useIconThemes = create<IconThemesState>(() => ({
 const fromSettings = (s: ReturnType<typeof useProject.getState>) =>
   (s.settings?.appearance as { fileIconTheme?: unknown } | undefined)?.fileIconTheme;
 
+const optionsFromSettings = (s: ReturnType<typeof useProject.getState>) =>
+  (s.settings?.appearance as { fileIconThemeOptions?: unknown } | undefined)?.fileIconThemeOptions;
+
+type ProjectState = ReturnType<typeof useProject.getState>;
+
+function optionsChanged(key: string, s: ProjectState, prev: ProjectState): boolean {
+  if (optionsFromSettings(s) === optionsFromSettings(prev)) return false;
+  return JSON.stringify(optionsOf(s, key)) !== JSON.stringify(optionsOf(prev, key));
+}
+
+function optionsOf(state: ProjectState, key: string): FileIconThemeOptions {
+  const own = (optionsFromSettings(state) as Record<string, unknown> | undefined)?.[key];
+  return validateIconThemeOptions(own);
+}
+
+function themeOptions(key: string): FileIconThemeOptions {
+  return optionsOf(useProject.getState(), key);
+}
+
 /** The selected icon theme (`<pluginId>/<themeId>`), or null for the built-in icons. */
 export function selectedIconTheme(): string | null {
   const { override } = useIconThemes.getState();
@@ -63,11 +80,24 @@ export function useSelectedIconTheme(): string | null {
 
 export const iconThemeKey = (pluginId: string, id: string) => `${pluginId}/${id}`;
 
+async function loadDetails(theme: IconThemeRef): Promise<IconThemeDetails | null> {
+  const id = `iconTheme/${theme.id}/settings`;
+  const assets = await pluginsBackend().assets(theme.pluginId, id);
+  const json = assets.find(([asset]) => asset === id)?.[1];
+  return json ? (JSON.parse(json) as IconThemeDetails) : null;
+}
+
 /** Called by the `iconThemes` projection: the theme can be selected while its plugin is live. */
 export function addIconTheme(theme: IconThemeRef): () => void {
   const key = iconThemeKey(theme.pluginId, theme.id);
   useIconThemes.setState((s) => ({ available: new Map(s.available).set(key, theme) }));
-  const unlist = addContributedIconTheme({ id: key, label: theme.label, origin: theme.origin });
+  const unlist = addContributedIconTheme({
+    id: key,
+    label: theme.label,
+    origin: theme.origin,
+    settingsPage: theme.settingsPage,
+    details: () => loadDetails(theme),
+  });
   return () => {
     unlist();
     useIconThemes.setState((s) => {
@@ -92,44 +122,32 @@ export async function selectIconTheme(key: string | null) {
   }
 }
 
-/**
- * The theme's resolver. Files: exact name, then the longest matching
- * extension, then its default file icon. Folders: exact name, then its
- * default (expanded) folder icon.
- */
-export function iconResolver(
-  map: IconThemeMap,
-  iconName: (icon: string) => string,
-  has: (name: string) => boolean,
-): FileIconTheme {
-  const pick = (icon: string | undefined | null) => (icon && has(iconName(icon)) ? iconName(icon) : null);
-  return {
-    file(fileName) {
-      const lower = fileName.toLowerCase();
-      const named = pick(map.fileNames[lower]);
-      if (named) return named;
-      let rest = lower;
-      for (let dot = rest.indexOf("."); dot >= 0; dot = rest.indexOf(".")) {
-        rest = rest.slice(dot + 1);
-        const byExt = pick(map.fileExtensions[rest]);
-        if (byExt) return byExt;
-      }
-      return pick(map.file);
-    },
-    folder(folderName, expanded) {
-      const named = pick(map.folderNames?.[folderName.toLowerCase()]);
-      if (named) return named;
-      return (expanded && pick(map.folderExpanded)) || pick(map.folder);
-    },
-  };
-}
-
 let undo: (() => void) | null = null;
 let loading: string | null = null;
 
+interface Loaded {
+  key: string;
+  map: IconThemeMap;
+  iconName: (icon: string) => string;
+  names: ReadonlySet<string>;
+}
+
+let loaded: Loaded | null = null;
+
+const HIDDEN_SVG = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"></svg>';
+
+function install(theme: Loaded) {
+  const options = themeOptions(theme.key);
+  const hidden = theme.iconName("__hidden");
+  setFileIconTheme(
+    iconResolver(theme.map, theme.iconName, (n) => theme.names.has(n) || n === hidden, { hidden, options }),
+  );
+  setIconAppearance(options);
+}
+
 async function apply(key: string | null) {
   const theme = key ? useIconThemes.getState().available.get(key) : undefined;
-  if (!theme) {
+  if (!key || !theme) {
     undo?.();
     undo = null;
     useIconThemes.setState({ applied: null });
@@ -151,10 +169,14 @@ async function apply(key: string | null) {
       .map(([id, svg]) => [iconName(id.slice(svgPrefix.length)), svg] as const);
     const names = new Set(icons.map(([n]) => n));
     undo?.();
-    const unregister = registerExternalIcons(icons);
-    setFileIconTheme(iconResolver(map, iconName, (n) => names.has(n)));
+    const unregister = registerExternalIcons([...icons, [iconName("__hidden"), HIDDEN_SVG]]);
+    const current: Loaded = { key, map, iconName, names };
+    loaded = current;
+    install(current);
     undo = () => {
+      loaded = null;
       setFileIconTheme(null);
+      setIconAppearance(null);
       unregister();
     };
     useIconThemes.setState({ applied: key });
@@ -179,6 +201,7 @@ export function trackIconTheme(): () => void {
     // Settings are shared by every window: a choice made in one shows in all.
     useProject.subscribe((s, prev) => {
       if (fromSettings(s) !== fromSettings(prev)) sync();
+      else if (loaded && optionsChanged(loaded.key, s, prev)) install(loaded);
     }),
   ];
   return () => {
diff --git a/src/features/plugins/index.ts b/src/features/plugins/index.ts
index 3991847b..57e1c11a 100644
--- a/src/features/plugins/index.ts
+++ b/src/features/plugins/index.ts
@@ -5,6 +5,8 @@
  * projected by `projection.ts` / `points.tsx`.
  *
  * Actions: `plugins.settings`, `plugins.installFromDisk`, `plugins.reloadAll`,
+ * `plugins.importIntellijTheme` (a theme plugin file; `arg`: its path),
+ * `plugins.importInstalledIntellijTheme` (from the JetBrains IDEs on this machine),
  * plus one action per plugin command: `plugin.<pluginId>.<commandId>`
  * (searchable in Search Everywhere › Actions and bindable in the keymap editor;
  * a string arg is forwarded to the plugin).
@@ -17,13 +19,21 @@ import { lazyComponent } from "@/ui";
 import { executeAction, registerActions } from "@/platform/actions";
 import { useProject } from "@/platform/project";
 import { editorService, registerOverlay, registerSettingsPage } from "@/workbench/contributions";
-import { followPluginChanges, startPluginBridge, syncProjection, trackPluginTheme } from "./bridge";
+import {
+  followPluginChanges,
+  providePluginThemePreviews,
+  startPluginBridge,
+  syncProjection,
+  trackPluginTheme,
+} from "./bridge";
 import { ConsentDialogHost, provideConsentDialog } from "./consent";
 import { trackIconTheme } from "./iconThemes";
 import { pluginLineMarkerGutter } from "./lineMarkerGutter";
 import { defineBuiltinUiPoints } from "./points";
 import { startViewUi } from "./uiPoints";
-import { installFromDisk, refreshPlugins, reloadPlugin, SETTINGS_PAGE_ID, usePlugins } from "./store";
+import { importIntellijTheme, showInstalledIntellijThemes } from "./intellijImport";
+import { IntellijThemesDialogHost } from "./IntellijThemesDialog";
+import { installFromDisk, refreshPlugins, reloadPlugin, SETTINGS_PAGE_ID, updateAllPlugins, usePlugins } from "./store";
 
 function registerPluginsPage(): () => void {
   return registerSettingsPage({
@@ -41,6 +51,7 @@ export function activateSettingsPages(): () => void {
   const disposers = [
     registerPluginsPage(),
     registerOverlay({ id: "plugins.consent", component: ConsentDialogHost }),
+    registerOverlay({ id: "plugins.intellijThemes", component: IntellijThemesDialogHost }),
     provideConsentDialog(),
     defineBuiltinUiPoints(),
     followPluginChanges(),
@@ -56,7 +67,9 @@ export function activate(): () => void {
   const disposers = [
     registerPluginsPage(),
     registerOverlay({ id: "plugins.consent", component: ConsentDialogHost }),
+    registerOverlay({ id: "plugins.intellijThemes", component: IntellijThemesDialogHost }),
     provideConsentDialog(),
+    providePluginThemePreviews(),
     registerActions([
       {
         id: "plugins.settings",
@@ -76,6 +89,37 @@ export function activate(): () => void {
           await installFromDisk(typeof arg === "string" ? arg : undefined);
         },
       },
+      {
+        id: "plugins.updateAll",
+        title: "Update All Plugins",
+        category: "Plugins",
+        icon: "plugin",
+        keywords: ["upgrade", "marketplace", "new version"],
+        run: async () => {
+          await updateAllPlugins();
+        },
+      },
+      {
+        id: "plugins.importIntellijTheme",
+        title: "Import IntelliJ Theme from File…",
+        category: "Plugins",
+        icon: "plugin",
+        keywords: ["intellij", "jetbrains", "theme", "jar", "theme.json", "color scheme"],
+        // Installing needs a project's window.
+        when: "projectOpen",
+        run: async ({ arg }) => {
+          await importIntellijTheme(typeof arg === "string" ? arg : undefined);
+        },
+      },
+      {
+        id: "plugins.importInstalledIntellijTheme",
+        title: "Import Theme from IntelliJ IDE…",
+        category: "Plugins",
+        icon: "plugin",
+        keywords: ["intellij", "jetbrains", "theme", "color scheme", "migrate"],
+        when: "projectOpen",
+        run: () => showInstalledIntellijThemes(),
+      },
       {
         id: "plugins.reloadAll",
         title: "Reload Plugins",
diff --git a/src/features/plugins/intellijImport.ts b/src/features/plugins/intellijImport.ts
new file mode 100644
index 00000000..3ba281f7
--- /dev/null
+++ b/src/features/plugins/intellijImport.ts
@@ -0,0 +1,61 @@
+/**
+ * Settings › Plugins › Import IntelliJ Theme: an IntelliJ theme plugin (a
+ * Marketplace `.jar` / `.zip`, a plugin folder of an installed IDE) or a
+ * `.theme.json` becomes an OpenIDEA theme plugin — read by the host, converted
+ * here (`intellijTheme.ts`), installed through the usual install page — and
+ * its theme is applied.
+ */
+import { create } from "zustand";
+import { pluginThemeRef } from "@/platform/themes";
+import { notifications } from "@/workbench/contributions";
+import { setTheme } from "@/workbench/theme";
+import { pluginsBackend } from "./backend";
+import { intellijThemePackage, type ThemePackage } from "./intellijTheme";
+import { errorText, installFromDisk } from "./store";
+
+/**
+ * Imports the IntelliJ theme plugin at `path` (asks for a file without one)
+ * and applies its theme `themeId` (an IntelliJ theme id), or its first.
+ * Returns the installed plugin's id.
+ */
+export async function importIntellijTheme(path?: string, themeId?: string): Promise<string | null> {
+  const backend = pluginsBackend();
+  let pkg: ThemePackage;
+  let dir: string;
+  try {
+    const picked = path ?? (await backend.pickIntellijTheme());
+    if (!picked) return null;
+    pkg = intellijThemePackage(await backend.readIntellijTheme(picked));
+    dir = await backend.stagePackage(pkg.id, pkg.files);
+  } catch (e) {
+    notifications().notify({
+      group: "plugins",
+      level: "error",
+      title: "Could not import the IntelliJ theme",
+      body: errorText(e),
+    });
+    return null;
+  }
+  const id = await installFromDisk(dir);
+  if (!id) return null;
+  const theme = pkg.themes.find((t) => t.sourceId === themeId) ?? pkg.themes[0];
+  if (theme) await setTheme(pluginThemeRef(id, theme.id));
+  return id;
+}
+
+interface DialogState {
+  open: boolean;
+  /** Called with the plugin id after an import from the dialog. */
+  onImported: ((id: string) => void) | null;
+}
+
+export const useIntellijThemesDialog = create<DialogState>(() => ({ open: false, onImported: null }));
+
+/** Shows the themes of the JetBrains IDEs on this machine to pick one to import. */
+export function showInstalledIntellijThemes(onImported?: (id: string) => void): void {
+  useIntellijThemesDialog.setState({ open: true, onImported: onImported ?? null });
+}
+
+export function closeInstalledIntellijThemes(): void {
+  useIntellijThemesDialog.setState({ open: false, onImported: null });
+}
diff --git a/scripts/theme/intellij.ts b/src/features/plugins/intellijTheme.ts
similarity index 70%
rename from scripts/theme/intellij.ts
rename to src/features/plugins/intellijTheme.ts
index 407f2ca0..963b80ef 100644
--- a/scripts/theme/intellij.ts
+++ b/src/features/plugins/intellijTheme.ts
@@ -1,11 +1,13 @@
 /**
  * Converts an IntelliJ theme (`.theme.json`, optionally with its editor scheme
- * `.icls`) into an OpenIDEA theme + editor scheme. The mapping covers the
- * main keys only; anything unmapped keeps the built-in value of the base
- * (`kind`). Pure functions, no dependencies: see import-intellij-theme.ts
- * for the command line.
+ * `.icls`) into an OpenIDEA theme + editor scheme, and an IntelliJ theme
+ * plugin into an OpenIDEA theme plugin package. The mapping covers the main
+ * keys only; anything unmapped keeps the built-in value of the base (`kind`).
+ *
+ * Pure functions without imports: Settings › Plugins › Import IntelliJ Theme
+ * uses them on what the host read from the plugin (`plugin_read_intellij_theme`),
+ * and so does the command line (`scripts/theme/import-intellij-theme.ts`).
  */
-import { stripJsonComments } from "./tokens.ts";
 
 /** OpenIDEA token ← IntelliJ `ui` keys, first present wins. `*.prop` wildcards apply too. */
 export const UI_KEYS: Record<string, string[]> = {
@@ -51,7 +53,8 @@ export const UI_KEYS: Record<string, string[]> = {
   "--bg-checkbox": ["Checkbox.Background.Default"],
   "--border-checkbox": ["Checkbox.Border.Default"],
   "--bg-tab-selected": ["EditorTabs.underlinedTabBackground", "EditorTabs.selectedBackground"],
-  "--border-tab-selected": ["EditorTabs.underlineColor"],
+  // Islands paints the selected tab's border with `underlinedBorderColor`; the classic tabs underline with `underlineColor`.
+  "--border-tab-selected": ["EditorTabs.underlinedBorderColor", "EditorTabs.underlineColor"],
   "--bg-tab-hover": ["EditorTabs.hoverBackground"],
   "--border-editor-tabs": ["EditorTabs.borderColor"],
   "--bg-toolbar-hover": ["ActionButton.hoverBackground"],
@@ -64,6 +67,7 @@ export const UI_KEYS: Record<string, string[]> = {
   "--bg-counter": ["Counter.background"],
   "--fg-counter": ["Counter.foreground"],
   "--bg-search-match": ["SearchMatch.startBackground", "SearchMatch.endBackground"],
+  "--fg-completion-match": ["CompletionPopup.matchForeground"],
   "--bg-toggle-on": ["ToggleButton.onBackground"],
   "--fg-toggle-on": ["ToggleButton.onForeground"],
   "--bg-toggle-off": ["ToggleButton.offBackground"],
@@ -87,7 +91,8 @@ export const ICLS_COLORS: Record<string, string[]> = {
   SELECTION_BACKGROUND: ["--bg-editor-selection"],
   LINE_NUMBERS_COLOR: ["--fg-line-number"],
   LINE_NUMBER_ON_CARET_ROW_COLOR: ["--fg-line-number-current"],
-  GUTTER_BACKGROUND: ["--bg-editor-gutter"],
+  // The new UI paints the gutter with this, else with the editor's background; `GUTTER_BACKGROUND` is the classic UI's.
+  EDITOR_GUTTER_BACKGROUND: ["--bg-editor-gutter"],
   INDENT_GUIDE: ["--border-indent-guide"],
   SELECTED_INDENT_GUIDE: ["--border-indent-guide-active"],
   RIGHT_MARGIN_COLOR: ["--border-right-margin"],
@@ -128,6 +133,7 @@ export const ICLS_ATTRIBUTES: Record<string, Array<[Part, string]>> = {
   DEFAULT_IDENTIFIER: [["FOREGROUND", "--syn-variable"]],
   DEFAULT_LOCAL_VARIABLE: [["FOREGROUND", "--syn-variable"]],
   DEFAULT_PARAMETER: [["FOREGROUND", "--syn-param"]],
+  DEFAULT_GLOBAL_VARIABLE: [["FOREGROUND", "--syn-global"]],
   DEFAULT_PREDEFINED_SYMBOL: [["FOREGROUND", "--syn-builtin"]],
   DEFAULT_METADATA: [
     ["FOREGROUND", "--syn-annotation"],
@@ -241,19 +247,33 @@ export function convertIcls(xml: string): { name: string; dark: boolean | null;
     if (key && value !== undefined && ICLS_COLORS[key]) set(ICLS_COLORS[key], iclsColor(value));
   }
 
-  const attributes = /<attributes>([\s\S]*?)<\/attributes>/.exec(xml)?.[1] ?? "";
-  for (const m of attributes.matchAll(/<option name="([^"]+)"[^>]*>\s*<value>([\s\S]*?)<\/value>\s*<\/option>/g)) {
-    const map = ICLS_ATTRIBUTES[m[1]!];
-    if (!map) continue;
+  const body = /<attributes>([\s\S]*?)<\/attributes>/.exec(xml)?.[1] ?? "";
+  const attributes = new Map<string, Map<string, string>>();
+  const empty = new Set<string>();
+  for (const m of body.matchAll(
+    /<option name="([^"]+)"[^>]*>\s*(?:<value\s*\/>|<value>([\s\S]*?)<\/value>)\s*<\/option>/g,
+  )) {
+    if (m[2] === undefined) empty.add(m[1]!);
     const parts = new Map<string, string>();
-    for (const o of m[2]!.matchAll(/<option\b[^>]*\/>/g)) {
+    for (const o of (m[2] ?? "").matchAll(/<option\b[^>]*\/>/g)) {
       const k = attr(o[0], "name");
       const v = attr(o[0], "value");
       if (k && v !== undefined) parts.set(k, v);
     }
+    attributes.set(m[1]!, parts);
+  }
+  const textForeground = iclsColor(attributes.get("TEXT")?.get("FOREGROUND") ?? "");
+  for (const [key, parts] of attributes) {
+    const map = ICLS_ATTRIBUTES[key];
+    if (!map) continue;
+    // `<value />` defines the key without colours, so the parent scheme's don't apply: it shows as plain text.
+    if (empty.has(key)) {
+      for (const [part, token] of map) if (part === "FOREGROUND") set([token], textForeground);
+      continue;
+    }
     for (const [part, token] of map) set([token], iclsColor(parts.get(part) ?? ""));
     // FONT_TYPE: 1 bold, 2 italic, 3 bold italic.
-    if (m[1] === "DEFAULT_LINE_COMMENT" && parts.has("FONT_TYPE")) {
+    if (key === "DEFAULT_LINE_COMMENT" && parts.has("FONT_TYPE")) {
       tokens["--syn-comment-style"] = Number(parts.get("FONT_TYPE")) & 2 ? "italic" : "normal";
     }
   }
@@ -272,9 +292,11 @@ export function slug(name: string): string {
   );
 }
 
-/** Converts an IntelliJ `.theme.json` (and optionally its `.icls`) into OpenIDEA theme files. */
+/** Converts an IntelliJ `.theme.json` (comments removed) and optionally its `.icls` into OpenIDEA theme files. */
 export function convertIntellijTheme(themeJson: string, icls?: string, id?: string): ConvertedTheme {
-  const src = JSON.parse(stripJsonComments(themeJson)) as { [k: string]: Json };
+  const parsed = JSON.parse(themeJson) as Json;
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("Not an IntelliJ theme");
+  const src = parsed;
   const name = typeof src.name === "string" ? src.name : "Imported Theme";
   const named = new Map<string, string>();
   if (src.colors && typeof src.colors === "object" && !Array.isArray(src.colors)) {
@@ -307,21 +329,104 @@ export function convertIntellijTheme(themeJson: string, icls?: string, id?: stri
   };
 }
 
-/** `plugin.toml` for a converted theme. */
-export function pluginManifest(c: ConvertedTheme, author: string, sourceName: string): string {
-  const q = (s: string) => JSON.stringify(s);
+/** A TOML basic string: quotes, backslashes and control characters escaped, lone surrogates replaced. */
+function tomlString(s: string): string {
+  let body = "";
+  for (const ch of s) {
+    const code = ch.codePointAt(0)!;
+    if (ch === '"' || ch === "\\") body += `\\${ch}`;
+    else if (code < 0x20 || code === 0x7f) body += `\\u${code.toString(16).padStart(4, "0")}`;
+    // `for…of` pairs surrogates, so one in this range is alone.
+    else if (code >= 0xd800 && code <= 0xdfff) body += "�";
+    else body += ch;
+  }
+  return `"${body}"`;
+}
+
+export interface ThemePackageInfo {
+  id: string;
+  name: string;
+  version: string;
+  description: string;
+  authors: string[];
+}
+
+/** `plugin.toml` for converted themes, each at `themes/<id>.theme.json` (+ `.scheme.json`). */
+export function pluginManifest(info: ThemePackageInfo, themes: readonly ConvertedTheme[], comment?: string): string {
   return [
-    `# Converted from ${sourceName} by scripts/theme/import-intellij-theme.ts.`,
-    `id = ${q(`theme-${c.theme.id}`)}`,
-    `name = ${q(`${c.theme.name} Theme`)}`,
-    `version = "1.0.0"`,
-    `description = ${q(`${c.theme.name}, converted from an IntelliJ theme.`)}`,
-    `authors = [${q(author)}]`,
-    `openidea-api = "0.1"`,
-    "",
-    "[[contributes.themes]]",
-    `path = ${q(`themes/${c.theme.id}.theme.json`)}`,
-    ...(c.scheme ? [`editor-scheme = ${q(`themes/${c.theme.id}.scheme.json`)}`] : []),
+    ...(comment ? [`# ${comment.replace(/[\r\n]+/g, " ")}`] : []),
+    `id = ${tomlString(info.id)}`,
+    `name = ${tomlString(info.name)}`,
+    `version = ${tomlString(info.version)}`,
+    `description = ${tomlString(info.description)}`,
+    `authors = [${info.authors.map(tomlString).join(", ")}]`,
+    `engines.openidea = "^1.0"`,
+    ...themes.flatMap((c) => [
+      "",
+      "[[contributes.themes]]",
+      `path = ${tomlString(`themes/${c.theme.id}.theme.json`)}`,
+      ...(c.scheme ? [`editor-scheme = ${tomlString(`themes/${c.theme.id}.scheme.json`)}`] : []),
+    ]),
     "",
   ].join("\n");
 }
+
+/** An IntelliJ theme plugin as the host read it (`IntellijThemeSource`). */
+export interface IntellijThemeSource {
+  name: string;
+  pluginId: string | null;
+  version: string | null;
+  vendor: string | null;
+  themes: { id: string; theme: string; editorScheme: string | null }[];
+}
+
+export interface ThemePackage {
+  id: string;
+  name: string;
+  files: { path: string; text: string }[];
+  /** The package's themes: their id here and in the IntelliJ plugin (`sourceId`). */
+  themes: { id: string; sourceId: string; name: string }[];
+}
+
+/** `2.3` → `2.3.0`; IntelliJ plugin versions are not always semver. */
+function semver(version: string | null): string {
+  const m = /^\s*v?(\d{1,9})(?:\.(\d{1,9}))?(?:\.(\d{1,9}))?/.exec(version ?? "");
+  return m ? `${Number(m[1])}.${Number(m[2] ?? 0)}.${Number(m[3] ?? 0)}` : "1.0.0";
+}
+
+/** An OpenIDEA theme plugin (`intellij.<plugin>`) with every theme of an IntelliJ theme plugin. */
+export function intellijThemePackage(source: IntellijThemeSource): ThemePackage {
+  const ids = new Set<string>();
+  const converted = source.themes.map((t) => {
+    const c = convertIntellijTheme(t.theme, t.editorScheme ?? undefined);
+    let id = c.theme.id;
+    for (let n = 2; ids.has(id); n++) id = `${c.theme.id.slice(0, 44)}-${n}`;
+    ids.add(id);
+    c.theme.id = id;
+    return { sourceId: t.id, converted: c };
+  });
+  if (converted.length === 0) throw new Error("The plugin has no themes");
+  const themes = converted.map((c) => c.converted);
+  // Package metadata, not UI text: the plugin list shows it as written.
+  const description = `${source.name}, imported from an IntelliJ theme plugin.`;
+  const info: ThemePackageInfo = {
+    id: `intellij.${slug(source.pluginId ?? source.name)}`,
+    name: source.name,
+    version: semver(source.version),
+    description,
+    authors: source.vendor ? [source.vendor] : [],
+  };
+  const json = (value: unknown) => `${JSON.stringify(value, null, 2)}\n`;
+  return {
+    id: info.id,
+    name: info.name,
+    files: [
+      { path: "plugin.toml", text: pluginManifest(info, themes) },
+      ...themes.flatMap((c) => [
+        { path: `themes/${c.theme.id}.theme.json`, text: json(c.theme) },
+        ...(c.scheme ? [{ path: `themes/${c.theme.id}.scheme.json`, text: json(c.scheme) }] : []),
+      ]),
+    ],
+    themes: converted.map(({ sourceId, converted: c }) => ({ id: c.theme.id, sourceId, name: c.theme.name })),
+  };
+}
diff --git a/src/features/plugins/points.tsx b/src/features/plugins/points.tsx
index 5974502c..0e033f71 100644
--- a/src/features/plugins/points.tsx
+++ b/src/features/plugins/points.tsx
@@ -13,7 +13,7 @@ import { Button, Kbd, T } from "@/ui";
 import { addIconTheme, iconThemeKey, selectIconTheme, useSelectedIconTheme } from "./iconThemes";
 import { defineUiPoint, type UiItem } from "./projection";
 import { SecretsDetails, type SecretDecl } from "./secrets";
-import { defineViewUiPoints } from "./uiPoints";
+import { defineViewUiPoints, pluginSettingsPageId } from "./uiPoints";
 import { isLive, runPluginCommand } from "./store";
 import styles from "./PluginsPage.module.css";
 
@@ -168,7 +168,13 @@ export function defineBuiltinUiPoints(): () => void {
     defineUiPoint<IconThemeDecl>("iconThemes", {
       title: "File Icon Themes",
       project: ({ pluginId, decl }, { plugin }) =>
-        addIconTheme({ pluginId, id: decl.id, label: decl.label, origin: plugin.name }),
+        addIconTheme({
+          pluginId,
+          id: decl.id,
+          label: decl.label,
+          origin: plugin.name,
+          settingsPage: `${pluginSettingsPageId(pluginId)}.${decl.id.replace(/\./g, "-")}`,
+        }),
       Details: IconThemesDetails,
     }),
     // Stored by the backend; listed here with a field per secret.
diff --git a/src/features/plugins/runtimeUi.tsx b/src/features/plugins/runtimeUi.tsx
index 85c54bf5..c0b7efd0 100644
--- a/src/features/plugins/runtimeUi.tsx
+++ b/src/features/plugins/runtimeUi.tsx
@@ -12,7 +12,7 @@ import { onIdeEvent } from "@/platform/ipc";
 import { useProject } from "@/platform/project";
 import { shortcutLabel } from "@/platform/keymap";
 import { BarButton } from "@/ui/BarButton";
-import { registerStatusItem } from "@/workbench/contributions";
+import { maybeEditorService, registerStatusItem } from "@/workbench/contributions";
 import { removeTask, upsertTask, useTasks } from "@/workbench/tasks";
 import { pluginsBackend } from "./backend";
 import { bumpView, deliverViewMessage } from "./views/viewStore";
@@ -259,6 +259,9 @@ export function handleRuntimeEvent(e: PluginEvent): boolean {
       // The program was approved (`process:`) and verified by the host.
       void executeAction("terminal.runCommand", { program: e.program, args: e.args, name: e.title, cwd: e.cwd });
       return true;
+    case "openLocation":
+      void maybeEditorService()?.openFile(e.path, { selection: { line: e.line, col: e.column }, focus: true });
+      return true;
     default:
       return false;
   }
diff --git a/src/features/plugins/store.ts b/src/features/plugins/store.ts
index 9b165123..047a4ce1 100644
--- a/src/features/plugins/store.ts
+++ b/src/features/plugins/store.ts
@@ -13,6 +13,7 @@ import type {
 import { notifications } from "@/workbench/contributions";
 import { pluginsBackend, type PluginsBackend } from "./backend";
 import { editorContext } from "./editorContext";
+import { iconThemeKey, selectedIconTheme, selectIconTheme } from "./iconThemes";
 
 export const SETTINGS_PAGE_ID = "plugins";
 
@@ -53,7 +54,13 @@ export const usePlugins = create<PluginsState>(() => ({
   marketError: null,
 }));
 
-export const errorText = (e: unknown) => (e instanceof Error ? e.message : String(e));
+/** A rejection's message: an `Error`, or an `IdeError` object from a command without a result type. */
+export const errorText = (e: unknown): string =>
+  e instanceof Error
+    ? e.message
+    : typeof e === "object" && e !== null && "message" in e && typeof e.message === "string"
+      ? e.message
+      : String(e);
 
 /** Statuses whose contributions are in effect. */
 export const isLive = (status: PluginStatus) => status === "active" || status === "inactive" || status === "static";
@@ -70,6 +77,8 @@ export interface ConsentRequest {
   capabilities: CapabilityInfo[];
   /** Unsigned package (from disk or a project folder). */
   unsigned: boolean;
+  /** Replaces an installed copy signed with another key that didn't vouch for this one. */
+  signerChanged?: boolean;
   warnings: string[];
 }
 
@@ -132,10 +141,19 @@ async function withBusy(id: string, title: string, op: () => Promise<unknown>):
 
 const nameOf = (id: string) => usePlugins.getState().plugins.find((p) => p.id === id)?.name ?? id;
 
-export function setPluginEnabled(id: string, enabled: boolean): Promise<boolean> {
-  return withBusy(id, `Could not ${enabled ? "enable" : "disable"} ${nameOf(id)}`, () =>
+export async function adoptIconTheme(pluginId: string): Promise<void> {
+  if (selectedIconTheme()) return;
+  const first = usePlugins.getState().ui.find((c) => c.pluginId === pluginId && c.point === "iconThemes");
+  const id = (first?.decl as { id?: unknown } | undefined)?.id;
+  if (typeof id === "string") await selectIconTheme(iconThemeKey(pluginId, id));
+}
+
+export async function setPluginEnabled(id: string, enabled: boolean): Promise<boolean> {
+  const done = await withBusy(id, `Could not ${enabled ? "enable" : "disable"} ${nameOf(id)}`, () =>
     pluginsBackend().setEnabled(id, enabled),
   );
+  if (done && enabled) await adoptIconTheme(id);
+  return done;
 }
 
 export function reloadPlugin(id: string): Promise<boolean> {
@@ -199,8 +217,13 @@ export async function setMarketUrl(url: string | null): Promise<void> {
   await refreshMarket(true);
 }
 
+/** A version this IDE can load, newer than the one installed. */
+export function isUpdate(entry: MarketPlugin): boolean {
+  return entry.compatible && !!entry.installed && compareVersions(entry.version, entry.installed) > 0;
+}
+
 /** Downloads (and checks) a marketplace plugin, then the install page as from disk. */
-export async function installFromMarket(id: string): Promise<string | null> {
+export async function installFromMarket(id: string, options: InstallOptions = {}): Promise<string | null> {
   usePlugins.setState({ installing: true });
   let dir: string;
   try {
@@ -215,11 +238,27 @@ export async function installFromMarket(id: string): Promise<string | null> {
     });
     return null;
   }
-  const installed = await installFromDisk(dir);
+  const installed = await installFromDisk(dir, false, options);
   void refreshMarket(false);
   return installed;
 }
 
+/**
+ * Installs every update the marketplace offers, one after another. Updates
+ * that need nothing confirmed install right away; the others show their
+ * install page. Returns how many were installed.
+ */
+export async function updateAllPlugins(): Promise<number> {
+  await refreshMarket(true);
+  const updates = (usePlugins.getState().market ?? []).filter(isUpdate);
+  let updated = 0;
+  for (const entry of updates) if (await installFromMarket(entry.id, { quiet: true })) updated++;
+  if (updated > 0) {
+    notifications().notify({ group: "plugins", level: "info", title: `Updated ${updated} plugins` });
+  }
+  return updated;
+}
+
 /** Settings › Plugins › Roll Back: the version before the last update. */
 export async function rollBackPlugin(id: string): Promise<void> {
   try {
@@ -264,12 +303,22 @@ async function packageFolder(backend: PluginsBackend, picked: string): Promise<s
   return manifest ? picked.slice(0, manifest.index) : picked;
 }
 
+interface InstallOptions {
+  /** No notification when it installs (a batch reports once). */
+  quiet?: boolean;
+}
+
 /**
  * Asks for a plugin (a folder, its `plugin.toml`, or an `.oiplugin` / `.zip`
  * package file), shows what it may do, and installs it with the user's
- * consent. Returns the new plugin id.
+ * consent. An update with nothing to confirm installs with the grants it
+ * has. Returns the new plugin id.
  */
-export async function installFromDisk(path?: string, packageFile = false): Promise<string | null> {
+export async function installFromDisk(
+  path?: string,
+  packageFile = false,
+  options: InstallOptions = {},
+): Promise<string | null> {
   const backend = pluginsBackend();
   let dir: string | null = path ?? null;
   try {
@@ -287,25 +336,32 @@ export async function installFromDisk(path?: string, packageFile = false): Promi
   }
   if (!dir) return null;
   usePlugins.setState({ installing: true });
+  let installed: string | null = null;
   try {
     const preview = await backend.previewInstall(dir);
-    const consent = await askConsent({
-      pluginId: preview.id,
-      name: preview.name,
-      version: preview.version,
-      kind: "install",
-      capabilities: preview.capabilities,
-      unsigned: preview.unsigned,
-      warnings: preview.warnings,
-    });
+    const consent: Consent | null = preview.needsConsent
+      ? await askConsent({
+          pluginId: preview.id,
+          name: preview.name,
+          version: preview.version,
+          kind: "install",
+          capabilities: preview.capabilities,
+          unsigned: preview.unsigned,
+          signerChanged: preview.signerChanged,
+          warnings: preview.warnings,
+        })
+      : { optional: preview.capabilities.filter((c) => c.optional && c.granted).map((c) => c.id) };
     if (!consent) return null;
     const info = await backend.installDir(dir, consent);
-    notifications().notify({
-      group: "plugins",
-      level: info.status === "failed" ? "warning" : "info",
-      title: `Installed ${info.name} ${info.version}`,
-      body: info.status === "failed" ? (info.error ?? "The plugin failed to start.") : undefined,
-    });
+    installed = info.status === "failed" ? null : info.id;
+    if (info.status === "failed" || !options.quiet) {
+      notifications().notify({
+        group: "plugins",
+        level: info.status === "failed" ? "warning" : "info",
+        title: `Installed ${info.name} ${info.version}`,
+        body: info.status === "failed" ? (info.error ?? "The plugin failed to start.") : undefined,
+      });
+    }
     return info.id;
   } catch (e) {
     notifications().notify({ group: "plugins", level: "error", title: "Could not install plugin", body: errorText(e) });
@@ -313,6 +369,7 @@ export async function installFromDisk(path?: string, packageFile = false): Promi
   } finally {
     usePlugins.setState({ installing: false });
     await refreshPlugins();
+    if (installed) await adoptIconTheme(installed);
   }
 }
 
diff --git a/src/features/plugins/uiPoints.tsx b/src/features/plugins/uiPoints.tsx
index 4fd675cf..d00ed2d2 100644
--- a/src/features/plugins/uiPoints.tsx
+++ b/src/features/plugins/uiPoints.tsx
@@ -290,6 +290,49 @@ function projectFileIcon(pluginId: string, decl: FileIconDecl): () => void {
 
 export const pluginToolWindowId = (pluginId: string, view: string) => `plugin.${pluginId}.${view}`;
 
+function registerView(pluginId: string, decl: ViewDecl, icon: string): () => void {
+  return registerToolWindow({
+    id: pluginToolWindowId(pluginId, decl.id),
+    title: decl.title,
+    icon,
+    anchor: decl.location,
+    order: 900,
+    component: () =>
+      decl.web ? (
+        <WebView pluginId={pluginId} view={decl.id} label={decl.title} />
+      ) : (
+        <PluginView pluginId={pluginId} view={decl.id} label={decl.title} />
+      ),
+  });
+}
+
+function projectView(pluginId: string, decl: ViewDecl): () => void {
+  if (!decl.icon?.endsWith(".svg")) return registerView(pluginId, decl, decl.icon ?? "plugin");
+  let disposed = false;
+  let undo = () => {};
+  void pluginsBackend()
+    .assets(pluginId, `viewIcon/${decl.id}`)
+    .then((assets) => {
+      if (disposed) return;
+      const svg = assets.find(([id]) => id === `viewIcon/${decl.id}`)?.[1];
+      const name = `ext:${pluginId}/view-${decl.id}`;
+      const unregister = svg ? registerExternalIcons([[name, svg]]) : () => {};
+      const remove = registerView(pluginId, decl, svg ? name : "plugin");
+      undo = () => {
+        remove();
+        unregister();
+      };
+    })
+    .catch((e: unknown) => {
+      console.warn(`plugin ${pluginId}: view icon ${decl.id}`, e);
+      if (!disposed) undo = registerView(pluginId, decl, "plugin");
+    });
+  return () => {
+    disposed = true;
+    undo();
+  };
+}
+
 /** Registers the client side of the P7 points; returns their disposer. */
 export function defineViewUiPoints(): () => void {
   const disposers = [
@@ -326,20 +369,7 @@ export function defineViewUiPoints(): () => void {
     }),
     defineUiPoint<ViewDecl>("views", {
       title: "Tool Windows",
-      project: ({ pluginId, decl }) =>
-        registerToolWindow({
-          id: pluginToolWindowId(pluginId, decl.id),
-          title: decl.title,
-          icon: decl.icon ?? "plugin",
-          anchor: decl.location,
-          order: 900,
-          component: () =>
-            decl.web ? (
-              <WebView pluginId={pluginId} view={decl.id} label={decl.title} />
-            ) : (
-              <PluginView pluginId={pluginId} view={decl.id} label={decl.title} />
-            ),
-        }),
+      project: ({ pluginId, decl }) => projectView(pluginId, decl),
     }),
     defineUiPoint<CustomEditorDecl>("customEditors", {
       title: "Editors",
diff --git a/src/features/project-tree/HeaderActions.tsx b/src/features/project-tree/HeaderActions.tsx
index c82e41c1..4c979fc0 100644
--- a/src/features/project-tree/HeaderActions.tsx
+++ b/src/features/project-tree/HeaderActions.tsx
@@ -6,14 +6,22 @@ import type { SortKey } from "./model";
 /** The title's "Project ▾" pane switcher (IDEA: Project / Project Files / Open Files / …). */
 export function useProjectTitleMenu(): { label: string; items: MenuItem[] } {
   const mode = useProjectTree((s) => s.mode);
+  const unity = useProjectTree((s) => s.unity);
   return {
     label: VIEW_MODES.find(([id]) => id === mode)?.[1] ?? "Project",
-    items: VIEW_MODES.map(([id, label]) => ({ id, label, checked: id === mode, run: () => setViewMode(id) })),
+    items: VIEW_MODES.filter(([id]) => id !== "unity" || unity).map(([id, label]) => ({
+      id,
+      label,
+      checked: id === mode,
+      run: () => setViewMode(id),
+    })),
   };
 }
 
 /** The on / off view options. */
-export type ToggleOption = { [K in keyof ViewOptions]: ViewOptions[K] extends boolean ? K : never }[keyof ViewOptions];
+export type ToggleOption = {
+  [K in keyof ViewOptions]-?: ViewOptions[K] extends boolean ? K : never;
+}[keyof ViewOptions];
 
 export const OPTION_LABELS: Array<[ToggleOption, string]> = [
   ["showHidden", "Show Hidden Files"],
@@ -54,8 +62,15 @@ export const SORT_LABELS: Array<[SortKey, string]> = [
 /** View options in the header's "⋮" menu (IDEA: Project › Options › Appearance / Behavior). */
 export function useProjectHeaderMenu(): MenuItem[] {
   const options = useProjectTree((s) => s.options);
+  const unity = useProjectTree((s) => s.mode === "unity");
   return [
     { kind: "header", label: "Appearance" },
+    ...(unity
+      ? [
+          option("showUnityMeta", "Show Meta Files", options),
+          option("showUnityGenerated", "Show Generated Files", options),
+        ]
+      : []),
     ...OPTION_LABELS.slice(0, 5).map(([key, label]) => option(key, label, options)),
     { kind: "separator" },
     ...SORT_LABELS.map(([sortBy, label]): MenuItem => ({
diff --git a/src/features/project-tree/ProjectView.module.css b/src/features/project-tree/ProjectView.module.css
index 96ec9a6c..4354bfc0 100644
--- a/src/features/project-tree/ProjectView.module.css
+++ b/src/features/project-tree/ProjectView.module.css
@@ -6,6 +6,15 @@
   flex-direction: column;
 }
 
+.unityNotice {
+  flex: none;
+  padding: 8px 12px;
+  color: var(--fg-muted);
+  font-size: 12px;
+  line-height: 1.5;
+  border-bottom: 1px solid var(--border);
+}
+
 .content {
   flex: 1;
   min-width: 0;
diff --git a/src/features/project-tree/ProjectView.test.tsx b/src/features/project-tree/ProjectView.test.tsx
index 8a2e4b90..f3223cca 100644
--- a/src/features/project-tree/ProjectView.test.tsx
+++ b/src/features/project-tree/ProjectView.test.tsx
@@ -95,6 +95,47 @@ function setup() {
 }
 
 describe("ProjectView", () => {
+  it("toggles Unity metadata and generated files independently in the rendered tree", async () => {
+    fs = new MemoryFs(
+      {
+        "/w/acme/Assets/Player.cs": "code",
+        "/w/acme/Assets/Player.cs.meta": "metadata",
+        "/w/acme/Library/cache": "cache",
+        "/w/acme/Game.sln": "",
+      },
+      ROOT,
+    );
+    setProjectFsForTests(fs, ROOT);
+    initProjectTree(ROOT, "Game", null, { editorVersion: "6000.0.62f1", projects: [], solutions: [] });
+    const { rows } = setup();
+    act(() => useProjectTree.setState({ expanded: new Set([ROOT, `${ROOT}/Assets`]) }));
+    await waitFor(() => expect(rows()).toContain("Player.cs"));
+    expect(rows()).not.toContain("Player.cs.meta");
+    expect(rows()).not.toContain("Library");
+    act(() => setViewOption("showUnityMeta", true));
+    await waitFor(() => expect(rows()).toContain("Player.cs.meta"));
+    expect(rows()).not.toContain("Game.sln");
+    act(() => setViewOption("showUnityGenerated", true));
+    await waitFor(() => expect(rows()).toContain("Game.sln"));
+    expect(rows()).toContain("Library");
+    act(() => setViewOption("showUnityMeta", false));
+    expect(rows()).not.toContain("Player.cs.meta");
+    expect(rows()).toContain("Library");
+  });
+
+  it("shows Unity version and generation guidance, then updates when project files arrive", async () => {
+    initProjectTree(ROOT, "Game", null, { editorVersion: "6000.0.62f1", projects: [], solutions: [] });
+    const { row } = setup();
+    expect(screen.getByText(/C# project files are missing/)).toHaveAttribute("role", "status");
+    await waitFor(() => expect(row("Game")).toHaveTextContent("Unity 6000.0.62f1"));
+    act(() => {
+      useProjectTree.setState({
+        unity: { editorVersion: "6000.0.62f1", projects: ["Assembly-CSharp.csproj"], solutions: ["Game.sln"] },
+      });
+    });
+    expect(screen.queryByText(/C# project files are missing/)).not.toBeInTheDocument();
+  });
+
   it("shows the root with its path and loads children lazily", async () => {
     const { rows, row, tree } = setup();
     await waitFor(() => expect(rows()).toEqual(["acme/w/acme", "build", "src", "README.md"]));
diff --git a/src/features/project-tree/ProjectView.tsx b/src/features/project-tree/ProjectView.tsx
index c09523c9..0d796cfa 100644
--- a/src/features/project-tree/ProjectView.tsx
+++ b/src/features/project-tree/ProjectView.tsx
@@ -128,6 +128,7 @@ function iconFor(
   build: BuildPresentation,
   detected: readonly RootFolder[],
   expanded: boolean,
+  holdsOpen: boolean,
 ): string {
   if (node.placeholder) return node.placeholder === "dir" ? "folder" : "file";
   if (node.icon) return node.icon;
@@ -139,9 +140,9 @@ function iconFor(
     const key = rel !== null && build.modules.has(rel) ? rel : node.path;
     const module = root ? moduleFolderIcon(key, node.root, build.modules) : null;
     if (module) return module;
-    return node.root ? "module" : (themedFolderIconName(node.label, expanded) ?? "folder");
+    return node.root ? "module" : (themedFolderIconName(node.label, expanded, holdsOpen, node.path) ?? "folder");
   }
-  return fileIconName(node.label);
+  return fileIconName(node.label, node.path);
 }
 
 // ---------------------------------------------------------------------------
@@ -258,6 +259,9 @@ interface RowProps {
   onPointerDown: (node: ProjectNode, e: ReactPointerEvent) => void;
 }
 
+const holdsOpenFile = (dir: string, files: readonly string[]) =>
+  files.some((f) => f.length > dir.length && f.startsWith(dir) && (f[dir.length] === "/" || f[dir.length] === "\\"));
+
 const Row = memo(function Row({
   node,
   matches,
@@ -279,9 +283,10 @@ const Row = memo(function Row({
   const build = useProjectPresentation();
   const file = useJvmPresentation(node.dir || node.placeholder ? "" : node.path, node.entry?.mtimeMs);
   const expanded = useProjectTree((s) => node.dir && s.expanded.has(node.key));
+  const holdsOpen = useProjectTree((s) => node.dir && holdsOpenFile(node.path, s.openFiles));
   const icon =
     node.dir || node.placeholder || node.icon
-      ? iconFor(node, roots, root, build, detected, expanded)
+      ? iconFor(node, roots, root, build, detected, expanded, holdsOpen)
       : presentationIcon(node.path, file, roots, root, build.spring);
   const moduleFolder =
     node.dir && !node.placeholder && !!root && isModuleFolder(relativePath(root, node.path), node.root, build.modules);
@@ -421,6 +426,7 @@ export function ProjectView() {
 
   const info = useMemo(() => visibleInfo(model, expanded), [model, expanded]);
   const mode = useProjectTree((s) => s.mode);
+  const unity = useProjectTree((s) => s.unity);
   const outlines = useProjectTree((s) => s.outlines);
   const showMembers = options.showMembers;
 
@@ -750,7 +756,7 @@ export function ProjectView() {
           editing={editing}
           cut={cutPaths.has(node.path)}
           dropTarget={dropTarget === node.key}
-          detail={node.root && !node.icon ? tildify(node.path, home) : (node.detail ?? null)}
+          detail={node.detail ?? (node.root && !node.icon ? tildify(node.path, home) : null)}
           onEditDone={focusTree}
           onClick={onRowClick}
           onDoubleClick={onRowDoubleClick}
@@ -776,6 +782,11 @@ export function ProjectView() {
       onFocus={(e) => setContext("projectViewFocus", (e.target as HTMLElement).getAttribute("role") === "tree")}
       onBlur={() => setContext("projectViewFocus", false)}
     >
+      {mode === "unity" && unity && !unity.projects.length && (
+        <div className={styles.unityNotice} role="status">
+          {tx`C# project files are missing. In Unity, select an external script editor in Preferences > External Tools, then regenerate project files.`}
+        </div>
+      )}
       {!model.roots.length && (
         <div className={styles.empty}>
           {txTemplate(`Nothing to show in ${VIEW_MODES.find(([id]) => id === mode)?.[1] ?? "this view"}`)}
diff --git a/src/features/project-tree/RefactoringPreview.tsx b/src/features/project-tree/RefactoringPreview.tsx
index fbcf8020..a1c55328 100644
--- a/src/features/project-tree/RefactoringPreview.tsx
+++ b/src/features/project-tree/RefactoringPreview.tsx
@@ -81,7 +81,7 @@ function FileGroup({
     <li className={styles.previewFile}>
       <div className={styles.previewFileRow}>
         <Checkbox checked={included} onChange={onToggle} aria-label={tx`Include ${nameOf(file.path)}`} />
-        <Icon name={fileIconName(nameOf(file.path))} size={14} />
+        <Icon name={fileIconName(nameOf(file.path), file.path)} size={14} />
         <span className={styles.previewName}>{nameOf(file.path)}</span>
         <span className={styles.previewPath}>{relativeTo(root, file.path) || file.path}</span>
         <span className={styles.spacer} />
diff --git a/src/features/project-tree/actions.ts b/src/features/project-tree/actions.ts
index f871a768..5e02d211 100644
--- a/src/features/project-tree/actions.ts
+++ b/src/features/project-tree/actions.ts
@@ -1,6 +1,7 @@
 /** Actions of the project view (Find Action, keymap, other features via `executeAction`). */
 import { activeEditor } from "@/editor/api";
 import { getAction, registerActions, type Action } from "@/platform/actions";
+import { getContext } from "@/platform/context";
 import { dirname, useProject } from "@/platform/project";
 import { showContextMenu, type MenuItem } from "@/ui";
 import { maybeEditorService, menuGroupItems, toolWindowService } from "@/workbench/contributions";
@@ -74,6 +75,16 @@ function nodesFrom(arg: unknown): ProjectNode[] {
   });
 }
 
+/**
+ * The target of an action invoked without one: the Project view's selection while it has focus,
+ * otherwise the active editor's file (a shortcut pressed in the editor acts on the edited file).
+ */
+function contextTarget(arg: unknown): unknown {
+  if (arg !== undefined && arg !== null) return arg;
+  if (getContext().projectViewFocus) return arg;
+  return maybeEditorService()?.activePath() ?? arg;
+}
+
 function folderFrom(arg: unknown): string | null {
   if (typeof arg === "string") return useProjectTree.getState().listings.has(arg) ? arg : parentOf(arg);
   return folderOf(leadNode());
@@ -379,7 +390,7 @@ export function registerProjectActions(): () => void {
       icon: "external-link",
       when: OPEN,
       keywords: ["show in explorer", "open in finder"],
-      run: ({ arg }) => revealInFinder(nodesFrom(arg)),
+      run: ({ arg }) => revealInFinder(nodesFrom(contextTarget(arg))),
     },
     {
       id: "project.openInTerminal",
@@ -388,7 +399,7 @@ export function registerProjectActions(): () => void {
       icon: "terminal",
       when: OPEN,
       run: ({ arg }) => {
-        const dir = folderFrom(arg);
+        const dir = folderFrom(contextTarget(arg));
         if (dir) delegate("terminal.openAt", dir);
       },
     },
diff --git a/src/features/project-tree/index.ts b/src/features/project-tree/index.ts
index efcc5d9a..87284c5c 100644
--- a/src/features/project-tree/index.ts
+++ b/src/features/project-tree/index.ts
@@ -1,6 +1,6 @@
 /** Project view: the "project" tool window, its file operations and actions. */
 import { onEditorEvent, openEditorPaths } from "@/editor/api";
-import { onIdeEvent } from "@/platform/ipc";
+import { commands, isTauri, onIdeEvent } from "@/platform/ipc";
 import { useBuildModel } from "@/platform/buildModel";
 import { validateProjectStructure, type RootFolder } from "@/platform/languageSettings";
 import { useProject } from "@/platform/project";
@@ -33,22 +33,60 @@ import {
   reloadLoadedDirs,
   setChangedFiles,
   setOpenFiles,
+  setViewMode,
   useProjectTree,
 } from "./store";
 
 export function activate(): () => void {
   loadHomeDir();
+  let unityTimer: ReturnType<typeof setTimeout> | undefined;
+  let unityGeneration = 0;
   const sync = () => {
     const p = useProject.getState().project;
     const s = useProjectTree.getState();
     if ((p?.root ?? null) !== s.root || p?.workspace?.projects !== (s.members ?? undefined))
-      initProjectTree(p?.root ?? null, p?.name ?? "", p?.workspace?.projects ?? null);
-    else if (p && p.name !== s.name) useProjectTree.setState({ name: p.name });
+      initProjectTree(p?.root ?? null, p?.name ?? "", p?.workspace?.projects ?? null, p?.unity ?? null);
+    else if (p) {
+      useProjectTree.setState({ name: p.name, unity: p.unity ?? null });
+      if (p.unity && !s.unity && s.mode === "project") setViewMode("unity");
+      if (!p.unity && s.mode === "unity") setViewMode("project");
+    }
   };
   sync();
   const unsubProject = useProject.subscribe((s, prev) => {
+    if (s.project?.root !== prev.project?.root) {
+      unityGeneration++;
+      clearTimeout(unityTimer);
+    }
     if (s.project !== prev.project) sync();
   });
+  // Unity regenerates these files while the IDE stays open. Refresh only metadata,
+  // retaining the current settings and ignoring replies from a previous project.
+  const unsubUnity = onIdeEvent("fsChanged", (e) => {
+    const project = useProject.getState().project;
+    if (!project || !isTauri()) return;
+    const relevant = [...e.created, ...e.modified, ...e.removed].some((p) => {
+      if (!p.startsWith(project.root + "/")) return false;
+      const rel = p.slice(project.root.length + 1);
+      return (
+        /^(Assets|Packages|ProjectSettings)(\/ProjectVersion\.txt)?$/.test(rel) ||
+        /^[^/]+\.(csproj|sln|slnx)$/i.test(rel)
+      );
+    });
+    if (!relevant) return;
+    const generation = ++unityGeneration;
+    clearTimeout(unityTimer);
+    unityTimer = setTimeout(async () => {
+      try {
+        const fresh = await commands.projectCurrent();
+        const current = useProject.getState().project;
+        if (generation !== unityGeneration || current?.root !== project.root || fresh?.root !== project.root) return;
+        useProject.setState({ project: { ...current, unity: fresh.unity } });
+      } catch {
+        // A project may have closed while the metadata request was in flight.
+      }
+    }, 150);
+  });
   // Excluded folders / exclude globs change which entries are `ignored`.
   const unsubExcludes = useProject.subscribe((s, prev) => {
     const ex = (x: typeof s.settings) =>
@@ -78,9 +116,13 @@ export function activate(): () => void {
     const paths = own ? validateProjectStructure(settings?.projectStructure).contentRoots : [];
     // The Build tool window's model (one load per build change), not a load of our own.
     const build = useBuildModel.getState();
-    const gradleProjects = build.root === project?.root ? (build.model?.gradle?.projects ?? []) : [];
-    const rootName = gradleProjects.find((p) => p.path === ":")?.name ?? "";
-    const groups = own && project ? gradleModuleGroups(gradleProjects, rootName, project.root) : [];
+    const gradleBuilds = build.root === project?.root ? (build.model?.gradle ?? []) : [];
+    const groups =
+      own && project
+        ? gradleBuilds.flatMap((g) =>
+            gradleModuleGroups(g.projects, g.projects.find((p) => p.path === ":")?.name ?? "", project.root, g.dir),
+          )
+        : [];
     const key = JSON.stringify([paths, groups]);
     if (key === shownRoots) return;
     shownRoots = key;
@@ -132,6 +174,11 @@ export function activate(): () => void {
   });
 
   const disposers = [
+    () => {
+      clearTimeout(unityTimer);
+      unityGeneration++;
+      unsubUnity();
+    },
     () => clearTimeout(openTimer),
     unsubEditor,
     unsubDecorations,
diff --git a/src/features/project-tree/model.ts b/src/features/project-tree/model.ts
index 832109d3..385868e5 100644
--- a/src/features/project-tree/model.ts
+++ b/src/features/project-tree/model.ts
@@ -8,6 +8,10 @@ import { isIgnoredName } from "@/platform/ignoredNames";
 import { ancestorsWithin, isInside, isSameOrInside, nameOf, parentOf, relativeTo } from "./paths";
 
 export interface TreeOptions {
+  /** Applied only by the Unity pane, never persisted as a user preference. */
+  unityRoot?: string;
+  showUnityMeta: boolean;
+  showUnityGenerated: boolean;
   /** Show ignored names (`files.ignoredNames`: `.git`, `.DS_Store`, …). Dotfiles are always shown. */
   showHidden: boolean;
   /** Show entries matched by .gitignore / exclude settings (dimmed). */
@@ -22,6 +26,8 @@ export interface TreeOptions {
 export type SortKey = "name" | "type" | "modified";
 
 export const DEFAULT_TREE_OPTIONS: TreeOptions = {
+  showUnityMeta: false,
+  showUnityGenerated: false,
   showHidden: false,
   showExcluded: true,
   compact: true,
@@ -69,7 +75,23 @@ export interface TreeModel {
 
 export type Listings = ReadonlyMap<string, readonly FileEntry[]>;
 
+export function unityPathVisible(path: string, opts: TreeOptions): boolean {
+  if (opts.unityRoot && path.startsWith(opts.unityRoot + "/")) {
+    const relative = path.slice(opts.unityRoot.length + 1);
+    // The full Project / Project Files panes retain access to generated files.
+    if (!opts.showUnityGenerated) {
+      if (/^(Library|Temp|Obj|obj|Logs|Build|Builds|UserSettings|\.vs|\.idea|\.vscode)(\/|$)/.test(relative))
+        return false;
+      if (!relative.includes("/") && /\.(csproj|sln|slnx|suo|user|pidb|booproj|unityproj)$/i.test(relative))
+        return false;
+    }
+    if (!opts.showUnityMeta && /\.meta$/i.test(relative)) return false;
+  }
+  return true;
+}
+
 export function isVisible(entry: FileEntry, opts: TreeOptions): boolean {
+  if (!unityPathVisible(entry.path, opts)) return false;
   // Ignored names are also excluded on the backend; only "Show Hidden" brings them back.
   if (isIgnoredName(entry.name)) return opts.showHidden;
   if (!opts.showExcluded && entry.ignored) return false;
diff --git a/src/features/project-tree/moduleGroups.test.ts b/src/features/project-tree/moduleGroups.test.ts
index c7d70ae2..b2481bca 100644
--- a/src/features/project-tree/moduleGroups.test.ts
+++ b/src/features/project-tree/moduleGroups.test.ts
@@ -123,3 +123,15 @@ describe("module group nodes in the tree", () => {
     expect(m.children.get(m.roots[0]!.key)!.map((n) => n.label)).toEqual(["billing", "core"]);
   });
 });
+
+it("namespaces module group identities by independently linked build", () => {
+  const projects = [
+    { path: ":", dir: "/w/first" },
+    { path: ":app", dir: "/w/shared" },
+  ];
+  const first = gradleModuleGroups(projects, "same", "/w/project", "first");
+  const second = gradleModuleGroups(projects, "same", "/w/project", "second");
+  expect(first.length).toBeGreaterThan(0);
+  expect(first[0]!.id).not.toBe(second[0]!.id);
+  expect(first.map(shape)).toEqual(second.map(shape));
+});
diff --git a/src/features/project-tree/moduleGroups.ts b/src/features/project-tree/moduleGroups.ts
index 40a178f7..a3e48572 100644
--- a/src/features/project-tree/moduleGroups.ts
+++ b/src/features/project-tree/moduleGroups.ts
@@ -29,7 +29,9 @@ export function gradleModuleGroups(
   projects: readonly { path: string; dir: string; build?: string | null }[],
   rootName: string,
   projectRoot: string,
+  buildDir?: string,
 ): ExtraRoot[] {
+  const identity = (name: string) => (buildDir === undefined ? name : JSON.stringify([buildDir, name]));
   const modules: Module[] = projects.map((p) => {
     const path = p.path.split(":").filter(Boolean);
     // An included build's modules are named after that build (`lib.core`); buildSrc and
@@ -51,7 +53,13 @@ export function gradleModuleGroups(
 
   const moduleNode = (m: Module): ExtraRoot => {
     const label = nameOf(m.dir) || m.dir;
-    return { id: m.name, label, detail: m.name === label ? undefined : m.name, icon: "gradle-module", path: m.dir };
+    return {
+      id: identity(m.name),
+      label,
+      detail: m.name === label ? undefined : m.name,
+      icon: "gradle-module",
+      path: m.dir,
+    };
   };
   // `modulesAndGroups`: ungrouped top-level modules as they are (the project folder is
   // shown anyway), one node for the common group path of the grouped ones.
@@ -82,7 +90,7 @@ export function gradleModuleGroups(
     const seen = new Set<string>();
     const moduleNodes = members.filter((m) => !seen.has(m.dir) && !!seen.add(m.dir)).map(moduleNode);
     return {
-      id: `gradleGroup:${group.join(".")}`,
+      id: identity(`gradleGroup:${group.join(".")}`),
       label: group[group.length - 1]!,
       icon: "gradle-project",
       children: [...[...childGroups.values()].map(node).sort(byLabel), ...moduleNodes.sort(byLabel)],
diff --git a/src/features/project-tree/operations.test.ts b/src/features/project-tree/operations.test.ts
index de1d9ea0..2204d998 100644
--- a/src/features/project-tree/operations.test.ts
+++ b/src/features/project-tree/operations.test.ts
@@ -8,6 +8,7 @@ import {
   refreshOsClipboard,
   selectionAfterDelete,
   transfer,
+  topLevelPaths,
 } from "./operations";
 import { IpcError } from "@/platform/ipc";
 import { closeFileRefactorDialog, pendingFileRefactorDialog } from "./FileRefactorDialogs";
@@ -50,6 +51,50 @@ describe("selectionAfterDelete", () => {
   });
 });
 
+describe("Unity asset selections", () => {
+  beforeEach(async () => {
+    fs = new MemoryFs(
+      {
+        "/p/Assets/Player.cs": "code",
+        "/p/Assets/Player.cs.meta": "metadata",
+        "/p/Assets/Player copy.cs.meta": "orphan",
+      },
+      "/p",
+    );
+    setProjectFsForTests(fs, "/p");
+    initProjectTree("/p", "Game", null, { editorVersion: "6000.0.1f1", projects: [], solutions: [] });
+    provideNotificationService({ notify });
+    notify.mockClear();
+    await loadDir("/p/Assets");
+  });
+
+  afterEach(() => {
+    setProjectFsForTests(null);
+    initProjectTree(null);
+  });
+
+  it("treats an asset and its selected metadata as one operation", () => {
+    expect(topLevelPaths([node("/p/Assets/Player.cs"), node("/p/Assets/Player.cs.meta")])).toEqual([
+      "/p/Assets/Player.cs",
+    ]);
+    expect(
+      topLevelPaths([
+        node("/p/Assets/Group", true),
+        node("/p/Assets/Group.meta"),
+        node("/p/Assets/Group/Inner.cs.meta"),
+      ]),
+    ).toEqual(["/p/Assets/Group"]);
+    expect(topLevelPaths([node("/p/Assets/Player.cs.meta")])).toEqual(["/p/Assets/Player.cs.meta"]);
+  });
+
+  it("skips orphan metadata names when choosing a duplicate asset name", async () => {
+    const copy = vi.spyOn(fs, "copy");
+    await transfer(["/p/Assets/Player.cs", "/p/Assets/Player.cs.meta"], "/p/Assets", "copy");
+    expect(copy).toHaveBeenCalledTimes(1);
+    expect(copy).toHaveBeenCalledWith("/p/Assets/Player.cs", "/p/Assets/Player copy 2.cs");
+  });
+});
+
 // Local OS paths and remote project paths may be identical strings.
 describe("OS file imports", () => {
   beforeEach(async () => {
diff --git a/src/features/project-tree/operations.ts b/src/features/project-tree/operations.ts
index 0ff55c87..b34122fd 100644
--- a/src/features/project-tree/operations.ts
+++ b/src/features/project-tree/operations.ts
@@ -84,10 +84,24 @@ export function leadNode(): ProjectNode | null {
 
 /** Selected paths without entries nested in other selected folders. */
 export function topLevelPaths(nodes: ProjectNode[] = selectedNodes()): string[] {
-  const paths = nodes.map((n) => n.path);
+  const paths = assetPaths(nodes.map((n) => n.path));
   return paths.filter((p) => !paths.some((q) => q !== p && isInside(p, q)));
 }
 
+/** A visible sidecar is already included by the backend asset operation. */
+function assetPaths(paths: string[]): string[] {
+  const { root, unity } = get();
+  if (!root || !unity) return paths;
+  return paths.filter(
+    (p) => !(isInside(p, joinPath(root, "Assets")) && p.endsWith(".meta") && paths.includes(p.slice(0, -5))),
+  );
+}
+
+function isUnityAssetFolder(path: string): boolean {
+  const { root, unity } = get();
+  return !!(root && unity && isSameOrInside(path, joinPath(root, "Assets")));
+}
+
 /** Folder that receives new / pasted items: the selected folder or the selected file's parent. */
 export function targetFolder(node: ProjectNode | null = leadNode()): string | null {
   if (!node && get().lead?.startsWith(MEMBER_PREFIX)) return null;
@@ -667,13 +681,15 @@ export async function transfer(
   name?: string,
   source: "project" | "local" = "project",
 ): Promise<string | boolean> {
+  paths = assetPaths(paths);
   if (mode === "move") return moveInto(paths, target);
   const { root } = get();
   if (!root) return false;
   const fs = projectFs(root);
   await loadDir(target);
   const taken = new Set(siblingsOf(target).map((n) => (caseInsensitive ? n.toLowerCase() : n)));
-  const isTaken = (n: string) => taken.has(caseInsensitive ? n.toLowerCase() : n);
+  const hasName = (n: string) => taken.has(caseInsensitive ? n.toLowerCase() : n);
+  const isTaken = (n: string) => hasName(n) || (isUnityAssetFolder(target) && hasName(`${n}.meta`));
   const touched = new Set<string>([target]);
   const errors: string[] = [];
   let first: string | null = null;
@@ -726,6 +742,7 @@ export async function transfer(
  * the options last used in the Move dialog). Refuses to overwrite.
  */
 async function moveInto(paths: string[], target: string): Promise<boolean> {
+  paths = assetPaths(paths);
   await loadDir(target);
   const taken = new Set(siblingsOf(target).map((n) => (caseInsensitive ? n.toLowerCase() : n)));
   const errors: string[] = [];
diff --git a/src/features/project-tree/selectIn.test.ts b/src/features/project-tree/selectIn.test.ts
index 046b3480..751cc235 100644
--- a/src/features/project-tree/selectIn.test.ts
+++ b/src/features/project-tree/selectIn.test.ts
@@ -14,6 +14,24 @@ afterEach(() => {
   useContextMenuStore.setState({ menu: null });
 });
 
+describe("Open in Terminal", () => {
+  it("opens the edited file's folder unless the Project view has focus", async () => {
+    const opened: unknown[] = [];
+    disposers.push(
+      registerProjectActions(),
+      registerActions([{ id: "terminal.openAt", title: "Open Terminal At", run: ({ arg }) => void opened.push(arg) }]),
+      () => setContext("projectOpen", false),
+      () => setContext("projectViewFocus", false),
+    );
+    setContext("projectOpen", true);
+    provideEditorService({ activePath: () => "/p/src/a.ts" } as unknown as EditorService);
+    await executeAction("project.openInTerminal");
+    expect(opened).toEqual(["/p/src"]);
+    await executeAction("project.openInTerminal", "/p/docs/readme.md");
+    expect(opened.at(-1)).toBe("/p/docs");
+  });
+});
+
 describe("Select In (⌥F1)", () => {
   it("lists the project view, contributed targets, Finder and the terminal", () => {
     disposers.push(
diff --git a/src/features/project-tree/store.ts b/src/features/project-tree/store.ts
index 99397185..df53ff6f 100644
--- a/src/features/project-tree/store.ts
+++ b/src/features/project-tree/store.ts
@@ -4,6 +4,7 @@
  * Kept outside React so actions (keyboard, Find Action, context menu) share it.
  */
 import { create } from "zustand";
+import type { UnityProjectInfo } from "@/bindings";
 import { call } from "@/platform/ipc";
 import { commands, type FileEntry, type OutlineItem } from "@/bindings";
 import { withDocument } from "@/editor/lsp/files";
@@ -25,6 +26,7 @@ import {
   mergeListing,
   planRefresh,
   visibleEntries,
+  unityPathVisible,
   type Placeholder,
   type ProjectNode,
   type TreeModel,
@@ -67,9 +69,10 @@ function storedOptions(): ViewOptions {
 }
 
 /** IDEA's Project view panes ("Project ▾" in the tool window header). */
-export type ViewMode = "project" | "projectFiles" | "openFiles" | "changedFiles" | "scratches";
+export type ViewMode = "unity" | "project" | "projectFiles" | "openFiles" | "changedFiles" | "scratches";
 
 export const VIEW_MODES: ReadonlyArray<[ViewMode, string]> = [
+  ["unity", "Unity"],
   ["project", "Project"],
   ["projectFiles", "Project Files"],
   ["openFiles", "Open Files"],
@@ -94,6 +97,7 @@ export interface Clipboard {
 }
 
 interface ProjectTreeState {
+  unity: UnityProjectInfo | null;
   root: string | null;
   name: string;
   members: readonly string[] | null;
@@ -140,6 +144,7 @@ function writeJson(key: string, value: unknown) {
 }
 
 export const useProjectTree = create<ProjectTreeState>(() => ({
+  unity: null,
   root: null,
   name: "",
   members: null,
@@ -170,6 +175,7 @@ const set = (patch: Partial<ProjectTreeState>) => useProjectTree.setState(patch)
 // Derived model (memoised on its inputs so React and actions share one instance)
 
 let memo: {
+  unity: UnityProjectInfo | null;
   root: string | null;
   name: string;
   members: readonly string[] | null;
@@ -187,10 +193,15 @@ const EMPTY_MODEL: TreeModel = { roots: [], children: new Map(), byKey: new Map(
 const filesOf = (s: ProjectTreeState) =>
   s.mode === "openFiles" ? s.openFiles : s.mode === "changedFiles" ? s.changedFiles : null;
 
+function treeOptions(s: ProjectTreeState): TreeOptions {
+  return s.mode === "unity" && s.unity && s.root ? { ...s.options, compact: false, unityRoot: s.root } : s.options;
+}
+
 export function selectModel(s: ProjectTreeState): TreeModel {
   const files = filesOf(s);
   if (
     memo &&
+    memo.unity === s.unity &&
     memo.root === s.root &&
     memo.name === s.name &&
     memo.members === s.members &&
@@ -205,6 +216,7 @@ export function selectModel(s: ProjectTreeState): TreeModel {
   const placeholder: Placeholder | null =
     s.editing?.kind === "new" ? { parent: s.editing.parent, kind: s.editing.nodeKind } : null;
   const extras = useProjectViewRoots.getState().roots;
+  const options = treeOptions(s);
   const contributed = projectViewRoots(extras);
   const memberRoots = s.members?.map((path) => ({
     path,
@@ -214,8 +226,8 @@ export function selectModel(s: ProjectTreeState): TreeModel {
   }));
   const project = () =>
     memberRoots
-      ? withExtraRoots(EMPTY_MODEL, memberRoots, s.listings, s.options, placeholder)
-      : buildModel({ path: s.root!, name: s.name }, s.listings, s.options, placeholder);
+      ? withExtraRoots(EMPTY_MODEL, memberRoots, s.listings, options, placeholder)
+      : buildModel({ path: s.root!, name: s.name }, s.listings, options, placeholder);
   let model = EMPTY_MODEL;
   if (s.root) {
     if (s.mode === "projectFiles") model = project();
@@ -233,13 +245,16 @@ export function selectModel(s: ProjectTreeState): TreeModel {
         files,
         s.options.foldersFirst,
       );
-    else model = withExtraRoots(project(), contributed, s.listings, s.options, placeholder);
+    else model = withExtraRoots(project(), contributed, s.listings, options, placeholder);
+    if (s.unity && s.mode === "unity" && model.roots[0])
+      model.roots[0].detail = s.unity.editorVersion ? `Unity ${s.unity.editorVersion}` : "Unity";
     const libraries = extraFolders(contributed).flatMap((r) =>
       r.readOnly && r.path !== undefined && isSameOrInside(r.path, s.root!) ? [r.path] : [],
     );
     model = withReadOnlyFolders(model, libraries);
   }
   memo = {
+    unity: s.unity,
     root: s.root,
     name: s.name,
     members: s.members,
@@ -264,19 +279,29 @@ const inflight = new Map<string, Promise<void>>();
 let persistTimer: ReturnType<typeof setTimeout> | undefined;
 
 /** Resets the view for a newly opened project, restoring its expansion state. */
-export function initProjectTree(root: string | null, name = "", members: readonly string[] | null = null) {
+export function initProjectTree(
+  root: string | null,
+  name = "",
+  members: readonly string[] | null = null,
+  unity: UnityProjectInfo | null = null,
+) {
   generation++;
   inflight.clear();
   outlineInflight.clear();
   clearTimeout(persistTimer);
   modeExpanded.clear();
   autoExpanded.clear();
+  const previousMode = get().mode;
+  const mode =
+    unity && previousMode === "project" ? "unity" : !unity && previousMode === "unity" ? "project" : previousMode;
   set({
+    unity,
+    mode,
     root,
     name,
     members,
     listings: new Map(),
-    expanded: initialExpanded(root, get().mode, members),
+    expanded: initialExpanded(root, mode, members),
     selected: new Set(),
     lead: null,
     editing: null,
@@ -304,23 +329,25 @@ function initialExpanded(root: string | null, mode: ViewMode, members = get().me
   // The tree as the user left it, like IDEA: a collapsed project root stays collapsed, and
   // nodes outside it (content roots, contributed roots) stay open.
   // Keys of nodes that no longer exist are inert. Only a first open expands the roots.
-  const persisted = mode === "project" ? readJson<string[]>(expandedKey(root)) : null;
+  const persisted = mode === "project" || mode === "unity" ? readJson<string[]>(expandedKey(root)) : null;
   if (persisted) return new Set(persisted);
   return new Set(members ?? [root]);
 }
 
 function persistExpanded() {
-  if (get().mode !== "project") return;
+  if (get().mode !== "project" && get().mode !== "unity") return;
   clearTimeout(persistTimer);
   persistTimer = setTimeout(() => {
     const { root, expanded, mode } = get();
-    if (root && mode === "project") writeJson(expandedKey(root), [...expanded].slice(0, MAX_PERSISTED));
+    if (root && (mode === "project" || mode === "unity"))
+      writeJson(expandedKey(root), [...expanded].slice(0, MAX_PERSISTED));
   }, 300);
 }
 
 /** Switches the pane ("Project ▾"), remembered across sessions. */
 export function setViewMode(mode: ViewMode) {
   const s = get();
+  if (mode === "unity" && !s.unity) return;
   if (s.mode === mode) return;
   modeExpanded.set(s.mode, s.expanded);
   autoExpanded.clear();
@@ -409,8 +436,8 @@ export function loadDir(path: string, force = false): Promise<void> {
       putListing(path, entries);
       // Compact Middle Packages needs to look one level down a single-folder chain.
       const s = get();
-      if (s.options.compact) {
-        const visible = visibleEntries(entries, s.options);
+      if (treeOptions(s).compact) {
+        const visible = visibleEntries(entries, treeOptions(s));
         const only = visible.length === 1 ? visible[0]! : null;
         if (only && isDirEntry(only) && !only.ignored && !s.listings.has(only.path)) void loadDir(only.path);
       }
@@ -590,6 +617,8 @@ export function modeShows(path: string): boolean {
   const { mode, root } = get();
   if (!root) return false;
   switch (mode) {
+    case "unity":
+      return unityPathVisible(path, treeOptions(get()));
     case "project":
       return true;
     case "projectFiles":
@@ -655,7 +684,7 @@ export async function expandAll(from?: string, limit = 400) {
     await loadDir(path);
     if (gen !== generation) return;
     const s = get();
-    for (const e of visibleEntries(s.listings.get(path) ?? [], s.options))
+    for (const e of visibleEntries(s.listings.get(path) ?? [], treeOptions(s)))
       if (isDirEntry(e) && !e.ignored && e.kind !== "symlink") queue.push(keyLike(dir, e.path));
   }
   setExpanded(toExpand);
diff --git a/src/features/project-tree/unity.test.ts b/src/features/project-tree/unity.test.ts
new file mode 100644
index 00000000..b7b9bafb
--- /dev/null
+++ b/src/features/project-tree/unity.test.ts
@@ -0,0 +1,78 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import type { FileEntry } from "@/bindings";
+import { DEFAULT_TREE_OPTIONS, visibleEntries } from "./model";
+import { currentModel, initProjectTree, modeShows, setViewMode, useProjectTree } from "./store";
+
+const unity = { editorVersion: "2022.3.62f1", solutions: [], projects: [] };
+const entry = (path: string, dir = false): FileEntry => ({
+  path,
+  name: path.slice(path.lastIndexOf("/") + 1),
+  kind: dir ? "dir" : "file",
+  size: 1,
+  mtimeMs: null,
+  ignored: false,
+  excluded: false,
+  hidden: false,
+});
+const files = [
+  entry("/game/Assets", true),
+  entry("/game/Packages", true),
+  entry("/game/ProjectSettings", true),
+  entry("/game/Library", true),
+  entry("/game/Temp", true),
+  entry("/game/Assets.meta"),
+  entry("/game/Game.sln"),
+  entry("/game/Assembly-CSharp.csproj"),
+  entry("/game/README.md"),
+];
+
+beforeEach(() => {
+  localStorage.clear();
+  initProjectTree(null);
+  setViewMode("project");
+});
+afterEach(() => initProjectTree(null));
+
+describe("Unity project view", () => {
+  it("opens in Unity mode and keeps the full project view available", () => {
+    initProjectTree("/game", "Game", null, unity);
+    useProjectTree.setState({ listings: new Map([["/game", files]]) });
+    expect(useProjectTree.getState().mode).toBe("unity");
+    const model = currentModel();
+    expect(model.roots[0]?.detail).toBe("Unity 2022.3.62f1");
+    expect(model.children.get("/game")?.map((n) => n.label)).toEqual([
+      "Assets",
+      "Packages",
+      "ProjectSettings",
+      "README.md",
+    ]);
+    setViewMode("projectFiles");
+    expect(currentModel().children.get("/game")).toHaveLength(files.length);
+  });
+
+  it("does not leak Unity mode or metadata into the next ordinary project", () => {
+    initProjectTree("/game", "Game", null, unity);
+    initProjectTree("/app", "App");
+    expect(useProjectTree.getState()).toMatchObject({ mode: "project", unity: null });
+    setViewMode("unity");
+    expect(useProjectTree.getState().mode).toBe("project");
+  });
+
+  it("hides only root caches, keeps asset folders with matching names, and can reveal metadata", () => {
+    const options = { ...DEFAULT_TREE_OPTIONS, unityRoot: "/game" };
+    const entries = [entry("/game/Assets/Library", true), entry("/game/Assets/P.cs.meta"), entry("/other/P.cs.meta")];
+    expect(visibleEntries(entries, options).map((e) => e.path)).toEqual(["/game/Assets/Library", "/other/P.cs.meta"]);
+    expect(visibleEntries(entries, { ...options, showHidden: true })).toHaveLength(2);
+    expect(visibleEntries(entries, { ...options, showUnityMeta: true })).toHaveLength(3);
+    expect(visibleEntries(files, { ...options, showUnityGenerated: true }).map((e) => e.name)).toContain("Library");
+    expect(visibleEntries(files, { ...options, showUnityGenerated: true }).map((e) => e.name)).toContain("Game.sln");
+    expect(visibleEntries(files, DEFAULT_TREE_OPTIONS)).toHaveLength(files.length);
+  });
+
+  it("keeps navigation to unloaded scripts in Unity mode", () => {
+    initProjectTree("/game", "Game", null, unity);
+    expect(modeShows("/game/Assets/Scripts/Player.cs")).toBe(true);
+    expect(modeShows("/game/Library/Cached.cs")).toBe(false);
+    expect(modeShows("/game/Assets/Player.cs.meta")).toBe(false);
+  });
+});
diff --git a/src/features/project-tree/unityRefresh.test.ts b/src/features/project-tree/unityRefresh.test.ts
new file mode 100644
index 00000000..061a664c
--- /dev/null
+++ b/src/features/project-tree/unityRefresh.test.ts
@@ -0,0 +1,75 @@
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import type { ProjectInfo } from "@/bindings";
+import { emitLocalIdeEvent } from "@/platform/ipc";
+import { useProject } from "@/platform/project";
+import { activate } from "./index";
+import { useProjectTree } from "./store";
+
+const current = vi.hoisted(() => vi.fn());
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    isTauri: () => true,
+    commands: {
+      ...real.commands,
+      projectCurrent: current,
+      projectRoots: async () => ({ status: "ok", data: { roots: [], detected: [] } }),
+    },
+  };
+});
+
+const project = (root = "/game"): ProjectInfo => ({
+  root,
+  name: "Game",
+  trusted: false,
+  isGit: false,
+  settings: {} as ProjectInfo["settings"],
+  unity: { editorVersion: "2022.3.62f1", projects: [], solutions: [] },
+});
+let dispose: () => void;
+beforeEach(() => {
+  vi.useFakeTimers();
+  current.mockReset();
+  useProject.setState({ project: project() });
+  dispose = activate();
+});
+afterEach(() => {
+  dispose();
+  useProject.setState({ project: null });
+  vi.useRealTimers();
+});
+const changed = () =>
+  emitLocalIdeEvent({ type: "fsChanged", created: ["/game/Assembly-CSharp.csproj"], modified: [], removed: [] });
+
+it("refreshes generated C# files through backend events without overwriting a project rename", async () => {
+  let resolve!: (value: unknown) => void;
+  current.mockReturnValue(
+    new Promise((r) => {
+      resolve = r;
+    }),
+  );
+  changed();
+  await vi.advanceTimersByTimeAsync(160);
+  expect(current).toHaveBeenCalledTimes(1);
+  useProject.setState({ project: { ...project(), name: "Renamed" } });
+  resolve({ ...project(), unity: { ...project().unity, projects: ["Assembly-CSharp.csproj"] } });
+  await vi.advanceTimersByTimeAsync(0);
+  expect(useProjectTree.getState().unity?.projects).toEqual(["Assembly-CSharp.csproj"]);
+  expect(useProject.getState().project?.name).toBe("Renamed");
+});
+
+it("discards a late reply after switching to another project", async () => {
+  let resolve!: (value: unknown) => void;
+  current.mockReturnValue(
+    new Promise((r) => {
+      resolve = r;
+    }),
+  );
+  changed();
+  await vi.advanceTimersByTimeAsync(160);
+  useProject.setState({ project: { ...project("/app"), unity: undefined } });
+  resolve(project());
+  await vi.advanceTimersByTimeAsync(0);
+  expect(useProjectTree.getState()).toMatchObject({ root: "/app", unity: null, mode: "project" });
+});
diff --git a/src/features/run/ConfigForm.tsx b/src/features/run/ConfigForm.tsx
index 159b04ed..c9c2ef8f 100644
--- a/src/features/run/ConfigForm.tsx
+++ b/src/features/run/ConfigForm.tsx
@@ -4,7 +4,7 @@
  * Before launch list.
  */
 import { parseJavaArgs } from "@/platform/javaLaunch";
-import { useMemo, useRef, useState, type KeyboardEvent, type ReactNode, type RefObject } from "react";
+import { useEffect, useMemo, useRef, useState, type KeyboardEvent, type ReactNode, type RefObject } from "react";
 import clsx from "clsx";
 import { isTauri, type BeforeLaunchTask, type RunConfig } from "@/platform/ipc";
 import { useWorkflowSettings } from "@/platform/workflowSettings";
@@ -729,9 +729,20 @@ function TypeField({
   const tx = useTx();
   const root = useProject((s) => s.project?.root ?? null);
   const listId = `run-field-${field.key}`;
+  const [loaded, setLoaded] = useState<ReadonlyArray<{ value: string; label: string; detail?: string }>>([]);
+  useEffect(() => {
+    let live = true;
+    void field
+      .loadOptions?.()
+      .then((options) => live && setLoaded(options))
+      .catch(() => {});
+    return () => {
+      live = false;
+    };
+  }, [field]);
   if (field.control === "output") return <OutputField label={field.label} text={field.value?.(params) ?? ""} />;
   if (field.control === "select") {
-    const options = [...(field.options ?? [])];
+    const options = [...(field.options ?? []), ...loaded];
     if (value && !options.some((o) => o.value === value)) options.push({ value, label: value });
     return (
       <Select
diff --git a/src/features/run/EditConfigsDialog.tsx b/src/features/run/EditConfigsDialog.tsx
index 15308169..461c84b9 100644
--- a/src/features/run/EditConfigsDialog.tsx
+++ b/src/features/run/EditConfigsDialog.tsx
@@ -22,13 +22,12 @@ import {
   kindLabel,
   removeConfig,
   upsertConfig,
-  userConfigs,
   validateConfig,
   type ConfigErrors,
 } from "./configs";
 import { importConfigs, importLabel } from "./importConfigs";
 import { targetName } from "./remote";
-import { saveUserConfigs, selectConfig, useRun } from "./store";
+import { saveEditedConfigs, selectConfig, useRun } from "./store";
 import { blankTemplate, COMPOUND, missingParams, newConfigOfType, templateId, typeFor } from "./types";
 import styles from "./Run.module.css";
 import { tx } from "@/platform/i18n";
@@ -305,7 +304,7 @@ function EditConfigsDialog() {
     }
     setSaving(true);
     try {
-      if (dirty) await saveUserConfigs(userConfigs(draft), removedDetectedIds);
+      if (dirty) await saveEditedConfigs(draft, removedDetectedIds);
       if (templatesDirty && templates) await call(commands.runSaveTemplates(templates));
       setRemovedDetectedIds([]);
       setDirty(false);
diff --git a/src/features/run/FindBar.tsx b/src/features/run/FindBar.tsx
index 81af6d83..a4544704 100644
--- a/src/features/run/FindBar.tsx
+++ b/src/features/run/FindBar.tsx
@@ -2,7 +2,7 @@
 import { type KeyboardEvent, type RefObject } from "react";
 import clsx from "clsx";
 import { IconButton, SearchField } from "@/ui";
-import { hasPrimaryModifier } from "@/platform/keymap";
+import { formatBinding, hasPrimaryModifier } from "@/platform/keymap";
 import { tx } from "@/platform/i18n";
 import type { FindOptions } from "./find";
 import styles from "./Run.module.css";
@@ -97,7 +97,7 @@ export function ConsoleFindBar({
             id: "case",
             icon: "case",
             title: "Match Case",
-            shortcut: "⌥C",
+            shortcut: formatBinding("Alt+C"),
             pressed: options.caseSensitive,
             onToggle: () => toggle("caseSensitive"),
           },
@@ -105,7 +105,7 @@ export function ConsoleFindBar({
             id: "word",
             icon: "word",
             title: "Words",
-            shortcut: "⌥W",
+            shortcut: formatBinding("Alt+W"),
             pressed: options.wholeWord,
             onToggle: () => toggle("wholeWord"),
           },
@@ -113,7 +113,7 @@ export function ConsoleFindBar({
             id: "regex",
             icon: "regex",
             title: "Regex",
-            shortcut: "⌥X",
+            shortcut: formatBinding("Alt+X"),
             pressed: options.regex,
             onToggle: () => toggle("regex"),
           },
@@ -125,7 +125,7 @@ export function ConsoleFindBar({
       <IconButton
         icon="arrow-up"
         title="Previous Occurrence"
-        shortcut="⇧↵"
+        shortcut={formatBinding("Shift+Enter")}
         size="small"
         disabled={count === 0}
         onClick={onPrevious}
diff --git a/src/features/run/Run.module.css b/src/features/run/Run.module.css
index 677ba9c6..99675566 100644
--- a/src/features/run/Run.module.css
+++ b/src/features/run/Run.module.css
@@ -102,7 +102,7 @@
   background: var(--bg-app);
   -webkit-user-select: text;
   user-select: text;
-  cursor: text;
+  cursor: default;
   outline: none;
   contain: strict;
 }
@@ -110,6 +110,7 @@
   position: relative;
   width: 100%;
   min-width: max-content;
+  cursor: text;
 }
 .wrap .consoleInner {
   min-width: 0;
diff --git a/src/features/run/RunView.test.tsx b/src/features/run/RunView.test.tsx
new file mode 100644
index 00000000..e76307b9
--- /dev/null
+++ b/src/features/run/RunView.test.tsx
@@ -0,0 +1,82 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { RunConfig } from "@/platform/ipc";
+import { debugSession, resetRuns, useRun, type RunSession } from "./store";
+import { sessionIcon } from "./RunView";
+
+const actions = vi.hoisted(() => ({ executeAction: vi.fn() }));
+vi.mock("@/platform/actions", async (orig) => ({ ...(await orig<object>()), executeAction: actions.executeAction }));
+
+const config = (extra: Partial<RunConfig> = {}): RunConfig => ({
+  id: "c",
+  name: "c",
+  kind: "spring-boot",
+  command: "mvn",
+  args: [],
+  cwd: null,
+  env: {},
+  detected: false,
+  isTest: false,
+  debugAdapter: null,
+  ...extra,
+});
+
+const session = (extra: Partial<RunSession> = {}): RunSession => ({
+  id: "s1",
+  config: config(),
+  runId: null,
+  status: "finished",
+  exitCode: 0,
+  startedAt: 0,
+  endedAt: 1,
+  stdinClosed: false,
+  ...extra,
+});
+
+describe("sessionIcon", () => {
+  it("shows the execution arrow while running, the check for tests", () => {
+    expect(sessionIcon(session({ status: "running" }))).toBe("run");
+    expect(sessionIcon(session({ status: "starting" }))).toBe("run");
+    expect(sessionIcon(session({ status: "starting", config: config({ isTest: true }) }))).toBe("check");
+  });
+
+  it("shows the red error icon for a failed exit", () => {
+    expect(sessionIcon(session({ status: "failed" }))).toBe("error");
+    expect(sessionIcon(session({ exitCode: 1 }))).toBe("error");
+  });
+
+  it("shows the configuration's own icon once the process ended (IDEA's third state)", () => {
+    expect(sessionIcon(session())).toBe("spring-boot");
+    expect(sessionIcon(session({ config: config({ kind: "program" }) }))).toBe("file-binary");
+    expect(sessionIcon(session({ config: config({ kind: "npm" }) }))).toBe("file-npm");
+  });
+
+  it("never shows the error icon for a session the user stopped", () => {
+    expect(sessionIcon(session({ exitCode: 1, stopped: true }))).toBe("spring-boot");
+  });
+});
+
+describe("debugSession", () => {
+  beforeEach(() => {
+    resetRuns();
+    actions.executeAction.mockClear();
+  });
+
+  it("launches the session's configuration through run.debugConfig", () => {
+    const c = config();
+    useRun.setState({ sessions: [session({ config: c })] });
+    debugSession("s1");
+    expect(actions.executeAction).toHaveBeenCalledWith("run.debugConfig", c);
+  });
+
+  it("prefers the original configuration of a derived run", () => {
+    const base = config({ id: "base" });
+    useRun.setState({ sessions: [session({ config: config({ id: "derived" }), baseConfig: base })] });
+    debugSession("s1");
+    expect(actions.executeAction).toHaveBeenCalledWith("run.debugConfig", base);
+  });
+
+  it("ignores unknown session ids", () => {
+    debugSession("nope");
+    expect(actions.executeAction).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/features/run/RunView.tsx b/src/features/run/RunView.tsx
index 18964f63..0d6ddac4 100644
--- a/src/features/run/RunView.tsx
+++ b/src/features/run/RunView.tsx
@@ -14,6 +14,7 @@ import {
   clearConsole,
   closeSessionTab,
   closeStdin,
+  debugSession,
   failedTests,
   rerunFailed,
   rerunSession,
@@ -31,6 +32,7 @@ import { TestTreeView, formatDuration } from "./TestTreeView";
 import { StackTracePanel, closeStackTrace, useStackTraces, type StackTraceTab } from "./stackTrace";
 import { showApplicationUpdate, useApplicationUpdates } from "./applicationUpdate";
 import { isUpdatable } from "./updatePolicies";
+import { configIcon } from "./configs";
 import styles from "./Run.module.css";
 import { tx } from "@/platform/i18n";
 
@@ -38,19 +40,28 @@ function failed(s: RunSession): boolean {
   return s.status === "failed" || (s.status === "finished" && s.exitCode !== 0 && !s.stopped);
 }
 
-function sessionIcon(s: RunSession): string {
+/**
+ * Tab icon, IDEA's three states: the green execution arrow while the process is alive,
+ * the red error badge for a failed exit, and once the process ended the run
+ * configuration's own icon (Services keeps the same model, see services.tsx).
+ */
+export function sessionIcon(s: RunSession): string {
   if (s.status === "running" || s.status === "starting") return s.config.isTest ? "check" : "run";
   if (failed(s)) return "error";
-  return s.config.isTest ? "check" : "run";
+  // Ended (exit or stop): the configuration's own icon — the green arrow stays "still running".
+  return configIcon(s.config);
 }
 
 export function SessionPanel({
   session,
   onRerun,
+  onDebug,
   onStop,
 }: {
   session: RunSession;
   onRerun?: (() => void) | null;
+  /** Override the Debug button (Services: rerun the attached debugger's launch); null disables it. */
+  onDebug?: (() => void) | null;
   onStop?: () => void;
 }) {
   const updating = useApplicationUpdates((s) => s.ids.has(session.id));
@@ -136,6 +147,15 @@ export function SessionPanel({
           disabled={onRerun === null}
           onClick={onRerun ?? (() => rerunSession(session.id))}
         />
+        {/* Switch the launch mode: the same configuration started under the debugger. */}
+        <IconButton
+          icon="debug"
+          iconSize={14}
+          title="Debug"
+          shortcut={shortcutLabel("run.debug")}
+          disabled={onDebug === null}
+          onClick={onDebug ?? (() => void debugSession(session.id))}
+        />
         {rt.tests && (
           <IconButton
             icon="rerun"
diff --git a/src/features/run/configs.test.ts b/src/features/run/configs.test.ts
index d27eb265..1a02731b 100644
--- a/src/features/run/configs.test.ts
+++ b/src/features/run/configs.test.ts
@@ -256,6 +256,37 @@ describe("context configuration", () => {
     expect(contextConfig("docs/readme.md", configs)).toBeNull();
   });
 
+  it("runs a module that imports relatively as a module of its package", () => {
+    const cli = "from .models import Priority, TaskList\n\n\ndef main():\n    pass\n";
+    expect(contextConfig("src/tasks/cli.py", configs, cli)).toMatchObject({
+      kind: "python",
+      command: "../.venv/bin/python",
+      args: ["-m", "tasks.cli"],
+      cwd: "src",
+      debugAdapter: "debugpy",
+    });
+    expect(contextConfig("app/api/routes.py", [], "from . import models\n")).toMatchObject({
+      command: "python3",
+      args: ["-m", "app.api.routes"],
+      cwd: null,
+    });
+    expect(contextConfig("src/app/__main__.py", [], "from .cli import main\n")).toMatchObject({
+      args: ["-m", "app"],
+      cwd: "src",
+    });
+    // Inside a nested Python project: from its folder (the venv command stays relative to the root).
+    const nested = [cfg({ id: "pytest", kind: "pytest", command: "backend/.venv/bin/pytest", cwd: "backend" })];
+    expect(contextConfig("backend/app/jobs.py", nested, "from .db import session\n")).toMatchObject({
+      command: "../backend/.venv/bin/python",
+      args: ["-m", "app.jobs"],
+      cwd: "backend",
+    });
+    // Absolute imports, a top-level file, a folder that can't be a package: as a script.
+    expect(contextConfig("src/tasks/cli.py", configs, "import os\n")!.args).toEqual(["src/tasks/cli.py"]);
+    expect(contextConfig("tool.py", [], "from .x import y\n")!.args).toEqual(["tool.py"]);
+    expect(contextConfig("my-scripts/run.py", [], "from .x import y\n")!.args).toEqual(["my-scripts/run.py"]);
+  });
+
   it("runs pytest for a test file even without a detected pytest config", () => {
     expect(contextConfig("worker/test_worker.py", [])).toMatchObject({
       command: "python3",
diff --git a/src/features/run/context.ts b/src/features/run/context.ts
index 69e2050e..fe8c40b9 100644
--- a/src/features/run/context.ts
+++ b/src/features/run/context.ts
@@ -236,7 +236,48 @@ function mainConfigFor(relPath: string, configs: RunConfig[]): RunConfig | null
   return null;
 }
 
-function scriptConfigFor(relPath: string, configs: RunConfig[], windows = isWindows()): RunConfig | null {
+/** `from .models import …`, `from . import x`: the file is a module of a package. */
+const RELATIVE_IMPORT = /^[ \t]*from[ \t]+\.+[\w.]*[ \t]+import\b/m;
+const IDENTIFIER = /^[A-Za-z_]\w*$/;
+
+/**
+ * A module that imports relatively runs as `python -m <package>.<module>` from the folder its top
+ * package sits in (the last `src` of its path, else the Python project's folder): run as a script,
+ * its relative imports fail. `null` for other files.
+ */
+export function pythonModuleRun(
+  relPath: string,
+  content: string | undefined,
+  configs: RunConfig[],
+): { cwd: string; module: string } | null {
+  if (!content || !RELATIVE_IMPORT.test(content)) return null;
+  const project = closest(
+    configs.filter((c) => c.kind === "python" || c.kind === "pytest"),
+    relPath,
+  )?.cwd?.replace(/^\.\/?|\/+$/g, "");
+  const segs = relPath.replace(/\.py$/, "").split("/");
+  const first = project && relPath.startsWith(`${project}/`) ? project.split("/").length : 0;
+  const src = segs.lastIndexOf("src", segs.length - 2);
+  const start = src >= first ? src + 1 : first;
+  const parts = segs.slice(start);
+  // Only a module inside a package can import relatively.
+  if (parts.length < 2 || !parts.every((p) => IDENTIFIER.test(p))) return null;
+  if (parts.at(-1) === "__main__" || parts.at(-1) === "__init__") parts.pop();
+  return { cwd: segs.slice(0, start).join("/"), module: parts.join(".") };
+}
+
+/** A command relative to the project root (`.venv/bin/python`), from `cwd` inside it. */
+function fromSubfolder(command: string, cwd: string): string {
+  if (!cwd || !command.includes("/") || command.startsWith("/") || /^[A-Za-z]:/.test(command)) return command;
+  return "../".repeat(cwd.split("/").length) + command;
+}
+
+function scriptConfigFor(
+  relPath: string,
+  configs: RunConfig[],
+  windows = isWindows(),
+  content?: string,
+): RunConfig | null {
   const base: RunConfig = {
     id: `context:file:${relPath}`,
     name: relPath.split("/").pop() ?? relPath,
@@ -251,10 +292,18 @@ function scriptConfigFor(relPath: string, configs: RunConfig[], windows = isWind
   };
   if (relPath.endsWith(".py")) {
     // Reuse the project's interpreter (venv / uv / poetry) when detected.
-    const py = projectPython(configs);
-    if (py)
-      return { ...base, kind: "python", command: py.command, args: [...py.prefix, relPath], debugAdapter: "debugpy" };
-    return { ...base, kind: "python", command: "python3", args: [relPath], debugAdapter: "debugpy" };
+    const py = projectPython(configs) ?? { command: "python3", prefix: [] };
+    const module = pythonModuleRun(relPath, content, configs);
+    if (module)
+      return {
+        ...base,
+        kind: "python",
+        command: fromSubfolder(py.command, module.cwd),
+        args: [...py.prefix, "-m", module.module],
+        cwd: module.cwd || null,
+        debugAdapter: "debugpy",
+      };
+    return { ...base, kind: "python", command: py.command, args: [...py.prefix, relPath], debugAdapter: "debugpy" };
   }
   if (/\.[cm]?js$/.test(relPath)) return { ...base, command: "node", args: [relPath], debugAdapter: "js-debug" };
   if (/\.ts$/.test(relPath)) return { ...base, command: "npx", args: ["tsx", relPath], debugAdapter: "js-debug" };
@@ -278,7 +327,7 @@ export function contextConfig(
 ): RunConfig | null {
   const role = fileRole(relPath, content, windows, hasDjangoTests(configs));
   if (role === "test") return testConfigFor(relPath, configs);
-  if (role === "main") return mainConfigFor(relPath, configs) ?? scriptConfigFor(relPath, configs, windows);
-  if (role === "script") return scriptConfigFor(relPath, configs, windows);
+  if (role === "main") return mainConfigFor(relPath, configs) ?? scriptConfigFor(relPath, configs, windows, content);
+  if (role === "script") return scriptConfigFor(relPath, configs, windows, content);
   return null;
 }
diff --git a/src/features/run/contextRun.ts b/src/features/run/contextRun.ts
index be9e3918..8e7f1bed 100644
--- a/src/features/run/contextRun.ts
+++ b/src/features/run/contextRun.ts
@@ -29,9 +29,11 @@ import {
   scriptLanguage,
   type ContextInput,
   type Produced,
+  hasRelativeImports,
 } from "./producers";
 import { runWithExecutor } from "./executors";
 import { goModulePath, loadGoModules } from "./goModules";
+import { isPythonPackage, loadPythonPackages } from "./pythonPackages";
 import { remoteDebugBlocked } from "./remote";
 import { toolEnv } from "./runtimes";
 import { adoptTemporary, loadConfigs, modifyTemporary, startRun, useRun } from "./store";
@@ -48,7 +50,8 @@ async function ensureConfigs() {
 export function projectContentRoots(): string[] {
   const own = validateProjectStructure(useProject.getState().settings?.projectStructure).contentRoots;
   // The build model keeps the folders of modules outside the project absolute.
-  const gradle = (useBuildModel.getState().model?.gradle?.projects ?? [])
+  const gradle = (useBuildModel.getState().model?.gradle ?? [])
+    .flatMap((g) => g.projects)
     .map((p) => p.dir)
     .filter((d) => isAbsolute(d));
   return [...new Set([...own, ...gradle])];
@@ -88,7 +91,8 @@ export async function produceResolved(input: ContextInput, dir = false): Promise
   const configs = useRun.getState().configs;
   if (dir || /\.go$/.test(input.path)) await loadGoModules(input.root, configs);
   if (dir) return produceDirectory({ ...input, goModule: goModulePath });
-  const fresh = { ...input, configs, goModule: goModulePath };
+  if (/\.py$/.test(input.path) && hasRelativeImports(input.content)) await loadPythonPackages(input.path);
+  const fresh = { ...input, configs, goModule: goModulePath, pythonPackage: isPythonPackage };
   const named = produceContext(fresh, OPTIMISTIC);
   if (!named) return null;
   // Project configurations (tests, cargo, gradle…) need no runtime lookup.
diff --git a/src/features/run/gradleRun.test.ts b/src/features/run/gradleRun.test.ts
index 27584d19..e96112c0 100644
--- a/src/features/run/gradleRun.test.ts
+++ b/src/features/run/gradleRun.test.ts
@@ -1,9 +1,31 @@
-import { describe, expect, it } from "vitest";
-import type { GradleModel, RunConfig } from "@/platform/ipc";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GradleModel, ProjectInfo, RunConfig } from "@/platform/ipc";
 import { applicationConfig } from "./application";
-import { DELEGATED_DEBUG, delegatedGradleConfig, wrapperGradleVersion } from "./gradleRun";
+import {
+  DELEGATED_DEBUG,
+  delegatedGradleConfig,
+  gradleDelegation,
+  withTestEvents,
+  wrapperGradleVersion,
+} from "./gradleRun";
 import { jdwpLaunch } from "./javaDebug";
 import { isJvmApplication } from "@/platform/javaLaunch";
+import { useBuildModel } from "@/platform/buildModel";
+import { useProject } from "@/platform/project";
+
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    isTauri: () => true,
+    call: (value: unknown) => value,
+    commands: {
+      ...real.commands,
+      runGradleInitScript: () => Promise.resolve("/tmp/openidea-gradle-run.gradle"),
+      fsReadText: () => Promise.resolve("distributionUrl=https://x/gradle-8.10-bin.zip"),
+    },
+  };
+});
 
 const ROOT = "/w/shop";
 const CORE = "/w/billing/modules/core";
@@ -122,3 +144,75 @@ describe("Build and run using: Gradle", () => {
     expect(jdwpLaunch(debug)!.args.filter((a) => a === DELEGATED_DEBUG)).toHaveLength(1);
   });
 });
+
+describe("Gradle test runs", () => {
+  const script = "/tmp/openidea-gradle-tests.gradle";
+  it("add the init script that reports each test", () => {
+    expect(
+      withTestEvents({ kind: "gradle", command: "./gradlew", args: ["test", "--tests", "*OrderTest"] }, script).args,
+    ).toEqual(["--init-script", script, "test", "--tests", "*OrderTest"]);
+    expect(withTestEvents({ kind: "shell", command: "C:\\w\\gradlew.bat", args: ["test"] }, script).args).toEqual([
+      "--init-script",
+      script,
+      "test",
+    ]);
+  });
+
+  it("leave other runs and an added script alone", () => {
+    const maven = { kind: "maven", command: "./mvnw", args: ["test"] };
+    expect(withTestEvents(maven, script)).toBe(maven);
+    const twice = withTestEvents({ kind: "gradle", command: "gradle", args: ["test"] }, script);
+    expect(withTestEvents(twice, script)).toBe(twice);
+  });
+});
+
+describe("delegation across independent builds", () => {
+  afterEach(() => {
+    useProject.setState({ project: null, settings: null });
+    useBuildModel.setState({ root: null, model: null, gradleOffline: false });
+  });
+
+  it("selects the module's linked build and preserves composite identity task paths", async () => {
+    const builds = ["first", "second"].map((dir) => ({
+      ...gradle,
+      dir,
+      command: `${ROOT}/${dir}/gradlew`,
+      env: { JAVA_HOME: `/${dir}/jdk` },
+      projects: [{ path: ":app", name: "app", dir: `${dir}/app`, buildFile: null, tasks: [] }],
+    }));
+    useProject.setState({ project: { root: ROOT } as ProjectInfo, settings: null });
+    useBuildModel.setState({ root: ROOT, model: { maven: null, gradle: builds }, gradleOffline: true });
+    const app = {
+      ...applicationConfig({ className: "a.Main" }, "second/app/src/main/java/a/Main.java", []),
+      module: "second/app",
+    };
+    const run = await gradleDelegation(app);
+    expect(run).toMatchObject({ command: `${ROOT}/second/gradlew`, cwd: "second", env: { JAVA_HOME: "/second/jdk" } });
+    expect(run!.args).toContain("--offline");
+    expect(run!.args.at(-1)).toBe(":app:openideaRun");
+  });
+
+  it("prefers the directly linked owner over a longer sibling composite root", async () => {
+    const composite = {
+      ...gradle,
+      dir: "very-long-composite",
+      command: `${ROOT}/very-long-composite/gradlew`,
+      projects: [{ path: ":b:app", name: "app", dir: "b/app", buildFile: null, tasks: [], build: ":b" }],
+    };
+    const direct = {
+      ...gradle,
+      dir: "b",
+      command: `${ROOT}/b/gradlew`,
+      projects: [{ path: ":app", name: "app", dir: "b/app", buildFile: null, tasks: [] }],
+    };
+    useProject.setState({ project: { root: ROOT } as ProjectInfo, settings: null });
+    useBuildModel.setState({ root: ROOT, model: { maven: null, gradle: [composite, direct] } });
+    const app = {
+      ...applicationConfig({ className: "a.Main" }, "b/app/src/main/java/a/Main.java", []),
+      module: "b/app",
+    };
+    const run = await gradleDelegation(app);
+    expect(run).toMatchObject({ command: `${ROOT}/b/gradlew`, cwd: "b" });
+    expect(run!.args.at(-1)).toBe(":app:openideaRun");
+  });
+});
diff --git a/src/features/run/gradleRun.ts b/src/features/run/gradleRun.ts
index 43a60500..e643aefb 100644
--- a/src/features/run/gradleRun.ts
+++ b/src/features/run/gradleRun.ts
@@ -6,6 +6,7 @@
  * the forked JVM (`-Dopenidea.run.debug`), not to the Gradle daemon.
  */
 import RUN_SCRIPT from "./gradleRun.gradle?raw";
+import TESTS_SCRIPT from "./gradleTests.gradle?raw";
 import { useBuildModel } from "@/platform/buildModel";
 import { call, commands, isTauri, type GradleModel, type RunConfig } from "@/platform/ipc";
 import { findJavaModule, isJvmApplication, parseJavaArgs } from "@/platform/javaLaunch";
@@ -84,20 +85,44 @@ export function delegatedGradleConfig(config: RunConfig, module: string, ctx: De
   };
 }
 
-/** Writes the init script where Gradle can read it; it never changes, so once per session. */
-let scriptPath: Promise<string> | null = null;
-function writeScript(): Promise<string> {
-  scriptPath ??= (async () => {
-    const { tempDir, join } = await import("@tauri-apps/api/path");
-    const path = await join(await tempDir(), "openidea-gradle-run.gradle");
-    await call(commands.fsDelete(path)).catch(() => {});
-    await call(commands.fsCreateFileBytes(path, Array.from(new TextEncoder().encode(RUN_SCRIPT))));
-    return path;
-  })().catch((e) => {
-    scriptPath = null;
-    throw e;
-  });
-  return scriptPath;
+/**
+ * Writes an init script where Gradle reads it: on the machine that runs the build (the
+ * remote host in remote development). It never changes, so once per session.
+ */
+const scriptPaths = new Map<string, Promise<string>>();
+function writeScript(name: string, text: string): Promise<string> {
+  let written = scriptPaths.get(name);
+  if (!written) {
+    written = call(commands.runGradleInitScript(name, text)).catch((e) => {
+      scriptPaths.delete(name);
+      throw e;
+    });
+    scriptPaths.set(name, written);
+  }
+  return written;
+}
+
+const isGradleCommand = (config: Pick<RunConfig, "kind" | "command">) =>
+  config.kind === "gradle" || /(^|[/\\])gradlew?(\.bat)?$/.test(config.command);
+
+/** `config` with the init script (`script`) that reports each test as it runs, for a Gradle test run. */
+export function withTestEvents<T extends Pick<RunConfig, "kind" | "command" | "args">>(config: T, script: string): T {
+  if (!isGradleCommand(config) || config.args.includes(script)) return config;
+  return { ...config, args: ["--init-script", script, ...config.args] };
+}
+
+/**
+ * A Gradle test run reporting each test as it runs (`gradleTests.gradle`): Gradle prints only
+ * failures, and its XML reports are complete only once a test task ends.
+ */
+export async function gradleTestLaunch<T extends RunConfig>(config: T): Promise<T> {
+  if (!isTauri() || !config.isTest || !isGradleCommand(config)) return config;
+  try {
+    return withTestEvents(config, await writeScript("openidea-gradle-tests", TESTS_SCRIPT));
+  } catch (e) {
+    console.warn("Gradle test init script not written", e);
+    return config;
+  }
 }
 
 /**
@@ -110,18 +135,32 @@ export async function gradleDelegation(config: RunConfig): Promise<RunConfig | n
   const { project, settings } = useProject.getState();
   if (!project?.root || settings?.languages?.java?.gradle?.runUsing === "ide") return null;
   const { model, gradleOffline } = useBuildModel.getState();
-  if (!model?.gradle) return null;
+  if (!model?.gradle?.length) return null;
   const module = config.module ?? (await findJavaModule(config));
   if (module === null) return null;
+  const dir = absolute(project.root, module);
+  // A composite can report a sibling's module; prefer a linked root that contains it.
+  const ownerDepth = (g: GradleModel) => {
+    const root = absolute(project.root, g.dir).replace(/\\/g, "/").replace(/\/+$/, "");
+    const path = dir.replace(/\\/g, "/").replace(/\/+$/, "");
+    return path === root || path.startsWith(`${root}/`) ? root.split("/").length : 0;
+  };
+  const gradle = model.gradle
+    .filter((g) => g.projects.some((p) => absolute(project.root, p.dir) === dir))
+    .sort((a, b) => ownerDepth(b) - ownerDepth(a))[0];
+  if (!gradle) return null;
   const ctx = {
     root: project.root,
-    gradle: model.gradle,
+    gradle,
     script: "",
     offline: gradleOffline,
     configurationCache: false,
   };
   if (!delegatedGradleConfig(config, module, ctx)) return null;
-  const [script, configurationCache] = await Promise.all([writeScript(), supportsConfigurationCache(ctx)]);
+  const [script, configurationCache] = await Promise.all([
+    writeScript("openidea-gradle-run", RUN_SCRIPT),
+    supportsConfigurationCache(ctx),
+  ]);
   return delegatedGradleConfig(config, module, { ...ctx, script, configurationCache });
 }
 
diff --git a/src/features/run/gradleTests.gradle b/src/features/run/gradleTests.gradle
new file mode 100644
index 00000000..76edcff6
--- /dev/null
+++ b/src/features/run/gradleTests.gradle
@@ -0,0 +1,44 @@
+// OpenIDEA: reports each test of Gradle's Test tasks as a TeamCity service message on the
+// build's output, for the Run window's test tree: Gradle itself prints only failures (or a
+// project's own format), and writes its XML reports when a task ends. Test tasks always run,
+// so a rerun never ends UP-TO-DATE without results.
+
+def tc = { String s ->
+    s == null ? '' : s.replace('|', '||').replace("'", "|'").replace('\n', '|n').replace('\r', '|r')
+        .replace('[', '|[').replace(']', '|]')
+}
+
+allprojects {
+    tasks.withType(Test).configureEach { Test task ->
+        task.outputs.upToDateWhen { false }
+        task.addTestListener(new TestListener() {
+            void beforeSuite(TestDescriptor suite) {}
+
+            void afterSuite(TestDescriptor suite, TestResult result) {}
+
+            void beforeTest(TestDescriptor test) {
+                println "##teamcity[testStarted name='${tc(test.name)}' className='${tc(test.className)}']"
+            }
+
+            void afterTest(TestDescriptor test, TestResult result) {
+                def id = "name='${tc(test.name)}' className='${tc(test.className)}'"
+                def type = result.resultType.toString()
+                if (type == 'FAILURE') {
+                    def error = result.exception
+                    def trace = new StringWriter()
+                    error?.printStackTrace(new PrintWriter(trace))
+                    println "##teamcity[testFailed ${id} message='${tc(error?.toString())}' details='${tc(trace.toString())}']"
+                } else if (type == 'SKIPPED') {
+                    println "##teamcity[testIgnored ${id}]"
+                }
+                println "##teamcity[testFinished ${id} duration='${result.endTime - result.startTime}']"
+            }
+        })
+        task.addTestOutputListener(new TestOutputListener() {
+            void onOutput(TestDescriptor test, TestOutputEvent output) {
+                if (test.className == null) return
+                println "##teamcity[testStdOut name='${tc(test.name)}' className='${tc(test.className)}' out='${tc(output.message)}']"
+            }
+        })
+    }
+}
diff --git a/src/features/run/index.ts b/src/features/run/index.ts
index c51262f7..a663c368 100644
--- a/src/features/run/index.ts
+++ b/src/features/run/index.ts
@@ -38,9 +38,10 @@ import { EditConfigsOverlay } from "./EditConfigsDialog";
 import { openImport } from "./importConfigs";
 import { registerGoActions } from "./goActions";
 import { invalidateGoModules } from "./goModules";
+import { invalidatePythonPackages } from "./pythonPackages";
 import { RunWidget } from "./RunWidget";
 import { runConfigsRunAnything } from "./runAnything";
-import { recordRun, runServiceProvider } from "./services";
+import { cleanupRemovedProject, recordRun, runServiceProvider } from "./services";
 import { runBeforeLaunch } from "./beforeLaunch";
 import { compoundChildren } from "./configs";
 import { remoteDebugBlocked } from "./remote";
@@ -299,6 +300,15 @@ export function activate(): () => void {
     listenForApplicationDeactivation(),
     trackRecentConfigurations(),
     useDebugRunSessions.subscribe(() => setContext("run.updatableRunning", updatableSessions().length > 0)),
+    // A removed workspace member (or a closed project) takes its sessions,
+    // temporary configurations and Services groups with it.
+    // Only while the same project stays open: closing it tears its runs down separately.
+    useProject.subscribe((s, prev) => {
+      if (!s.project || s.project.root !== prev.project?.root) return;
+      const before = prev.project.workspace?.projects ?? [];
+      const after = s.project.workspace?.projects ?? [];
+      for (const root of before) if (!after.includes(root)) void cleanupRemovedProject(root);
+    }),
     registerEditorContribution({ id: "run.targets", order: 55, extensions: runGutter }),
     registerEditorContribution({ id: "run.npmScripts", order: 58, extensions: npmGutter }),
     registerMenuGroup({
@@ -565,6 +575,7 @@ export function activate(): () => void {
     onIdeEvent("fsChanged", (e) => {
       const paths = [...e.created, ...e.modified, ...e.removed];
       if (paths.some((p) => /(?:^|\/)go\.(?:mod|work)$/.test(p))) invalidateGoModules();
+      if (paths.some((p) => p.endsWith("/__init__.py"))) invalidatePythonPackages();
       if (paths.some((p) => CONFIG_FILES.test(p))) scheduleReload();
     }),
     onIdeEvent("runExited", (e) => {
diff --git a/src/features/run/inheritedMain.test.ts b/src/features/run/inheritedMain.test.ts
new file mode 100644
index 00000000..4043e462
--- /dev/null
+++ b/src/features/run/inheritedMain.test.ts
@@ -0,0 +1,125 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { HierarchyItem } from "@/platform/ipc";
+import {
+  clearInheritedMain,
+  hasInheritedMain,
+  resolveCandidates,
+  resolveInheritedMain,
+  unresolvedCandidates,
+  type InheritedMainDeps,
+} from "./inheritedMain";
+
+const item = (name: string, path: string, kind: HierarchyItem["kind"] = "class"): HierarchyItem => ({
+  name,
+  kind,
+  detail: null,
+  path,
+  range: { start: { line: 0, col: 0 }, end: { line: 5, col: 1 } },
+  selectionRange: { start: { line: 0, col: 6 }, end: { line: 0, col: 6 + name.length } },
+  fromRanges: [],
+});
+const MAIN = "public static void main(String[] a) {}";
+
+function deps(supers: Record<string, HierarchyItem[] | Error>, texts: Record<string, string>) {
+  const d: InheritedMainDeps = {
+    supertypes: vi.fn(async (path) => {
+      const r = supers[path];
+      if (r instanceof Error) throw r;
+      return r ?? [];
+    }),
+    text: vi.fn(async (i) => {
+      const t = texts[i.uri ?? i.path];
+      if (t === undefined) throw new Error("unreadable");
+      return t;
+    }),
+  };
+  return d;
+}
+const at = { line: 3, col: 13 };
+
+beforeEach(() => clearInheritedMain());
+
+describe("resolveInheritedMain", () => {
+  it("finds main in a direct superclass inside a jar", async () => {
+    const jar = "jdt://contents/lib.jar/pkg/AtomStarter.class";
+    const d = deps(
+      { "/p/App.java": [item("AtomStarter", jar)] },
+      { [jar]: `package pkg; class AtomStarter { ${MAIN} }` },
+    );
+    expect(await resolveInheritedMain("/p/App.java", at, d)).toBe(true);
+  });
+
+  it("walks two levels", async () => {
+    const d = deps(
+      { "/p/App.java": [item("Mid", "/p/Mid.java")], "/p/Mid.java": [item("Base", "/p/Base.java")] },
+      { "/p/Mid.java": "class Mid extends Base {}", "/p/Base.java": `class Base { ${MAIN} }` },
+    );
+    expect(await resolveInheritedMain("/p/App.java", at, d)).toBe(true);
+  });
+
+  it("ignores interfaces and instance main", async () => {
+    const d = deps(
+      { "/p/App.java": [item("Iface", "/p/Iface.java", "interface"), item("Inst", "/p/Inst.java")] },
+      { "/p/Iface.java": `interface Iface { ${MAIN} }`, "/p/Inst.java": "class Inst { void main() {} }" },
+    );
+    expect(await resolveInheritedMain("/p/App.java", at, d)).toBe(false);
+  });
+
+  it("stops on cycles", async () => {
+    const d = deps(
+      { "/p/A.java": [item("B", "/p/B.java")], "/p/B.java": [item("B", "/p/B.java")] },
+      { "/p/B.java": "class B {}" },
+    );
+    expect(await resolveInheritedMain("/p/A.java", at, d)).toBe(false);
+    expect(d.supertypes).toHaveBeenCalledTimes(2);
+  });
+
+  it("is undefined when the server cannot answer, false when a deeper level fails", async () => {
+    expect(await resolveInheritedMain("/p/A.java", at, deps({ "/p/A.java": new Error("x") }, {}))).toBeUndefined();
+    const d = deps(
+      { "/p/A.java": [item("B", "/p/B.java")], "/p/B.java": new Error("x") },
+      { "/p/B.java": "class B {}" },
+    );
+    expect(await resolveInheritedMain("/p/A.java", at, d)).toBe(false);
+  });
+
+  it("treats an unreadable supertype as no main", async () => {
+    const d = deps({ "/p/A.java": [item("B", "/p/B.java")] }, {});
+    expect(await resolveInheritedMain("/p/A.java", at, d)).toBe(false);
+  });
+
+  it("reads each supertype's text once", async () => {
+    const d = deps(
+      { "/p/A.java": [item("B", "/p/B.java")], "/p/C.java": [item("B", "/p/B.java")] },
+      { "/p/B.java": "class B {}" },
+    );
+    await resolveInheritedMain("/p/A.java", at, d);
+    await resolveInheritedMain("/p/C.java", at, d);
+    expect(d.text).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe("resolveCandidates", () => {
+  const src = "package demo;\n\npublic class App extends Base {}\n";
+  it("records answers for fileTargets and skips them next time", async () => {
+    const d = deps({ "/p/App.java": [item("Base", "/p/Base.java")] }, { "/p/Base.java": `class Base { ${MAIN} }` });
+    expect(unresolvedCandidates("/p/App.java", src)).toHaveLength(1);
+    expect(await resolveCandidates("/p/App.java", unresolvedCandidates("/p/App.java", src), d)).toBe(true);
+    expect(hasInheritedMain("/p/App.java", { className: "demo.App", base: "Base" })).toBe(true);
+    expect(unresolvedCandidates("/p/App.java", src)).toHaveLength(0);
+  });
+
+  it("asks again when the extends clause changes", async () => {
+    const d = deps({ "/p/App.java": [item("Base", "/p/Base.java")] }, { "/p/Base.java": `class Base { ${MAIN} }` });
+    await resolveCandidates("/p/App.java", unresolvedCandidates("/p/App.java", src), d);
+    const edited = src.replace("extends Base", "extends Other");
+    expect(hasInheritedMain("/p/App.java", { className: "demo.App", base: "Other" })).toBe(false);
+    expect(unresolvedCandidates("/p/App.java", edited)).toHaveLength(1);
+  });
+
+  it("leaves a candidate pending while the server is unavailable", async () => {
+    const d = deps({ "/p/App.java": new Error("unavailable") }, {});
+    expect(await resolveCandidates("/p/App.java", unresolvedCandidates("/p/App.java", src), d)).toBe(false);
+    expect(unresolvedCandidates("/p/App.java", src)).toHaveLength(1);
+  });
+});
diff --git a/src/features/run/inheritedMain.ts b/src/features/run/inheritedMain.ts
new file mode 100644
index 00000000..a6261984
--- /dev/null
+++ b/src/features/run/inheritedMain.ts
@@ -0,0 +1,142 @@
+/**
+ * `main` inherited from a superclass (in the project or a library JAR): the JVM
+ * launches `java -cp … Sub` fine when `Base` declares `static main`, but the
+ * synchronous scanner only sees the file's own text. This asks the language
+ * server for the superclass chain once, and remembers the answer for
+ * `fileTargets` to read synchronously.
+ */
+import { lspRequest } from "@/editor/lsp/lsp";
+import { readFileLines, withDocument } from "@/editor/lsp/files";
+import { commands, type HierarchyItem, type Pos } from "@/platform/ipc";
+import type { RunTarget } from "./targets";
+import { jvmMainCandidates, scanJvmTargets, simpleClassName, type JvmMainCandidate } from "./jvmTargets";
+
+export interface InheritedMainDeps {
+  supertypes: (path: string, pos: Pos) => Promise<HierarchyItem[]>;
+  /** Source text of a supertype (file, or decompiled / source-jar document). */
+  text: (item: HierarchyItem) => Promise<string>;
+}
+
+export const inheritedMainDeps: InheritedMainDeps = {
+  supertypes: (path, pos) =>
+    withDocument(path, (doc) => lspRequest(() => commands.lspTypeHierarchy(doc, pos, "incoming"))),
+  text: async (item) => {
+    const lines = await readFileLines(item.uri ?? item.path);
+    if (!lines) throw new Error("unreadable");
+    return lines.join("\n");
+  },
+};
+
+/** Whether the type declares a static `main` itself, by `uri ?? path` and name. */
+const declares = new Map<string, Promise<boolean>>();
+/** file → `class extends base` → inherits a static `main`. */
+const resolved = new Map<string, Map<string, boolean>>();
+const keyOf = (c: Pick<JvmMainCandidate, "className" | "base">) => `${c.className} extends ${c.base}`;
+
+/** After the server settles: ask again where it said "no" (it may have been indexing); keep the "yes" answers. */
+export function retryNegativeInheritedMain() {
+  declares.clear();
+  for (const m of resolved.values()) for (const [k, v] of m) if (!v) m.delete(k);
+}
+
+export function clearInheritedMain() {
+  declares.clear();
+  resolved.clear();
+}
+
+export const hasInheritedMain = (path: string, c: Pick<JvmMainCandidate, "className" | "base">) =>
+  resolved.get(path)?.get(keyOf(c)) === true;
+
+/** Candidates of `path` not answered yet. */
+export function unresolvedCandidates(path: string, text: string): JvmMainCandidate[] {
+  const done = resolved.get(path);
+  return jvmMainCandidates(text, path).filter((c) => !done?.has(keyOf(c)));
+}
+
+function declaresMain(s: HierarchyItem, deps: InheritedMainDeps): Promise<boolean> {
+  const key = `${s.uri ?? s.path}#${s.name}`;
+  let p = declares.get(key);
+  if (!p) {
+    const name = s.name.replace(/<.*$/, "");
+    p = deps
+      .text(s)
+      .then((text) =>
+        scanJvmTargets(text, "", false).some(
+          (t) => t.kind === "main" && !t.instance && simpleClassName(t.className) === name,
+        ),
+      );
+    // Not remembered on failure: the document may become readable later.
+    p.catch(() => declares.delete(key));
+    declares.set(key, p);
+  }
+  return p.catch(() => false);
+}
+
+/**
+ * Whether a superclass of the type at `pos` declares a static `main`.
+ * `undefined` when the server could not say (not ready), so the caller retries later.
+ * Interfaces are skipped: a static interface `main` is not inherited.
+ */
+export async function resolveInheritedMain(
+  path: string,
+  pos: Pos,
+  deps: InheritedMainDeps,
+  depth = 6,
+): Promise<boolean | undefined> {
+  const seen = new Set<string>();
+  let level = [{ path, pos }];
+  for (let d = 0; d < depth && level.length; d++) {
+    const next: typeof level = [];
+    for (const t of level) {
+      let supers: HierarchyItem[];
+      try {
+        supers = await deps.supertypes(t.path, t.pos);
+      } catch {
+        if (d === 0) return undefined;
+        continue;
+      }
+      for (const s of supers) {
+        if (s.kind !== "class") continue;
+        const key = `${s.uri ?? s.path}:${s.selectionRange.start.line}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        if (await declaresMain(s, deps)) return true;
+        next.push({ path: s.path, pos: s.selectionRange.start });
+      }
+    }
+    level = next;
+  }
+  return false;
+}
+
+/** Resolves the file's pending candidates; true when a new inherited `main` was found. */
+export async function resolveCandidates(
+  path: string,
+  candidates: readonly JvmMainCandidate[],
+  deps: InheritedMainDeps = inheritedMainDeps,
+): Promise<boolean> {
+  let found = false;
+  for (const c of candidates) {
+    const has = await resolveInheritedMain(path, { line: c.line, col: c.col }, deps);
+    if (has === undefined) continue;
+    if (!resolved.has(path)) resolved.set(path, new Map());
+    resolved.get(path)!.set(keyOf(c), has);
+    found ||= has;
+  }
+  return found;
+}
+
+/** `main` targets for the file's classes whose superclass declares one (answers resolved earlier). */
+export function inheritedRunTargets(path: string, text: string): RunTarget[] {
+  if (!resolved.get(path)?.size) return [];
+  return jvmMainCandidates(text, path)
+    .filter((c) => hasInheritedMain(path, c))
+    .map((c) => ({
+      line: c.line,
+      kind: "main",
+      name: simpleClassName(c.className),
+      path: [c.className],
+      className: c.className,
+      spring: c.spring,
+    }));
+}
diff --git a/src/features/run/java.test.ts b/src/features/run/java.test.ts
index 1ee300d7..f74d3e7e 100644
--- a/src/features/run/java.test.ts
+++ b/src/features/run/java.test.ts
@@ -11,7 +11,7 @@ import { useProject } from "@/platform/project";
 import { applicationConfig, jvmModuleDir, jvmTestConfig } from "./application";
 import { buildRows } from "./ConfigChooser";
 import { jdwpLaunch } from "./javaDebug";
-import { scanJvmTargets } from "./jvmTargets";
+import { firstTopLevelType, jvmMainCandidates, scanJvmTargets } from "./jvmTargets";
 import { adoptTemporary, MAX_TEMPORARY, saveTemporary, testReportEvents, useRun } from "./store";
 import { detectRunTargets, targetConfig } from "./targets";
 
@@ -94,6 +94,47 @@ describe("scanJvmTargets (Java)", () => {
       [16, "test", "a.b.OrderTest$Fixture", "inner", false],
     ]);
   });
+
+  it("treats the public void methods of a TestNG class-level @Test as tests", () => {
+    const src = [
+      "package a.b;", // 0
+      "import org.testng.annotations.*;",
+      '@Test(groups = "unit")',
+      "public class PriceTest {", // 3
+      "  @BeforeMethod public void setUp() {}",
+      "  public void rounds() {}", // 5
+      '  @Test(dataProvider = "rows")',
+      "  public void parses(String row) {}", // 7
+      "  @DataProvider public Object[][] rows() { return null; }",
+      '  @DataProvider(name = "more") public void notATest() {}',
+      "  void packagePrivate() {}",
+      "  private void util() {}",
+      "  public static void shared() {}",
+      "  public int value() { return 1; }",
+      "}",
+    ].join("\n");
+    expect(pick(src, "src/test/java/a/b/PriceTest.java")).toEqual([
+      [3, "suite", "a.b.PriceTest", null, false],
+      [5, "test", "a.b.PriceTest", "rounds", false],
+      [7, "test", "a.b.PriceTest", "parses", false],
+    ]);
+  });
+});
+
+describe("firstTopLevelType", () => {
+  it("is the first top-level class, interface, enum, record or annotation, with the package", () => {
+    const src = [
+      "package demo;",
+      "import java.util.List; // class Commented {}",
+      '/* enum Old {} */ @Tag(type = List.class, name = "class Str")',
+      "interface Shape { class Nested {} }",
+      "public class Test { public static void main(String[] args) {} }",
+    ].join("\n");
+    expect(firstTopLevelType(src)).toBe("demo.Shape");
+    expect(firstTopLevelType("record Point(int x) {}\nclass Test {}")).toBe("Point");
+    expect(firstTopLevelType("@interface Marker {}\nclass Test {}")).toBe("Marker");
+    expect(firstTopLevelType("void main() {\n  IO.println(1);\n}\n")).toBeNull();
+  });
 });
 
 describe("scanJvmTargets (Kotlin)", () => {
@@ -338,6 +379,18 @@ describe("debugging build tool configurations", () => {
     expect(merged.env.JAVA_TOOL_OPTIONS).toMatch(/^-Dfile\.encoding=UTF-8 -agentlib:jdwp=/);
   });
 
+  it("debugs a single Java file: the agent before the file, or for java only on a javac line", () => {
+    const source = jdwpLaunch(cfg({ id: "f", kind: "java-file", command: "/bin/java", args: ["Hi.java"] }))!;
+    expect(source.args).toEqual([expect.stringMatching(AGENT), "Hi.java"]);
+    const line = "mkdir -p /tmp/c && /bin/javac -g -d /tmp/c Test.java && /bin/java -cp /tmp/c Test";
+    const compiled = jdwpLaunch(
+      cfg({ id: "f", kind: "java-file", command: line, env: { JDK_JAVA_OPTIONS: "-Xmx1g" } }),
+    )!;
+    expect(compiled).toMatchObject({ command: line, args: [] });
+    expect(compiled.env.JDK_JAVA_OPTIONS).toMatch(/^-Xmx1g -agentlib:jdwp=/);
+    expect(compiled.env.JAVA_TOOL_OPTIONS).toBeUndefined();
+  });
+
   it("leaves Application configurations and other debuggers alone", () => {
     for (const kind of ["application", "spring-boot"])
       expect(jdwpLaunch(cfg({ id: "a", kind, command: "java", debugAdapter: "java-debug" }))).toBeNull();
@@ -367,6 +420,24 @@ describe("JUnit XML reports", () => {
       location: { path: "a/B.java", line: 42, resolve: "name", className: "a.B$Inner" },
     });
   });
+
+  it("locate Kotlin tests with spaces in their names, behind a class loader prefix", () => {
+    const events = testReportEvents([
+      {
+        className: "a.LibraryTest",
+        name: "cannot lend twice",
+        status: "failed",
+        durationMs: null,
+        message: null,
+        output: "AssertionFailedError\n\tat app//a.LibraryTest.cannot lend twice(LibraryTest.kt:43)",
+      },
+    ]);
+    expect(events).toContainEqual({
+      type: "location",
+      path: ["a.LibraryTest", "cannot lend twice"],
+      location: { path: "a/LibraryTest.kt", line: 43, resolve: "name", className: "a.LibraryTest" },
+    });
+  });
 });
 
 describe("temporary configurations", () => {
@@ -436,3 +507,35 @@ describe("temporary configurations", () => {
     expect(useRun.getState().temporary).toEqual([]);
   });
 });
+
+describe("jvmMainCandidates", () => {
+  const names = (src: string) => jvmMainCandidates(src, "a/B.java").map((c) => c.className);
+
+  it("finds the class from the report, at its name", () => {
+    const src = "package demo;\n\n@SpringBootApplication\npublic class AiChatApplication extends AtomStarter {}\n";
+    expect(jvmMainCandidates(src, "a/B.java")).toEqual([
+      { line: 3, col: 13, className: "demo.AiChatApplication", base: "AtomStarter", spring: true },
+    ]);
+  });
+
+  it.each([
+    ["static nested class", "class A { static class B extends Base {} }", ["A$B"]],
+    ["inner (non-static) class", "class A { class B extends Base {} }", []],
+    ["abstract class", "abstract class A extends Base {}", ["A"]],
+    ["own main", "class A extends Base { public static void main(String[] a) {} }", []],
+    ["implements only", "class A implements Runnable {}", []],
+    ["interface extends", "interface A extends Base {}", []],
+    ["enum and record", "enum E implements I {}\nrecord R() implements I {}", []],
+    ["multi-line generic header", "class A<T extends Number>\n  extends Base<T>\n{}", ["A"]],
+    ["type bound only", "class A<T extends Number> {}", []],
+    ["extends in comment and string", '// class A extends B\nclass C { String s = "class D extends E {"; }', []],
+  ])("%s", (_, src, expected) => expect(names(src)).toEqual(expected));
+
+  it("accepts java.lang.String[] and flags instance main", () => {
+    const [fq] = scanJvmTargets("class A { public static void main(java.lang.String[] a) {} }", "A.java", false);
+    expect(fq).toMatchObject({ kind: "main", className: "A" });
+    const [inst] = scanJvmTargets("class A { void main() {} }", "A.java", false);
+    expect(inst).toMatchObject({ kind: "main", instance: true });
+    expect(fq?.instance).toBeUndefined();
+  });
+});
diff --git a/src/features/run/javaDebug.ts b/src/features/run/javaDebug.ts
index 1932608c..225cf18c 100644
--- a/src/features/run/javaDebug.ts
+++ b/src/features/run/javaDebug.ts
@@ -40,8 +40,12 @@ function withProperty(args: readonly string[], key: string, value: string): stri
 export function jdwpLaunch(config: RunConfig): RunConfig | null {
   if (config.kind === "tomcat") return { ...config, params: { ...config.params, tomcatDebug: "true" } };
   const args = config.args;
-  // A single source file (`java Hi.java`): the agent goes before the file.
-  if (config.kind === "java-file") return { ...config, args: [JDWP_AGENT, ...args] };
+  // A single source file (`java Hi.java`): the agent goes before the file. Compiled first
+  // (`javac … && java -cp …`): through `JDK_JAVA_OPTIONS`, which only the `java` launcher reads.
+  if (config.kind === "java-file")
+    return args.length
+      ? { ...config, args: [JDWP_AGENT, ...args] }
+      : { ...config, env: withOption(config.env, "JDK_JAVA_OPTIONS", JDWP_AGENT) };
   if (config.kind === "maven" || /(^|\/)mvnw?(\.cmd)?$/.test(config.command)) {
     if (args.some((a) => a === "spring-boot:run" || /:spring-boot-maven-plugin:[^:]*:run$/.test(a)))
       return { ...config, args: withProperty(args, "spring-boot.run.jvmArguments", JDWP_AGENT) };
diff --git a/src/features/run/jvmTargets.ts b/src/features/run/jvmTargets.ts
index 4635793c..1384ce20 100644
--- a/src/features/run/jvmTargets.ts
+++ b/src/features/run/jvmTargets.ts
@@ -17,11 +17,25 @@ export interface JvmTarget {
   method?: string;
   /** The class is a `@SpringBootApplication`. */
   spring?: boolean;
+  /** Java 25 instance `main` (JEP 512): a subclass cannot inherit it on older JDKs. */
+  instance?: boolean;
+}
+
+/** A class with `extends X` and no `main` of its own: it may inherit one. */
+export interface JvmMainCandidate {
+  /** Position of the class name (0-based line, UTF-16 column). */
+  line: number;
+  col: number;
+  className: string;
+  /** The superclass as written (`a.b.Base`), so an answer lapses when the `extends` clause changes. */
+  base: string;
+  spring?: boolean;
 }
 
 interface Token {
   text: string;
   line: number;
+  col: number;
 }
 
 /** Blanks comments, strings, text blocks and char literals (newlines kept). */
@@ -69,12 +83,14 @@ function tokenize(code: string): Token[] {
   for (let line = 0; line < lines.length; line++) {
     re.lastIndex = 0;
     let m: RegExpExecArray | null;
-    while ((m = re.exec(lines[line]!))) tokens.push({ text: m[0], line });
+    while ((m = re.exec(lines[line]!))) tokens.push({ text: m[0], line, col: m.index });
   }
   return tokens;
 }
 
 const TEST_ANNOTATIONS = new Set(["Test", "ParameterizedTest", "RepeatedTest", "TestFactory", "TestTemplate"]);
+/** TestNG methods that set up or feed tests; not tests themselves under a class-level `@Test`. */
+const TESTNG_NOT_TESTS = /^(Before|After)\w*$|^(DataProvider|Factory)$/;
 const TYPE_KEYWORDS = new Set(["class", "interface", "enum", "record", "object"]);
 const NOT_TYPES = new Set(["new", "return", "throw", "else", "case", "assert", "yield", "await", "this", "super"]);
 const KOTLIN_DECL = /^(fun|val|var|class|object|interface|enum|data|sealed|abstract|open|private|public|internal|@)$/;
@@ -90,15 +106,27 @@ interface ClassFrame {
   annotations: string[];
   kind: string;
   companion: boolean;
+  /** Java `class … extends X` that may inherit a `main` (top-level or `static` nested). */
+  inheritsFrom?: { col: number; base: string };
 }
 
 /** Targets of a Java (`kotlin = false`) or Kotlin source file. */
 export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): JvmTarget[] {
+  return scan(src, relPath, kotlin).targets;
+}
+
+/** Java classes that extend another class but declare no `main`; see `inheritedMain.ts`. */
+export function jvmMainCandidates(src: string, relPath: string): JvmMainCandidate[] {
+  return scan(src, relPath, false).candidates;
+}
+
+function scan(src: string, relPath: string, kotlin: boolean) {
   const code = stripCommentsAndStrings(src);
   const pkg = /^\s*package\s+([\w.]+)/m.exec(code)?.[1] ?? "";
   const qualify = (binary: string) => (pkg ? `${pkg}.${binary}` : binary);
   const tokens = tokenize(code);
   const out: JvmTarget[] = [];
+  const candidates: JvmMainCandidate[] = [];
   const classes: ClassFrame[] = [];
   /** A class header seen, waiting for its `{`. */
   let pendingClass: Omit<ClassFrame, "depth"> | null = null;
@@ -151,6 +179,9 @@ export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): J
       const name = isIdent(next) && !TYPE_KEYWORDS.has(next!) ? unquote(next!) : companion ? "Companion" : null;
       if (name) {
         pendingClass = { name, line: tokens[i]!.line, annotations, kind: t, companion };
+        const base = !kotlin && t === "class" ? extendsClause(tokens, i) : null;
+        if (base && (classes.length === 0 || hasModifier(tokens, i, "static")))
+          pendingClass.inheritsFrom = { col: tokens[i + 1]!.col, base };
         annotations = [];
       }
       continue;
@@ -158,7 +189,16 @@ export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): J
 
     if (t === "{") {
       if (pendingClass) {
-        classes.push({ ...pendingClass, depth: depth + 1 });
+        const frame = { ...pendingClass, depth: depth + 1 };
+        if (frame.inheritsFrom)
+          candidates.push({
+            line: frame.line,
+            col: frame.inheritsFrom.col,
+            className: qualify(binaryName([...classes, frame])),
+            base: frame.inheritsFrom.base,
+            spring: frame.annotations.includes("SpringBootApplication") || undefined,
+          });
+        classes.push(frame);
         pendingClass = null;
       }
       depth++;
@@ -208,7 +248,16 @@ export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): J
     const modifiers: string[] = [];
     for (let k = i - 1; k >= 0 && !MEMBER_END.has(tokens[k]!.text); k--) modifiers.push(tokens[k]!.text);
     const owner = top();
-    if (annotations.some((a) => TEST_ANNOTATIONS.has(a)) && owner) {
+    // TestNG `@Test` on a class (JUnit's is method-only): its public `void` methods are tests.
+    const classLevelTest =
+      !kotlin &&
+      owner?.kind === "class" &&
+      owner.annotations.includes("Test") &&
+      prev === "void" &&
+      modifiers.includes("public") &&
+      !modifiers.includes("static") &&
+      !annotations.some((a) => TESTNG_NOT_TESTS.test(a));
+    if ((annotations.some((a) => TEST_ANNOTATIONS.has(a)) || classLevelTest) && owner) {
       const className = qualify(binaryName(frames));
       out.push({ line: tokens[i]!.line, kind: "test", className, method: name });
       for (let f = frames.length; f > 0; f--) {
@@ -223,7 +272,8 @@ export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): J
       }
     } else if (name === "main") {
       const paramText = params.filter((p) => p !== "final").join(" ");
-      const stringArgs = /^String\s*(\[\s*]|\.\s*\.\s*\.)/.test(paramText) || paramText === "";
+      const stringArgs =
+        /^(java\s*\.\s*lang\s*\.\s*)?String\s*(\[\s*]|\.\s*\.\s*\.)/.test(paramText) || paramText === "";
       const kotlinArgs = /^\w+\s*:\s*Array\s*<\s*(out\s+)?String\s*>$/.test(paramText) || paramText === "";
       if (kotlin && kotlinArgs) {
         if (!owner) {
@@ -254,6 +304,7 @@ export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): J
             kind: "main",
             className: qualify(binaryName(frames)),
             spring: spring || undefined,
+            instance: !isStatic || undefined,
           });
         }
       }
@@ -269,7 +320,51 @@ export function scanJvmTargets(src: string, relPath: string, kotlin: boolean): J
   // One main per class is enough (overloads).
   const seen = new Set<string>();
   const unique = out.filter((t) => t.kind !== "main" || (!seen.has(t.className) && !!seen.add(t.className)));
-  return [...suites, ...unique].sort((a, b) => a.line - b.line);
+  const own = new Set(unique.filter((t) => t.kind === "main").map((t) => t.className));
+  return {
+    targets: [...suites, ...unique].sort((a, b) => a.line - b.line),
+    candidates: candidates.filter((c) => !own.has(c.className)),
+  };
+}
+
+function hasModifier(tokens: Token[], at: number, modifier: string): boolean {
+  for (let k = at - 1; k >= 0 && !MEMBER_END.has(tokens[k]!.text); k--) if (tokens[k]!.text === modifier) return true;
+  return false;
+}
+
+/** The superclass named by the `extends` clause of the `class` at `at` (not a type-parameter bound), if any. */
+function extendsClause(tokens: Token[], at: number): string | null {
+  let angle = 0;
+  for (let k = at + 2; k < tokens.length && tokens[k]!.text !== "{" && tokens[k]!.text !== ";"; k++) {
+    const t = tokens[k]!.text;
+    if (t === "<") angle++;
+    else if (t === ">") angle--;
+    else if (angle === 0 && t === "extends") {
+      let base = "";
+      for (let j = k + 1; j < tokens.length && !["<", "{", "implements", "permits"].includes(tokens[j]!.text); j++)
+        base += tokens[j]!.text;
+      return base || null;
+    }
+  }
+  return null;
+}
+
+/** Binary name of a Java file's first top-level type: the class the source launcher (`java Hi.java`) runs. */
+export function firstTopLevelType(src: string): string | null {
+  const code = stripCommentsAndStrings(src);
+  const pkg = /^\s*package\s+([\w.]+)/m.exec(code)?.[1] ?? "";
+  const tokens = tokenize(code);
+  let depth = 0;
+  for (let i = 0; i < tokens.length; i++) {
+    const t = tokens[i]!.text;
+    if (t === "{") depth++;
+    else if (t === "}") depth = Math.max(0, depth - 1);
+    else if (depth === 0 && TYPE_KEYWORDS.has(t) && tokens[i - 1]?.text !== ".") {
+      const name = tokens[i + 1]?.text;
+      if (isIdent(name)) return pkg ? `${pkg}.${name}` : name!;
+    }
+  }
+  return null;
 }
 
 /** Simple name of a binary class name (`a.b.Outer$Inner` → `Inner`). */
diff --git a/src/features/run/jvmTypes.ts b/src/features/run/jvmTypes.ts
index 2401ea7e..6b1d6f0e 100644
--- a/src/features/run/jvmTypes.ts
+++ b/src/features/run/jvmTypes.ts
@@ -6,6 +6,8 @@
  */
 import { call, commands, type RunConfig } from "@/platform/ipc";
 import { CLASSPATH, parseJavaArgs, TEST_CLASSPATH } from "@/platform/javaLaunch";
+import { basename, useProject } from "@/platform/project";
+import { useBuildPresentation } from "@/platform/projectPresentation";
 import type { RunConfigTypeContribution, RunConfigTypeField } from "@/workbench/contributions";
 import { formatArgs, parseArgs } from "./configs";
 import { commandName } from "./commandName";
@@ -51,6 +53,45 @@ function mainClasses(configs: readonly RunConfig[]): string[] {
   return [...out];
 }
 
+/** The module of the project root in the `module` param (`RunConfig.module` is `""` for it). */
+export const ROOT_MODULE = ".";
+
+/** `java` in a JDK home (`params.jre`); the home itself when the path names `bin/java` already. */
+export function jreJava(home: string, windows = isWindows()): string {
+  const java = windows ? "java.exe" : "java";
+  return /[\\/]bin[\\/]java(\.exe)?$/i.test(home) ? home : `${home.replace(/[\\/]+$/, "")}/bin/${java}`;
+}
+
+/** IDEA's JRE: the module's JDK unless one installed JDK is chosen. */
+const jreField: RunConfigTypeField = {
+  key: "jre",
+  label: "JRE",
+  control: "select",
+  options: [{ value: "", label: "Default (the module's JDK)" }],
+  loadOptions: async () =>
+    (await call(commands.sdkDetect("jdk"))).map((jdk) => ({
+      value: String(jdk.path),
+      label: jdk.name,
+      detail: String(jdk.path),
+    })),
+};
+
+/** IDEA's "Use classpath of module": the module whose classpath and build the run uses. */
+const moduleField: RunConfigTypeField = {
+  key: "module",
+  label: "Use classpath of module",
+  control: "select",
+  options: [{ value: "", label: "Find by main class" }],
+  loadOptions: async () => {
+    const root = useProject.getState().project?.root ?? "";
+    return [...useBuildPresentation.getState().modules.keys()].sort().map((dir) => ({
+      value: dir || ROOT_MODULE,
+      label: dir ? basename(dir) : basename(root),
+      detail: dir.includes("/") ? dir : undefined,
+    }));
+  },
+};
+
 function jvmApplicationType(spring: boolean): RunConfigTypeContribution {
   return {
     id: spring ? "spring-boot" : "application",
@@ -72,6 +113,8 @@ function jvmApplicationType(spring: boolean): RunConfigTypeContribution {
       { key: "programArgs", label: "Program arguments", mono: true },
       ...(spring ? [profilesField("Comma separated; passed as --spring.profiles.active")] : []),
       ...(spring ? updatePolicyFields(false) : []),
+      jreField,
+      moduleField,
       {
         key: "classpath",
         label: "Classpath",
@@ -86,7 +129,7 @@ function jvmApplicationType(spring: boolean): RunConfigTypeContribution {
       const main = p.mainClass?.trim() ?? "";
       const profiles = spring ? (p.activeProfiles?.trim() ?? "") : "";
       return {
-        command: p.executable || "java",
+        command: p.jre ? jreJava(p.jre) : p.executable || "java",
         args: [
           ...splitJvmArgs(p.vmOptions),
           "-cp",
@@ -116,6 +159,7 @@ function jvmApplicationType(spring: boolean): RunConfigTypeContribution {
       }
       return {
         ...(c.command !== "java" ? { executable: c.command } : {}),
+        ...(c.module != null ? { module: c.module || ROOT_MODULE } : {}),
         mainClass: parsed.mainClass,
         vmOptions: formatArgs(parsed.vmArgs),
         programArgs: formatArgs(rest),
diff --git a/src/features/run/producers.test.ts b/src/features/run/producers.test.ts
index 4e73b758..21574434 100644
--- a/src/features/run/producers.test.ts
+++ b/src/features/run/producers.test.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from "vitest";
-import type { RunConfig } from "@/platform/ipc";
+import { afterEach, describe, expect, it } from "vitest";
+import type { HierarchyItem, RunConfig } from "@/platform/ipc";
 import {
   innermostTarget,
   nodeTypeStripping,
@@ -15,8 +15,18 @@ import {
   type LocatedTool,
   type ToolEnv,
 } from "./producers";
+import { clearInheritedMain, resolveCandidates, unresolvedCandidates } from "./inheritedMain";
+
+afterEach(() => clearInheritedMain());
 
 const ROOT = "/work/app";
+const superItem: Omit<HierarchyItem, "name" | "path"> = {
+  kind: "class",
+  detail: null,
+  range: { start: { line: 0, col: 0 }, end: { line: 1, col: 0 } },
+  selectionRange: { start: { line: 0, col: 0 }, end: { line: 0, col: 1 } },
+  fromRanges: [],
+};
 const SCRATCH = "/Users/me/Library/Application Support/ai.l0ng.openidea/scratches";
 
 const cfg = (over: Partial<RunConfig> & { id: string; kind: string }): RunConfig => ({
@@ -152,6 +162,31 @@ describe("single-file producers (scratches)", () => {
     expect(produceContext(scratch("hi.py"), env({}))!.missing!.title).toBe("Cannot run 'hi.py'");
   });
 
+  it("Python: a module with relative imports runs with -m from above its top package", () => {
+    const venv = [cfg({ id: "pytest", kind: "pytest", command: ".venv/bin/pytest" })];
+    const packages = new Set([`${ROOT}/src/tasks`, `${ROOT}/src/tasks/sub`]);
+    const at = (path: string, content: string) =>
+      run({ path, root: ROOT, configs: venv, content, pythonPackage: (d) => packages.has(d) });
+    const relative = "from .models import TaskList\n";
+    expect(at(`${ROOT}/src/tasks/cli.py`, relative)).toMatchObject({
+      command: `${ROOT}/.venv/bin/python`,
+      args: ["-m", "tasks.cli"],
+      cwd: "src",
+    });
+    expect(at(`${ROOT}/src/tasks/sub/__main__.py`, "from ..models import X\n")).toMatchObject({
+      args: ["-m", "tasks.sub"],
+      cwd: "src",
+    });
+    // A directory without `__init__.py` is still the module's package; a top-level one runs from the root.
+    expect(at(`${ROOT}/scripts/gen.py`, relative)).toMatchObject({ args: ["-m", "scripts.gen"], cwd: null });
+    // Without relative imports, the file runs as a script.
+    expect(at(`${ROOT}/src/tasks/cli.py`, "import argparse\n")).toMatchObject({
+      command: ".venv/bin/python",
+      args: ["src/tasks/cli.py"],
+      cwd: null,
+    });
+  });
+
   it("shell scripts: the shell of the #! line, else by extension; extensionless files by #!", () => {
     expect(run(scratch("a.sh", "#!/usr/bin/env bash\necho hi"))).toMatchObject({
       command: "/bin/bash",
@@ -309,6 +344,69 @@ describe("single-file producers (scratches)", () => {
     expect(p.config!.args.at(-1)).toBe("demo.Hi");
   });
 
+  it("Java: a main class after another top-level class compiles with javac, then runs with java -cp", () => {
+    const src =
+      "class Parent {\n  void show() {}\n}\n\npublic class Test {\n" +
+      "  public static void main(String[] args) {\n    new Parent().show();\n  }\n}\n";
+    const input = { path: `${ROOT}/src/Test.java`, root: ROOT, configs: [], content: src };
+    const out = "/tmp/openidea-run/Test-[a-z0-9]+-classes";
+    for (const p of [produceFile(input, ALL), produceContext(input, ALL), produceContext({ ...input, line: 6 }, ALL)]) {
+      expect(p!.config).toMatchObject({
+        id: "context:file:src/Test.java",
+        name: "Test.java",
+        kind: "java-file",
+        args: [],
+        cwd: null,
+        debugAdapter: "java-debug",
+      });
+      expect(p!.config!.command).toMatch(
+        new RegExp(`^mkdir -p (${out}) && /bin/javac -g -d \\1 src/Test\\.java && /bin/java -cp \\1 Test$`),
+      );
+    }
+    // The source launcher runs the first top-level class: a main there keeps `java Test.java`.
+    expect(
+      run(scratch("Test.java", "public class Test {\n  public static void main(String[] a) {}\n}\nclass B {}")),
+    ).toEqual({ name: "Test.java", command: "/bin/java", args: ["Test.java"], cwd: SCRATCH });
+    // Java 25 compact source file: no class, `java Hi.java` as before.
+    expect(run(scratch("Hi.java", "void main() {\n  IO.println(1);\n}\nclass Helper {}\n"))).toMatchObject({
+      command: "/bin/java",
+      args: ["Hi.java"],
+    });
+  });
+
+  it("Java: the gutter runs the main class it marks, nested ones and those of a JDK on Windows too", () => {
+    const src = [
+      "package demo;",
+      "class First {",
+      "  public static void main(String[] args) {}",
+      "  static class Inner {",
+      "    public static void main(String[] args) {}",
+      "  }",
+      "}",
+      "public class Second {",
+      "  public static void main(String[] args) {}",
+      "}",
+    ].join("\n");
+    const at = (line?: number) => produceContext(scratch("Second.java", src, line), ALL)!;
+    // The file and the first class: the source launcher.
+    for (const p of [at(), at(2)]) expect(p.config).toMatchObject({ command: "/bin/java", args: ["Second.java"] });
+    const second = at(8);
+    expect(second).toMatchObject({ name: "Second", scope: "element" });
+    expect(second.config).toMatchObject({ id: `context:file:${SCRATCH}/Second.java#demo.Second`, name: "Second" });
+    expect(second.config!.command).toMatch(/ && \/bin\/java -cp \S+ demo\.Second$/);
+    expect(at(4).config!.command).toMatch(/ && \/bin\/java -cp \S+ 'demo\.First\$Inner'$/);
+    const jdk = "C:\\Program Files\\Java\\jdk-21\\bin\\java.exe";
+    const win: ToolEnv = {
+      tool: (n) => (n === "java" ? { path: jdk, version: null } : null),
+      compileDir: "C:/Users/me/AppData/Local/openidea/run",
+      windows: true,
+    };
+    const p = produceContext(scratch("Second.java", src, 8), win)!;
+    expect(p.config!.command).toMatch(
+      /^\(if not exist (C:\\Users\\me\\AppData\\Local\\openidea\\run\\Second-[a-z0-9]+-classes) mkdir \1\) && "C:\\Program Files\\Java\\jdk-21\\bin\\javac\.exe" -g -d \1 Second\.java && "C:\\Program Files\\Java\\jdk-21\\bin\\java\.exe" -cp \1 demo\.Second$/,
+    );
+  });
+
   it("Java: a main in a Gradle module outside the project runs on the module's classpath", () => {
     // `includeFlat 'billing'`: the module folder is a sibling of the project folder.
     const svc = "/work/billing/modules/core";
@@ -331,6 +429,23 @@ describe("single-file producers (scratches)", () => {
     expect(p.config!.args).toEqual(["-cp", "${classpath}", "com.example.ShopApplication"]);
   });
 
+  it("Java: a class whose superclass declares main runs as a Spring Boot application", async () => {
+    const path = `${ROOT}/src/main/java/demo/AiChatApplication.java`;
+    const content = "package demo;\n\n@SpringBootApplication\npublic class AiChatApplication extends AtomStarter {}\n";
+    const gradle = [cfg({ id: "gradle:test", kind: "gradle", command: "./gradlew", args: ["test"], isTest: true })];
+    const input = { path, root: ROOT, configs: gradle, content, line: 3 };
+    expect(fileTargets(input, content)).toEqual([]);
+    await resolveCandidates(path, unresolvedCandidates(path, content), {
+      supertypes: async () => [{ ...superItem, name: "AtomStarter", path: "jdt://lib/AtomStarter.class" }],
+      text: async () => "package x; public class AtomStarter { public static void main(String[] a) {} }",
+    });
+    expect(fileTargets(input, content)).toMatchObject([
+      { kind: "main", className: "demo.AiChatApplication", spring: true },
+    ]);
+    expect(produceContext(input, ALL)!.config).toMatchObject({ kind: "spring-boot" });
+    expect(produceContext(input, ALL)!.config!.args.at(-1)).toBe("demo.AiChatApplication");
+  });
+
   describe("Java / Kotlin mains in a build nested in a folder of repositories", () => {
     // RuoYi-Vue-Plus (Maven) next to plus-ui (npm), opened together.
     const boot =
diff --git a/src/features/run/producers.ts b/src/features/run/producers.ts
index efed66bd..85f6d0b5 100644
--- a/src/features/run/producers.ts
+++ b/src/features/run/producers.ts
@@ -18,7 +18,9 @@ import { goGenerateConfig } from "./goGenerate";
 import { goTestParts } from "./goArguments";
 import { contextConfig, fileRole, projectPython, testBasesFor, testConfigFor } from "./context";
 import { djangoLabel, djangoTestsOf, hasDjangoTests } from "./djangoTypes";
+import { firstTopLevelType, scanJvmTargets, simpleClassName } from "./jvmTargets";
 import { isWindows } from "./jvmTypes";
+import { inheritedRunTargets } from "./inheritedMain";
 import { detectRunTargets, targetConfig, targetLanguage, type RunTarget } from "./targets";
 import { tx } from "@/platform/i18n";
 
@@ -54,6 +56,8 @@ export interface ContextInput {
   content?: string;
   /** Go: the module path of a module directory (`go.mod`), when known. */
   goModule?: (dir: string) => string | null | undefined;
+  /** Python: whether a directory is a package (`__init__.py`), when known. */
+  pythonPackage?: (dir: string) => boolean | undefined;
   /** 0-based caret line: the element at the caret wins over the file. */
   line?: number;
   /**
@@ -408,6 +412,31 @@ function fileConfig(
   };
 }
 
+const PYTHON_RELATIVE_IMPORT = /^\s*from\s+\.+[\w.]*\s+import\b/m;
+
+/** Whether Python source imports relatively (`from .models import X`): it only runs as a module. */
+export function hasRelativeImports(content: string | undefined): boolean {
+  return !!content && PYTHON_RELATIVE_IMPORT.test(content);
+}
+
+/**
+ * A module with relative imports, run as `python -m package.module` from the directory above
+ * its top package (its own directory is a package for the import, `__init__.py` or not).
+ */
+function pythonModule(input: ContextInput): { name: string; dir: string } | null {
+  if (!hasRelativeImports(input.content)) return null;
+  let top = dirName(input.path);
+  for (let up = dirName(top); up && up !== top && input.pythonPackage?.(up); up = dirName(up)) top = up;
+  const dir = dirName(top);
+  if (!dir || dir === top) return null;
+  const parts = input.path
+    .slice(dir === "/" ? 1 : dir.length + 1)
+    .replace(/\.py$/, "")
+    .split("/");
+  if (parts.length > 1 && (parts.at(-1) === "__init__" || parts.at(-1) === "__main__")) parts.pop();
+  return { name: parts.join("."), dir };
+}
+
 /** Python: the interpreter from settings, the detected project interpreter, then `python3` on the PATH. */
 function pythonCommand(input: ContextInput, env: ToolEnv, s: FileSite): { command: string; prefix: string[] } | null {
   if (env.python) return { command: env.python, prefix: [] };
@@ -515,6 +544,44 @@ function compiled(
   return { name, scope, config, debug: { build: buildConfig, config: binary } };
 }
 
+/**
+ * A single Java file. The source launcher (`java Hi.java`, JEP 330) runs the file's first
+ * top-level type, so another main class (declared after it, nested, or picked in the gutter)
+ * is compiled with the JDK's `javac` into a class directory and run with `java -cp`.
+ */
+function javaFile(input: ContextInput, env: ToolEnv, s: FileSite, mainClass?: string): Produced {
+  const tools = toolsFor("java");
+  const java = pick(env, tools);
+  if (!java) return { name: s.file, scope: "file", missing: missing("java", s.file, tools) };
+  const source: Produced = {
+    name: s.file,
+    scope: "file",
+    config: fileConfig(s, "java-file", java.command, [s.arg], "java-debug"),
+  };
+  if (input.content === undefined) return source;
+  const first = firstTopLevelType(input.content);
+  const mains = scanJvmTargets(input.content, s.idPath, false)
+    .filter((t) => t.kind === "main")
+    .map((t) => t.className);
+  const stem = stemOf(s.file);
+  const fileMain =
+    mains.find((c) => c === first) ?? mains.find((c) => c.slice(c.lastIndexOf(".") + 1) === stem) ?? mains[0];
+  const launch = mainClass ?? fileMain;
+  if (!launch || launch === first) return source;
+  const win = !!env.windows;
+  const dir = env.compileDir.replace(/\\/g, "/").replace(/(.)\/+$/, "$1");
+  const out = nativePath(`${dir}/${stem}-${hash(input.path)}-classes`, win);
+  // The `javac` of the JDK that runs the class, so their class file versions match.
+  const javac = java.command.replace(/(^|[\\/])java(\.exe)?$/i, "$1javac$2");
+  const build = `${mkdirLine(out, win)} && ${shellLine([javac, "-g", "-d", out, s.arg], win)}`;
+  const run = shellLine([java.command, "-cp", out, launch], win);
+  const config: RunConfig = {
+    ...fileConfig(s, "java-file", `${build} && ${run}`, [], "java-debug"),
+    ...(launch === fileMain ? {} : { id: `context:file:${s.idPath}#${launch}`, name: simpleClassName(launch) }),
+  };
+  return { name: config.name, scope: "file", config };
+}
+
 function simple(
   lang: ScriptLanguage,
   s: FileSite,
@@ -636,7 +703,10 @@ export function produceFile(input: ContextInput, env: ToolEnv): Produced | null
     }
     if (/\.(java|kt)$/.test(rel) && hasBuildTool(rel, configs, JVM_BUILDS)) {
       if (input.content === undefined) return null;
-      const targets = detectRunTargets(input.content, rel).filter((t) => t.className);
+      const targets = [
+        ...detectRunTargets(input.content, rel),
+        ...inheritedRunTargets(input.path, input.content),
+      ].filter((t) => t.className);
       const target = targets.find((t) => t.kind === "main") ?? targets.find((t) => t.kind === "suite");
       const config = target ? targetConfig(target, rel, configs, input.content) : null;
       return config ? { name: config.name, scope: "file", config } : null;
@@ -651,6 +721,22 @@ export function produceFile(input: ContextInput, env: ToolEnv): Produced | null
     case "python": {
       const py = pythonCommand(input, env, s);
       if (!py) return { name: s.file, scope: "file", missing: missing("python", s.file, ["python3", "python"]) };
+      const module = pythonModule(input);
+      if (module) {
+        // It runs in another directory: a venv-relative interpreter is relative to the project root.
+        const command =
+          input.root && py.command.includes("/") && !py.command.startsWith("/")
+            ? `${input.root}/${py.command}`
+            : py.command;
+        return {
+          name: s.file,
+          scope: "file",
+          config: {
+            ...fileConfig(s, "python", command, [...py.prefix, "-m", module.name], "debugpy"),
+            cwd: module.dir === input.root ? null : relTo(module.dir, input.root),
+          },
+        };
+      }
       return {
         name: s.file,
         scope: "file",
@@ -734,8 +820,7 @@ export function produceFile(input: ContextInput, env: ToolEnv): Produced | null
       return simple(lang, s, env, "go", () => ["run", s.arg], "delve");
     case "java":
       if (input.content !== undefined && !/\bvoid\s+main\s*\(/.test(input.content)) return null;
-      // JEP 330: `java Hi.java` compiles and runs a single source file.
-      return simple(lang, s, env, "java-file", () => [s.arg], "java-debug");
+      return javaFile(input, env, s);
     case "rust":
       if (!hasRustMain(input.content)) {
         // A standalone file with tests only: run them all.
@@ -839,7 +924,8 @@ export function fileTargets(
       (t) => t.kind === "main" && (!t.className || /\.(java|kt)$/.test(input.path)),
     );
   }
-  return detectRunTargets(content, s.rel, hasDjangoTests(input.configs));
+  const targets = detectRunTargets(content, s.rel, hasDjangoTests(input.configs));
+  return /\.java$/.test(input.path) ? [...targets, ...inheritedRunTargets(input.path, content)] : targets;
 }
 
 function elementProduction(input: ContextInput, env: ToolEnv, target: RunTarget): Produced | null {
@@ -855,6 +941,8 @@ function elementProduction(input: ContextInput, env: ToolEnv, target: RunTarget)
       const config = applicationConfig({ className: target.className, spring: target.spring }, rel, input.configs);
       return { name: config.name, scope: "element", config };
     }
+    if (target.className && /\.java$/.test(input.path))
+      return { ...javaFile(input, env, s, target.className), scope: "element" };
     const file = produceFile(input, env);
     return file ? { ...file, scope: "element" } : null;
   }
diff --git a/src/features/run/pythonPackages.ts b/src/features/run/pythonPackages.ts
new file mode 100644
index 00000000..819e94a3
--- /dev/null
+++ b/src/features/run/pythonPackages.ts
@@ -0,0 +1,30 @@
+/**
+ * Which directories are Python packages (`__init__.py`), for running a module with relative
+ * imports as `python -m package.module`. Read once per directory.
+ */
+import { call, commands, isTauri } from "@/platform/ipc";
+
+const known = new Map<string, boolean>();
+
+export function invalidatePythonPackages() {
+  known.clear();
+}
+
+/** Whether `dir` is a package, when already read. */
+export function isPythonPackage(dir: string): boolean | undefined {
+  return known.get(dir);
+}
+
+const parent = (p: string) => (p.includes("/") ? p.slice(0, p.lastIndexOf("/")) || "/" : "");
+
+/** Reads the packages enclosing `path`'s directory, up to the first directory that isn't one. */
+export async function loadPythonPackages(path: string): Promise<void> {
+  if (!isTauri()) return;
+  for (let dir = parent(parent(path)); dir; dir = parent(dir)) {
+    if (!known.has(dir)) {
+      const kind = await call(commands.fsEntryKind(`${dir}/__init__.py`)).catch(() => null);
+      known.set(dir, kind === "file");
+    }
+    if (!known.get(dir) || dir === "/") return;
+  }
+}
diff --git a/src/features/run/removal.test.tsx b/src/features/run/removal.test.tsx
index 29a35c2e..29733e03 100644
--- a/src/features/run/removal.test.tsx
+++ b/src/features/run/removal.test.tsx
@@ -6,6 +6,8 @@ const ipc = vi.hoisted(() => ({
   runConfigs: vi.fn(),
   runTemplates: vi.fn(async () => ({ status: "ok", data: [] })),
   runImportSources: vi.fn(async () => ({ status: "ok", data: [] })),
+  runWithoutDerived: vi.fn(async (configs: unknown) => ({ status: "ok", data: configs })),
+  runApplySettings: vi.fn(async (configs: unknown) => ({ status: "ok", data: configs })),
 }));
 vi.mock("@/platform/ipc", async (importOriginal) => ({
   ...(await importOriginal<typeof import("@/platform/ipc")>()),
@@ -17,7 +19,7 @@ import type { RunConfig } from "@/platform/ipc";
 import { useProject } from "@/platform/project";
 import { EditConfigsOverlay } from "./EditConfigsDialog";
 import { ConfigChooserOverlay } from "./ConfigChooser";
-import { canDeleteConfig, deleteConfig, loadConfigs, resetRuns, useRun } from "./store";
+import { adoptTemporary, canDeleteConfig, deleteConfig, loadConfigs, resetRuns, useRun } from "./store";
 import { registerBuiltinTypes } from "./types";
 
 const config = (kind = "npm"): RunConfig => ({
@@ -125,3 +127,43 @@ it("Cancel discards a pending detected removal", () => {
   expect(ipc.runSaveConfigs).not.toHaveBeenCalled();
   expect(useRun.getState().configs).toEqual([config()]);
 });
+
+const temporaryOf = () =>
+  JSON.parse(localStorage.getItem("openidea.run.temporary.v2:/test-removal") ?? "[]") as RunConfig[];
+const mainGo: RunConfig = { ...config("go"), id: "go:file:/test-removal/app/main.go", name: "main.go" };
+
+it("removes a temporary configuration from Edit Configurations for good", async () => {
+  adoptTemporary(mainGo);
+  useRun.setState({ editTarget: mainGo.id });
+  render(<EditConfigsOverlay />);
+  fireEvent.click(screen.getByRole("treeitem", { name: "main.go" }));
+  fireEvent.click(screen.getByRole("button", { name: "Remove Configuration" }));
+  fireEvent.click(screen.getByRole("button", { name: "OK" }));
+  await waitFor(() => expect(useRun.getState().editorOpen).toBe(false));
+  // Not a suppressed detection: it was never detected by the backend.
+  expect(ipc.runSaveConfigs).toHaveBeenCalledWith([], []);
+  expect(temporaryOf()).toEqual([]);
+  await act(() => loadConfigs());
+  expect(useRun.getState().configs.map((c) => c.id)).toEqual(["npm:app"]);
+  expect(useRun.getState().temporary).toEqual([]);
+});
+
+it("keeps unedited temporary configurations temporary and saves edited ones", async () => {
+  const goal: RunConfig = { ...config("maven"), id: "maven:goal:pom.xml:test", name: "app [test]", detected: false };
+  const other: RunConfig = {
+    ...config("maven"),
+    id: "maven:goal:pom.xml:verify",
+    name: "app [verify]",
+    detected: false,
+  };
+  adoptTemporary(goal);
+  adoptTemporary(other);
+  useRun.setState({ editTarget: other.id });
+  render(<EditConfigsOverlay />);
+  fireEvent.change(screen.getByRole("textbox", { name: "Name" }), { target: { value: "verify app" } });
+  fireEvent.click(screen.getByRole("button", { name: "OK" }));
+  await waitFor(() => expect(useRun.getState().editorOpen).toBe(false));
+  expect(ipc.runSaveConfigs).toHaveBeenCalledWith([expect.objectContaining({ id: other.id, name: "verify app" })], []);
+  expect(useRun.getState().temporary).toEqual([goal.id]);
+  expect(temporaryOf().map((c) => c.id)).toEqual([goal.id]);
+});
diff --git a/src/features/run/runConfigTypes.test.tsx b/src/features/run/runConfigTypes.test.tsx
index 1fb73c57..e8b412ab 100644
--- a/src/features/run/runConfigTypes.test.tsx
+++ b/src/features/run/runConfigTypes.test.tsx
@@ -70,6 +70,32 @@ beforeEach(() => {
 afterEach(() => disposeTypes());
 
 describe("configuration types", () => {
+  it("runs an Application with the chosen JRE and the classpath of the chosen module", () => {
+    const type = typeFor("application")!;
+    const base = withParams(newConfigOfType(type, []), { ...newConfigOfType(type, []).params, mainClass: "a.Main" });
+    expect(base.command).toBe("java");
+    expect(base.module).toBeUndefined();
+
+    const chosen = withParams(base, { ...base.params, jre: "/jdks/temurin-8", module: "server" });
+    expect(chosen.command).toBe("/jdks/temurin-8/bin/java");
+    expect(chosen.module).toBe("server");
+    // The project root is a module too.
+    expect(withParams(chosen, { ...chosen.params, module: "." }).module).toBe("");
+    // Back to the defaults: the module's JDK, and the module found again for another main class.
+    const auto = withParams(chosen, { ...chosen.params, jre: "", module: "", mainClass: "b.Main" });
+    expect(auto.command).toBe("java");
+    expect(auto.module).toBeUndefined();
+
+    // A configuration saved with its module shows it in the form.
+    const saved = cfg("saved", {
+      kind: "application",
+      command: "java",
+      args: ["-cp", "${classpath}", "a.Main"],
+      module: "",
+    });
+    expect(formParams(saved)).toMatchObject({ mainClass: "a.Main", module: "." });
+  });
+
   it.each(["spring-boot", "tomcat"])("edits shared update policies in the %s form", async (kind) => {
     const type = typeFor(kind)!;
     const original = newConfigOfType(type, []);
diff --git a/src/features/run/runGutter.ts b/src/features/run/runGutter.ts
index 0fe0e8b6..9d630c96 100644
--- a/src/features/run/runGutter.ts
+++ b/src/features/run/runGutter.ts
@@ -21,6 +21,8 @@ import {
   projectContext,
 } from "./contextRun";
 import { loadGoModules } from "./goModules";
+import { onServerSettled } from "@/editor/lsp/availability";
+import { resolveCandidates, retryNegativeInheritedMain, unresolvedCandidates } from "./inheritedMain";
 import { fileTargets, OPTIMISTIC, produceContextChoices, type ContextInput } from "./producers";
 import { loadConfigs, useRun } from "./store";
 import { targetLanguage, type RunTarget } from "./targets";
@@ -203,8 +205,15 @@ export function runGutter(ctx: EditorDocContext): Extension {
     class {
       timer: ReturnType<typeof setTimeout> | undefined;
       readonly unsubscribe: () => void;
+      readonly offServers: () => void;
+      resolving = false;
+      destroyed = false;
       constructor(readonly view: EditorView) {
         this.schedule(0);
+        this.offServers = onServerSettled(() => {
+          retryNegativeInheritedMain();
+          this.schedule(0);
+        });
         // Redraw the markers with the new results (the gutter recomputes them on any update).
         this.unsubscribe = onTestStatesChanged(() => {
           if (view.state.field(targetsField).length) view.dispatch({ effects: testStatesChanged.of(null) });
@@ -223,10 +232,26 @@ export function runGutter(ctx: EditorDocContext): Extension {
             cur.length === found.length &&
             cur.every((t, i) => t.pos === found[i]!.pos && t.name === found[i]!.name && t.kind === found[i]!.kind);
           if (!same) view.dispatch({ effects: setTargets.of(found) });
+          this.resolveInherited(view.state.doc.toString());
         }, delay);
       }
+      /** Classes that may inherit a `main`: ask the language server, then redraw if one does. */
+      resolveInherited(text: string) {
+        if (this.resolving || !path.endsWith(".java")) return;
+        const pending = unresolvedCandidates(path, text);
+        if (!pending.length) return;
+        this.resolving = true;
+        resolveCandidates(path, pending)
+          .then((found) => {
+            if (found && !this.destroyed) this.schedule(0);
+          })
+          .catch(() => {})
+          .finally(() => (this.resolving = false));
+      }
       destroy() {
         clearTimeout(this.timer);
+        this.destroyed = true;
+        this.offServers();
         this.unsubscribe();
       }
     },
diff --git a/src/features/run/services.test.ts b/src/features/run/services.test.ts
index 8a5ceb93..2072ecf8 100644
--- a/src/features/run/services.test.ts
+++ b/src/features/run/services.test.ts
@@ -1,8 +1,25 @@
-import { beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { RunConfig } from "@/platform/ipc";
-import { DEFAULT_TYPES, readRan, readTypes, runServiceItems, sessionDetail, sessionStatus } from "./services";
+import { useProject } from "@/platform/project";
+
+const ipc = vi.hoisted(() => ({ runConfigs: vi.fn() }));
+vi.mock("@/platform/ipc", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@/platform/ipc")>()),
+  isTauri: () => true,
+  commands: ipc,
+}));
+
+import {
+  cleanupRemovedProject,
+  DEFAULT_TYPES,
+  readRan,
+  readTypes,
+  runServiceItems,
+  sessionDetail,
+  sessionStatus,
+} from "./services";
 import { startedPort } from "./serverPort";
-import type { RunSession } from "./store";
+import { useRun, type RunSession } from "./store";
 import type { DebugServiceSession } from "@/workbench/contributions";
 
 const config = (id: string, kind: string): RunConfig => ({
@@ -248,9 +265,58 @@ describe("embedded web server port", () => {
     expect(startedPort("o.s.b.web.embedded.netty.NettyWebServer  : Netty started on port 9090")).toBe(9090);
     expect(startedPort("Netty started on port(s): 9091")).toBe(9091);
     expect(startedPort("Undertow started on port(s) 8082 (http)")).toBe(8082);
-    expect(startedPort("Jetty started on port 8083 (http/1.1) with context path '/'")).toBe(8083);
+    expect(startedPort("Jetty started on port 9083 (http/1.1) with context path '/'")).toBe(9083);
     expect(startedPort("Tomcat initialized with port 8080 (http)")).toBeNull();
     expect(startedPort("Started DemoApplication in 1.2 seconds")).toBeNull();
     expect(startedPort("Tomcat started on port 99999")).toBeNull();
   });
 });
+
+describe("removing a workspace member from Services", () => {
+  const main = { ...config("app", "spring-boot"), cwd: "/w/main" };
+  const vue = { ...config("dev", "npm"), cwd: "/w/vue" };
+
+  beforeEach(() => {
+    localStorage.clear();
+    useProject.setState({ project: { root: "/w/main" } as never });
+    ipc.runConfigs.mockImplementation(async () => ({ status: "ok", data: [main] }));
+  });
+  afterEach(() => {
+    useProject.setState({ project: null });
+    useRun.setState({ configs: [], sessions: [], temporary: [], selectedId: null });
+  });
+
+  it("stops and forgets the member's sessions and drops its empty type groups", async () => {
+    useRun.setState({
+      configs: [main, vue],
+      temporary: ["dev"],
+      sessions: [session("s1", main, "finished", 1), session("s2", vue, "running", 2, { runId: 7 })],
+    });
+    localStorage.setItem("openidea.services.runTypes:/w/main", JSON.stringify(["spring-boot", "npm"]));
+    localStorage.setItem("openidea.services.ran:/w/main", JSON.stringify(["app", "dev"]));
+
+    await cleanupRemovedProject("/w/vue");
+
+    const s = useRun.getState();
+    expect(s.sessions.map((x) => x.id)).toEqual(["s1"]);
+    expect(s.configs.map((c) => c.id)).toEqual(["app"]);
+    expect(s.temporary).toEqual([]);
+    expect(readTypes("/w/main")).toEqual(["spring-boot"]);
+    expect(readRan("/w/main")).toEqual(["app"]);
+    expect(ipc.runConfigs).toHaveBeenCalled();
+  });
+
+  it("keeps a type another project still uses, and a sibling with a shared prefix", async () => {
+    const other = { ...config("serve", "npm"), cwd: "/w/main" };
+    const sibling = { ...config("dev2", "npm"), cwd: "/w/vue2" };
+    useRun.setState({ configs: [main, other, vue, sibling], sessions: [] });
+    localStorage.setItem("openidea.services.runTypes:/w/main", JSON.stringify(["npm"]));
+    // What the backend lists once /w/vue is no longer a workspace member.
+    ipc.runConfigs.mockImplementation(async () => ({ status: "ok", data: [main, other, sibling] }));
+
+    await cleanupRemovedProject("/w/vue");
+
+    expect(useRun.getState().configs.map((c) => c.id)).toEqual(["app", "serve", "dev2"]);
+    expect(readTypes("/w/main")).toEqual(["npm"]);
+  });
+});
diff --git a/src/features/run/services.tsx b/src/features/run/services.tsx
index 3d31c201..41af0d17 100644
--- a/src/features/run/services.tsx
+++ b/src/features/run/services.tsx
@@ -29,7 +29,7 @@ import { commandLine, configIcon, KIND_OPTIONS, kindLabel } from "./configs";
 import { SessionPanel } from "./RunView";
 import { showApplicationUpdate } from "./applicationUpdate";
 import { isUpdatable } from "./updatePolicies";
-import { startRun, useRun, type RunSession } from "./store";
+import { loadConfigs, persistTemporary, startRun, stopSession, useRun, type RunSession } from "./store";
 import {
   currentServiceSession,
   currentServiceSessions,
@@ -137,6 +137,65 @@ export function recordRun(configId: string) {
   }
 }
 
+// ---------------------------------------------------------------------------
+// Project removal: a workspace member's data leaves with it
+
+/** Whether `path` is inside the directory `root` (a removed member, not a sibling with a shared prefix). */
+function insideRoot(path: string, root: string): boolean {
+  return path === root || path.startsWith(`${root}/`);
+}
+
+/**
+ * Drops a removed workspace member's data from Services: stops and forgets its
+ * sessions (a finished one still groups the tree), removes its temporary
+ * configurations, reloads (the backend no longer lists the member) and clears
+ * the added types and remembered runs that would otherwise render empty groups.
+ */
+export async function cleanupRemovedProject(removedRoot: string): Promise<void> {
+  const { configs, sessions, temporary } = useRun.getState();
+  const ofRemoved = (c: RunConfig) => !!c.cwd && insideRoot(c.cwd, removedRoot);
+  const removedIds = new Set(configs.filter(ofRemoved).map((c) => c.id));
+
+  const removedSessions = sessions.filter((s) => removedIds.has(s.config.id));
+  for (const s of removedSessions) if (busy(s)) await stopSession(s.id);
+  if (removedSessions.length) {
+    const ids = new Set(removedSessions.map((s) => s.id));
+    useRun.setState((s) => ({ sessions: s.sessions.filter((x) => !ids.has(x.id)) }));
+  }
+
+  if (temporary.some((id) => removedIds.has(id))) {
+    const temporaryLeft = temporary.filter((id) => !removedIds.has(id));
+    useRun.setState({
+      configs: useRun.getState().configs.filter((c) => !removedIds.has(c.id)),
+      temporary: temporaryLeft,
+    });
+    persistTemporary();
+  }
+
+  // The kinds the member had configurations of; after the reload those that are
+  // left without any (and without a session) are removed from the added types.
+  const kinds = new Set(configs.filter(ofRemoved).map((c) => c.kind));
+  await loadConfigs();
+
+  const { configs: fresh, sessions: liveSessions } = useRun.getState();
+  const liveKinds = new Set([...fresh.map((c) => c.kind), ...liveSessions.map((s) => s.config.kind)]);
+  for (const kind of kinds) if (!liveKinds.has(kind)) removeType(kind);
+
+  const root = useProject.getState().project?.root ?? null;
+  if (root) {
+    const freshIds = new Set(fresh.map((c) => c.id));
+    const ids = ranIds(root).filter((id) => freshIds.has(id));
+    if (ids.length !== ranIds(root).length) {
+      useRanConfigs.setState({ root, ids });
+      try {
+        localStorage.setItem(RAN_KEY + root, JSON.stringify(ids));
+      } catch {
+        /* storage unavailable */
+      }
+    }
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Tree
 
@@ -387,6 +446,7 @@ function RunDetail({ item }: { item: ServiceTreeItem }) {
         key={execution.run!.id}
         session={execution.run!}
         onRerun={d ? d.rerun : undefined}
+        onDebug={d ? d.rerun : undefined}
         onStop={d ? () => void stopServiceSessions([execution]) : undefined}
       />
     );
diff --git a/src/features/run/store.ts b/src/features/run/store.ts
index 1d139678..6c542050 100644
--- a/src/features/run/store.ts
+++ b/src/features/run/store.ts
@@ -42,7 +42,8 @@ import {
   type TestOutputParser,
 } from "./testing";
 import { GoTestOutput } from "./testing/go";
-import { TeamcityOutput } from "./testing/phpunit";
+import { moveToReportedClasses } from "./testing/jvm";
+import { TeamcityOutput } from "./testing/teamcity";
 import type { TestStdout } from "./testing/types";
 import { recordTestStates } from "./testing/states";
 import { failedTestPaths, leafTestPaths, rerunFailedConfig, testsConfig } from "./testing/rerun";
@@ -53,7 +54,7 @@ import { typeFor } from "./types";
 import { recordRun } from "./services";
 import { startedPort } from "./serverPort";
 import { tomcatBrowserUrl } from "./tomcat";
-import { gradleDelegation } from "./gradleRun";
+import { gradleDelegation, gradleTestLaunch } from "./gradleRun";
 import { openUrl } from "./navigate";
 import { tx } from "@/platform/i18n";
 
@@ -341,16 +342,17 @@ function writeTemporary(root: string, configs: RunConfig[]) {
 
 let persisting = 0;
 
-function persistTemporary() {
+export function persistTemporary() {
   const root = useProject.getState().project?.root;
   if (!root) return;
   const { configs, temporary } = useRun.getState();
   const list = temporary.map((id) => configs.find((c) => c.id === id)).filter((c): c is RunConfig => !!c);
   writeTemporary(root, list);
+  // A rewrite still pending from an earlier call must not bring back what was removed since.
+  const generation = ++persisting;
   if (!list.length || !isTauri()) return;
   // Then rewritten without what settings derived (the project's Maven, JDK, interpreter…), so a
   // later settings change reaches them as it does detected and saved configurations.
-  const generation = ++persisting;
   void call(commands.runWithoutDerived(list))
     .then((kept) => {
       if (generation === persisting && useProject.getState().project?.root === root) writeTemporary(root, kept);
@@ -432,6 +434,30 @@ export async function deleteConfig(id: string): Promise<void> {
   );
 }
 
+/**
+ * Edit Configurations' OK / Apply. A temporary configuration stays temporary unless it was edited
+ * there (then it is saved, as IDEA makes it permanent), and one removed there is forgotten.
+ */
+export async function saveEditedConfigs(draft: readonly RunConfig[], removedDetectedIds: string[] = []): Promise<void> {
+  const { configs, temporary } = useRun.getState();
+  const unchanged = (c: RunConfig) => {
+    const before = configs.find((o) => o.id === c.id);
+    return !!before && JSON.stringify(before) === JSON.stringify(c);
+  };
+  const kept = temporary.filter((id) => draft.some((c) => c.id === id && unchanged(c)));
+  if (kept.length !== temporary.length) {
+    useRun.setState({
+      configs: configs.filter((c) => !temporary.includes(c.id) || kept.includes(c.id)),
+      temporary: kept,
+    });
+    persistTemporary();
+  }
+  await saveUserConfigs(
+    draft.filter((c) => !c.detected && !kept.includes(c.id)),
+    removedDetectedIds,
+  );
+}
+
 /** Persists user configurations and reloads the merged list. */
 export async function saveUserConfigs(user: RunConfig[], removedDetectedIds: string[] = []): Promise<void> {
   user = await Promise.all(
@@ -541,8 +567,13 @@ function newRuntime(config: RunConfig): SessionRuntime {
     if (tests && parser) tests.apply(parser.feed(line));
   };
   const framework = tests && parser ? frameworkFor(config) : null;
+  // PHPUnit `--teamcity` and Gradle's test init script report through service messages.
   const stdout =
-    framework === "go" ? new GoTestOutput(feed) : framework === "phpunit" ? new TeamcityOutput(feed) : null;
+    framework === "go"
+      ? new GoTestOutput(feed)
+      : framework === "phpunit" || framework === "jvm"
+        ? new TeamcityOutput(feed)
+        : null;
   const runtime: SessionRuntime = {
     stdout,
     tests,
@@ -776,7 +807,8 @@ export async function startRun(
     if ((options.launch || launch.isTest) && launch.emulateTerminal) launch = { ...launch, emulateTerminal: false };
     if (launch.emulateTerminal) rt.terminal = new TerminalOutput();
     patchSession(sessionId, { terminal: !!launch.emulateTerminal });
-    const started = launch.isTest ? withTestReporting(launch) : launch;
+    const started = launch.isTest ? await gradleTestLaunch(withTestReporting(launch)) : launch;
+    if (runtimes.get(sessionId)?.generation !== generation) return getSession(sessionId) ?? null;
     const processStarted = performance.now();
     const info = await startWithRemedies(started, () => call(commands.runStart(started, channel)));
     console.info("Run process started", { name: config.name, ms: performance.now() - processStarted });
@@ -893,7 +925,16 @@ function finishSession(sessionId: string, code: number | null) {
       if (rt.tests && rt.parser) {
         rt.tests.apply(rt.parser.end?.() ?? []);
         // Surefire / Gradle print only failures and class totals: per-test results come from the XML reports.
-        if (frameworkFor(session.config) === "jvm") rt.tests.apply(await jvmReportEvents(session));
+        if (frameworkFor(session.config) === "jvm") {
+          const reports = await jvmReports(session);
+          const tests = rt.tests;
+          // Tests the run reported already (Gradle's init script, Surefire failures) keep their output.
+          tests.apply(testReportEvents(reports).filter((e) => !("path" in e) || !tests.hasResult(e.path)));
+          moveToReportedClasses(
+            rt.tests,
+            reports.map((r) => r.className),
+          );
+        }
         if (runtimes.get(sessionId) !== rt) return;
         rt.tests.finish(code);
         recordTestStates(rt.tests);
@@ -910,12 +951,11 @@ function finishSession(sessionId: string, code: number | null) {
   }, 30);
 }
 
-async function jvmReportEvents(session: RunSession): Promise<TestEvent[]> {
+async function jvmReports(session: RunSession): Promise<TestCaseReport[]> {
   if (!isTauri()) return [];
   try {
     // Report files are written during the run; allow for coarse file-system timestamps.
-    const reports = await call(commands.runTestReports(session.config.cwd ?? null, session.startedAt - 2000));
-    return testReportEvents(reports);
+    return await call(commands.runTestReports(session.config.cwd ?? null, session.startedAt - 2000));
   } catch {
     return [];
   }
@@ -933,7 +973,7 @@ export function testReportEvents(reports: readonly TestCaseReport[]): TestEvent[
     for (const line of text.split("\n").slice(0, 200)) events.push({ type: "output", path, line });
     const outer = r.className.split("$")[0]!;
     const frame = new RegExp(
-      `at (${outer.replace(/[.$]/g, "\\$&")}(?:\\$[\\w$]+)?)\\.[\\w$<>]+\\(([\\w$-]+\\.(?:java|kt|groovy|scala)):(\\d+)\\)`,
+      `at (?:\\S*/)?(${outer.replace(/[.$]/g, "\\$&")}(?:\\$[\\w$]+)?)\\.[^()\\n]+\\(([\\w$-]+\\.(?:java|kt|groovy|scala)):(\\d+)\\)`,
     ).exec(r.output ?? "");
     if (frame) events.push({ type: "location", path, location: jvmFrameTarget(frame[1], frame[2]!, Number(frame[3])) });
   }
@@ -1031,6 +1071,16 @@ export function rerunSession(sessionId: string) {
   if (session) void startRun(session.config, sessionId, session.baseConfig);
 }
 
+/**
+ * "Debug": relaunches the session's configuration in debug mode — the same
+ * `run.debugConfig` entry the Services view and the editor context menu use
+ * (`baseConfig` keeps the original configuration for derived launches).
+ */
+export function debugSession(sessionId: string) {
+  const session = getSession(sessionId);
+  if (session) void executeAction("run.debugConfig", session.baseConfig ?? session.config);
+}
+
 /** Paths of the failed tests of a session's last run. */
 export function failedTests(sessionId: string): string[][] {
   const tests = runtimes.get(sessionId)?.tests;
diff --git a/src/features/run/testing/comparison.test.ts b/src/features/run/testing/comparison.test.ts
index c5d38102..5a502693 100644
--- a/src/features/run/testing/comparison.test.ts
+++ b/src/features/run/testing/comparison.test.ts
@@ -10,6 +10,13 @@ describe("parseComparison", () => {
     expect(parseComparison(['expected: "a b"', ' but was: "a c"'])).toEqual({ expected: '"a b"', actual: '"a c"' });
   });
 
+  it("TestNG", () => {
+    expect(parseComparison(["java.lang.AssertionError: total expected [3] but found [2]"])).toEqual({
+      expected: "3",
+      actual: "2",
+    });
+  });
+
   it("kotlin.test", () => {
     expect(parseComparison(["java.lang.AssertionError: Expected <1>, actual <2>."])).toEqual({
       expected: "1",
diff --git a/src/features/run/testing/comparison.ts b/src/features/run/testing/comparison.ts
index 20b4fc26..18df71f0 100644
--- a/src/features/run/testing/comparison.ts
+++ b/src/features/run/testing/comparison.ts
@@ -21,6 +21,8 @@ export function parseComparison(output: readonly string[]): Comparison | null {
   // JUnit / opentest4j / AssertJ / Hamcrest-style: `expected: <x> but was: <y>`.
   if ((m = /expected:\s*(<[\s\S]*?>|\S[^\n]*?)\s*but was:\s*(<[\s\S]*?>|[^\n]*)/.exec(text)))
     return { expected: unwrap(m[1]!), actual: unwrap(m[2]!) };
+  // TestNG `Assert.assertEquals`: `expected [x] but found [y]`.
+  if ((m = /expected \[([\s\S]*?)\] but found \[([\s\S]*?)\]/.exec(text))) return { expected: m[1]!, actual: m[2]! };
   // kotlin.test: `Expected <x>, actual <y>.`
   if ((m = /Expected <([\s\S]*?)>, actual <([\s\S]*?)>/.exec(text))) return { expected: m[1]!, actual: m[2]! };
   // Rust `assert_eq!`: `  left: x` / ` right: y` (the macro doesn't say which one is expected).
diff --git a/src/features/run/testing/jvm.ts b/src/features/run/testing/jvm.ts
index b0344419..41cd021f 100644
--- a/src/features/run/testing/jvm.ts
+++ b/src/features/run/testing/jvm.ts
@@ -1,6 +1,11 @@
-/** Gradle test logging (`Class > method() PASSED`) and Maven Surefire reports. */
+/**
+ * Gradle test logging (`Class > method() PASSED`), the Gradle test init script's service messages
+ * (`gradleTests.gradle`) and Maven Surefire reports.
+ */
 import { jvmFrameTarget } from "../links";
-import { parseDuration, type TestEvent, type TestOutputParser } from "./types";
+import type { TestResults } from "./results";
+import { serviceMessage, type ServiceMessage } from "./teamcity";
+import { parseDuration, type TestEvent, type TestLocation, type TestOutputParser } from "./types";
 
 const GRADLE_RE = /^(\S[^>]*?(?:\s>\s[^>]+?)+)\s+(PASSED|FAILED|SKIPPED)(?:\s+\(([\d.]+\s*m?s)\))?$/;
 const GRADLE_SUMMARY_RE = /^(\d+) tests? completed(?:, (\d+) failed)?(?:, (\d+) skipped)?/;
@@ -14,10 +19,62 @@ const SUREFIRE2_RE = /^(?:\[\w+\]\s+)?([\w$]+)\(([\w$.]+)\)\s+Time elapsed: ([\d
 const SUREFIRE_CLASS_RE =
   /^(?:\[\w+\]\s+)?Tests run: (\d+), Failures: (\d+), Errors: (\d+), Skipped: (\d+), Time elapsed: ([\d.]+ s(?:ec)?).*?(?:-- in |- in )([\w$.]+)\s*$/;
 const SUREFIRE_TOTAL_RE = /^(?:\[\w+\]\s+)?Tests run: (\d+), Failures: (\d+), Errors: (\d+), Skipped: (\d+)\s*$/;
+// `at org.junit…`, also behind a class loader or module (`at app//org.junit…`, `at java.base@21/java.lang…`).
+const LIBRARY_FRAME_RE =
+  /^\s*at\s+(?:\S*\/)?(?:org\.junit|junit\.|org\.opentest4j|org\.testng|kotlin\.|jdk\.internal|java\.|javax\.|sun\.|org\.gradle)/;
+
+/** The source position of a stack frame in the project's code, null for library frames. */
+function frameLocation(line: string): TestLocation | null {
+  const f = FRAME_RE.exec(line);
+  if (!f || LIBRARY_FRAME_RE.test(line)) return null;
+  return f[2] ? jvmFrameTarget(f[1], f[2], Number(f[3])) : { path: f[4]!, line: Number(f[5]), resolve: "name" };
+}
+
+/**
+ * Test events of the init script's messages. Tests are `[class, method]`, named as in the XML reports
+ * (`add(int, int)[1]` → `add`); `outcomes` keeps each test's failure or skip until it finishes.
+ */
+function initScriptEvents({ kind, attrs }: ServiceMessage, outcomes: Map<string, "failed" | "skipped">): TestEvent[] {
+  if (!attrs.className || !attrs.name) return [];
+  const path = [attrs.className, attrs.name.split("(")[0]!.trim() || attrs.name];
+  const key = path.join("\0");
+  // A parameterized method's invocations share its node: one failure fails the method.
+  const failed = outcomes.get(key) === "failed";
+  switch (kind) {
+    case "testStarted":
+      if (!failed) outcomes.delete(key);
+      return [{ type: "start", path }];
+    case "testStdOut":
+    case "testStdErr": {
+      const text = (attrs.out ?? "").replace(/\r?\n$/, "");
+      return text ? text.split(/\r?\n/).map((line) => ({ type: "output", path, line })) : [];
+    }
+    case "testFailed": {
+      outcomes.set(key, "failed");
+      const lines = (attrs.details || attrs.message || "").split("\n");
+      const events: TestEvent[] = lines.map((line) => ({ type: "output", path, line }));
+      const location = lines.map(frameLocation).find((l) => l);
+      if (location) events.push({ type: "location", path, location });
+      return events;
+    }
+    case "testIgnored":
+      if (!failed) outcomes.set(key, "skipped");
+      return [];
+    case "testFinished": {
+      const status = outcomes.get(key) ?? "passed";
+      const durationMs = attrs.duration ? Number(attrs.duration) : undefined;
+      return [{ type: "result", path, status, ...(durationMs === undefined ? {} : { durationMs }) }];
+    }
+  }
+  return [];
+}
 
 export function jvmParser(): TestOutputParser {
   let failure: string[] | null = null;
   let located = false;
+  /** The init script reports every test: Gradle's own test logging would repeat them by simple class name. */
+  let reported = false;
+  const outcomes = new Map<string, "failed" | "skipped">();
 
   const startFailure = (path: string[]) => {
     failure = path;
@@ -27,9 +84,20 @@ export function jvmParser(): TestOutputParser {
   return {
     feed(line) {
       const events: TestEvent[] = [];
+      const message = serviceMessage(line);
+      if (message) {
+        reported = true;
+        failure = null;
+        return initScriptEvents(message, outcomes);
+      }
       let m: RegExpExecArray | null;
       if ((m = GRADLE_RE.exec(line.trim())) && !line.startsWith(" ")) {
-        const path = m[1]!.split(/\s+>\s+/);
+        if (reported) {
+          failure = null;
+          return events;
+        }
+        // `method()` is a JUnit 5 display name; the reports name the method.
+        const path = m[1]!.split(/\s+>\s+/).map((p, i, all) => (i === all.length - 1 ? p.replace(/\(\)$/, "") : p));
         const status = m[2] === "PASSED" ? "passed" : m[2] === "FAILED" ? "failed" : "skipped";
         events.push({ type: "result", path, status, durationMs: parseDuration(m[3]) });
         if (status === "failed") startFailure(path);
@@ -79,23 +147,29 @@ export function jvmParser(): TestOutputParser {
           return events;
         }
         events.push({ type: "output", path: failure, line });
-        const f = FRAME_RE.exec(line);
-        const libraryFrame =
-          /^\s*at\s+(?:org\.junit|junit\.|org\.opentest4j|kotlin\.|jdk\.internal|java\.|javax\.|sun\.|org\.gradle)/.test(
-            line,
-          );
-        if (f && !located && !libraryFrame) {
+        const location = located ? null : frameLocation(line);
+        if (location) {
           located = true;
-          events.push({
-            type: "location",
-            path: failure,
-            location: f[2]
-              ? jvmFrameTarget(f[1], f[2], Number(f[3]))
-              : { path: f[4]!, line: Number(f[5]), resolve: "name" },
-          });
+          events.push({ type: "location", path: failure, location });
         }
       }
       return events;
     },
   };
 }
+
+/**
+ * Gradle's console names a test class by its simple name and its XML reports by the
+ * qualified one: moves the console's results to the reported class.
+ */
+export function moveToReportedClasses(tests: TestResults, classNames: readonly string[]) {
+  const bySimpleName = new Map<string, string | null>();
+  for (const c of new Set(classNames)) {
+    const simple = c.slice(c.lastIndexOf(".") + 1);
+    if (simple !== c) bySimpleName.set(simple, bySimpleName.has(simple) ? null : c);
+  }
+  for (const root of [...tests.roots]) {
+    const qualified = bySimpleName.get(root.name);
+    if (qualified) tests.move([root.name], [qualified]);
+  }
+}
diff --git a/src/features/run/testing/parsers.test.ts b/src/features/run/testing/parsers.test.ts
index 95e15fbc..50b435a4 100644
--- a/src/features/run/testing/parsers.test.ts
+++ b/src/features/run/testing/parsers.test.ts
@@ -13,6 +13,7 @@ import {
   TestResults,
   type TestOutputParser,
 } from "./index";
+import { moveToReportedClasses } from "./jvm";
 
 function results(parser: TestOutputParser, text: string) {
   const r = new TestResults();
@@ -365,16 +366,86 @@ OrderControllerTest > Paging > firstPage() SKIPPED
 3 tests completed, 1 failed, 1 skipped
 `,
     );
-    expect(leaf(r, "OrderControllerTest", "shouldListOrders()")?.own).toBe("passed");
-    expect(leaf(r, "OrderControllerTest", "shouldCreateOrder()")?.location).toEqual({
+    expect(leaf(r, "OrderControllerTest", "shouldListOrders")?.own).toBe("passed");
+    expect(leaf(r, "OrderControllerTest", "shouldCreateOrder")?.location).toEqual({
       path: "OrderControllerTest.kt",
       line: 22,
       resolve: "name",
     });
-    expect(leaf(r, "OrderControllerTest", "Paging", "firstPage()")?.own).toBe("skipped");
+    expect(leaf(r, "OrderControllerTest", "Paging", "firstPage")?.own).toBe("skipped");
     expect(r.summary).toMatchObject({ passed: 1, failed: 1, skipped: 1 });
   });
 
+  it("moves gradle's console results to the reported classes", () => {
+    const r = results(
+      jvmParser(),
+      `OrderTest > creates order() FAILED
+    org.opentest4j.AssertionFailedError at OrderTest.kt:22
+`,
+    );
+    r.apply([
+      { type: "result", path: ["com.acme.OrderTest", "lists"], status: "passed" },
+      { type: "result", path: ["com.acme.OrderTest", "creates order"], status: "failed" },
+      { type: "result", path: ["com.acme.UserTest", "loads"], status: "passed" },
+      { type: "result", path: ["com.other.UserTest", "loads"], status: "passed" },
+    ]);
+    moveToReportedClasses(r, ["com.acme.OrderTest", "com.acme.UserTest", "com.other.UserTest"]);
+    expect(r.roots.map((n) => n.name)).toEqual(["com.acme.OrderTest", "com.acme.UserTest", "com.other.UserTest"]);
+    const failed = leaf(r, "com.acme.OrderTest", "creates order")!;
+    expect(failed.own).toBe("failed");
+    expect(failed.location).toMatchObject({ path: "OrderTest.kt", line: 22 });
+    expect(failed.output).not.toEqual([]);
+    expect(r.counts()).toMatchObject({ passed: 3, failed: 1 });
+    expect(r.get("OrderTest")).toBeUndefined();
+  });
+
+  it("reports each test from the gradle init script's service messages", () => {
+    const parser = jvmParser();
+    const r = results(
+      parser,
+      `> Task :test
+##teamcity[testStarted name='addsZero()' className='demo.CalcTest']
+##teamcity[testStdOut name='addsZero()' className='demo.CalcTest' out='adding zero|n']
+##teamcity[testFinished name='addsZero()' className='demo.CalcTest' duration='11']
+##teamcity[testStarted name='fails()' className='demo.CalcTest']
+##teamcity[testFailed name='fails()' className='demo.CalcTest' message='boom' details='org.opentest4j.AssertionFailedError: boom|n\tat app//org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197)|n\tat app//demo.CalcTest.fails(CalcTest.java:21)|n']
+##teamcity[testFinished name='fails()' className='demo.CalcTest' duration='4']
+CalcTest > fails() FAILED
+    org.opentest4j.AssertionFailedError at CalcTest.java:21
+##teamcity[testStarted name='add(int)|[1|]' className='demo.ParamTest']
+##teamcity[testFailed name='add(int)|[1|]' className='demo.ParamTest' message='no' details='no']
+##teamcity[testFinished name='add(int)|[1|]' className='demo.ParamTest' duration='1']
+##teamcity[testStarted name='add(int)|[2|]' className='demo.ParamTest']
+##teamcity[testFinished name='add(int)|[2|]' className='demo.ParamTest' duration='1']
+##teamcity[testStarted name='later()' className='demo.ParamTest']
+##teamcity[testIgnored name='later()' className='demo.ParamTest']
+##teamcity[testFinished name='later()' className='demo.ParamTest' duration='0']
+`,
+    );
+    // Named like the XML reports, and not repeated under Gradle's simple class name.
+    expect(r.roots.map((n) => n.name)).toEqual(["demo.CalcTest", "demo.ParamTest"]);
+    expect(leaf(r, "demo.CalcTest", "addsZero")).toMatchObject({
+      own: "passed",
+      durationMs: 11,
+      output: ["adding zero"],
+    });
+    const failed = leaf(r, "demo.CalcTest", "fails")!;
+    expect(failed.own).toBe("failed");
+    expect(failed.output[0]).toBe("org.opentest4j.AssertionFailedError: boom");
+    expect(failed.location).toMatchObject({ path: "demo/CalcTest.java", line: 21, className: "demo.CalcTest" });
+    expect(leaf(r, "demo.ParamTest", "add")?.own).toBe("failed");
+    expect(leaf(r, "demo.ParamTest", "later")?.own).toBe("skipped");
+    expect(r.hasResult(["demo.CalcTest", "fails"])).toBe(true);
+    expect(r.hasResult(["demo.CalcTest", "other"])).toBe(false);
+  });
+
+  it("shows a test as running from its start", () => {
+    const r = new TestResults();
+    r.apply(jvmParser().feed("##teamcity[testStarted name='slow()' className='demo.SlowTest']"));
+    expect(leaf(r, "demo.SlowTest", "slow")?.own).toBe("running");
+    expect(r.hasResult(["demo.SlowTest", "slow"])).toBe(false);
+  });
+
   it("parses surefire reports", () => {
     const r = results(
       jvmParser(),
@@ -400,6 +471,24 @@ org.opentest4j.AssertionFailedError: expected: <3> but was: <2>
     expect(r.get("com.acme.UserTest")?.own).toBe("passed");
     expect(r.summary).toMatchObject({ passed: 2, failed: 1 });
   });
+
+  it("locates a TestNG failure in the test, past TestNG's own frames", () => {
+    const r = results(
+      jvmParser(),
+      `[INFO] Running com.acme.PriceTest
+[ERROR] Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.2 s <<< FAILURE! -- in com.acme.PriceTest
+[ERROR] com.acme.PriceTest.rounds -- Time elapsed: 0.01 s <<< FAILURE!
+java.lang.AssertionError: expected [3] but found [2]
+	at org.testng.Assert.fail(Assert.java:111)
+	at org.testng.Assert.assertEquals(Assert.java:1080)
+	at com.acme.PriceTest.rounds(PriceTest.java:12)
+`,
+    );
+    expect(leaf(r, "com.acme.PriceTest", "rounds")?.location).toMatchObject({
+      path: "com/acme/PriceTest.java",
+      line: 12,
+    });
+  });
 });
 
 describe("parser selection", () => {
diff --git a/src/features/run/testing/phpunit.test.ts b/src/features/run/testing/phpunit.test.ts
index 8a72967f..1cf26046 100644
--- a/src/features/run/testing/phpunit.test.ts
+++ b/src/features/run/testing/phpunit.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { createTestParser, frameworkFor, withTestReporting } from "./index";
-import { phpunitArgs, phpunitFilter, phpunitParser, TeamcityOutput, withTeamcity } from "./phpunit";
+import { phpunitArgs, phpunitFilter, phpunitParser, withTeamcity } from "./phpunit";
+import { TeamcityOutput } from "./teamcity";
 import { TestResults } from "./results";
 import type { TestEvent } from "./types";
 
diff --git a/src/features/run/testing/phpunit.ts b/src/features/run/testing/phpunit.ts
index eaf986c8..c6fdbe81 100644
--- a/src/features/run/testing/phpunit.ts
+++ b/src/features/run/testing/phpunit.ts
@@ -3,24 +3,8 @@
  * suite and test event, with the exact `Class::method` names and failure details. Tests are reported as
  * `[...suites, test]`: the configured suite (`Unit`), the class, then the method (with its data set).
  */
-import { TestStdout, type TestEvent, type TestOutputParser } from "./types";
-
-const MESSAGE_RE = /^\s*##teamcity\[(\w+)((?:\s+[\w.-]+='(?:[^|']|\|.)*')*)\s*\]\s*$/;
-const ATTR_RE = /([\w.-]+)='((?:[^|']|\|.)*)'/g;
-
-/** TeamCity escapes: `|n` `|r` `|'` `|[` `|]` `||` and `|0xNNNN`. */
-function unescape(value: string): string {
-  return value.replace(/\|(0x[0-9a-fA-F]{4}|.)/g, (_, c: string) => {
-    if (c.startsWith("0x")) return String.fromCharCode(Number.parseInt(c, 16));
-    return c === "n" ? "\n" : c === "r" ? "\r" : c;
-  });
-}
-
-function attributes(text: string): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const m of text.matchAll(ATTR_RE)) out[m[1]!] = unescape(m[2]!);
-  return out;
-}
+import { serviceMessage } from "./teamcity";
+import type { TestEvent, TestOutputParser } from "./types";
 
 /** `php_qn:///app/tests/FooTest.php::\App\FooTest::testBar` → the file. */
 function hintFile(hint: string | undefined): string | null {
@@ -51,10 +35,9 @@ export function phpunitParser(): TestOutputParser {
 
   return {
     feed(line) {
-      const m = MESSAGE_RE.exec(line);
-      if (!m) return [];
-      const kind = m[1]!;
-      const a = attributes(m[2] ?? "");
+      const message = serviceMessage(line);
+      if (!message) return [];
+      const { kind, attrs: a } = message;
       const name = a.name ?? "";
       const events: TestEvent[] = [];
       switch (kind) {
@@ -188,10 +171,3 @@ export function phpunitFilter(paths: readonly (readonly string[])[]): string {
   }
   return `/(${[...parts].join("|")})$/`;
 }
-
-/** Console text of a `--teamcity` run: the service messages only feed the test tree, as in PhpStorm. */
-export class TeamcityOutput extends TestStdout {
-  constructor(feedLine: (line: string) => void) {
-    super(feedLine, (line) => (MESSAGE_RE.test(line) ? "" : line + "\n"));
-  }
-}
diff --git a/src/features/run/testing/results.ts b/src/features/run/testing/results.ts
index 2e31412b..e0c75aca 100644
--- a/src/features/run/testing/results.ts
+++ b/src/features/run/testing/results.ts
@@ -68,6 +68,12 @@ export class TestResults {
     return this.byId.get(id);
   }
 
+  /** The test at `path` has finished with a result. */
+  hasResult(path: readonly string[]): boolean {
+    const own = this.byId.get(path.join(SEP))?.own;
+    return !!own && own !== "running";
+  }
+
   /** Finds a test by a suffix of its path (pytest failure headers name `Class.test`). */
   findBySuffix(suffix: string[]): TestNode | undefined {
     let best: TestNode | undefined;
@@ -81,6 +87,26 @@ export class TestResults {
     return best;
   }
 
+  /** Moves the subtree at `from` to `into`, merging it with what is already there. */
+  move(from: string[], into: string[]) {
+    const source = this.byId.get(from.join(SEP));
+    if (!source || from.join(SEP) === into.join(SEP)) return;
+    this.version++;
+    const parent = from.length > 1 ? this.byId.get(from.slice(0, -1).join(SEP))?.children : this.roots;
+    parent?.splice(parent.indexOf(source), 1);
+    this.mergeInto(source, into);
+  }
+
+  private mergeInto(source: TestNode, into: string[]) {
+    this.byId.delete(source.id);
+    const target = this.node(into);
+    if (source.own && (!target.own || source.own === "failed")) target.own = source.own;
+    target.durationMs ??= source.durationMs;
+    target.location ??= source.location;
+    if (target.output.length === 0) target.output = source.output;
+    for (const child of source.children) this.mergeInto(child, [...into, child.name]);
+  }
+
   apply(events: readonly TestEvent[]) {
     if (events.length === 0) return;
     this.version++;
diff --git a/src/features/run/testing/teamcity.ts b/src/features/run/testing/teamcity.ts
new file mode 100644
index 00000000..cbb495b7
--- /dev/null
+++ b/src/features/run/testing/teamcity.ts
@@ -0,0 +1,37 @@
+/**
+ * TeamCity service messages (`##teamcity[testStarted name='…' …]`): PHPUnit's `--teamcity` output and
+ * the Gradle test init script (`gradleTests.gradle`) report each test with them.
+ */
+import { TestStdout } from "./types";
+
+const MESSAGE_RE = /^\s*##teamcity\[(\w+)((?:\s+[\w.-]+='(?:[^|']|\|.)*')*)\s*\]\s*$/;
+const ATTR_RE = /([\w.-]+)='((?:[^|']|\|.)*)'/g;
+
+/** TeamCity escapes: `|n` `|r` `|'` `|[` `|]` `||` and `|0xNNNN`. */
+function unescape(value: string): string {
+  return value.replace(/\|(0x[0-9a-fA-F]{4}|.)/g, (_, c: string) => {
+    if (c.startsWith("0x")) return String.fromCharCode(Number.parseInt(c, 16));
+    return c === "n" ? "\n" : c === "r" ? "\r" : c;
+  });
+}
+
+export interface ServiceMessage {
+  kind: string;
+  attrs: Record<string, string>;
+}
+
+/** The service message on `line`, or null for any other output. */
+export function serviceMessage(line: string): ServiceMessage | null {
+  const m = MESSAGE_RE.exec(line);
+  if (!m) return null;
+  const attrs: Record<string, string> = {};
+  for (const a of (m[2] ?? "").matchAll(ATTR_RE)) attrs[a[1]!] = unescape(a[2]!);
+  return { kind: m[1]!, attrs };
+}
+
+/** Console text of a run reporting through service messages: the messages only feed the test tree. */
+export class TeamcityOutput extends TestStdout {
+  constructor(feedLine: (line: string) => void) {
+    super(feedLine, (line) => (MESSAGE_RE.test(line) ? "" : line + "\n"));
+  }
+}
diff --git a/src/features/run/types.ts b/src/features/run/types.ts
index a90bcc5a..6216e32f 100644
--- a/src/features/run/types.ts
+++ b/src/features/run/types.ts
@@ -13,6 +13,7 @@ import {
   gradleForkedJvm,
   isWindows,
   mavenForkedJvm,
+  ROOT_MODULE,
   springBootType,
   type ForkedJvm,
 } from "./jvmTypes";
@@ -505,9 +506,12 @@ export function withParams(config: RunConfig, params: Record<string, string>, ty
     ...(params.goKind ? { isTest: params.goKind === "test" } : {}),
     command: line.command,
     args: line.args,
-    ...(isJvmApplication(config) && parseJavaArgs(config.args).mainClass !== parseJavaArgs(line.args).mainClass
-      ? { module: undefined }
-      : {}),
+    // "Use classpath of module": the chosen module; else it is found again for another main class.
+    ...(isJvmApplication(config) && params.module
+      ? { module: params.module === ROOT_MODULE ? "" : params.module }
+      : isJvmApplication(config) && parseJavaArgs(config.args).mainClass !== parseJavaArgs(line.args).mainClass
+        ? { module: undefined }
+        : {}),
     ...(type?.ownsWorkingDirectory ? { cwd: line.cwd ?? null } : {}),
     ...(line.stop ? { stopCommand: line.stop } : {}),
   };
diff --git a/src/features/scratch/__tests__/scratch.test.tsx b/src/features/scratch/__tests__/scratch.test.tsx
index 016a487d..c447b132 100644
--- a/src/features/scratch/__tests__/scratch.test.tsx
+++ b/src/features/scratch/__tests__/scratch.test.tsx
@@ -4,14 +4,26 @@ import userEvent from "@testing-library/user-event";
 import { getAction } from "@/platform/actions";
 import { onIdeEvent } from "@/platform/ipc";
 import { useProjectViewRoots } from "@/workbench/contributions";
-import { chooserRows, pushRecent, scratchFileName, scratchLanguages, type ScratchLanguage } from "../model";
+import {
+  chooserRows,
+  pushRecent,
+  scratchContent,
+  scratchFileName,
+  scratchLanguages,
+  type ScratchLanguage,
+} from "../model";
 import { createScratch, setScratchBackend, tauriScratchBackend, type ScratchBackend } from "../scratches";
 import { useScratch } from "../store";
 import { ScratchChooserHost } from "../ScratchChooser";
 import { activate } from "..";
 
 const LANGS: ScratchLanguage[] = scratchLanguages([
-  { id: "java", name: "Java", extensions: ["java"] },
+  {
+    id: "java",
+    name: "Java",
+    extensions: ["java"],
+    scratchTemplate: "class Scratch {\n    public static void main(String[] args) {\n        $END$\n    }\n}\n",
+  },
   { id: "python", name: "Python", extensions: ["py", "pyi"] },
   { id: "javascript", name: "JavaScript", extensions: ["js", "mjs"] },
   { id: "plaintext", name: "Plain Text", extensions: ["txt"] },
@@ -27,6 +39,22 @@ describe("scratch naming", () => {
   });
 });
 
+describe("scratch content", () => {
+  it("starts from the language's template with the caret at $END$", () => {
+    const cases: [string | undefined, string, { line: number; col: number } | null][] = [
+      [undefined, "", null],
+      ["", "", null],
+      ["fn main() {\n    $END$\n}\n", "fn main() {\n    \n}\n", { line: 1, col: 4 }],
+      ["package main\n\nfunc main() {\n\t$END$\n}\n", "package main\n\nfunc main() {\n\t\n}\n", { line: 3, col: 1 }],
+      ["$END$x", "x", { line: 0, col: 0 }],
+      ["// é\n$END$ $END$", "// é\n ", { line: 1, col: 0 }],
+      ["no caret\n", "no caret\n", null],
+    ];
+    for (const [template, text, caret] of cases)
+      expect(scratchContent(template), String(template)).toEqual({ text, caret });
+  });
+});
+
 describe("language chooser rows", () => {
   it("keeps languages with an extension, sorted by name, first extension wins", () => {
     expect(LANGS.map((l) => `${l.name}:${l.ext}`)).toEqual([
@@ -62,20 +90,30 @@ describe("language chooser rows", () => {
 
 describe("creating scratch files", () => {
   let files: Set<string>;
+  let contents: Map<string, string>;
   let opened: string[];
+  let carets: ({ line: number; col: number } | null)[];
   let backend: ScratchBackend;
   beforeEach(() => {
     localStorage.clear();
     useScratch.setState({ languages: null, recent: [] });
     files = new Set(["/data/scratches/scratch.java"]);
+    contents = new Map();
     opened = [];
+    carets = [];
     backend = {
       dataDir: async () => "/data/",
       listNames: async (dir) => [...files].filter((f) => f.startsWith(dir + "/")).map((f) => f.slice(dir.length + 1)),
       createDir: async () => {},
-      createFile: async (p) => void files.add(p),
+      createFile: async (p, text) => {
+        files.add(p);
+        contents.set(p, text);
+      },
       languages: async () => LANGS,
-      open: async (p) => void opened.push(p),
+      open: async (p, caret) => {
+        opened.push(p);
+        carets.push(caret);
+      },
     };
     setScratchBackend(backend);
   });
@@ -91,6 +129,16 @@ describe("creating scratch files", () => {
     expect(opened).toEqual(["/data/scratches/scratch_1.java"]);
   });
 
+  it("fills a new scratch from its language's template, caret in the body; others start empty", async () => {
+    await createScratch(LANGS.find((l) => l.id === "java")!);
+    await createScratch(LANGS.find((l) => l.id === "python")!);
+    expect(contents.get("/data/scratches/scratch_1.java")).toBe(
+      "class Scratch {\n    public static void main(String[] args) {\n        \n    }\n}\n",
+    );
+    expect(contents.get("/data/scratches/scratch.py")).toBe("");
+    expect(carets).toEqual([{ line: 2, col: 8 }, null]);
+  });
+
   it("registers the action and the Scratches root; the chooser creates the picked language", async () => {
     const dispose = activate();
     try {
diff --git a/src/features/scratch/model.ts b/src/features/scratch/model.ts
index f559271e..be6e4ea5 100644
--- a/src/features/scratch/model.ts
+++ b/src/features/scratch/model.ts
@@ -6,6 +6,8 @@ export interface ScratchLanguage {
   name: string;
   /** Extension (without the dot) new scratch files of this language get. */
   ext: string;
+  /** Initial content; `$END$` marks where the caret goes. */
+  template?: string;
 }
 
 /** IDEA's names: `scratch.<ext>`, then `scratch_1.<ext>`, `scratch_2.<ext>`… */
@@ -21,16 +23,34 @@ export function scratchFileName(existing: Iterable<string>, ext: string): string
 
 /** Languages a scratch file can be created for (those with an extension), by name. */
 export function scratchLanguages(
-  langs: ReadonlyArray<{ id: string; name: string; extensions: readonly string[] }>,
+  langs: ReadonlyArray<{ id: string; name: string; extensions: readonly string[]; scratchTemplate?: string | null }>,
 ): ScratchLanguage[] {
   const out: ScratchLanguage[] = [];
   for (const l of langs) {
     const ext = l.extensions.find((e) => e.trim())?.replace(/^\./, "");
-    if (ext) out.push({ id: l.id, name: l.name, ext });
+    if (ext) out.push({ id: l.id, name: l.name, ext, ...(l.scratchTemplate && { template: l.scratchTemplate }) });
   }
   return out.sort((a, b) => a.name.localeCompare(b.name, undefined, { sensitivity: "base" }));
 }
 
+const CARET = "$END$";
+
+/** A new scratch file's text and caret (0-based line, UTF-16 column) from its language's template. */
+export function scratchContent(template: string | undefined): {
+  text: string;
+  caret: { line: number; col: number } | null;
+} {
+  if (!template) return { text: "", caret: null };
+  const at = template.indexOf(CARET);
+  if (at < 0) return { text: template, caret: null };
+  const before = template.slice(0, at);
+  const lines = before.split("\n");
+  return {
+    text: before + template.slice(at + CARET.length).replaceAll(CARET, ""),
+    caret: { line: lines.length - 1, col: lines[lines.length - 1]!.length },
+  };
+}
+
 export interface LanguageRow {
   lang: ScratchLanguage;
   matches: number[] | null;
diff --git a/src/features/scratch/scratches.ts b/src/features/scratch/scratches.ts
index 864f5cfc..ef552c48 100644
--- a/src/features/scratch/scratches.ts
+++ b/src/features/scratch/scratches.ts
@@ -6,16 +6,16 @@
 import { IpcError, call, commands, emitLocalIdeEvent, isTauri } from "@/platform/ipc";
 import { ipcPath } from "@/platform/paths";
 import { editorService, notifications } from "@/workbench/contributions";
-import { scratchFileName, scratchLanguages, type ScratchLanguage } from "./model";
+import { scratchContent, scratchFileName, scratchLanguages, type ScratchLanguage } from "./model";
 
 export interface ScratchBackend {
   /** Absolute app data dir. */
   dataDir(): Promise<string>;
   listNames(dir: string): Promise<string[]>;
   createDir(dir: string): Promise<void>;
-  createFile(path: string): Promise<void>;
+  createFile(path: string, text: string): Promise<void>;
   languages(): Promise<ScratchLanguage[]>;
-  open(path: string): Promise<void>;
+  open(path: string, caret: { line: number; col: number } | null): Promise<void>;
 }
 
 export const tauriScratchBackend: ScratchBackend = {
@@ -26,9 +26,12 @@ export const tauriScratchBackend: ScratchBackend = {
   },
   listNames: async (dir) => (await call(commands.fsReadDir(dir))).map((e) => e.name),
   createDir: async (dir) => void (await call(commands.fsCreateDir(dir))),
-  createFile: async (path) => void (await call(commands.fsCreateFile(path))),
+  createFile: async (path, text) =>
+    void (await call(
+      text ? commands.fsCreateFileBytes(path, [...new TextEncoder().encode(text)]) : commands.fsCreateFile(path),
+    )),
   languages: async () => scratchLanguages(await commands.languages()),
-  open: (path) => editorService().openFile(path, { focus: true }),
+  open: (path, caret) => editorService().openFile(path, { focus: true, ...(caret && { selection: caret }) }),
 };
 
 let backend: ScratchBackend = tauriScratchBackend;
@@ -64,16 +67,17 @@ export function scratchesDir(): Promise<string> {
 
 export const scratchesAvailable = () => isTauri() || backend !== tauriScratchBackend;
 
-/** Creates `scratch[_n].<ext>` for `lang` and opens it; returns its path. */
+/** Creates `scratch[_n].<ext>` for `lang` from its template and opens it; returns its path. */
 export async function createScratch(lang: ScratchLanguage): Promise<string | null> {
   try {
     const dir = await scratchesDir();
     const name = scratchFileName(await backend.listNames(dir), lang.ext);
     const path = `${dir}/${name}`;
-    await backend.createFile(path);
+    const { text, caret } = scratchContent(lang.template);
+    await backend.createFile(path, text);
     // The file watcher covers the project only: tell the project view.
     emitLocalIdeEvent({ type: "fsChanged", created: [path], modified: [], removed: [] });
-    await backend.open(path);
+    await backend.open(path, caret);
     return path;
   } catch (e) {
     notifications().notify({
diff --git a/src/features/search/__tests__/dialogs.test.tsx b/src/features/search/__tests__/dialogs.test.tsx
index 202c6dff..46267849 100644
--- a/src/features/search/__tests__/dialogs.test.tsx
+++ b/src/features/search/__tests__/dialogs.test.tsx
@@ -65,6 +65,7 @@ const { showSearchEverywhere, hideSearchEverywhere, useSearchEverywhere, pushSea
   await import("../everywhere/store");
 const { FindInFilesOverlay } = await import("../find/FindInFiles");
 const { showFindPopup, hideFindPopup } = await import("../find/store");
+const { defaultPreset, useKeymap } = await import("@/platform/keymap");
 
 const tick = () => act(() => new Promise((r) => setTimeout(r, 100)));
 
@@ -476,13 +477,40 @@ describe("Recent Files multi-selection", () => {
 });
 
 describe("Find in Files dialog", () => {
-  it("streams results and previews the replacement", async () => {
+  it("streams results and highlights the matches while replacing, as IDEA", async () => {
     render(<FindInFilesOverlay />);
     act(() => showFindPopup(true, { query: "order" }));
     await act(() => new Promise((r) => setTimeout(r, 250)));
     expect(screen.getByText("1 match in 1 file")).toBeInTheDocument();
     fireEvent.change(screen.getByLabelText("Replace with"), { target: { value: "item" } });
-    expect(screen.getByText("item", { ignore: "script, style, textarea" })).toBeInTheDocument();
+    const matches = screen.getByRole("listbox", { name: "Matches" });
+    expect(matches.querySelector("mark")).not.toBeNull();
+    expect(matches.querySelector("del, ins")).toBeNull();
     expect(screen.getByRole("button", { name: "Replace All" })).toBeEnabled();
   });
+
+  it.each([
+    ["macos", ["⌥C", "⌥↓", "⇧⌘↵"], ["⌘↵", "⌥⇧↵"]],
+    ["linux", ["Alt+C", "Alt+Down", "Ctrl+Shift+Enter"], ["Ctrl+Enter", "Alt+Shift+Enter"]],
+    ["windows", ["Alt+C", "Alt+Down", "Ctrl+Shift+Enter"], ["Ctrl+Enter", "Alt+Shift+Enter"]],
+  ] as const)("spells its shortcuts the %s way", (os, [matchCase, history, newLine], [openKey, replaceAllKey]) => {
+    const previous = { os: usePlatform.getState().os, preset: useKeymap.getState().preset };
+    usePlatform.setState({ os });
+    useKeymap.setState({ preset: defaultPreset() });
+    try {
+      render(<FindInFilesOverlay />);
+      act(() => showFindPopup(true, { query: "order" }));
+      const shortcut = (name: string) =>
+        screen.getAllByRole("button", { name }).map((b) => b.getAttribute("data-tooltip-shortcut"));
+      expect(shortcut("Match Case")).toEqual([matchCase]);
+      expect(shortcut("Recent Searches")).toEqual([history, history]);
+      expect(shortcut("New Line")).toEqual([newLine, newLine]);
+      expect(document.querySelector("footer")!.textContent).toContain(`${openKey}Open in Find Window`);
+      expect(screen.getByRole("button", { name: "Replace All" })).toHaveAttribute("title", replaceAllKey);
+      if (os !== "macos") expect(document.querySelector("[role=dialog]")!.innerHTML).not.toMatch(/[⌘⌥⇧↵]/);
+    } finally {
+      usePlatform.setState({ os: previous.os });
+      useKeymap.setState({ preset: previous.preset });
+    }
+  });
 });
diff --git a/src/features/search/__tests__/fileMasks.test.ts b/src/features/search/__tests__/fileMasks.test.ts
new file mode 100644
index 00000000..f1230b36
--- /dev/null
+++ b/src/features/search/__tests__/fileMasks.test.ts
@@ -0,0 +1,46 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const extensions = [
+  { extension: "rs", files: 40 },
+  { extension: "md", files: 12 },
+  { extension: "lock", files: 9 },
+  { extension: "toml", files: 6 },
+  { extension: "png", files: 5 },
+  { extension: "json", files: 3 },
+  { extension: "yml", files: 2 },
+  { extension: "sh", files: 1 },
+];
+const languages = [
+  { id: "rust", extensions: ["rs"] },
+  { id: "markdown", extensions: ["md", "markdown"] },
+  { id: "toml", extensions: ["toml"] },
+  { id: "json", extensions: ["json"] },
+  { id: "yaml", extensions: ["yml", "yaml"] },
+  { id: "shell", extensions: ["sh"] },
+];
+
+vi.mock("@/platform/ipc", async (orig) => ({
+  ...(await orig<typeof import("@/platform/ipc")>()),
+  call: async (p: unknown) => p,
+  commands: {
+    indexFileExtensions: () => Promise.resolve(extensions),
+    languages: () => Promise.resolve(languages),
+  },
+}));
+
+const { recentMasks, refreshProjectMasks, rememberMask, useProjectMasks } = await import("../find/store");
+
+beforeEach(() => {
+  localStorage.clear();
+  useProjectMasks.setState({ masks: [] });
+});
+
+describe("file mask suggestions", () => {
+  it("are the project's most common language file types, recent masks first", async () => {
+    await refreshProjectMasks();
+    expect(useProjectMasks.getState().masks).toEqual(["*.rs", "*.md", "*.toml", "*.json", "*.yml"]);
+    rememberMask("*.toml");
+    rememberMask("!*Test*");
+    expect(recentMasks()).toEqual(["!*Test*", "*.toml", "*.rs", "*.md", "*.json", "*.yml"]);
+  });
+});
diff --git a/src/features/search/__tests__/findPopup.test.tsx b/src/features/search/__tests__/findPopup.test.tsx
index e2928ccc..bd27e709 100644
--- a/src/features/search/__tests__/findPopup.test.tsx
+++ b/src/features/search/__tests__/findPopup.test.tsx
@@ -63,8 +63,18 @@ vi.mock("@/platform/ipc", async (orig) => ({
 }));
 
 const { FindInFilesOverlay } = await import("../find/FindInFiles");
-const { findHistory, hideFindPopup, rememberFindString, runFindPopupCommand, showFindPopup, useFindPopup } =
-  await import("../find/store");
+const {
+  findHistory,
+  hideFindPopup,
+  rememberFindString,
+  runFindPopupCommand,
+  showFindPopup,
+  useFindPopup,
+  useProjectMasks,
+} = await import("../find/store");
+
+const { formatBinding } = await import("@/platform/keymap");
+const { usePlatform } = await import("@/platform/platformInfo");
 
 const settle = () => act(() => new Promise((r) => setTimeout(r, 250)));
 const selectedRows = () =>
@@ -92,6 +102,7 @@ beforeEach(() => {
     preserveCase: false,
     context: "any",
     replacement: "",
+    newTab: false,
   });
 });
 
@@ -206,7 +217,8 @@ describe("Find in Files popup", () => {
 });
 
 describe("outdated popup results", () => {
-  const results = () => screen.getByRole("listbox", { name: "Matches" }).parentElement!;
+  // The results box, whether it holds the list or the empty text.
+  const results = () => document.querySelector<HTMLElement>("[aria-busy]")!;
   const rowText = () =>
     within(screen.getByRole("listbox", { name: "Matches" }))
       .getAllByRole("option")
@@ -255,13 +267,14 @@ describe("outdated popup results", () => {
       expect(results()).not.toHaveAttribute("data-stale");
       expect(rowText()).toHaveLength(1);
       expect(screen.getByText("1 match in 1 file")).toBeInTheDocument();
-      expect(results().querySelector(replace ? "ins" : "mark")).not.toBeNull();
+      expect(results().querySelector("mark")).not.toBeNull();
+      expect(results().querySelector("del, ins")).toBeNull();
       if (replace) expect(screen.getByRole("button", { name: "Replace" })).toBeEnabled();
       await act(async () => finish(null));
     },
   );
 
-  it.each(["Replace", "Replace All in This File", "Replace All", "Enter", "All shortcut", "All mnemonic"])(
+  it.each(["Replace", "Replace All", "Enter", "All shortcut", "All mnemonic"])(
     "blocks %s during debounce and validation",
     async (action) => {
       render(<FindInFilesOverlay />);
@@ -318,12 +331,12 @@ describe("outdated popup results", () => {
     await settle();
     expect(results()).toHaveAttribute("data-stale", "true");
     expect(rowText()).toHaveLength(3);
-    const box = results();
     await act(async () => finish(null));
-    expect(box).not.toHaveAttribute("data-stale");
-    expect(screen.getByText("No matches")).toBeInTheDocument();
+    expect(results()).not.toHaveAttribute("data-stale");
+    // IDEA's header shows a count only while something matches.
+    expect(screen.queryByText(/\bmatch(es)? in\b/)).not.toBeInTheDocument();
     expect(screen.getByText("Nothing found")).toBeInTheDocument();
-    expect(within(box).queryAllByRole("option")).toHaveLength(0);
+    expect(within(results()).queryAllByRole("option")).toHaveLength(0);
     expect(screen.getByRole("button", { name: "Replace" })).toBeDisabled();
   });
 
@@ -354,3 +367,145 @@ describe("outdated popup results", () => {
     expect(replaced).toHaveLength(0);
   });
 });
+
+describe("footer, as IDEA", () => {
+  it("remembers Open results in new tab and passes it on; ⌥B toggles it", () => {
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false, { query: "order" }));
+    const box = screen.getByRole("checkbox", { name: "Open results in new tab" });
+    expect(box).not.toBeChecked();
+    fireEvent.keyDown(field(), { key: "b", code: "KeyB", altKey: true });
+    expect(box).toBeChecked();
+    expect(localStorage.getItem("openidea.search.findNewTab.v1")).toBe("true");
+    fireEvent.click(box);
+    expect(useFindPopup.getState().newTab).toBe(false);
+  });
+
+  it("keeps OpenIDEA's Replace preview: a diff in place of the code preview", async () => {
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false, { query: "order" }));
+    expect(screen.queryByRole("checkbox", { name: "Preview" })).not.toBeInTheDocument();
+    act(() => showFindPopup(true, { query: "order" }));
+    await settle();
+    expect(screen.getByRole("region", { name: "Preview" })).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("checkbox", { name: "Preview" }));
+    expect(screen.queryByRole("region", { name: "Preview" })).not.toBeInTheDocument();
+  });
+
+  it("names the result keys only for a multi-line query", () => {
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false, { query: "order" }));
+    expect(screen.queryByText(/to select usages$/)).not.toBeInTheDocument();
+    fireEvent.change(field(), { target: { value: "order\nitem" } });
+    expect(screen.getByText(/^Use .+ and .+ to select usages$/)).toBeInTheDocument();
+  });
+});
+
+describe("mnemonics, as IDEA", () => {
+  it("⌥P / ⌥M / ⌥D / ⌥S pick the scope tab, whose letter is underlined off macOS", () => {
+    const os = usePlatform.getState().os;
+    usePlatform.setState({ os: "linux" });
+    try {
+      render(<FindInFilesOverlay />);
+      act(() => showFindPopup(false, { query: "order" }));
+      expect(screen.getByRole("tab", { name: "In Project" }).querySelector("u")?.textContent).toBe("P");
+      for (const [code, tab] of [
+        ["KeyD", "directory"],
+        ["KeyS", "scope"],
+        ["KeyM", "module"],
+        ["KeyP", "project"],
+      ] as const) {
+        fireEvent.keyDown(field(), { key: code.slice(3).toLowerCase(), code, altKey: true });
+        expect(useFindPopup.getState().scopeTab).toBe(tab);
+      }
+    } finally {
+      usePlatform.setState({ os });
+    }
+  });
+});
+
+describe("file mask, as IDEA", () => {
+  it("turned on with nothing typed takes the first suggestion", () => {
+    useProjectMasks.setState({ masks: ["*.rs", "*.toml"] });
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false));
+    expect(screen.getByLabelText("File mask")).toHaveAttribute("placeholder", "*.rs");
+    fireEvent.click(screen.getByRole("checkbox", { name: "File mask:" }));
+    expect([useFindPopup.getState().maskEnabled, useFindPopup.getState().mask]).toEqual([true, "*.rs"]);
+  });
+});
+
+describe("layout, as IDEA", () => {
+  it("shows the preview only once something matches", async () => {
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false));
+    expect(screen.queryByRole("region", { name: "Preview" })).not.toBeInTheDocument();
+    fireEvent.change(field(), { target: { value: "order" } });
+    await settle();
+    expect(screen.getByRole("region", { name: "Preview" })).toBeInTheDocument();
+  });
+
+  it("is resizable and opens at the size it was left at", () => {
+    localStorage.setItem("openidea.search.findPopupSize.v1", JSON.stringify({ w: 700, h: 520 }));
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false));
+    const dialog = screen.getByRole("dialog");
+    expect([dialog.style.width, dialog.style.height]).toEqual(["700px", "520px"]);
+    expect(within(dialog).getByRole("separator", { name: "Resize" })).toBeInTheDocument();
+  });
+});
+
+describe("empty results, as IDEA", () => {
+  const findNothing = () => {
+    search = async () => null;
+  };
+
+  it("asks for a query while there is none", () => {
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false));
+    expect(screen.getByText("Type search query to find in files")).toBeInTheDocument();
+  });
+
+  it("names the one option in use and clears it", () => {
+    useFindPopup.setState({ maskEnabled: true, mask: "*.rs" });
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false));
+    expect(screen.getByText("No search text entered.")).toBeInTheDocument();
+    expect(screen.getByText("Search option used: File mask")).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Clear option" }));
+    expect(useFindPopup.getState().maskEnabled).toBe(false);
+    expect(screen.getByText("Type search query to find in files")).toBeInTheDocument();
+  });
+
+  it("lists every option in use with its key, and ⇧⌥⌫ clears them all", async () => {
+    findNothing();
+    useFindPopup.setState({ caseSensitive: true, wholeWord: true, context: "inComments" });
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false, { query: "absent" }));
+    await settle();
+    expect(screen.getByText("Nothing found.")).toBeInTheDocument();
+    expect(screen.getByText("Search options used:")).toBeInTheDocument();
+    expect(
+      screen.getByText(`Match Case ${formatBinding("Alt+C")} Words ${formatBinding("Alt+W")} Filter`),
+    ).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Clear all options" })).toBeInTheDocument();
+    fireEvent.keyDown(field(), { key: "Backspace", altKey: true, shiftKey: true });
+    const s = useFindPopup.getState();
+    expect([s.caseSensitive, s.wholeWord, s.isRegex, s.maskEnabled, s.context]).toEqual([
+      false,
+      false,
+      false,
+      false,
+      "any",
+    ]);
+  });
+
+  it("offers Search with Regex for a query that reads as one", async () => {
+    findNothing();
+    render(<FindInFilesOverlay />);
+    act(() => showFindPopup(false, { query: "fo+.*bar" }));
+    await settle();
+    fireEvent.click(screen.getByRole("button", { name: "Search with Regex" }));
+    expect(useFindPopup.getState().isRegex).toBe(true);
+  });
+});
diff --git a/src/features/search/__tests__/findWindow.test.ts b/src/features/search/__tests__/findWindow.test.ts
index 2b9ca980..16d3dc39 100644
--- a/src/features/search/__tests__/findWindow.test.ts
+++ b/src/features/search/__tests__/findWindow.test.ts
@@ -39,22 +39,29 @@ afterEach(disposeFindWindow);
 
 describe("Find tool window tabs", () => {
   it("reuses the selected tab unless it is pinned", () => {
-    const a = openInFindWindow(q("a"), "a", null, deps);
-    const b = openInFindWindow(q("b"), "b", null, deps);
+    const a = openInFindWindow(q("a"), "a", { deps });
+    const b = openInFindWindow(q("b"), "b", { deps });
     expect(useFindWindow.getState().tabs.map((t) => t.title)).toEqual(["b"]);
     expect(useFindWindow.getState().active).toBe(b);
     expect(b).not.toBe(a);
 
     pinFindTab(b, true);
-    const c = openInFindWindow(q("c"), "c", null, deps);
+    const c = openInFindWindow(q("c"), "c", { deps });
     expect(useFindWindow.getState().tabs.map((t) => t.title)).toEqual(["b", "c"]);
     expect(useFindWindow.getState().active).toBe(c);
 
     // Selecting the pinned tab again opens the next search beside it.
     useFindWindow.setState({ active: b });
-    openInFindWindow(q("d"), "d", null, deps);
+    openInFindWindow(q("d"), "d", { deps });
     expect(useFindWindow.getState().tabs.map((t) => t.title)).toEqual(["b", "c", "d"]);
   });
+
+  it("keeps the selected tab with IDEA's Open results in new tab", () => {
+    openInFindWindow(q("a"), "a", { deps });
+    const b = openInFindWindow(q("b"), "b", { deps, newTab: true });
+    expect(useFindWindow.getState().tabs.map((t) => t.title)).toEqual(["a", "b"]);
+    expect(useFindWindow.getState().active).toBe(b);
+  });
 });
 
 describe("buildFindTree", () => {
diff --git a/src/features/search/bookmarks/BookmarkPopups.tsx b/src/features/search/bookmarks/BookmarkPopups.tsx
index 10bf6c41..f30b1c1f 100644
--- a/src/features/search/bookmarks/BookmarkPopups.tsx
+++ b/src/features/search/bookmarks/BookmarkPopups.tsx
@@ -225,7 +225,7 @@ function BookmarksPopup() {
 
   const fileLabel = (path: string, dir: boolean) => (
     <span className={styles.fileRow}>
-      <Icon name={dir ? "folder" : fileIconName(basename(path))} size={14} />
+      <Icon name={dir ? "folder" : fileIconName(basename(path), path)} size={14} />
       <span className={styles.fileName}>{basename(path)}</span>
       <span className={styles.dim}>{root ? relPath(path) : path}</span>
     </span>
diff --git a/src/features/search/common/open.ts b/src/features/search/common/open.ts
index a11da385..6e3b890a 100644
--- a/src/features/search/common/open.ts
+++ b/src/features/search/common/open.ts
@@ -14,6 +14,11 @@ export async function openLocation(
   pos?: Position | null,
   options: Omit<OpenOptions, "selection"> = {},
 ): Promise<void> {
+  if (path.startsWith("git-log:")) {
+    const { executeAction } = await import("@/platform/actions");
+    await executeAction("vcs.log.revealBookmark", path);
+    return;
+  }
   const service = maybeEditorService();
   if (!service) {
     notifications().notify({
diff --git a/src/features/search/everywhere/FilterPopup.tsx b/src/features/search/everywhere/FilterPopup.tsx
index 41ccfef8..1bcb0fe1 100644
--- a/src/features/search/everywhere/FilterPopup.tsx
+++ b/src/features/search/everywhere/FilterPopup.tsx
@@ -5,7 +5,7 @@
  */
 import { useEffect, useMemo, useState } from "react";
 import { Button, Checkbox, Input, Popup, T, type PopupAnchor } from "@/ui";
-import { recentMasks } from "../find/store";
+import { recentMasks, refreshProjectMasks, useProjectMasks } from "../find/store";
 import { KIND_LABELS, kindsFor, type FilterTab, type SeFilters } from "./filters";
 import { loadLanguages } from "./deps";
 import { setSearchEverywhereFilter } from "./store";
@@ -135,6 +135,8 @@ export function FilterPopup({
 
 function MaskFilter({ mask, onClose }: { mask: string; onClose: () => void }) {
   const [value, setValue] = useState(mask);
+  const projectMasks = useProjectMasks((p) => p.masks);
+  useEffect(() => void refreshProjectMasks(), []);
   const apply = (m: string) => setSearchEverywhereFilter("text", { mask: m.trim() });
   return (
     <div className={styles.filterGroup}>
@@ -145,7 +147,7 @@ function MaskFilter({ mask, onClose }: { mask: string; onClose: () => void }) {
         id="se-file-mask"
         data-autofocus
         value={value}
-        placeholder="*.ts, !*.test.*"
+        placeholder={projectMasks[0] ?? ""}
         spellCheck={false}
         onChange={(e) => {
           setValue(e.target.value);
diff --git a/src/features/search/everywhere/SearchEverywhere.module.css b/src/features/search/everywhere/SearchEverywhere.module.css
index 4e573979..76a2445b 100644
--- a/src/features/search/everywhere/SearchEverywhere.module.css
+++ b/src/features/search/everywhere/SearchEverywhere.module.css
@@ -175,40 +175,6 @@
   color: var(--fg);
   tab-size: 2;
 }
-/* Lezer classHighlighter tokens of text hits (same colours as the Markdown preview). */
-.code :global(.tok-keyword),
-.code :global(.tok-modifier),
-.code :global(.tok-controlKeyword),
-.code :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.code :global(.tok-string),
-.code :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.code :global(.tok-number),
-.code :global(.tok-bool),
-.code :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.code :global(.tok-typeName),
-.code :global(.tok-className),
-.code :global(.tok-namespace) {
-  color: var(--syn-type);
-}
-.code :global(.tok-comment) {
-  color: var(--syn-comment);
-}
-.code :global(.tok-meta),
-.code :global(.tok-macroName) {
-  color: var(--syn-annotation);
-}
-.code :global(.tok-propertyName) {
-  color: var(--syn-property);
-}
-.code :global(.tok-variableName.tok-definition) {
-  color: var(--syn-function);
-}
 .repeat {
   color: var(--fg-faint);
 }
diff --git a/src/features/search/everywhere/SearchEverywhere.tsx b/src/features/search/everywhere/SearchEverywhere.tsx
index b991625f..c629fb68 100644
--- a/src/features/search/everywhere/SearchEverywhere.tsx
+++ b/src/features/search/everywhere/SearchEverywhere.tsx
@@ -4,7 +4,7 @@ import clsx from "clsx";
 import { actionToggled, executeAction, executeActionFrom, getAction } from "@/platform/actions";
 import type { ProjectFileSet } from "@/platform/ipc";
 import { tx as translate, useTx } from "@/platform/i18n";
-import { hasPrimaryModifier, registerKeyClaim, shortcutLabel } from "@/platform/keymap";
+import { formatBinding, hasPrimaryModifier, hostBinding, registerKeyClaim, shortcutLabel } from "@/platform/keymap";
 import {
   Checkbox,
   Dialog,
@@ -98,6 +98,7 @@ const INITIAL_SELECTION: Selection = { key: null, anchorKey: null, lead: -1, anc
 function SearchEverywhereDialog() {
   const tx = useTx();
   const tab = useSearchEverywhere((s) => s.tab);
+  const hint = hintFor(tab, tx);
   const query = useSearchEverywhere((s) => s.query);
   const includeNonProject = useSearchEverywhere((s) => s.includeNonProject);
   const fileSet = useSearchEverywhere((s) => s.fileSet);
@@ -339,7 +340,7 @@ function SearchEverywhereDialog() {
         ? [{ label: "Open Settings Page", run: () => activate(row) }]
         : [
             { label: "Open", run: () => activate(row) },
-            { label: "Open to the Side", shortcut: "⇧↵", run: () => activate(row, true) },
+            { label: "Open to the Side", shortcut: formatBinding("Shift+Enter"), run: () => activate(row, true) },
             { kind: "separator" },
             { label: "Copy Path", run: () => copy(row.path) },
             { label: "Copy Path from Project Root", run: () => copy(row.rel) },
@@ -503,7 +504,7 @@ function SearchEverywhereDialog() {
           size="small"
           className={styles.headerButton}
           title={tx("Open in Find Tool Window")}
-          shortcut={tab === "text" ? "⌘↵" : undefined}
+          shortcut={tab === "text" ? formatBinding(hostBinding("Meta+Enter")) : undefined}
           onClick={() => closeThen(() => void executeAction("find.inPath", { query: parsed.text }))}
         />
       </div>
@@ -513,7 +514,7 @@ function SearchEverywhereDialog() {
             type="button"
             className={styles.magnifier}
             aria-label={tx("Search history")}
-            title={tx("Search history (⌥↑ / ⌥↓)")}
+            title={tx`Search history (${formatBinding("Alt+Up")} / ${formatBinding("Alt+Down")})`}
             onMouseDown={(e) => e.preventDefault()}
             onClick={(e) => openHistory(e.currentTarget)}
           >
@@ -539,9 +540,9 @@ function SearchEverywhereDialog() {
             onKeyDown={onKeyDown}
           />
           {snap?.loading && !emptyQuery && <Spinner size={14} className={styles.spinner} />}
-          {hintFor(tab) && (
+          {hint && (
             <span className={styles.hint} aria-hidden>
-              <T>{hintFor(tab)}</T>
+              {hint}
             </span>
           )}
         </div>
@@ -645,7 +646,7 @@ function describe(row: SeRow | undefined): string {
     case "action": {
       const a = getAction(row.id);
       const text = a?.description ?? (row.category ? `${row.category} | ${row.title}` : row.title);
-      return `${text}  ·  ${translate("⌥↵ to assign a shortcut")}`;
+      return `${text}  ·  ${translate`${formatBinding("Alt+Enter")} to assign a shortcut`}`;
     }
     case "setting":
       return [...row.path, row.title].map((p) => translate(p)).join(" | ");
@@ -674,12 +675,12 @@ function previewOf(row: SeRow | undefined): { path: string; line: number; highli
   }
 }
 
-function hintFor(tab: SeTab): string {
+function hintFor(tab: SeTab, tx: ReturnType<typeof useTx>): string {
   switch (tab) {
     case "all":
-      return "Type / to see commands";
+      return tx("Type / to see commands");
     case "text":
-      return "⌘↵ to open in Find tool window";
+      return tx`${formatBinding(hostBinding("Meta+Enter"))} to open in Find tool window`;
     default:
       return "";
   }
diff --git a/src/features/search/find/FindInFiles.module.css b/src/features/search/find/FindInFiles.module.css
index da28768a..c5733dde 100644
--- a/src/features/search/find/FindInFiles.module.css
+++ b/src/features/search/find/FindInFiles.module.css
@@ -1,5 +1,8 @@
+/* IDEA's Find in Files is a popup: Popup.background, not the dialog surface. */
 .dialog {
-  max-height: min(86vh, calc(90vh - 24px));
+  max-height: calc(90vh - 12px);
+  background: var(--bg-popup, var(--bg-elev));
+  font-family: var(--font-ui);
 }
 .dialog > :global([data-dialog-body]) {
   display: flex;
@@ -17,13 +20,14 @@
   display: flex;
   align-items: center;
   gap: 10px;
-  height: 34px;
-  padding: 0 8px 0 12px;
+  height: 42px;
+  padding: 0 14px 0 20px;
+  border-bottom: 1px solid var(--border-popup);
   color: var(--fg-subtle);
 }
 .title {
-  color: var(--fg-emphasis);
-  font-weight: 500;
+  color: var(--fg-strong);
+  font-weight: 600;
 }
 .status {
   display: inline-flex;
@@ -39,7 +43,8 @@
 .mask {
   display: flex;
   align-items: center;
-  height: var(--h-control-small);
+  height: var(--h-control);
+  background: var(--bg-field);
   border: 1px solid var(--border-strong);
   border-radius: var(--radius-small);
   padding-left: 6px;
@@ -53,18 +58,18 @@
   border: 0;
   outline: none;
   color: var(--fg);
-  font-family: var(--font-mono);
-  font-size: var(--fs-small);
 }
 .fields {
   flex: none;
   display: flex;
   flex-direction: column;
-  gap: 6px;
-  padding: 0 12px 8px;
+  gap: 8px;
+  padding: 8px 8px 0;
 }
-.field {
+/* The query fields sit on the popup surface, framed only by their border. */
+.fields .field {
   width: 100%;
+  background: transparent;
 }
 .field input {
   font-family: var(--font-mono);
@@ -75,13 +80,15 @@
   font-size: var(--fs-small);
   padding-left: 2px;
 }
+/* Scope tabs line up with the title; the selected one is a neutral pressed pill, as in IDEA. */
 .scopeRow {
+  --bg-tab-selected: var(--bg-toolbar-pressed);
+  --border-tab-selected: transparent;
   flex: none;
   display: flex;
   align-items: center;
   gap: 12px;
-  padding: 0 12px 0 6px;
-  border-bottom: 1px solid var(--border-popup);
+  padding: 8px 14px 4px 20px;
 }
 .scopeDetail {
   flex: 1;
@@ -107,15 +114,24 @@
 .dirInput:focus {
   border-color: var(--accent);
 }
+/* Results alone (empty state) or results over the preview; grows with the popup. */
+.split {
+  flex: 1 1 auto;
+  height: 500px;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+}
+.split > * {
+  flex: 1;
+  min-height: 0;
+}
 .results {
-  flex: 0 1 242px;
+  flex: 1;
   min-height: 0;
-  height: 242px;
   display: flex;
   flex-direction: column;
   padding: 2px 0;
-  font-family: var(--font-mono);
-  font-weight: var(--fw-code);
 }
 .results > * {
   flex: 1;
@@ -131,6 +147,8 @@
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-family: var(--font-mono);
+  font-weight: var(--fw-code);
 }
 .rowFile {
   flex: none;
@@ -138,7 +156,6 @@
   overflow: hidden;
   text-overflow: ellipsis;
   color: var(--fg-subtle);
-  font-family: var(--font-ui);
 }
 .rowFileActive {
   color: var(--fg-muted);
@@ -153,22 +170,24 @@
   align-items: center;
   justify-content: space-between;
   gap: 10px;
-  height: 24px;
-  padding: 0 12px;
+  height: 36px;
+  padding: 0 20px;
   border-top: 1px solid var(--border-popup);
-  border-bottom: 1px solid var(--border-popup);
-  font-size: var(--fs-small);
   color: var(--fg-subtle);
 }
 .previewPath {
+  min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.previewName {
+  color: var(--fg-strong);
+  margin-right: 8px;
+}
 .previewBox {
-  flex: 0 1 220px;
+  flex: 1;
   min-height: 0;
-  height: 220px;
   display: flex;
   flex-direction: column;
 }
@@ -179,9 +198,8 @@
   align-items: center;
   justify-content: flex-end;
   gap: 8px;
-  min-height: 38px;
-  padding: 6px 12px;
-  border-top: 1px solid var(--border-popup);
+  min-height: 46px;
+  padding: 8px 20px;
 }
 .footer > button,
 .footer > label {
@@ -204,3 +222,35 @@
   opacity: 0.55;
   text-decoration: line-through;
 }
+.empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 2px;
+  padding: 0 20px;
+  text-align: center;
+  line-height: 1.6;
+}
+.emptyOptions {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 1.2em;
+}
+.link {
+  padding: 0;
+  border: 0;
+  background: none;
+  color: var(--link);
+  font: inherit;
+  cursor: pointer;
+}
+.link:hover {
+  color: var(--link-hover);
+}
+/* IDEA's disabled "Ctrl+Enter" label before Open in Find Window. */
+.okHint {
+  flex: none;
+  color: var(--fg-faint);
+  white-space: nowrap;
+}
diff --git a/src/features/search/find/FindInFiles.tsx b/src/features/search/find/FindInFiles.tsx
index 7d3687ef..97ff2d59 100644
--- a/src/features/search/find/FindInFiles.tsx
+++ b/src/features/search/find/FindInFiles.tsx
@@ -3,7 +3,8 @@ import clsx from "clsx";
 import { openEditorPaths, useEditorRegistry } from "@/editor/api";
 import { executeAction } from "@/platform/actions";
 import { setContext } from "@/platform/context";
-import { useTxTemplate, tx } from "@/platform/i18n";
+import { t, useTxTemplate, tx } from "@/platform/i18n";
+import { formatBinding, hostBinding, shortcutLabel } from "@/platform/keymap";
 import { call, commands, isTauri, type SearchScope } from "@/platform/ipc";
 import { useProject } from "@/platform/project";
 import { useProjectModules } from "@/platform/projectRoots";
@@ -15,9 +16,13 @@ import {
   IconButton,
   List,
   Menu,
+  Mnemonic,
   SearchField,
   Select,
   Spinner,
+  SplitGroup,
+  SplitHandle,
+  SplitPanel,
   Tabs,
   listNavigate,
   type MenuItem,
@@ -59,12 +64,19 @@ import {
   hideFindPopup,
   recentMasks,
   rememberFindString,
+  refreshProjectMasks,
   rememberMask,
   resolveDirectory,
   resolveFindScope,
   setFindPopupCommandHandler,
+  loadFindPopupSize,
+  loadFindPopupSplit,
+  saveFindPopupSize,
+  saveFindPopupSplit,
+  setFindPopupNewTab,
   setFindPopupPinned,
   useFindPopup,
+  useProjectMasks,
   type FindOptions,
   type BuiltinScope,
   type FindPopupCommand,
@@ -89,18 +101,19 @@ async function chooseDirectory(current: string): Promise<string | null> {
 
 const POPUP_MAX_MATCHES = 2000;
 const SEARCH_DEBOUNCE_MS = 150;
-const ROW = 22;
+const ROW = 24;
 
 export function FindInFilesOverlay() {
   const open = useFindPopup((s) => s.open);
   return open ? <FindInFilesDialog /> : null;
 }
 
-const SCOPE_TABS: Array<{ id: ScopeTab; label: string }> = [
-  { id: "project", label: "In Project" },
-  { id: "module", label: "Module" },
-  { id: "directory", label: "Directory" },
-  { id: "scope", label: "Scope" },
+/** IDEA's scope tabs and their Alt mnemonics. */
+const SCOPE_TABS: Array<{ id: ScopeTab; label: string; mnemonic: string }> = [
+  { id: "project", label: "In Project", mnemonic: "P" },
+  { id: "module", label: "Module", mnemonic: "M" },
+  { id: "directory", label: "Directory", mnemonic: "D" },
+  { id: "scope", label: "Scope", mnemonic: "S" },
 ];
 
 const NAMED_SCOPES: Array<{ value: BuiltinScope; label: string }> = [
@@ -134,11 +147,18 @@ function FindInFilesDialog() {
   const [historyMenu, setHistoryMenu] = useState<"find" | "replace" | null>(null);
   const [contextMenu, setContextMenu] = useState(false);
   const [previewVersion, setPreviewVersion] = useState(0);
+  // OpenIDEA's Replace › Preview: the preview shows the replacement as a diff.
+  const [previewMode, setPreviewMode] = useState(false);
+  const [diffPreview, setDiffPreview] = useState<{ key: string; lines: PreviewLine[] } | null>(null);
+  const [initialSize] = useState(loadFindPopupSize);
+  const [split, setSplit] = useState(loadFindPopupSplit);
+  const keepSplit = (layout: Record<string, number>) => {
+    setSplit(layout);
+    saveFindPopupSplit(layout);
+  };
   const [marks, setMarks] = useState<ReplaceMarks>(NO_MARKS);
   const [running, setRunning] = useState<ReplaceRun | null>(null);
   const [progress, setProgress] = useState<ReplaceProgress | null>(null);
-  const [previewMode, setPreviewMode] = useState(false);
-  const [diffPreview, setDiffPreview] = useState<{ key: string; lines: PreviewLine[] } | null>(null);
   const busy = !!running;
   const patternRef = useRef<HTMLInputElement>(null);
   const patternBoxRef = useRef<HTMLDivElement>(null);
@@ -149,6 +169,11 @@ function FindInFilesDialog() {
   const set = (patch: Partial<FindOptions>) => useFindPopup.setState(patch);
 
   useEffect(() => () => session.dispose(), [session]);
+  const projectMasks = useProjectMasks((p) => p.masks);
+  useEffect(() => void refreshProjectMasks(), []);
+  /** Turning the mask on with nothing typed takes the first suggestion, as IDEA's combo box shows one. */
+  const enableMask = (on: boolean) =>
+    set(on && !s.mask.trim() ? { maskEnabled: true, mask: recentMasks()[0] ?? "" } : { maskEnabled: on });
   useEffect(() => {
     if (modules.length && !modules.some((m) => m.path === s.module))
       useFindPopup.setState({ module: modules[0]!.path });
@@ -258,7 +283,11 @@ function FindInFilesDialog() {
     if (s.maskEnabled) rememberMask(s.mask);
     const pinned = buildQuery(options, scope, 0);
     close();
-    openInFindWindow(pinned, describeQuery(pinned, root), s.replace ? s.replacement : null, undefined, s.preserveCase);
+    openInFindWindow(pinned, describeQuery(pinned, root), {
+      replacement: s.replace ? s.replacement : null,
+      preserveCase: s.preserveCase,
+      newTab: s.newTab,
+    });
   };
 
   // Check again after a confirmation: its captured rows may have been superseded.
@@ -350,23 +379,6 @@ function FindInFilesDialog() {
       if (i >= 0) setIndex(i);
     }
   };
-  const skip = () => {
-    const i = nextPending(rows, rows.indexOf(chosen[chosen.length - 1]!), marks);
-    if (i >= 0) setIndex(i);
-  };
-  const replaceInFile = async () => {
-    if (!selected) return;
-    const next = await replaceUsages(
-      pendingUsages(
-        rows.filter((r) => r.path === selected.path),
-        marks,
-      ),
-    );
-    if (next) {
-      const i = nextPending(rows, active, next);
-      if (i >= 0) setIndex(i);
-    }
-  };
   const replaceAll = async (usages: Usage[]) => {
     const done = await replaceUsages(usages);
     if (done) close();
@@ -413,19 +425,41 @@ function FindInFilesDialog() {
       | undefined;
     if (toggle) set({ [toggle]: !s[toggle] });
     else if (code === "KeyK") {
-      set({ maskEnabled: !s.maskEnabled });
+      enableMask(!s.maskEnabled);
       if (!s.maskEnabled) setTimeout(() => maskInputRef.current?.select(), 0);
     } else if (code === "KeyE" && s.replace) set({ preserveCase: !s.preserveCase });
+    else if (code === "KeyB") setFindPopupNewTab(!s.newTab);
+    else if (SCOPE_TABS.some((t) => code === `Key${t.mnemonic}`))
+      selectScope(SCOPE_TABS.find((t) => code === `Key${t.mnemonic}`)!.id);
     else if (code === "KeyA" && s.replace) {
       if (rows.length && !busy) void confirmReplaceAll();
     } else return false;
     return true;
   };
 
+  const selectScope = (id: ScopeTab) => {
+    // IDEA starts the Directory scope at the current file's folder.
+    if (id === "directory" && !s.directory.trim()) {
+      const active = maybeEditorService()?.activePath();
+      const folders = project?.workspace?.projects ?? (root ? [root] : []);
+      const dir = active && folders.some((r) => active.startsWith(r + "/")) ? dirname(active) : root;
+      set({ scopeTab: "directory", directory: dir ?? "" });
+    } else set({ scopeTab: id });
+  };
+
+  /** IDEA's "Clear all options" (⇧⌥⌫): back to a plain search everywhere. */
+  const clearOptions = () =>
+    set({ caseSensitive: false, wholeWord: false, isRegex: false, maskEnabled: false, context: "any" });
+
   const onKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
     const target = e.target as HTMLElement;
     const inField =
       (target.tagName === "INPUT" || target.tagName === "TEXTAREA") && target.closest("[data-find-field]");
+    if (e.key === "Backspace" && e.altKey && e.shiftKey && !e.metaKey && !e.ctrlKey) {
+      e.preventDefault();
+      clearOptions();
+      return;
+    }
     if (e.key === "Enter" && e.altKey && e.shiftKey && !e.metaKey && !e.ctrlKey) {
       // ⇧⌥↵: Replace All.
       e.preventDefault();
@@ -499,12 +533,75 @@ function FindInFilesDialog() {
     run: () => set({ context: c.value }),
   }));
   const pendingSelected = s.replace && !stale ? pendingUsages(chosen, marks).length : 0;
+  // A multi-line query takes the arrow keys, so IDEA names the keys that still move through results.
+  const nextKey = shortcutLabel("find.popup.nextResult");
+  const previousKey = shortcutLabel("find.popup.previousResult");
+  const navigationHint =
+    s.pattern.includes("\n") && nextKey && previousKey ? tx`Use ${nextKey} and ${previousKey} to select usages` : "";
+
+  const resultsBox = (
+    <div
+      className={clsx(styles.results, stale && styles.outdated)}
+      data-stale={stale || undefined}
+      aria-busy={stale || state.status === "searching"}
+    >
+      <List<MatchRow>
+        items={rows}
+        getKey={(r, i) => `${r.key}:${i}`}
+        activeIndex={active}
+        isSelected={(r) => isRowSelected(sel, r.key)}
+        onActivate={(r, i, e) => {
+          if (e.type === "click" && (e as MouseEvent).detail < 2) return onRowClick(i, e as MouseEvent);
+          openRow(r, e.shiftKey);
+        }}
+        focusable={false}
+        rowHeight={ROW}
+        aria-label="Matches"
+        empty={
+          <EmptyResults state={state} options={options} onClear={clearOptions} onRegex={() => set({ isRegex: true })} />
+        }
+        renderItem={(r, st) => {
+          const state = s.replace ? groupState(r, marks) : "pending";
+          return (
+            <>
+              <span
+                className={clsx(
+                  styles.rowText,
+                  state === "done" && styles.rowDone,
+                  state === "excluded" && styles.rowExcluded,
+                )}
+              >
+                <MatchText
+                  text={r.text}
+                  ranges={stale ? [] : r.ranges}
+                  source={{ path: r.path, line: r.line, col: r.textCol }}
+                />
+              </span>
+              <span className={clsx(styles.rowFile, st.active && styles.rowFileActive)}>
+                {state === "done" && (
+                  <span className={styles.rowLine}>
+                    <T>replaced ·</T>{" "}
+                  </span>
+                )}
+                {workspace ? r.relPath : basename(r.relPath)} <span className={styles.rowLine}>{r.line + 1}</span>
+              </span>
+            </>
+          );
+        }}
+      />
+    </div>
+  );
 
   return (
     <Dialog
       open
       onClose={close}
       width={820}
+      resizable="both"
+      minWidth={560}
+      minHeight={400}
+      initialSize={initialSize}
+      onResized={saveFindPopupSize}
       position="top"
       transparentBackdrop
       // IDEA's Find in Files is a modeless dialog: it survives switching to another app.
@@ -521,13 +618,17 @@ function FindInFilesDialog() {
             {summary}
           </span>
           <span className={styles.spacer} />
-          <Checkbox checked={s.maskEnabled} onChange={(v) => set({ maskEnabled: v })} label="File mask:" />
+          <Checkbox
+            checked={s.maskEnabled}
+            onChange={enableMask}
+            label={<Mnemonic text={tx("File mask:")} char="K" />}
+          />
           <div ref={maskRef} className={clsx(styles.mask, !s.maskEnabled && styles.maskOff)}>
             <input
               ref={maskInputRef}
               className={styles.maskInput}
               value={s.mask}
-              placeholder="*.kt, !*Test*"
+              placeholder={projectMasks[0] ?? ""}
               aria-label={tx("File mask")}
               spellCheck={false}
               onChange={(e) => set({ mask: e.target.value, maskEnabled: true })}
@@ -557,7 +658,7 @@ function FindInFilesDialog() {
               data-autofocus
               value={s.pattern}
               onChange={(v) => set({ pattern: v })}
-              placeholder={s.isRegex ? "Regular expression" : "Text to find"}
+              placeholder="Search"
               aria-label="Text to find"
               invalid={state.status === "invalid"}
               className={styles.field}
@@ -568,7 +669,7 @@ function FindInFilesDialog() {
                   id: "case",
                   icon: "case",
                   title: "Match Case",
-                  shortcut: "⌥C",
+                  shortcut: formatBinding("Alt+C"),
                   pressed: s.caseSensitive,
                   onToggle: (v) => set({ caseSensitive: v }),
                 },
@@ -576,7 +677,7 @@ function FindInFilesDialog() {
                   id: "word",
                   icon: "word",
                   title: "Words",
-                  shortcut: "⌥W",
+                  shortcut: formatBinding("Alt+W"),
                   pressed: s.wholeWord,
                   onToggle: (v) => set({ wholeWord: v }),
                 },
@@ -584,7 +685,7 @@ function FindInFilesDialog() {
                   id: "regex",
                   icon: "regex",
                   title: "Regex",
-                  shortcut: "⌥X",
+                  shortcut: formatBinding("Alt+X"),
                   pressed: s.isRegex,
                   onToggle: (v) => set({ isRegex: v }),
                 },
@@ -598,7 +699,7 @@ function FindInFilesDialog() {
                 value={s.replacement}
                 onChange={(v) => set({ replacement: v })}
                 leadingIcon="replace"
-                placeholder="Replace with"
+                placeholder="Replace"
                 aria-label="Replace with"
                 className={styles.field}
                 multiline
@@ -608,7 +709,7 @@ function FindInFilesDialog() {
                     id: "preserveCase",
                     icon: "preserve-case",
                     title: "Preserve Case",
-                    shortcut: "⌥E",
+                    shortcut: formatBinding("Alt+E"),
                     pressed: s.preserveCase,
                     onToggle: (v) => set({ preserveCase: v }),
                   },
@@ -621,17 +722,13 @@ function FindInFilesDialog() {
           <Tabs
             variant="compact"
             aria-label="Search scope"
-            items={SCOPE_TABS.map((t) => ({ id: t.id, label: t.label }))}
+            items={SCOPE_TABS.map((t) => ({
+              id: t.id,
+              label: <Mnemonic text={tx(t.label)} char={t.mnemonic} />,
+              text: t.label,
+            }))}
             activeId={s.scopeTab}
-            onSelect={(id) => {
-              // IDEA starts the Directory scope at the current file's folder.
-              if (id === "directory" && !s.directory.trim()) {
-                const active = maybeEditorService()?.activePath();
-                const folders = project?.workspace?.projects ?? (root ? [root] : []);
-                const dir = active && folders.some((r) => active.startsWith(r + "/")) ? dirname(active) : root;
-                set({ scopeTab: "directory", directory: dir ?? "" });
-              } else set({ scopeTab: id as ScopeTab });
-            }}
+            onSelect={(id) => selectScope(id as ScopeTab)}
           />
           <div className={styles.scopeDetail}>
             {s.scopeTab === "directory" && (
@@ -706,128 +803,82 @@ function FindInFilesDialog() {
             )}
           </div>
         </div>
-        <div
-          className={clsx(styles.results, stale && styles.outdated)}
-          data-stale={stale || undefined}
-          aria-busy={stale || state.status === "searching"}
-        >
-          <List<MatchRow>
-            items={rows}
-            getKey={(r, i) => `${r.key}:${i}`}
-            activeIndex={active}
-            isSelected={(r) => isRowSelected(sel, r.key)}
-            onActivate={(r, i, e) => {
-              if (e.type === "click" && (e as MouseEvent).detail < 2) return onRowClick(i, e as MouseEvent);
-              openRow(r, e.shiftKey);
-            }}
-            focusable={false}
-            rowHeight={ROW}
-            aria-label="Matches"
-            empty={<span>{emptyText(state, s.pattern)}</span>}
-            renderItem={(r, st) => {
-              const state = s.replace ? groupState(r, marks) : "pending";
-              return (
-                <>
-                  <span
-                    className={clsx(
-                      styles.rowText,
-                      state === "done" && styles.rowDone,
-                      state === "excluded" && styles.rowExcluded,
-                    )}
-                  >
-                    <MatchText
-                      text={r.text}
-                      ranges={stale ? [] : r.ranges}
-                      source={{ path: r.path, line: r.line, col: r.textCol }}
-                      active={st.active}
-                      replacement={!stale && s.replace && state !== "done" ? s.replacement : null}
-                      query={query}
-                      preserveCase={s.preserveCase}
+        <div className={styles.split}>
+          {rows.length ? (
+            <SplitGroup orientation="vertical" id="find-popup-split" defaultLayout={split} onLayoutChanged={keepSplit}>
+              <SplitPanel id="results" minSize={ROW * 3} defaultSize="48%">
+                {resultsBox}
+              </SplitPanel>
+              <SplitHandle hairline={false} />
+              <SplitPanel id="preview" minSize={96}>
+                <div className={styles.previewHeader}>
+                  {selected ? (
+                    <span className={styles.previewPath}>
+                      <span className={styles.previewName}>{basename(selected.relPath)}</span>
+                      {selected.relPath.includes("/") && dirname(selected.relPath)}
+                    </span>
+                  ) : (
+                    <span />
+                  )}
+                </div>
+                <div className={styles.previewBox}>
+                  {!stale && previewMode && s.replace && selected ? (
+                    <ReplaceDiffPreview
+                      lines={diffPreview?.key === diffPreviewKey ? diffPreview.lines : null}
+                      line={selected.line}
                     />
-                  </span>
-                  <span className={clsx(styles.rowFile, st.active && styles.rowFileActive)}>
-                    {state === "done" && (
-                      <span className={styles.rowLine}>
-                        <T>replaced ·</T>{" "}
-                      </span>
-                    )}
-                    {workspace ? r.relPath : basename(r.relPath)} <span className={styles.rowLine}>{r.line + 1}</span>
-                  </span>
-                </>
-              );
-            }}
-          />
-        </div>
-        <div className={styles.previewHeader}>
-          {selected ? (
-            <>
-              <span className={styles.previewPath}>{selected.relPath}</span>
-              <span className={styles.rowLine}>
-                {selected.line + 1}:{selected.col + 1}
-              </span>
-            </>
+                  ) : (
+                    <CodePreview
+                      path={selected?.path ?? null}
+                      line={selected?.line ?? 0}
+                      highlights={fileHighlights}
+                      version={previewVersion}
+                    />
+                  )}
+                </div>
+              </SplitPanel>
+            </SplitGroup>
           ) : (
-            <span />
-          )}
-        </div>
-        <div className={styles.previewBox}>
-          {!stale && previewMode && s.replace && selected ? (
-            <ReplaceDiffPreview
-              lines={diffPreview?.key === diffPreviewKey ? diffPreview.lines : null}
-              line={selected.line}
-            />
-          ) : (
-            <CodePreview
-              path={selected?.path ?? null}
-              line={selected?.line ?? 0}
-              highlights={fileHighlights}
-              version={previewVersion}
-            />
+            resultsBox
           )}
         </div>
         <footer className={styles.footer}>
-          <span className={styles.hint}>
-            {s.replace ? (
-              <T>↵ Replace Selected · ⇧⌥↵ Replace All · ⌘↵ Open in Find Window</T>
-            ) : (
-              <T>↵ Open · ⇧↵ Open to the side · ⌘↵ Open in Find Window</T>
-            )}
-          </span>
+          <Checkbox
+            checked={s.newTab}
+            onChange={setFindPopupNewTab}
+            label={<Mnemonic text={tx("Open results in new tab")} char="B" />}
+          />
+          {s.replace && <Checkbox checked={previewMode} onChange={setPreviewMode} label="Preview" />}
+          {navigationHint && <span className={styles.hint}>{navigationHint}</span>}
+          <span className={styles.spacer} />
           {s.replace && progress && (
             <span className={styles.hint} aria-live="polite">
               {tx`Replacing… ${progress.done}/${progress.total} files`}
             </span>
           )}
           {s.replace && running && (
-            <Button size="small" onClick={() => running.cancel()}>
+            <Button onClick={() => running.cancel()}>
               <T>Stop</T>
             </Button>
           )}
+          <span className={styles.okHint}>{formatBinding(hostBinding("Meta+Enter"))}</span>
+          <Button disabled={!s.pattern} onClick={pin}>
+            <T>Open in Find Window</T>
+          </Button>
           {s.replace && (
             <>
-              <Checkbox checked={previewMode} onChange={setPreviewMode} label="Preview" />
-              <Button size="small" variant="secondary" disabled={stale || !selected || busy} onClick={skip}>
-                <T>Skip</T>
-              </Button>
-              <Button size="small" disabled={stale || !selected || busy} onClick={() => void replaceSelected()}>
-                {pendingSelected > 1 ? txt(`Replace ${pendingSelected} Occurrences`) : <T>Replace</T>}
-              </Button>
-              <Button size="small" disabled={stale || !selected || busy} onClick={() => void replaceInFile()}>
-                <T>Replace All in This File</T>
-              </Button>
               <Button
-                size="small"
-                title="Replace All (⇧⌥↵, ⌥A)"
+                title={formatBinding("Shift+Alt+Enter")}
                 disabled={stale || !rows.length || busy || state.status === "searching"}
                 onClick={() => void confirmReplaceAll()}
               >
-                <T>Replace All</T>
+                <Mnemonic text={tx("Replace All")} char="A" />
+              </Button>
+              <Button variant="primary" disabled={stale || !selected || busy} onClick={() => void replaceSelected()}>
+                {pendingSelected > 1 ? txt(`Replace ${pendingSelected} Occurrences`) : <T>Replace</T>}
               </Button>
             </>
           )}
-          <Button size="small" variant={s.replace ? "secondary" : "primary"} disabled={!s.pattern} onClick={pin}>
-            <T>Open in Find Window</T>
-          </Button>
         </footer>
       </div>
       <Menu
@@ -857,20 +908,89 @@ function FindInFilesDialog() {
   );
 }
 
+/** IDEA's header count: shown once something matched. */
 function statusText(s: FindState): string {
-  if (s.status === "invalid") return "Invalid pattern";
-  if (s.status === "error") return s.error ?? "Search failed";
-  if (s.status === "idle") return "";
-  const files = s.files.length;
-  const more = s.summary?.limitHit ? "+" : "";
-  if (!s.matchCount) return s.status === "done" ? "No matches" : "Searching…";
-  return `${s.matchCount}${more} match${s.matchCount === 1 ? "" : "es"} in ${files}${more} file${files === 1 ? "" : "s"}`;
+  if (!s.matchCount) return "";
+  const key = s.summary?.limitHit ? "search.find.matchesIncomplete" : "search.find.matches";
+  return t(key, { matches: s.matchCount, files: s.files.length });
 }
 
-function emptyText(s: FindState, pattern: string): string {
-  if (!pattern) return "Type text to search the project";
-  if (s.status === "invalid") return s.error ?? "Invalid pattern";
-  if (s.status === "searching" || s.status === "validating") return "Searching…";
-  if (s.status === "error") return s.error ?? "Search failed";
-  return "Nothing found";
+const REGEX_CHARS = /[.$|()[\]{}^?*+\\]/;
+
+/** Whether text with regex syntax in it is also a valid pattern: IDEA then offers "Search with Regex". */
+function couldBeRegex(text: string): boolean {
+  if (!REGEX_CHARS.test(text)) return false;
+  try {
+    new RegExp(text);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** IDEA's empty results text: why nothing is listed, the search options in use and how to clear them. */
+function EmptyResults({
+  state,
+  options: o,
+  onClear,
+  onRegex,
+}: {
+  state: FindState;
+  options: FindOptions;
+  onClear: () => void;
+  onRegex: () => void;
+}) {
+  const masked = o.maskEnabled && !!o.mask.trim();
+  if (!o.pattern && !masked) return <div className={styles.empty}>{tx("Type search query to find in files")}</div>;
+  if (state.status === "invalid") return <div className={styles.empty}>{state.error ?? tx("Invalid pattern")}</div>;
+  if (state.status === "error") return <div className={styles.empty}>{state.error ?? tx("Search failed")}</div>;
+  if (o.pattern && state.status !== "done") return <div className={styles.empty}>{tx("Searching…")}</div>;
+  const used = [
+    o.caseSensitive && { label: "Match Case", key: "Alt+C" },
+    o.wholeWord && { label: "Words", key: "Alt+W" },
+    o.isRegex && { label: "Regex", key: "Alt+X" },
+    masked && { label: "File mask", key: "Alt+K" },
+    o.context !== "any" && { label: "Filter", key: "" },
+  ].filter((u) => !!u);
+  const regex = !!o.pattern && !o.isRegex && couldBeRegex(o.pattern);
+  const clearKey = formatBinding("Shift+Alt+Backspace");
+  return (
+    <div className={styles.empty}>
+      <div>
+        {o.pattern ? tx("Nothing found") : tx("No search text entered")}
+        {used.length || regex ? "." : ""}
+      </div>
+      {regex ? (
+        <div className={styles.emptyOptions}>
+          <div>
+            <button type="button" className={styles.link} onClick={onRegex}>
+              <T>Search with Regex</T>
+            </button>{" "}
+            {formatBinding("Alt+X")}
+          </div>
+        </div>
+      ) : used.length ? (
+        <div className={styles.emptyOptions}>
+          {used.length === 1 ? (
+            <div>{tx`Search option used: ${tx(used[0]!.label)}`}</div>
+          ) : (
+            <>
+              <div>
+                <T>Search options used:</T>
+              </div>
+              <div>
+                {used.map((u) => [tx(u.label), u.key && formatBinding(u.key)].filter(Boolean).join(" ")).join("  ")}
+              </div>
+            </>
+          )}
+          <div>
+            <button type="button" className={styles.link} onClick={onClear}>
+              {used.length === 1 ? <T>Clear option</T> : <T>Clear all options</T>}
+            </button>{" "}
+            {clearKey}
+          </div>
+        </div>
+      ) : null}
+    </div>
+  );
 }
diff --git a/src/features/search/find/FindToolWindow.tsx b/src/features/search/find/FindToolWindow.tsx
index db1ae34c..90066080 100644
--- a/src/features/search/find/FindToolWindow.tsx
+++ b/src/features/search/find/FindToolWindow.tsx
@@ -3,7 +3,7 @@ import clsx from "clsx";
 import { create } from "zustand";
 import { executeAction } from "@/platform/actions";
 import type { FileMatches } from "@/platform/ipc";
-import { shortcutLabel } from "@/platform/keymap";
+import { formatBinding, hostBinding, shortcutLabel } from "@/platform/keymap";
 import {
   Button,
   EmptyState,
@@ -53,7 +53,7 @@ import {
   type FindTab,
 } from "./windowStore";
 import styles from "./FindToolWindow.module.css";
-import { tx } from "@/platform/i18n";
+import { t, tx } from "@/platform/i18n";
 
 type Node =
   | { kind: "dir"; key: string; label: string; count: number; children: Node[] }
@@ -205,7 +205,7 @@ export function FindToolWindow() {
   if (!tab) {
     return (
       <EmptyState title="No search results" icon="search">
-        {tx`Use Find in Files (${shortcutLabel("find.inPath") ?? "⇧⌘F"}) and choose “Open in Find Window”.`}
+        {tx`Use Find in Files (${shortcutLabel("find.inPath") ?? formatBinding(hostBinding("Meta+Shift+F"))}) and choose “Open in Find Window”.`}
       </EmptyState>
     );
   }
@@ -376,8 +376,10 @@ function FindTabView({ tab }: { tab: FindTab }) {
             ? (st.error ?? tx("Search failed"))
             : progress
               ? tx`Replacing… ${progress.done}/${progress.total} files`
-              : tx`${`${st.matchCount}${st.summary?.limitHit ? "+" : ""}`} matches in ${st.files.length} files` +
-                (marks.excluded.size ? ` · ${tx`${marks.excluded.size} excluded`}` : "")}
+              : t(st.summary?.limitHit ? "search.find.matchesIncomplete" : "search.find.matches", {
+                  matches: st.matchCount,
+                  files: st.files.length,
+                }) + (marks.excluded.size ? ` · ${tx`${marks.excluded.size} excluded`}` : "")}
         </span>
         <span className={styles.spacer} />
         <Button size="small" variant="ghost" disabled={!selection.size} onClick={exclude} title="Exclude / include (⌫)">
@@ -543,7 +545,6 @@ function FindNodeContent({ node, state, tab }: { node: Node; state: TreeRowState
               text={node.text}
               ranges={node.ranges}
               source={{ path: node.path, line: node.line, col: node.textCol }}
-              active={state.selected}
               replacement={tab.replacement}
               query={tab.query}
               preserveCase={!!tab.preserveCase}
diff --git a/src/features/search/find/parts.module.css b/src/features/search/find/parts.module.css
index 4b3c0c3d..7b68e9c0 100644
--- a/src/features/search/find/parts.module.css
+++ b/src/features/search/find/parts.module.css
@@ -1,47 +1,14 @@
 .text {
   white-space: pre;
 }
-/* Lezer classHighlighter tokens of result lines (same colours as Search Everywhere's text hits). */
-.code :global(.tok-keyword),
-.code :global(.tok-modifier),
-.code :global(.tok-controlKeyword),
-.code :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.code :global(.tok-string),
-.code :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.code :global(.tok-number),
-.code :global(.tok-bool),
-.code :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.code :global(.tok-typeName),
-.code :global(.tok-className),
-.code :global(.tok-namespace) {
-  color: var(--syn-type);
-}
-.code :global(.tok-comment) {
-  color: var(--syn-comment);
-}
-.code :global(.tok-meta),
-.code :global(.tok-macroName) {
-  color: var(--syn-annotation);
-}
-.code :global(.tok-propertyName) {
-  color: var(--syn-property);
-}
-.code :global(.tok-variableName.tok-definition) {
-  color: var(--syn-function);
-}
 .match {
-  background: var(--accent-soft);
-  color: var(--fg-strong);
+  background: var(--bg-search-match);
+  color: var(--fg-search-match, inherit);
   border-radius: 2px;
 }
-.matchActive {
-  background: color-mix(in srgb, var(--accent) 30%, transparent);
+/* IDEA paints a hit in one colour over the syntax colours, selected row or not. */
+.match :global([class*="tok-"]) {
+  color: inherit;
 }
 .removed {
   color: var(--fg-subtle);
diff --git a/src/features/search/find/parts.tsx b/src/features/search/find/parts.tsx
index f221b44e..eb626ad2 100644
--- a/src/features/search/find/parts.tsx
+++ b/src/features/search/find/parts.tsx
@@ -19,7 +19,6 @@ import { tx } from "@/platform/i18n";
 export function MatchText({
   text,
   ranges,
-  active,
   replacement,
   query,
   preserveCase = false,
@@ -27,7 +26,6 @@ export function MatchText({
 }: {
   text: string;
   ranges: ReadonlyArray<readonly [number, number]>;
-  active?: boolean;
   replacement?: string | null;
   query?: Pick<SearchQuery, "pattern" | "isRegex" | "caseSensitive"> | null;
   preserveCase?: boolean;
@@ -51,7 +49,7 @@ export function MatchText({
       );
     } else {
       parts.push(
-        <mark key={i} className={clsx(styles.match, active && styles.matchActive)}>
+        <mark key={i} className={styles.match}>
           {tokenSpans(text, s, e, tokens, "")}
         </mark>,
       );
diff --git a/src/features/search/find/store.ts b/src/features/search/find/store.ts
index 0f39ea45..eecc00a9 100644
--- a/src/features/search/find/store.ts
+++ b/src/features/search/find/store.ts
@@ -1,6 +1,13 @@
 import { create } from "zustand";
 import type { ContextKeys } from "@/platform/context";
-import type { ProjectFileSet, SearchContext, SearchQuery, SearchScope } from "@/platform/ipc";
+import {
+  call,
+  commands,
+  type ProjectFileSet,
+  type SearchContext,
+  type SearchQuery,
+  type SearchScope,
+} from "@/platform/ipc";
 import { SEARCH_CONTEXTS, customScopes, findCustomScope, rememberSearch, searchHistory } from "@/platform/search";
 import { loadJson, saveJson } from "../common/open";
 
@@ -52,9 +59,12 @@ interface FindPopupState extends FindOptions {
   session: number;
   /** Title-bar pin: the popup stays open when a result is opened or the user clicks outside. */
   pinned: boolean;
+  /** IDEA's "Open results in new tab": Open in Find Window keeps the active Find tab. */
+  newTab: boolean;
 }
 
 const PINNED_KEY = "openidea.search.findPinned.v1";
+const NEW_TAB_KEY = "openidea.search.findNewTab.v1";
 
 export const useFindPopup = create<FindPopupState>(() => ({
   open: false,
@@ -74,6 +84,7 @@ export const useFindPopup = create<FindPopupState>(() => ({
   namedScope: "projectFiles",
   context: "any",
   pinned: loadJson<unknown>(PINNED_KEY, false) === true,
+  newTab: loadJson<unknown>(NEW_TAB_KEY, false) === true,
 }));
 
 export function setFindPopupPinned(pinned: boolean) {
@@ -81,6 +92,35 @@ export function setFindPopupPinned(pinned: boolean) {
   saveJson(PINNED_KEY, pinned);
 }
 
+export function setFindPopupNewTab(newTab: boolean) {
+  useFindPopup.setState({ newTab });
+  saveJson(NEW_TAB_KEY, newTab);
+}
+
+const SIZE_KEY = "openidea.search.findPopupSize.v1";
+const SPLIT_KEY = "openidea.search.findPopupSplit.v1";
+
+/** The popup's size and its results / preview split, remembered like IDEA's. */
+export function loadFindPopupSize(): { w: number; h: number } | null {
+  const v = loadJson<{ w?: unknown; h?: unknown } | null>(SIZE_KEY, null);
+  return typeof v?.w === "number" && typeof v.h === "number" ? { w: v.w, h: v.h } : null;
+}
+
+export function saveFindPopupSize(size: { w: number; h: number }) {
+  saveJson(SIZE_KEY, size);
+}
+
+export function loadFindPopupSplit(): Record<string, number> | undefined {
+  const v = loadJson<unknown>(SPLIT_KEY, null);
+  return v && typeof v === "object" && Object.values(v).every((n) => typeof n === "number")
+    ? (v as Record<string, number>)
+    : undefined;
+}
+
+export function saveFindPopupSplit(layout: Record<string, number>) {
+  saveJson(SPLIT_KEY, layout);
+}
+
 /**
  * Keys the popup handles that are also global shortcuts (⌘G / ⇧⌘G, F4 / ⌘↓, ⌥↓):
  * hidden actions bound later in the keymap win while the popup is open and
@@ -138,12 +178,34 @@ export function hideFindPopup() {
 }
 
 const MASKS_KEY = "openidea.search.fileMasks.v1";
-const DEFAULT_MASKS = ["*.ts,*.tsx", "*.rs", "*.kt", "*.java", "*.py", "*.go", "*.md", "*.json", "!*.test.*"];
+const PROJECT_MASKS = 5;
 
+/**
+ * `*.ext` masks of the project's most common language file types. IDEA seeds its
+ * mask list with the IDE's languages; a multi-language IDE takes the project's.
+ */
+export const useProjectMasks = create<{ masks: string[] }>(() => ({ masks: [] }));
+
+export async function refreshProjectMasks() {
+  try {
+    const [counts, languages] = await Promise.all([call(commands.indexFileExtensions()), commands.languages()]);
+    const known = new Set(languages.flatMap((l) => l.extensions.map((e) => e.toLowerCase())));
+    const masks = counts
+      .filter((c) => known.has(c.extension))
+      .slice(0, PROJECT_MASKS)
+      .map((c) => `*.${c.extension}`);
+    useProjectMasks.setState({ masks });
+  } catch {
+    /* no project index (welcome screen, tests) */
+  }
+}
+
+/** Masks to offer: the ones used recently, then the project's file types. */
 export function recentMasks(): string[] {
   const v = loadJson<unknown>(MASKS_KEY, []);
   const recent = Array.isArray(v) ? v.filter((x): x is string => typeof x === "string") : [];
-  return [...recent, ...DEFAULT_MASKS.filter((m) => !recent.includes(m))];
+  const project = useProjectMasks.getState().masks;
+  return [...recent, ...project.filter((m) => !recent.includes(m))];
 }
 
 export function rememberMask(mask: string) {
diff --git a/src/features/search/find/windowStore.ts b/src/features/search/find/windowStore.ts
index de8aee1d..1a8e03aa 100644
--- a/src/features/search/find/windowStore.ts
+++ b/src/features/search/find/windowStore.ts
@@ -49,19 +49,25 @@ function patchTab(id: number, patch: Partial<FindTab>) {
   useFindWindow.setState((s) => ({ tabs: s.tabs.map((t) => (t.id === id ? { ...t, ...patch } : t)) }));
 }
 
+export interface OpenInFindWindowOptions {
+  replacement?: string | null;
+  preserveCase?: boolean;
+  /** IDEA's "Open results in new tab": keep the active tab instead of replacing it. */
+  newTab?: boolean;
+  deps?: FindDeps;
+}
+
 export function openInFindWindow(
   query: SearchQuery,
   title: string,
-  replacement: string | null = null,
-  deps = ipcFindDeps(),
-  preserveCase = false,
+  { replacement = null, preserveCase = false, newTab = false, deps = ipcFindDeps() }: OpenInFindWindowOptions = {},
 ) {
   const id = nextTab++;
   const session = new FindSession(deps, (state) => patchTab(id, { state }));
   sessions.set(id, session);
   useFindWindow.setState((s) => {
     const tab: FindTab = { id, title, query, replacement, preserveCase, state: IDLE };
-    const reused = s.tabs.find((t) => t.id === s.active && !t.pinned);
+    const reused = newTab ? undefined : s.tabs.find((t) => t.id === s.active && !t.pinned);
     if (reused) {
       sessions.get(reused.id)?.dispose();
       sessions.delete(reused.id);
@@ -82,15 +88,17 @@ export function openInFindWindow(
 
 /** Use the normal Find session/tab lifecycle for live editor results. */
 export function openEditorResults(source: FindResultsSource) {
-  const id = openInFindWindow(source.query, source.title, null, {
-    validate: async () => {},
-    nextRequestId,
-    cancel: () => {},
-    start: async (_request, _query, onFile) => {
-      const file = source.read();
-      const matches = countFileMatches(file);
-      if (matches) onFile(file);
-      return { files: matches ? 1 : 0, matches, limitHit: false, cancelled: false, elapsedMs: 0 };
+  const id = openInFindWindow(source.query, source.title, {
+    deps: {
+      validate: async () => {},
+      nextRequestId,
+      cancel: () => {},
+      start: async (_request, _query, onFile) => {
+        const file = source.read();
+        const matches = countFileMatches(file);
+        if (matches) onFile(file);
+        return { files: matches ? 1 : 0, matches, limitHit: false, cancelled: false, elapsedMs: 0 };
+      },
     },
   });
   patchTab(id, { editorResults: true });
diff --git a/src/features/search/recent/RecentPopups.module.css b/src/features/search/recent/RecentPopups.module.css
index 2d8a63d7..e34f5819 100644
--- a/src/features/search/recent/RecentPopups.module.css
+++ b/src/features/search/recent/RecentPopups.module.css
@@ -233,38 +233,3 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-/* Lezer classHighlighter tokens (same colours as Search Everywhere's text hits). */
-.code :global(.tok-keyword),
-.code :global(.tok-modifier),
-.code :global(.tok-controlKeyword),
-.code :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.code :global(.tok-string),
-.code :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.code :global(.tok-number),
-.code :global(.tok-bool),
-.code :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.code :global(.tok-typeName),
-.code :global(.tok-className),
-.code :global(.tok-namespace) {
-  color: var(--syn-type);
-}
-.code :global(.tok-comment) {
-  color: var(--syn-comment);
-  font-style: italic;
-}
-.code :global(.tok-meta),
-.code :global(.tok-macroName) {
-  color: var(--syn-annotation);
-}
-.code :global(.tok-propertyName) {
-  color: var(--syn-property);
-}
-.code :global(.tok-variableName.tok-definition) {
-  color: var(--syn-function);
-}
diff --git a/src/features/search/recent/RecentPopups.tsx b/src/features/search/recent/RecentPopups.tsx
index a6b79e08..18bc89d4 100644
--- a/src/features/search/recent/RecentPopups.tsx
+++ b/src/features/search/recent/RecentPopups.tsx
@@ -633,7 +633,7 @@ function RecentLocationsDialog() {
           renderItem={(l) => (
             <div className={styles.location}>
               <div className={styles.locationHeader}>
-                <Icon name={fileIconName(basename(l.rel))} size={14} className={styles.icon} />
+                <Icon name={fileIconName(basename(l.rel), l.rel)} size={14} className={styles.icon} />
                 <HighlightedText
                   className={styles.locationName}
                   text={basename(l.rel)}
diff --git a/src/features/services/Services.module.css b/src/features/services/Services.module.css
index daad831f..98d0e9fa 100644
--- a/src/features/services/Services.module.css
+++ b/src/features/services/Services.module.css
@@ -128,6 +128,9 @@
   white-space: pre;
   -webkit-user-select: text;
   user-select: text;
+  cursor: default;
+}
+.log > div {
   cursor: text;
 }
 .wrap {
diff --git a/src/features/settings/__tests__/behavior.test.ts b/src/features/settings/__tests__/behavior.test.ts
index e17a9eb1..8d1ab1e8 100644
--- a/src/features/settings/__tests__/behavior.test.ts
+++ b/src/features/settings/__tests__/behavior.test.ts
@@ -22,6 +22,47 @@ describe("appearance & behavior settings", () => {
     expect(validateAppearanceExtras({ theme: "system" }).syncWithOs).toBe(true);
   });
 
+  it("keeps valid file icon theme options and drops or clamps the rest", () => {
+    expect(validateAppearanceExtras({}).fileIconThemeOptions).toEqual({});
+    const options = validateAppearanceExtras({
+      fileIconThemeOptions: {
+        "p/t": {
+          groups: { tests: true, bad: "yes" },
+          choices: { arrows: "plus", bad: 1 },
+          hideFiles: true,
+          hollowFolders: "x",
+          hideUiIcons: true,
+          hidePsiIcons: 1,
+          monochrome: "#546E7A",
+          saturation: 50,
+          opacity: 1,
+          iconSize: 20.4,
+          rowHeight: 100,
+          accent: "red",
+        },
+        "not a key": { hideFiles: true },
+        "p/u": 5,
+      },
+    }).fileIconThemeOptions;
+    expect(options).toEqual({
+      "p/t": {
+        groups: { tests: true },
+        choices: { arrows: "plus" },
+        hideFiles: true,
+        hideFolders: false,
+        hollowFolders: false,
+        hideUiIcons: true,
+        hidePsiIcons: false,
+        monochrome: "#546E7A",
+        saturation: 20,
+        opacity: 10,
+        iconSize: 20,
+        rowHeight: 48,
+        accent: null,
+      },
+    });
+  });
+
   it("defaults Show tool window badges to on and honours the stored value", () => {
     expect(validateAppearanceExtras({}).showToolWindowBadges).toBe(true);
     expect(validateAppearanceExtras({ showToolWindowBadges: false }).showToolWindowBadges).toBe(false);
diff --git a/src/features/settings/__tests__/iconThemeSettings.test.tsx b/src/features/settings/__tests__/iconThemeSettings.test.tsx
new file mode 100644
index 00000000..60dd55a8
--- /dev/null
+++ b/src/features/settings/__tests__/iconThemeSettings.test.tsx
@@ -0,0 +1,147 @@
+import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import {
+  addContributedIconTheme,
+  useContributedIconThemes,
+  type IconThemeChoice,
+  type IconThemeDetails,
+} from "@/platform/themes";
+import { useSettingsPages } from "@/workbench/contributions";
+import { trackIconThemePages } from "../iconThemePages";
+import { validateSettings } from "../model/schema";
+import { useSettingsDialog } from "../model/staging";
+import { BEHAVIOR_PAGES } from "../pages/behavior";
+
+const savedDialog = useSettingsDialog.getState();
+const KEY = "global|appearance.fileIconThemeOptions";
+const PAGE = "plugins.p.t";
+const staged = () => useSettingsDialog.getState().staged[KEY]?.value as Record<string, Record<string, unknown>>;
+
+const DETAILS: IconThemeDetails = {
+  groups: [{ id: "tests", name: "Tests", enabled: false }],
+  choices: [
+    {
+      id: "arrows",
+      name: "Arrows style",
+      default: "plain",
+      options: [
+        { id: "plain", name: "Default" },
+        { id: "plus", name: "Plus-Minus" },
+      ],
+    },
+  ],
+  accent: true,
+  settings: [
+    {
+      title: "Toggles",
+      items: [
+        { option: "hideFiles", label: "Files on", hint: "Shows file icons", invert: true },
+        { option: "hidePsiIcons", label: "Hide symbols" },
+      ],
+    },
+    { title: "Packs", items: [{ option: "groups", columns: 2 }] },
+    {
+      title: "Looks",
+      items: [
+        { option: "choice", choice: "arrows" },
+        { option: "rowHeight", label: "Line height", default: 30 },
+        { option: "accent", label: "Accent", default: "#112233" },
+      ],
+    },
+  ],
+};
+
+const theme = (details: IconThemeDetails | null): IconThemeChoice => ({
+  id: "p/t",
+  label: "Atom",
+  settingsPage: PAGE,
+  details: async () => details,
+});
+
+function select(selected: string, options: unknown = {}) {
+  const base = validateSettings({ appearance: { fileIconTheme: selected, fileIconThemeOptions: options } });
+  useSettingsDialog.setState({ base, globalBase: base, staged: {} });
+}
+
+const page = () => useSettingsPages.getState().pages.get(PAGE);
+
+async function openPage() {
+  await waitFor(() => expect(page()).toBeDefined());
+  const Page = page()!.component!;
+  render(<Page />);
+}
+
+let stop: () => void = () => {};
+
+beforeEach(() => {
+  stop = trackIconThemePages();
+});
+
+afterEach(() => {
+  stop();
+  useSettingsDialog.setState(savedDialog);
+  useContributedIconThemes.setState({ themes: [] });
+});
+
+describe("icon theme settings page", () => {
+  it("is registered from the theme's settings while the theme is contributed", async () => {
+    const remove = addContributedIconTheme(theme(DETAILS));
+    await waitFor(() => expect(page()?.title).toBe("Atom"));
+    expect(page()?.keywords).toEqual(expect.arrayContaining(["Toggles", "Files on", "Line height", "Tests"]));
+    act(remove);
+    expect(page()).toBeUndefined();
+  });
+
+  it("is not registered for themes without settings", async () => {
+    addContributedIconTheme(theme(null));
+    addContributedIconTheme({ ...theme({ ...DETAILS, settings: [] }), id: "p/u", settingsPage: "plugins.p.u" });
+    await new Promise((r) => setTimeout(r, 0));
+    expect(page()).toBeUndefined();
+    expect(useSettingsPages.getState().pages.has("plugins.p.u")).toBe(false);
+  });
+
+  it("renders the sections and items the theme declares", async () => {
+    addContributedIconTheme(theme(DETAILS));
+    select("");
+    await openPage();
+    for (const title of ["Toggles", "Packs", "Looks"]) {
+      expect(screen.getByRole("region", { name: title })).toBeInTheDocument();
+    }
+    expect(screen.getByText("Shows file icons")).toBeInTheDocument();
+    expect(screen.queryByRole("checkbox", { name: /saturation/i })).toBeNull();
+    expect(screen.getByRole("checkbox", { name: "Files on" })).toBeChecked();
+    expect(screen.getByRole("checkbox", { name: "Hide symbols" })).not.toBeChecked();
+  });
+
+  it("stages the options with the theme's defaults, keeping other themes' options", async () => {
+    addContributedIconTheme(theme(DETAILS));
+    select("", { "q/u": { hideFiles: true } });
+    await openPage();
+    fireEvent.click(screen.getByRole("checkbox", { name: "Files on" }));
+    expect(staged()["p/t"]).toMatchObject({ hideFiles: true });
+    fireEvent.click(screen.getByRole("checkbox", { name: "Hide symbols" }));
+    expect(staged()["p/t"]).toMatchObject({ hidePsiIcons: true });
+    fireEvent.click(screen.getByRole("checkbox", { name: "Tests" }));
+    expect(staged()["p/t"]).toMatchObject({ groups: { tests: true } });
+    fireEvent.click(screen.getByRole("button", { name: "Arrows style" }));
+    fireEvent.click(await screen.findByRole("option", { name: "Plus-Minus" }));
+    expect(staged()["p/t"]).toMatchObject({ choices: { arrows: "plus" } });
+    fireEvent.click(screen.getByRole("checkbox", { name: "Line height" }));
+    expect(staged()["p/t"]).toMatchObject({ rowHeight: 30 });
+    fireEvent.click(screen.getByRole("checkbox", { name: "Accent" }));
+    expect(staged()["p/t"]).toMatchObject({ accent: "#112233" });
+    expect(staged()["q/u"]).toMatchObject({ hideFiles: true });
+  });
+
+  it("is no longer part of Settings › Appearance", () => {
+    addContributedIconTheme(theme(DETAILS));
+    select("p/t");
+    const option = BEHAVIOR_PAGES.find((p) => p.id === "appearance")!
+      .sections!.flatMap((s) => s.options)
+      .find((o) => o.kind === "custom" && o.label === "File icon theme")!;
+    if (option.kind !== "custom") throw new Error("File icon theme row missing");
+    const Row = option.component;
+    render(<Row />);
+    expect(screen.queryByRole("checkbox", { name: "Files on" })).toBeNull();
+  });
+});
diff --git a/src/features/settings/__tests__/inspections.test.ts b/src/features/settings/__tests__/inspections.test.ts
index e7eea28c..417626d1 100644
--- a/src/features/settings/__tests__/inspections.test.ts
+++ b/src/features/settings/__tests__/inspections.test.ts
@@ -15,7 +15,7 @@ import {
   type InspectionNode,
 } from "../pages/editor/inspectionsModel";
 import { splitPageTarget } from "../model/staging";
-import { validateInspections } from "@/platform/inspections";
+import { JAVA_SERIAL_VERSION_INSPECTION, validateInspections } from "@/platform/inspections";
 import { NATURAL_LANGUAGES_PAGE, SPELLING_PAGE } from "../pages/editor/spelling";
 import { INSPECTIONS_PAGE } from "../pages/editor/inspections";
 import { EDITOR_PAGES } from "../pages/editor";
@@ -69,6 +69,7 @@ describe("inspections tree", () => {
     expect(tree.map((g) => g.name)).toEqual([
       "Cargo",
       "General",
+      "Java",
       "JavaScript",
       "Other",
       "Proofreading",
@@ -109,6 +110,19 @@ describe("inspections tree", () => {
     expect(checkState(o, python)).toBe("on");
   });
 
+  it("keeps an inspection that is off by default off until turned on", () => {
+    const serial = find(tree, `Java/${JAVA_SERIAL_VERSION_INSPECTION}`)!;
+    expect(checkState({}, serial)).toBe("off");
+    let o = setEnabled({}, serial, true);
+    expect(o).toEqual({ [JAVA_SERIAL_VERSION_INSPECTION]: { enabled: true } });
+    expect(checkState(o, serial)).toBe("on");
+    o = setEnabled(o, serial, false);
+    expect(o).toEqual({});
+    // Turning a whole group on or off only records what differs from each default.
+    const java = find(tree, "group:Java")!;
+    expect(setEnabled({}, java, true)).toEqual({ [JAVA_SERIAL_VERSION_INSPECTION]: { enabled: true } });
+  });
+
   it("keeps severity and enabled overrides independent", () => {
     let o = setLevel({}, "lsp:ruff", "error");
     o = setEnabled(o, find(tree, "Python/lsp:ruff")!, false);
diff --git a/src/features/settings/__tests__/languages.test.ts b/src/features/settings/__tests__/languages.test.ts
index a53555f3..c4b26681 100644
--- a/src/features/settings/__tests__/languages.test.ts
+++ b/src/features/settings/__tests__/languages.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   DEFAULT_LANGUAGES,
+  PHP_LANGUAGE_LEVELS,
   folderRole,
   markFolder,
   normalizeFolder,
@@ -21,7 +22,12 @@ describe("languages settings", () => {
       node: { packageManager: "pip" },
       rust: { checkCommand: "clippy", checkOnSave: false },
       typescript: { version: "" },
-      java: { jdtlsVmArgs: " -Xmx2g ", jdk: 21, jdtlsJdk: " /opt/jdk-25 ", maven: { home: " /opt/maven " } },
+      java: {
+        jdtlsVmArgs: " -Xmx2g ",
+        jdk: 21,
+        jdtlsJdk: " /opt/jdk-25 ",
+        maven: { home: " /opt/maven ", daemon: "yes", mvndHome: " /opt/mvnd " },
+      },
     });
     expect(v.python).toEqual({ interpreter: "/usr/bin/python3", activateVirtualenv: true });
     expect(v.node.packageManager).toBe("");
@@ -31,7 +37,14 @@ describe("languages settings", () => {
     expect(v.java.jdtlsVmArgs).toBe("-Xmx2g");
     expect(v.java.jdk).toBe("");
     expect(v.java.jdtlsJdk).toBe("/opt/jdk-25");
-    expect(v.java.maven).toEqual({ home: "/opt/maven", userSettings: "", localRepository: "", unlinkedProjects: [] });
+    expect(v.java.maven).toEqual({
+      home: "/opt/maven",
+      userSettings: "",
+      localRepository: "",
+      unlinkedProjects: [],
+      daemon: false,
+      mvndHome: "/opt/mvnd",
+    });
     expect(validateSettings({}).languages).toEqual(DEFAULT_LANGUAGES);
   });
 
@@ -43,6 +56,30 @@ describe("languages settings", () => {
     expect(validateSettings(settings).languages.ruby.interpreter).toBe("/opt/ruby/bin/ruby");
   });
 
+  it("defaults the PHP language level to Auto and keeps only known levels", () => {
+    expect(validateSettings({}).languages.php).toEqual({
+      interpreter: "",
+      languageLevel: "",
+      includePaths: [],
+      stubs: [],
+    });
+    const lists = validateLanguages({ php: { includePaths: [" ../platform ", "", 3, "../platform"], stubs: "redis" } });
+    expect(lists.php.includePaths).toEqual(["../platform"]);
+    expect(lists.php.stubs).toEqual([]);
+    expect(validateLanguages({ php: { languageLevel: "7.4" } }).php.languageLevel).toBe("7.4");
+    for (const level of ["7.4.3", "9.0", 8.1, null]) {
+      expect(validateLanguages({ php: { languageLevel: level } }).php.languageLevel).toBe("");
+    }
+    expect(PHP_LANGUAGE_LEVELS[0]).toBe("");
+    expect(PHP_LANGUAGE_LEVELS).toContain("5.6");
+    expect(PHP_LANGUAGE_LEVELS.at(-1)).toBe("8.5");
+  });
+
+  it("finds the PHP page by its language level", () => {
+    const php = LANGUAGE_PAGES.find((p) => p.id === "languages.php")!;
+    expect(php.keywords).toContain("language level");
+  });
+
   it("keeps Prettier opt-in on save and normalizes its enabled languages", () => {
     expect(validateLanguages({}).prettier).toMatchObject({ prefer: false, runOnSave: false, path: "" });
     expect(
diff --git a/src/features/settings/__tests__/phpStatus.test.tsx b/src/features/settings/__tests__/phpStatus.test.tsx
new file mode 100644
index 00000000..197b1539
--- /dev/null
+++ b/src/features/settings/__tests__/phpStatus.test.tsx
@@ -0,0 +1,233 @@
+import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { executeAction, registerAction } from "@/platform/actions";
+import { setContext } from "@/platform/context";
+import { useProject } from "@/platform/project";
+import type { PhpLanguageLevels, ProjectInfo, Settings } from "@/bindings";
+
+type FsChange = { created: string[]; modified: string[]; removed: string[] };
+
+const mocks = vi.hoisted(() => ({
+  notify: vi.fn(),
+  level: vi.fn(),
+  set: vi.fn(),
+  fsChanged: undefined as ((e: FsChange) => void) | undefined,
+  component: null as React.ComponentType | null,
+}));
+vi.mock("@/platform/ipc", () => ({
+  call: (p: unknown) => p,
+  isTauri: () => true,
+  onIdeEvent: (name: string, handler: (e: FsChange) => void) => {
+    if (name === "fsChanged") mocks.fsChanged = handler;
+    return () => {};
+  },
+  commands: { sdkPhpLanguageLevel: mocks.level, settingsSet: mocks.set },
+}));
+vi.mock("@/workbench/contributions", () => ({
+  notifications: () => ({ notify: mocks.notify }),
+  registerStatusItem: (item: { component: React.ComponentType }) => {
+    mocks.component = item.component;
+    return () => {};
+  },
+}));
+import { activatePhpStatus } from "../languages/PhpStatus";
+
+const fromComposer: PhpLanguageLevels = {
+  effective: { version: "7.4.0", source: "require" },
+  auto: { version: "7.4.0", source: "require" },
+  member: null,
+};
+
+const focus = (language: string, path: string) =>
+  act(() => {
+    setContext("editorLangId", language);
+    setContext("editorPath", path);
+  });
+
+let dispose: () => void;
+beforeEach(() => {
+  vi.clearAllMocks();
+  mocks.level.mockResolvedValue(fromComposer);
+  mocks.set.mockImplementation((_scope: string, _key: string, value: string) =>
+    Promise.resolve({ languages: { php: { languageLevel: JSON.parse(value) } } }),
+  );
+  useProject.setState({ project: { root: "/project" } as ProjectInfo, settings: null });
+  setContext("projectOpen", true);
+  setContext("editorLangId", null);
+  setContext("editorPath", null);
+  dispose = activatePhpStatus();
+});
+afterEach(() => {
+  vi.useRealTimers();
+  cleanup();
+  dispose();
+});
+
+const mount = () => {
+  const Component = mocks.component!;
+  return render(<Component />);
+};
+
+const pick = async (label: string) => {
+  await act(() => executeAction("php.languageLevelPopup"));
+  fireEvent.click(await screen.findByRole("menuitemcheckbox", { name: label }));
+};
+
+describe("PHP language level status", () => {
+  it("stays hidden for other editors without asking the backend", async () => {
+    mount();
+    await focus("typescript", "/project/src/app.ts");
+    expect(screen.queryByRole("button")).toBeNull();
+    expect(mocks.level).not.toHaveBeenCalled();
+  });
+
+  it("shows the effective level of the focused PHP file and where it comes from", async () => {
+    mount();
+    await focus("php", "/project/src/Invoice.php");
+    const button = await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    expect(button.textContent).toBe("PHP 7.4");
+    expect(button.dataset.tooltip).toBe("PHP 7.4.0, the lowest version require.php in composer.json allows");
+    expect(mocks.level).toHaveBeenCalledWith("/project/src/Invoice.php");
+    await focus("markdown", "/project/README.md");
+    expect(screen.queryByRole("button")).toBeNull();
+  });
+
+  it("names config.platform.php and the language server default", async () => {
+    mocks.level.mockResolvedValueOnce({
+      effective: { version: "7.2.34", source: "platform" },
+      auto: null,
+      member: null,
+    });
+    mount();
+    await focus("php", "/project/a.php");
+    const button = await screen.findByRole("button", { name: "PHP Language Level: PHP 7.2" });
+    expect(button.dataset.tooltip).toBe("PHP 7.2.34, from config.platform.php in composer.json");
+    mocks.level.mockResolvedValueOnce({ effective: null, auto: null, member: null });
+    await focus("php", "/project/b.php");
+    const fallback = await screen.findByRole("button", { name: "PHP Language Level: PHP" });
+    expect(fallback.dataset.tooltip).toBe(
+      "No PHP version in the settings or composer.json: Intelephense uses its default",
+    );
+  });
+
+  it("writes the picked level to the project settings", async () => {
+    mount();
+    await focus("php", "/project/src/Invoice.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    mocks.level.mockResolvedValue({ ...fromComposer, effective: { version: "8.1.0", source: "settings" } });
+    await pick("8.1");
+    await waitFor(() =>
+      expect(mocks.set).toHaveBeenCalledWith("project", "languages.php.languageLevel", JSON.stringify("8.1")),
+    );
+    const button = await screen.findByRole("button", { name: "PHP Language Level: PHP 8.1" });
+    expect(button.dataset.tooltip).toBe("PHP 8.1.0, set in the settings");
+    expect(useProject.getState().settings?.languages?.php?.languageLevel).toBe("8.1");
+  });
+
+  it("shows what Auto resolves to and clears the level with it", async () => {
+    mocks.level.mockResolvedValue({ ...fromComposer, effective: { version: "8.1.0", source: "settings" } });
+    useProject.setState({ settings: { languages: { php: { languageLevel: "8.1" } } } as Settings });
+    mount();
+    await focus("php", "/project/src/Invoice.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 8.1" });
+    await act(() => executeAction("php.languageLevelPopup"));
+    expect(screen.getByRole("menuitemcheckbox", { name: "8.1" }).getAttribute("aria-checked")).toBe("true");
+    const auto = screen.getByRole("menuitemcheckbox", { name: /^Auto/ });
+    expect(auto.getAttribute("aria-checked")).toBe("false");
+    expect(auto.textContent).toContain("7.4");
+    mocks.level.mockResolvedValue(fromComposer);
+    fireEvent.click(auto);
+    await waitFor(() =>
+      expect(mocks.set).toHaveBeenCalledWith("project", "languages.php.languageLevel", JSON.stringify("")),
+    );
+    expect(await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" })).toBeTruthy();
+  });
+
+  it("re-reads the level once after composer.json of the project or a linked project changes", async () => {
+    useProject.setState({ project: { root: "/project", workspace: { projects: ["/linked/api"] } } as ProjectInfo });
+    mount();
+    await focus("php", "/project/src/Invoice.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    vi.useFakeTimers();
+    const change = (...modified: string[]) => act(() => mocks.fsChanged!({ created: [], modified, removed: [] }));
+    await change("/project/vendor/acme/lib/composer.json", "/project/src/composer.json");
+    await act(() => vi.advanceTimersByTimeAsync(1000));
+    expect(mocks.level).toHaveBeenCalledTimes(1);
+    // Each change in a burst restarts the wait.
+    await change("/project/composer.json");
+    await act(() => vi.advanceTimersByTimeAsync(200));
+    await change("/project/composer.json");
+    await act(() => vi.advanceTimersByTimeAsync(299));
+    expect(mocks.level).toHaveBeenCalledTimes(1);
+    await act(() => vi.advanceTimersByTimeAsync(1));
+    expect(mocks.level).toHaveBeenCalledTimes(2);
+    await change("/linked/api/composer.json");
+    await act(() => vi.advanceTimersByTimeAsync(300));
+    expect(mocks.level).toHaveBeenCalledTimes(3);
+  });
+
+  it("re-reads the level when the PHP language level setting changes, not other settings", async () => {
+    mount();
+    await focus("php", "/project/src/Invoice.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    act(() => useProject.setState({ settings: { editor: { fontSize: 15 } } as Settings }));
+    expect(mocks.level).toHaveBeenCalledTimes(1);
+    act(() => useProject.setState({ settings: { languages: { php: { languageLevel: "8.1" } } } as Settings }));
+    await waitFor(() => expect(mocks.level).toHaveBeenCalledTimes(2));
+  });
+
+  it("shows a workspace member's level but leaves its choice to the member's settings", async () => {
+    mocks.level.mockResolvedValue({ ...fromComposer, member: "/project/api" });
+    mount();
+    await focus("php", "/project/api/src/Invoice.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    await act(() => executeAction("php.languageLevelPopup"));
+    expect(screen.getByText("Set in the settings of the linked project api")).toBeTruthy();
+    const items = screen.getAllByRole("menuitemcheckbox");
+    expect(items.map((item) => item.getAttribute("aria-disabled"))).toEqual(items.map(() => "true"));
+    expect(screen.getByRole("menuitemcheckbox", { name: /^Auto/ }).getAttribute("aria-checked")).toBe("true");
+    fireEvent.click(screen.getByRole("menuitemcheckbox", { name: "8.1" }));
+    expect(mocks.set).not.toHaveBeenCalled();
+  });
+
+  it("drops the previous file's level and menu when another PHP file is focused", async () => {
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+    mocks.level.mockResolvedValueOnce({ ...fromComposer, member: "/project/api" });
+    mount();
+    await focus("php", "/project/api/src/Order.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    await act(() => executeAction("php.languageLevelPopup"));
+    expect(screen.getByRole("menu")).toBeTruthy();
+    mocks.level.mockRejectedValueOnce(new Error("project closed"));
+    await focus("php", "/project/src/Invoice.php");
+    expect(screen.queryByRole("button")).toBeNull();
+    expect(screen.queryByRole("menu")).toBeNull();
+    await waitFor(() => expect(warn).toHaveBeenCalled());
+    expect(mocks.level).toHaveBeenLastCalledWith("/project/src/Invoice.php");
+    expect(screen.queryByRole("button")).toBeNull();
+    // The menu does not come back with the next level.
+    await focus("php", "/project/api/src/Order.php");
+    await screen.findByRole("button", { name: "PHP Language Level: PHP 7.4" });
+    expect(screen.queryByRole("menu")).toBeNull();
+    warn.mockRestore();
+  });
+
+  it("ignores levels it does not list and reports write failures", async () => {
+    await executeAction("php.selectLanguageLevel", "9.9");
+    expect(mocks.set).not.toHaveBeenCalled();
+    mocks.set.mockRejectedValueOnce(new Error("write failed"));
+    await executeAction("php.selectLanguageLevel", "8.1");
+    expect(mocks.notify).toHaveBeenCalledWith(expect.objectContaining({ level: "error" }));
+    expect(useProject.getState().settings).toBeNull();
+  });
+
+  it("opens the PHP settings page while the widget is hidden", async () => {
+    const run = vi.fn();
+    const off = registerAction({ id: "file.settings", title: "Settings…", run });
+    mount();
+    await focus("typescript", "/project/src/app.ts");
+    await executeAction("php.languageLevelPopup");
+    expect(run.mock.calls.map(([ctx]) => ctx.arg)).toEqual(["languages.php"]);
+    off();
+  });
+});
diff --git a/src/features/settings/__tests__/settingsWindowOpen.test.ts b/src/features/settings/__tests__/settingsWindowOpen.test.ts
index f1ed12a2..64b5ced2 100644
--- a/src/features/settings/__tests__/settingsWindowOpen.test.ts
+++ b/src/features/settings/__tests__/settingsWindowOpen.test.ts
@@ -38,7 +38,10 @@ describe("the native Settings window", () => {
   it("opens even when a page fails to register, and logs why", async () => {
     vi.spyOn(console, "error").mockImplementation(() => {});
     const dispose = activateSettingsWindow("main");
+    expect(useSettingsDialog.getState().open).toBe(true);
+    expect(useSettingsDialog.getState().pagesLoading).toBe(true);
     await vi.waitFor(() => expect(useSettingsDialog.getState().open).toBe(true));
+    await vi.waitFor(() => expect(useSettingsDialog.getState().pagesLoading).toBe(false));
     expect(logFrontend).toHaveBeenCalledWith(
       "error",
       expect.stringContaining("cannot register settings pages: Error: page failed"),
diff --git a/src/features/settings/dialog/SettingsDialog.module.css b/src/features/settings/dialog/SettingsDialog.module.css
index d7bad042..f457b4a8 100644
--- a/src/features/settings/dialog/SettingsDialog.module.css
+++ b/src/features/settings/dialog/SettingsDialog.module.css
@@ -63,6 +63,15 @@
   flex-direction: column;
   min-height: 0;
 }
+.loading {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 0;
+  color: var(--fg-subtle);
+  font-size: var(--fs-small);
+}
 .pageHeader {
   flex: none;
   display: flex;
diff --git a/src/features/settings/dialog/SettingsDialog.tsx b/src/features/settings/dialog/SettingsDialog.tsx
index 9d6bbf74..0ae1ab28 100644
--- a/src/features/settings/dialog/SettingsDialog.tsx
+++ b/src/features/settings/dialog/SettingsDialog.tsx
@@ -17,6 +17,7 @@ import {
   Icon,
   IconButton,
   SearchField,
+  Spinner,
   Tree,
   type DialogButton,
   type TreeHandle,
@@ -220,7 +221,7 @@ function SettingsDialogInner() {
 /** Page tree + current page; reads the shared settings staging store. */
 export function SettingsLayout() {
   const pages = useSettingsPages((s) => s.pages);
-  const { pageId, query, staged, stagedSecrets, stagedExternal, saving } = useSettingsDialog();
+  const { pageId, query, staged, stagedSecrets, stagedExternal, saving, pagesLoading } = useSettingsDialog();
   const treeRef = useRef<TreeHandle>(null);
 
   const tree = useMemo(() => buildPageTree(pages.values()), [pages]);
@@ -265,6 +266,16 @@ export function SettingsLayout() {
     }
   };
 
+  if (pagesLoading) {
+    return (
+      <div className={styles.layout}>
+        <div className={styles.loading}>
+          <Spinner size={16} /> <T>Loading…</T>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className={styles.layout}>
       <div className={styles.sidebar}>
diff --git a/src/features/settings/iconThemePages.tsx b/src/features/settings/iconThemePages.tsx
new file mode 100644
index 00000000..fbc00fcf
--- /dev/null
+++ b/src/features/settings/iconThemePages.tsx
@@ -0,0 +1,60 @@
+import { useContributedIconThemes, type IconThemeChoice, type IconThemeDetails } from "@/platform/themes";
+import { registerSettingsPage } from "@/workbench/contributions";
+import { IconThemeSettings } from "./pages/IconThemeSettings";
+
+function keywords(theme: IconThemeChoice, details: IconThemeDetails): string[] {
+  const words = details.settings.flatMap((s) => [
+    s.title,
+    ...s.items.flatMap((item) => {
+      if (item.option === "groups") return details.groups.map((g) => g.name);
+      if (item.option === "choice") return details.choices.filter((c) => c.id === item.choice).map((c) => c.name);
+      return [item.label ?? ""];
+    }),
+  ]);
+  return [theme.origin ?? "", ...words].filter(Boolean);
+}
+
+function register(theme: IconThemeChoice, page: string, details: IconThemeDetails): () => void {
+  return registerSettingsPage({
+    id: page,
+    title: theme.label,
+    keywords: keywords(theme, details),
+    component: () => <IconThemeSettings themeKey={theme.id} details={details} />,
+  });
+}
+
+export function trackIconThemePages(): () => void {
+  const pages = new Map<IconThemeChoice, () => void>();
+  const pending = new Set<IconThemeChoice>();
+  const add = async (theme: IconThemeChoice, page: string) => {
+    pending.add(theme);
+    try {
+      const details = await theme.details?.();
+      if (!pending.has(theme) || !details?.settings.length) return;
+      pages.set(theme, register(theme, page, details));
+    } catch (e) {
+      console.warn(`icon theme ${theme.id}: cannot load its settings`, e);
+    } finally {
+      pending.delete(theme);
+    }
+  };
+  const sync = (themes: readonly IconThemeChoice[]) => {
+    for (const theme of pending) if (!themes.includes(theme)) pending.delete(theme);
+    for (const [theme, undo] of pages) {
+      if (themes.includes(theme)) continue;
+      undo();
+      pages.delete(theme);
+    }
+    for (const theme of themes) {
+      if (theme.settingsPage && !pages.has(theme) && !pending.has(theme)) void add(theme, theme.settingsPage);
+    }
+  };
+  sync(useContributedIconThemes.getState().themes);
+  const unsubscribe = useContributedIconThemes.subscribe((s) => sync(s.themes));
+  return () => {
+    unsubscribe();
+    pending.clear();
+    pages.forEach((undo) => undo());
+    pages.clear();
+  };
+}
diff --git a/src/features/settings/index.ts b/src/features/settings/index.ts
index 802a17da..9f1b3d03 100644
--- a/src/features/settings/index.ts
+++ b/src/features/settings/index.ts
@@ -24,6 +24,7 @@ import { LazySettingsDialog, loadBuiltinPages, unloadBuiltinPages } from "./dial
 import {
   closeSettings,
   openSettings,
+  rebaseSettings,
   selectPage,
   setNewProjects,
   setQuery,
@@ -37,10 +38,13 @@ import { installActionProxies, installSettingsHost } from "./window/bridge";
 import { AssignShortcutOverlay, showAssignShortcut } from "./keymap/AssignShortcut";
 import { settingsSearchEntries } from "./searchIndex";
 import { activatePythonStatus } from "./languages/PythonStatus";
+import { activatePhpStatus } from "./languages/PhpStatus";
 import { nativeToAsciiAction } from "./nativeToAscii";
 import { isImeKey } from "@/platform/ime";
+import { trackIconThemePages } from "./iconThemePages";
 
-export { settingsWindowParent } from "./window/bridge";
+/** Settings-driven runtime state (zoom, fonts, theme) of a secondary window. */
+export const activateRuntimeSettings = trackRuntimeSettings;
 export const SettingsWindow = lazyComponent(() => import("./window/SettingsWindow").then((m) => m.SettingsWindow));
 
 /** Same event as `windows::LAUNCH_EVENT`: a pending launch (page) is waiting. */
@@ -104,7 +108,9 @@ async function showSettings(page?: string, newProjects = false) {
 export function activate(): () => void {
   const disposers = [
     trackRuntimeSettings(),
+    trackIconThemePages(),
     activatePythonStatus(),
+    activatePhpStatus(),
     unloadBuiltinPages,
     registerOverlay({ id: "settings.dialog", component: LazySettingsDialog }),
     registerActions(zoomActions()),
@@ -192,6 +198,7 @@ function installWindowKeys(): () => void {
 export function activateSettingsWindow(parent: string): () => void {
   const disposers = [
     trackRuntimeSettings(),
+    trackIconThemePages(),
     unloadBuiltinPages,
     registerActions(settingsActions((page, newProjects) => relaunch({ page, newProjects: !!newProjects }))),
     installActionProxies(parent),
@@ -207,20 +214,24 @@ export function activateSettingsWindow(parent: string): () => void {
     }),
   ];
   void (async () => {
-    let launch: SettingsLaunch | null = null;
+    useSettingsDialog.setState({ pagesLoading: true });
+    openSettings();
     try {
-      // A page that fails to register is reported; the window still opens with the others.
-      await loadBuiltinPages().catch((e) => logError("cannot register settings pages", e));
-      await restoreRemote();
-      const project = await commands.projectCurrent().catch(() => null);
-      if (project) useProject.setState({ project, settings: project.settings });
-      else await loadSettings().catch((e) => console.warn("cannot load settings", e));
-      // `listenLaunch` may have taken the launch first and applied it already.
-      launch = await takeLaunch();
+      const launch = await takeLaunch();
+      relaunch(launch);
+      await Promise.all([
+        loadBuiltinPages().catch((e) => logError("cannot register settings pages", e)),
+        (async () => {
+          await restoreRemote();
+          const project = await commands.projectCurrent().catch(() => null);
+          if (project) useProject.setState({ project, settings: project.settings });
+          else await loadSettings().catch((e) => console.warn("cannot load settings", e));
+          rebaseSettings();
+        })(),
+      ]);
     } finally {
-      // Without this the window would stay an empty title bar.
-      openSettings(launch?.page, { newProjects: launch?.newProjects ?? useSettingsDialog.getState().newProjects });
+      useSettingsDialog.setState({ pagesLoading: false });
     }
-  })();
+  })().catch((e) => logError("settings window startup failed", e));
   return () => disposers.reverse().forEach((d) => d());
 }
diff --git a/src/features/settings/languages/LanguagePages.tsx b/src/features/settings/languages/LanguagePages.tsx
index aef869b3..12b9adae 100644
--- a/src/features/settings/languages/LanguagePages.tsx
+++ b/src/features/settings/languages/LanguagePages.tsx
@@ -5,7 +5,8 @@
  */
 import { useId, useMemo } from "react";
 import { IconButton, Input, type SelectOption } from "@/ui";
-import { Row, Section, Select, Toggle } from "../components/Form";
+import { PHP_LANGUAGE_LEVELS } from "@/platform/languageSettings";
+import { GlobListEditor, Row, Section, Select, Toggle } from "../components/Form";
 import { choosePath } from "./api";
 import { useSetting } from "../components/context";
 import { SdkField, tildify, useDetected } from "./components";
@@ -112,12 +113,55 @@ export function NodePage() {
 // ---------------------------------------------------------------------------
 // PHP
 
+const PHP_LEVEL_OPTIONS: SelectOption[] = PHP_LANGUAGE_LEVELS.map((level) =>
+  level ? { value: level, label: level } : { value: "", label: "Auto", detail: "from composer.json" },
+);
+
 export function PhpPage() {
   const [interpreter] = useSetting<string>("languages.php.interpreter");
+  const [level, setLevel] = useSetting<string>("languages.php.languageLevel");
+  const [includePaths, setIncludePaths] = useSetting<string[]>("languages.php.includePaths");
+  const [stubs, setStubs] = useSetting<string[]>("languages.php.stubs");
   const { list } = useDetected("php");
   const selected = list.find((s) => s.path === interpreter) ?? (interpreter ? undefined : list[0]);
   return (
     <div className={styles.page}>
+      <Section>
+        <Row
+          label="PHP language level"
+          hint="The PHP version Intelephense checks the code against: newer syntax and functions are reported. Auto uses config.platform.php from composer.json, else the lowest version require.php allows."
+        >
+          <Select value={level} options={PHP_LEVEL_OPTIONS} onChange={setLevel} aria-label="PHP language level" />
+        </Row>
+        <Row
+          label="Include paths"
+          stacked
+          hint="Folders outside the project whose classes and functions Intelephense indexes too, such as the platform a module extends. Absolute, or relative to the project."
+        >
+          <GlobListEditor
+            value={includePaths ?? []}
+            onChange={setIncludePaths}
+            placeholder="/path/to/platform"
+            emptyText="No include paths"
+            itemLabel="Include path"
+            aria-label="Include paths"
+          />
+        </Row>
+        <Row
+          label="Additional stubs"
+          stacked
+          hint="Intelephense stub sets loaded on top of its defaults, such as wordpress. Each ext-* in require or require-dev of composer.json adds its own."
+        >
+          <GlobListEditor
+            value={stubs ?? []}
+            onChange={setStubs}
+            placeholder="Stub name, e.g. wordpress"
+            emptyText="No additional stubs"
+            itemLabel="Stub"
+            aria-label="Additional stubs"
+          />
+        </Row>
+      </Section>
       <Section title="CLI Interpreter">
         <SdkRow
           k="languages.php.interpreter"
@@ -382,6 +426,7 @@ export function GradlePage() {
 }
 
 export function MavenPage() {
+  const [daemon, setDaemon] = useSetting<boolean>("languages.java.maven.daemon");
   return (
     <div className={styles.page}>
       <Section>
@@ -394,7 +439,7 @@ export function MavenPage() {
           directory
           browseTitle="Select Maven Home Directory"
           aria-label="Maven home path"
-          hint="Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw."
+          hint="Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw. Bypassed while the Maven daemon is enabled."
         />
         <PathInput
           k="languages.java.maven.userSettings"
@@ -411,6 +456,19 @@ export function MavenPage() {
           title="Select Local Repository"
           hint="Passed as -Dmaven.repo.local."
         />
+        <Toggle
+          label="Use Maven Daemon (mvnd)"
+          checked={daemon}
+          onChange={setDaemon}
+          hint="Builds, sync and Maven run configurations run through mvnd for speed. It embeds its own Maven (the home and mvnw are bypassed), needs Java 17+ and builds in parallel by default. Falls back to mvn when mvnd is missing or the JDK is too old."
+        />
+        <PathInput
+          k="languages.java.maven.mvndHome"
+          label="Maven Daemon home path"
+          placeholder="MVND_HOME, else auto-detected"
+          title="Select Maven Daemon Home Directory"
+          hint="The mvnd home (or its executable). Empty = $MVND_HOME, else mvnd on PATH."
+        />
       </Section>
     </div>
   );
diff --git a/src/features/settings/languages/PhpStatus.tsx b/src/features/settings/languages/PhpStatus.tsx
new file mode 100644
index 00000000..122af644
--- /dev/null
+++ b/src/features/settings/languages/PhpStatus.tsx
@@ -0,0 +1,188 @@
+import { useEffect, useRef } from "react";
+import { create } from "zustand";
+import { executeAction, registerActions } from "@/platform/actions";
+import { getContext, useContextKeys } from "@/platform/context";
+import { call, commands, onIdeEvent, type PhpLanguageLevel, type PhpLanguageLevels } from "@/platform/ipc";
+import { PHP_LANGUAGE_LEVELS } from "@/platform/languageSettings";
+import { basename, useProject } from "@/platform/project";
+import { tx } from "@/platform/i18n";
+import { notifications, registerStatusItem } from "@/workbench/contributions";
+import { BarButton, Menu, type MenuItem } from "@/ui";
+import { phpLanguageLevel } from "./api";
+
+/** What the widget last resolved for a file, so the popup action can read it without a render. */
+interface Status extends PhpLanguageLevels {
+  root: string;
+  path: string;
+}
+
+const usePopup = create<{ open: boolean; status: Status | null }>(() => ({ open: false, status: null }));
+const close = () => usePopup.setState({ open: false });
+const reset = () => usePopup.setState({ open: false, status: null });
+
+/** Whether the widget is on screen, read straight from the stores (the action runs outside a render). */
+function popupShown(): boolean {
+  const root = useProject.getState().project?.root;
+  const status = usePopup.getState().status;
+  const context = getContext();
+  return !!root && status?.root === root && status.path === context.editorPath && context.editorLangId === "php";
+}
+
+/** `8.1.0` as `8.1`, the way the levels are listed. */
+const shortVersion = (level: PhpLanguageLevel) => level.version.split(".").slice(0, 2).join(".");
+
+function origin(level: PhpLanguageLevel | null): string {
+  if (!level) return tx("No PHP version in the settings or composer.json: Intelephense uses its default");
+  const version = level.version;
+  switch (level.source) {
+    case "settings":
+      return tx`PHP ${version}, set in the settings`;
+    case "platform":
+      return tx`PHP ${version}, from config.platform.php in composer.json`;
+    case "require":
+      return tx`PHP ${version}, the lowest version require.php in composer.json allows`;
+  }
+}
+
+function PhpStatus() {
+  const root = useProject((s) => s.project?.root);
+  const linked = useProject((s) => s.project?.workspace?.projects);
+  const configured = useProject((s) => s.settings?.languages?.php?.languageLevel ?? "");
+  const path = useContextKeys((s) =>
+    s.editorLangId === "php" && typeof s.editorPath === "string" ? s.editorPath : null,
+  );
+  const status = usePopup((s) => s.status);
+  const open = usePopup((s) => s.open);
+  const anchor = useRef<HTMLButtonElement>(null);
+  useEffect(() => reset, [root]);
+  // The menu belongs to the focused file.
+  useEffect(() => close, [path]);
+  useEffect(() => {
+    if (!root || !path) return;
+    let live = true;
+    let sequence = 0;
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    // Auto reads the composer.json of the project or of the linked project the file is in.
+    const manifests = new Set([root, ...(linked ?? [])].map((dir) => `${dir}/composer.json`));
+    const refresh = async () => {
+      const request = ++sequence;
+      try {
+        const level = await phpLanguageLevel(path);
+        if (live && sequence === request) usePopup.setState({ status: level && { root, path, ...level } });
+      } catch (e) {
+        console.warn("Cannot read the PHP language level", e);
+      }
+    };
+    void refresh();
+    const off = onIdeEvent("fsChanged", (e) => {
+      if (![...e.created, ...e.modified, ...e.removed].some((file) => manifests.has(file))) return;
+      clearTimeout(timer);
+      timer = setTimeout(() => void refresh(), 300);
+    });
+    return () => {
+      live = false;
+      clearTimeout(timer);
+      off();
+    };
+  }, [root, linked, path, configured]);
+  // The widget only renders once its project's level is in the store, so the popup action
+  // sees the same state as the button without waiting for an effect to publish a flag.
+  if (!path || !popupShown() || !status) return null;
+  const { effective, auto, member } = status;
+  const label = effective ? `PHP ${shortVersion(effective)}` : "PHP";
+  const chosen = effective?.source === "settings" ? shortVersion(effective) : "";
+  // The choices write the workspace's settings, which a member does not read.
+  const name = member && basename(member);
+  const items: MenuItem[] = [
+    { kind: "header", label: "PHP Language Level" },
+    ...(name
+      ? [{ kind: "header", label: tx`Set in the settings of the linked project ${name}` } satisfies MenuItem]
+      : []),
+    ...PHP_LANGUAGE_LEVELS.map((level): MenuItem =>
+      level
+        ? {
+            label: level,
+            verbatim: true,
+            checked: level === chosen,
+            disabled: !!member,
+            run: () => void executeAction("php.selectLanguageLevel", level),
+          }
+        : {
+            label: "Auto",
+            shortcut: auto ? shortVersion(auto) : undefined,
+            checked: !chosen,
+            disabled: !!member,
+            run: () => void executeAction("php.selectLanguageLevel", ""),
+          },
+    ),
+  ];
+  return (
+    <>
+      <BarButton
+        ref={anchor}
+        tooltip={origin(effective)}
+        aria-label={tx`PHP Language Level: ${label}`}
+        aria-haspopup="menu"
+        aria-expanded={open}
+        onClick={() => void executeAction("php.languageLevelPopup")}
+      >
+        {label}
+      </BarButton>
+      <Menu
+        open={open}
+        onClose={close}
+        anchor={anchor}
+        placement="top-end"
+        items={items}
+        aria-label="PHP Language Level"
+      />
+    </>
+  );
+}
+
+export function activatePhpStatus(): () => void {
+  const dispose = [
+    registerStatusItem({
+      id: "php.languageLevel",
+      title: "PHP Language Level",
+      align: "right",
+      priority: 89,
+      component: PhpStatus,
+    }),
+    registerActions([
+      {
+        id: "php.languageLevelPopup",
+        title: "PHP Language Level",
+        category: "Settings",
+        keywords: ["php version"],
+        when: "projectOpen",
+        run: () =>
+          popupShown()
+            ? usePopup.setState((s) => ({ open: !s.open }))
+            : void executeAction("file.settings", "languages.php"),
+      },
+      {
+        id: "php.selectLanguageLevel",
+        title: "Select PHP Language Level",
+        category: "Settings",
+        hidden: true,
+        run: async ({ arg }) => {
+          const project = useProject.getState().project;
+          if (!project || typeof arg !== "string" || !PHP_LANGUAGE_LEVELS.some((level) => level === arg)) return;
+          try {
+            const settings = await call(
+              commands.settingsSet("project", "languages.php.languageLevel", JSON.stringify(arg)),
+            );
+            if (useProject.getState().project === project) useProject.setState({ settings });
+          } catch (e) {
+            notifications().notify({ level: "error", title: "Cannot select PHP language level", body: String(e) });
+          }
+        },
+      },
+    ]),
+  ];
+  return () => {
+    reset();
+    dispose.reverse().forEach((d) => d());
+  };
+}
diff --git a/src/features/settings/languages/api.ts b/src/features/settings/languages/api.ts
index b56ba951..64551173 100644
--- a/src/features/settings/languages/api.ts
+++ b/src/features/settings/languages/api.ts
@@ -4,7 +4,16 @@
  */
 import { Channel } from "@tauri-apps/api/core";
 import { create } from "zustand";
-import { call, commands, isTauri, nextRequestId, type PythonPackage, type Sdk, type SdkKind } from "@/platform/ipc";
+import {
+  call,
+  commands,
+  isTauri,
+  nextRequestId,
+  type PhpLanguageLevels,
+  type PythonPackage,
+  type Sdk,
+  type SdkKind,
+} from "@/platform/ipc";
 
 export type { PythonPackage, Sdk, SdkKind };
 
@@ -97,6 +106,11 @@ export function effectivePython(): Promise<string | null> {
   return isTauri() ? call(commands.sdkPythonEffective()) : Promise.resolve(null);
 }
 
+/** The PHP language level of the project `path` belongs to; null outside Tauri. */
+export function phpLanguageLevel(path: string): Promise<PhpLanguageLevels | null> {
+  return isTauri() ? call(commands.sdkPhpLanguageLevel(path)) : Promise.resolve(null);
+}
+
 /** File / folder chooser (Tauri dialog); null when cancelled or outside Tauri. */
 export async function choosePath(opts: {
   directory: boolean;
diff --git a/src/features/settings/model/behaviorSchema.ts b/src/features/settings/model/behaviorSchema.ts
index 6b2552df..bfcd7194 100644
--- a/src/features/settings/model/behaviorSchema.ts
+++ b/src/features/settings/model/behaviorSchema.ts
@@ -5,7 +5,9 @@
  */
 
 import { isThemeChoiceId, type ThemeChoiceId } from "@/platform/themes";
+import type { FileIconThemeOptions } from "@/bindings";
 import { ZOOM_LIMITS } from "@/platform/zoom";
+import { validateIconThemeOptionsMap } from "@/platform/iconThemeOptions";
 
 export type Antialiasing = "subpixel" | "greyscale" | "none";
 export type OpenProjectIn = "ask" | "new" | "same" | "attach";
@@ -19,6 +21,7 @@ export interface AppearanceExtras {
   preferredDarkTheme: ConcreteTheme;
   /** A plugin's file icon theme (`<pluginId>/<themeId>`); empty for the built-in icons. */
   fileIconTheme: string;
+  fileIconThemeOptions: Record<string, FileIconThemeOptions>;
   zoom: number;
   useCustomFont: boolean;
   uiFontFamily: string;
@@ -73,6 +76,7 @@ export const DEFAULT_APPEARANCE_EXTRAS: AppearanceExtras = {
   preferredLightTheme: "light",
   preferredDarkTheme: "dark",
   fileIconTheme: "",
+  fileIconThemeOptions: {},
   zoom: 100,
   useCustomFont: false,
   uiFontFamily: "Inter",
@@ -127,6 +131,7 @@ export function validateAppearanceExtras(raw: unknown): AppearanceExtras {
     preferredDarkTheme: concrete(a.preferredDarkTheme, d.preferredDarkTheme),
     fileIconTheme:
       typeof a.fileIconTheme === "string" && /^[^/\s]+\/[^/\s]+$/.test(a.fileIconTheme) ? a.fileIconTheme : "",
+    fileIconThemeOptions: validateIconThemeOptionsMap(a.fileIconThemeOptions),
     zoom: int(a.zoom, d.zoom, ZOOM_LIMITS),
     useCustomFont: b("useCustomFont"),
     uiFontFamily: typeof a.uiFontFamily === "string" && a.uiFontFamily.trim() ? a.uiFontFamily.trim() : d.uiFontFamily,
diff --git a/src/features/settings/model/staging.ts b/src/features/settings/model/staging.ts
index 6bc437ad..b78d67bc 100644
--- a/src/features/settings/model/staging.ts
+++ b/src/features/settings/model/staging.ts
@@ -46,6 +46,7 @@ export interface SettingsDialogState {
   scopes: Record<string, Scope>;
   saving: boolean;
   error: string | null;
+  pagesLoading: boolean;
 }
 
 export const DEFAULT_PAGE = "appearance";
@@ -66,6 +67,7 @@ export const useSettingsDialog = create<SettingsDialogState>(() => ({
   scopes: {},
   saving: false,
   error: null,
+  pagesLoading: false,
 }));
 
 const stageKey = (scope: Scope, key: string) => `${scope}|${key}`;
@@ -109,6 +111,12 @@ async function loadGlobalBase() {
   }
 }
 
+export function rebaseSettings() {
+  const base = validateSettings(useProject.getState().settings);
+  useSettingsDialog.setState((s) => (s.open ? { base, globalBase: base } : {}));
+  void loadGlobalBase();
+}
+
 /** IDEA's File › New Projects Setup › Settings for New Projects. */
 export const settingsTitle = (newProjects: boolean) => (newProjects ? "Settings for New Projects" : "Settings");
 
@@ -129,6 +137,7 @@ export function closeSettings() {
     externalApplied: {},
     error: null,
     saving: false,
+    pagesLoading: false,
   });
 }
 
diff --git a/src/features/settings/pages/Behavior.module.css b/src/features/settings/pages/Behavior.module.css
index 0a36ad27..616b9beb 100644
--- a/src/features/settings/pages/Behavior.module.css
+++ b/src/features/settings/pages/Behavior.module.css
@@ -115,3 +115,21 @@
 .center {
   text-align: center;
 }
+
+.iconPacks {
+  display: grid;
+  grid-template-columns: repeat(var(--icon-pack-columns, 1), minmax(0, 1fr));
+  gap: 6px 24px;
+  padding: 2px 0;
+}
+
+.iconLabel {
+  padding: 2px 0;
+}
+
+.iconHint {
+  padding: 0 0 2px 20px;
+  color: var(--fg-subtle);
+  font-size: var(--fs-small);
+  line-height: 1.4;
+}
diff --git a/src/features/settings/pages/IconThemeSettings.tsx b/src/features/settings/pages/IconThemeSettings.tsx
new file mode 100644
index 00000000..f3317381
--- /dev/null
+++ b/src/features/settings/pages/IconThemeSettings.tsx
@@ -0,0 +1,159 @@
+import type { CSSProperties, ReactNode } from "react";
+import type { FileIconThemeOptions as Options } from "@/bindings";
+import { Checkbox, Select } from "@/ui";
+import { ICON_THEME_LIMITS, validateIconThemeOptions } from "@/platform/iconThemeOptions";
+import type { IconThemeDetails, IconThemeSettingItem } from "@/platform/themes";
+import { ColorSwatches, NumberInput, Row, Section, Toggle } from "../components/Form";
+import { useSetting } from "../components/context";
+import styles from "./Behavior.module.css";
+
+type Flag = "hideFiles" | "hideFolders" | "hideUiIcons" | "hidePsiIcons" | "hollowFolders";
+type Colour = "accent" | "monochrome";
+type Amount = keyof typeof ICON_THEME_LIMITS;
+
+const UNITS: Partial<Record<Amount, string>> = { opacity: "%", iconSize: "px", rowHeight: "px" };
+
+interface ItemProps {
+  item: IconThemeSettingItem;
+  details: IconThemeDetails;
+  options: Options;
+  set: (patch: Partial<Options>) => void;
+}
+
+function Hint({ text }: { text?: string | null }) {
+  return text ? <div className={styles.iconHint}>{text}</div> : null;
+}
+
+function Line({ children }: { children: ReactNode }) {
+  return <div className={styles.fontRow}>{children}</div>;
+}
+
+function FlagItem({ item, options, set, flag }: ItemProps & { flag: Flag }) {
+  const value = !!options[flag];
+  return (
+    <Toggle
+      label={item.label ?? ""}
+      hint={item.hint ? <span>{item.hint}</span> : undefined}
+      checked={item.invert ? !value : value}
+      onChange={(on) => set({ [flag]: item.invert ? !on : on })}
+    />
+  );
+}
+
+function GroupsItem({ item, details, options, set }: ItemProps) {
+  const style = { "--icon-pack-columns": item.columns ?? 1 } as CSSProperties;
+  return (
+    <>
+      {item.label && <div className={styles.iconLabel}>{item.label}</div>}
+      <div className={styles.iconPacks} style={style}>
+        {details.groups.map((g) => (
+          <Checkbox
+            key={g.id}
+            label={g.name}
+            checked={options.groups?.[g.id] ?? g.enabled}
+            onChange={(on) => set({ groups: { ...options.groups, [g.id]: on } })}
+          />
+        ))}
+      </div>
+      <Hint text={item.hint} />
+    </>
+  );
+}
+
+function ChoiceItem({ item, details, options, set }: ItemProps) {
+  const choice = details.choices.find((c) => c.id === item.choice);
+  if (!choice) return null;
+  return (
+    <Row label={item.label ?? choice.name} hint={item.hint ? <span>{item.hint}</span> : undefined}>
+      <Select
+        aria-label={item.label ?? choice.name}
+        value={options.choices?.[choice.id] ?? choice.default}
+        options={choice.options.map((o) => ({ value: o.id, label: o.name }))}
+        onChange={(value) => set({ choices: { ...options.choices, [choice.id]: value } })}
+      />
+    </Row>
+  );
+}
+
+function ColourItem({ item, options, set, colour }: ItemProps & { colour: Colour }) {
+  const label = item.label ?? "";
+  const value = options[colour];
+  const fallback = String(item.default ?? "");
+  return (
+    <>
+      <Line>
+        <Checkbox label={label} checked={!!value} onChange={(on) => set({ [colour]: on ? fallback : null })} />
+        {value && (
+          <ColorSwatches
+            value={value}
+            presets={[{ value: fallback, label: "Default" }]}
+            onChange={(v) => set({ [colour]: v })}
+            aria-label={label}
+          />
+        )}
+      </Line>
+      <Hint text={item.hint} />
+    </>
+  );
+}
+
+function AmountItem({ item, options, set, amount }: ItemProps & { amount: Amount }) {
+  const label = item.label ?? "";
+  const value = options[amount];
+  const fallback = Number(item.default ?? ICON_THEME_LIMITS[amount].min);
+  return (
+    <>
+      <Line>
+        <Checkbox label={label} checked={value != null} onChange={(on) => set({ [amount]: on ? fallback : null })} />
+        {value != null && (
+          <NumberInput
+            aria-label={label}
+            value={value}
+            {...ICON_THEME_LIMITS[amount]}
+            integer
+            unit={UNITS[amount]}
+            onChange={(v) => set({ [amount]: v })}
+          />
+        )}
+      </Line>
+      <Hint text={item.hint} />
+    </>
+  );
+}
+
+function Item(props: ItemProps) {
+  const { option } = props.item;
+  switch (option) {
+    case "hideFiles":
+    case "hideFolders":
+    case "hideUiIcons":
+    case "hidePsiIcons":
+    case "hollowFolders":
+      return <FlagItem {...props} flag={option} />;
+    case "groups":
+      return <GroupsItem {...props} />;
+    case "choice":
+      return <ChoiceItem {...props} />;
+    case "accent":
+    case "monochrome":
+      return <ColourItem {...props} colour={option} />;
+    case "saturation":
+    case "opacity":
+    case "iconSize":
+    case "rowHeight":
+      return <AmountItem {...props} amount={option} />;
+  }
+}
+
+export function IconThemeSettings({ themeKey, details }: { themeKey: string; details: IconThemeDetails }) {
+  const [all, setAll] = useSetting<Record<string, Options> | undefined>("appearance.fileIconThemeOptions");
+  const options = validateIconThemeOptions(all?.[themeKey]);
+  const set = (patch: Partial<Options>) => setAll({ ...all, [themeKey]: { ...options, ...patch } });
+  return details.settings.map((section, i) => (
+    <Section key={i} title={section.title}>
+      {section.items.map((item, j) => (
+        <Item key={j} item={item} details={details} options={options} set={set} />
+      ))}
+    </Section>
+  ));
+}
diff --git a/src/features/settings/pages/editor/general.tsx b/src/features/settings/pages/editor/general.tsx
index 009ae4ae..a34ac6cf 100644
--- a/src/features/settings/pages/editor/general.tsx
+++ b/src/features/settings/pages/editor/general.tsx
@@ -597,6 +597,12 @@ const GUTTER = editorPage({
               keywords: ["super method", "overrides", "implements"],
               component: () => <GutterGroup id="supers" label="Implementing and overriding methods" />,
             },
+            {
+              t: "custom",
+              label: "Color preview",
+              keywords: ["color", "swatch", "colour"],
+              component: () => <GutterGroup id="colors" label="Color preview" />,
+            },
           ],
         },
       ],
diff --git a/src/features/settings/pages/editor/inspectionsModel.ts b/src/features/settings/pages/editor/inspectionsModel.ts
index bf029bac..85293a6f 100644
--- a/src/features/settings/pages/editor/inspectionsModel.ts
+++ b/src/features/settings/pages/editor/inspectionsModel.ts
@@ -8,6 +8,7 @@ import {
   INSPECTION_LEVELS,
   codeInspectionId,
   customProfileId,
+  enabledByDefault,
   newProfileKey,
   overridesOf,
   producerInspectionId,
@@ -159,7 +160,7 @@ export function inspectionIds(node: InspectionNode): string[] {
   return [...(node.id ? [node.id] : []), ...node.children.flatMap(inspectionIds)];
 }
 
-export const isEnabled = (o: ProfileOverrides, id: string) => o[id]?.enabled !== false;
+export const isEnabled = (o: ProfileOverrides, id: string) => o[id]?.enabled ?? enabledByDefault(id);
 
 export type CheckState = "on" | "off" | "mixed";
 
@@ -181,9 +182,12 @@ function withOverride(o: ProfileOverrides, id: string, patch: Partial<Inspection
   return next;
 }
 
-/** Turns a node and all its descendants on or off (on is the default, so it removes the override). */
+/** Turns a node and all its descendants on or off; an inspection back at its default drops the override. */
 export function setEnabled(o: ProfileOverrides, node: InspectionNode, enabled: boolean): ProfileOverrides {
-  return inspectionIds(node).reduce((acc, id) => withOverride(acc, id, { enabled: enabled ? undefined : false }), o);
+  return inspectionIds(node).reduce(
+    (acc, id) => withOverride(acc, id, { enabled: enabled === enabledByDefault(id) ? undefined : enabled }),
+    o,
+  );
 }
 
 /** `undefined` restores the default ("As reported"). */
diff --git a/src/features/settings/pages/languages.tsx b/src/features/settings/pages/languages.tsx
index bf31e0b1..e547ba22 100644
--- a/src/features/settings/pages/languages.tsx
+++ b/src/features/settings/pages/languages.tsx
@@ -148,6 +148,8 @@ export const LANGUAGE_PAGES: PageSpec[] = [
     keywords: [
       "php interpreter",
       "cli interpreter",
+      "language level",
+      "php version",
       "php",
       "composer",
       "phpunit",
diff --git a/src/features/settings/window/SettingsWindow.tsx b/src/features/settings/window/SettingsWindow.tsx
index 231a6064..445dc59b 100644
--- a/src/features/settings/window/SettingsWindow.tsx
+++ b/src/features/settings/window/SettingsWindow.tsx
@@ -14,12 +14,15 @@ export function SettingsWindow() {
   const os = usePlatform((s) => s.os);
   const ownTitleBar = usePlatform((s) => s.overlayTitleBar || s.framelessTitleBar);
   const open = useSettingsDialog((s) => s.open);
+  const pagesLoading = useSettingsDialog((s) => s.pagesLoading);
   const title = useSettingsTitle();
   const ref = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (open) ref.current?.querySelector<HTMLElement>("[data-autofocus]")?.focus({ preventScroll: true });
-  }, [open]);
+    if (open && !pagesLoading) {
+      ref.current?.querySelector<HTMLElement>("[data-autofocus]")?.focus({ preventScroll: true });
+    }
+  }, [open, pagesLoading]);
 
   return (
     <div ref={ref} className={clsx(styles.window, os === "linux" && styles.windowEdge)}>
diff --git a/src/features/templates/__tests__/live.test.ts b/src/features/templates/__tests__/live.test.ts
index 1b395015..2993f5b7 100644
--- a/src/features/templates/__tests__/live.test.ts
+++ b/src/features/templates/__tests__/live.test.ts
@@ -154,6 +154,18 @@ describe("expansion", () => {
     for (const a of ["psvm", "sout", "fori", "iter", "main"]) expect(has("java", a)).toBe(true);
     for (const a of ["main", "fun", "val", "sout"]) expect(has("kotlin", a)).toBe(true);
     for (const a of ["todo", "fixme"]) expect(has("go", a)).toBe(true);
+    for (const a of ["fore", "forek", "pubf", "prisf", "thr", "eco", "rqro"]) expect(has("php", a)).toBe(true);
+    expect(has("java", "fore")).toBe(false);
+  });
+
+  it("writes PHP variables with their $", () => {
+    const php = (abbrev: string) => BUILTIN_TEMPLATES.find((t) => t.id === `php.${abbrev}`)!;
+    const fore = apply("", expandTemplate(php("fore")).snippet, 0);
+    expect(fore.text).toBe("foreach ( as $value) {\n  \n}");
+    // The caret starts on the iterable.
+    expect(fore.sel[0]).toEqual([9, 9]);
+    expect(apply("", expandTemplate(php("forek")).snippet, 0).text).toBe("foreach ( as $key => $value) {\n  \n}");
+    expect(apply("", expandTemplate(php("prosf")).snippet, 0).text).toBe("protected static function ()\n{\n  \n}");
   });
 
   it("merges user edits, deletions and user templates", () => {
diff --git a/src/features/templates/live/builtins.ts b/src/features/templates/live/builtins.ts
index 59868e79..e8c40ea7 100644
--- a/src/features/templates/live/builtins.ts
+++ b/src/features/templates/live/builtins.ts
@@ -264,6 +264,45 @@ const kotlin = group(
   ],
 );
 
+const method = (abbrev: string, modifiers: string): Def => ({
+  abbrev,
+  description: `${modifiers} function`,
+  body: `${modifiers} function $NAME$($PARAMETERS$)\n{\n\t$END$\n}`,
+});
+
+/** PHP's `$` is written `$$` in a template body. */
+const php = group(
+  "PHP",
+  "php",
+  ["php"],
+  [
+    {
+      abbrev: "fore",
+      description: "foreach (iterable as value)",
+      body: "foreach ($ITERABLE$ as $$$VALUE$) {\n\t$END$\n}",
+      variables: [v("ITERABLE"), v("VALUE", undefined, '"value"')],
+    },
+    {
+      abbrev: "forek",
+      description: "foreach (iterable as key => value)",
+      body: "foreach ($ITERABLE$ as $$$KEY$ => $$$VALUE$) {\n\t$END$\n}",
+      variables: [v("ITERABLE"), v("KEY", undefined, '"key"'), v("VALUE", undefined, '"value"')],
+    },
+    method("pubf", "public"),
+    method("prof", "protected"),
+    method("prif", "private"),
+    method("pubsf", "public static"),
+    method("prosf", "protected static"),
+    method("prisf", "private static"),
+    { abbrev: "thr", description: "throw new", body: "throw new $END$;" },
+    { abbrev: "eco", description: "echo", body: 'echo "$END$";' },
+    { abbrev: "inc", description: "include", body: "include '$END$';" },
+    { abbrev: "inco", description: "include_once", body: "include_once '$END$';" },
+    { abbrev: "rqr", description: "require", body: "require '$END$';" },
+    { abbrev: "rqro", description: "require_once", body: "require_once '$END$';" },
+  ],
+);
+
 const general = group(
   "General",
   "any",
@@ -458,6 +497,7 @@ export const BUILTIN_TEMPLATES: readonly LiveTemplate[] = [
   ...go,
   ...java,
   ...kotlin,
+  ...php,
   ...sqlQuery,
   ...sqlStatement,
   ...sqlCode,
diff --git a/src/features/terminal/FindBar.tsx b/src/features/terminal/FindBar.tsx
index d7914040..fc22a244 100644
--- a/src/features/terminal/FindBar.tsx
+++ b/src/features/terminal/FindBar.tsx
@@ -6,7 +6,7 @@ import { IconButton, SearchField } from "@/ui";
 import type { TerminalSearchOptions, TerminalSearchResult } from "./session";
 import { activeSession } from "./store";
 import styles from "./Terminal.module.css";
-import { hasPrimaryModifier } from "@/platform/keymap";
+import { formatBinding, hasPrimaryModifier } from "@/platform/keymap";
 import { tx } from "@/platform/i18n";
 
 export const useTerminalFind = create<{ open: boolean; seq: number; query: string; options: TerminalSearchOptions }>(
@@ -125,7 +125,7 @@ export function TerminalFindBar({ sessionKey }: { sessionKey: string | null }) {
             id: "case",
             icon: "case",
             title: "Match Case",
-            shortcut: "⌥C",
+            shortcut: formatBinding("Alt+C"),
             pressed: options.caseSensitive,
             onToggle: () => toggle("caseSensitive"),
           },
@@ -133,7 +133,7 @@ export function TerminalFindBar({ sessionKey }: { sessionKey: string | null }) {
             id: "word",
             icon: "word",
             title: "Words",
-            shortcut: "⌥W",
+            shortcut: formatBinding("Alt+W"),
             pressed: options.wholeWord,
             onToggle: () => toggle("wholeWord"),
           },
@@ -141,7 +141,7 @@ export function TerminalFindBar({ sessionKey }: { sessionKey: string | null }) {
             id: "regex",
             icon: "regex",
             title: "Regex",
-            shortcut: "⌥X",
+            shortcut: formatBinding("Alt+X"),
             pressed: options.regex,
             onToggle: () => toggle("regex"),
           },
@@ -153,7 +153,7 @@ export function TerminalFindBar({ sessionKey }: { sessionKey: string | null }) {
       <IconButton
         icon="arrow-up"
         title="Previous Occurrence"
-        shortcut="⇧↵"
+        shortcut={formatBinding("Shift+Enter")}
         size="small"
         disabled={!query}
         onClick={() => find("previous")}
diff --git a/src/features/terminal/imeCommit.test.ts b/src/features/terminal/imeCommit.test.ts
index 76753353..a6fd994c 100644
--- a/src/features/terminal/imeCommit.test.ts
+++ b/src/features/terminal/imeCommit.test.ts
@@ -31,6 +31,12 @@ function gateWithRebase() {
   return { gate, run, pending, rebases: () => rebased };
 }
 
+/** Collects the emissions that reach the PTY, like `Session.fromTerminal`. */
+function emitter(gate: ImeCommitGate) {
+  const sent: string[] = [];
+  return { sent, emit: (data: string) => gate.accept() && sent.push(data) };
+}
+
 describe("ImeCommitGate", () => {
   it("takes the first emission of a commit and drops the repeated one", () => {
     const { gate } = gateWithRebase();
@@ -42,10 +48,7 @@ describe("ImeCommitGate", () => {
   it("keeps the real text of the pi case and drops the stale suffix", () => {
     // xterm sends the committed diff first, then a stale `value.substring(start)`.
     const { gate, run } = gateWithRebase();
-    const sent: string[] = [];
-    const emit = (data: string) => {
-      if (gate.accept()) sent.push(data);
-    };
+    const { sent, emit } = emitter(gate);
     gate.begin();
     emit("在吗");
     gate.finish();
@@ -54,37 +57,101 @@ describe("ImeCommitGate", () => {
     expect(sent).toEqual(["在吗"]);
   });
 
-  it("accepts every emission once the commit is over", () => {
-    const { gate, run } = gateWithRebase();
+  it("lets a key the IME did not take through right after a commit", () => {
+    // Punctuation committed directly, then Enter within the commit's timeout: Enter must run.
+    const { gate, rebases } = gateWithRebase();
+    const { sent, emit } = emitter(gate);
+    gate.begin();
+    emit("，");
+    gate.keystroke();
+    emit("\r");
+    expect(sent).toEqual(["，", "\r"]);
+    expect(rebases()).toBe(1);
+    // Outside a commit, or during a composition, a keystroke changes nothing.
+    gate.keystroke();
+    gate.compositionStart();
+    gate.keystroke();
+    expect(rebases()).toBe(1);
+  });
+
+  it("starts a new commit on the next IME keystroke even inside the timeout", () => {
+    // Two commits can arrive back to back; the second must not be swallowed by the first
+    // commit's still-running timeout.
+    const { gate } = gateWithRebase();
+    gate.begin();
+    expect(gate.accept()).toBe(true);
     gate.begin();
     expect(gate.accept()).toBe(true);
     expect(gate.accept()).toBe(false);
+  });
+
+  it("drops the stale suffix of a WebKitGTK punctuation commit without compositionstart", () => {
+    // fcitx5 commits `，` as insertFromComposition + compositionend without compositionstart:
+    // xterm sends the keydown diff `，`, then compositionend emits `好，` from the previous
+    // composition's position. That suffix is what showed up as a duplicate in the terminal.
+    const { gate, run, rebases } = gateWithRebase();
+    const { sent, emit } = emitter(gate);
+    gate.begin();
+    emit("，");
+    gate.finish();
+    emit("好，");
+    run();
+    expect(sent).toEqual(["，"]);
+    expect(rebases()).toBe(1);
+  });
+
+  it("stands down for a real composition, then gates the next commit again", () => {
+    // compositionstart must not disable the gate for the whole session: the very next
+    // punctuation commit still needs deduplication.
+    const { gate, run, rebases } = gateWithRebase();
+    gate.begin();
+    gate.compositionStart();
+    expect(gate.accept()).toBe(true);
+    expect(gate.accept()).toBe(true);
     gate.finish();
     run();
+    expect(rebases()).toBe(1);
+
+    gate.begin();
+    expect(gate.accept()).toBe(true);
+    expect(gate.accept()).toBe(false);
+  });
+
+  it("accepts every emission while composing", () => {
+    const { gate } = gateWithRebase();
+    gate.compositionStart();
+    expect(gate.accept()).toBe(true);
     expect(gate.accept()).toBe(true);
     expect(gate.accept()).toBe(true);
   });
 
-  it("rebases the textarea when the commit closes, not before", () => {
+  it("rebases after a composition that xterm sent by itself", () => {
     const { gate, run, rebases } = gateWithRebase();
-    gate.begin();
+    gate.compositionStart();
     gate.finish();
     expect(rebases()).toBe(0);
     run();
     expect(rebases()).toBe(1);
   });
 
-  it("stands down once a real compositionstart arrives", () => {
-    const { gate, rebases } = gateWithRebase();
+  it("rebases after a commit whose compositionend arrives, not before", () => {
+    const { gate, run, rebases } = gateWithRebase();
     gate.begin();
-    gate.compositionStart();
-    expect(gate.accept()).toBe(true);
     expect(gate.accept()).toBe(true);
+    gate.finish();
     expect(rebases()).toBe(0);
-    // And a later commit is not gated either.
-    gate.begin();
-    expect(gate.accept()).toBe(true);
+    run();
+    expect(rebases()).toBe(1);
+  });
+
+  it("opens a commit from a composition input when no keydown preceded it", () => {
+    const { gate } = gateWithRebase();
+    gate.input();
     expect(gate.accept()).toBe(true);
+    expect(gate.accept()).toBe(false);
+    // A second input event belongs to the same commit and must not reopen it.
+    gate.input();
+    expect(gate.accept()).toBe(false);
   });
 
   it("closes a commit whose compositionend never arrives", () => {
@@ -96,4 +163,13 @@ describe("ImeCommitGate", () => {
     expect(rebases()).toBe(1);
     expect(gate.accept()).toBe(true);
   });
+
+  it("does not rebase into a composition that started before the close ran", () => {
+    const { gate, run, rebases } = gateWithRebase();
+    gate.begin();
+    gate.finish();
+    gate.compositionStart();
+    run();
+    expect(rebases()).toBe(0);
+  });
 });
diff --git a/src/features/terminal/imeCommit.ts b/src/features/terminal/imeCommit.ts
index baeca349..1f2c1ca7 100644
--- a/src/features/terminal/imeCommit.ts
+++ b/src/features/terminal/imeCommit.ts
@@ -1,14 +1,31 @@
 /**
  * Collapses the repeated data emissions of one IME commit.
  *
- * WebKitGTK + fcitx5 commit text without firing `compositionstart`, so xterm's `CompositionHelper`
- * never advances `_compositionPosition.start` and keeps appending the committed text to its hidden
- * textarea. A commit then reaches `onData` twice — once with the committed text, once with a stale
- * `value.substring(start)` — and the same text shows up in the terminal twice.
+ * WebKitGTK commits IME text with an inconsistent mix of events, and xterm's
+ * `CompositionHelper` only copes with part of it:
  *
- * One commit must send one chunk: take the first emission and drop the rest, then rebase the
- * textarea so the next commit starts from an empty value. IMEs that do report `compositionstart`
- * (macOS, IBus) keep xterm's own bookkeeping, so the gate stands down for them.
+ * - A composed word (`你好`) reports `compositionstart`, so xterm records where the
+ *   composition starts in its hidden textarea and sends the committed text once on
+ *   `compositionend`.
+ * - Text that the IME commits directly (punctuation such as `；` or `，`) reports
+ *   `insertFromComposition` + `compositionend` **without** `compositionstart`. xterm then
+ *   finalizes the *previous* composition's position: it sends the keydown's textarea diff
+ *   first and, once `compositionend` runs, a stale `value.substring(start)` on top. That
+ *   second emission is the duplicated suffix users see (typing `；你好，` sends `，` and then
+ *   `好，`). Newer WebKitGTK delivers the same commits as `insertText` without any
+ *   composition events, which xterm sends through its keydown path; the stale emission there
+ *   carries the previous commit's text instead.
+ *
+ * One commit must send one chunk, so the gate lets the first emission through and drops the
+ * rest until the commit closes. A commit is delimited by the IME's own keystroke (code 229)
+ * outside a composition, or by a composition input when the platform sends no keydown.
+ * Commits that really compose are left to xterm: `compositionstart` stands the gate down for
+ * that commit only — it must not disable the gate for the session, because the very next
+ * punctuation commit still needs deduplication.
+ *
+ * xterm never clears its hidden textarea by itself, so every commit ends with a rebase: the
+ * textarea is emptied after xterm's own senders have run, keeping the next commit from
+ * carrying old text.
  */
 
 /** How long a commit may stay open when its `compositionend` never arrives. */
@@ -27,8 +44,8 @@ const WINDOW_SCHEDULER: ImeScheduler = {
 export class ImeCommitGate {
   private open = false;
   private sent = false;
+  private composing = false;
   private timer: number | null = null;
-  private native = false;
   private readonly rebase: () => void;
   private readonly scheduler: ImeScheduler;
 
@@ -37,21 +54,61 @@ export class ImeCommitGate {
     this.scheduler = scheduler;
   }
 
-  /** A commit starts: the IME's own keystroke (code 229) or its composition input event. */
+  /**
+   * A commit starts: the IME's own keystroke (code 229) outside a composition.
+   *
+   * Always starts a fresh commit, even when the previous one is still inside its timeout:
+   * two commits can arrive back to back, and the second must not be swallowed.
+   */
   begin(): void {
-    if (this.native || this.open) return;
+    if (this.composing) return;
+    this.cancelTimer();
     this.open = true;
     this.sent = false;
     this.timer = this.scheduler.after(() => this.close(), IME_COMMIT_TIMEOUT_MS);
   }
 
-  /** The commit ended: let the emissions both of xterm's senders queued go out, then rebase. */
+  /**
+   * A composition input arrived. Opens a commit only when no commit is open: resetting
+   * `sent` here would let the emissions already queued for this commit go out again.
+   */
+  input(): void {
+    if (this.composing || this.open) return;
+    this.open = true;
+    this.sent = false;
+    this.timer = this.scheduler.after(() => this.close(), IME_COMMIT_TIMEOUT_MS);
+  }
+
+  /**
+   * An IME composition begins. xterm's own composition handling owns this commit, so the
+   * gate stays out of its way — but only until the composition ends.
+   */
+  compositionStart(): void {
+    this.composing = true;
+    this.cancelTimer();
+    this.open = false;
+    this.sent = false;
+  }
+
+  /**
+   * The composition — or, on WebKitGTK, a directly committed character — ended.
+   * Bubble phase: xterm's own `compositionend` listener ran first and queued its send, so a
+   * 0 ms close lands behind that emission and cannot cut the committed text off.
+   */
   finish(): void {
-    if (!this.open) return;
+    this.composing = false;
     this.cancelTimer();
     this.timer = this.scheduler.after(() => this.close(), 0);
   }
 
+  /**
+   * A keystroke the IME did not take (Enter, an arrow, a letter typed outside it): the commit
+   * is over, and what that key sends must reach the PTY.
+   */
+  keystroke(): void {
+    if (this.open && !this.composing) this.close();
+  }
+
   /** Whether this emission should reach the PTY. */
   accept(): boolean {
     if (!this.open) return true;
@@ -60,19 +117,13 @@ export class ImeCommitGate {
     return true;
   }
 
-  /** The IME reports composition events, so xterm needs no help — stay out of its way. */
-  compositionStart(): void {
-    this.native = true;
-    this.cancelTimer();
-    this.open = false;
-    this.sent = false;
-  }
-
   /** Ends the commit and rebases the textarea to an empty value. */
   close(): void {
     this.cancelTimer();
-    if (!this.open) return;
+    // A new composition started before this close ran; its own finish will rebase.
+    if (this.composing) return;
     this.open = false;
+    this.sent = false;
     this.rebase();
   }
 
diff --git a/src/features/terminal/session.ts b/src/features/terminal/session.ts
index dce99c6c..70e90bfd 100644
--- a/src/features/terminal/session.ts
+++ b/src/features/terminal/session.ts
@@ -413,17 +413,18 @@ export class TerminalSession {
 
   /**
    * Routes a WebKitGTK / fcitx5 IME commit through `ImeCommitGate`: the platform reports the
-   * composition's own keystroke (code 229) and its input event but never `compositionstart`,
-   * which is what xterm's own bookkeeping is built on.
+   * commit's own keystroke (code 229) and its input event, but reports `compositionstart` only
+   * for composed words — never for the punctuation an IME commits directly.
    */
   private watchImeCommit() {
     const textarea = this.term.textarea;
     if (!textarea) return;
     const onKeyDown = (e: KeyboardEvent) => {
       if (e.keyCode === 229) this.ime.begin();
+      else this.ime.keystroke();
     };
     const onInput = (e: InputEvent) => {
-      if (e.inputType === "insertFromComposition" || e.inputType === "insertCompositionText") this.ime.begin();
+      if (e.inputType === "insertFromComposition" || e.inputType === "insertCompositionText") this.ime.input();
     };
     const onCompositionStart = () => this.ime.compositionStart();
     // Bubble phase, i.e. after xterm's own listener: the rebase must land behind the emissions
diff --git a/src/features/todo/PreviewEditor.tsx b/src/features/todo/PreviewEditor.tsx
index dfb951a3..68beae4e 100644
--- a/src/features/todo/PreviewEditor.tsx
+++ b/src/features/todo/PreviewEditor.tsx
@@ -20,6 +20,7 @@ import { openideaTheme } from "@/editor/core/cm/theme";
 import { openideaHighlightStyle } from "@/editor/core/cm/highlight";
 import { findLanguageDescription, loadSupport } from "@/editor/core/cm/languages";
 import { attachDocument, embeddedEditorExtensions, type DocumentAttachment } from "@/editor/api";
+import { previewColors } from "@/editor/lineTokens";
 import { SourcePreview, T, type SourceHighlight } from "@/ui";
 import { todoHighlightExtension } from "./highlight";
 import styles from "./TodoView.module.css";
@@ -148,7 +149,10 @@ export function PreviewEditor({
     view.dispatch({ selection: { anchor: pos }, effects: EditorView.scrollIntoView(pos, { y: "center" }) });
   }, [line, col]);
 
-  if (!path || readOnly) return <SourcePreview path={path} line={line} highlights={highlights} load={fallbackLoad} />;
+  if (!path || readOnly)
+    return (
+      <SourcePreview path={path} line={line} highlights={highlights} load={fallbackLoad} colorize={previewColors} />
+    );
   if (error)
     return (
       <div className={styles.previewError}>
diff --git a/src/features/vcs/CommitChooser.tsx b/src/features/vcs/CommitChooser.tsx
new file mode 100644
index 00000000..90115f3f
--- /dev/null
+++ b/src/features/vcs/CommitChooser.tsx
@@ -0,0 +1,50 @@
+import { useState } from "react";
+import type { Commit } from "@/bindings";
+import { Dialog, List, SearchField } from "@/ui";
+import { openDialog } from "./dialogs";
+import { commitKey } from "./multiRoot";
+
+export function chooseLogCommit(commits: Commit[], title: string): Promise<Commit | null> {
+  return new Promise((resolve) => {
+    const close = openDialog(() => (
+      <CommitChooser
+        commits={commits}
+        title={title}
+        onDone={(commit) => {
+          close();
+          resolve(commit);
+        }}
+      />
+    ));
+  });
+}
+
+function CommitChooser({
+  commits,
+  title,
+  onDone,
+}: {
+  commits: Commit[];
+  title: string;
+  onDone: (commit: Commit | null) => void;
+}) {
+  const [query, setQuery] = useState("");
+  const shown = commits.filter((c) =>
+    `${c.id} ${c.summary} ${c.author}`.toLocaleLowerCase().includes(query.toLocaleLowerCase()),
+  );
+  return (
+    <Dialog open title={title} onClose={() => onDone(null)} width={520}>
+      <SearchField value={query} onChange={setQuery} placeholder="Search commits" aria-label="Search commits" />
+      <div style={{ height: 260, display: "flex" }}>
+        <List
+          items={shown}
+          getKey={commitKey}
+          renderItem={(c) => `${c.shortId}  ${c.summary} — ${c.author}`}
+          onActivate={onDone}
+          rowHeight={26}
+          aria-label={title}
+        />
+      </div>
+    </Dialog>
+  );
+}
diff --git a/src/features/vcs/CommitView.module.css b/src/features/vcs/CommitView.module.css
index 6f69a9c5..6e0fafb4 100644
--- a/src/features/vcs/CommitView.module.css
+++ b/src/features/vcs/CommitView.module.css
@@ -62,9 +62,9 @@
 .icon {
   flex: none;
 }
+/* The name takes the whole row; when it doesn't fit, the grey detail after it gives way first. */
 .label {
-  flex: 0 0 auto;
-  max-width: 75%;
+  flex: 0 1 auto;
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -74,6 +74,7 @@
   font-weight: 600;
 }
 .detail {
+  flex: 0 10000 auto;
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -190,6 +191,9 @@
   align-items: center;
   gap: 8px;
 }
+.stashRow > .detail {
+  flex-shrink: 1;
+}
 .stashMessage {
   flex: 1;
   min-width: 0;
diff --git a/src/features/vcs/CommitView.tsx b/src/features/vcs/CommitView.tsx
index 84ca3d67..bd17083a 100644
--- a/src/features/vcs/CommitView.tsx
+++ b/src/features/vcs/CommitView.tsx
@@ -47,7 +47,7 @@ import {
   toggledCheck,
   type ChangeNode,
 } from "./changes";
-import { applyStash, commitChanges, dropStash, showUnstashDialog, stashChanges } from "./changeOps";
+import { applyStash, commitChanges, deleteUnversioned, dropStash, showUnstashDialog, stashChanges } from "./changeOps";
 import { CommitOptionsPopup } from "./CommitOptions";
 import { DEFAULT_LIST_NAME, useChangelists, withListDefaults } from "./changelists";
 import { moveToChangelist } from "./changelistsUi";
@@ -224,7 +224,7 @@ export function listMenu(id: string, active: boolean, files: readonly FileStatus
   ];
 }
 
-function nodeMenu(nodes: ChangeNode[], repos: readonly string[]): MenuItem[] {
+export function nodeMenu(nodes: ChangeNode[], repos: readonly string[]): MenuItem[] {
   const files = filesOf(nodes);
   const paths = files.map((f) => f.path);
   const first = nodes.find((n) => n.type === "file");
@@ -246,7 +246,13 @@ function nodeMenu(nodes: ChangeNode[], repos: readonly string[]): MenuItem[] {
   items.push(
     { kind: "action", action: "vcs.rollback", arg: paths, label: "Rollback…" },
     ...(untracked.length
-      ? [{ kind: "action" as const, action: "vcs.addToVcs", arg: untracked.map((f) => f.path) }]
+      ? [
+          { kind: "action" as const, action: "vcs.addToVcs", arg: untracked.map((f) => f.path) },
+          // Only when every selected file is unversioned: versioned ones are rolled back, not deleted.
+          ...(untracked.length === files.length
+            ? [{ label: "Delete…", icon: "trash", run: () => void deleteUnversioned(untracked.map((f) => f.path)) }]
+            : []),
+        ]
       : []),
     ...(toIgnore.length
       ? [
diff --git a/src/features/vcs/ComparisonWindow.tsx b/src/features/vcs/ComparisonWindow.tsx
new file mode 100644
index 00000000..dd7d0dc1
--- /dev/null
+++ b/src/features/vcs/ComparisonWindow.tsx
@@ -0,0 +1,196 @@
+/**
+ * The comparison window (`comparison-<parent>-<n>`): files that differ between two revisions of
+ * its parent's project, and their diff, in a window of its own (IDEA's Changes Between dialog).
+ */
+import clsx from "clsx";
+import { useEffect } from "react";
+import { create } from "zustand";
+import { emitTo } from "@tauri-apps/api/event";
+import { getCurrentWindow } from "@tauri-apps/api/window";
+import { editorController } from "@/editor/core/controller";
+import { AUX_CLOSED, type AuxCloseResult } from "@/platform/auxWindow";
+import { setContext } from "@/platform/context";
+import { isImeKey } from "@/platform/ime";
+import { call, commands, type ComparisonLaunch } from "@/platform/ipc";
+import { useProject } from "@/platform/project";
+import { restoreRemote } from "@/platform/remote";
+import { usePlatform } from "@/platform/platformInfo";
+import { Button, Spinner, T, isPopupOpen } from "@/ui";
+import { editorService, notifications } from "@/workbench/contributions";
+import { EditorArea } from "@/workbench/EditorArea";
+import { OverlayHost } from "@/workbench/OverlayHost";
+import { TitleBar } from "@/workbench/TitleBar";
+import { useApplyTheme } from "@/workbench/theme";
+import { diffInput, type DiffData } from "./diffInput";
+import { ChangesBetweenDialog } from "./operations";
+import { refreshNow, useVcs } from "./store";
+import styles from "./common.module.css";
+
+const useComparison = create<{
+  launch: ComparisonLaunch | null;
+  title: string;
+  full: boolean;
+  error: string | null;
+}>(() => ({ launch: null, title: "", full: false, error: null }));
+
+/**
+ * Loads the comparison of this window's launch. `confirmLeave` settles unsaved changes of the
+ * documents edited here, in the named project, before the window closes.
+ */
+export function activateComparisonWindow(
+  parent: string,
+  confirmLeave: (project: string | null) => Promise<boolean>,
+): () => void {
+  let projectName: string | null = null;
+  const native = getCurrentWindow();
+  let disposed = false;
+  let closing = false;
+  let stopClose: (() => void) | undefined;
+  void native
+    .onCloseRequested(async (event) => {
+      if (closing) {
+        event.preventDefault();
+        return;
+      }
+      closing = true;
+      const models = [...editorController().manager.byId.values()];
+      let closed = false;
+      try {
+        await Promise.all(models.map((model) => model.sync.whenIdle()));
+        closed = await confirmLeave(projectName);
+        if (closed) {
+          for (const model of models) model.dispose();
+          await Promise.all(
+            models.map((model) =>
+              commands.docClose(model.doc).catch((error) => console.warn("cannot release comparison document", error)),
+            ),
+          );
+        }
+      } catch (error) {
+        notifications().notify({ level: "error", title: "Could not close comparison", body: String(error) });
+      } finally {
+        if (!closed) event.preventDefault();
+        const result: AuxCloseResult = {
+          label: native.label,
+          closed,
+          documents: closed ? models.map((model) => model.doc) : [],
+        };
+        await emitTo(parent, AUX_CLOSED, result).catch((error) =>
+          console.warn("cannot report comparison close", error),
+        );
+        closing = false;
+      }
+    })
+    .then((off) => {
+      if (disposed) off();
+      else stopClose = off;
+    });
+  const onKey = (event: KeyboardEvent) => {
+    if (event.defaultPrevented || isImeKey(event) || isPopupOpen()) return;
+    if (event.key === "Escape") {
+      event.preventDefault();
+      void native.close();
+    }
+  };
+  const onCloseShortcut = (event: KeyboardEvent) => {
+    if (isImeKey(event) || isPopupOpen()) return;
+    if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === "w") {
+      event.preventDefault();
+      event.stopImmediatePropagation();
+      void native.close();
+    }
+  };
+  window.addEventListener("keydown", onKey);
+  window.addEventListener("keydown", onCloseShortcut, true);
+  void (async () => {
+    await restoreRemote();
+    const launch = (await commands.windowTakeLaunch())?.comparison;
+    if (!launch) throw new Error("Missing comparison request");
+    const project = await commands.projectCurrent();
+    if (!project) throw new Error("The comparison's project is no longer open");
+    projectName = project.name;
+    // Settings only: restoring the project's editor session here would overwrite the main window's tabs.
+    useProject.setState({ settings: project.settings });
+    const roots = await call(commands.vcsRoots());
+    useVcs.setState({
+      available: roots.length > 0,
+      root: project.root,
+      roots: roots.map((root) => root.root),
+      repo: launch.repo,
+    });
+    setContext("projectOpen", true);
+    setContext("vcsAvailable", roots.length > 0);
+    await refreshNow();
+    useComparison.setState({ launch });
+  })().catch((error) => useComparison.setState({ error: String(error) }));
+  return () => {
+    disposed = true;
+    stopClose?.();
+    window.removeEventListener("keydown", onKey);
+    window.removeEventListener("keydown", onCloseShortcut, true);
+  };
+}
+
+/** The comparison's caption, on the title bar and the native window (Window menu, task switcher). */
+function showCaption(caption: string) {
+  if (useComparison.getState().title === caption) return;
+  useComparison.setState({ title: caption });
+  void getCurrentWindow()
+    .setTitle(caption)
+    .catch(() => {});
+}
+
+export function ComparisonWindow() {
+  useApplyTheme();
+  const { launch, title, full, error } = useComparison();
+  // macOS overlays traffic lights on the bar; Windows and Linux are frameless, like Settings.
+  const os = usePlatform((s) => s.os);
+  const ownTitleBar = usePlatform((s) => s.overlayTitleBar || s.framelessTitleBar);
+  const showDiff = (data: DiffData) => {
+    void editorService()
+      .openInput(diffInput(data), { focus: true })
+      .then(() => useComparison.setState({ full: true }))
+      .catch((error) => notifications().notify({ level: "error", title: "Could not show diff", body: String(error) }));
+  };
+  useEffect(() => {
+    if (full) editorService().focus?.();
+  }, [full]);
+  return (
+    <main className={clsx(styles.comparisonWindow, os === "linux" && styles.comparisonWindowEdge)}>
+      {ownTitleBar && <TitleBar minimal dialog title={title} />}
+      {error ? (
+        <div className={styles.error} role="alert">
+          {error}
+        </div>
+      ) : !launch ? (
+        <div className={styles.comparisonWindowLoading} role="status">
+          <Spinner />
+          <T>Loading…</T>
+        </div>
+      ) : (
+        <>
+          {full && (
+            <div className={styles.compareToolbar}>
+              <Button onClick={() => useComparison.setState({ full: false })}>Back to Changed Files</Button>
+            </div>
+          )}
+          <div className={styles.comparisonWindowBody} hidden={full}>
+            <ChangesBetweenDialog
+              from={launch.from}
+              to={launch.to}
+              scope={launch.scope ?? undefined}
+              native
+              onCaption={showCaption}
+              onShowDiff={showDiff}
+              onClose={() => void getCurrentWindow().close()}
+            />
+          </div>
+          <div className={styles.comparisonWindowBody} hidden={!full}>
+            <EditorArea />
+          </div>
+        </>
+      )}
+      <OverlayHost />
+    </main>
+  );
+}
diff --git a/src/features/vcs/DiffEditor.tsx b/src/features/vcs/DiffEditor.tsx
index b00dd6e7..b1b83e2d 100644
--- a/src/features/vcs/DiffEditor.tsx
+++ b/src/features/vcs/DiffEditor.tsx
@@ -217,7 +217,10 @@ export function DiffEditor({ input, toolbarActions }: { input: EditorInput; tool
   /** Text of the sides that are not live documents. */
   const [statics, setStatics] = useState<{ a: string | null; b: string | null } | null>(null);
   const [error, setError] = useState<string | null>(null);
-  const [opts, setOptsState] = useState<DiffViewOptions>(loadDiffOptions);
+  const [opts, setOptsState] = useState<DiffViewOptions>(() => {
+    const saved = loadDiffOptions();
+    return data.mode ? { ...saved, mode: data.mode } : saved;
+  });
   const [lang, setLang] = useState<Extension | null>(null);
   const [chunkInfo, setChunkInfo] = useState({ count: 0, current: -1, moves: 0, whitespaceOnly: false });
   const [busy, setBusy] = useState(false);
diff --git a/src/features/vcs/GitLog.module.css b/src/features/vcs/GitLog.module.css
index 8f5cdc94..fb89714b 100644
--- a/src/features/vcs/GitLog.module.css
+++ b/src/features/vcs/GitLog.module.css
@@ -139,12 +139,23 @@
 
 /* commit table */
 .listWrap {
+  position: relative;
   flex: 1;
   min-height: 0;
   display: flex;
   flex-direction: column;
   min-width: 0;
 }
+.speedSearch {
+  position: absolute;
+  top: 4px;
+  right: 8px;
+  z-index: 1;
+  padding: 4px 8px;
+  background: var(--bg-popup);
+  border: 1px solid var(--border);
+  color: var(--fg);
+}
 .list {
   flex: 1;
   min-height: 0;
@@ -165,6 +176,39 @@
   cursor: default;
   font-size: var(--fs-ui);
 }
+.columnHeader {
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  background: var(--bg-app);
+  border-bottom: 1px solid var(--border);
+  color: var(--fg-subtle);
+}
+.columnHeader:hover {
+  background: var(--bg-app);
+}
+.columnCell {
+  flex: none;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.columnHeading {
+  position: relative;
+  padding-inline-end: 6px;
+  cursor: grab;
+}
+.columnResize {
+  position: absolute;
+  inset-block: 0;
+  inset-inline-end: 0;
+  width: 6px;
+  cursor: col-resize;
+  touch-action: none;
+}
+.columnResize:focus-visible {
+  outline: 2px solid var(--focus-ring);
+  outline-offset: -2px;
+}
 /* View Options › Highlight › Current Branch: commits reachable from HEAD are tinted. */
 .currentBranch {
   --log-row-bg: var(--bg-log-current-branch);
@@ -342,6 +386,21 @@
   user-select: text;
   font-size: var(--fs-ui);
 }
+.commitTooltip {
+  width: min(520px, calc(100vw - 32px));
+  max-height: 60vh;
+  overflow: auto;
+  padding: 12px;
+  white-space: normal;
+  user-select: text;
+}
+.revisionSource {
+  flex: 1;
+  min-height: 0;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
 .subjectLine {
   color: var(--fg-strong);
   font-weight: 600;
@@ -349,6 +408,12 @@
   word-break: break-word;
   line-height: 1.5;
 }
+.expandMessage {
+  display: block;
+  margin-block-start: 6px;
+  font-weight: normal;
+  font-size: var(--fs-small);
+}
 .fullMessage {
   margin-top: 6px;
   color: var(--fg);
@@ -414,7 +479,7 @@
   font-size: var(--fs-small);
   line-height: 18px;
   -webkit-user-select: text;
-  cursor: text;
+  cursor: default;
   -webkit-user-select: text;
   user-select: text;
 }
@@ -422,6 +487,7 @@
   white-space: pre-wrap;
   word-break: break-all;
   color: var(--fg-secondary);
+  cursor: text;
 }
 .line-cmd {
   color: var(--fg-emphasis);
diff --git a/src/features/vcs/GitLog.tsx b/src/features/vcs/GitLog.tsx
index 124306da..89edb7bb 100644
--- a/src/features/vcs/GitLog.tsx
+++ b/src/features/vcs/GitLog.tsx
@@ -1,3 +1,5 @@
+import { useBookmarkPopups } from "@/features/search/bookmarks/store";
+import { commitBookmarkPath } from "./logBookmarks";
 import { copySelectionOnKeyDown } from "@/ui/selectableText";
 import { branchesByRepo, commitKey, commitRepo, graphCommit, type RepoCommit } from "./multiRoot";
 /** Git tool window: Log (graph, filters, commit details) and Console tabs. */
@@ -6,6 +8,7 @@ import { BranchFilterPopup } from "./BranchFilterPopup";
 import {
   memo,
   useCallback,
+  useContext,
   useEffect,
   useLayoutEffect,
   useMemo,
@@ -13,10 +16,11 @@ import {
   useState,
   type KeyboardEvent,
   type MouseEvent as ReactMouseEvent,
+  type ReactNode,
 } from "react";
 import clsx from "clsx";
 import { useVirtualizer } from "@tanstack/react-virtual";
-import type { Branch, ChangedFile, Commit, RevisionChange } from "@/bindings";
+import type { Branch, ChangedFile, Commit } from "@/bindings";
 import { call, commands } from "@/platform/ipc";
 import { executeAction } from "@/platform/actions";
 import { maybeEditorService, type EditorInput } from "@/workbench/contributions";
@@ -29,6 +33,9 @@ import {
   SplitHandle,
   SplitPanel,
   Spinner,
+  Dialog,
+  Popup,
+  TOOLTIP_DELAY,
   Tabs,
   Tree,
   fileIconName,
@@ -37,9 +44,13 @@ import {
   type TreeHandle,
   T,
   copyText,
+  lazyComponent,
 } from "@/ui";
 import { hasPrimaryModifier } from "@/platform/keymap";
-import { collapseLinear, computeGraph, hideLongEdges, laneColor, reachableFrom, type GraphRow } from "./graph";
+import { laneColor, reachableFrom, type GraphRow, type GraphSegment } from "./graph";
+import { nextSpeedMatch } from "./logSearch";
+import { LogIndexStatus } from "./logIndex";
+import { presentLogGraph } from "./logPresentation";
 import {
   closeLogTab,
   extendCommitSelection,
@@ -49,10 +60,16 @@ import {
   isPushed,
   isMine,
   loadMore,
+  logState,
+  loadNewer,
   ME,
   dateRangeLabel,
   refsSignature,
   reloadLog,
+  openLogTab,
+  recentLogFilters,
+  recentFilterValues,
+  toggleCommitBookmark,
   selectCommit,
   selectGitTab,
   selectedCommits,
@@ -78,7 +95,7 @@ import {
   isFavoriteBranch,
   type BranchTreeNode,
 } from "./branches";
-import { chooseDateRange, chooseMany, promptText } from "./dialogs";
+import { chooseDateRange, chooseMany, openDialog } from "./dialogs";
 import { buildFileTree, dirKeys, type FileTreeNode } from "./fileTree";
 import { DIFF_KIND, diffInput } from "./diffInput";
 import {
@@ -97,9 +114,37 @@ import { useWorkflowSettings } from "@/platform/workflowSettings";
 import { gitTabs, shownTab } from "./gitTabs";
 import { LocalChangesView, StashContent, tabItems, useStashTabCounts } from "./CommitView";
 import { WorktreesPanel } from "./gitMenuDialogs";
+import { chooseLogPaths } from "./PathFilterDialog";
+import { goToRef } from "./logStore";
+import { LogIdContext } from "./logContext";
+import { LogScope } from "./LogScope";
+import { browseRepositoryAt, openExternalLog } from "./RevisionBrowser";
+import { invalidateLogDetails, loadLogDetails, useCommitDetails } from "./logDetails";
 
 const ROW = 26;
 const LANE = 14;
+interface LogColumn {
+  id: string;
+  title: string;
+  width: number;
+  render(commit: Commit): ReactNode;
+}
+const LogMergePreview = lazyComponent(() => import("./GitMergeDiff").then((m) => m.GitMergeDiff));
+const LogDiffPreview = lazyComponent(() => import("./DiffEditor").then((m) => m.DiffEditor));
+
+function useLogRepositories() {
+  const scope = useContext(LogIdContext);
+  const tab = useGitLog((s) => s.logTabs.find((t) => t.id === (scope ?? s.shownLog)));
+  const roots = useVcs((s) => s.roots);
+  const repo = tab?.repo;
+  const repositories = tab?.repositories;
+  return useMemo(() => (repositories?.length ? repositories : repo ? [repo] : roots), [repo, roots, repositories]);
+}
+
+function useReadOnlyLog() {
+  const scope = useContext(LogIdContext);
+  return useGitLog((s) => s.logTabs.find((t) => t.id === (scope ?? s.shownLog))?.readOnly === true);
+}
 
 /** The Git window's tabs (they depend on the commit interface) and the one shown. */
 function useGitTabs() {
@@ -116,8 +161,9 @@ function useGitTabs() {
 /** Tool window header: [Local Changes / Stash…] Log, log tabs, Console and Worktrees content tabs. */
 export function GitTabs() {
   const available = useVcs((s) => s.available);
+  const external = useGitLog((s) => s.logTabs.some((t) => t.id === s.tab && t.readOnly));
   const { tabs, shown } = useGitTabs();
-  if (!available) return null;
+  if (!available && !external) return null;
   return (
     <Tabs
       variant="compact"
@@ -134,9 +180,9 @@ export function GitTabs() {
 
 export function GitToolWindow() {
   const { shown } = useGitTabs();
-  const shownLog = useGitLog((s) => s.shownLog);
   const available = useVcs((s) => s.available);
-  if (!available)
+  const external = useGitLog((s) => s.logTabs.some((t) => t.id === s.tab && t.readOnly));
+  if (!available && !external)
     return (
       <EmptyState title="Version control is not configured">
         <T>The project is not a Git repository.</T>
@@ -159,7 +205,9 @@ export function GitToolWindow() {
         <WorktreesPanel className={styles.worktrees} listClassName={styles.worktreeList} />
       ) : (
         // Each log tab has its own view (its filters and commits are swapped into the store).
-        <LogView key={shownLog} />
+        <LogScope id={shown}>
+          <LogView key={shown} />
+        </LogScope>
       )}
     </div>
   );
@@ -168,43 +216,78 @@ export function GitToolWindow() {
 // ---------------------------------------------------------------------------
 // Log
 
-function LogView() {
+export function LogView() {
+  const scope = useContext(LogIdContext);
+  const shown = useGitLog((s) => s.shownLog);
+  const active = !scope || scope === shown;
   const version = useVcs((s) => s.version);
   const commits = useGitLog((s) => s.commits);
   const selection = useGitLog((s) => s.selection);
   const root = useVcs((s) => s.root);
-  const repo = useVcs((s) => s.roots);
+  const repo = useLogRepositories();
+  const readOnly = useReadOnlyLog();
   const showBranches = useLogOptions((s) => s.showBranches);
+  const showDetails = useLogOptions((s) => s.showDetails);
   const branchesLoaded = useVcs((s) => s.branchesLoaded);
   const lastRefs = useRef<string | null>(null);
   const allRefs = useRef<string | null>(null);
+  const externalRefs = useRef<string | null>(null);
   useEffect(() => {
     let live = true;
-    void branchesByRepo(repo)
-      .then((all) => {
+    void Promise.all([
+      branchesByRepo(repo),
+      Promise.all(repo.map(async (root) => [root, await call(commands.vcsLogRefs(root))] as const)),
+    ])
+      .then(([all, refs]) => {
         if (!live) return;
-        const signature = JSON.stringify(all);
-        if (allRefs.current !== null && allRefs.current !== signature) void reloadLog({ preserve: true });
+        const signature = JSON.stringify([all, refs]);
+        if (allRefs.current !== null && allRefs.current !== signature) {
+          invalidateLogDetails(repo);
+          void reloadLog({ preserve: true }, scope ?? undefined);
+        }
         allRefs.current = signature;
+        if (readOnly) externalRefs.current = JSON.stringify(refs.map(([, value]) => value));
       })
       .catch(() => undefined);
     return () => {
       live = false;
     };
-  }, [repo, version]);
+  }, [repo, version, readOnly, scope]);
+  useEffect(() => {
+    if (!readOnly) return;
+    let live = true;
+    const timer = setInterval(() => {
+      void Promise.all(repo.map((root) => call(commands.vcsLogRefs(root))))
+        .then((refs) => {
+          if (!live) return;
+          const signature = JSON.stringify(refs);
+          if (externalRefs.current && externalRefs.current !== signature) {
+            invalidateLogDetails(repo);
+            void reloadLog({ preserve: true }, scope ?? undefined);
+          }
+          externalRefs.current = signature;
+        })
+        .catch(() => undefined);
+    }, 5000);
+    return () => {
+      live = false;
+      clearInterval(timer);
+    };
+  }, [repo, readOnly, scope]);
 
   // On mount, when the window switches to another project and when another of its
   // repositories is selected (its branches are needed to notice its refs moving).
   useEffect(() => {
     lastRefs.current = null;
     allRefs.current = null;
-    if (!useGitLog.getState().commits.length) void reloadLog();
-    void loadBranches().catch(() => undefined);
-  }, [root, repo]);
+    void reloadLog({ preserve: logState(scope ?? undefined).commits.length > 0 }, scope ?? undefined);
+    if (!readOnly) void loadBranches().catch(() => undefined);
+  }, [root, repo, readOnly, scope]);
 
   // Once the repository's branches are known, settle the branch filter (the
   // remembered refs, else the current branch) and load the log with it.
   useEffect(() => {
+    if (!active) return;
     if (!branchesLoaded) return;
     // The refs the log is loaded with, so the first checkout or commit after this reloads it.
     const { branch, branches } = useVcs.getState();
@@ -212,10 +295,11 @@ function LogView() {
     const settled = initLogBranchFilter();
     const { commits, loading } = useGitLog.getState();
     if (settled || (!commits.length && !loading)) void reloadLog();
-  }, [root, repo, branchesLoaded]);
+  }, [root, repo, branchesLoaded, active]);
 
   // HEAD or a branch tip moved (commit, undo, reset, rebase, fetch…): reload (keeps the selection).
   useEffect(() => {
+    if (!active) return;
     const { branch, branches, branchesLoaded } = useVcs.getState();
     if (!branchesLoaded) return;
     const refs = refsSignature(branch, branches) + JSON.stringify(useVcs.getState().heads);
@@ -223,7 +307,7 @@ function LogView() {
     lastRefs.current = refs;
     if (previous !== null && previous !== refs && useGitLog.getState().commits.length)
       void reloadLog({ preserve: true });
-  }, [version]);
+  }, [version, active]);
 
   return (
     // Its own layout without the Branches pane, so each keeps its sizes.
@@ -244,13 +328,18 @@ function LogView() {
       <SplitPanel id="commits" defaultSize="54%" minSize="25%">
         <div className={styles.log}>
           <FilterBar />
+          <LogIndexStatus repositories={repo} />
           <CommitList />
         </div>
       </SplitPanel>
-      <SplitHandle />
-      <SplitPanel id="details" defaultSize="28%" minSize="15%">
-        <CommitDetails key={selection.join(" ") || "none"} commits={commits} />
-      </SplitPanel>
+      {showDetails && (
+        <>
+          <SplitHandle />
+          <SplitPanel id="details" defaultSize="28%" minSize="15%">
+            <CommitDetails key={selection.join(" ") || "none"} commits={commits} />
+          </SplitPanel>
+        </>
+      )}
     </SplitGroup>
   );
 }
@@ -265,12 +354,24 @@ function branchDetail(n: BranchTreeNode): string | undefined {
 }
 
 export function BranchesPanel() {
+  const scope = useContext(LogIdContext);
+  const shown = useGitLog((s) => s.shownLog);
+  const active = !scope || scope === shown;
+  const logGeneration = useGitLog((s) => s.generation);
   const selectedBranches = useVcs((s) => s.branches);
-  const repositories = useVcs((s) => s.roots);
+  const repositories = useLogRepositories();
+  const readOnly = useReadOnlyLog();
   const version = useVcs((s) => s.version);
   const [allBranches, setAllBranches] = useState<Record<string, Branch[]>>({});
   const [allTags, setAllTags] = useState<Record<string, string[]>>({});
-  const branches = selectedBranches;
+  const currentRepository = currentRepo();
+  const branches = useMemo(
+    () =>
+      repositories.length === 1 && repositories[0] !== currentRepository
+        ? (allBranches[repositories[0]!] ?? [])
+        : selectedBranches,
+    [repositories, currentRepository, allBranches, selectedBranches],
+  );
   const root = useVcs((s) => s.root);
   const branchesLoaded = useVcs((s) => s.branchesLoaded);
   const current = useVcs((s) => s.branch?.head ?? null);
@@ -283,14 +384,14 @@ export function BranchesPanel() {
   // Branches reload when refs move (fetch, new tag…): the tags are re-read with them.
   useEffect(() => {
     let live = true;
-    call(commands.vcsTags(currentRepo())).then(
+    call(commands.vcsTags(repositories[0] ?? currentRepo())).then(
       (t) => live && setTags(t),
       () => live && setTags([]),
     );
     return () => {
       live = false;
     };
-  }, [root, branches]);
+  }, [root, branches, repositories]);
   useEffect(() => {
     let live = true;
     void branchesByRepo(repositories)
@@ -302,7 +403,7 @@ export function BranchesPanel() {
     return () => {
       live = false;
     };
-  }, [repositories, version]);
+  }, [repositories, version, logGeneration]);
   const allRoots = useMemo(() => {
     if (repositories.length < 2) return buildBranchTree(branches, favorites, tags);
     return buildRepositoryBranchTree(
@@ -357,9 +458,10 @@ export function BranchesPanel() {
     [refs, selected],
   );
   useEffect(() => {
+    if (!active) return;
     useBranchesPane.setState({ selected: targets });
-  }, [targets]);
-  useEffect(() => () => useBranchesPane.setState({ selected: [] }), []);
+    return () => useBranchesPane.setState({ selected: [] });
+  }, [targets, active]);
   const target = targets[0] ?? undefined;
   const favorite = !!target?.branch && isFavoriteBranch(target.branch, favorites);
   const onKeyDownCapture = (e: KeyboardEvent<HTMLDivElement>) => {
@@ -376,42 +478,51 @@ export function BranchesPanel() {
     <div className={styles.branches} onKeyDownCapture={onKeyDownCapture}>
       <div className={styles.branchesTools} role="toolbar" aria-orientation="vertical" aria-label={tx("Branches")}>
         <IconButton icon="chevron-left" title="Hide Branches" size="small" action="vcs.log.showBranches" />
-        <IconButton icon="plus" title="New Branch…" size="small" action="vcs.log.branches.new" actionArg={target} />
+        {!readOnly && (
+          <>
+            <IconButton icon="plus" title="New Branch…" size="small" action="vcs.log.branches.new" actionArg={target} />
+            <IconButton
+              icon="git-pull"
+              size="small"
+              title="Update Selected"
+              action="vcs.log.branches.update"
+              actionArg={target}
+              disabled={!canUpdateBranch(target ?? null)}
+            />
+            <IconButton
+              icon="trash"
+              size="small"
+              title="Delete Branch"
+              action="vcs.log.branches.delete"
+              actionArg={target}
+              disabled={!canDeleteBranch(target ?? null)}
+            />
+            <IconButton
+              icon="locate"
+              size="small"
+              title="Navigate Log to Selected Branch"
+              action="vcs.log.branches.navigate"
+              actionArg={target}
+              disabled={!target}
+            />
+            <IconButton
+              icon={favorite ? "star" : "star-outline"}
+              title={favorite ? "Remove from Favorites" : "Add to Favorites"}
+              size="small"
+              action="vcs.log.branches.toggleFavorite"
+              actionArg={target}
+              pressed={favorite}
+              disabled={!target?.branch}
+            />
+            <IconButton icon="git-fetch" title="Fetch" size="small" action="vcs.fetch" />
+          </>
+        )}
         <IconButton
-          icon="git-pull"
+          icon="refresh"
+          title="Refresh"
           size="small"
-          title="Update Selected"
-          action="vcs.log.branches.update"
-          actionArg={target}
-          disabled={!canUpdateBranch(target ?? null)}
+          onClick={() => (readOnly ? void reloadLog({ preserve: true }) : void loadBranches())}
         />
-        <IconButton
-          icon="trash"
-          size="small"
-          title="Delete Branch"
-          action="vcs.log.branches.delete"
-          actionArg={target}
-          disabled={!canDeleteBranch(target ?? null)}
-        />
-        <IconButton
-          icon="locate"
-          size="small"
-          title="Navigate Log to Selected Branch"
-          action="vcs.log.branches.navigate"
-          actionArg={target}
-          disabled={!target}
-        />
-        <IconButton
-          icon={favorite ? "star" : "star-outline"}
-          title={favorite ? "Remove from Favorites" : "Add to Favorites"}
-          size="small"
-          action="vcs.log.branches.toggleFavorite"
-          actionArg={target}
-          pressed={favorite}
-          disabled={!target?.branch}
-        />
-        <IconButton icon="git-fetch" title="Fetch" size="small" action="vcs.fetch" />
-        <IconButton icon="refresh" title="Refresh" size="small" onClick={() => void loadBranches()} />
       </div>
       <div className={styles.branchesMain}>
         <div className={styles.branchesBar}>
@@ -462,6 +573,15 @@ export function BranchesPanel() {
             setLogFilters({ branches: sel, repositories: n.repo ? [n.repo] : [] });
           }}
           onContextMenu={(n, _s, e) => {
+            if (readOnly) {
+              if (!n?.ref) return;
+              e.preventDefault();
+              showContextMenu(e, [
+                { label: "Show in Git Log", run: () => setLogBranches([n.ref!]) },
+                { label: "Copy", run: () => void copyText(n.ref!) },
+              ]);
+              return;
+            }
             const menu = n?.branch
               ? branchMenu(n.branch, n.repo ? (useVcs.getState().heads[n.repo]?.head ?? null) : current)
               : n?.kind === "tag"
@@ -558,13 +678,19 @@ function FilterButton({ label, value, onOpen, onClear, hidden }: LogFilter & { h
 }
 
 function FilterBar() {
+  const scope = useContext(LogIdContext);
+  const shown = useGitLog((s) => s.shownLog);
+  const active = !scope || scope === shown;
+  const logGeneration = useGitLog((s) => s.generation);
   const filters = useGitLog((s) => s.filters);
   const commits = useGitLog((s) => s.commits);
   const selectedBranches = useVcs((s) => s.branches);
   const [branches, setBranches] = useState(selectedBranches);
   const version = useVcs((s) => s.version);
   const root = useVcs((s) => s.root);
-  const repositories = useVcs((s) => s.roots);
+  const repositories = useLogRepositories();
+  const readOnly = useReadOnlyLog();
+  const bookmarks = useGitLog((s) => s.bookmarks);
   const showBranches = useLogOptions((s) => s.showBranches);
   useEffect(() => {
     let live = true;
@@ -584,7 +710,7 @@ function FilterBar() {
     return () => {
       live = false;
     };
-  }, [repositories, filters.repositories, version]);
+  }, [repositories, filters.repositories, version, logGeneration]);
   const [text, setText] = useState(filters.text);
   const [branchAnchor, setBranchAnchor] = useState<HTMLElement | null>(null);
   // Filters that do not fit move behind a chevron, like a toolbar's overflow.
@@ -613,10 +739,10 @@ function FilterBar() {
   }
 
   useEffect(() => {
-    if (text === filters.text) return;
+    if (!active || text === filters.text) return;
     const t = setTimeout(() => setLogFilters({ text }), 300);
     return () => clearTimeout(t);
-  }, [text, filters.text]);
+  }, [text, filters.text, active]);
 
   const branchNames = () => branches.filter((b) => !b.name.endsWith("/HEAD")).map((b) => b.name);
 
@@ -624,19 +750,38 @@ function FilterBar() {
     setBranchAnchor(null);
     const r = await chooseMany({
       title: "Filter by Branch",
-      options: ["HEAD", ...branchNames()],
+      options: [
+        ...new Set([
+          "HEAD",
+          ...branchNames(),
+          ...recentFilterValues("branches").flat(),
+          ...recentFilterValues("range").filter((s): s is string => !!s),
+        ]),
+      ],
       initial: filters.branches,
-      customLabel: "Other revisions (comma-separated):",
+      customLabel: "Branches, patterns, exclusions or ranges (comma-separated):",
     });
     if (r) setLogBranches(r);
   };
 
-  const openUser = (anchor: HTMLElement) => {
-    const authors = [...new Set(commits.map((c) => c.author))].sort((a, b) => a.localeCompare(b)).slice(0, 30);
+  const openUser = async (anchor: HTMLElement) => {
+    const roots = filters.repositories?.length
+      ? filters.repositories
+      : repositories.length
+        ? repositories
+        : [currentRepo()];
+    const users = await Promise.all(roots.map((repo) => call(commands.vcsLogUsers(repo)).catch(() => [] as string[])));
+    const authors = [...new Set(users.flat().concat(commits.map((c) => `${c.author} <${c.email}>`)))].sort((a, b) =>
+      a.localeCompare(b),
+    );
     menuBelow(anchor, [
+      ...recentFilterValues("authors").map((authors) => ({
+        label: authors.join(", "),
+        run: () => setLogFilters({ authors }),
+      })),
       { label: ME, checked: filters.authors.includes(ME), run: () => setLogFilters({ authors: [ME] }) },
       ...(authors.length ? [{ kind: "separator" as const }] : []),
-      ...authors.map((a) => ({
+      ...authors.slice(0, 30).map((a) => ({
         label: a,
         checked: filters.authors.includes(a),
         run: () => setLogFilters({ authors: [a] }),
@@ -659,6 +804,9 @@ function FilterBar() {
 
   const openDate = (anchor: HTMLElement) =>
     menuBelow(anchor, [
+      ...recentFilterValues("date")
+        .filter((date) => date != null)
+        .map((date) => ({ label: date.label, run: () => setLogFilters({ date }) })),
       ...DATE_OPTIONS.map((o) => ({
         label: o.label,
         checked: filters.date?.label === o.label,
@@ -676,14 +824,18 @@ function FilterBar() {
 
   const openPaths = (anchor: HTMLElement) =>
     menuBelow(anchor, [
+      ...recentFilterValues("paths")
+        .filter((paths) => paths?.length)
+        .map((paths) => ({ label: paths!.join(", "), run: () => setLogFilters({ paths, path: null }) })),
       {
         label: "Select Folders…",
         run: async () => {
-          const cur = filters.path && root ? relTo(root, filters.path) : (filters.path ?? "");
-          const r = await promptText({ title: "Filter by Path", label: "File or folder", initial: cur, mono: true });
-          if (!r) return;
-          const v = r.value.trim();
-          setLogFilters({ path: v ? (v.startsWith("/") || !root ? v : `${root}/${v}`) : null });
+          const paths = await chooseLogPaths(
+            repositories.length ? repositories : root ? [root] : [],
+            filters.paths ?? (filters.path ? [filters.path] : []),
+            readOnly,
+          );
+          if (paths) setLogFilters({ path: null, paths });
         },
       },
     ]);
@@ -709,7 +861,7 @@ function FilterBar() {
       : []),
     {
       label: "Branch",
-      value: filters.branches.join(", ") || null,
+      value: filters.range || filters.branches.join(", ") || null,
       onOpen: setBranchAnchor,
       onClear: () => setLogBranches([]),
     },
@@ -727,9 +879,13 @@ function FilterBar() {
     },
     {
       label: "Paths",
-      value: filters.path ? (root ? relTo(root, filters.path) : filters.path) || "." : null,
+      value: filters.paths?.length
+        ? filters.paths.map((p) => (root ? relTo(root, p) : p)).join(", ")
+        : filters.path
+          ? (root ? relTo(root, filters.path) : filters.path) || "."
+          : null,
       onOpen: openPaths,
-      onClear: () => setLogFilters({ path: null }),
+      onClear: () => setLogFilters({ path: null, paths: [] }),
     },
   ];
 
@@ -798,6 +954,71 @@ function FilterBar() {
         />
       )}
       <span className={styles.grow} />
+      <IconButton
+        icon="bookmark"
+        title="Bookmarked Commits"
+        size="small"
+        disabled={!Object.keys(bookmarks).length}
+        onClick={(e) =>
+          menuBelow(
+            e,
+            Object.entries(bookmarks).map(([key, summary]) => ({
+              label: summary,
+              run: () => {
+                const split = key.lastIndexOf("\0");
+                void goToRef(key.slice(split + 1), split >= 0 ? key.slice(0, split) : undefined);
+              },
+            })),
+          )
+        }
+      />
+      <IconButton
+        icon="plus"
+        title="Open Another Log Tab"
+        size="small"
+        onClick={(e) =>
+          menuBelow(e, [
+            {
+              label: "In Tool Window",
+              run: () => {
+                openLogTab("log", `Log ${useGitLog.getState().logTabs.length + 1}`);
+              },
+            },
+            {
+              label: "In Editor",
+              run: () => {
+                openLogTab("log", `Log ${useGitLog.getState().logTabs.length + 1}`, "editor");
+              },
+            },
+            { label: "External Repository…", run: openExternalLog },
+          ])
+        }
+      />
+      <IconButton
+        icon="clock"
+        title="Recent Filters"
+        size="small"
+        onClick={(e) =>
+          menuBelow(
+            e,
+            recentLogFilters().map((filters) => ({
+              label:
+                [
+                  filters.range,
+                  filters.branches.join(", "),
+                  filters.authors.join(", "),
+                  filters.text,
+                  filters.path,
+                  filters.paths?.join(", "),
+                  filters.date?.label,
+                ]
+                  .filter(Boolean)
+                  .join(" · ") || tx("All commits"),
+              run: () => setLogFilters(filters),
+            })),
+          )
+        }
+      />
       <IconButton icon="refresh" title="Refresh" size="small" onClick={() => void reloadLog({ preserve: true })} />
       <IconButton
         icon="sort"
@@ -830,10 +1051,21 @@ export function graphOptionsMenu(o: LogOptions): MenuItem[] {
     { kind: "header", label: "Sort" },
     { label: "By Commit Date", checked: o.sort === "date", run: () => updateLogOptions({ sort: "date" }) },
     { label: "Topologically", checked: o.sort === "topo", run: () => updateLogOptions({ sort: "topo" }) },
+    {
+      label: "Incoming Commits First",
+      checked: o.sort === "standard",
+      run: () => updateLogOptions({ sort: "standard" }),
+    },
     { kind: "separator" },
     { kind: "header", label: "Options" },
     toggle("First Parent", o, "firstParent"),
     toggle("No Merges", o, "noMerges"),
+    {
+      label: "Linearize Merges",
+      checked: o.linearizeMerges,
+      run: () =>
+        updateLogOptions({ linearizeMerges: !o.linearizeMerges, ...(!o.linearizeMerges ? { sort: "standard" } : {}) }),
+    },
     { kind: "separator" },
     { kind: "header", label: "Branch Actions" },
     { kind: "action", action: "vcs.log.collapseLinear" },
@@ -850,9 +1082,16 @@ export function viewOptionsMenu(o: LogOptions): MenuItem[] {
     toggle("Long Edges", o, "longEdges"),
     toggle("Commit Timestamp", o, "commitTimestamp"),
     toggle("References on the Left", o, "refsOnLeft"),
+    toggle("Details", o, "showDetails"),
+    toggle("Repository", o, "showRepository"),
     {
       label: "Columns",
-      submenu: [toggle("Author", o, "showAuthor"), toggle("Date", o, "showDate"), toggle("Hash", o, "showHash")],
+      submenu: [
+        toggle("Author", o, "showAuthor"),
+        toggle("Date", o, "showDate"),
+        toggle("Hash", o, "showHash"),
+        toggle("Signature", o, "showSignature"),
+      ],
     },
     { kind: "separator" },
     { kind: "header", label: "Highlight" },
@@ -864,6 +1103,22 @@ export function viewOptionsMenu(o: LogOptions): MenuItem[] {
 
 /** IDEA's Git Log commit context menu (Git.Log.ContextMenu); `selection` = all selected commits, newest first. */
 export function commitMenu(c: Commit, selection: Commit[] = [c]): MenuItem[] {
+  if ((c as RepoCommit).readOnly)
+    return [
+      { kind: "action", action: "vcs.log.copyRevision", arg: c },
+      { label: "Copy Commit Message", run: () => copyCommitMessage(c) },
+      {
+        label: useGitLog.getState().bookmarks[commitKey(c)] ? "Remove Commit Bookmark" : "Bookmark Commit",
+        run: () => toggleCommitBookmark(c),
+      },
+      {
+        label: "Assign Mnemonic",
+        run: () => useBookmarkPopups.setState({ chooser: { path: commitBookmarkPath(c), line: 0, text: c.summary } }),
+      },
+      { kind: "action", action: "vcs.log.goToParent", arg: c },
+      { kind: "action", action: "vcs.log.goToChild", arg: c },
+      { label: "Browse Repository at Revision", run: () => browseRepositoryAt(c) },
+    ];
   const many = selection.length > 1 && selection.some((x) => commitKey(x) === commitKey(c));
   const head = (commitRepo(c) ? useVcs.getState().heads[commitRepo(c)!]?.head : useVcs.getState().branch?.head) ?? null;
   const { outgoing } = useGitLog.getState();
@@ -894,11 +1149,16 @@ export function commitMenu(c: Commit, selection: Commit[] = [c]): MenuItem[] {
       : true);
   return [
     { kind: "action", action: "vcs.log.copyRevision", arg: c },
-    { label: "Copy Commit Message", run: () => void navigator.clipboard?.writeText(c.message) },
+    {
+      label: useGitLog.getState().bookmarks[commitKey(c)] ? "Remove Commit Bookmark" : "Bookmark Commit",
+      run: () => toggleCommitBookmark(c),
+    },
+    { label: "Copy Commit Message", run: () => copyCommitMessage(c) },
     { kind: "action", action: "vcs.log.createPatch", arg: c },
     { kind: "action", action: "vcs.log.cherryPick", arg: c },
     { kind: "separator" },
     { kind: "action", action: "vcs.log.checkoutRevision", arg: c },
+    { label: "Browse Repository at Revision", run: () => browseRepositoryAt(c) },
     { kind: "action", action: "vcs.log.compareWithLocal", arg: c },
     { kind: "separator" },
     { kind: "action", action: "vcs.log.resetToHere", arg: c },
@@ -922,6 +1182,10 @@ export function commitMenu(c: Commit, selection: Commit[] = [c]): MenuItem[] {
     { kind: "action", action: "vcs.log.newBranch", arg: c },
     { kind: "action", action: "vcs.log.newTag", arg: c },
     { kind: "separator" },
+    {
+      label: "Assign Mnemonic",
+      run: () => useBookmarkPopups.setState({ chooser: { path: commitBookmarkPath(c), line: 0, text: c.summary } }),
+    },
     { kind: "action", action: "vcs.log.goToChild", arg: c },
     { kind: "action", action: "vcs.log.goToParent", arg: c, disabled: !c.parents.length },
     { kind: "separator" },
@@ -929,10 +1193,58 @@ export function commitMenu(c: Commit, selection: Commit[] = [c]): MenuItem[] {
   ];
 }
 
+async function copyCommitMessage(c: Commit) {
+  const message = c.messageTruncated ? (await loadLogDetails(c)).message : c.message;
+  await copyText(message);
+}
+
 function CommitList() {
+  const scope = useContext(LogIdContext);
+  const shown = useGitLog((s) => s.shownLog);
+  const active = !scope || scope === shown;
   const all = useGitLog((s) => s.commits);
-  const allRows = useGitLog((s) => s.rows);
+  const selection = useGitLog((s) => s.selection);
+  const earlier = useMemo(() => {
+    const seen = new Set<string | null | undefined>();
+    return all.some((c) => {
+      const repo = commitRepo(c);
+      if (seen.has(repo)) return false;
+      seen.add(repo);
+      return (c.logPosition ?? 0) > 0;
+    });
+  }, [all]);
   const opts = useLogOptions();
+  const bookmarks = useGitLog((s) => s.bookmarks);
+  const fragments = useGitLog((s) => s.fragments);
+  const { expanded: expandedFragments, collapsed: collapsedFragments, merges: expandedMerges } = fragments;
+  const [hoverColor, setHoverColor] = useState<string | null>(null);
+  const [boundaryTitles, setBoundaryTitles] = useState<ReadonlyMap<string, string>>(() => new Map());
+  const boundaryRequests = useRef(new Set<string>());
+  const [speedSearch, setSpeedSearch] = useState("");
+  const speedGeneration = useRef(0);
+  const speedTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  useEffect(() => () => clearTimeout(speedTimer.current), []);
+  const columns = useMemo(() => {
+    const builtins: LogColumn[] = [
+      ...(opts.showAuthor ? [{ id: "author", title: "Author", width: 130, render: (c: Commit) => c.author }] : []),
+      ...(opts.showDate
+        ? [
+            {
+              id: "date",
+              title: "Date",
+              width: 120,
+              render: (c: Commit) => formatTime(opts.commitTimestamp ? (c.commitTimeMs ?? c.timeMs) : c.timeMs),
+            },
+          ]
+        : []),
+      ...(opts.showHash ? [{ id: "hash", title: "Hash", width: 72, render: (c: Commit) => c.shortId }] : []),
+      ...(opts.showSignature
+        ? [{ id: "signature", title: "Signature", width: 100, render: (c: Commit) => <CommitSignature commit={c} /> }]
+        : []),
+    ];
+    const order = [...new Set([...opts.columnOrder, ...builtins.map((c) => c.id)])];
+    return builtins.sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
+  }, [opts.showAuthor, opts.showDate, opts.showHash, opts.showSignature, opts.commitTimestamp, opts.columnOrder]);
   const user = useGitLog((s) => s.user);
   const headCommit = useVcs((s) => s.branch?.headCommit ?? null);
   const branches = useVcs((s) => s.branches);
@@ -943,23 +1255,66 @@ function CommitList() {
   const headKeys = useMemo(
     () =>
       new Set(
-        all.filter((c) => c.id === (commitRepo(c) ? heads[commitRepo(c)!]?.headCommit : headCommit)).map(commitKey),
+        all
+          .filter(
+            (c) => c.refs.includes("HEAD") || c.id === (commitRepo(c) ? heads[commitRepo(c)!]?.headCommit : headCommit),
+          )
+          .map(commitKey),
       ),
     [all, heads, headCommit],
   );
-  const collapsed = useMemo(
-    () => (opts.collapseLinear ? collapseLinear(all.map(graphCommit), headKeys) : null),
-    [all, opts.collapseLinear, headKeys],
+  const {
+    commits,
+    rows,
+    linear,
+    collapsed,
+    graph: displayedGraph,
+  } = useMemo(
+    () => presentLogGraph(all, opts, fragments, new Set([...headKeys, ...selection, ...Object.keys(bookmarks)])),
+    [all, opts, fragments, headKeys, selection, bookmarks],
+  );
+  const { edges: highlighted, nodes: highlightedNodes } = useMemo(() => {
+    const empty = { edges: new Set<string>(), nodes: new Set<string>() };
+    if (!hoverColor) return empty;
+    const nodeId = hoverColor.startsWith("node:") ? hoverColor.slice(5) : null;
+    const merge = nodeId ?? linear?.fragments.get(hoverColor);
+    const fragment = merge ? linear?.nodes.get(merge) : null;
+    const nodes = new Set(fragment);
+    if (!fragment) {
+      const source = nodeId
+        ? displayedGraph.find((c) => c.id === nodeId)
+        : displayedGraph.find((c) => c.parents.some((p) => `${c.id}\0${p}` === hoverColor));
+      const target = source?.parents.find((p) => nodeId || `${source.id}\0${p}` === hoverColor);
+      if (source) nodes.add(source.id);
+      const byId = new Map(displayedGraph.map((c) => [c.id, c]));
+      const children = new Map<string, number>();
+      for (const c of displayedGraph) for (const p of c.parents) children.set(p, (children.get(p) ?? 0) + 1);
+      for (let current = target; current && !nodes.has(current);) {
+        nodes.add(current);
+        const c = byId.get(current);
+        if (!c || c.parents.length !== 1 || children.get(current) !== 1 || c.refs?.length || headKeys.has(current))
+          break;
+        current = c.parents[0];
+      }
+    }
+    return {
+      nodes,
+      edges: new Set(
+        displayedGraph.flatMap((c) =>
+          nodes.has(c.id) ? c.parents.filter((p) => nodes.has(p)).map((p) => `${c.id}\0${p}`) : [],
+        ),
+      ),
+    };
+  }, [hoverColor, linear, displayedGraph, headKeys]);
+  const minWidth = useMemo(
+    () =>
+      rows.reduce((width, row) => Math.max(width, row.width * LANE), 100) +
+      columns.reduce(
+        (width, column) => width + (opts.columnWidths[column.id] ?? column.width ?? 120),
+        opts.showRepository && useVcs.getState().roots.length > 1 ? 220 : 120,
+      ),
+    [rows, columns, opts.columnWidths, opts.showRepository],
   );
-  const commits = useMemo(() => {
-    if (!collapsed) return all;
-    const byKey = new Map(all.map((c) => [commitKey(c), c]));
-    return collapsed.commits.map((c) => byKey.get(c.id)!);
-  }, [all, collapsed]);
-  const rows = useMemo(() => {
-    const laid = collapsed ? computeGraph(collapsed.graph).rows : allRows;
-    return opts.longEdges ? laid : hideLongEdges(laid);
-  }, [collapsed, allRows, opts.longEdges]);
   const filterBranches = useGitLog((s) => s.filters.branches);
   const currentBranch = useVcs((s) => s.branch?.head ?? null);
   // Nothing to tell apart when the log is filtered to the current branch.
@@ -968,29 +1323,48 @@ function CommitList() {
     if (!opts.highlightCurrentBranch || onlyCurrent) return null;
     const reach = new Set<string>();
     for (const head of headKeys) for (const id of reachableFrom(all.map(graphCommit), head)) reach.add(id);
+    for (const c of all) {
+      if (c.onCurrentBranch === true) reach.add(commitKey(c));
+      else if (c.onCurrentBranch === false) reach.delete(commitKey(c));
+    }
     return reach;
   }, [all, headKeys, opts.highlightCurrentBranch, onlyCurrent]);
   const loading = useGitLog((s) => s.loading);
   const done = useGitLog((s) => s.done);
   const error = useGitLog((s) => s.error);
   const selected = useGitLog((s) => s.selected);
-  const selection = useGitLog((s) => s.selection);
   const selectedSet = useMemo(() => new Set(selection), [selection]);
   const revealTick = useGitLog((s) => s.revealTick);
   const scrollRef = useRef<HTMLDivElement>(null);
+  const previousRows = useRef(commits);
+  useLayoutEffect(() => {
+    const element = scrollRef.current;
+    const previous = previousRows.current;
+    previousRows.current = commits;
+    if (!element || previous === commits) return;
+    const top = Math.max(0, Math.floor((element.scrollTop - ROW) / ROW));
+    // Preserve the first surviving visible commit and its pixel offset.
+    for (let i = top; i < previous.length; i++) {
+      const next = commits.findIndex((c) => commitKey(c) === commitKey(previous[i]!));
+      if (next < 0) continue;
+      element.scrollTop += (next - i) * ROW;
+      break;
+    }
+  }, [commits]);
   const finished = done;
   const virtualizer = useVirtualizer({
     count: commits.length + (finished ? 0 : 1),
     getScrollElement: () => scrollRef.current,
     estimateSize: () => ROW,
     overscan: 20,
+    scrollMargin: ROW,
   });
   const items = virtualizer.getVirtualItems();
   const last = items[items.length - 1];
 
   useEffect(() => {
-    if (!finished && !loading && last && last.index >= commits.length - 40) void loadMore();
-  }, [last, commits.length, finished, loading]);
+    if (!finished && !loading && last && last.index >= commits.length - 40) void loadMore(scope ?? undefined);
+  }, [last, commits.length, finished, loading, active, scope]);
 
   const selectedIndex = selected ? commits.findIndex((c) => commitKey(c) === selected) : -1;
   useLayoutEffect(() => {
@@ -1011,6 +1385,54 @@ function CommitList() {
   }, []);
 
   const onKeyDown = (e: KeyboardEvent) => {
+    if (!e.ctrlKey && !e.metaKey && !e.altKey && (e.key.length === 1 || e.key === "Backspace" || e.key === "Escape")) {
+      const query = e.key === "Escape" ? "" : e.key === "Backspace" ? speedSearch.slice(0, -1) : speedSearch + e.key;
+      setSpeedSearch(query);
+      speedGeneration.current++;
+      clearTimeout(speedTimer.current);
+      speedTimer.current = setTimeout(() => setSpeedSearch(""), 1500);
+      if (query) {
+        const found = nextSpeedMatch(commits, query, opts, -1);
+        if (found >= 0) {
+          selectCommit(commitKey(commits[found]!), true);
+          virtualizer.scrollToIndex(found, { align: "auto" });
+        } else if (query.length >= 2) {
+          const generation = ++speedGeneration.current;
+          const roots = [...new Set(all.map(commitRepo))];
+          void Promise.all(
+            roots.map(async (repo) => {
+              const [hit] = await call(
+                commands.vcsLog(repo ?? currentRepo(), {
+                  skip: 0,
+                  limit: 1,
+                  summaryOnly: true,
+                  speedSearch: query,
+                  searchFields: [...(opts.showAuthor ? ["author"] : []), ...(opts.showHash ? ["hash"] : [])],
+                  branch: null,
+                  path: null,
+                  author: null,
+                  text: null,
+                }),
+              );
+              return hit ? { ...hit, repo } : null;
+            }),
+          )
+            .then((hits) => {
+              const hit = hits.find(Boolean);
+              if (hit && speedGeneration.current === generation) void goToRef(hit.id, commitRepo(hit));
+            })
+            .catch(() => undefined);
+        }
+      }
+      e.preventDefault();
+      return;
+    }
+    if (speedSearch && (e.key === "F3" || e.key === "Enter")) {
+      e.preventDefault();
+      const found = nextSpeedMatch(commits, speedSearch, opts, selectedIndex, e.shiftKey ? -1 : 1);
+      if (found >= 0) selectCommit(commitKey(commits[found]!), true);
+      return;
+    }
     const lead = selectedIndex >= 0 ? commits[selectedIndex] : undefined;
     if (lead && (e.key === "ArrowLeft" || e.key === "ArrowRight") && !e.altKey && !e.metaKey && !e.ctrlKey) {
       e.preventDefault();
@@ -1037,8 +1459,113 @@ function CommitList() {
 
   if (error && !commits.length) return <div className={styles.message}>{error}</div>;
 
+  const fragment = (from: string, target: string, expand: boolean) => {
+    if (from === target && (expandedMerges.has("*") ? !expandedMerges.has(from) : expandedMerges.has(from))) {
+      useGitLog.setState({
+        fragments: {
+          ...fragments,
+          merges: expandedMerges.has("*")
+            ? new Set([...expandedMerges, from])
+            : new Set([...expandedMerges].filter((id) => id !== from)),
+        },
+      });
+      return;
+    }
+    if (
+      from === target &&
+      linear &&
+      all.find((c) => commitKey(c) === from)?.parents.length === 2 &&
+      linear.graph.find((c) => c.id === from)?.parents.length === 1
+    ) {
+      useGitLog.setState({
+        fragments: {
+          ...fragments,
+          merges: expandedMerges.has("*")
+            ? new Set([...expandedMerges].filter((id) => id !== from))
+            : new Set([...expandedMerges, from]),
+        },
+      });
+      return;
+    }
+    if (from === target) {
+      const shown = (linear?.graph ?? collapsed?.graph ?? all.map(graphCommit)).find((c) => c.id === from);
+      target = shown?.parents[0] ?? target;
+      expand = !!shown?.dashed?.[0];
+    }
+    const merge = linear?.fragments.get(`${from}\0${target}`);
+    if (merge) {
+      useGitLog.setState({
+        fragments: {
+          ...fragments,
+          merges: expandedMerges.has("*")
+            ? new Set([...expandedMerges].filter((id) => id !== merge))
+            : new Set([...expandedMerges, merge]),
+        },
+      });
+      return;
+    }
+    const graph = new Map(
+      all.map((c) => {
+        const g = graphCommit(c);
+        return [g.id, g] as const;
+      }),
+    );
+    const childCounts = new Map<string, number>();
+    for (const c of graph.values())
+      for (const parent of c.parents) childCounts.set(parent, (childCounts.get(parent) ?? 0) + 1);
+    const hidden: string[] = [];
+    for (const start of expand ? (graph.get(from)?.parents ?? []) : [target]) {
+      const chain: string[] = [];
+      let current: string | undefined = start;
+      const seen = new Set<string>();
+      while (current && !seen.has(current)) {
+        seen.add(current);
+        const node = graph.get(current);
+        if (
+          !node ||
+          (expand && current === target) ||
+          node.parents.length !== 1 ||
+          childCounts.get(current) !== 1 ||
+          node.refs.length ||
+          headKeys.has(current)
+        )
+          break;
+        chain.push(current);
+        current = node.parents[0];
+      }
+      if (!expand || current === target) hidden.push(...chain);
+    }
+    if (expand) {
+      useGitLog.setState({
+        fragments: {
+          ...fragments,
+          expanded: new Set([...expandedFragments, ...hidden]),
+          collapsed: new Set([...collapsedFragments].filter((id) => !hidden.includes(id))),
+        },
+      });
+    } else {
+      useGitLog.setState({
+        fragments: {
+          ...fragments,
+          expanded: new Set([...expandedFragments].filter((id) => !hidden.includes(id))),
+          collapsed: new Set([...collapsedFragments, ...hidden]),
+        },
+      });
+    }
+  };
+
   return (
     <div className={styles.listWrap}>
+      {earlier && (
+        <button type="button" disabled={loading} onClick={() => void loadNewer(scope ?? undefined)}>
+          {tx("Load Newer Commits")}
+        </button>
+      )}
+      {speedSearch && (
+        <div role="status" className={styles.speedSearch}>
+          {speedSearch}
+        </div>
+      )}
       {error && (
         <div role="alert" className={styles.message}>
           {error}
@@ -1050,19 +1577,51 @@ function CommitList() {
         role="listbox"
         aria-label={tx("Commits")}
         aria-multiselectable
-        aria-activedescendant={selectedIndex >= 0 ? `commit-${selectedIndex}` : undefined}
+        aria-activedescendant={selectedIndex >= 0 ? `commit-${scope ?? "log"}-${selectedIndex}` : undefined}
         tabIndex={0}
         onKeyDown={onKeyDown}
+        onCopy={(e) => {
+          if (window.getSelection()?.toString()) return;
+          const selected = commits.filter((c) => selectedSet.has(commitKey(c)));
+          if (!selected.length) return;
+          e.preventDefault();
+          e.clipboardData.setData(
+            "text/plain",
+            selected
+              .map((c) =>
+                [
+                  c.summary,
+                  c.refs.join(" "),
+                  ...(opts.showRepository ? [commitRepo(c) ?? ""] : []),
+                  ...columns.map((column) => (typeof column.render(c) === "string" ? column.render(c) : "")),
+                ].join("\t"),
+              )
+              .join("\n"),
+          );
+          e.clipboardData.setData(
+            "application/x-openidea-vcs-commits",
+            JSON.stringify({ version: 1, commits: selected.map((c) => ({ root: commitRepo(c), hash: c.id })) }),
+          );
+        }}
       >
+        <div className={clsx(styles.row, styles.columnHeader)} style={{ minWidth }}>
+          {opts.showRepository && useVcs.getState().roots.length > 1 && (
+            <span className={styles.colRepository}>{tx("Repository")}</span>
+          )}
+          <span className={styles.colSubject}>{tx("Commit")}</span>
+          {columns.map((column) => (
+            <LogColumnHeader key={column.id} column={column} columns={columns} options={opts} />
+          ))}
+        </div>
         {!commits.length && !loading && finished && (
           <div className={styles.message}>{headCommit ? tx("No commits match the filters") : tx("No commits yet")}</div>
         )}
-        <div style={{ height: virtualizer.getTotalSize(), position: "relative" }}>
+        <div style={{ height: virtualizer.getTotalSize(), position: "relative", minWidth }}>
           {items.map((v) => {
             const c = commits[v.index];
             if (!c)
               return (
-                <div key="loading" className={styles.row} style={{ top: v.start }}>
+                <div key="loading" className={styles.row} style={{ top: v.start - ROW }}>
                   <Spinner size={12} />{" "}
                   <span className={styles.muted}>
                     <T>Loading…</T>
@@ -1072,10 +1631,10 @@ function CommitList() {
             return (
               <CommitRow
                 key={commitKey(c)}
-                id={`commit-${v.index}`}
+                id={`commit-${scope ?? "log"}-${v.index}`}
                 commit={c}
                 graph={rows[v.index]}
-                top={v.start}
+                top={v.start - ROW}
                 selected={selectedSet.has(commitKey(c))}
                 head={headKeys.has(commitKey(c))}
                 mine={opts.highlightMine && isMine(c, user)}
@@ -1083,6 +1642,52 @@ function CommitList() {
                 opts={opts}
                 remoteNames={new Set((c as RepoCommit).remoteNames ?? remoteNames)}
                 onPick={pick}
+                hoverColor={hoverColor}
+                highlighted={highlighted}
+                highlightedNodes={highlightedNodes}
+                onHover={(edge) => {
+                  setHoverColor(edge);
+                  if (!edge) return;
+                  const source = displayedGraph.find((c) => c.parents.some((p) => `${c.id}\0${p}` === edge));
+                  const target = source?.parents.find((p) => `${source.id}\0${p}` === edge);
+                  if (
+                    !source ||
+                    !target ||
+                    commits.some((c) => commitKey(c) === target) ||
+                    boundaryRequests.current.has(target)
+                  )
+                    return;
+                  const original = all.find((c) => commitKey(c) === source.id);
+                  if (!original) return;
+                  boundaryRequests.current.add(target);
+                  const split = target.lastIndexOf("\0"),
+                    id = target.slice(split + 1);
+                  void loadLogDetails({ ...original, id })
+                    .then((details) =>
+                      setBoundaryTitles((current) =>
+                        new Map(current).set(target, `${id.slice(0, 8)} ${details.message.split("\n")[0]}`),
+                      ),
+                    )
+                    .catch(() => undefined);
+                }}
+                onFragment={fragment}
+                onNavigate={(index, key) => {
+                  const target = commits[index];
+                  if (target) selectCommit(commitKey(target), true);
+                  else if (key) {
+                    const split = key.lastIndexOf("\0");
+                    void goToRef(key.slice(split + 1), split >= 0 ? key.slice(0, split) : currentRepo());
+                  }
+                }}
+                targetTitle={(index, key) => {
+                  const target = commits[index];
+                  return target
+                    ? `${target.shortId} ${target.summary} — ${target.author}`
+                    : (key && boundaryTitles.get(key)) ||
+                        `${tx("Commit is outside the loaded history")} · ${key?.split("\0").at(-1)?.slice(0, 8) ?? ""}`;
+                }}
+                columns={columns}
+                bookmarked={!!bookmarks[commitKey(c)]}
               />
             );
           })}
@@ -1092,6 +1697,106 @@ function CommitList() {
   );
 }
 
+function LogColumnHeader({
+  column,
+  columns,
+  options,
+}: {
+  column: LogColumn;
+  columns: LogColumn[];
+  options: LogOptions;
+}) {
+  const drag = useRef<{ x: number; width: number } | null>(null);
+  const width = options.columnWidths[column.id] ?? column.width ?? 120;
+  const resize = (value: number) =>
+    updateLogOptions({
+      columnWidths: { ...logOptions().columnWidths, [column.id]: Math.max(40, Math.min(800, value)) },
+    });
+  const move = (source: string, target: string) => {
+    const ids = columns.map((c) => c.id);
+    const from = ids.indexOf(source),
+      to = ids.indexOf(target);
+    if (from < 0 || to < 0 || from === to) return;
+    ids.splice(from, 1);
+    ids.splice(to, 0, source);
+    updateLogOptions({ columnOrder: ids });
+  };
+  const index = columns.findIndex((c) => c.id === column.id);
+  return (
+    <span
+      className={clsx(styles.columnCell, styles.columnHeading)}
+      style={{ width }}
+      draggable
+      onDragStart={(e) => {
+        e.dataTransfer.setData("application/x-openidea-log-column", column.id);
+        e.dataTransfer.effectAllowed = "move";
+      }}
+      onDragOver={(e) => {
+        if (e.dataTransfer.types.includes("application/x-openidea-log-column")) e.preventDefault();
+      }}
+      onDrop={(e) => {
+        e.preventDefault();
+        move(e.dataTransfer.getData("application/x-openidea-log-column"), column.id);
+      }}
+      onContextMenu={(e) => {
+        e.preventDefault();
+        showContextMenu(e, [
+          {
+            label: "Move Left",
+            disabled: index === 0,
+            run: () => move(column.id, columns[index - 1]?.id ?? column.id),
+          },
+          {
+            label: "Move Right",
+            disabled: index === columns.length - 1,
+            run: () => move(column.id, columns[index + 1]?.id ?? column.id),
+          },
+          { label: "Reset Width", run: () => resize(column.width ?? 120) },
+        ]);
+      }}
+    >
+      {tx(column.title)}
+      <span
+        className={styles.columnResize}
+        role="separator"
+        aria-orientation="vertical"
+        aria-label={tx`Resize ${tx(column.title)} column`}
+        aria-valuemin={40}
+        aria-valuemax={800}
+        aria-valuenow={width}
+        tabIndex={0}
+        onPointerDown={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          drag.current = { x: e.clientX, width };
+          e.currentTarget.setPointerCapture(e.pointerId);
+        }}
+        onPointerMove={(e) => {
+          if (drag.current && e.currentTarget.hasPointerCapture(e.pointerId))
+            resize(drag.current.width + e.clientX - drag.current.x);
+        }}
+        onPointerUp={(e) => {
+          drag.current = null;
+          if (e.currentTarget.hasPointerCapture(e.pointerId)) e.currentTarget.releasePointerCapture(e.pointerId);
+        }}
+        onPointerCancel={() => {
+          drag.current = null;
+        }}
+        onLostPointerCapture={() => {
+          drag.current = null;
+        }}
+        onKeyDown={(e) => {
+          if (e.key !== "ArrowLeft" && e.key !== "ArrowRight") return;
+          e.preventDefault();
+          e.stopPropagation();
+          if (e.altKey) move(column.id, columns[index + (e.key === "ArrowLeft" ? -1 : 1)]?.id ?? column.id);
+          else resize(width + (e.key === "ArrowLeft" ? -10 : 10));
+        }}
+      />
+    </span>
+  );
+}
+
 const CommitRow = memo(function CommitRow({
   id,
   commit: c,
@@ -1104,6 +1809,15 @@ const CommitRow = memo(function CommitRow({
   opts,
   remoteNames,
   onPick,
+  hoverColor,
+  highlighted,
+  highlightedNodes,
+  onHover,
+  onFragment,
+  onNavigate,
+  targetTitle,
+  columns,
+  bookmarked,
 }: {
   id: string;
   commit: Commit;
@@ -1116,8 +1830,35 @@ const CommitRow = memo(function CommitRow({
   opts: LogOptions;
   remoteNames: ReadonlySet<string>;
   onPick: (id: string, e: ReactMouseEvent) => void;
+  hoverColor: string | null;
+  highlighted: ReadonlySet<string>;
+  highlightedNodes: ReadonlySet<string>;
+  onHover: (color: string | null) => void;
+  onFragment: (from: string, target: string, expand: boolean) => void;
+  onNavigate: (index: number, key?: string) => void;
+  targetTitle: (index: number, key?: string) => string;
+  columns: LogColumn[];
+  bookmarked: boolean;
 }) {
   const merge = opts.highlightMerges && c.parents.length > 1;
+  const subjectRef = useRef<HTMLSpanElement>(null);
+  const [tooltip, setTooltip] = useState(false);
+  const tooltipTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  useEffect(() => () => clearTimeout(tooltipTimer.current), []);
+  useEffect(() => {
+    if (!tooltip) return;
+    const hide = () => setTooltip(false);
+    window.addEventListener("scroll", hide, true);
+    return () => window.removeEventListener("scroll", hide, true);
+  }, [tooltip]);
+  const enterTooltip = () => {
+    clearTimeout(tooltipTimer.current);
+    tooltipTimer.current = setTimeout(() => setTooltip(true), TOOLTIP_DELAY);
+  };
+  const leaveTooltip = () => {
+    clearTimeout(tooltipTimer.current);
+    tooltipTimer.current = setTimeout(() => setTooltip(false), 120);
+  };
   const refs = c.refs.length > 0 && (
     <RefLabels
       refs={c.refs}
@@ -1127,7 +1868,6 @@ const CommitRow = memo(function CommitRow({
       left={opts.refsOnLeft}
     />
   );
-  const time = opts.commitTimestamp ? (c.commitTimeMs ?? c.timeMs) : c.timeMs;
   return (
     <div
       id={id}
@@ -1144,29 +1884,70 @@ const CommitRow = memo(function CommitRow({
         showContextMenu(e, commitMenu(c, selectedCommits()));
       }}
     >
-      {commitRepo(c) && useVcs.getState().roots.length > 1 && (
+      {opts.showRepository && commitRepo(c) && useVcs.getState().roots.length > 1 && (
         <span className={styles.colRepository} title={commitRepo(c)!}>
           {repoName(commitRepo(c)!)}
         </span>
       )}
       <span className={styles.colSubject}>
-        {graph && <GraphCell row={graph} head={head} />}
+        {graph && (
+          <GraphCell
+            row={graph}
+            head={head}
+            activeColor={hoverColor}
+            highlighted={highlighted}
+            highlightedNodes={highlightedNodes}
+            onHover={onHover}
+            onNavigate={onNavigate}
+            targetTitle={targetTitle}
+            onFragment={(target, expand, source) => onFragment(source ?? commitKey(c), target, expand)}
+            onNode={() => onFragment(commitKey(c), commitKey(c), false)}
+          />
+        )}
+        {bookmarked && <Icon name="bookmark" size={12} />}
         {opts.refsOnLeft && refs}
         <span
+          ref={subjectRef}
           className={clsx(styles.subject, head && styles.headSubject, merge && styles.mergeSubject)}
-          title={c.message}
+          onPointerEnter={enterTooltip}
+          onPointerLeave={leaveTooltip}
+          onPointerDown={() => {
+            clearTimeout(tooltipTimer.current);
+            setTooltip(false);
+          }}
         >
-          {c.summary}
+          <IssueText text={c.summary} />
         </span>
         {!opts.refsOnLeft && refs}
+        <Popup
+          open={tooltip}
+          anchor={subjectRef}
+          role="tooltip"
+          autoFocus={false}
+          restoreFocus={false}
+          onClose={() => setTooltip(false)}
+          className={styles.commitTooltip}
+        >
+          <div onPointerEnter={() => clearTimeout(tooltipTimer.current)} onPointerLeave={leaveTooltip}>
+            <CommitMessage commit={c} />
+          </div>
+        </Popup>
       </span>
-      {opts.showAuthor && (
-        <span className={clsx(styles.colAuthor, styles.muted, mine && styles.mine)} title={`${c.author} <${c.email}>`}>
-          {c.author}
+      {columns.map((column) => (
+        <span
+          key={column.id}
+          className={clsx(
+            styles.columnCell,
+            styles.muted,
+            column.id === "author" && mine && styles.mine,
+            column.id === "hash" && styles.hash,
+          )}
+          style={{ width: opts.columnWidths[column.id] ?? column.width ?? 120 }}
+          title={column.id === "author" ? `${c.author} <${c.email}>` : undefined}
+        >
+          {column.render(c)}
         </span>
-      )}
-      {opts.showDate && <span className={clsx(styles.colDate, styles.muted)}>{formatTime(time)}</span>}
-      {opts.showHash && <span className={clsx(styles.colHash, styles.muted, styles.hash)}>{c.shortId}</span>}
+      ))}
     </div>
   );
 });
@@ -1175,50 +1956,143 @@ function x(lane: number) {
   return LANE / 2 + lane * LANE;
 }
 
+/** Straight, also across lanes (IDEA's diagonal edges). */
 function seg(fromX: number, fromY: number, toX: number, toY: number) {
-  if (fromX === toX) return `M${fromX} ${fromY}L${toX} ${toY}`;
-  const mid = (fromY + toY) / 2;
-  return `M${fromX} ${fromY}C${fromX} ${mid} ${toX} ${mid} ${toX} ${toY}`;
+  return `M${fromX} ${fromY}L${toX} ${toY}`;
 }
 
-export function GraphCell({ row, head }: { row: GraphRow; head?: boolean }) {
-  const width = Math.min(row.width, 24) * LANE;
+export function GraphCell({
+  row,
+  head,
+  activeColor,
+  highlighted,
+  highlightedNodes,
+  onHover,
+  onNavigate,
+  onFragment,
+  targetTitle,
+  onNode,
+}: {
+  row: GraphRow;
+  head?: boolean;
+  activeColor?: string | null;
+  highlighted?: ReadonlySet<string>;
+  highlightedNodes?: ReadonlySet<string>;
+  onHover?: (edge: string | null) => void;
+  onNavigate?: (index: number, key?: string) => void;
+  onFragment?: (target: string, expand: boolean, source?: string) => void;
+  targetTitle?: (index: number, key?: string) => string;
+  onNode?: () => void;
+}) {
   const cy = ROW / 2;
+  const draw = (s: GraphSegment, i: number, up: boolean) => {
+    const target = (up ? row.upTargets : row.downTargets)?.[i];
+    const canFragment =
+      !!target &&
+      !!onFragment &&
+      s.kind !== "filtered" &&
+      s.kind !== "shallow" &&
+      (!!s.source || (!up && s.from === row.lane));
+    const canNavigate = s.targetRow != null && s.kind !== "shallow" && !!onNavigate;
+    const actionable = canNavigate || canFragment;
+    const label =
+      s.kind === "shallow"
+        ? tx("Shallow history boundary")
+        : s.targetRow != null
+          ? (targetTitle?.(s.targetRow, target) ?? tx("Go to connected commit"))
+          : s.dashed
+            ? tx("Expand this fragment")
+            : tx("Collapse this fragment");
+    const activate = () => {
+      if (canNavigate) onNavigate?.(s.targetRow!, target);
+      else if (canFragment) onFragment?.(target!, !!s.dashed, s.source);
+    };
+    const fromX = x(s.fromX ?? s.from);
+    const toX = x(s.toX ?? s.to);
+    const path =
+      seg(fromX, up ? 0 : cy, toX, up ? cy : ROW) +
+      (s.arrow ? arrowHead(up ? fromX : toX, up ? 0 : ROW, up ? -1 : 1) : "");
+    return (
+      <g
+        key={`${up ? "u" : "d"}${i}`}
+        role={actionable ? "button" : undefined}
+        tabIndex={actionable ? 0 : undefined}
+        aria-label={actionable ? label : undefined}
+        onMouseEnter={() => onHover?.(s.edge ?? `${s.source ?? ""}\0${target ?? ""}`)}
+        onMouseDown={(e) => e.stopPropagation()}
+        onClick={(e) => {
+          e.stopPropagation();
+          activate();
+        }}
+        onKeyDown={(e) => {
+          if (actionable && (e.key === "Enter" || e.key === " ")) {
+            e.preventDefault();
+            e.stopPropagation();
+            activate();
+          }
+        }}
+      >
+        <title>{label}</title>
+        <rect
+          x={Math.min(fromX, toX) - 5}
+          y={up ? 0 : cy}
+          width={Math.max(10, Math.abs(fromX - toX) + 10)}
+          height={cy}
+          fill="transparent"
+          pointerEvents="none"
+        />
+        <path d={path} stroke="transparent" strokeWidth={10} style={{ pointerEvents: "stroke" }} />
+        <path
+          d={path}
+          stroke={laneColor(s.color)}
+          strokeWidth={s.edge != null && (activeColor === s.edge || highlighted?.has(s.edge)) ? 2.8 : 1.4}
+          pointerEvents="none"
+          strokeLinecap={s.dashed ? "butt" : "square"}
+          strokeDasharray={s.dashed ? "2 2" : undefined}
+        />
+      </g>
+    );
+  };
   return (
-    <svg className={styles.graph} width={width} height={ROW} aria-hidden>
-      {row.up.map((s, i) => (
-        <path
-          key={`u${i}`}
-          d={seg(x(s.from), 0, x(s.to), cy) + (s.arrow ? arrowHead(x(s.from), 0, -1) : "")}
-          stroke={laneColor(s.color)}
-          strokeLinecap={s.dashed ? "butt" : "square"}
-          strokeDasharray={s.dashed ? "2 2" : undefined}
+    <svg
+      className={styles.graph}
+      width={row.width * LANE}
+      height={ROW}
+      aria-label={tx("Commit graph")}
+      onMouseLeave={() => onHover?.(null)}
+    >
+      {row.up.map((s, i) => draw(s, i, true))}
+      {row.down.map((s, i) => draw(s, i, false))}
+      <g
+        role={onNode ? "button" : undefined}
+        tabIndex={onNode ? 0 : undefined}
+        aria-label={onNode ? tx("Collapse or expand this branch") : undefined}
+        onMouseDown={(e) => e.stopPropagation()}
+        onMouseEnter={() => row.id && onHover?.(`node:${row.id}`)}
+        onClick={(e) => {
+          e.stopPropagation();
+          onNode?.();
+        }}
+        onKeyDown={(e) => {
+          if (onNode && (e.key === "Enter" || e.key === " ")) {
+            e.preventDefault();
+            e.stopPropagation();
+            onNode();
+          }
+        }}
+      >
+        <circle cx={x(row.lane)} cy={cy} r={8} fill="transparent" />
+        <circle
+          cx={x(row.lane)}
+          cy={cy}
+          r={row.id && highlightedNodes?.has(row.id) ? 6 : head ? 5 : 3.8}
+          fill={head ? "var(--log-row-bg, var(--bg-app))" : laneColor(row.color)}
+          stroke={laneColor(row.color)}
+          strokeWidth={head ? 1.5 : 0}
+          pointerEvents="none"
         />
-      ))}
-      {row.down.map((s, i) => (
-        <path
-          key={`d${i}`}
-          d={seg(x(s.from), cy, x(s.to), ROW) + (s.arrow ? arrowHead(x(s.to), ROW, 1) : "")}
-          stroke={laneColor(s.color)}
-          strokeLinecap={s.dashed ? "butt" : "square"}
-          strokeDasharray={s.dashed ? "2 2" : undefined}
-        />
-      ))}
-      {head ? (
-        <>
-          <circle
-            cx={x(row.lane)}
-            cy={cy}
-            r={5}
-            fill="var(--log-row-bg, var(--bg-app))"
-            stroke={laneColor(row.color)}
-            strokeWidth={1.5}
-          />
-          <circle cx={x(row.lane)} cy={cy} r={2.5} fill={laneColor(row.color)} />
-        </>
-      ) : (
-        <circle cx={x(row.lane)} cy={cy} r={3.8} fill={laneColor(row.color)} />
-      )}
+        {head && <circle cx={x(row.lane)} cy={cy} r={2.5} fill={laneColor(row.color)} pointerEvents="none" />}
+      </g>
     </svg>
   );
 }
@@ -1268,6 +2142,10 @@ export function RefLabels({
  * (IDEA), their combined changes with every selected commit listed below.
  */
 export function CommitDetails({ commits }: { commits: Commit[] }) {
+  const scope = useContext(LogIdContext);
+  const shown = useGitLog((s) => s.shownLog);
+  const active = !scope || scope === shown;
+  const readOnly = useReadOnlyLog();
   const selected = useGitLog((s) => s.selected);
   const selection = useGitLog((s) => s.selection);
   // Newest first (log order).
@@ -1279,40 +2157,104 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
   const many = chosen.length > 1;
   const idsKey = chosen.map(commitKey).join(" ");
   const commitRoot = commit ? commitRepo(commit) : null;
-  const root = useVcs((s) => s.root) ?? "";
-  const [files, setFiles] = useState<(ChangedFile | RevisionChange)[] | null>(null);
-  const [error, setError] = useState<string | null>(null);
+  const [result, setResult] = useState<{
+    key: string;
+    files: LogChange[] | null;
+    error: string | null;
+  } | null>(null);
   const [expanded, setExpanded] = useState<Set<string> | null>(null);
+  const [parentIndex, setParentIndex] = useState(-1);
+  const fromParents = useLogOptions((s) => s.changesFromParents);
+  const onlyAffected = useLogOptions((s) => s.showOnlyAffected);
+  const preview = useLogOptions((s) => s.diffPreview);
+  const diffLocation = useLogOptions((s) => s.diffLocation);
+  const filters = useGitLog((s) => s.filters);
+  const filesKey = JSON.stringify([idsKey, fromParents, parentIndex, commitRoot]);
+  const files = result?.key === filesKey ? result.files : null;
+  const error = result?.key === filesKey ? result.error : null;
 
   useEffect(() => {
     if (!idsKey) return;
-    const ids = chosen.map((c) => c.id);
     let alive = true;
-    const load =
-      ids.length > 1
-        ? call(commands.vcsCommitsChanges(commitRoot ?? currentRepo(), ids.reverse()))
-        : call(commands.vcsCommitFiles(commitRoot ?? currentRepo(), ids[0]!));
-    load.then((f) => alive && setFiles(f)).catch((e) => alive && setError(e instanceof Error ? e.message : String(e)));
+    const load = (async () => {
+      if (many) {
+        const roots = [...new Set(chosen.map(commitRepo))];
+        return (
+          await Promise.all(
+            roots.map(async (repo) => {
+              const group = chosen.filter((c) => commitRepo(c) === repo);
+              const files = await call(
+                commands.vcsCommitsChanges(repo ?? currentRepo(), group.map((c) => c.id).reverse()),
+              );
+              return toLogChanges(files, null, repo, readOnly);
+            }),
+          )
+        ).flat();
+      }
+      const c = chosen[0]!;
+      if (c.parents.length > 1) {
+        const groups = await Promise.all(
+          c.parents.map(async (id, index) => {
+            const files = await call(commands.vcsDiffRevisions(commitRoot ?? currentRepo(), id, c.id));
+            return toLogChanges(files, { ...c, parents: [id] }, commitRoot, readOnly).map((f) => ({
+              ...f,
+              group: `${tx("Parent")} ${index + 1}: ${id.slice(0, 8)}`,
+            }));
+          }),
+        );
+        if (fromParents) return parentIndex < 0 ? groups.flat() : (groups[parentIndex] ?? []);
+        // A merge's combined changes are files changed against every parent.
+        return groups[0]!
+          .filter((f) => groups.every((group) => group.some((x) => x.path === f.path)))
+          .map((f) => ({
+            ...f,
+            group: undefined,
+            mergeParents: c.parents
+              .slice(0, 2)
+              .map((rev, i) => ({ rev, path: groups[i]!.find((x) => x.path === f.path)?.oldPath ?? f.path })),
+          }));
+      }
+      const files = await call(commands.vcsCommitFiles(commitRoot ?? currentRepo(), c.id));
+      return toLogChanges(files, c, commitRoot, readOnly);
+    })();
+    load
+      .then((files) => alive && setResult({ key: filesKey, files, error: null }))
+      .catch(
+        (e) => alive && setResult({ key: filesKey, files: null, error: e instanceof Error ? e.message : String(e) }),
+      );
     return () => {
       alive = false;
     };
-  }, [idsKey]);
+  }, [idsKey, chosen, fromParents, parentIndex, commitRoot, filesKey, many, readOnly]);
 
   const groupByDirectory = useLogOptions((s) => s.groupByDirectory);
   const [selectedKeys, setSelectedKeys] = useState<ReadonlySet<string>>(() => new Set());
   const treeRef = useRef<TreeHandle>(null);
   const [diffToReveal, setDiffToReveal] = useState<{ key: string } | null>(null);
   const syncingDiff = useRef(false);
-  const changes = useMemo(
-    () => (files && commit ? toLogChanges(files, many ? null : commit, commitRoot) : []),
-    [files, commit, many, commitRoot],
+  const changes = useMemo(() => {
+    const changes = files ?? [];
+    const paths = filters.paths?.length ? filters.paths : filters.path ? [filters.path] : [];
+    return onlyAffected && paths.length
+      ? changes.filter((c) =>
+          paths.some((p) => {
+            const matches = (rel: string) => {
+              const abs = absolutePath(rel, c.repo);
+              return abs === p || abs.startsWith(`${p}/`) || (!many && commit?.historyPath === rel);
+            };
+            return matches(c.path) || (c.oldPath != null && matches(c.oldPath));
+          }),
+        )
+      : changes;
+  }, [files, commit, many, filters.path, filters.paths, onlyAffected]);
+  const multipleRoots = new Set(chosen.map(commitRepo)).size > 1;
+  const changeTreePath = useCallback(
+    (f: LogChange) => `${multipleRoots ? `${repoName(f.repo ?? "")}/` : ""}${f.group ? `${f.group}/` : ""}${f.path}`,
+    [multipleRoots],
   );
   const tree = useMemo(
-    () =>
-      groupByDirectory
-        ? buildFileTree(changes, (f) => relTo(root, f.path))
-        : flatFileNodes(changes, (f) => relTo(root, f.path)),
-    [changes, root, groupByDirectory],
+    () => (groupByDirectory ? buildFileTree(changes, changeTreePath) : flatFileNodes(changes, changeTreePath)),
+    [changes, groupByDirectory, changeTreePath],
   );
   const allDirs = useMemo(() => dirKeys(tree), [tree]);
   const ordered = useMemo(() => filesUnder(tree), [tree]);
@@ -1320,11 +2262,14 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
 
   // Show Diff Preview: a single selected file follows into the editor's preview tab.
   const previewTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
-  useEffect(() => () => clearTimeout(previewTimer.current), []);
+  useEffect(() => {
+    if (!active) clearTimeout(previewTimer.current);
+    return () => clearTimeout(previewTimer.current);
+  }, [active]);
   const previewSelection = (sel: ReadonlySet<string>) => {
     clearTimeout(previewTimer.current);
     if (syncingDiff.current) return;
-    if (!logOptions().diffPreview || sel.size !== 1) return;
+    if (!logOptions().diffPreview || logOptions().diffLocation !== "editor" || sel.size !== 1) return;
     const file = fileNodeAt(tree, [...sel][0]!)?.file;
     // A preview that cannot open (no editor yet, the file went away) is just skipped.
     if (file)
@@ -1340,7 +2285,7 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
       const change = ordered.find((c) => diffInput(c.diff).key === input.key);
       if (!change) return;
       clearTimeout(previewTimer.current);
-      const rel = relTo(root, change.path);
+      const rel = changeTreePath(change);
       setExpanded((current) => {
         const next = new Set(current ?? allDirs);
         for (const key of allDirs) if (rel.startsWith(key.slice(2) + "/")) next.add(key);
@@ -1350,7 +2295,7 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
     };
     followDiff(editor?.activeInput?.() ?? null);
     return editor?.onActiveInputChange?.(followDiff);
-  }, [ordered, allDirs, root]);
+  }, [ordered, allDirs, changeTreePath]);
 
   // Tree.reveal needs the expanded rows to have rendered. Suppress the reverse
   // preview update so it cannot reopen the diff and lose its requested chunk.
@@ -1362,9 +2307,16 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
   }, [diffToReveal]);
 
   useEffect(() => {
+    if (!active) return;
     useLogChanges.setState({ commits: chosen, all: ordered, selected: chosenChanges });
-  }, [chosen, ordered, chosenChanges]);
-  useEffect(() => () => useLogChanges.setState({ commits: [], all: [], selected: [] }), []);
+  }, [chosen, ordered, chosenChanges, active]);
+  useEffect(
+    () => () => {
+      if (!scope || useGitLog.getState().shownLog === scope)
+        useLogChanges.setState({ commits: [], all: [], selected: [] });
+    },
+    [scope],
+  );
 
   if (!commit)
     return (
@@ -1381,6 +2333,16 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
       { kind: "action", action: "vcs.log.changes.groupByDirectory" },
       { kind: "separator" },
       { kind: "action", action: "vcs.log.changes.diffPreview" },
+      toggle("Show Only Affected Changes", logOptions(), "showOnlyAffected"),
+      toggle("Show Changes from Parents", logOptions(), "changesFromParents"),
+      {
+        label: "Diff Preview Location",
+        submenu: (["editor", "right", "bottom"] as const).map((location) => ({
+          label: location === "editor" ? "Editor" : location === "right" ? "Right" : "Bottom",
+          checked: diffLocation === location,
+          run: () => updateLogOptions({ diffLocation: location }),
+        })),
+      },
     ]);
 
   const onFileMenu = (node: FileTreeNode<LogChange> | null, sel: ReadonlySet<string>, e: ReactMouseEvent) => {
@@ -1391,106 +2353,186 @@ export function CommitDetails({ commits }: { commits: Commit[] }) {
     showContextMenu(e, changesMenu(target));
   };
 
+  const details = (
+    <SplitGroup orientation="vertical" id="git-log-details">
+      <SplitPanel id="files" defaultSize="60%" minSize="60px">
+        <div className={styles.filesPane}>
+          <div className={styles.detailsBar} role="toolbar" aria-label={tx("Changed files")}>
+            <IconButton
+              icon="diff"
+              size="small"
+              title="Show Diff"
+              action="vcs.log.changes.showDiff"
+              actionArg={chosenChanges}
+              disabled={!chosenChanges.length}
+            />
+            <IconButton
+              icon="revert"
+              size="small"
+              title="Revert Selected Changes"
+              action="vcs.log.changes.revert"
+              actionArg={chosenChanges}
+              disabled={readOnly || !chosenChanges.length || new Set(chosenChanges.map((c) => c.repo)).size > 1}
+            />
+            <IconButton icon="eye" title="View Options" size="small" aria-haspopup="menu" onClick={openViewOptions} />
+            {!many && fromParents && commit.parents.length > 1 && (
+              <button
+                type="button"
+                className={styles.filterMain}
+                onClick={(e) =>
+                  menuBelow(e, [
+                    { label: tx("All Parents"), checked: parentIndex < 0, run: () => setParentIndex(-1) },
+                    ...commit.parents.map((id, index) => ({
+                      label: `${tx("Parent")} ${index + 1}: ${id.slice(0, 8)}`,
+                      checked: index === parentIndex,
+                      run: () => setParentIndex(index),
+                    })),
+                  ])
+                }
+              >
+                {parentIndex < 0 ? tx("All Parents") : `${tx("Parent")} ${parentIndex + 1}`}
+              </button>
+            )}
+            <span className={styles.detailsCount}>
+              {files ? fileCount(changes.length) : ""}
+              {many ? " " + tx`in ${chosen.length} commits` : ""}
+            </span>
+            <span className={styles.grow} />
+            <IconButton
+              icon="expand-all"
+              title="Expand All"
+              size="small"
+              disabled={!allDirs.length}
+              onClick={() => setExpanded(new Set(allDirs))}
+            />
+            <IconButton
+              icon="collapse-all"
+              title="Collapse All"
+              size="small"
+              disabled={!allDirs.length}
+              onClick={() => setExpanded(new Set())}
+            />
+          </div>
+          {error && <div className={styles.message}>{error}</div>}
+          {!files && !error && (
+            <div className={styles.message}>
+              <Spinner size={12} />
+            </div>
+          )}
+          {files && (
+            <Tree<FileTreeNode<LogChange>>
+              handleRef={treeRef}
+              roots={tree}
+              getKey={(n) => n.key}
+              getLabel={(n) => n.name}
+              getChildren={(n) => (n.file ? undefined : n.children)}
+              isExpandable={(n) => !n.file}
+              expanded={expanded ?? new Set(allDirs)}
+              onExpandedChange={(next) => setExpanded(next)}
+              selected={selectedKeys}
+              onSelectionChange={(sel) => {
+                setSelectedKeys(sel);
+                previewSelection(sel);
+              }}
+              renderNode={(n) => <ChangedFileRow node={n} flat={!groupByDirectory} />}
+              onActivate={(n) => n.file && void showChangesDiff([n.file])}
+              onContextMenu={onFileMenu}
+              aria-label="Changed files"
+              className={styles.fileTree}
+            />
+          )}
+        </div>
+      </SplitPanel>
+      <SplitHandle />
+      <SplitPanel id="message" minSize="60px">
+        <div className={styles.messageBox}>
+          {many ? (
+            chosen.map((c) => <CommitMessage key={commitKey(c)} commit={c} compact />)
+          ) : (
+            <CommitMessage commit={commit} />
+          )}
+        </div>
+      </SplitPanel>
+    </SplitGroup>
+  );
+  const embedded = preview && diffLocation !== "editor";
+  const selectedChange = chosenChanges.length === 1 ? chosenChanges[0] : undefined;
   return (
     <div className={styles.details}>
-      <SplitGroup orientation="vertical" id="git-log-details">
-        <SplitPanel id="files" defaultSize="60%" minSize="60px">
-          <div className={styles.filesPane}>
-            <div className={styles.detailsBar} role="toolbar" aria-label={tx("Changed files")}>
-              <IconButton
-                icon="diff"
-                size="small"
-                title="Show Diff"
-                action="vcs.log.changes.showDiff"
-                actionArg={chosenChanges}
-                disabled={!chosenChanges.length}
-              />
-              <IconButton
-                icon="revert"
-                size="small"
-                title="Revert Selected Changes"
-                action="vcs.log.changes.revert"
-                actionArg={chosenChanges}
-                disabled={!chosenChanges.length}
-              />
-              <IconButton icon="eye" title="View Options" size="small" aria-haspopup="menu" onClick={openViewOptions} />
-              <span className={styles.detailsCount}>
-                {files ? fileCount(files.length) : ""}
-                {many ? " " + tx`in ${chosen.length} commits` : ""}
-              </span>
-              <span className={styles.grow} />
-              <IconButton
-                icon="expand-all"
-                title="Expand All"
-                size="small"
-                disabled={!allDirs.length}
-                onClick={() => setExpanded(new Set(allDirs))}
-              />
-              <IconButton
-                icon="collapse-all"
-                title="Collapse All"
-                size="small"
-                disabled={!allDirs.length}
-                onClick={() => setExpanded(new Set())}
-              />
-            </div>
-            {error && <div className={styles.message}>{error}</div>}
-            {!files && !error && (
-              <div className={styles.message}>
-                <Spinner size={12} />
-              </div>
-            )}
-            {files && (
-              <Tree<FileTreeNode<LogChange>>
-                handleRef={treeRef}
-                roots={tree}
-                getKey={(n) => n.key}
-                getLabel={(n) => n.name}
-                getChildren={(n) => (n.file ? undefined : n.children)}
-                isExpandable={(n) => !n.file}
-                expanded={expanded ?? new Set(allDirs)}
-                onExpandedChange={(next) => setExpanded(next)}
-                selected={selectedKeys}
-                onSelectionChange={(sel) => {
-                  setSelectedKeys(sel);
-                  previewSelection(sel);
-                }}
-                renderNode={(n) => <ChangedFileRow node={n} flat={!groupByDirectory} />}
-                onActivate={(n) => n.file && void showChangesDiff([n.file])}
-                onContextMenu={onFileMenu}
-                aria-label="Changed files"
-                className={styles.fileTree}
-              />
-            )}
-          </div>
-        </SplitPanel>
-        <SplitHandle />
-        <SplitPanel id="message" minSize="60px">
-          <div className={styles.messageBox}>
-            {many ? (
-              chosen.map((c) => <CommitMessage key={commitKey(c)} commit={c} compact />)
+      {embedded ? (
+        <SplitGroup
+          orientation={diffLocation === "right" ? "horizontal" : "vertical"}
+          id={`git-log-preview-${diffLocation}`}
+        >
+          <SplitPanel id="changes" defaultSize="55%" minSize="20%">
+            {details}
+          </SplitPanel>
+          <SplitHandle />
+          <SplitPanel id="preview" minSize="20%">
+            {selectedChange ? (
+              selectedChange.mergeParents?.length === 2 && selectedChange.after ? (
+                <LogMergePreview
+                  input={{
+                    kind: "git-merge-diff",
+                    key: `git-merge-diff:${selectedChange.repo}:${selectedChange.after}:${selectedChange.path}`,
+                    data: {
+                      repo: selectedChange.repo,
+                      revision: selectedChange.after,
+                      path: selectedChange.path,
+                      parents: selectedChange.mergeParents,
+                    },
+                  }}
+                />
+              ) : (
+                <LogDiffPreview key={diffInput(selectedChange.diff).key} input={diffInput(selectedChange.diff)} />
+              )
             ) : (
-              <CommitMessage commit={commit} />
+              <EmptyState>
+                <T>Select a file to preview its changes</T>
+              </EmptyState>
             )}
-          </div>
-        </SplitPanel>
-      </SplitGroup>
+          </SplitPanel>
+        </SplitGroup>
+      ) : (
+        details
+      )}
     </div>
   );
 }
 
 /** A commit's message and metadata; `compact` (one of several selected): without the body. */
 function CommitMessage({ commit, compact = false }: { commit: Commit; compact?: boolean }) {
-  const [subject, ...bodyLines] = commit.message.replace(/\s+$/, "").split("\n");
+  const { details, error } = useCommitDetails(commit, !compact);
+  const repo = commitRepo(commit) ?? currentRepo();
+  const message = details?.message || commit.message;
+  const [subject, ...bodyLines] = message.replace(/\s+$/, "").split("\n");
   const body = compact ? "" : bodyLines.join("\n").replace(/^\n+/, "");
   return (
     <div className={clsx(compact && styles.commitEntry)}>
       <div className={styles.subjectLine}>
-        <IssueText text={subject ?? ""} />
+        <CommitMessageText text={subject ?? ""} repo={repo} />
+        {/* Only a message with a body has more to show. */}
+        {body && (
+          <button
+            type="button"
+            className={clsx(styles.linkButton, styles.expandMessage)}
+            onClick={() =>
+              openDialog((close) => (
+                <Dialog open title={tx`Commit ${commit.shortId}`} width={760} onClose={close}>
+                  <div className={clsx(styles.messageBox, styles.fullMessage)}>
+                    <CommitMessageText text={message} repo={repo} />
+                  </div>
+                </Dialog>
+              ))
+            }
+          >
+            {tx("Expand Commit Message")}
+          </button>
+        )}
       </div>
       {body && (
         <div className={styles.fullMessage}>
-          <IssueText text={body} />
+          <CommitMessageText text={body} repo={repo} />
         </div>
       )}
       <div className={clsx(styles.meta, compact && styles.metaCompact)}>
@@ -1505,8 +2547,57 @@ function CommitMessage({ commit, compact = false }: { commit: Commit; compact?:
         {commit.author} &lt;{commit.email}&gt;
         {commit.timeMs ? " " + tx`on ${new Date(commit.timeMs).toLocaleString()}` : ""}
       </div>
-      {commit.parents.length > 1 && (
-        <div className={styles.meta}>{tx`Merge of ${commit.parents.map((p) => p.slice(0, 8)).join(", ")}`}</div>
+      {!compact &&
+        commit.committer &&
+        (commit.committer !== commit.author ||
+          commit.committerEmail !== commit.email ||
+          commit.commitTimeMs !== commit.timeMs) && (
+          <div className={styles.meta}>
+            {tx("Committed by")} {commit.committer} &lt;{commit.committerEmail}&gt;{" "}
+            {commit.commitTimeMs ? new Date(commit.commitTimeMs).toLocaleString() : ""}
+          </div>
+        )}
+      {commit.parents.length > 0 && (
+        <div className={styles.meta}>
+          {tx(commit.parents.length > 1 ? "Merge of" : "Parent")}{" "}
+          {commit.parents.map((id, i) => (
+            <span key={id}>
+              {i > 0 ? ", " : ""}
+              <button type="button" className={styles.linkButton} onClick={() => void goToRef(id, repo)}>
+                {id.slice(0, 8)}
+              </button>
+            </span>
+          ))}
+        </div>
+      )}
+      {details && (
+        <>
+          <div className={styles.meta}>
+            {tx("Containing branches")}:{" "}
+            {details.containingBranches.length
+              ? details.containingBranches.map((branch, i) => (
+                  <span key={branch}>
+                    {i > 0 ? ", " : ""}
+                    <button type="button" className={styles.linkButton} onClick={() => void goToRef(branch, repo)}>
+                      {branch}
+                    </button>
+                  </span>
+                ))
+              : tx("None")}
+          </div>
+          <div
+            className={styles.meta}
+            title={[details.signer, details.key, details.fingerprint].filter(Boolean).join("\n")}
+          >
+            {tx("Signature")}: {signatureLabel(details.signature)}
+            {details.signer ? ` · ${details.signer}` : ""}
+          </div>
+        </>
+      )}
+      {error && (
+        <div role="status" className={styles.meta}>
+          {tx("Could not load containing branches or signature details")}
+        </div>
       )}
       {commit.refs.length > 0 && (
         <div className={styles.meta}>
@@ -1517,30 +2608,87 @@ function CommitMessage({ commit, compact = false }: { commit: Commit; compact?:
   );
 }
 
+function signatureLabel(code: string) {
+  return tx(
+    (
+      {
+        G: "Verified",
+        U: "Good signature with unknown trust",
+        B: "Bad signature",
+        E: "Could not verify",
+        N: "Unsigned",
+        X: "Expired signature",
+        Y: "Expired signing key",
+        R: "Revoked signing key",
+      } as Record<string, string>
+    )[code] ?? "Could not verify",
+  );
+}
+
+function CommitSignature({ commit }: { commit: Commit }) {
+  const { details, error } = useCommitDetails(commit);
+  return (
+    <span title={details ? [details.signer, details.key, details.fingerprint].filter(Boolean).join("\n") : undefined}>
+      {details ? signatureLabel(details.signature) : error ? tx("Could not verify") : tx("Loading…")}
+    </span>
+  );
+}
+
+function CommitMessageText({ text, repo }: { text: string; repo: string | null | undefined }) {
+  return text.split(/\b([a-fA-F0-9]{7,64})\b/g).map((part, i) =>
+    i % 2 ? (
+      <button type="button" className={styles.linkButton} key={i} onClick={() => void goToRef(part, repo)}>
+        {part}
+      </button>
+    ) : (
+      <IssueText key={i} text={part} />
+    ),
+  );
+}
+
 /** IDEA's changes browser context menu in the Git Log; `changes` = the files it acts on. */
 export function changesMenu(changes: LogChange[]): MenuItem[] {
   const one = changes.length === 1 ? changes[0]! : null;
   return [
     { kind: "action", action: "vcs.log.changes.showDiff", arg: changes },
-    { kind: "action", action: "vcs.log.changes.compareWithLocal", arg: changes, disabled: !one?.after },
-    { kind: "action", action: "vcs.log.changes.compareBeforeWithLocal", arg: changes, disabled: !one?.before },
+    { kind: "action", action: "vcs.log.changes.compareWithLocal", arg: changes, disabled: !one?.after || one.readOnly },
+    {
+      kind: "action",
+      action: "vcs.log.changes.compareBeforeWithLocal",
+      arg: changes,
+      disabled: !one?.before || one.readOnly,
+    },
     { kind: "separator" },
     {
       kind: "action",
       action: "vcs.log.changes.jumpToSource",
       arg: changes,
-      disabled: !changes.some((c) => c.after),
+      disabled: !changes.some((c) => c.after && !c.readOnly),
     },
     { kind: "separator" },
-    { kind: "action", action: "vcs.log.changes.revert", arg: changes },
-    { kind: "action", action: "vcs.log.changes.getFromRevision", arg: changes },
-    { kind: "separator" },
     {
       kind: "action",
-      action: "vcs.showHistory",
-      arg: one ? absolutePath(one.path, one.repo) : undefined,
-      disabled: !one?.after,
+      action: "vcs.log.changes.revert",
+      arg: changes,
+      disabled: changes.some((c) => c.readOnly) || new Set(changes.map((c) => c.repo)).size > 1,
     },
+    {
+      kind: "action",
+      action: "vcs.log.changes.getFromRevision",
+      arg: changes,
+      disabled: changes.some((c) => c.readOnly),
+    },
+    { kind: "separator" },
+    ...(one?.readOnly
+      ? [{ label: "Show History for File", run: () => openLogTab("history", absolutePath(one.path, one.repo)) }]
+      : [
+          {
+            kind: "action",
+            action: "vcs.showHistory",
+            arg: one ? absolutePath(one.path, one.repo) : undefined,
+            disabled: !one?.after,
+          } satisfies MenuItem,
+        ]),
   ];
 }
 
diff --git a/src/features/vcs/GitMergeDiff.tsx b/src/features/vcs/GitMergeDiff.tsx
new file mode 100644
index 00000000..abf66526
--- /dev/null
+++ b/src/features/vcs/GitMergeDiff.tsx
@@ -0,0 +1,95 @@
+import { useEffect, useRef, useState } from "react";
+import { EditorState, Text } from "@codemirror/state";
+import { Decoration, EditorView } from "@codemirror/view";
+import { Chunk } from "@codemirror/merge";
+import { call, commands } from "@/platform/ipc";
+import type { EditorInput } from "@/workbench/contributions";
+import { languageFor, viewerBase } from "./cm";
+import { repositoryPath } from "./repositoryPaths";
+import styles from "./GitLog.module.css";
+import { syncMergeScroll } from "./mergeScroll";
+
+/** Read-only parent / merge result / parent comparison, independent of the worktree. */
+export function GitMergeDiff({ input }: { input: EditorInput }) {
+  const data = input.data as {
+    repo: string;
+    revision: string;
+    path: string;
+    parents: Array<{ rev: string; path: string }>;
+  };
+  const host = useRef<HTMLDivElement>(null);
+  const [error, setError] = useState<string | null>(null);
+  useEffect(() => {
+    let alive = true;
+    const views: EditorView[] = [];
+    let stopScroll: (() => void) | undefined;
+    const sides = [data.parents[0]!, { rev: data.revision, path: data.path }, data.parents[1]!];
+    void Promise.all([
+      Promise.all(sides.map((s) => call(commands.vcsFileAt(repositoryPath(data.repo, s.path), s.rev)))),
+      languageFor(data.path),
+    ])
+      .then(([texts, language]) => {
+        if (!alive || !host.current) return;
+        const docs = texts.map((text) => Text.of((text ?? "").split("\n")));
+        const marks = docs.map(() => new Map<number, string>());
+        for (const parent of [0, 2])
+          for (const chunk of Chunk.build(docs[parent]!, docs[1]!)) {
+            for (const [pane, from, to] of [
+              [parent, chunk.fromA, chunk.toA],
+              [1, chunk.fromB, chunk.toB],
+            ]) {
+              const doc = docs[pane!]!;
+              for (let line = doc.lineAt(Math.min(from!, doc.length)); line.from < to!;) {
+                marks[pane!]!.set(
+                  line.from,
+                  chunk.fromA === chunk.toA ? "inserted" : chunk.fromB === chunk.toB ? "deleted" : "modified",
+                );
+                if (line.number === doc.lines) break;
+                line = doc.line(line.number + 1);
+              }
+            }
+          }
+        for (const [i, text] of texts.entries()) {
+          const pane = document.createElement("div");
+          pane.style.cssText = "flex:1;min-width:0;display:flex;flex-direction:column";
+          const label = document.createElement("div");
+          label.textContent = `${sides[i]!.rev.slice(0, 8)} · ${sides[i]!.path}`;
+          pane.append(label);
+          host.current.append(pane);
+          const view = new EditorView({
+            parent: pane,
+            state: EditorState.create({
+              doc: text ?? "",
+              extensions: [
+                viewerBase({ readOnly: true }),
+                ...(language ? [language] : []),
+                EditorView.decorations.of(
+                  Decoration.set(
+                    [...marks[i]!]
+                      .sort((a, b) => a[0] - b[0])
+                      .map(([from, kind]) => Decoration.line({ class: `cm-diffLine-${kind}` }).range(from)),
+                  ),
+                ),
+              ],
+            }),
+          });
+          views.push(view);
+        }
+        stopScroll = syncMergeScroll({ ours: views[0]!, result: views[1]!, theirs: views[2]! });
+      })
+      .catch((e) => alive && setError(String(e)));
+    const element = host.current;
+    return () => {
+      alive = false;
+      stopScroll?.();
+      views.forEach((v) => v.destroy());
+      element?.replaceChildren();
+    };
+  }, [data]);
+  return (
+    <>
+      <div role={error ? "alert" : undefined}>{error}</div>
+      <div className={styles.revisionSource} style={{ display: "flex" }} ref={host} />
+    </>
+  );
+}
diff --git a/src/features/vcs/LogScope.tsx b/src/features/vcs/LogScope.tsx
new file mode 100644
index 00000000..9d41c9e1
--- /dev/null
+++ b/src/features/vcs/LogScope.tsx
@@ -0,0 +1,37 @@
+import { useEffect, type ReactNode } from "react";
+import type { EditorInput } from "@/workbench/contributions";
+import { LogIdContext, LogOptionsContext } from "./logContext";
+import { rootLogOptions } from "./logOptions";
+import { ensureEditorLog, focusLogView, parkedLogOptions, useRootGitLog } from "./logStore";
+import { LogView } from "./GitLog";
+import styles from "./GitLog.module.css";
+
+export function LogScope({ id, children }: { id: string; children: ReactNode }) {
+  const active = useRootGitLog((s) => s.shownLog);
+  const options = rootLogOptions();
+  const focus = () => {
+    if (useRootGitLog.getState().shownLog !== id) focusLogView(id);
+  };
+  return (
+    <LogIdContext.Provider value={id}>
+      <LogOptionsContext.Provider value={active === id ? options : (parkedLogOptions(id) ?? options)}>
+        <div className={styles.root} data-git-log onPointerDownCapture={focus} onFocusCapture={focus}>
+          {children}
+        </div>
+      </LogOptionsContext.Provider>
+    </LogIdContext.Provider>
+  );
+}
+
+export function GitLogEditor({ input }: { input: EditorInput }) {
+  const data = input.data as { id: string; label: string };
+  useEffect(() => {
+    ensureEditorLog(data.id, data.label);
+    focusLogView(data.id);
+  }, [data.id, data.label]);
+  return (
+    <LogScope id={data.id}>
+      <LogView />
+    </LogScope>
+  );
+}
diff --git a/src/features/vcs/PathFilterDialog.tsx b/src/features/vcs/PathFilterDialog.tsx
new file mode 100644
index 00000000..5b498519
--- /dev/null
+++ b/src/features/vcs/PathFilterDialog.tsx
@@ -0,0 +1,138 @@
+import { useState } from "react";
+import { Checkbox, Dialog, Input, Tree } from "@/ui";
+import { projectFs } from "@/features/project-tree/fs";
+import { openDialog } from "./dialogs";
+import { repoName } from "./store";
+import { call, commands } from "@/platform/ipc";
+import { tx } from "@/platform/i18n";
+
+interface PathNode {
+  path: string;
+  name: string;
+  directory: boolean;
+}
+
+export function chooseLogPaths(roots: string[], initial: string[], readOnly = false): Promise<string[] | null> {
+  return new Promise((resolve) => {
+    const close = openDialog(() => (
+      <PathFilterDialog
+        roots={roots}
+        initial={initial}
+        readOnly={readOnly}
+        onDone={(value) => {
+          close();
+          resolve(value);
+        }}
+      />
+    ));
+  });
+}
+
+function PathFilterDialog({
+  roots,
+  initial,
+  readOnly,
+  onDone,
+}: {
+  roots: string[];
+  initial: string[];
+  readOnly: boolean;
+  onDone: (value: string[] | null) => void;
+}) {
+  const [checked, setChecked] = useState<ReadonlySet<string>>(() => new Set(initial));
+  const [listings, setListings] = useState<Map<string, PathNode[]>>(() => new Map());
+  const [custom, setCustom] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const toggle = (path: string, on: boolean) =>
+    setChecked((before) => {
+      const next = new Set(before);
+      if (on) next.add(path);
+      else next.delete(path);
+      return next;
+    });
+  const apply = () => {
+    const added = custom
+      .split("\n")
+      .map((s) => s.trim())
+      .filter(Boolean);
+    if (
+      added.some(
+        (path) =>
+          !roots.some((root) => path === root || path.startsWith(`${root}/`)) || path.split(/[\\/]/).includes(".."),
+      )
+    ) {
+      setError(tx("Choose an absolute path inside a selected repository."));
+      return;
+    }
+    onDone([...new Set([...checked, ...added])]);
+  };
+  const nodes = roots.map((path) => ({ path, name: repoName(path), directory: true }));
+  const load = async (node: PathNode) => {
+    try {
+      const root = roots.find((r) => node.path === r || node.path.startsWith(`${r}/`));
+      if (!root) return;
+      let entries: PathNode[];
+      if (readOnly) {
+        const files = await call(commands.vcsRevisionFiles(root, "HEAD"));
+        const prefix = node.path === root ? "" : `${node.path.slice(root.length + 1)}/`;
+        const children = new Map<string, PathNode>();
+        for (const file of files)
+          if (file.startsWith(prefix)) {
+            const [name, ...rest] = file.slice(prefix.length).split("/");
+            if (name) children.set(name, { name, path: `${node.path}/${name}`, directory: rest.length > 0 });
+          }
+        entries = [...children.values()].sort(
+          (a, b) => Number(b.directory) - Number(a.directory) || a.name.localeCompare(b.name),
+        );
+      } else
+        entries = (await projectFs(root).readDir(node.path))
+          .filter((entry) => entry.name !== ".git")
+          .map((entry) => ({ name: entry.name, path: entry.path, directory: entry.kind === "dir" }));
+      setListings((before) => new Map(before).set(node.path, entries));
+      setError(null);
+    } catch (e) {
+      setError(String(e));
+    }
+  };
+  return (
+    <Dialog
+      open
+      title="Filter by Paths"
+      width={560}
+      onClose={() => onDone(null)}
+      buttons={[
+        { label: "OK", role: "default", onClick: apply },
+        { label: "Cancel", role: "cancel" },
+      ]}
+    >
+      <div style={{ height: 320, display: "flex" }}>
+        <Tree<PathNode>
+          roots={nodes}
+          getKey={(n) => n.path}
+          getLabel={(n) => n.name}
+          getChildren={(n) => (n.directory ? listings.get(n.path) : undefined)}
+          isExpandable={(n) => n.directory}
+          loadChildren={load}
+          renderNode={(n) => (
+            <Checkbox label={n.name} checked={checked.has(n.path)} onChange={(on) => toggle(n.path, on)} />
+          )}
+          aria-label="Files and folders"
+        />
+      </div>
+      {checked.size > 0 && (
+        <div style={{ maxHeight: 100, overflow: "auto" }} aria-label="Selected paths">
+          {[...checked].map((path) => (
+            <Checkbox key={path} label={path} checked onChange={(on) => toggle(path, on)} />
+          ))}
+        </div>
+      )}
+      <Input
+        value={custom}
+        onChange={(e) => setCustom(e.target.value)}
+        placeholder="Additional absolute path"
+        aria-label="Additional absolute path"
+      />
+      {error && <div role="alert">{error}</div>}
+    </Dialog>
+  );
+}
diff --git a/src/features/vcs/PushChanges.tsx b/src/features/vcs/PushChanges.tsx
index ad6753cc..fefa408f 100644
--- a/src/features/vcs/PushChanges.tsx
+++ b/src/features/vcs/PushChanges.tsx
@@ -1,19 +1,29 @@
 /**
  * Push dialog: the files changed by the outgoing commits (the selected commit's, or all of
  * them), with the selected file's diff beside the tree. The diff stays inside the dialog,
- * which is modal.
+ * which is modal. A single commit also shows its message, author and time.
  */
 import { useEffect, useMemo, useState } from "react";
 import type { ChangedFile, Commit, RevisionChange } from "@/bindings";
 import { call, commands } from "@/platform/ipc";
 import { tx } from "@/platform/i18n";
-import { Button, Spinner, T } from "@/ui";
+import { Button, IconButton, Spinner, T } from "@/ui";
 import { ComparisonTree } from "./ComparisonTree";
 import { buildFileTree } from "./fileTree";
-import { toLogChanges, type LogChange } from "./logChanges";
-import { KIND_COLOR, fileCount } from "./model";
+import { flatFileNodes, toLogChanges, type LogChange } from "./logChanges";
+import { KIND_COLOR, dirName, fileCount } from "./model";
 import styles from "./common.module.css";
 
+const GROUP_KEY = "openidea.vcs.push.groupByDirectory";
+
+function readGroupByDirectory(): boolean {
+  try {
+    return localStorage.getItem(GROUP_KEY) !== "false";
+  } catch {
+    return true;
+  }
+}
+
 /** Identifies what `PushChanges` shows; render it with this `key` so a new selection starts afresh. */
 export const pushChangesKey = (repo: string | null, commits: readonly Commit[]) =>
   `${repo ?? ""}:${commits.map((c) => c.id).join(" ")}`;
@@ -34,6 +44,7 @@ export function PushChanges({
   const [changes, setChanges] = useState<LogChange[] | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [current, setCurrent] = useState<LogChange | null>(null);
+  const [byDirectory, setByDirectory] = useState(readGroupByDirectory);
 
   useEffect(() => {
     if (!commits.length) return;
@@ -50,7 +61,18 @@ export function PushChanges({
     };
   }, [repo, commits]);
 
-  const tree = useMemo(() => (changes ? buildFileTree(changes, (f) => f.path) : []), [changes]);
+  const tree = useMemo(
+    () => (!changes ? [] : byDirectory ? buildFileTree(changes, (f) => f.path) : flatFileNodes(changes, (f) => f.path)),
+    [changes, byDirectory],
+  );
+  const toggleGrouping = () => {
+    setByDirectory(!byDirectory);
+    try {
+      localStorage.setItem(GROUP_KEY, String(!byDirectory));
+    } catch {
+      /* kept for this dialog only */
+    }
+  };
   const count = commits.length;
   if (!count) return null;
   return (
@@ -65,7 +87,16 @@ export function PushChanges({
             <T>Show All Commits</T>
           </Button>
         )}
+        <IconButton
+          icon="folder"
+          size="small"
+          title={tx("Group by Directory")}
+          pressed={byDirectory}
+          onClick={toggleGrouping}
+          className={styles.pushGrouping}
+        />
       </div>
+      {count === 1 && <PushCommitDetails commit={commits[0]!} />}
       {error ? (
         <div className={styles.error}>{error}</div>
       ) : !changes ? (
@@ -80,9 +111,31 @@ export function PushChanges({
           diffFor={(c) => c.diff}
           getColor={(c) => KIND_COLOR[c.kind === "untracked" ? "added" : c.kind]}
           ariaLabel="Changed files"
-          renderDetails={(n) => (n.file ? null : <span className={styles.fileDir}>{n.count}</span>)}
+          renderDetails={(n) =>
+            n.file ? (
+              byDirectory ? null : (
+                <span className={styles.fileDir}>{dirName(n.file.path)}</span>
+              )
+            ) : (
+              <span className={styles.fileDir}>{n.count}</span>
+            )
+          }
         />
       )}
     </div>
   );
 }
+
+/** The selected commit's full message, revision, author and time. */
+function PushCommitDetails({ commit }: { commit: Commit }) {
+  const date = commit.timeMs ? new Date(commit.timeMs).toLocaleString() : null;
+  return (
+    <section className={styles.pushCommitDetails} aria-label={tx("Commit details")}>
+      <div className={styles.pushCommitMessage}>{commit.message.trimEnd() || commit.summary}</div>
+      <div className={styles.fileDir}>
+        {commit.shortId} {commit.author} &lt;{commit.email}&gt;
+        {date ? " " + tx`on ${date}` : ""}
+      </div>
+    </section>
+  );
+}
diff --git a/src/features/vcs/RevisionBrowser.tsx b/src/features/vcs/RevisionBrowser.tsx
new file mode 100644
index 00000000..a5d3dbb8
--- /dev/null
+++ b/src/features/vcs/RevisionBrowser.tsx
@@ -0,0 +1,245 @@
+import { useEffect, useMemo, useRef, useState } from "react";
+import { EditorState } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+import type { Commit } from "@/bindings";
+import { call, commands, isTauri } from "@/platform/ipc";
+import { tx } from "@/platform/i18n";
+import { editorService, notifications, type EditorInput } from "@/workbench/contributions";
+import {
+  Dialog,
+  EmptyState,
+  IconButton,
+  SearchField,
+  Spinner,
+  SplitGroup,
+  SplitHandle,
+  SplitPanel,
+  Tree,
+  T,
+  copyText,
+  showContextMenu,
+} from "@/ui";
+import { openDialog } from "./dialogs";
+
+import { commitRepo, type RepoCommit } from "./multiRoot";
+import { currentRepoRoot, useVcs } from "./store";
+import { repositoryPath } from "./repositoryPaths";
+import { languageFor, viewerBase } from "./cm";
+import styles from "./GitLog.module.css";
+import { choosePath } from "@/features/settings/languages/api";
+import { openLogTab } from "./logStore";
+
+interface RevisionData {
+  repo: string;
+  revision: string;
+  path: string;
+  external?: boolean;
+}
+
+export async function openExternalLog() {
+  const picked = isTauri()
+    ? await (
+        await import("@tauri-apps/plugin-dialog")
+      ).open({ title: tx("Open Git Log"), directory: true, multiple: true })
+    : await choosePath({ title: "Open Git Log", directory: true });
+  const paths = Array.isArray(picked) ? picked : picked ? [picked] : [];
+  if (!paths.length) return;
+  try {
+    const roots = await Promise.all(paths.map((path) => call(commands.vcsOpenExternalLog(path))));
+    openLogTab("external", roots.join(", "), "editor", roots);
+  } catch (error) {
+    notifications().notify({ group: "vcs", level: "error", title: "Could not open Git log", body: String(error) });
+  }
+}
+
+export function browseRepositoryAt(commit: Commit) {
+  const repo = commitRepo(commit) ?? currentRepoRoot();
+  if (!repo) return;
+  openDialog((close) => (
+    <RevisionBrowser repo={repo} revision={commit.id} external={(commit as RepoCommit).readOnly} onClose={close} />
+  ));
+}
+
+function RevisionBrowser({
+  repo,
+  revision,
+  external,
+  onClose,
+}: {
+  repo: string;
+  revision: string;
+  external?: boolean;
+  onClose: () => void;
+}) {
+  const [directories, setDirectories] = useState<Record<string, string[]>>({});
+  const files = directories[""] ?? null;
+  const [error, setError] = useState<string | null>(null);
+  const [query, setQuery] = useState("");
+  const [searchFiles, setSearchFiles] = useState<string[] | null>(null);
+  const [selected, setSelected] = useState<string | null>(null);
+  useEffect(() => {
+    let alive = true;
+    void call(commands.vcsRevisionChildren(repo, revision, ""))
+      .then((files) => {
+        if (alive) setDirectories({ "": files });
+      })
+      .catch((error) => {
+        if (alive) setError(String(error));
+      });
+    return () => {
+      alive = false;
+    };
+  }, [repo, revision]);
+  useEffect(() => {
+    if (!query || searchFiles) return;
+    let alive = true;
+    const timer = setTimeout(
+      () =>
+        void call(commands.vcsRevisionFiles(repo, revision))
+          .then((files) => {
+            if (alive) setSearchFiles(files);
+          })
+          .catch((error) => {
+            if (alive) setError(String(error));
+          }),
+      250,
+    );
+    return () => {
+      alive = false;
+      clearTimeout(timer);
+    };
+  }, [query, searchFiles, repo, revision]);
+  const tree = useMemo(
+    () =>
+      (query ? (searchFiles ?? []) : (files ?? [])).filter(
+        (path) => !query || path.toLocaleLowerCase().includes(query.toLocaleLowerCase()),
+      ),
+    [files, query, searchFiles],
+  );
+  const load = async (path: string) => {
+    const children = await call(commands.vcsRevisionChildren(repo, revision, path.replace(/\/$/, "")));
+    setDirectories((current) => ({ ...current, [path]: children }));
+  };
+  const open = (path: string) => {
+    if (useVcs.getState().root) {
+      const bytes = new TextEncoder().encode(JSON.stringify({ repo, revision, path }));
+      const encoded = Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+      void editorService().openFile(`git-revision:${encoded}/${encodeURIComponent(path.split("/").at(-1)!)}`, {
+        focus: true,
+      });
+    } else
+      void editorService().openInput({
+        kind: "git-revision",
+        key: `git-revision:${repo}\0${revision}\0${path}`,
+        data: { repo, revision, path, external } satisfies RevisionData,
+      });
+  };
+  return (
+    <Dialog open title={tx`Repository at ${revision.slice(0, 8)}`} onClose={onClose} width={1000}>
+      <div style={{ height: "min(70vh, 640px)", display: "flex", flexDirection: "column" }}>
+        <SearchField
+          value={query}
+          onChange={setQuery}
+          placeholder="Search repository files"
+          aria-label="Search repository files"
+        />
+        {error ? (
+          <div role="alert">{error}</div>
+        ) : !files ? (
+          <Spinner />
+        ) : (
+          <SplitGroup orientation="horizontal" id="git-revision-browser">
+            <SplitPanel id="files" defaultSize="30%" minSize="20%">
+              <Tree
+                roots={tree}
+                getKey={(n) => n}
+                getLabel={(n) => n.replace(/\/$/, "").split("/").at(-1)!}
+                getChildren={(n) => directories[n]}
+                isExpandable={(n) => n.endsWith("/")}
+                loadChildren={load}
+                onSelectionChange={(_, n) => {
+                  if (n && !n.endsWith("/")) setSelected(n);
+                }}
+                onActivate={(n) => {
+                  if (!n.endsWith("/")) open(n);
+                }}
+                onContextMenu={(node, _selection, e) => {
+                  if (!node) return;
+                  e.preventDefault();
+                  showContextMenu(e, [
+                    { label: "Open Revision in Editor", disabled: node.endsWith("/"), run: () => open(node) },
+                    { label: "Copy Path", run: () => copyText(node) },
+                    {
+                      label: "Show History",
+                      run: () => openLogTab("history", repositoryPath(repo, node.replace(/\/$/, "")), "editor"),
+                    },
+                  ]);
+                }}
+                aria-label="Repository files"
+              />
+            </SplitPanel>
+            <SplitHandle />
+            <SplitPanel id="source" minSize="30%">
+              {selected ? (
+                <div className={styles.filesPane}>
+                  <div className={styles.detailsBar}>
+                    {selected}
+                    <IconButton icon="external-link" title="Open Revision in Editor" onClick={() => open(selected)} />
+                  </div>
+                  <RevisionSource key={selected} repo={repo} revision={revision} path={selected} />
+                </div>
+              ) : (
+                <EmptyState>
+                  <T>Select a file to view its repository version</T>
+                </EmptyState>
+              )}
+            </SplitPanel>
+          </SplitGroup>
+        )}
+      </div>
+    </Dialog>
+  );
+}
+
+export function GitRevisionEditor({ input }: { input: EditorInput }) {
+  return <RevisionSource {...(input.data as RevisionData)} />;
+}
+
+function RevisionSource({ repo, revision, path, external }: RevisionData) {
+  const host = useRef<HTMLDivElement>(null);
+  const key = `${repo}\0${revision}\0${path}`;
+  const [error, setError] = useState<{ key: string; message: string } | null>(null);
+  useEffect(() => {
+    let alive = true;
+    let view: EditorView | null = null;
+    const absolute = repositoryPath(repo, path);
+    const content = async () => {
+      if (external) await call(commands.vcsOpenExternalLog(repo));
+      return call(commands.vcsFileAt(absolute, revision));
+    };
+    void Promise.all([content(), languageFor(path)])
+      .then(([text, language]) => {
+        if (!alive || !host.current) return;
+        view = new EditorView({
+          parent: host.current,
+          state: EditorState.create({
+            doc: text ?? "",
+            extensions: [viewerBase({ readOnly: true }), ...(language ? [language] : [])],
+          }),
+        });
+      })
+      .catch((error) => {
+        if (alive) setError({ key, message: String(error) });
+      });
+    return () => {
+      alive = false;
+      view?.destroy();
+    };
+  }, [repo, revision, path, external, key]);
+  return (
+    <div className={styles.revisionSource}>
+      {error?.key === key && <div role="alert">{error.message}</div>}
+      <div className={styles.revisionSource} ref={host} />
+    </div>
+  );
+}
diff --git a/src/features/vcs/SelectionHistory.module.css b/src/features/vcs/SelectionHistory.module.css
new file mode 100644
index 00000000..04bc54f1
--- /dev/null
+++ b/src/features/vcs/SelectionHistory.module.css
@@ -0,0 +1,18 @@
+.range {
+  flex: none;
+  color: var(--fg-subtle);
+  font-size: var(--fs-small);
+}
+.summary,
+.meta {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.summary {
+  color: var(--fg-emphasis);
+}
+.meta {
+  color: var(--fg-subtle);
+  font-size: var(--fs-small);
+}
diff --git a/src/features/vcs/SelectionHistory.tsx b/src/features/vcs/SelectionHistory.tsx
new file mode 100644
index 00000000..f92a5eab
--- /dev/null
+++ b/src/features/vcs/SelectionHistory.tsx
@@ -0,0 +1,154 @@
+/**
+ * History for Selection editor tab (IDEA's Show History for Selection): the
+ * commits that changed the selected lines (`git log -L`, renames followed),
+ * newest first, each shown as the block before and after it. Unsaved or
+ * uncommitted edits of the block come first as Local Changes.
+ */
+import { useEffect, useState } from "react";
+import type { BlockHistory, BlockRevision } from "@/bindings";
+import { call, commands, isCancelled, nextRequestId } from "@/platform/ipc";
+import { List, Spinner, T } from "@/ui";
+import type { EditorInput } from "@/workbench/contributions";
+import { DiffEditor } from "./DiffEditor";
+import { diffInput, type DiffSide } from "./diffInput";
+import { baseName, formatTime } from "./model";
+import { errorMessage } from "./ops";
+import type { SelectionHistoryData } from "./selectionHistoryKind";
+import layout from "./LocalHistory.module.css";
+import styles from "./SelectionHistory.module.css";
+import { tx } from "@/platform/i18n";
+
+export type HistoryRow =
+  | { kind: "local"; head: string; current: string }
+  | { kind: "revision"; revision: BlockRevision };
+
+const HEAD = "HEAD";
+
+/** Lines `from..=to` of `text`, each ending with a line break (as Git prints a block). */
+export function blockOf(text: string, [from, to]: readonly [number, number]): string {
+  return text
+    .split("\n")
+    .slice(from, to + 1)
+    .map((line) => `${line.replace(/\r$/, "")}\n`)
+    .join("");
+}
+
+/** The rows of the list: Local Changes when the block differs from HEAD, then the commits. */
+export function historyRows(history: BlockHistory, current: string): HistoryRow[] {
+  const rows: HistoryRow[] = history.revisions.map((revision) => ({ kind: "revision", revision }));
+  const head = history.revisions[0]?.after;
+  if (history.headLines && head !== undefined && head !== current) rows.unshift({ kind: "local", head, current });
+  return rows;
+}
+
+function sides(row: HistoryRow): [DiffSide, DiffSide] {
+  if (row.kind === "local")
+    return [
+      { type: "text", text: row.head, label: HEAD },
+      { type: "text", text: row.current, label: tx("Local Changes") },
+    ];
+  const r = row.revision;
+  return [
+    { type: "text", text: r.before, label: `${r.shortId}^` },
+    { type: "text", text: r.after, label: r.shortId },
+  ];
+}
+
+export function SelectionHistoryEditor({ input }: { input: EditorInput }) {
+  const data = input.data as SelectionHistoryData;
+  const [history, setHistory] = useState<BlockHistory | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [active, setActive] = useState(0);
+
+  useEffect(() => {
+    const request = nextRequestId();
+    let done = false;
+    call(commands.vcsBlockHistory(request, data.path, data.text, data.lines))
+      .then(setHistory, (e: unknown) => {
+        if (!isCancelled(e)) setError(errorMessage(e));
+      })
+      .finally(() => {
+        done = true;
+      });
+    return () => {
+      if (!done) void commands.cancelRequest(request);
+    };
+  }, [data]);
+
+  const rows = history ? historyRows(history, blockOf(data.text, data.lines)) : [];
+  const current = rows[Math.min(active, rows.length - 1)];
+  const [from, to] = data.lines;
+
+  let detail;
+  if (!current)
+    detail = (
+      <div className={layout.message}>
+        <T>Select a revision</T>
+      </div>
+    );
+  else {
+    const [left, right] = sides(current);
+    detail = (
+      <DiffEditor
+        key={current.kind === "local" ? "local" : current.revision.id}
+        input={diffInput({ path: data.path, left, right })}
+      />
+    );
+  }
+
+  return (
+    <div className={layout.root}>
+      <div className={layout.sidebar}>
+        <div className={layout.header}>
+          <span className={layout.title}>
+            <T>History for Selection</T>
+          </span>
+          <span className={styles.range}>{`${baseName(data.path)}:${from + 1}-${to + 1}`}</span>
+        </div>
+        {error ? (
+          <div className={layout.message}>{error}</div>
+        ) : !history ? (
+          <div className={layout.message}>
+            <Spinner size={14} />
+          </div>
+        ) : (
+          <List
+            items={rows}
+            getKey={(row) => (row.kind === "local" ? "local" : row.revision.id)}
+            activeIndex={Math.min(active, rows.length - 1)}
+            onActiveChange={setActive}
+            onActivate={(_row, i) => setActive(i)}
+            rowHeight={38}
+            aria-label="Revisions"
+            className={layout.list}
+            empty={
+              <span className={layout.message}>
+                {history.headLines ? tx`No commits changed these lines` : tx`These lines are not committed yet`}
+              </span>
+            }
+            renderItem={(row) =>
+              row.kind === "local" ? (
+                <span className={layout.entry}>
+                  <span className={styles.summary}>
+                    <T>Local Changes</T>
+                  </span>
+                  <span className={styles.meta}>
+                    <T>Not Committed Yet</T>
+                  </span>
+                </span>
+              ) : (
+                <span className={layout.entry}>
+                  <span className={styles.summary}>{row.revision.summary}</span>
+                  <span className={styles.meta}>
+                    {`${row.revision.shortId} · ${row.revision.author} · ${formatTime(row.revision.timeMs)}`}
+                  </span>
+                </span>
+              )
+            }
+          />
+        )}
+      </div>
+      <div className={layout.diff}>{detail}</div>
+    </div>
+  );
+}
diff --git a/src/features/vcs/__tests__/GitMergeDiff.test.tsx b/src/features/vcs/__tests__/GitMergeDiff.test.tsx
new file mode 100644
index 00000000..3f980f31
--- /dev/null
+++ b/src/features/vcs/__tests__/GitMergeDiff.test.tsx
@@ -0,0 +1,41 @@
+import { render, waitFor } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    commands: {
+      ...real.commands,
+      vcsFileAt: async (_path: string, rev: string) => ({
+        status: "ok",
+        data: `const value = ${rev === "merge" ? 3 : rev === "left" ? 1 : 2};\n`,
+      }),
+    },
+  };
+});
+import { GitMergeDiff } from "../GitMergeDiff";
+describe("historical merge comparison", () => {
+  it("shows and highlights both parents and the immutable result without an editable worktree pane", async () => {
+    const { container, unmount } = render(
+      <GitMergeDiff
+        input={{
+          kind: "git-merge-diff",
+          key: "merge:file",
+          data: {
+            repo: "/repo",
+            path: "a.ts",
+            revision: "merge",
+            parents: [
+              { rev: "left", path: "a.ts" },
+              { rev: "right", path: "a.ts" },
+            ],
+          },
+        }}
+      />,
+    );
+    await waitFor(() => expect(container.querySelectorAll(".cm-editor")).toHaveLength(3));
+    expect(container.querySelectorAll('.cm-content[contenteditable="false"]')).toHaveLength(3);
+    expect(container.querySelectorAll(".cm-diffLine-modified").length).toBeGreaterThanOrEqual(3);
+    unmount();
+  });
+});
diff --git a/src/features/vcs/__tests__/branchOps.test.ts b/src/features/vcs/__tests__/branchOps.test.ts
index e6899b2f..be0c1e78 100644
--- a/src/features/vcs/__tests__/branchOps.test.ts
+++ b/src/features/vcs/__tests__/branchOps.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, expect, it, vi } from "vitest";
-import type { BranchInfo } from "@/bindings";
+import type { Branch, BranchInfo } from "@/bindings";
 const mocks = vi.hoisted(() => ({ prompt: vi.fn() }));
 vi.mock("../dialogs", async (original) => ({
   ...(await original<typeof import("../dialogs")>()),
@@ -17,9 +17,25 @@ const branch = (head: string | null): BranchInfo => ({
   operation: null,
 });
 
+const local = (name: string, current = false): Branch => ({
+  name,
+  remote: false,
+  current,
+  upstream: null,
+  ahead: 0,
+  behind: 0,
+  lastCommitMs: null,
+});
+
 beforeEach(() => {
   vi.clearAllMocks();
-  useVcs.setState({ root: "/p", repo: "/p/front", branch: branch("feature/ui") });
+  // The current branch is always among the local branches, so the suggestion names an existing one.
+  useVcs.setState({
+    root: "/p",
+    repo: "/p/front",
+    branch: branch("feature/ui"),
+    branches: [local("feature/ui", true), local("main")],
+  });
   // Cancel: only what the dialog was offered matters here, not its outcome.
   mocks.prompt.mockResolvedValue(null);
 });
@@ -27,6 +43,7 @@ beforeEach(() => {
 it("prefills a plain New Branch with the current branch name", async () => {
   await newBranch();
   expect(mocks.prompt.mock.calls[0]?.[0].initial).toBe("feature/ui");
+  expect(mocks.prompt.mock.calls[0]?.[0].validateInitial).toBe(true);
 });
 
 it("prefills nothing when HEAD is detached", async () => {
diff --git a/src/features/vcs/__tests__/commitMode.test.ts b/src/features/vcs/__tests__/commitMode.test.ts
index 103842ea..f128c4ef 100644
--- a/src/features/vcs/__tests__/commitMode.test.ts
+++ b/src/features/vcs/__tests__/commitMode.test.ts
@@ -2,6 +2,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const vcsLog = vi.fn();
 const fsReadText = vi.fn();
+const vcsConfigGet = vi.fn(async (_repo: unknown, _key: string) => ({ status: "ok", data: null as string | null }));
 
 vi.mock("@/platform/ipc", async (importOriginal) => {
   const real = await importOriginal<typeof import("@/platform/ipc")>();
@@ -10,7 +11,7 @@ vi.mock("@/platform/ipc", async (importOriginal) => {
     commands: {
       ...real.commands,
       vcsLog: (repo: unknown, query: unknown) => vcsLog(repo, query),
-      vcsConfigGet: async () => ({ status: "ok", data: null }),
+      vcsConfigGet: (repo: unknown, key: string) => vcsConfigGet(repo, key),
       fsReadText: (path: string) => fsReadText(path),
     },
   };
@@ -18,7 +19,13 @@ vi.mock("@/platform/ipc", async (importOriginal) => {
 
 import { gitTabs, shownTab, stashTabOf, stashTabs } from "../gitTabs";
 import { pushDialogNeeded } from "../commitUi";
-import { installPreparedMessage, keepMessageAfterCommit, messageAfterCommit, useCommit } from "../commitStore";
+import {
+  installPreparedMessage,
+  keepMessageAfterCommit,
+  messageAfterCommit,
+  templatePath,
+  useCommit,
+} from "../commitStore";
 import { closeLogTab, emptyFilters, openLogTab, selectGitTab, setLogFilters, useGitLog } from "../logStore";
 import { useVcs } from "../store";
 
@@ -95,6 +102,43 @@ describe("commit message after a commit", () => {
   });
 });
 
+describe("commit template", () => {
+  beforeEach(() => {
+    fsReadText.mockReset();
+    vcsConfigGet.mockImplementation(async (_repo, key) => ({
+      status: "ok",
+      data: key === "commit.template" ? ".gitmessage" : null,
+    }));
+    useCommit.setState({ message: "" });
+  });
+
+  it("resolves the configured path as git does", () => {
+    expect(templatePath("~/.gitmessage", "/p", "/home/me/")).toBe("/home/me/.gitmessage");
+    expect(templatePath("/etc/msg", "/p", "")).toBe("/etc/msg");
+    expect(templatePath("C:\\msg.txt", "/p", "")).toBe("C:\\msg.txt");
+    expect(templatePath(".gitmessage", "/p", "")).toBe("/p/.gitmessage");
+  });
+
+  it("fills the empty message field, and again after a commit clears it", async () => {
+    fsReadText.mockResolvedValue({ status: "ok", data: "feat: \n\n# Why:\nRefs: \n" });
+    useVcs.setState({ root: "/p", branch: null });
+    const dispose = installPreparedMessage();
+    await vi.waitFor(() => expect(useCommit.getState().message).toBe("feat: \n\nRefs:"));
+    expect(fsReadText).toHaveBeenCalledWith("/p/.gitmessage");
+
+    keepMessageAfterCommit("feat: x", true);
+    await vi.waitFor(() => expect(useCommit.getState().message).toBe("feat: \n\nRefs:"));
+    // A kept message stays; a typed one is never replaced.
+    keepMessageAfterCommit("feat: x", false);
+    useCommit.setState({ message: "typed" });
+    useVcs.setState({ root: "/q" });
+    useCommit.setState({ message: "typed" });
+    await Promise.resolve();
+    expect(useCommit.getState().message).toBe("typed");
+    dispose();
+  });
+});
+
 describe("log tabs of their own", () => {
   beforeEach(() => {
     vcsLog.mockReset().mockResolvedValue({ status: "ok", data: [] });
diff --git a/src/features/vcs/__tests__/deleteUnversioned.test.ts b/src/features/vcs/__tests__/deleteUnversioned.test.ts
new file mode 100644
index 00000000..9e517f61
--- /dev/null
+++ b/src/features/vcs/__tests__/deleteUnversioned.test.ts
@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { FileStatus } from "@/bindings";
+import type { MenuItem } from "@/ui";
+import type { ChangeNode } from "../changes";
+
+const mocks = vi.hoisted(() => ({ confirm: vi.fn(), fsDelete: vi.fn(), call: vi.fn() }));
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  return { ...real, call: mocks.call, commands: { ...real.commands, fsDelete: mocks.fsDelete } };
+});
+vi.mock("../dialogs", async (original) => ({
+  ...(await original<typeof import("../dialogs")>()),
+  confirmDialog: mocks.confirm,
+}));
+
+const { nodeMenu } = await import("../CommitView");
+const { deleteUnversioned } = await import("../changeOps");
+
+const file = (rel: string, unstaged: FileStatus["unstaged"]): ChangeNode => {
+  const f: FileStatus = { path: `/p/${rel}`, relPath: rel, staged: null, unstaged, renamedFrom: null };
+  return { key: f.path, type: "file", label: rel, group: "unversioned", files: [f], path: f.path };
+};
+const deleteItem = (menu: MenuItem[]) =>
+  menu.find((i) => i.kind !== "separator" && "label" in i && i.label === "Delete…");
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  mocks.fsDelete.mockImplementation((path: string) => path);
+  mocks.call.mockResolvedValue(null);
+});
+
+describe("Delete… for unversioned files", () => {
+  it("is offered only when every selected file is unversioned", () => {
+    expect(deleteItem(nodeMenu([file("a.txt", "untracked"), file("b.txt", "untracked")], ["/p"]))).toBeDefined();
+    expect(deleteItem(nodeMenu([file("a.txt", "untracked"), file("c.txt", "modified")], ["/p"]))).toBeUndefined();
+    expect(deleteItem(nodeMenu([file("c.txt", "modified")], ["/p"]))).toBeUndefined();
+  });
+
+  it("asks first, then deletes each file", async () => {
+    mocks.confirm.mockResolvedValueOnce(false);
+    await deleteUnversioned(["/p/a.txt"]);
+    expect(mocks.fsDelete).not.toHaveBeenCalled();
+
+    mocks.confirm.mockResolvedValueOnce(true);
+    await deleteUnversioned(["/p/a.txt", "/p/b.txt"]);
+    expect(mocks.fsDelete.mock.calls.map((c) => c[0])).toEqual(["/p/a.txt", "/p/b.txt"]);
+  });
+});
diff --git a/src/features/vcs/__tests__/diffFind.test.tsx b/src/features/vcs/__tests__/diffFind.test.tsx
index a42649bc..8931ed3d 100644
--- a/src/features/vcs/__tests__/diffFind.test.tsx
+++ b/src/features/vcs/__tests__/diffFind.test.tsx
@@ -4,6 +4,7 @@ import userEvent from "@testing-library/user-event";
 import { EditorView } from "@codemirror/view";
 import type { EditorInput } from "@/workbench/contributions";
 import { useKeymap } from "@/platform/keymap";
+import { useFindOptions, useFindSessions } from "@/editor/core/view/FindBar";
 
 const texts: Record<string, string> = { HEAD: "foo\nbar\nfoo\n", abc123: "foo\nbaz\nfoo\n" };
 
@@ -72,7 +73,11 @@ const press = async (index: number, code: string, shift = false) => {
   return v;
 };
 
-afterEach(() => useKeymap.setState({ overrides: {} }));
+afterEach(() => {
+  useKeymap.setState({ overrides: {} });
+  useFindOptions.setState({ search: "", replace: "" });
+  useFindSessions.setState({}, true);
+});
 
 describe("Find in the diff viewer", () => {
   it("preserves external focus when loading and changing a working-tree preview", async () => {
diff --git a/src/features/vcs/__tests__/diffToolbar.test.tsx b/src/features/vcs/__tests__/diffToolbar.test.tsx
index e7f1e33d..bdac8d2e 100644
--- a/src/features/vcs/__tests__/diffToolbar.test.tsx
+++ b/src/features/vcs/__tests__/diffToolbar.test.tsx
@@ -71,6 +71,14 @@ beforeEach(() => {
 });
 
 describe("Diff toolbar", () => {
+  it("can start an embedded comparison side by side without overwriting saved viewer preferences", async () => {
+    localStorage.setItem("openidea.vcs.diffOptions", JSON.stringify({ mode: "unified" }));
+    const mounted = render(<DiffEditor input={{ ...input, data: { ...(input.data as object), mode: "split" } }} />);
+    await waitFor(() => expect(mounted.container.querySelectorAll(".cm-editor")).toHaveLength(2));
+    expect(JSON.parse(localStorage.getItem("openidea.vcs.diffOptions")!).mode).toBe("unified");
+    mounted.unmount();
+    localStorage.removeItem("openidea.vcs.diffOptions");
+  });
   it("shows a binary notice for disk comparisons instead of identical empty text", async () => {
     probe.mockResolvedValue({ status: "ok", data: { size: 3, binary: true, tooLarge: false } });
     const binaryInput = {
diff --git a/src/features/vcs/__tests__/graph.test.ts b/src/features/vcs/__tests__/graph.test.ts
index 23080fa0..97464ef7 100644
--- a/src/features/vcs/__tests__/graph.test.ts
+++ b/src/features/vcs/__tests__/graph.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { computeGraph } from "../graph";
+import { computeGraph, straightenLaneChanges } from "../graph";
 
 const c = (id: string, ...parents: string[]) => ({ id, parents });
 
@@ -62,3 +62,47 @@ describe("computeGraph", () => {
     expect(m2.down).toContainEqual({ from: m2.lane, to: 0, color: rows[0]!.color });
   });
 });
+
+describe("straightenLaneChanges", () => {
+  it("draws a lane change as one diagonal across the row boundary, keeping the lanes", () => {
+    // m merges f into main; f branched from a; b sits in lane 0 while lane 1 passes it.
+    const rows = straightenLaneChanges(computeGraph([c("m", "b", "f"), c("f", "a"), c("b", "a"), c("a")]).rows);
+    const [m, f, b, a] = rows;
+    // m → f: leaves m's node towards lane 1 and reaches f's node in a straight line.
+    expect(m!.down[1]).toMatchObject({ from: 0, to: 1, toX: 0.5 });
+    expect(f!.up.find((s) => s.from === 1)).toMatchObject({ from: 1, to: 1, fromX: 0.5 });
+    // Lane 1 converging into a: the vertical line of b's row meets it halfway.
+    expect(a!.up[1]).toMatchObject({ from: 1, to: 0, fromX: 0.5 });
+    expect(b!.down.find((s) => s.from === 1)).toMatchObject({ from: 1, to: 1, toX: 0.5 });
+    // Straight lines stay where they are.
+    expect(m!.down[0]!.toX).toBeUndefined();
+    expect(a!.up[0]!.fromX).toBeUndefined();
+  });
+
+  it("leaves a lane that another line also ends in, and arrows, as they are", () => {
+    const rows = straightenLaneChanges([
+      {
+        lane: 0,
+        color: 0,
+        up: [],
+        down: [
+          { from: 0, to: 1, color: 0 },
+          { from: 1, to: 1, color: 1 },
+        ],
+        width: 2,
+      },
+      {
+        lane: 1,
+        color: 1,
+        up: [{ from: 1, to: 1, color: 1 }],
+        down: [{ from: 1, to: 2, color: 1, arrow: "down" }],
+        width: 3,
+      },
+      { lane: 2, color: 1, up: [{ from: 2, to: 2, color: 1 }], down: [], width: 3 },
+    ]);
+    expect(rows[0]!.down[0]!.toX).toBeUndefined();
+    expect(rows[1]!.up[0]!.fromX).toBeUndefined();
+    expect(rows[1]!.down[0]!.toX).toBeUndefined();
+    expect(rows[2]!.up[0]!.fromX).toBeUndefined();
+  });
+});
diff --git a/src/features/vcs/__tests__/logDetails.test.tsx b/src/features/vcs/__tests__/logDetails.test.tsx
index 1ca27ea1..ca3c4158 100644
--- a/src/features/vcs/__tests__/logDetails.test.tsx
+++ b/src/features/vcs/__tests__/logDetails.test.tsx
@@ -1,83 +1,94 @@
-import { commitKey } from "../multiRoot";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { Commit } from "@/bindings";
-
-const vcsCommitFiles = vi.fn();
-const vcsCommitsChanges = vi.fn();
-
-vi.mock("@/platform/ipc", async (importOriginal) => {
-  const real = await importOriginal<typeof import("@/platform/ipc")>();
+const api = vi.hoisted(() => ({ batch: vi.fn(), cancel: vi.fn() }));
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
   return {
     ...real,
     commands: {
       ...real.commands,
-      vcsCommitFiles: (repo: unknown, id: string) => vcsCommitFiles(repo, id),
-      vcsCommitsChanges: (repo: unknown, ids: string[]) => vcsCommitsChanges(repo, ids),
+      vcsLogDetailsBatch: (...args: unknown[]) => api.batch(...args),
+      cancelRequest: (...args: unknown[]) => api.cancel(...args),
     },
   };
 });
-
-import { CommitDetails } from "../GitLog";
+import { loadLogDetails } from "../logDetails";
+import { useVcs } from "../store";
 import { useGitLog } from "../logStore";
-
-const commit = (summary: string, d: string): Commit => ({
-  id: d.repeat(40),
-  shortId: d.repeat(8),
+const commit = (id: string): Commit => ({
+  id,
+  shortId: id,
   parents: [],
-  author: "A",
-  email: "a@example.com",
-  timeMs: 0,
-  summary,
-  message: `${summary}\n\nBody of ${summary}`,
   refs: [],
+  author: "A",
+  email: "a@x",
+  summary: id,
+  message: id,
+  timeMs: 0,
 });
-
-// Log order: newest first.
-const log = [commit("Third", "3"), commit("Second", "2"), commit("First", "1")];
-
-afterEach(() => {
-  useGitLog.setState({ commits: [], selection: [], selected: null });
-  vcsCommitFiles.mockReset();
-  vcsCommitsChanges.mockReset();
+beforeEach(() => {
+  api.batch.mockReset().mockImplementation(async (_repo: string, ids: string[]) => ({
+    status: "ok",
+    data: ids.map((id) => ({
+      message: id,
+      containingBranches: [],
+      signature: "N",
+      signer: "",
+      key: "",
+      fingerprint: "",
+    })),
+  }));
+  api.cancel.mockReset().mockResolvedValue(undefined);
+  useVcs.setState((s) => ({ repo: "/repo", root: "/repo", version: s.version + 1 }));
 });
-
-describe("Git Log commit details", () => {
-  it("shows one commit's files and full message", async () => {
-    vcsCommitFiles.mockResolvedValue({ status: "ok", data: [{ path: "a.ts", kind: "modified", oldPath: null }] });
-    useGitLog.setState({ commits: log, selected: log[1]!.id, selection: [log[1]!.id] });
-    render(<CommitDetails commits={log} />);
-    expect(await screen.findByText("1 file")).toBeInTheDocument();
-    expect(vcsCommitFiles).toHaveBeenCalledWith(null, log[1]!.id);
-    expect(screen.getByText("Body of Second")).toBeInTheDocument();
+describe("commit detail jobs", () => {
+  it("retries immediately after the last consumer cancels without losing the replacement cache entry", async () => {
+    let rejectOld!: (error: Error) => void;
+    api.batch.mockImplementationOnce(
+      () =>
+        new Promise((_resolve, reject) => {
+          rejectOld = reject;
+        }),
+    );
+    const controller = new AbortController();
+    const old = loadLogDetails(commit("retry-cancelled"), controller.signal).catch((error: unknown) => error);
+    await vi.waitFor(() => expect(api.batch).toHaveBeenCalledTimes(1));
+    controller.abort();
+    const replacement = loadLogDetails(commit("retry-cancelled"));
+    await vi.waitFor(() => expect(api.batch).toHaveBeenCalledTimes(2));
+    await expect(replacement).resolves.toMatchObject({ message: "retry-cancelled" });
+    rejectOld(new Error("Cancelled"));
+    await old;
+    await loadLogDetails(commit("retry-cancelled"));
+    expect(api.batch).toHaveBeenCalledTimes(2);
   });
-
-  it("combines the changes of several selected commits, oldest first, and lists them", async () => {
-    vcsCommitsChanges.mockResolvedValue({
-      status: "ok",
-      data: [
-        { path: "a.ts", kind: "modified", oldPath: null, before: "0".repeat(40), after: log[0]!.id },
-        { path: "b.ts", kind: "added", oldPath: null, before: null, after: log[2]!.id },
-      ],
-    });
-    // Selected in click order (Cmd-click), not log order; non-contiguous.
-    useGitLog.setState({ commits: log, selected: log[0]!.id, selection: [log[2]!.id, log[0]!.id] });
-    render(<CommitDetails commits={log} />);
-    expect(await screen.findByText(/2 files\s*in 2 commits/)).toBeInTheDocument();
-    expect(vcsCommitsChanges).toHaveBeenCalledWith(null, [log[2]!.id, log[0]!.id]);
-    expect(vcsCommitFiles).not.toHaveBeenCalled();
-    expect(screen.getByText("First")).toBeInTheDocument();
-    expect(screen.getByText("Third")).toBeInTheDocument();
-    expect(screen.queryByText("Second")).toBeNull();
+  it("batches rows and reuses results across log generations", async () => {
+    const [a, b] = await Promise.all([loadLogDetails(commit("batch-a")), loadLogDetails(commit("batch-b"))]);
+    expect([a.message, b.message]).toEqual(["batch-a", "batch-b"]);
+    expect(api.batch).toHaveBeenCalledTimes(1);
+    expect(api.batch.mock.calls[0]![1]).toEqual(["batch-a", "batch-b"]);
+    useGitLog.setState((s) => ({ generation: s.generation + 1 }));
+    await loadLogDetails(commit("batch-a"));
+    expect(api.batch).toHaveBeenCalledTimes(1);
   });
-  it("loads the selected root even when two repositories contain the same SHA", async () => {
-    const front = { ...commit("Front", "1"), repo: "/front" };
-    const back = { ...commit("Back", "1"), repo: "/back" };
-    vcsCommitFiles.mockResolvedValue({ status: "ok", data: [{ path: "same.ts", kind: "modified", oldPath: null }] });
-    useGitLog.setState({ commits: [front, back], selected: commitKey(back), selection: [commitKey(back)] });
-    render(<CommitDetails commits={[front, back]} />);
-    expect(await screen.findByText("1 file")).toBeInTheDocument();
-    expect(vcsCommitFiles).toHaveBeenCalledWith("/back", back.id);
-    expect(screen.getByText("Body of Back")).toBeInTheDocument();
+  it("cancels running native work only when its last consumer leaves", async () => {
+    let finish!: (value: unknown) => void;
+    api.batch.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        }),
+    );
+    const a = new AbortController(),
+      b = new AbortController();
+    const first = loadLogDetails(commit("shared"), a.signal);
+    const second = loadLogDetails(commit("shared"), b.signal);
+    await vi.waitFor(() => expect(api.batch).toHaveBeenCalledTimes(1));
+    a.abort();
+    expect(api.cancel).not.toHaveBeenCalled();
+    b.abort();
+    expect(api.cancel).toHaveBeenCalledWith(api.batch.mock.calls[0]![2]);
+    finish({ status: "ok", data: [{ message: "shared" }] });
+    await Promise.all([first, second]);
   });
 });
diff --git a/src/features/vcs/__tests__/logGraphCorrectness.test.tsx b/src/features/vcs/__tests__/logGraphCorrectness.test.tsx
new file mode 100644
index 00000000..0c63ca81
--- /dev/null
+++ b/src/features/vcs/__tests__/logGraphCorrectness.test.tsx
@@ -0,0 +1,144 @@
+import { describe, expect, it, vi } from "vitest";
+import { fireEvent, render, screen } from "@testing-library/react";
+import type { Commit } from "@/bindings";
+import { collapseLinear, computeGraph, hideLongEdges, linearizeMerges } from "../graph";
+import { commitKey, graphCommit } from "../multiRoot";
+import { GraphCell } from "../GitLog";
+import { toLogChanges } from "../logChanges";
+
+const commit = (id: string, parents: string[] = [], refs: string[] = []): Commit => ({
+  id,
+  shortId: id,
+  parents,
+  refs,
+  author: "Author",
+  email: "author@example.com",
+  summary: id,
+  message: id,
+  timeMs: 0,
+});
+
+describe("graph projections", () => {
+  it("draws a filtered edge without changing the revision used for a file diff", () => {
+    const c = { ...commit("tip", ["hidden"]), repo: "/repo", graphParents: ["base"], graphDashed: [true] };
+    const graph = graphCommit(c);
+    expect(graph.parents).toEqual([commitKey({ id: "base", repo: "/repo" })]);
+    expect(computeGraph([graph]).rows[0]!.down[0]!.dashed).toBe(true);
+    const [file] = toLogChanges([{ path: "a.ts", kind: "modified", oldPath: null }], c);
+    expect(file!.before).toBe("hidden");
+    expect(c.parents).toEqual(["hidden"]);
+  });
+
+  it("preserves filter dashes even when collapse hides no additional commits", () => {
+    const c = { ...commit("tip", ["base"]), dashed: [true] };
+    const collapsed = collapseLinear([c, commit("base")], new Set(["tip"]));
+    expect(collapsed.graph[0]!.dashed).toEqual([true]);
+  });
+
+  it("keeps selected commits and collapses only the requested fragment", () => {
+    const chain = [
+      commit("tip", ["selected"]),
+      commit("selected", ["middle"]),
+      commit("middle", ["base"]),
+      commit("base"),
+    ];
+    const result = collapseLinear(chain, new Set(["selected"]), new Set(["selected", "middle"]));
+    expect(result.commits.map((c) => c.id)).toEqual(["tip", "selected", "base"]);
+    expect(result.graph[1]).toMatchObject({ parents: ["base"], dashed: [true] });
+  });
+
+  it("retains every node and lane beyond twenty-four simultaneous branches", () => {
+    const commits = Array.from({ length: 36 }, (_, i) => commit(`tip${i}`, [`base${i}`]));
+    const first = computeGraph(commits);
+    const next = computeGraph(
+      Array.from({ length: 36 }, (_, i) => commit(`base${i}`)),
+      first.state,
+    );
+    expect(first.rows.at(-1)!.width).toBe(36);
+    expect(next.rows.map((r) => r.lane)).toEqual(Array.from({ length: 36 }, (_, i) => i));
+    expect(next.state.lanes).toEqual([]);
+    const { container } = render(<GraphCell row={first.rows.at(-1)!} />);
+    expect(Number(container.querySelector("svg")!.getAttribute("width"))).toBeGreaterThan(24 * 10);
+  });
+
+  it("makes long-edge arrows navigate to the correct endpoints by keyboard", () => {
+    const chain = Array.from({ length: 40 }, (_, i) => commit(`x${i}`, i < 39 ? [`x${i + 1}`] : []));
+    const rows = hideLongEdges(computeGraph([commit("tip", ["base"]), ...chain, commit("base")]).rows);
+    const down = rows.find((r) => r.down.some((s) => s.arrow === "down"))!;
+    const up = rows.find((r) => r.up.some((s) => s.arrow === "up"))!;
+    const navigate = vi.fn();
+    const { rerender } = render(<GraphCell row={down} onNavigate={navigate} targetTitle={(i) => `Go to ${i}`} />);
+    fireEvent.keyDown(screen.getByRole("button", { name: "Go to 41" }), { key: "Enter" });
+    expect(navigate).toHaveBeenLastCalledWith(41, "base");
+    rerender(<GraphCell row={up} onNavigate={navigate} targetTitle={(i) => `Go to ${i}`} />);
+    fireEvent.keyDown(screen.getByRole("button", { name: "Go to 0" }), { key: " " });
+    expect(navigate).toHaveBeenLastCalledWith(0, "base");
+  });
+
+  it("keeps a referenced branch's colour when an unrelated head is inserted ahead of it", () => {
+    const main = commit("main-tip", ["base"], ["HEAD", "main"]);
+    const old = computeGraph([main, commit("base")]).rows[0]!;
+    const next = computeGraph([commit("tag-tip", [], ["tag: release"]), main, commit("base")]).rows[1]!;
+    expect(next.color).toBe(old.color);
+    expect(next.lane).toBe(old.lane);
+  });
+
+  it("targets the exact incoming fragment instead of the row or its reused colour", () => {
+    const graph = computeGraph([
+      { ...commit("tip", ["base"]), dashed: [true], edgeTypes: ["collapsed" as const] },
+      commit("other"),
+      commit("base"),
+    ]);
+    const fragment = vi.fn();
+    render(<GraphCell row={graph.rows[1]!} onFragment={fragment} />);
+    fireEvent.click(screen.getAllByRole("button", { name: "Expand this fragment" })[0]!);
+    expect(fragment).toHaveBeenCalledWith("base", true, "tip");
+  });
+});
+
+describe("linear merge presentation", () => {
+  const commits = [
+    commit("merge", ["main", "feature"]),
+    commit("feature", ["feature-base"]),
+    commit("feature-base", ["base"]),
+    commit("main", ["base"]),
+    commit("base"),
+  ];
+
+  it("serializes a contained incoming block and expands back to the actual graph", () => {
+    const original = structuredClone(commits);
+    const linear = linearizeMerges(commits);
+    expect(linear.graph.map((c) => c.id)).toEqual(commits.map((c) => c.id));
+    expect(linear.graph[0]!.parents).toEqual(["feature"]);
+    expect(linear.graph[2]).toMatchObject({ parents: ["main"], dashed: [true] });
+    expect(linear.fragments.get("feature-base\0main")).toBe("merge");
+    expect(linearizeMerges(commits, new Set(["merge"])).graph.map((c) => c.parents)).toEqual(
+      commits.map((c) => c.parents),
+    );
+    expect(commits).toEqual(original);
+  });
+
+  it("linearizes shared fragments while preserving their other incoming edges", () => {
+    const shared = [commit("other", ["feature"]), ...commits];
+    expect(linearizeMerges(shared).graph[1]!.parents).toEqual(["feature"]);
+    expect(linearizeMerges(shared).graph[0]!.parents).toEqual(["feature"]);
+    expect(linearizeMerges(commits.slice(0, 3)).graph[0]!.parents).toEqual(["main", "feature"]);
+  });
+
+  it("expands nested merge fragments together with their containing merge", () => {
+    const nested = [
+      commit("outer", ["main", "nested"]),
+      commit("nested", ["feature", "topic"]),
+      commit("topic", ["base"]),
+      commit("feature", ["base"]),
+      commit("main", ["base"]),
+      commit("base"),
+    ];
+    const collapsed = linearizeMerges(nested);
+    expect(collapsed.graph[0]!.parents).toEqual(["nested"]);
+    expect(collapsed.graph[1]!.parents).toEqual(["topic"]);
+    expect(linearizeMerges(nested, new Set(["outer"])).graph.map((c) => c.parents)).toEqual(
+      nested.map((c) => c.parents),
+    );
+  });
+});
diff --git a/src/features/vcs/__tests__/logLoading.test.ts b/src/features/vcs/__tests__/logLoading.test.ts
new file mode 100644
index 00000000..a331dbb6
--- /dev/null
+++ b/src/features/vcs/__tests__/logLoading.test.ts
@@ -0,0 +1,279 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Commit, LogQuery } from "@/bindings";
+
+const api = vi.hoisted(() => ({ log: vi.fn(), refs: vi.fn(), cancel: vi.fn(), choose: vi.fn() }));
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    commands: {
+      ...real.commands,
+      vcsLog: (repo: string | null, query: LogQuery) => api.log(repo, query),
+      vcsLogRefs: () => api.refs(),
+      cancelRequest: (id: number) => api.cancel(id),
+      vcsBranches: () => Promise.resolve({ status: "ok", data: [] }),
+      vcsBranchInfo: () => Promise.resolve({ status: "ok", data: { upstream: null } }),
+      vcsConfigGet: () => Promise.resolve({ status: "ok", data: null }),
+      vcsOpenExternalLog: (repo: string) => Promise.resolve({ status: "ok", data: repo }),
+    },
+  };
+});
+vi.mock("../CommitChooser", () => ({ chooseLogCommit: (commits: Commit[]) => api.choose(commits) }));
+
+import { commitKey } from "../multiRoot";
+import { useVcs } from "../store";
+import { DEFAULT_LOG_OPTIONS, useLogOptions } from "../logOptions";
+import {
+  displayedLogGraph,
+  emptyFilters,
+  extendCommitSelection,
+  goToChild,
+  goToParent,
+  goToRef,
+  logState,
+  openLogTab,
+  selectGitTab,
+  PAGE,
+  reloadLog,
+  setLogBranches,
+  toggleCommitSelection,
+  updateLogOptions,
+  useGitLog,
+} from "../logStore";
+
+const c = (id: string, parents: string[] = [], refs: string[] = []): Commit => ({
+  id,
+  shortId: id,
+  parents,
+  refs,
+  author: "A",
+  email: "a@example.com",
+  timeMs: 0,
+  summary: id,
+  message: id,
+});
+const ok = <T>(data: T) => ({ status: "ok" as const, data });
+
+beforeEach(() => {
+  api.log.mockReset().mockResolvedValue(ok([]));
+  api.refs.mockReset().mockResolvedValue(ok({}));
+  api.cancel.mockReset().mockResolvedValue(undefined);
+  api.choose.mockReset().mockImplementation(async (commits: Commit[]) => commits[1]);
+  useVcs.setState({ root: "/repo", repo: "/repo", roots: ["/repo"], branches: [] });
+  useLogOptions.setState({ ...DEFAULT_LOG_OPTIONS });
+  useGitLog.setState({
+    shownLog: "log",
+    tab: "log",
+    logTabs: [],
+    filters: emptyFilters(),
+    commits: [],
+    rows: [],
+    selection: [],
+    selected: null,
+    done: false,
+    fragments: { expanded: new Set(), collapsed: new Set(), merges: new Set() },
+    generation: useGitLog.getState().generation + 1,
+  });
+});
+
+afterEach(async () => {
+  api.log.mockResolvedValue(ok([]));
+  await reloadLog();
+});
+
+describe("incremental log refresh", () => {
+  it("lets an inactive visible scope finish its own request without cancelling the active scope", async () => {
+    let finish!: (value: ReturnType<typeof ok<Commit[]>>) => void;
+    api.log.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        }),
+    );
+    const main = reloadLog();
+    await vi.waitFor(() => expect(finish).toBeDefined());
+    const request = api.log.mock.lastCall![1].request;
+    const other = openLogTab("log", "Other");
+    api.log.mockResolvedValue(ok([c("other")]));
+    await reloadLog();
+    finish(ok([c("main")]));
+    await main;
+    expect(api.cancel).not.toHaveBeenCalledWith(request);
+    expect(logState("log").commits[0]!.id).toBe("main");
+    expect(logState(other).commits[0]!.id).toBe("other");
+    selectGitTab("log");
+    expect(useGitLog.getState().commits[0]!.id).toBe("main");
+  });
+  it("joins a proven linear prefix and refreshes decorations without dropping loaded history", async () => {
+    useGitLog.setState({ filters: { ...emptyFilters(), branches: ["HEAD"] } });
+    api.log.mockResolvedValue(ok([c("old", ["base"], ["HEAD", "main"]), c("base")]));
+    await reloadLog();
+    api.log.mockResolvedValue(ok([c("new", ["old"], ["HEAD", "main"]), c("old", ["base"])]));
+    api.refs.mockResolvedValue(ok({ HEAD: "new", main: "new", "tag: v1": "base" }));
+    await reloadLog({ preserve: true });
+    expect(api.log.mock.lastCall?.[1]).toMatchObject({ stopAt: "old", skip: 0 });
+    expect(useGitLog.getState().commits.map((c) => [c.id, c.refs])).toEqual([
+      ["new", ["HEAD", "main"]],
+      ["old", []],
+      ["base", ["tag: v1"]],
+    ]);
+    expect(useGitLog.getState().done).toBe(true);
+  });
+
+  it("fetches a full replacement when the prefix introduces a merge", async () => {
+    useGitLog.setState({ filters: { ...emptyFilters(), branches: ["HEAD"] } });
+    api.log.mockResolvedValue(ok([c("old"), c("stale")]));
+    await reloadLog();
+    const replacement = [c("merge", ["old", "side"]), c("side", ["old"]), c("old")];
+    api.log.mockResolvedValue(ok(replacement));
+    await reloadLog({ preserve: true });
+    expect(api.log.mock.calls.slice(-2).map((call) => call[1].stopAt)).toEqual(["old", null]);
+    expect(useGitLog.getState().commits.map((c) => c.id)).toEqual(["merge", "side", "old"]);
+  });
+
+  it("intersects repository and path filters and clears rows for an empty intersection", async () => {
+    useVcs.setState({ roots: ["/repo/front", "/repo/back"] });
+    useGitLog.setState({
+      filters: { ...emptyFilters(), paths: ["/repo/front/a", "/repo/back/b"], repositories: ["/repo/back"] },
+    });
+    api.log.mockResolvedValue(ok([c("back")]));
+    await reloadLog();
+    expect(api.log.mock.lastCall).toEqual([
+      "/repo/back",
+      expect.objectContaining({ paths: ["/repo/back/b"], authorsExact: true }),
+    ]);
+    api.log.mockClear();
+    useGitLog.setState({ filters: { ...emptyFilters(), path: "/repo/front/a", repositories: ["/repo/back"] } });
+    await reloadLog({ preserve: true });
+    expect(api.log).not.toHaveBeenCalled();
+    expect(useGitLog.getState().commits).toEqual([]);
+    expect(useGitLog.getState().error).toBeNull();
+  });
+
+  it("keeps multi-path filters scoped to their owning external repositories", async () => {
+    useVcs.setState({ root: null, repo: null, roots: [] });
+    openLogTab("external", "/a", "toolWindow", ["/a", "/b", "/c"]);
+    useGitLog.setState({ filters: { ...emptyFilters(), paths: ["/a/src", "/b/test"] } });
+    await reloadLog();
+    expect(api.log.mock.calls).toEqual([
+      ["/a", expect.objectContaining({ paths: ["/a/src"] })],
+      ["/b", expect.objectContaining({ paths: ["/b/test"] })],
+    ]);
+    api.log.mockClear();
+    useGitLog.setState({ filters: { ...emptyFilters(), path: "/outside/file" } });
+    await reloadLog();
+    expect(api.log).not.toHaveBeenCalled();
+    expect(useGitLog.getState().commits).toEqual([]);
+  });
+
+  it("cancels a superseded page and ignores its later response", async () => {
+    let finish!: (value: ReturnType<typeof ok<Commit[]>>) => void;
+    api.log.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        }),
+    );
+    const old = reloadLog();
+    await vi.waitFor(() => expect(finish).toBeDefined());
+    const request = api.log.mock.lastCall![1].request;
+    api.log.mockResolvedValue(ok([c("fresh")]));
+    await reloadLog();
+    expect(api.cancel).toHaveBeenCalledWith(request);
+    finish(ok([c("stale")]));
+    await old;
+    expect(useGitLog.getState().commits.map((c) => c.id)).toEqual(["fresh"]);
+  });
+});
+
+describe("commit navigation", () => {
+  it("resolves references in the repositories of a standalone multi-root log", async () => {
+    useVcs.setState({ root: null, repo: null, roots: [] });
+    openLogTab("external", "/a", "toolWindow", ["/a", "/b"]);
+    api.log.mockImplementation(async (repo: string) => ok(repo ? [c("target")] : []));
+    expect(await goToRef("main")).toBe(true);
+    expect(api.choose).toHaveBeenCalledWith([
+      expect.objectContaining({ repo: "/a" }),
+      expect.objectContaining({ repo: "/b" }),
+    ]);
+    expect(useGitLog.getState().selected).toBe(commitKey({ ...c("target"), repo: "/b" }));
+    expect(api.log.mock.calls.every(([repo]) => repo === "/a" || repo === "/b")).toBe(true);
+  });
+
+  it("jumps to an indexed window beyond thirty pages without paging through the prefix", async () => {
+    const history = Array.from({ length: PAGE * 31 + 7 }, (_, i) => c(`commit${i}`));
+    const target = history.at(-1)!;
+    api.log.mockImplementation(async (_repo: string, q: LogQuery) =>
+      ok(q.branch === target.id || q.seek === target.id ? [target] : history.slice(q.skip, q.skip + q.limit)),
+    );
+    expect(await goToRef(target.id)).toBe(true);
+    expect(useGitLog.getState().selected).toBe(commitKey({ ...target, repo: "/repo" }));
+    expect(api.log.mock.calls.some((call) => call[1].seek === target.id)).toBe(true);
+    expect(api.log.mock.calls.length).toBeLessThan(5);
+  });
+
+  it("navigates the displayed collapsed adjacency in both directions", async () => {
+    const commits = [c("tip", ["middle"]), c("middle", ["base"]), c("base")];
+    useGitLog.setState({ commits, done: true });
+    updateLogOptions({ collapseLinear: true });
+    await goToParent(commits[0]!);
+    expect(useGitLog.getState().selected).toBe("base");
+    await goToChild(commits[2]!);
+    expect(useGitLog.getState().selected).toBe("tip");
+  });
+
+  it("expands merges in linearized mode and retains expansion across new pages", () => {
+    const commits = [c("merge", ["main", "side"]), c("side", ["base"]), c("main", ["base"]), c("base")];
+    useGitLog.setState({ commits });
+    useLogOptions.setState({ linearizeMerges: true });
+    expect(displayedLogGraph().graph[0]!.parents).toEqual(["side"]);
+    updateLogOptions({ collapseLinear: false });
+    expect(displayedLogGraph().graph[0]!.parents).toEqual(["main", "side"]);
+    updateLogOptions({ collapseLinear: true });
+    expect(displayedLogGraph().graph[0]!.parents).toEqual(["side"]);
+  });
+
+  it("keeps selections and ranges spanning repository roots", () => {
+    const commits = [
+      { ...c("a"), repo: "/a" },
+      { ...c("b"), repo: "/b" },
+    ];
+    useGitLog.setState({ commits, selection: [commitKey(commits[0]!)] });
+    toggleCommitSelection(commitKey(commits[1]!));
+    expect(useGitLog.getState().selection).toEqual(commits.map(commitKey));
+    extendCommitSelection(commitKey(commits[1]!), commits);
+    expect(useGitLog.getState().selection).toEqual(commits.map(commitKey));
+  });
+
+  it("sends branches and independent ranges without dropping either", async () => {
+    setLogBranches(["main", "a..b", "c..d"]);
+    await reloadLog();
+    expect(api.log.mock.lastCall?.[1]).toMatchObject({ branches: ["main"], range: null, ranges: ["a..b", "c..d"] });
+  });
+
+  it("offers both merge parents and selects the chosen repository-scoped commit", async () => {
+    const commits = [c("merge", ["main", "side"]), c("main"), c("side")].map((c) => ({ ...c, repo: "/repo" }));
+    useGitLog.setState({ commits, done: true });
+    await goToParent(commits[0]!);
+    expect(api.choose).toHaveBeenCalledWith(commits.slice(1));
+    expect(useGitLog.getState().selected).toBe(commitKey(commits[2]!));
+  });
+
+  it("does not navigate after a reference lookup is superseded by a filter change", async () => {
+    let finish!: (value: ReturnType<typeof ok<Commit[]>>) => void;
+    api.log.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        }),
+    );
+    const navigate = goToRef("target");
+    await vi.waitFor(() => expect(finish).toBeDefined());
+    api.log.mockResolvedValue(ok([c("filtered")]));
+    await reloadLog();
+    finish(ok([c("target")]));
+    expect(await navigate).toBe(false);
+    expect(useGitLog.getState().selected).toBeNull();
+    expect(useGitLog.getState().commits[0]!.id).toBe("filtered");
+  });
+});
diff --git a/src/features/vcs/__tests__/logOptions.test.ts b/src/features/vcs/__tests__/logOptions.test.ts
index 56be32da..284de06d 100644
--- a/src/features/vcs/__tests__/logOptions.test.ts
+++ b/src/features/vcs/__tests__/logOptions.test.ts
@@ -37,8 +37,8 @@ describe("Collapse Linear Branches", () => {
     ];
     const { commits: shown, graph } = collapseLinear(commits, new Set());
     expect(shown.map((x) => x.id)).toEqual(["t", "m", "base"]);
-    expect(graph.find((g) => g.id === "m")).toEqual({ id: "m", parents: ["base"], dashed: [true] });
-    expect(graph.find((g) => g.id === "t")).toEqual({ id: "t", parents: ["m"] });
+    expect(graph.find((g) => g.id === "m")).toMatchObject({ id: "m", parents: ["base"], dashed: [true] });
+    expect(graph.find((g) => g.id === "t")).toMatchObject({ id: "t", parents: ["m"] });
     const { rows } = computeGraph(graph);
     expect(rows[1]!.down.some((s) => s.dashed)).toBe(true);
     expect(rows[2]!.up.some((s) => s.dashed)).toBe(true);
@@ -52,7 +52,12 @@ describe("Collapse Linear Branches", () => {
       c("x", [], ["tag: v1"]),
     ];
     const { graph } = collapseLinear(commits, new Set());
-    expect(graph.find((g) => g.id === "y")).toEqual({ id: "y", parents: ["x"], dashed: [true] });
+    expect(graph.find((g) => g.id === "y")).toMatchObject({
+      id: "y",
+      parents: ["x"],
+      dashed: [true],
+      edgeTypes: ["filtered"],
+    });
     expect(computeGraph(commits).rows[1]!.down.some((s) => s.dashed)).toBe(true);
   });
 
diff --git a/src/features/vcs/__tests__/logSearch.test.ts b/src/features/vcs/__tests__/logSearch.test.ts
new file mode 100644
index 00000000..e936b6ac
--- /dev/null
+++ b/src/features/vcs/__tests__/logSearch.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from "vitest";
+import type { Commit } from "@/bindings";
+import { nextSpeedMatch, speedMatches, visibleCommitText } from "../logSearch";
+import { DEFAULT_LOG_OPTIONS } from "../logOptions";
+const c = (id: string): Commit => ({
+  id,
+  shortId: id,
+  summary: "Synchronize client",
+  message: "body-only",
+  author: "Unique author",
+  email: "hidden@example.com",
+  refs: ["main"],
+  parents: [],
+  timeMs: 0,
+});
+describe("log speed search", () => {
+  it("matches fuzzy words within visible columns and cycles in both directions", () => {
+    const commits = [c("one"), c("two")];
+    expect(speedMatches("snc clt", visibleCommitText(commits[0]!, DEFAULT_LOG_OPTIONS))).toBe(true);
+    expect(nextSpeedMatch(commits, "client", DEFAULT_LOG_OPTIONS, 0)).toBe(1);
+    expect(nextSpeedMatch(commits, "client", DEFAULT_LOG_OPTIONS, 1)).toBe(0);
+    expect(nextSpeedMatch(commits, "client", DEFAULT_LOG_OPTIONS, 0, -1)).toBe(1);
+    expect(speedMatches("Unique", visibleCommitText(commits[0]!, { ...DEFAULT_LOG_OPTIONS, showAuthor: false }))).toBe(
+      false,
+    );
+    expect(speedMatches("body-only", visibleCommitText(commits[0]!, DEFAULT_LOG_OPTIONS))).toBe(false);
+  });
+});
diff --git a/src/features/vcs/__tests__/logUiFeatures.test.tsx b/src/features/vcs/__tests__/logUiFeatures.test.tsx
new file mode 100644
index 00000000..2159cf57
--- /dev/null
+++ b/src/features/vcs/__tests__/logUiFeatures.test.tsx
@@ -0,0 +1,205 @@
+import { act, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Commit } from "@/bindings";
+import { ContextMenuHost, hideContextMenu } from "@/ui";
+
+const api = vi.hoisted(() => ({ commits: [] as Commit[], details: vi.fn(), diff: vi.fn() }));
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  const ok = <T,>(data: T) => Promise.resolve({ status: "ok" as const, data });
+  return {
+    ...real,
+    commands: {
+      ...real.commands,
+      vcsLog: () => ok(api.commits),
+      vcsLogRefs: () => ok({}),
+      vcsBranches: () => ok([]),
+      vcsTags: () => ok([]),
+      vcsBranchInfo: () => ok({ upstream: null }),
+      vcsConfigGet: () => ok(null),
+      vcsCommitFiles: () => ok([{ path: "src/a.ts", kind: "modified", oldPath: null }]),
+      vcsLogDetails: () => api.details(),
+      vcsLogDetailsBatch: async (_repo: string, ids: string[]) => ({
+        status: "ok",
+        data: await Promise.all(ids.map(async () => (await api.details()).data)),
+      }),
+      vcsLogIndex: () => ok({ indexed: 0, total: 0, running: false }),
+      vcsDiffRevisions: (...args: unknown[]) => api.diff(...args),
+    },
+  };
+});
+
+import { CommitDetails, LogView } from "../GitLog";
+import { useVcs } from "../store";
+import { commitKey } from "../multiRoot";
+import { emptyFilters, openLogTab, reloadLog, selectGitTab, useGitLog } from "../logStore";
+import { LogScope } from "../LogScope";
+import { DEFAULT_LOG_OPTIONS, useLogOptions } from "../logOptions";
+import { VcsDialogHost } from "../dialogs";
+
+const c = (id: string, parents: string[] = [], refs: string[] = []): Commit => ({
+  id,
+  shortId: id,
+  parents,
+  refs,
+  author: "Author",
+  email: "a@example.com",
+  summary: id,
+  message: id,
+  timeMs: 0,
+});
+
+beforeEach(() => {
+  api.commits = [c("tip", ["middle"], ["HEAD"]), c("middle", ["base"]), c("base")];
+  api.details.mockReset().mockResolvedValue({
+    status: "ok",
+    data: {
+      message: "tip\n\nFull body loaded on demand",
+      containingBranches: ["main"],
+      signature: "G",
+      signer: "Author",
+      key: "key",
+      fingerprint: "fingerprint",
+    },
+  });
+  api.diff.mockReset().mockResolvedValue({
+    status: "ok",
+    data: [
+      { path: "src/a.ts", kind: "modified", oldPath: null, before: "p1", after: "merge" },
+      { path: "elsewhere/b.ts", kind: "renamed", oldPath: "src/b.ts", before: "p1", after: "merge" },
+      { path: "unrelated/c.ts", kind: "added", oldPath: null, before: null, after: "merge" },
+    ],
+  });
+  useVcs.setState({
+    root: "/repo",
+    repo: "/repo",
+    roots: ["/repo"],
+    available: true,
+    branchesLoaded: true,
+    branches: [],
+    branch: { head: "main", headCommit: "tip", upstream: null, ahead: 0, behind: 0, operation: null },
+  });
+  useGitLog.setState({
+    shownLog: "log",
+    tab: "log",
+    logTabs: [],
+    commits: [],
+    rows: [],
+    filters: emptyFilters(),
+    selection: [],
+    selected: null,
+    done: false,
+    branchScope: "/repo",
+    generation: useGitLog.getState().generation + 1,
+  });
+  useLogOptions.setState({ ...DEFAULT_LOG_OPTIONS, showBranches: false, showDetails: false });
+});
+
+afterEach(async () => {
+  hideContextMenu();
+  api.commits = [];
+  await reloadLog();
+});
+
+describe("log controls", () => {
+  it("keeps a pending text edit with its original view when focus changes before the debounce", async () => {
+    const other = openLogTab("log", "Other");
+    selectGitTab("log");
+    render(
+      <>
+        <LogScope id="log">
+          <LogView />
+        </LogScope>
+        <LogScope id={other}>
+          <LogView />
+        </LogScope>
+      </>,
+    );
+    const [main, second] = screen.getAllByRole("textbox", { name: "Filter by message" });
+    fireEvent.change(main!, { target: { value: "pending" } });
+    fireEvent.pointerDown(second!);
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 350));
+    });
+    expect(useGitLog.getState().shownLog).toBe(other);
+    expect(useGitLog.getState().filters.text).toBe("");
+    fireEvent.pointerDown(main!);
+    await waitFor(() => expect(useGitLog.getState().filters.text).toBe("pending"));
+  });
+
+  it("expands a single collapsed fragment from its node without changing the global option", async () => {
+    useLogOptions.setState({ collapseLinear: true });
+    render(<LogView />);
+    const list = await screen.findByRole("listbox", { name: "Commits" });
+    await waitFor(() => expect(within(list).getAllByRole("option")).toHaveLength(2));
+    const tip = within(list).getAllByRole("option")[0]!;
+    fireEvent.click(within(tip).getByRole("button", { name: "Collapse or expand this branch" }));
+    await waitFor(() => expect(within(list).getAllByRole("option")).toHaveLength(3));
+    expect(useLogOptions.getState().collapseLinear).toBe(true);
+  });
+
+  it("keeps the selected middle commit visible under collapse and supports speed search", async () => {
+    useLogOptions.setState({ collapseLinear: true });
+    useGitLog.setState({ selected: "/repo\0middle", selection: ["/repo\0middle"] });
+    render(<LogView />);
+    const list = await screen.findByRole("listbox", { name: "Commits" });
+    await waitFor(() => expect(within(list).getAllByRole("option")).toHaveLength(3));
+    fireEvent.keyDown(list, { key: "b" });
+    expect(useGitLog.getState().selected).toBe("/repo\0base");
+    expect(screen.getByRole("status")).toHaveTextContent("b");
+  });
+
+  it("resizes and reorders columns using the keyboard", async () => {
+    render(<LogView />);
+    const author = await screen.findByRole("separator", { name: "Resize Author column" });
+    fireEvent.keyDown(author, { key: "ArrowRight" });
+    expect(useLogOptions.getState().columnWidths.author).toBe(140);
+    fireEvent.keyDown(author, { key: "ArrowRight", altKey: true });
+    expect(useLogOptions.getState().columnOrder).toEqual(["date", "author"]);
+  });
+});
+
+describe("commit details", () => {
+  it("loads a full body, containing branches, and signature only when details are visible", async () => {
+    useGitLog.setState({ selected: "/repo\0tip", selection: ["/repo\0tip"] });
+    render(
+      <>
+        <LogView />
+        <VcsDialogHost />
+      </>,
+    );
+    await screen.findByRole("listbox", { name: "Commits" });
+    expect(api.details).not.toHaveBeenCalled();
+    await act(async () => {
+      useLogOptions.setState({ showDetails: true });
+    });
+    expect(await screen.findByText("Full body loaded on demand")).toBeInTheDocument();
+    expect(screen.getByText(/Signature.*Verified/)).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Expand Commit Message" }));
+    expect(await screen.findByRole("dialog", { name: "Commit tip" })).toHaveTextContent("Full body loaded on demand");
+    fireEvent.keyDown(screen.getByRole("dialog"), { key: "Escape" });
+  });
+
+  it("compares real merge parents and retains renamed files under affected-path filtering", async () => {
+    const merge = { ...c("merge", ["p1", "p2"]), repo: "/repo", graphParents: ["filtered-base"] };
+    useGitLog.setState({
+      commits: [merge],
+      selected: commitKey(merge),
+      selection: [commitKey(merge)],
+      filters: { ...emptyFilters(), paths: ["/repo/src"] },
+    });
+    useLogOptions.setState({ changesFromParents: true, showOnlyAffected: true });
+    render(
+      <>
+        <CommitDetails commits={[merge]} />
+        <ContextMenuHost />
+      </>,
+    );
+    expect(await screen.findByText("4 files")).toBeInTheDocument();
+    expect(api.diff).toHaveBeenCalledWith("/repo", "p1", "merge");
+    expect(screen.queryByText("c.ts")).toBeNull();
+    fireEvent.click(screen.getByRole("button", { name: "All Parents" }));
+    fireEvent.click(await screen.findByRole("menuitemcheckbox", { name: "Parent 2: p2" }));
+    await waitFor(() => expect(api.diff).toHaveBeenLastCalledWith("/repo", "p2", "merge"));
+  });
+});
diff --git a/src/features/vcs/__tests__/logViews.test.tsx b/src/features/vcs/__tests__/logViews.test.tsx
new file mode 100644
index 00000000..d32a19e7
--- /dev/null
+++ b/src/features/vcs/__tests__/logViews.test.tsx
@@ -0,0 +1,142 @@
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@/platform/ipc", async (original) => {
+  const real = await original<typeof import("@/platform/ipc")>();
+  const empty = () => Promise.resolve({ status: "ok" as const, data: [] });
+  return {
+    ...real,
+    commands: {
+      ...real.commands,
+      vcsLog: empty,
+      vcsBranches: empty,
+      vcsBranchInfo: () => Promise.resolve({ status: "ok", data: { upstream: null } }),
+      vcsConfigGet: () => Promise.resolve({ status: "ok", data: null }),
+    },
+  };
+});
+
+import { LogScope } from "../LogScope";
+import { DEFAULT_LOG_OPTIONS, useLogOptions } from "../logOptions";
+import {
+  closeLogTab,
+  emptyFilters,
+  installGitLog,
+  openLogTab,
+  recentLogFilters,
+  reloadLog,
+  selectGitTab,
+  setLogBranches,
+  setLogFilters,
+  updateLogOptions,
+  useGitLog,
+} from "../logStore";
+import { useVcs } from "../store";
+
+beforeEach(() => {
+  localStorage.clear();
+  sessionStorage.clear();
+  useVcs.setState({ root: "/repo", repo: "/repo", roots: ["/repo"] });
+  useGitLog.setState({
+    shownLog: "log",
+    tab: "log",
+    logTabs: [],
+    commits: [],
+    rows: [],
+    filters: emptyFilters(),
+    selection: [],
+    selected: null,
+    done: true,
+    generation: useGitLog.getState().generation + 1,
+  });
+  useLogOptions.setState({ ...DEFAULT_LOG_OPTIONS });
+});
+
+afterEach(async () => {
+  for (const tab of useGitLog.getState().logTabs) closeLogTab(tab.id);
+  await reloadLog();
+});
+
+function Probe({ name }: { name: string }) {
+  const text = useGitLog((s) => s.filters.text);
+  const hash = useLogOptions((s) => s.showHash);
+  return <button onClick={() => setLogFilters({ text: `${name} edited` })}>{`${name}: ${text} / hash ${hash}`}</button>;
+}
+
+describe("independent log views", () => {
+  it("keeps both scopes visible and activates the target before applying an edit", async () => {
+    setLogFilters({ text: "main" });
+    const other = openLogTab("log", "Other");
+    setLogFilters({ text: "other" });
+    updateLogOptions({ showHash: true });
+    selectGitTab("log");
+    render(
+      <>
+        <LogScope id="log">
+          <Probe name="main" />
+        </LogScope>
+        <LogScope id={other}>
+          <Probe name="other" />
+        </LogScope>
+      </>,
+    );
+    expect(screen.getByText("main: main / hash false")).toBeInTheDocument();
+    expect(screen.getByText("other: other / hash true")).toBeInTheDocument();
+    const button = screen.getByText("other: other / hash true");
+    await act(async () => {
+      fireEvent.pointerDown(button);
+      fireEvent.click(button);
+    });
+    expect(useGitLog.getState().shownLog).toBe(other);
+    expect(screen.getByText("main: main / hash false")).toBeInTheDocument();
+    expect(screen.getByText("other: other edited / hash true")).toBeInTheDocument();
+  });
+
+  it("restores each tab's filters and options after leaving and reopening the project", async () => {
+    const off = installGitLog();
+    setLogFilters({ text: "main" });
+    const other = openLogTab("log", "Other");
+    setLogFilters({ paths: ["/repo/src"], branches: ["feature/.*"] });
+    useGitLog.setState({
+      fragments: {
+        expanded: new Set(["/repo\0expanded"]),
+        collapsed: new Set(["/repo\0collapsed"]),
+        merges: new Set(["/repo\0merge"]),
+      },
+      selected: "/repo\0expanded",
+      selection: ["/repo\0expanded"],
+    });
+    updateLogOptions({ showHash: true, diffLocation: "bottom" });
+    selectGitTab("log");
+    await reloadLog();
+    useVcs.setState({ root: "/another", repo: "/another", roots: ["/another"] });
+    useVcs.setState({ root: "/repo", repo: "/repo", roots: ["/repo"] });
+    expect(useGitLog.getState().filters.text).toBe("main");
+    expect(useGitLog.getState().fragments.expanded.size).toBe(0);
+    selectGitTab(other);
+    expect(useGitLog.getState().filters).toMatchObject({ paths: ["/repo/src"], branches: ["feature/.*"] });
+    expect(useLogOptions.getState()).toMatchObject({ showHash: true, diffLocation: "bottom" });
+    expect([...useGitLog.getState().fragments.expanded]).toEqual(["/repo\0expanded"]);
+    expect([...useGitLog.getState().fragments.collapsed]).toEqual(["/repo\0collapsed"]);
+    expect([...useGitLog.getState().fragments.merges]).toEqual(["/repo\0merge"]);
+    expect(useGitLog.getState().selection).toEqual(["/repo\0expanded"]);
+    off();
+  });
+
+  it("remembers branch-only filters and clears a range when a named branch replaces it", async () => {
+    setLogBranches(["main..feature"]);
+    await reloadLog();
+    expect(useGitLog.getState().filters).toMatchObject({ range: "main..feature", branches: [] });
+    setLogFilters({ branches: ["main"] });
+    await reloadLog();
+    expect(useGitLog.getState().filters.range).toBeNull();
+    setLogBranches(["feature"]);
+    await reloadLog();
+    expect(recentLogFilters()).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ branches: ["main"] }),
+        expect.objectContaining({ range: "main..feature" }),
+      ]),
+    );
+  });
+});
diff --git a/src/features/vcs/__tests__/multiRoot.test.ts b/src/features/vcs/__tests__/multiRoot.test.ts
index 0064e42d..b77558d6 100644
--- a/src/features/vcs/__tests__/multiRoot.test.ts
+++ b/src/features/vcs/__tests__/multiRoot.test.ts
@@ -71,6 +71,16 @@ beforeEach(() => {
 });
 
 describe("multi-root Git log", () => {
+  it("keeps filtered edge hints from both graph metadata formats", () => {
+    const row = { ...commit("tip"), repo: "/a", parents: ["real"], dashed: [true] };
+    expect(graphCommit(row)).toMatchObject({ parents: ["/a\0real"], dashed: [true], edgeTypes: ["filtered"] });
+    expect(graphCommit({ ...row, graphParents: ["visible"], graphDashed: [false] })).toMatchObject({
+      parents: ["/a\0visible"],
+      dashed: [false],
+      edgeTypes: ["normal"],
+    });
+  });
+
   it("merges streams by time without violating each root's topological order", () => {
     const child = { ...commit("child", 1), repo: "a", parents: ["parent"] };
     const parent = { ...commit("parent", 100), repo: "a" };
@@ -86,7 +96,7 @@ describe("multi-root Git log", () => {
     selectCommit(commitKey(front));
     expect(selectedCommits()).toEqual([front]);
     toggleCommitSelection(commitKey(back));
-    expect(selectedCommits()).toEqual([back]);
+    expect(selectedCommits()).toEqual([front, back]);
     expect(commitFileDiffData(back, { path: "main.ts", oldPath: null, kind: "added" }).path).toBe(
       "/project/back/main.ts",
     );
@@ -115,6 +125,30 @@ describe("multi-root Git log", () => {
     expect(rows.map((c) => c.timeMs)).toEqual([...rows.map((c) => c.timeMs)].sort((a, b) => b! - a!));
   });
 
+  it("does not mark native root pages complete before every fetched commit has been emitted", async () => {
+    const data = Object.fromEntries(
+      useVcs.getState().roots.map((repo, root) => [
+        repo,
+        Array.from({ length: 180 }, (_, i) => ({
+          ...commit(`${root}-${i}`, 10000 - i * 2 - root),
+          logPosition: i,
+          logTotal: 180,
+        })),
+      ]),
+    );
+    log.mockImplementation(async (repo: string, q: LogQuery) => ({
+      status: "ok",
+      data: data[repo]!.slice(q.skip, q.skip + q.limit),
+    }));
+    await reloadLog();
+    expect(useGitLog.getState().commits).toHaveLength(PAGE);
+    expect(useGitLog.getState().done).toBe(false);
+    await loadMore();
+    expect(useGitLog.getState().commits).toHaveLength(360);
+    expect(useGitLog.getState().done).toBe(true);
+    expect(new Set(useGitLog.getState().commits.map(commitKey)).size).toBe(360);
+  });
+
   it("filters repositories and keeps history tabs pinned when the selected root changes", async () => {
     log.mockImplementation(async () => ({ status: "ok", data: [commit("same")] }));
     useGitLog.setState({ filters: { ...emptyFilters(), repositories: ["/project/back"] } });
@@ -132,6 +166,14 @@ describe("multi-root Git log", () => {
     off();
   });
 
+  it("shows a submodule folder's own history, not the folder's history in the enclosing repository", () => {
+    useVcs.setState({ roots: ["/r", "/r/libs/core"] });
+    openLogTab("history", "/r/libs/core");
+    openLogTab("history", "/r/libs/core/src/Lib.kt");
+    openLogTab("history", "/r/libs");
+    expect(useGitLog.getState().logTabs.map((t) => t.repo)).toEqual(["/r/libs/core", "/r/libs/core", "/r"]);
+  });
+
   it("shows several repositories chosen one click at a time in the Repository filter", async () => {
     log.mockImplementation(async (repo: string) => ({ status: "ok", data: [commit(repo)] }));
     let repositories = toggleRepository(undefined, "/project/front");
diff --git a/src/features/vcs/__tests__/pushChanges.test.tsx b/src/features/vcs/__tests__/pushChanges.test.tsx
index 1cdbf94b..b400a332 100644
--- a/src/features/vcs/__tests__/pushChanges.test.tsx
+++ b/src/features/vcs/__tests__/pushChanges.test.tsx
@@ -12,7 +12,16 @@ vi.mock("@/platform/ipc", async (importOriginal) => {
 import { PushChanges } from "../PushChanges";
 
 const commit = (id: string, parent: string): Commit =>
-  ({ id, shortId: id.slice(0, 7), parents: [parent], summary: id, author: "me", timeMs: 0 }) as unknown as Commit;
+  ({
+    id,
+    shortId: id.slice(0, 7),
+    parents: [parent],
+    summary: id,
+    message: id,
+    author: "me",
+    email: "me@example.com",
+    timeMs: 0,
+  }) as unknown as Commit;
 const newer = commit("bbbbbbbbbb", "aaaaaaaaaa");
 const older = commit("aaaaaaaaaa", "9999999999");
 
@@ -41,4 +50,36 @@ describe("Push dialog changes", () => {
     fireEvent.click(screen.getByRole("button", { name: "Show All Commits" }));
     expect(showAll).toHaveBeenCalled();
   });
+
+  it("shows the selected commit's message and author, and lists files flat on request", async () => {
+    localStorage.clear();
+    files.mockResolvedValue({
+      status: "ok",
+      data: [{ path: "src/orders/service.py", oldPath: null, kind: "added" }],
+    });
+    const one = { ...older, message: "Add order service\n\nIntroduces the service.\n", timeMs: 1_700_000_000_000 };
+    render(<PushChanges repo="/r" commits={[one]} />);
+    const details = screen.getByRole("region", { name: "Commit details" });
+    expect(details.textContent).toContain("Add order service\n\nIntroduces the service.");
+    expect(details.textContent).toContain("aaaaaaa me <me@example.com> on ");
+    expect(await screen.findByText("src/orders")).toBeTruthy();
+    expect(screen.getAllByRole("treeitem")).toHaveLength(2);
+    const grouping = screen.getByRole("button", { name: "Group by Directory" });
+    expect(grouping.getAttribute("aria-pressed")).toBe("true");
+    fireEvent.click(grouping);
+    expect(grouping.getAttribute("aria-pressed")).toBe("false");
+    // Flat: one row, the file, with its directory beside the name.
+    const rows = screen.getAllByRole("treeitem");
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.textContent).toContain("service.py");
+    expect(rows[0]!.textContent).toContain("src/orders");
+    expect(localStorage.getItem("openidea.vcs.push.groupByDirectory")).toBe("false");
+  });
+
+  it("shows no commit details for several commits", async () => {
+    combined.mockResolvedValue({ status: "ok", data: [] });
+    render(<PushChanges repo="/r" commits={[newer, older]} />);
+    expect(await screen.findByText(/0 files in 2 commits/)).toBeTruthy();
+    expect(screen.queryByRole("region", { name: "Commit details" })).toBeNull();
+  });
 });
diff --git a/src/features/vcs/__tests__/selectionHistory.test.tsx b/src/features/vcs/__tests__/selectionHistory.test.tsx
new file mode 100644
index 00000000..50f81fbd
--- /dev/null
+++ b/src/features/vcs/__tests__/selectionHistory.test.tsx
@@ -0,0 +1,136 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { EditorState } from "@codemirror/state";
+import type { BlockHistory, BlockRevision } from "@/bindings";
+
+const vcsBlockHistory = vi.fn();
+const cancelRequest = vi.fn();
+
+vi.mock("@/platform/ipc", async (importOriginal) => {
+  const real = await importOriginal<typeof import("@/platform/ipc")>();
+  return {
+    ...real,
+    isTauri: () => true,
+    commands: {
+      ...real.commands,
+      vcsBlockHistory: (...args: unknown[]) => vcsBlockHistory(...args),
+      cancelRequest: (id: number) => cancelRequest(id),
+    },
+  };
+});
+vi.mock("../DiffEditor", () => ({
+  DiffEditor: ({
+    input,
+  }: {
+    input: { data: { left: { label: string; text: string }; right: { label: string; text: string } } };
+  }) => (
+    <div data-testid="diff">
+      {`${input.data.left.label}: ${input.data.left.text}| ${input.data.right.label}: ${input.data.right.text}`}
+    </div>
+  ),
+}));
+
+import { SelectionHistoryEditor, blockOf, historyRows } from "../SelectionHistory";
+import { selectedLines, selectionHistoryInput, type SelectionHistoryData } from "../selectionHistoryKind";
+
+const revision = (id: string, summary: string, before: string, after: string): BlockRevision => ({
+  id: id.repeat(40),
+  shortId: id.repeat(7),
+  author: "Ada",
+  email: "ada@example.com",
+  timeMs: 1_700_000_000_000,
+  summary,
+  path: "src/a.txt",
+  before,
+  after,
+  beforeLine: 1,
+  afterLine: 1,
+});
+
+const TEXT = "one\nTWO\nTHREE\nfour\n";
+const history: BlockHistory = {
+  headLines: [1, 2],
+  revisions: [
+    revision("a", "Shout three", "TWO\nthree\n", "TWO\nTHREE\n"),
+    revision("b", "Shout two", "two\nthree\n", "TWO\nthree\n"),
+  ],
+};
+const ok = (data: unknown) => Promise.resolve({ status: "ok", data });
+
+function open(data: SelectionHistoryData) {
+  return render(<SelectionHistoryEditor input={selectionHistoryInput(data)} />);
+}
+
+beforeEach(() => {
+  vcsBlockHistory.mockReset();
+  cancelRequest.mockReset().mockReturnValue(ok(null));
+});
+
+describe("selected lines", () => {
+  const doc = EditorState.create({ doc: "zero\none\ntwo\nthree\n" }).doc;
+  it.each([
+    ["the caret line without a selection", 6, 6, [1, 1]],
+    ["every line the selection touches", 7, 11, [1, 2]],
+    ["a selection backwards", 11, 7, [1, 2]],
+    ["not the line a selection ends at the start of", 5, 13, [1, 2]],
+    ["the line itself when selecting just its start", 9, 9, [2, 2]],
+  ])("%s", (_, from, to, expected) => {
+    expect(selectedLines(doc, Math.min(from, to), Math.max(from, to))).toEqual(expected);
+  });
+});
+
+describe("rows", () => {
+  it("cuts the block out of the text as Git prints it", () => {
+    expect(blockOf(TEXT, [1, 2])).toBe("TWO\nTHREE\n");
+    expect(blockOf("a\r\nb\r\n", [0, 1])).toBe("a\nb\n");
+  });
+
+  it("lists Local Changes only when the block differs from HEAD", () => {
+    expect(historyRows(history, "TWO\nTHREE\n").map((r) => r.kind)).toEqual(["revision", "revision"]);
+    const edited = historyRows(history, "TWO\nTHREE!\n");
+    expect(edited[0]).toEqual({ kind: "local", head: "TWO\nTHREE\n", current: "TWO\nTHREE!\n" });
+    expect(edited).toHaveLength(3);
+    expect(historyRows({ headLines: null, revisions: [] }, "new\n")).toEqual([]);
+  });
+});
+
+describe("History for Selection tab", () => {
+  it("asks for the selected lines of the editor's text and diffs each commit's block", async () => {
+    vcsBlockHistory.mockReturnValue(ok(history));
+    open({ path: "/p/src/a.txt", lines: [1, 2], text: "one\nTWO\nTHREE!\nfour\n" });
+    await screen.findByText("Shout three");
+    const [request, path, text, lines] = vcsBlockHistory.mock.calls[0]!;
+    expect([typeof request, path, text, lines]).toEqual(["number", "/p/src/a.txt", "one\nTWO\nTHREE!\nfour\n", [1, 2]]);
+    expect(screen.getByText("a.txt:2-3")).toBeTruthy();
+    // The unsaved edit comes first, against HEAD's block.
+    expect(screen.getByTestId("diff").textContent).toBe("HEAD: TWO\nTHREE\n| Local Changes: TWO\nTHREE!\n");
+    fireEvent.click(screen.getByText("Shout two"));
+    await waitFor(() =>
+      expect(screen.getByTestId("diff").textContent).toBe("bbbbbbb^: two\nthree\n| bbbbbbb: TWO\nthree\n"),
+    );
+    expect(screen.getByText(/^bbbbbbb · Ada · /)).toBeTruthy();
+  });
+
+  it("says why there is nothing to show", async () => {
+    vcsBlockHistory.mockReturnValue(ok({ headLines: null, revisions: [] }));
+    const { unmount } = open({ path: "/p/a.txt", lines: [0, 0], text: "new\n" });
+    await screen.findByText("These lines are not committed yet");
+    unmount();
+    vcsBlockHistory.mockReturnValue(ok({ headLines: [0, 0], revisions: [] }));
+    open({ path: "/p/a.txt", lines: [0, 0], text: "old\n" });
+    await screen.findByText("No commits changed these lines");
+  });
+
+  it("shows Git's error and cancels a request still running when closed", async () => {
+    vcsBlockHistory.mockReturnValueOnce(
+      Promise.resolve({ status: "error", error: { kind: "internal", message: "fatal: bad range" } }),
+    );
+    const { unmount } = open({ path: "/p/a.txt", lines: [0, 0], text: "x\n" });
+    await screen.findByText(/fatal: bad range/);
+    unmount();
+    expect(cancelRequest).not.toHaveBeenCalled();
+    vcsBlockHistory.mockReturnValue(new Promise(() => {}));
+    open({ path: "/p/a.txt", lines: [0, 0], text: "x\n" }).unmount();
+    expect(cancelRequest).toHaveBeenCalledWith(vcsBlockHistory.mock.calls.at(-1)![0]);
+  });
+});
diff --git a/src/features/vcs/actions.tsx b/src/features/vcs/actions.tsx
index 2edcfb40..03211965 100644
--- a/src/features/vcs/actions.tsx
+++ b/src/features/vcs/actions.tsx
@@ -33,6 +33,7 @@ import { useChangelists } from "./changelists";
 import { openDialog } from "./dialogs";
 import { gotoChange, rollbackSelectedLines } from "./gutter";
 import { openLocalHistory } from "./localHistoryKind";
+import { showSelectionHistory } from "./selectionHistoryKind";
 import { openLogTab, revealCommit, selectGitTab, useGitLog } from "./logStore";
 import { isModalCommit, openCommit, pushAfterCommit } from "./commitUi";
 import { allRepos, runRemote } from "./ops";
@@ -472,6 +473,15 @@ export function registerVcsActions(): () => void {
         showGitWindow();
       },
     },
+    {
+      id: "vcs.showHistoryForSelection",
+      title: "Show History for Selection",
+      category: "Git",
+      icon: "history",
+      when: `${VCS} && textEditorActive`,
+      keywords: ["line history", "block history", "git log -L"],
+      run: () => showSelectionHistory(),
+    },
     {
       id: "vcs.showCommit",
       title: "Show Commit in Git Log",
diff --git a/src/features/vcs/branchOps.ts b/src/features/vcs/branchOps.ts
index 6bd3f894..ab8c294c 100644
--- a/src/features/vcs/branchOps.ts
+++ b/src/features/vcs/branchOps.ts
@@ -156,10 +156,12 @@ export async function newBranch(from?: string) {
   const r = await promptText({
     title: from ? tx`Create New Branch from ${from}` : "Create New Branch",
     label: "New branch name:",
-    initial: suggestion && !validateBranchName(suggestion) ? suggestion : "",
+    // Kept even when that branch exists (the current one always does): the user edits it.
+    initial: suggestion,
     mono: true,
     okLabel: "Create",
     validate: validateBranchName,
+    validateInitial: true,
     checkbox: { label: "Checkout branch", initial: true },
   });
   if (!r) return;
@@ -371,6 +373,7 @@ export async function newBranchInRepos(roots: readonly string[], from?: string)
     mono: true,
     okLabel: "Create",
     validate: validateBranchName,
+    validateInitial: true,
     checkbox: { label: "Checkout branch", initial: true },
   });
   if (!r) return;
diff --git a/src/features/vcs/changeOps.tsx b/src/features/vcs/changeOps.tsx
index a50adc30..3a2ad7a0 100644
--- a/src/features/vcs/changeOps.tsx
+++ b/src/features/vcs/changeOps.tsx
@@ -9,6 +9,7 @@ import { useChangelists, withListDefaults } from "./changelists";
 import { runCommitChecks } from "./commitChecks";
 import { forgetAmendDraft, keepMessageAfterCommit, rememberMessage, useCommit } from "./commitStore";
 import { workflowSettings } from "@/platform/workflowSettings";
+import { notifyFileOperation } from "@/platform/fileOps";
 import { confirmDialog, openDialog } from "./dialogs";
 import { hunkKeys } from "./hunks";
 import { KIND_COLOR, baseName, dirName, effectiveKind, relTo, rootOf, stripSlash } from "./model";
@@ -144,6 +145,31 @@ async function partialCommitFiles(paths: readonly string[]): Promise<{ files: Pa
   return { files, whole };
 }
 
+/** Delete… on unversioned files in the Changes view, as in IDEA: they move to the Trash. */
+export async function deleteUnversioned(paths: readonly string[]) {
+  if (!paths.length) return;
+  const question = paths.length === 1 ? tx`Delete '${baseName(paths[0]!)}'?` : tx`Delete ${paths.length} items?`;
+  const ok = await confirmDialog({
+    title: "Delete",
+    okLabel: "Delete",
+    danger: true,
+    message: (
+      <>
+        {question}
+        <br />
+        <T>Items are moved to the Trash.</T>
+      </>
+    ),
+  });
+  if (!ok) return;
+  await runOp("Delete", async () => {
+    for (const path of paths) {
+      await call(commands.fsDelete(path));
+      notifyFileOperation({ kind: "deleted", paths: [path] });
+    }
+  });
+}
+
 /** Files the Rollback action applies to by default. */
 export function rollbackCandidates(
   paths?: readonly string[],
@@ -260,7 +286,7 @@ function RollbackDialog({ files, onClose }: { files: FileStatus[]; onClose: () =
                   })
                 }
               />
-              <Icon name={fileIconName(baseName(f.path))} size={14} />
+              <Icon name={fileIconName(baseName(f.path), f.path)} size={14} />
               <span className={styles.fileName} style={{ color: KIND_COLOR[kind] }}>
                 {baseName(f.path)}
               </span>
diff --git a/src/features/vcs/commitStore.ts b/src/features/vcs/commitStore.ts
index aa0536c7..968371ea 100644
--- a/src/features/vcs/commitStore.ts
+++ b/src/features/vcs/commitStore.ts
@@ -180,6 +180,7 @@ export function keepMessageAfterCommit(committed: string, clear: boolean) {
   const message = messageAfterCommit(committed, clear);
   keptMessage = message || null;
   useCommit.setState({ message });
+  if (!message) void loadTemplate();
 }
 
 /** The field holds nothing the user typed: empty, or what the last commit left there. */
@@ -200,9 +201,35 @@ export function preparedMessageText(raw: string): string {
     .trim();
 }
 
+/** `commit.template` resolved as git does: `~/` in the home directory, a relative path in the repository. */
+export function templatePath(value: string, root: string, home: string): string {
+  if (value === "~" || value.startsWith("~/")) return home.replace(/[/\\]$/, "") + value.slice(1);
+  if (value.startsWith("/") || /^[A-Za-z]:[\\/]/.test(value)) return value;
+  return `${root}/${value}`;
+}
+
+/** Fills an empty message field with the repository's commit template (`commit.template`), without its `#` lines. */
+async function loadTemplate() {
+  const root = useVcs.getState().root;
+  if (!root || useCommit.getState().message.trim()) return;
+  try {
+    const value = await call(commands.vcsConfigGet(root, "commit.template"));
+    if (!value) return;
+    const home = value.startsWith("~") ? await (await import("@tauri-apps/api/path")).homeDir() : "";
+    const text = preparedMessageText(await call(commands.fsReadText(templatePath(value, root, home))));
+    if (!text || useVcs.getState().root !== root || useCommit.getState().message.trim()) return;
+    // Not typed: a prepared merge message may replace it.
+    keptMessage = text;
+    useCommit.setState({ message: text });
+  } catch {
+    // No readable template: the field stays empty.
+  }
+}
+
 /**
  * Like IDEA, pre-fills the commit message (unless something was typed) with the
- * message git prepared for a merge / cherry-pick / revert that stopped (e.g. on conflicts).
+ * message git prepared for a merge / cherry-pick / revert that stopped (e.g. on conflicts),
+ * otherwise with the commit template.
  */
 export function installPreparedMessage(): () => void {
   const load = async () => {
@@ -217,6 +244,7 @@ export function installPreparedMessage(): () => void {
   };
   const op = (s = useVcs.getState()) => s.branch?.operation ?? null;
   if (PREPARED_MESSAGE_OPS.has(op() ?? "")) void load();
+  else void loadTemplate();
   return useVcs.subscribe((s, prev) => {
     if (s.root !== prev.root) {
       // Another repository: nothing typed or ticked for the previous one carries over (Amend least of all).
@@ -233,6 +261,7 @@ export function installPreparedMessage(): () => void {
         selectedShelf: null,
       });
       if (PREPARED_MESSAGE_OPS.has(op(s) ?? "")) void load();
+      else void loadTemplate();
       return;
     }
     const now = op(s);
diff --git a/src/features/vcs/common.module.css b/src/features/vcs/common.module.css
index 34685628..cadf6f9d 100644
--- a/src/features/vcs/common.module.css
+++ b/src/features/vcs/common.module.css
@@ -143,6 +143,27 @@
   padding: 0 14px 6px;
   color: var(--fg-subtle);
 }
+.pushGrouping {
+  margin-left: auto;
+}
+.pushCommitDetails {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  max-height: 96px;
+  margin: 0 14px 8px;
+  padding: 6px 8px;
+  overflow: auto;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-small);
+  -webkit-user-select: text;
+  user-select: text;
+}
+.pushCommitMessage {
+  color: var(--fg-strong);
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
 .todoList {
   margin: 8px 0 0;
   padding-left: 18px;
@@ -280,6 +301,64 @@
   background: var(--bg-list-selected);
 }
 
+.comparisonDialog > [data-dialog-body] {
+  display: flex;
+  flex-direction: column;
+}
+.comparisonDialog .comparison {
+  flex: 1 1 auto;
+}
+.comparisonWindow {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  min-height: 0;
+  background: var(--bg-dialog, var(--bg-elev));
+  color: var(--fg);
+}
+/* Linux: frameless X11 windows have no shadow, so mark the edge in CSS (like the Settings window). */
+.comparisonWindowEdge {
+  position: relative;
+}
+.comparisonWindowEdge::after {
+  content: "";
+  position: absolute;
+  inset: 0;
+  z-index: 1;
+  pointer-events: none;
+  box-shadow: inset 0 0 0 1px var(--border-window);
+}
+.comparisonWindowLoading {
+  display: flex;
+  flex: 1;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: var(--fg-muted);
+}
+.comparisonWindowBody {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+}
+.comparisonWindowBody[hidden] {
+  display: none;
+}
+.comparisonWindowBody > .comparisonWindow {
+  flex: 1;
+}
+.comparisonWindowBody > .comparison {
+  flex: 1 1 auto;
+}
+.comparisonWindowFooter {
+  display: flex;
+  justify-content: flex-end;
+  flex: none;
+  gap: 12px;
+  padding: 12px 16px;
+}
 .comparison {
   display: flex;
   height: min(520px, 65vh);
diff --git a/src/features/vcs/conflictsUi.tsx b/src/features/vcs/conflictsUi.tsx
index 2777e3ea..caf743b6 100644
--- a/src/features/vcs/conflictsUi.tsx
+++ b/src/features/vcs/conflictsUi.tsx
@@ -126,7 +126,7 @@ function ConflictsDialog({ onClose }: { onClose: () => void }) {
           }}
           renderItem={(f) => (
             <span className={styles.fileRow} style={{ flex: 1, padding: 0 }}>
-              <Icon name={fileIconName(baseName(f.path))} size={14} />
+              <Icon name={fileIconName(baseName(f.path), f.path)} size={14} />
               <span className={styles.fileName} style={{ color: "var(--vcs-conflict)" }}>
                 {baseName(f.path)}
               </span>
diff --git a/src/features/vcs/dialogs.tsx b/src/features/vcs/dialogs.tsx
index 401c0236..45a34a56 100644
--- a/src/features/vcs/dialogs.tsx
+++ b/src/features/vcs/dialogs.tsx
@@ -43,6 +43,8 @@ export interface PromptOptions {
   mono?: boolean;
   /** Returns an error message, or null when valid. */
   validate?: (value: string) => string | null;
+  /** Show the prefilled value's problem (e.g. the branch exists) before it is edited. */
+  validateInitial?: boolean;
   /** Optional checkbox below the field. */
   checkbox?: { label: string; initial: boolean };
 }
@@ -70,7 +72,7 @@ function PromptDialog(props: PromptOptions & { onDone: (r: PromptResult | null)
   const { title, label, initial = "", placeholder, okLabel = "OK", mono, validate, checkbox, onDone } = props;
   const [value, setValue] = useState(initial);
   const [checked, setChecked] = useState(checkbox?.initial ?? false);
-  const [touched, setTouched] = useState(false);
+  const [touched, setTouched] = useState(!!props.validateInitial && initial !== "");
   const error = validate ? validate(value) : value.trim() ? null : "Value must not be empty";
   const submit = () => {
     setTouched(true);
diff --git a/src/features/vcs/diff-editor-tab.tsx b/src/features/vcs/diff-editor-tab.tsx
index 12f19afb..5f9779a8 100644
--- a/src/features/vcs/diff-editor-tab.tsx
+++ b/src/features/vcs/diff-editor-tab.tsx
@@ -3,9 +3,11 @@ import { hideAllToolWindows, useToolWindowLayout } from "@/workbench/toolwindows
 import { shortcutLabel } from "@/platform/keymap";
 import { IconButton } from "@/ui";
 import { DiffEditor } from "./DiffEditor";
+import type { DiffData } from "./diffInput";
 
 export function DiffEditorTab({ input }: { input: EditorInput }) {
   const maximized = useToolWindowLayout((state) => !!state.stashed && !Object.values(state.visible).some(Boolean));
+  if ((input.data as DiffData).embedded) return <DiffEditor input={input} />;
   return (
     <DiffEditor
       input={input}
diff --git a/src/features/vcs/diffInput.ts b/src/features/vcs/diffInput.ts
index 861bc714..cea3a56d 100644
--- a/src/features/vcs/diffInput.ts
+++ b/src/features/vcs/diffInput.ts
@@ -55,6 +55,10 @@ export interface DiffData {
    * pull request's file: `{ kind: "github.pullRequest", number: 12, path: "src/a.ts" }`. Plain JSON.
    */
   context?: { kind: string; [key: string]: unknown };
+  /** Shown inside another view (deployment comparison), not as an editor tab: no tab controls. */
+  embedded?: boolean;
+  /** Show the sides this way at first instead of the saved mode, which it leaves unchanged. */
+  mode?: "split" | "unified";
 }
 
 export const DIFF_KIND = "diff";
diff --git a/src/features/vcs/gitTabs.ts b/src/features/vcs/gitTabs.ts
index 4e5de84c..1e914c82 100644
--- a/src/features/vcs/gitTabs.ts
+++ b/src/features/vcs/gitTabs.ts
@@ -54,7 +54,9 @@ export function gitTabs(input: GitTabsInput): ContentTab[] {
   return [
     ...(input.modal ? [{ id: "changes", label: "Local Changes" }, ...stashTabs(input)] : []),
     { id: "log", label: "Log" },
-    ...input.logTabs.map((t) => ({ id: t.id, label: logTabLabel(t), closable: true })),
+    ...input.logTabs
+      .filter((t) => t.location !== "editor")
+      .map((t) => ({ id: t.id, label: logTabLabel(t), closable: true })),
     { id: "console", label: "Console" },
     { id: "worktrees", label: "Worktrees" },
   ];
diff --git a/src/features/vcs/graph.ts b/src/features/vcs/graph.ts
index 9659a81d..1f160952 100644
--- a/src/features/vcs/graph.ts
+++ b/src/features/vcs/graph.ts
@@ -4,7 +4,12 @@
  * transformations of the log's Graph / View options.
  */
 
+export type EdgeKind = "normal" | "filtered" | "collapsed" | "shallow" | "unloaded";
+
 export interface GraphSegment {
+  edge?: string;
+  kind?: EdgeKind;
+  source?: string;
   /** Lane at the segment's start (top edge for `up`, node level for `down`). */
   from: number;
   /** Lane at the segment's end (node level for `up`, bottom edge for `down`). */
@@ -14,9 +19,15 @@ export interface GraphSegment {
   dashed?: true;
   /** A long edge continues out of sight in this direction (Show Long Edges off). */
   arrow?: "up" | "down";
+  /** Destination row of a long-edge arrow in the displayed graph. */
+  targetRow?: number;
+  /** Drawn lane positions when they differ from `from` / `to` (see {@link straightenLaneChanges}). */
+  fromX?: number;
+  toX?: number;
 }
 
 export interface GraphRow {
+  id?: string;
   /** Lane of the commit's node. */
   lane: number;
   color: number;
@@ -26,10 +37,15 @@ export interface GraphRow {
   down: GraphSegment[];
   /** Number of lane slots this row spans. */
   width: number;
+  /** Graph ids corresponding to each half-edge, for fragment actions. */
+  upTargets?: string[];
+  downTargets?: string[];
 }
 
 interface Lane {
   id: string;
+  source?: string;
+  kind?: EdgeKind;
   color: number;
   dashed?: true;
 }
@@ -44,6 +60,9 @@ export interface GraphCommit {
   parents: readonly string[];
   /** Per parent: the link skips collapsed commits. */
   dashed?: readonly boolean[];
+  refs?: readonly string[];
+  remoteNames?: readonly string[];
+  edgeTypes?: readonly ("normal" | "filtered" | "collapsed" | "shallow" | "unloaded")[];
 }
 
 export const emptyGraphState = (): GraphState => ({ lanes: [], nextColor: 0 });
@@ -68,6 +87,21 @@ export function computeGraph(
   state: GraphState = emptyGraphState(),
 ): { rows: GraphRow[]; state: GraphState } {
   const lanes = [...state.lanes];
+  const track = commits.some((c) => c.refs !== undefined);
+  const positions = new Map(commits.map((c, i) => [c.id, i]));
+  const layout = graphLayout(commits);
+  const refAware = commits.some((c) => c.refs?.length);
+  const stableColor = (id: string, fallback: number) => {
+    if (!refAware) return fallback;
+    const index = positions.get(id);
+    const owner = index == null ? id : layout.owners[index]!;
+    let hash = 2166136261;
+    for (const char of owner) hash = Math.imul(hash ^ char.charCodeAt(0), 16777619);
+    return hash >>> 0;
+  };
+  const describe = (s: GraphSegment, lane: Lane) =>
+    track ? { ...s, edge: `${lane.source ?? ""}\0${lane.id}`, source: lane.source, kind: lane.kind } : s;
+
   let nextColor = state.nextColor;
   const rows: GraphRow[] = [];
 
@@ -82,48 +116,89 @@ export function computeGraph(
       lane = matching[0]!;
       color = lanes[lane]!.color;
     } else {
-      lane = firstFree(lanes);
-      color = nextColor++;
+      const preferred = refAware ? Math.max(0, layout.layout[positions.get(c.id)!]! - 1) : firstFree(lanes);
+      lane = !lanes[preferred] ? preferred : firstFree(lanes);
+      color = stableColor(c.id, nextColor++);
     }
     const widthBefore = lanes.length;
 
     const up: GraphSegment[] = [];
+    const upTargets: string[] = [];
     lanes.forEach((l, i) => {
       if (!l) return;
-      up.push(seg(i, l.id === c.id ? lane : i, l.color, l.dashed));
+      up.push(describe(seg(i, l.id === c.id ? lane : i, l.color, l.dashed), l));
+      upTargets.push(l.id);
     });
     for (const m of matching) lanes[m] = null;
     if (lane >= lanes.length) lanes.length = lane + 1;
     lanes[lane] = null;
 
     const down: GraphSegment[] = [];
+    const downTargets: string[] = [];
     lanes.forEach((l, i) => {
-      if (l) down.push(seg(i, i, l.color, l.dashed));
+      if (l) {
+        down.push(describe(seg(i, i, l.color, l.dashed), l));
+        downTargets.push(l.id);
+      }
     });
 
     c.parents.forEach((p, k) => {
       const dashed = !!c.dashed?.[k];
+      const kind = c.edgeTypes?.[k] ?? (dashed ? "filtered" : "normal");
+      const info = {
+        id: p,
+        source: c.id,
+        kind: !positions.has(p) && kind !== "shallow" ? ("unloaded" as const) : kind,
+      };
+      if (track && kind === "shallow") {
+        down.push({
+          ...describe(seg(lane, lane, color, dashed), { ...info, color }),
+          kind: kind === "shallow" ? "shallow" : "unloaded",
+          arrow: "down",
+          targetRow: -1,
+        });
+        downTargets.push(p);
+        return;
+      }
       // The first parent continues this lane even if another lane also leads to it
       // (both lines then converge at the parent's node, like `git log --graph`).
       if (k === 0) {
-        lanes[lane] = laneOf(p, color, dashed);
-        down.push(seg(lane, lane, color, dashed));
+        lanes[lane] = { ...laneOf(p, color, dashed), ...info };
+        down.push(describe(seg(lane, lane, color, dashed), { ...info, color }));
+        downTargets.push(p);
         return;
       }
       const existing = lanes.findIndex((l) => l?.id === p);
       if (existing >= 0) {
-        down.push(seg(lane, existing, lanes[existing]!.color, dashed));
+        down.push(
+          describe(seg(lane, existing, lanes[existing]!.color, dashed), { ...info, color: lanes[existing]!.color }),
+        );
+        downTargets.push(p);
         return;
       }
       const slot = firstFree(lanes);
-      const col = nextColor++;
-      lanes[slot] = laneOf(p, col, dashed);
-      down.push(seg(lane, slot, col, dashed));
+      const col = stableColor(p, nextColor++);
+      lanes[slot] = { ...laneOf(p, col, dashed), ...info };
+      down.push(describe(seg(lane, slot, col, dashed), { ...info, color: col }));
+      downTargets.push(p);
     });
 
     while (lanes.length && lanes[lanes.length - 1] === null) lanes.pop();
-    const widthAfter = Math.max(0, ...down.map((s) => s.to + 1));
-    rows.push({ lane, color, up, down, width: Math.max(widthBefore, widthAfter, lane + 1) });
+    const widthAfter = down.reduce((width, segment) => Math.max(width, segment.to + 1), 0);
+    rows.push({
+      ...(track ? { id: c.id } : {}),
+      lane,
+      color,
+      up,
+      down,
+      upTargets,
+      downTargets,
+      width: Math.max(widthBefore, widthAfter, lane + 1),
+    });
+  }
+  if (track && rows.length) {
+    const last = rows.at(-1)!;
+    last.down = last.down.map((s) => (s.kind === "unloaded" ? { ...s, arrow: "down", targetRow: -1 } : s));
   }
   return { rows, state: { lanes, nextColor } };
 }
@@ -134,13 +209,28 @@ export function computeGraph(
  * linked by dashed edges. Commits in `keep` (HEAD) stay visible.
  */
 export function collapseLinear<
-  C extends { id: string; parents: readonly string[]; refs: readonly string[]; dashed?: readonly boolean[] },
->(commits: readonly C[], keep: ReadonlySet<string>): { commits: C[]; graph: GraphCommit[] } {
+  C extends {
+    id: string;
+    parents: readonly string[];
+    refs: readonly string[];
+    dashed?: readonly boolean[];
+    edgeTypes?: readonly EdgeKind[];
+  },
+>(
+  commits: readonly C[],
+  keep: ReadonlySet<string>,
+  only?: ReadonlySet<string>,
+): { commits: C[]; graph: GraphCommit[] } {
   const byId = new Map(commits.map((c) => [c.id, c]));
   const children = new Map<string, number>();
   for (const c of commits) for (const p of c.parents) children.set(p, (children.get(p) ?? 0) + 1);
   const hidden = (c: C | undefined): boolean =>
-    !!c && c.parents.length === 1 && children.get(c.id) === 1 && !c.refs.length && !keep.has(c.id);
+    !!c &&
+    c.parents.length === 1 &&
+    children.get(c.id) === 1 &&
+    !c.refs.length &&
+    !keep.has(c.id) &&
+    (!only || only.has(c.id));
 
   const visible: C[] = [];
   const graph: GraphCommit[] = [];
@@ -148,14 +238,16 @@ export function collapseLinear<
     if (hidden(c)) continue;
     const dashed: boolean[] = [];
     const parents: string[] = [];
+    const edgeTypes: EdgeKind[] = [];
     for (const [i, p] of c.parents.entries()) {
       let cur = p;
-      // A filter may already link past hidden commits.
-      let skipped = c.dashed?.[i] ?? false;
+      let skipped = !!c.dashed?.[i];
+      let kind = c.edgeTypes?.[i] ?? (skipped ? "filtered" : "normal");
       for (let next = byId.get(cur), guard = 0; next && guard < commits.length && hidden(next); guard++) {
         cur = next.parents[0]!;
         next = byId.get(cur);
         skipped = true;
+        kind = "collapsed";
       }
       // Two collapsed lines can lead to the same commit: draw one edge.
       const seen = parents.indexOf(cur);
@@ -163,10 +255,11 @@ export function collapseLinear<
       else {
         parents.push(cur);
         dashed.push(skipped);
+        edgeTypes.push(kind);
       }
     }
     visible.push(c);
-    graph.push(dashed.some(Boolean) ? { id: c.id, parents, dashed } : { id: c.id, parents });
+    graph.push({ ...c, id: c.id, parents, dashed, edgeTypes });
   }
   return { commits: visible, graph };
 }
@@ -183,8 +276,184 @@ export function reachableFrom(
   return out;
 }
 
-/** Edges running straight through at least this many rows are long. */
-export const LONG_EDGE = 30;
+/** Ref-priority DFS layout, shared by Bek fragment recognition and lane colours.
+ * Adapted from IntelliJ GraphLayoutBuilder (JetBrains contributors, Apache-2.0). */
+export function graphLayout(commits: readonly GraphCommit[]) {
+  const positions = new Map(commits.map((c, i) => [c.id, i]));
+  const parents = commits.map((c) =>
+    c.parents.flatMap((id) => {
+      const i = positions.get(id);
+      return i == null ? [] : [i];
+    }),
+  );
+  const children = commits.map(() => [] as number[]);
+  parents.forEach((ps, i) => ps.forEach((p) => children[p]!.push(i)));
+  const refRank = (c: GraphCommit, ref: string) =>
+    `${ref === "HEAD" ? 0 : ref === "main" || ref === "master" ? 1 : ref.startsWith("tag: ") ? 4 : c.remoteNames?.includes(ref) ? 3 : 2}${ref}`;
+  const priority = (i: number) =>
+    commits[i]!.refs?.length ? commits[i]!.refs!.map((r) => refRank(commits[i]!, r)).sort()[0]! : `5${commits[i]!.id}`;
+  const heads = commits
+    .flatMap((c, i) => (!children[i]!.length || c.refs?.length ? [i] : []))
+    .sort((a, b) => priority(a).localeCompare(priority(b)));
+  const layout = commits.map(() => 0);
+  const owners = commits.map(() => "");
+  let next = 1;
+  for (const head of heads) {
+    if (layout[head]) continue;
+    const owner =
+      commits[head]!.refs?.filter((r) => r !== "HEAD").sort((a, b) =>
+        refRank(commits[head]!, a).localeCompare(refRank(commits[head]!, b)),
+      )[0] ?? (commits[head]!.refs?.includes("HEAD") ? "HEAD" : commits[head]!.id);
+    const startLayout = next;
+    const stack = [head];
+    while (stack.length) {
+      const node = stack.at(-1)!;
+      const first = !layout[node];
+      if (first) {
+        layout[node] = next;
+        owners[node] = `${owner}\0${next - startLayout}`;
+      }
+      const parent = parents[node]!.find((p) => !layout[p]);
+      if (parent != null) stack.push(parent);
+      else {
+        if (first) next++;
+        stack.pop();
+      }
+    }
+  }
+  return { layout, owners, parents, children };
+}
+
+/** LinearBek fragment recognition and nested expansion.
+ * Adapted from JetBrains LinearBekGraphBuilder, Copyright 2000-2025, Apache-2.0. */
+export function linearizeMerges(commits: readonly GraphCommit[], expanded: ReadonlySet<string> = new Set()) {
+  const positions = new Map(commits.map((c, i) => [c.id, i]));
+  const { layout } = graphLayout(commits);
+  const expand = new Set(expanded);
+  const build = () => {
+    const graph = commits.map((c) => ({
+      ...c,
+      parents: [...c.parents],
+      dashed: c.parents.map((_, i) => !!c.dashed?.[i]),
+    }));
+    const fragments = new Map<string, string>();
+    const nodes = new Map<string, Set<string>>();
+    for (let merge = graph.length - 1; merge >= 0; merge--) {
+      const down = graph[merge]!.parents.flatMap((p) => {
+        const i = positions.get(p);
+        return i == null ? [] : [i];
+      }).sort((a, b) => a - b);
+      if (down.length !== 2 || graph[merge]!.parents.length !== 2) continue;
+      const [right, left] = down as [number, number];
+      const body = new Set<number>(),
+        tails = new Set<number>();
+      const tailEdges = new Map<number, Set<string>>();
+      const queue: Array<{ up: number; down: number | undefined; id: string }> = [];
+      const add = (up: number) => graph[up]!.parents.forEach((id) => queue.push({ up, down: positions.get(id), id }));
+      const magic = new Set<number>();
+      const pending = [...graph[left]!.parents];
+      while (pending.length) {
+        const id = pending.pop()!,
+          i = positions.get(id);
+        if (i == null || i > left + LONG_EDGE || magic.has(i)) continue;
+        magic.add(i);
+        pending.push(...graph[i]!.parents);
+      }
+      let rows = 1,
+        size = 1,
+        old = false,
+        valid = true;
+      const visited = new Set<string>();
+      add(right);
+      while (queue.length && valid) {
+        queue.sort((a, b) => (b.down ?? Infinity) - (a.down ?? Infinity));
+        const e = queue.pop()!;
+        const key = `${e.up}\0${e.id}`;
+        if (visited.has(key)) continue;
+        visited.add(key);
+        const next = e.down;
+        if (next == null) {
+          if (!body.has(e.up)) tails.add(e.up);
+          continue;
+        }
+        if (next === left) {
+          if (!body.has(e.up)) tails.add(e.up);
+          old = true;
+        } else if (next >= right + rows && next < left) {
+          rows = next - right + 1;
+          size++;
+          add(next);
+          body.add(e.up);
+        } else if (next > left) {
+          const li = layout[next]!,
+            ll = layout[left]!,
+            rl = layout[right]!;
+          let allowed: boolean;
+          if (ll > rl && !old) allowed = next <= left + LONG_EDGE && magic.has(next);
+          else if ((li > ll && li < rl) || li === ll) allowed = true;
+          else if (li >= rl) allowed = false;
+          else allowed = next > left + LONG_EDGE ? tailEdges.has(e.up) || body.has(e.up) : magic.has(next);
+          if (!allowed) {
+            valid = false;
+            break;
+          }
+          if (!body.has(e.up)) {
+            tails.add(e.up);
+            tailEdges.set(e.up, new Set([...(tailEdges.get(e.up) ?? []), e.id]));
+          }
+        }
+        if (size >= 200) valid = false;
+      }
+      if (!valid || !tails.size) continue;
+      const id = graph[merge]!.id;
+      nodes.set(id, new Set([merge, left, right, ...body, ...tails].map((i) => graph[i]!.id)));
+      if (expand.has(id)) continue;
+      for (const [up, removed] of tailEdges) {
+        const c = graph[up]!;
+        c.dashed = c.dashed.filter((_, i) => !removed.has(c.parents[i]!));
+        c.parents = c.parents.filter((p) => !removed.has(p));
+      }
+      for (const tail of tails) {
+        const c = graph[tail]!,
+          target = graph[left]!.id;
+        const index = c.parents.indexOf(target);
+        if (index < 0) {
+          c.parents.push(target);
+          c.dashed.push(true);
+        } else c.dashed[index] = true;
+        fragments.set(`${c.id}\0${target}`, id);
+      }
+      const c = graph[merge]!,
+        target = graph[left]!.id;
+      c.dashed = c.dashed.filter((_, i) => c.parents[i] !== target);
+      c.parents = c.parents.filter((p) => p !== target);
+    }
+    for (const c of graph) {
+      const original = commits[positions.get(c.id)!]!;
+      c.edgeTypes = c.parents.map((p, i) =>
+        fragments.has(`${c.id}\0${p}`)
+          ? "collapsed"
+          : (original.edgeTypes?.[original.parents.indexOf(p)] ?? (c.dashed[i] ? "filtered" : "normal")),
+      );
+    }
+    return { graph, fragments, nodes };
+  };
+  let result = build();
+  // Expanding a containing merge restores its nested fragments as well.
+  for (;;) {
+    let changed = false;
+    for (const id of [...expand])
+      for (const node of result.nodes.get(id) ?? [])
+        if (node !== id && result.nodes.has(node) && !expand.has(node)) {
+          expand.add(node);
+          changed = true;
+        }
+    if (!changed) return result;
+    result = build();
+  }
+}
+
+const LONG_EDGE = 30;
 /** Rows of a hidden long edge still drawn next to each of its ends. */
 const LONG_EDGE_STUB = 2;
 
@@ -198,7 +467,7 @@ const passes = (row: GraphRow, i: number) => row.lane !== i && row.up.some(onLan
  */
 export function hideLongEdges(rows: readonly GraphRow[], minLength = LONG_EDGE): GraphRow[] {
   const out = rows.slice();
-  const width = Math.max(0, ...rows.map((r) => r.width));
+  const width = rows.reduce((max, row) => Math.max(max, row.width), 0);
   const edit = (r: number, fn: (row: GraphRow) => GraphRow) => {
     out[r] = fn(out[r]!);
   };
@@ -214,10 +483,22 @@ export function hideLongEdges(rows: readonly GraphRow[], minLength = LONG_EDGE):
         const from = start + LONG_EDGE_STUB;
         const to = r - 1 - LONG_EDGE_STUB;
         for (let k = from; k <= to; k++) {
-          edit(k, (row) => ({ ...row, up: row.up.filter((s) => !lane(s)), down: row.down.filter((s) => !lane(s)) }));
+          edit(k, (row) => ({
+            ...row,
+            up: row.up.filter((s) => !lane(s)),
+            down: row.down.filter((s) => !lane(s)),
+            upTargets: row.upTargets?.filter((_, i) => !lane(row.up[i]!)),
+            downTargets: row.downTargets?.filter((_, i) => !lane(row.down[i]!)),
+          }));
         }
-        edit(from - 1, (row) => ({ ...row, down: row.down.map((s) => (lane(s) ? { ...s, arrow: "down" } : s)) }));
-        edit(to + 1, (row) => ({ ...row, up: row.up.map((s) => (lane(s) ? { ...s, arrow: "up" } : s)) }));
+        edit(from - 1, (row) => ({
+          ...row,
+          down: row.down.map((s) => (lane(s) ? { ...s, arrow: "down", targetRow: r } : s)),
+        }));
+        edit(to + 1, (row) => ({
+          ...row,
+          up: row.up.map((s) => (lane(s) ? { ...s, arrow: "up", targetRow: start - 1 } : s)),
+        }));
       }
       start = -1;
     }
@@ -225,6 +506,43 @@ export function hideLongEdges(rows: readonly GraphRow[], minLength = LONG_EDGE):
   return out;
 }
 
+/**
+ * Draws a lane change as one straight diagonal across the row boundary, like IDEA: a half-row
+ * segment that changes lane and the vertical half of the neighbouring row that continues it meet
+ * halfway between the two lanes. Only the drawn positions change; `from` / `to` stay the lanes.
+ */
+export function straightenLaneChanges(rows: readonly GraphRow[]): GraphRow[] {
+  const out = rows.map((r) => ({ ...r, up: [...r.up], down: [...r.down] }));
+  const vertical = (s: GraphSegment, lane: number) => s.from === lane && s.to === lane && !s.arrow;
+  for (let r = 0; r < out.length; r++) {
+    const row = out[r]!;
+    // Leaving the node towards another lane: continues straight down in the next row.
+    const next = out[r + 1];
+    // Another line ending at the same lane (a merge into a lane that continues) keeps its position.
+    const shared = (list: readonly GraphSegment[], lane: number, end: "from" | "to") =>
+      list.filter((x) => x[end] === lane).length > 1;
+    row.down.forEach((s, i) => {
+      if (s.from === s.to || s.arrow || !next || shared(row.down, s.to, "to")) return;
+      const j = next.up.findIndex((u) => vertical(u, s.to) && u.edge === s.edge && u.fromX === undefined);
+      if (j < 0) return;
+      const mid = (s.from + s.to) / 2;
+      row.down[i] = { ...s, toX: mid };
+      next.up[j] = { ...next.up[j]!, fromX: mid };
+    });
+    // Converging into the node from another lane: continues a vertical line of the previous row.
+    const prev = out[r - 1];
+    row.up.forEach((s, i) => {
+      if (s.from === s.to || s.arrow || !prev || shared(prev.down, s.from, "to")) return;
+      const j = prev.down.findIndex((d) => vertical(d, s.from) && d.edge === s.edge && d.toX === undefined);
+      if (j < 0) return;
+      const mid = (s.from + s.to) / 2;
+      row.up[i] = { ...s, fromX: mid };
+      prev.down[j] = { ...prev.down[j]!, toX: mid };
+    });
+  }
+  return out;
+}
+
 /** Lane colours (tokens), cycled by colour index. */
 export const LANE_COLORS = [
   "var(--accent)",
diff --git a/src/features/vcs/historyActions.tsx b/src/features/vcs/historyActions.tsx
index a45f689b..4becc6a3 100644
--- a/src/features/vcs/historyActions.tsx
+++ b/src/features/vcs/historyActions.tsx
@@ -1,3 +1,4 @@
+import { parseCommitBookmark } from "./logBookmarks";
 import { commitKey, commitRepo } from "./multiRoot";
 /**
  * Actions for operations in progress, Git Log commits, change lists, the shelf
@@ -23,7 +24,7 @@ import { useChangelists } from "./changelists";
 import { commitWindowFocused } from "./actions";
 import { useCommit } from "./commitStore";
 import { openCommit } from "./commitUi";
-import { goToChild, goToParent, goToRef, selectedCommits, useGitLog } from "./logStore";
+import { goToChild, goToParent, goToRef, openLogTab, selectedCommits, useGitLog } from "./logStore";
 import { chooseRevision } from "./RevisionChooser";
 import {
   cherryPick,
@@ -59,9 +60,10 @@ import {
   unshelve,
 } from "./shelf";
 import { currentRepo, focusRepo, useVcs } from "./store";
+import { openExternalLog } from "./RevisionBrowser";
 
 const VCS = "vcsAvailable";
-const IN_GIT_LOG = "vcsAvailable && activeToolWindow == git";
+const IN_GIT_LOG = "(vcsAvailable || projectOpen) && (activeToolWindow == git || vcsLogFocus)";
 const IN_COMMIT = "vcsAvailable && activeToolWindow == commit";
 
 /** The commit an action refers to: its argument (commit or id), else the Git Log selection. */
@@ -84,16 +86,18 @@ export function commitsArg(arg: unknown): Commit[] {
   return selection.length ? selection : [commitArg(undefined)].filter((c): c is Commit => !!c);
 }
 
-function withCommits(fn: (cs: Commit[]) => unknown) {
+function withCommits(fn: (cs: Commit[]) => unknown, allowReadOnly = false) {
   return async ({ arg }: { arg?: unknown }) => {
     const cs = commitsArg(arg);
     if (!cs.length) {
       notifications().notify({ group: "vcs", level: "info", title: "Select a commit in the Git log" });
       return;
     }
-    if (new Set(cs.map(commitRepo)).size > 1) return;
+    if (!allowReadOnly && new Set(cs.map(commitRepo)).size > 1) return;
+    const readOnly = cs.some((c) => "readOnly" in c && c.readOnly === true);
+    if (readOnly && !allowReadOnly) return;
     const repo = commitRepo(cs[0]!);
-    if (repo) await focusRepo(repo);
+    if (repo && !readOnly) await focusRepo(repo);
     void fn(cs);
   };
 }
@@ -108,7 +112,7 @@ async function openCommitInBrowser(c: Commit) {
   else notifications().notify({ group: "vcs", level: "warning", title: `No web URL for remote '${remote}'` });
 }
 
-function withCommit(fn: (c: Commit) => unknown) {
+function withCommit(fn: (c: Commit) => unknown, allowReadOnly = false) {
   return async ({ arg }: { arg?: unknown }) => {
     const c = commitArg(arg);
     if (!c) {
@@ -116,7 +120,9 @@ function withCommit(fn: (c: Commit) => unknown) {
       return;
     }
     const repo = commitRepo(c);
-    if (repo) await focusRepo(repo);
+    const readOnly = "readOnly" in c && c.readOnly === true;
+    if (readOnly && !allowReadOnly) return;
+    if (repo && !readOnly) await focusRepo(repo);
     void fn(c);
   };
 }
@@ -154,6 +160,21 @@ export function trackOperationContext(): () => void {
 
 export function registerHistoryActions(): () => void {
   const actions: Action[] = [
+    {
+      id: "vcs.log.revealBookmark",
+      title: "Show Commit Bookmark",
+      category: "Git Log",
+      run: async ({ arg }) => {
+        const target = typeof arg === "string" ? parseCommitBookmark(arg) : null;
+        if (target) {
+          if (target.repo && !useVcs.getState().roots.includes(target.repo)) {
+            const root = await call(commands.vcsOpenExternalLog(target.repo));
+            openLogTab("external", root, "editor", [root]);
+          }
+          await goToRef(target.id, target.repo || null);
+        }
+      },
+    },
     // --- operation in progress (Git › Continue Rebase…) ---
     {
       id: "vcs.rebase.continue",
@@ -225,19 +246,28 @@ export function registerHistoryActions(): () => void {
     },
 
     // --- Git Log toolbar ---
+    {
+      id: "vcs.log.openExternal",
+      title: "Open External Git Log…",
+      category: "Git Log",
+      run: openExternalLog,
+    },
     {
       id: "vcs.log.goToRef",
       title: "Go to Hash/Branch/Tag",
       category: "Git Log",
       icon: "search",
-      when: VCS,
+      when: "vcsAvailable || projectOpen || vcsLogFocus",
       keyWhen: IN_GIT_LOG,
       keywords: ["find commit", "jump"],
       run: async () => {
-        toolWindowService().show("git", true);
+        const log = useGitLog.getState();
+        const tab = log.logTabs.find((t) => t.id === log.shownLog);
+        if (tab?.location !== "editor") toolWindowService().show("git", true);
         const rev = await chooseRevision("Go to Hash/Branch/Tag", {
           tags: true,
           placeholder: "Enter hash or branch/tag name",
+          repositories: tab?.repo ? [tab.repo] : log.filters.repositories,
         });
         if (rev && !(await goToRef(rev)))
           notifications().notify({ group: "vcs", level: "warning", title: `'${rev}' was not found in the log` });
@@ -250,9 +280,9 @@ export function registerHistoryActions(): () => void {
       title: "Copy Revision Number",
       category: "Git Log",
       icon: "copy",
-      when: VCS,
+      when: "vcsAvailable || projectOpen || vcsLogFocus",
       keyWhen: IN_GIT_LOG,
-      run: withCommits((cs) => navigator.clipboard?.writeText(cs.map((c) => c.id).join(" "))),
+      run: withCommits((cs) => navigator.clipboard?.writeText(cs.map((c) => c.id).join(" ")), true),
     },
     {
       id: "vcs.log.createPatch",
@@ -382,16 +412,16 @@ export function registerHistoryActions(): () => void {
       title: "Go to Child Commit",
       category: "Git Log",
       icon: "arrow-left",
-      when: VCS,
-      run: withCommit(goToChild),
+      when: "vcsAvailable || projectOpen || vcsLogFocus",
+      run: withCommit(goToChild, true),
     },
     {
       id: "vcs.log.goToParent",
       title: "Go to Parent Commit",
       category: "Git Log",
       icon: "arrow-right",
-      when: VCS,
-      run: withCommit(goToParent),
+      when: "vcsAvailable || projectOpen || vcsLogFocus",
+      run: withCommit(goToParent, true),
     },
     {
       id: "vcs.log.openInBrowser",
diff --git a/src/features/vcs/index.ts b/src/features/vcs/index.ts
index 8d2234d8..750bfded 100644
--- a/src/features/vcs/index.ts
+++ b/src/features/vcs/index.ts
@@ -32,6 +32,7 @@ import { VcsDialogHost } from "./dialogs";
 import { changeMarkers } from "./gutter";
 import { installHunkPopup } from "./HunkPopup";
 import { LOCAL_HISTORY_KIND } from "./localHistoryKind";
+import { SELECTION_HISTORY_KIND, type SelectionHistoryData } from "./selectionHistoryKind";
 import { registerLocalHistoryActions } from "./localHistoryActions";
 import { MERGE_KIND, type MergeData } from "./mergeKind";
 import { registerMergeActions } from "./mergeActions";
@@ -43,7 +44,7 @@ import { activate as activateConflictMarkers } from "./conflictMarkers";
 import { MergeRebaseWidget } from "./MergeRebaseWidget";
 import { installFileConfirmations } from "./confirmations";
 import { installIncomingCheck } from "./incoming";
-import { installGitLog, selectGitTab, useGitLog } from "./logStore";
+import { closeLogTab, installGitLog, selectGitTab, useGitLog } from "./logStore";
 import { installVcsStore, onConflictsAppeared, onConflictsCleared, useVcs } from "./store";
 import { tx } from "@/platform/i18n";
 
@@ -147,6 +148,19 @@ function conflictsBody(names: string[]): string {
 }
 
 /** Settings › Version Control › Log (also used by the Settings window). */
+export { activateComparisonWindow, ComparisonWindow } from "./ComparisonWindow";
+
+/** The diff viewer (editor kind `diff`), also for windows that show diffs without Git (deployment). */
+export function activateDiffViewer(): () => void {
+  return registerEditorKind({
+    kind: DIFF_KIND,
+    standalone: true,
+    component: lazyComponent(() => import("./diff-editor-tab").then((m) => m.DiffEditorTab)),
+    title: (input) => diffTitle(input.data as DiffData),
+    icon: () => "diff",
+  });
+}
+
 export function activateSettingsPages(): () => void {
   return registerSettingsPage({
     id: "vcs.log",
@@ -229,11 +243,34 @@ export function activate(): () => void {
       headerContent: lazyComponent(() => import("./GitLog").then((m) => m.GitTabs)),
     }),
     registerEditorKind({
-      kind: DIFF_KIND,
-      component: lazyComponent(() => import("./diff-editor-tab").then((m) => m.DiffEditorTab)),
-      title: (input) => diffTitle(input.data as DiffData),
-      icon: () => "diff",
+      kind: "git-revision",
+      standalone: true,
+      component: lazyComponent(() => import("./RevisionBrowser").then((m) => m.GitRevisionEditor)),
+      title: (input) => {
+        const data = input.data as { path: string; revision: string };
+        return `${baseName(data.path)} (${data.revision.slice(0, 8)})`;
+      },
+      icon: () => "file",
+      restorable: true,
     }),
+    registerEditorKind({
+      kind: "git-log",
+      standalone: true,
+      component: lazyComponent(() => import("./LogScope").then((m) => m.GitLogEditor)),
+      title: (input) => (input.data as { label: string }).label,
+      icon: () => "toolwindow-git",
+      restorable: true,
+      onClose: (input) => closeLogTab((input.data as { id: string }).id),
+    }),
+    registerEditorKind({
+      kind: "git-merge-diff",
+      standalone: true,
+      component: lazyComponent(() => import("./GitMergeDiff").then((m) => m.GitMergeDiff)),
+      title: (input) => (input.data as { path: string }).path,
+      icon: () => "diff",
+      restorable: true,
+    }),
+    activateDiffViewer(),
     registerEditorKind({
       kind: MERGE_KIND,
       component: lazyComponent(() => import("./MergeEditor").then((m) => m.MergeEditor)),
@@ -246,6 +283,15 @@ export function activate(): () => void {
       title: (input) => `Local History: ${baseName((input.data as { path: string }).path)}`,
       icon: () => "clock",
     }),
+    registerEditorKind({
+      kind: SELECTION_HISTORY_KIND,
+      component: lazyComponent(() => import("./SelectionHistory").then((m) => m.SelectionHistoryEditor)),
+      title: (input) => {
+        const { path, lines } = input.data as SelectionHistoryData;
+        return `History: ${baseName(path)}:${lines[0] + 1}-${lines[1] + 1}`;
+      },
+      icon: () => "history",
+    }),
     registerEditorContribution({
       id: "vcs.changeMarkers",
       order: 60,
diff --git a/src/features/vcs/logBookmarks.ts b/src/features/vcs/logBookmarks.ts
new file mode 100644
index 00000000..51169943
--- /dev/null
+++ b/src/features/vcs/logBookmarks.ts
@@ -0,0 +1,16 @@
+import type { Commit } from "@/bindings";
+import { commitRepo } from "./multiRoot";
+
+/** Stable virtual bookmark target; uses the platform's groups, mnemonic and description model. */
+export const commitBookmarkPath = (commit: Commit) =>
+  `git-log:${encodeURIComponent(commitRepo(commit) ?? "")}#${commit.id}`;
+export function parseCommitBookmark(path: string): { repo: string; id: string } | null {
+  if (!path.startsWith("git-log:")) return null;
+  const [repo, id] = path.slice(8).split("#");
+  if (!id) return null;
+  try {
+    return { repo: decodeURIComponent(repo!), id };
+  } catch {
+    return null;
+  }
+}
diff --git a/src/features/vcs/logChanges.ts b/src/features/vcs/logChanges.ts
index c292d945..7a07b3c1 100644
--- a/src/features/vcs/logChanges.ts
+++ b/src/features/vcs/logChanges.ts
@@ -14,6 +14,7 @@ import { baseName } from "./model";
 import { readWorkingText, runOp, saveAll, writeFileText } from "./ops";
 import { reportApply } from "./shelf";
 import { currentRepoRoot } from "./store";
+import { commitRepo } from "./multiRoot";
 import { repositoryPath } from "./repositoryPaths";
 import { confirmDialog } from "./dialogs";
 
@@ -29,6 +30,9 @@ export interface LogChange {
   /** `null`: the change deleted the file. */
   after: string | null;
   diff: DiffData;
+  readOnly?: boolean;
+  group?: string;
+  mergeParents?: Array<{ rev: string; path: string }>;
 }
 
 /** One commit's files (`commit` given) or several commits' combined changes. */
@@ -36,12 +40,14 @@ export function toLogChanges(
   files: readonly (ChangedFile | RevisionChange)[],
   commit: Commit | null,
   repo = currentRepoRoot(),
+  readOnly = false,
 ): LogChange[] {
   return files.map((f) => {
     if (commit) {
       const parent = commit.parents[0] ?? null;
       return {
         repo,
+        readOnly,
         path: f.path,
         oldPath: f.oldPath,
         kind: f.kind,
@@ -53,6 +59,7 @@ export function toLogChanges(
     const r = f as RevisionChange;
     return {
       repo,
+      readOnly,
       path: r.path,
       oldPath: r.oldPath,
       kind: r.kind,
@@ -138,6 +145,22 @@ export function changesArg(arg: unknown): LogChange[] {
 export async function showChangesDiff(changes: readonly LogChange[], preview = false) {
   const first = changes[0];
   if (!first) return;
+  if (first.mergeParents?.length === 2 && first.after) {
+    await editorService().openInput(
+      {
+        kind: "git-merge-diff",
+        key: `git-merge-diff:${first.repo}:${first.after}:${first.path}`,
+        data: {
+          repo: first.repo ?? currentRepoRoot(),
+          revision: first.after,
+          path: first.path,
+          parents: first.mergeParents,
+        },
+      },
+      { preview, focus: !preview },
+    );
+    return;
+  }
   const all = useLogChanges.getState().all;
   const chain = all.includes(first) ? all : [...changes];
   await openDiff(
@@ -151,6 +174,7 @@ export async function showChangesDiff(changes: readonly LogChange[], preview = f
 
 /** Compare with Local (`side` after) / Compare Before with Local: the revision ↔ the working file. */
 export async function compareChangeWithLocal(change: LogChange, side: "after" | "before" = "after") {
+  if (change.readOnly) return;
   const rev = side === "after" ? change.after : change.before;
   if (!rev) return;
   const revPath = side === "before" && change.oldPath ? absolutePath(change.oldPath, change.repo) : undefined;
@@ -163,6 +187,7 @@ export async function compareChangeWithLocal(change: LogChange, side: "after" |
 
 /** Jump to Source: the working file. */
 export async function openChangeSource(change: LogChange) {
+  if (change.readOnly) return;
   await editorService().openFile(absolutePath(change.path, change.repo), { focus: true });
 }
 
@@ -171,6 +196,7 @@ export async function openChangeSource(change: LogChange) {
  * change deleted is deleted.
  */
 export async function getFromRevision(changes: readonly LogChange[]) {
+  if (changes.some((c) => c.readOnly)) return;
   if (!changes.length) return;
   const ok = await confirmDialog({
     title: "Get from Revision",
@@ -205,10 +231,17 @@ export async function getFromRevision(changes: readonly LogChange[]) {
 
 /** Revert Selected Changes: applies the reverse of the selected files' changes to the working tree. */
 export async function revertSelectedChanges(changes: readonly LogChange[], commits: readonly Commit[]) {
+  if (changes.some((c) => c.readOnly)) return;
   if (!changes.length || !commits.length) return;
+  const repo = changes[0]!.repo ?? currentRepoRoot();
+  if (changes.some((c) => (c.repo ?? currentRepoRoot()) !== repo)) return;
   await saveAll();
   // Oldest first; the backend reverses the order for a reversed patch.
-  const ids = [...commits].reverse().map((c) => c.id);
+  const ids = [...commits]
+    .reverse()
+    .filter((c) => (commitRepo(c) ?? currentRepoRoot()) === repo)
+    .map((c) => c.id);
+  if (!ids.length) return;
   const paths = new Set(changes.flatMap((c) => (c.oldPath ? [c.path, c.oldPath] : [c.path])));
   const outcome = await runOp(
     tx("Revert selected changes"),
diff --git a/src/features/vcs/logContext.ts b/src/features/vcs/logContext.ts
new file mode 100644
index 00000000..bf8ea851
--- /dev/null
+++ b/src/features/vcs/logContext.ts
@@ -0,0 +1,5 @@
+import { createContext } from "react";
+import type { LogOptions } from "./logOptions";
+
+export const LogIdContext = createContext<string | null>(null);
+export const LogOptionsContext = createContext<LogOptions | null>(null);
diff --git a/src/features/vcs/logDetails.ts b/src/features/vcs/logDetails.ts
new file mode 100644
index 00000000..4d5974ca
--- /dev/null
+++ b/src/features/vcs/logDetails.ts
@@ -0,0 +1,144 @@
+import { useEffect, useState } from "react";
+import type { Commit, LogDetails } from "@/bindings";
+import { call, commands, nextRequestId, type RequestId } from "@/platform/ipc";
+import { commitRepo } from "./multiRoot";
+import { currentRepo, useVcs } from "./store";
+import { create } from "zustand";
+
+const refVersions = create<Record<string, number>>(() => ({}));
+export function invalidateLogDetails(roots: readonly string[]) {
+  refVersions.setState((s) => Object.fromEntries(roots.map((root) => [root, (s[root] ?? 0) + 1])));
+}
+
+interface Entry {
+  key: string;
+  repo: string | null;
+  id: string;
+  promise: Promise<LogDetails>;
+  resolve: (details: LogDetails) => void;
+  reject: (error: unknown) => void;
+  users: number;
+  request?: RequestId;
+  settled: boolean;
+}
+const cache = new Map<string, Entry>();
+const pending: Entry[] = [];
+const batches = new Map<RequestId, Entry[]>();
+let scheduled = false;
+let running = 0;
+
+function forget(entry: Entry) {
+  if (cache.get(entry.key) === entry) cache.delete(entry.key);
+}
+
+function flush() {
+  scheduled = false;
+  while (pending.length && running < 4) {
+    const first = pending.shift()!;
+    if (!first.users) {
+      forget(first);
+      first.reject(new Error("Commit details request cancelled"));
+      continue;
+    }
+    const entries = [first];
+    for (let i = 0; i < pending.length && entries.length < 64;) {
+      if (!pending[i]!.users) {
+        const cancelled = pending.splice(i, 1)[0]!;
+        forget(cancelled);
+        cancelled.reject(new Error("Commit details request cancelled"));
+      } else if (pending[i]!.repo === first.repo) entries.push(...pending.splice(i, 1));
+      else i++;
+    }
+    const request = nextRequestId();
+    entries.forEach((entry) => {
+      entry.request = request;
+    });
+    batches.set(request, entries);
+    running++;
+    void call(
+      commands.vcsLogDetailsBatch(
+        first.repo,
+        entries.map((e) => e.id),
+        request,
+      ),
+    )
+      .then(
+        (details) =>
+          entries.forEach((entry, i) => {
+            if (details[i]) {
+              entry.settled = true;
+              entry.resolve(details[i]!);
+            } else {
+              forget(entry);
+              entry.reject(new Error("Commit details were not returned"));
+            }
+          }),
+        (error) =>
+          entries.forEach((entry) => {
+            forget(entry);
+            entry.reject(error);
+          }),
+      )
+      .finally(() => {
+        running--;
+        batches.delete(request);
+        flush();
+      });
+  }
+}
+
+/** Batches visible rows by root. Ref-dependent fields refresh on version changes;
+ * the backend caches immutable messages and signatures independently. */
+export function loadLogDetails(commit: Commit, signal?: AbortSignal): Promise<LogDetails> {
+  const repo = commitRepo(commit) ?? currentRepo();
+  const key = `${repo}\0${commit.id}\0${useVcs.getState().version}\0${refVersions.getState()[repo ?? ""] ?? 0}`;
+  let entry = cache.get(key);
+  if (!entry) {
+    let resolve!: Entry["resolve"], reject!: Entry["reject"];
+    const promise = new Promise<LogDetails>((yes, no) => {
+      resolve = yes;
+      reject = no;
+    });
+    entry = { key, repo, id: commit.id, promise, resolve, reject, users: 0, settled: false };
+    if (cache.size >= 10000) cache.delete(cache.keys().next().value!);
+    cache.set(key, entry);
+    pending.push(entry);
+  }
+  entry.users++;
+  const own = entry;
+  const abort = () => {
+    own.users = Math.max(0, own.users - 1);
+    if (!own.settled && !own.users) forget(own);
+    if (own.settled || !own.request) return;
+    const batch = batches.get(own.request);
+    if (batch?.every((e) => !e.users)) void commands.cancelRequest(own.request).catch(() => undefined);
+  };
+  if (signal?.aborted) abort();
+  else signal?.addEventListener("abort", abort, { once: true });
+  if (!scheduled) {
+    scheduled = true;
+    queueMicrotask(flush);
+  }
+  return entry.promise;
+}
+
+export function useCommitDetails(commit: Commit, enabled = true) {
+  const version = useVcs((s) => s.version);
+  const repo = commitRepo(commit) ?? currentRepo();
+  const refs = refVersions((s) => s[repo ?? ""] ?? 0);
+  const key = `${repo}\0${commit.id}\0${version}\0${refs}`;
+  const [result, setResult] = useState<{ key: string; details: LogDetails | null; error: boolean } | null>(null);
+  useEffect(() => {
+    if (!enabled) return;
+    const controller = new AbortController();
+    void loadLogDetails(commit, controller.signal)
+      .then((details) => {
+        if (!controller.signal.aborted) setResult({ key, details, error: false });
+      })
+      .catch(() => {
+        if (!controller.signal.aborted) setResult({ key, details: null, error: true });
+      });
+    return () => controller.abort();
+  }, [commit, key, enabled, version]);
+  return { details: result?.key === key ? result.details : null, error: result?.key === key && result.error };
+}
diff --git a/src/features/vcs/logIndex.tsx b/src/features/vcs/logIndex.tsx
new file mode 100644
index 00000000..33a0a73f
--- /dev/null
+++ b/src/features/vcs/logIndex.tsx
@@ -0,0 +1,110 @@
+import { useEffect } from "react";
+import { create } from "zustand";
+import type { LogIndexProgress } from "@/bindings";
+import { call, commands, nextRequestId, type RequestId } from "@/platform/ipc";
+import { tx } from "@/platform/i18n";
+import { useVcs } from "./store";
+import { IconButton } from "@/ui";
+
+interface Job {
+  version?: number;
+  restart?: boolean;
+  users: number;
+  request: RequestId | null;
+  paused: boolean;
+  progress: LogIndexProgress;
+  timer?: ReturnType<typeof setInterval>;
+}
+const jobs = new Map<string, Job>();
+const revision = create<{ value: number }>(() => ({ value: 0 }));
+const notify = () => revision.setState((s) => ({ value: s.value + 1 }));
+function start(repo: string, job: Job) {
+  if (job.paused) return;
+  if (job.request != null) {
+    job.restart = true;
+    return;
+  }
+  const request = nextRequestId();
+  job.request = request;
+  job.progress = { ...job.progress, running: true };
+  job.timer = setInterval(() => {
+    void call(commands.vcsLogIndex(repo, null))
+      .then((progress) => {
+        if (job.request === request) {
+          job.progress = progress;
+          notify();
+        }
+      })
+      .catch(() => undefined);
+  }, 750);
+  void call(commands.vcsLogIndex(repo, request))
+    .then(
+      (progress) => {
+        job.progress = progress;
+      },
+      () => {
+        job.progress = { ...job.progress, running: false };
+      },
+    )
+    .finally(() => {
+      if (job.request !== request) return;
+      job.request = null;
+      clearInterval(job.timer);
+      if (job.restart && job.users && !job.paused) {
+        job.restart = false;
+        start(repo, job);
+      }
+      notify();
+    });
+  notify();
+}
+
+/** Visible log scopes share one background job per repository. */
+export function LogIndexStatus({ repositories }: { repositories: readonly string[] }) {
+  revision((s) => s.value);
+  const version = useVcs((s) => s.version);
+  useEffect(() => {
+    for (const repo of repositories) {
+      const job: Job = jobs.get(repo) ?? {
+        users: 0,
+        request: null,
+        paused: false,
+        progress: { indexed: 0, total: 0, running: false },
+      };
+      jobs.set(repo, job);
+      const first = job.users++ === 0;
+      if (first || job.version !== version) {
+        job.version = version;
+        start(repo, job);
+      }
+    }
+    return () => {
+      for (const repo of repositories) {
+        const job = jobs.get(repo)!;
+        if (--job.users === 0) {
+          clearInterval(job.timer);
+          if (job.request != null) void commands.cancelRequest(job.request).catch(() => undefined);
+        }
+      }
+    };
+  }, [repositories, version]);
+  return repositories.map((repo) => {
+    const job = jobs.get(repo);
+    if (!job || (!job.paused && !job.progress.running)) return null;
+    return (
+      <div key={repo} role="status" style={{ display: "flex", alignItems: "center", gap: 6 }}>
+        {tx`Indexing Git log: ${job.progress.indexed} / ${job.progress.total}`}
+        <IconButton
+          icon={job.paused ? "play" : "pause"}
+          title={job.paused ? "Resume Indexing" : "Pause Indexing"}
+          onClick={() => {
+            job.paused = !job.paused;
+            if (job.paused && job.request != null) void commands.cancelRequest(job.request).catch(() => undefined);
+            else start(repo, job);
+            notify();
+          }}
+        />
+      </div>
+    );
+  });
+}
diff --git a/src/features/vcs/logOptions.ts b/src/features/vcs/logOptions.ts
index 611ec3a6..4e594a83 100644
--- a/src/features/vcs/logOptions.ts
+++ b/src/features/vcs/logOptions.ts
@@ -3,8 +3,10 @@
  * persisted across sessions.
  */
 import { create } from "zustand";
+import { useContext } from "react";
+import { LogOptionsContext } from "./logContext";
 
-export type LogSort = "date" | "topo";
+export type LogSort = "date" | "topo" | "standard";
 
 export interface LogOptions {
   sort: LogSort;
@@ -19,6 +21,7 @@ export interface LogOptions {
   showAuthor: boolean;
   showDate: boolean;
   showHash: boolean;
+  showSignature: boolean;
   highlightMine: boolean;
   highlightMerges: boolean;
   highlightCurrentBranch: boolean;
@@ -28,6 +31,14 @@ export interface LogOptions {
   groupByDirectory: boolean;
   /** Selecting a changed file shows its diff in the editor's preview tab. */
   diffPreview: boolean;
+  showDetails: boolean;
+  showRepository: boolean;
+  showOnlyAffected: boolean;
+  changesFromParents: boolean;
+  diffLocation: "editor" | "right" | "bottom";
+  columnOrder: string[];
+  columnWidths: Record<string, number>;
+  linearizeMerges: boolean;
 }
 
 /** IDEA's defaults. */
@@ -44,12 +55,21 @@ export const DEFAULT_LOG_OPTIONS: LogOptions = {
   showAuthor: true,
   showDate: true,
   showHash: false,
+  showSignature: false,
   highlightMine: true,
   highlightMerges: true,
   highlightCurrentBranch: true,
   showBranches: true,
   groupByDirectory: true,
   diffPreview: true,
+  showDetails: true,
+  showRepository: true,
+  showOnlyAffected: false,
+  changesFromParents: false,
+  diffLocation: "editor",
+  columnOrder: ["author", "date", "hash"],
+  columnWidths: {},
+  linearizeMerges: false,
 };
 
 /** Options that change which commits the backend returns (a reload is needed). */
@@ -61,7 +81,21 @@ export function parseLogOptions(raw: unknown): LogOptions {
   const o = raw && typeof raw === "object" ? (raw as Record<string, unknown>) : {};
   const out = { ...DEFAULT_LOG_OPTIONS };
   for (const k of Object.keys(out) as Array<keyof LogOptions>) {
-    if (k === "sort") out.sort = o.sort === "topo" ? "topo" : o.sort === "date" ? "date" : DEFAULT_LOG_OPTIONS.sort;
+    if (k === "sort")
+      out.sort = o.sort === "standard" || o.sort === "topo" || o.sort === "date" ? o.sort : DEFAULT_LOG_OPTIONS.sort;
+    else if (k === "diffLocation")
+      out.diffLocation = o.diffLocation === "right" || o.diffLocation === "bottom" ? o.diffLocation : "editor";
+    else if (k === "columnOrder")
+      out.columnOrder = Array.isArray(o.columnOrder)
+        ? [...new Set(o.columnOrder.filter((v): v is string => typeof v === "string"))]
+        : [...DEFAULT_LOG_OPTIONS.columnOrder];
+    else if (k === "columnWidths" && o.columnWidths && typeof o.columnWidths === "object")
+      out.columnWidths = Object.fromEntries(
+        Object.entries(o.columnWidths).filter(
+          (entry): entry is [string, number] =>
+            typeof entry[1] === "number" && Number.isFinite(entry[1]) && entry[1] >= 40 && entry[1] <= 800,
+        ),
+      );
     else if (typeof o[k] === "boolean") (out as Record<string, unknown>)[k] = o[k];
   }
   return out;
@@ -76,7 +110,13 @@ function load(): LogOptions {
   }
 }
 
-export const useLogOptions = create<LogOptions>(() => load());
+export const rootLogOptions = create<LogOptions>(() => load());
+export const useLogOptions = Object.assign(function useScopedLogOptions<T = LogOptions>(
+  selector?: (state: LogOptions) => T,
+): T {
+  const scoped = useContext(LogOptionsContext);
+  return rootLogOptions((state) => (selector ? selector(scoped ?? state) : ((scoped ?? state) as T)));
+}, rootLogOptions);
 
 // Settings › Version Control › Log edits them from the Settings window too.
 if (typeof window !== "undefined")
diff --git a/src/features/vcs/logPaneActions.ts b/src/features/vcs/logPaneActions.ts
index 95393948..093fdaa4 100644
--- a/src/features/vcs/logPaneActions.ts
+++ b/src/features/vcs/logPaneActions.ts
@@ -21,6 +21,7 @@ import { logOptions } from "./logOptions";
 import { goToRef, updateLogOptions } from "./logStore";
 
 const VCS = "vcsAvailable";
+const LOG = "vcsAvailable || projectOpen || vcsLogFocus";
 
 /** A ref selected in the Branches pane. */
 export interface BranchTarget {
@@ -62,7 +63,7 @@ export function registerLogPaneActions(): () => void {
       id: "vcs.log.showBranches",
       title: "Show Branches",
       category: "Git Log",
-      when: VCS,
+      when: LOG,
       toggled: () => logOptions().showBranches,
       run: () => {
         updateLogOptions({ showBranches: !logOptions().showBranches });
@@ -74,7 +75,7 @@ export function registerLogPaneActions(): () => void {
       title: "Collapse Linear Branches",
       category: "Git Log",
       icon: "collapse-all",
-      when: VCS,
+      when: LOG,
       run: () => updateLogOptions({ collapseLinear: true }),
     },
     {
@@ -82,7 +83,7 @@ export function registerLogPaneActions(): () => void {
       title: "Expand Linear Branches",
       category: "Git Log",
       icon: "expand-all",
-      when: VCS,
+      when: LOG,
       run: () => updateLogOptions({ collapseLinear: false }),
     },
 
@@ -135,12 +136,11 @@ export function registerLogPaneActions(): () => void {
       title: "Navigate Log to Selected Branch",
       category: "Git Log",
       icon: "locate",
-      when: VCS,
+      when: LOG,
       hidden: true,
       run: async ({ arg }) => {
         const t = branchArg(arg);
-        if (t?.repo) await focusRepo(t.repo);
-        if (t && !(await goToRef(t.ref)))
+        if (t && !(await goToRef(t.ref, t.repo)))
           notifications().notify({ group: "vcs", level: "warning", title: `'${t.ref}' was not found in the log` });
       },
     },
@@ -151,7 +151,7 @@ export function registerLogPaneActions(): () => void {
       title: "Show Diff",
       category: "Git Log",
       icon: "diff",
-      when: VCS,
+      when: LOG,
       hidden: true,
       run: ({ arg }) => void showChangesDiff(changesArg(arg)),
     },
@@ -159,7 +159,7 @@ export function registerLogPaneActions(): () => void {
       id: "vcs.log.changes.compareWithLocal",
       title: "Compare with Local",
       category: "Git Log",
-      when: VCS,
+      when: LOG,
       hidden: true,
       run: ({ arg }) => {
         const c = changesArg(arg)[0];
@@ -170,7 +170,7 @@ export function registerLogPaneActions(): () => void {
       id: "vcs.log.changes.compareBeforeWithLocal",
       title: "Compare Before with Local",
       category: "Git Log",
-      when: VCS,
+      when: LOG,
       hidden: true,
       run: ({ arg }) => {
         const c = changesArg(arg)[0];
@@ -182,7 +182,7 @@ export function registerLogPaneActions(): () => void {
       title: "Jump to Source",
       category: "Git Log",
       icon: "edit",
-      when: VCS,
+      when: LOG,
       hidden: true,
       run: ({ arg }) => {
         for (const c of changesArg(arg)) if (c.after) void openChangeSource(c);
@@ -209,7 +209,7 @@ export function registerLogPaneActions(): () => void {
       id: "vcs.log.changes.groupByDirectory",
       title: "Group by Directory",
       category: "Git Log",
-      when: VCS,
+      when: LOG,
       toggled: () => logOptions().groupByDirectory,
       run: () => updateLogOptions({ groupByDirectory: !logOptions().groupByDirectory }),
     },
@@ -218,7 +218,7 @@ export function registerLogPaneActions(): () => void {
       title: "Show Diff Preview",
       category: "Git Log",
       description: "Selecting a changed file shows its diff in the editor's preview tab",
-      when: VCS,
+      when: LOG,
       toggled: () => logOptions().diffPreview,
       run: () => updateLogOptions({ diffPreview: !logOptions().diffPreview }),
     },
diff --git a/src/features/vcs/logPresentation.ts b/src/features/vcs/logPresentation.ts
new file mode 100644
index 00000000..c4471c99
--- /dev/null
+++ b/src/features/vcs/logPresentation.ts
@@ -0,0 +1,31 @@
+import { collapseLinear, computeGraph, hideLongEdges, linearizeMerges, straightenLaneChanges } from "./graph";
+import { commitKey, graphCommit, type RepoCommit } from "./multiRoot";
+import type { LogOptions } from "./logOptions";
+
+/** The same displayed adjacency drives painting, navigation and fragment actions. */
+export function presentLogGraph(
+  all: readonly RepoCommit[],
+  options: LogOptions,
+  fragments: { expanded: ReadonlySet<string>; collapsed: ReadonlySet<string>; merges: ReadonlySet<string> },
+  keep: ReadonlySet<string>,
+) {
+  const source = all.map(graphCommit);
+  const collapsed =
+    options.collapseLinear || fragments.collapsed.size
+      ? collapseLinear(
+          source,
+          new Set([...keep, ...fragments.expanded]),
+          options.collapseLinear ? undefined : fragments.collapsed,
+        )
+      : null;
+  const expanded = fragments.merges.has("*")
+    ? new Set(source.filter((c) => !fragments.merges.has(c.id)).map((c) => c.id))
+    : fragments.merges;
+  const linear = options.linearizeMerges ? linearizeMerges(collapsed?.graph ?? source, expanded) : null;
+  const graph = linear?.graph ?? collapsed?.graph ?? source;
+  const byId = new Map(all.map((c) => [commitKey(c), c]));
+  const commits = graph.map((c) => byId.get(c.id)!);
+  const laid = computeGraph(graph).rows;
+  const rows = straightenLaneChanges(options.longEdges ? laid : hideLongEdges(laid));
+  return { commits, graph, rows, linear, collapsed };
+}
diff --git a/src/features/vcs/logSearch.ts b/src/features/vcs/logSearch.ts
new file mode 100644
index 00000000..f5869fff
--- /dev/null
+++ b/src/features/vcs/logSearch.ts
@@ -0,0 +1,44 @@
+import type { Commit } from "@/bindings";
+import type { LogOptions } from "./logOptions";
+import { commitRepo } from "./multiRoot";
+import { formatTime } from "./model";
+
+export function visibleCommitText(c: Commit, options: LogOptions): string[] {
+  return [
+    c.summary,
+    c.refs.join(" "),
+    ...(options.showRepository ? [commitRepo(c) ?? ""] : []),
+    ...(options.showAuthor ? [c.author] : []),
+    ...(options.showDate ? [formatTime(options.commitTimestamp ? (c.commitTimeMs ?? c.timeMs) : c.timeMs)] : []),
+    ...(options.showHash ? [c.shortId] : []),
+  ];
+}
+
+/** Case-insensitive word/subsequence matching; columns never form an artificial word. */
+export function speedMatches(query: string, columns: readonly string[]): boolean {
+  return query
+    .toLocaleLowerCase()
+    .split(/\s+/)
+    .filter(Boolean)
+    .every((word) =>
+      columns.some((column) => {
+        let next = 0;
+        for (const c of column.toLocaleLowerCase()) if (c === word[next]) next++;
+        return next === word.length;
+      }),
+    );
+}
+
+export function nextSpeedMatch(
+  commits: readonly Commit[],
+  query: string,
+  options: LogOptions,
+  from: number,
+  direction = 1,
+) {
+  for (let step = 1; step <= commits.length; step++) {
+    const i = (from + direction * step + commits.length * 2) % commits.length;
+    if (speedMatches(query, visibleCommitText(commits[i]!, options))) return i;
+  }
+  return -1;
+}
diff --git a/src/features/vcs/logStore.ts b/src/features/vcs/logStore.ts
index 59ed9425..1cb26a4e 100644
--- a/src/features/vcs/logStore.ts
+++ b/src/features/vcs/logStore.ts
@@ -1,13 +1,22 @@
 /** Git log tool window state: filters, paged commits, graph, selection. */
 import { branchesByRepo, commitKey, commitRepo, graphCommit, mergeRepoLogs, type RepoCommit } from "./multiRoot";
 import { create } from "zustand";
-import type { Branch, BranchInfo, Commit } from "@/bindings";
-import { call, commands } from "@/platform/ipc";
+import { useContext } from "react";
+import { LogIdContext } from "./logContext";
+import { setContext } from "@/platform/context";
+import { maybeEditorService } from "@/workbench/contributions";
+import type { Branch, BranchInfo, Commit, LogQuery } from "@/bindings";
+import { call, commands, nextRequestId, type RequestId } from "@/platform/ipc";
 import { workflowSettings } from "@/platform/workflowSettings";
-import { collapseLinear, computeGraph, emptyGraphState, type GraphRow, type GraphState } from "./graph";
-import { logOptions, setLogOptions, type LogOptions } from "./logOptions";
+import { computeGraph, emptyGraphState, type GraphRow, type GraphState } from "./graph";
+import { logOptions, parseLogOptions, setLogOptions, useLogOptions, type LogOptions } from "./logOptions";
 import { clearConsole, errorMessage } from "./ops";
 import { currentRepo, currentRepoRoot, repoName, repoOf, useVcs } from "./store";
+import { chooseLogCommit } from "./CommitChooser";
+import { presentLogGraph } from "./logPresentation";
+import { toggleBookmark, updateBookmarks, useBookmarks } from "@/features/search/bookmarks/store";
+import { commitBookmarkPath, parseCommitBookmark } from "./logBookmarks";
+import { stripSlash } from "./model";
 
 /** Date filter: commits made (committer time) after / before the given times (epoch ms). */
 export interface LogDateFilter {
@@ -31,6 +40,8 @@ export interface LogFilters {
   matchCase: boolean;
   /** Absolute path (file or directory). */
   path: string | null;
+  paths?: string[];
+  range?: string | null;
   date: LogDateFilter | null;
 }
 
@@ -62,15 +73,37 @@ interface LogState {
   /** The current user (`user.email`, else `user.name`), for View Options › Highlight › My Commits. */
   user: string | null;
   generation: number;
+  viewsVersion: number;
+  seek: { repo: string | null; id: string } | null;
+  bookmarks: Record<string, string>;
+  fragments: LogFragments;
+}
+
+interface LogFragments {
+  expanded: ReadonlySet<string>;
+  collapsed: ReadonlySet<string>;
+  merges: ReadonlySet<string>;
+}
+
+const emptyFragments = (): LogFragments => ({ expanded: new Set(), collapsed: new Set(), merges: new Set() });
+
+function parseFragments(value: unknown): LogFragments {
+  const raw = value && typeof value === "object" ? (value as Record<string, unknown>) : {};
+  const ids = (value: unknown) =>
+    new Set((Array.isArray(value) ? (value as unknown[]) : []).filter((id): id is string => typeof id === "string"));
+  return { expanded: ids(raw.expanded), collapsed: ids(raw.collapsed), merges: ids(raw.merges) };
 }
 
 /** A log tab of its own (IDEA's "History: file" / "Log: branch" tabs): its own filters and view. */
 export interface LogTab {
   id: string;
-  kind: "history" | "branch";
+  kind: "history" | "branch" | "log" | "external";
   /** What it shows (the file path or the branch); opening the same again selects the tab. */
   target: string;
   repo?: string | null;
+  repositories?: string[];
+  location?: "toolWindow" | "editor";
+  readOnly?: boolean;
 }
 
 export const PAGE = 300;
@@ -93,7 +126,16 @@ export function toggleRepository(selected: readonly string[] | undefined, repo:
 
 /** Any filter other than the text field's toggles is set. */
 export function hasFilters(f: LogFilters): boolean {
-  return !!(f.repositories?.length || f.branches.length || f.authors.length || f.text || f.path || f.date);
+  return !!(
+    f.repositories?.length ||
+    f.branches.length ||
+    f.authors.length ||
+    f.text ||
+    f.path ||
+    f.paths?.length ||
+    f.range ||
+    f.date
+  );
 }
 
 /** `ME` replaced by the current user's email (or name); duplicates and blanks dropped. */
@@ -133,8 +175,9 @@ function currentUser(): Promise<string | null> {
   return me.value;
 }
 
-const initialLog = (): Omit<LogState, "generation"> => ({
+const initialLog = (): Omit<LogState, "generation" | "viewsVersion"> => ({
   filters: emptyFilters(),
+  seek: null,
   commits: [],
   rows: [],
   graph: emptyGraphState(),
@@ -151,9 +194,15 @@ const initialLog = (): Omit<LogState, "generation"> => ({
   branchScope: null,
   revealTick: 0,
   user: null,
+  bookmarks: {},
+  fragments: emptyFragments(),
 });
 
-export const useGitLog = create<LogState>(() => ({ ...initialLog(), generation: 0 }));
+export const useRootGitLog = create<LogState>(() => ({ ...initialLog(), generation: 0, viewsVersion: 0 }));
+export const useGitLog = Object.assign(function useScopedGitLog<T>(selector: (state: LogState) => T): T {
+  const id = useContext(LogIdContext);
+  return useRootGitLog((state) => selector(id && state.shownLog !== id ? { ...state, ...parked.get(id) } : state));
+}, useRootGitLog);
 
 /**
  * The refs the log shows: the remembered ones that still exist, else `HEAD` (the
@@ -207,41 +256,129 @@ export function initLogBranchFilter(): boolean {
 
 /** The Branch filter's setter: a choice in the main Log is remembered for the repository. */
 export function setLogBranches(branches: readonly string[]) {
+  useGitLog.setState({ seek: null });
+  const ranges = branches.filter((b) => b.includes(".."));
   const s = useGitLog.getState();
+  rememberRecentFilters(s.filters);
   const repo = s.shownLog === "log" ? currentRepoRoot() : null;
   useGitLog.setState({
-    filters: { ...s.filters, branches: [...branches] },
+    filters: {
+      ...s.filters,
+      branches: branches.filter((b) => !b.includes("..")),
+      range: ranges.length ? ranges.join("\n") : null,
+    },
     ...(repo ? { branchScope: repo } : {}),
   });
   if (repo) rememberLogBranches(repo, branches);
   void reloadLog();
 }
 
-let loadPromise: Promise<void> | null = null;
+const loadPromises = new Map<string, Promise<void>>();
+const pageRequests = new Map<string, Set<RequestId>>();
+let generationSequence = 0;
+const nextGeneration = () => (generationSequence = Math.max(generationSequence, useGitLog.getState().generation) + 1);
+
+function cancelLogRequests(id?: string) {
+  for (const [view, requests] of pageRequests) {
+    if (id && view !== id) continue;
+    for (const request of requests) void commands.cancelRequest(request).catch(() => undefined);
+    requests.clear();
+    loadPromises.delete(view);
+  }
+}
 
 /** What a log tab shows: the store fields swapped in and out when another log tab is selected. */
 type LogView = Pick<
   LogState,
-  "filters" | "commits" | "rows" | "graph" | "loading" | "done" | "error" | "selected" | "selection" | "revealTick"
->;
+  | "filters"
+  | "seek"
+  | "commits"
+  | "rows"
+  | "graph"
+  | "loading"
+  | "done"
+  | "error"
+  | "selected"
+  | "selection"
+  | "revealTick"
+  | "fragments"
+  | "generation"
+> & { options: LogOptions };
 
 function freshView(filters: LogFilters): LogView {
-  const { commits, rows, graph, loading, done, error, selected, selection, revealTick } = initialLog();
-  return { filters, commits, rows, graph, loading, done, error, selected, selection, revealTick };
+  const { commits, rows, graph, loading, done, error, selected, selection, revealTick, fragments } = initialLog();
+  return {
+    filters,
+    seek: null,
+    commits,
+    rows,
+    graph,
+    loading,
+    done,
+    error,
+    selected,
+    selection,
+    revealTick,
+    fragments,
+    options: logOptions(),
+    generation: nextGeneration(),
+  };
 }
 
 /** Views of the log tabs not shown now. */
 const parked = new Map<string, LogView>();
 
 function currentView(): LogView {
-  const { filters, commits, rows, graph, done, error, selected, selection, revealTick } = useGitLog.getState();
-  // A page still loading is dropped (the generation changes): loaded again when shown.
-  return { filters, commits, rows, graph, loading: false, done, error, selected, selection, revealTick };
+  const {
+    filters,
+    commits,
+    rows,
+    graph,
+    done,
+    error,
+    selected,
+    selection,
+    revealTick,
+    fragments,
+    loading,
+    generation,
+    seek,
+  } = useGitLog.getState();
+  return {
+    filters,
+    commits,
+    rows,
+    graph,
+    loading,
+    seek,
+    generation,
+    done,
+    error,
+    selected,
+    selection,
+    revealTick,
+    fragments,
+    options: logOptions(),
+  };
 }
 
 export const isLogTab = (id: string, tabs: readonly LogTab[] = useGitLog.getState().logTabs) =>
   id === "log" || tabs.some((t) => t.id === id);
 
+export function logState(id = useGitLog.getState().shownLog): LogState {
+  const state = useGitLog.getState();
+  return id === state.shownLog ? state : { ...state, ...parked.get(id), shownLog: id };
+}
+
+function setViewState(id: string, patch: Partial<LogState> | ((state: LogState) => Partial<LogState>)) {
+  const update = typeof patch === "function" ? patch(logState(id)) : patch;
+  if (id === useGitLog.getState().shownLog) useGitLog.setState(update);
+  else if (parked.has(id)) {
+    parked.set(id, { ...parked.get(id)!, ...update });
+    useGitLog.setState((s) => ({ viewsVersion: s.viewsVersion + 1 }));
+  }
+}
+
 /** Puts the view of log tab `id` into the store, parking the one shown. */
 function showLogView(id: string) {
   const s = useGitLog.getState();
@@ -249,11 +386,21 @@ function showLogView(id: string) {
   parked.set(s.shownLog, currentView());
   const view = parked.get(id) ?? freshView(emptyFilters());
   parked.delete(id);
-  loadPromise = null;
-  useGitLog.setState({ ...view, shownLog: id, generation: s.generation + 1 });
+  const { options, ...state } = view;
+  setLogOptions(options);
+  useGitLog.setState({ ...state, shownLog: id });
   if (!view.commits.length) void reloadLog();
 }
 
+export const focusLogView = (id: string) => showLogView(id);
+export const parkedLogOptions = (id: string): LogOptions | undefined => parked.get(id)?.options;
+
+export function ensureEditorLog(id: string, label: string) {
+  if (useGitLog.getState().logTabs.some((t) => t.id === id)) return;
+  parked.set(id, freshView(emptyFilters()));
+  useGitLog.setState((s) => ({ logTabs: [...s.logTabs, { id, kind: "log", target: label, location: "editor" }] }));
+}
+
 /** Selects a content tab of the Git tool window; a log tab brings its own filters and commits. */
 export function selectGitTab(id: string) {
   if (isLogTab(id)) showLogView(id);
@@ -262,22 +409,83 @@ export function selectGitTab(id: string) {
 
 let tabSeq = 0;
 
+/**
+ * The repository whose history Show History lists: a repository's own root (a submodule
+ * folder included) is its own history, as in IDEA, not the folder's history in the
+ * enclosing repository; any other path belongs to the innermost repository containing it.
+ */
+function historyRepo(target: string): string | null {
+  const roots = useVcs.getState().roots;
+  const path = stripSlash(target);
+  return roots.includes(path) ? path : repoOf(target);
+}
+
 /**
  * Opens (or selects) a log tab of its own, leaving the main Log and its filters as
  * they are: Show History for a file, Show Git Log for a branch.
  */
-export function openLogTab(kind: LogTab["kind"], target: string): string {
-  const repo = kind === "history" ? repoOf(target) : currentRepoRoot();
-  const existing = useGitLog.getState().logTabs.find((t) => t.kind === kind && t.target === target && t.repo === repo);
+export function openLogTab(
+  kind: LogTab["kind"],
+  target: string,
+  location: LogTab["location"] = "toolWindow",
+  repositories?: string[],
+): string {
+  const active = useGitLog.getState().logTabs.find((t) => t.id === useGitLog.getState().shownLog);
+  repositories ??=
+    (kind === "log" || kind === "branch") && active?.readOnly
+      ? (active.repositories ?? (active.repo ? [active.repo] : undefined))
+      : undefined;
+  const repo =
+    kind === "external"
+      ? target
+      : kind === "history"
+        ? (historyRepo(target) ??
+          active?.repositories?.find((repo) => target === repo || target.startsWith(`${repo}/`)) ??
+          (active?.repo && target.startsWith(`${active.repo}/`) ? active.repo : null))
+        : (active?.repo ?? (kind === "log" ? null : currentRepoRoot()));
+  const existing =
+    kind !== "log" &&
+    useGitLog
+      .getState()
+      .logTabs.find(
+        (t) =>
+          t.kind === kind &&
+          (kind === "external" && repositories?.length
+            ? JSON.stringify([...(t.repositories ?? (t.repo ? [t.repo] : []))].sort()) ===
+              JSON.stringify([...repositories].sort())
+            : t.target === target && t.repo === repo),
+      );
   if (existing) {
     selectGitTab(existing.id);
     return existing.id;
   }
   const id = `${kind}:${++tabSeq}`;
-  const filters = { ...emptyFilters(), ...(kind === "history" ? { path: target } : { branches: [target] }) };
+  const filters =
+    kind === "log"
+      ? { ...useGitLog.getState().filters }
+      : {
+          ...emptyFilters(),
+          ...(kind === "history" ? { path: target } : kind === "branch" ? { branches: [target] } : {}),
+        };
   parked.set(id, freshView(filters));
-  useGitLog.setState((s) => ({ logTabs: [...s.logTabs, { id, kind, target, repo }] }));
-  selectGitTab(id);
+  useGitLog.setState((s) => ({
+    logTabs: [
+      ...s.logTabs,
+      {
+        id,
+        kind,
+        target,
+        repo: repositories?.length ? null : repo,
+        repositories,
+        location,
+        readOnly: kind === "external" || active?.readOnly === true,
+      },
+    ],
+  }));
+  if (location === "editor" && maybeEditorService()) {
+    showLogView(id);
+    void maybeEditorService()!.openInput({ kind: "git-log", key: `git-log:${id}`, data: { id, label: target } });
+  } else selectGitTab(id);
   return id;
 }
 
@@ -286,6 +494,7 @@ export function closeLogTab(id: string) {
   const s = useGitLog.getState();
   if (!s.logTabs.some((t) => t.id === id)) return;
   if (s.shownLog === id) showLogView("log");
+  cancelLogRequests(id);
   parked.delete(id);
   useGitLog.setState((l) => ({
     logTabs: l.logTabs.filter((t) => t.id !== id),
@@ -298,48 +507,279 @@ export function closeLogTab(id: string) {
  * and console. Repository selection does not change the log or its history tabs.
  */
 export function installGitLog(): () => void {
-  return useVcs.subscribe((s, prev) => {
+  const trackFocus = (event: FocusEvent) =>
+    setContext("vcsLogFocus", event.target instanceof Element && !!event.target.closest("[data-git-log]"));
+  document.addEventListener("focusin", trackFocus);
+  restoreLogSession(useVcs.getState().root);
+  const unsubscribeLog = useGitLog.subscribe(() => saveLogSession(useVcs.getState().root));
+  const unsubscribeOptions = useLogOptions.subscribe(() => saveLogSession(useVcs.getState().root));
+  const migratedBookmarks = new Set<string>();
+  const syncBookmarks = () => {
+    const root = useVcs.getState().root;
+    if (useBookmarks.getState().scope !== root) return;
+    if (root && !migratedBookmarks.has(root)) {
+      migratedBookmarks.add(root);
+      for (const [key, text] of Object.entries(useGitLog.getState().bookmarks)) {
+        const split = key.lastIndexOf("\0");
+        const repo = split < 0 ? root : key.slice(0, split),
+          id = key.slice(split + 1);
+        const path = `git-log:${encodeURIComponent(repo)}#${id}`;
+        if (!useBookmarks.getState().items.some((b) => b.path === path))
+          updateBookmarks((items) => toggleBookmark(items, path, 0, text));
+      }
+    }
+    useGitLog.setState({
+      bookmarks: Object.fromEntries(
+        useBookmarks.getState().items.flatMap((b) => {
+          const c = parseCommitBookmark(b.path);
+          return c ? [[commitKey({ repo: c.repo, id: c.id }), b.description || b.text]] : [];
+        }),
+      ),
+    });
+  };
+  syncBookmarks();
+  const unsubscribeBookmarks = useBookmarks.subscribe(syncBookmarks);
+  const unsubscribeVcs = useVcs.subscribe((s, prev) => {
     if (s.root !== prev.root) {
-      loadPromise = null;
+      saveLogSession(prev.root);
+      restoring = true;
+      cancelLogRequests();
+      loadPromises.clear();
       parked.clear();
       useGitLog.setState((l) => ({
         ...initialLog(),
+        bookmarks: {},
         tab: isLogTab(l.tab, l.logTabs) ? "log" : l.tab,
         generation: l.generation + 1,
       }));
       clearConsole();
+      restoreLogSession(s.root);
+      syncBookmarks();
+      restoring = false;
     } else if (s.roots !== prev.roots) {
-      for (const [id, view] of parked) parked.set(id, freshView(view.filters));
+      for (const [id, view] of parked) parked.set(id, { ...freshView(view.filters), options: view.options });
       void reloadLog();
     }
   });
+  return () => {
+    saveLogSession(useVcs.getState().root);
+    cancelLogRequests();
+    unsubscribeLog();
+    unsubscribeOptions();
+    unsubscribeBookmarks();
+    unsubscribeVcs();
+    document.removeEventListener("focusin", trackFocus);
+    setContext("vcsLogFocus", false);
+  };
+}
+
+let restoring = false;
+const sessionKey = (root: string) => `openidea.vcs.logSession.v1:${root}`;
+
+function parseFilters(value: unknown): LogFilters {
+  if (!value || typeof value !== "object") return emptyFilters();
+  const raw = value as Record<string, unknown>;
+  const strings = (v: unknown): string[] =>
+    Array.isArray(v) ? v.filter((s): s is string => typeof s === "string") : [];
+  const filters = {
+    ...emptyFilters(),
+    branches: strings(raw.branches),
+    authors: strings(raw.authors),
+    repositories: strings(raw.repositories),
+    paths: strings(raw.paths),
+    text: typeof raw.text === "string" ? raw.text : "",
+    path: typeof raw.path === "string" ? raw.path : null,
+    range: typeof raw.range === "string" ? raw.range : null,
+    regex: raw.regex === true,
+    matchCase: raw.matchCase === true,
+  };
+  if (raw.date && typeof raw.date === "object") {
+    const date = raw.date as Record<string, unknown>;
+    if (
+      (date.after == null || (typeof date.after === "number" && Number.isFinite(date.after))) &&
+      (date.before == null || (typeof date.before === "number" && Number.isFinite(date.before)))
+    )
+      filters.date = {
+        after: (date.after as number | null) ?? null,
+        before: (date.before as number | null) ?? null,
+        label: typeof date.label === "string" ? date.label : "",
+      };
+  }
+  return filters;
+}
+
+function saveLogSession(root: string | null) {
+  if (!root || restoring) return;
+  const state = useGitLog.getState();
+  const views = new Map(parked).set(state.shownLog, currentView());
+  try {
+    localStorage.setItem(
+      sessionKey(root),
+      JSON.stringify({
+        version: 1,
+        active: state.shownLog,
+        tabs: state.logTabs,
+        bookmarks: state.bookmarks,
+        views: [...views].map(([id, view]) => ({
+          id,
+          filters: view.filters,
+          options: view.options,
+          fragments: Object.fromEntries(Object.entries(view.fragments).map(([key, ids]) => [key, [...ids]])),
+          selected: view.selected,
+          selection: view.selection,
+        })),
+      }),
+    );
+  } catch {
+    /* A full or unavailable store leaves this session usable. */
+  }
+}
+
+function restoreLogSession(root: string | null) {
+  if (!root) return;
+  restoring = true;
+  try {
+    const raw: unknown = JSON.parse(localStorage.getItem(sessionKey(root)) ?? "null");
+    if (!raw || typeof raw !== "object" || !("version" in raw) || raw.version !== 1) return;
+    const value = raw as { tabs?: unknown; views?: unknown; active?: unknown; bookmarks?: unknown };
+    const tabs = Array.isArray(value.tabs)
+      ? value.tabs.filter(
+          (tab): tab is LogTab =>
+            !!tab &&
+            typeof tab === "object" &&
+            typeof tab.id === "string" &&
+            typeof tab.target === "string" &&
+            ["history", "branch", "log", "external"].includes(tab.kind) &&
+            (tab.repo == null || typeof tab.repo === "string"),
+        )
+      : [];
+    for (const tab of tabs) tabSeq = Math.max(tabSeq, Number(tab.id.split(":").at(-1)) || 0);
+    const ids = new Set(["log", ...tabs.map((t) => t.id)]);
+    if (Array.isArray(value.views))
+      for (const view of value.views) {
+        if (view && typeof view === "object" && typeof view.id === "string" && ids.has(view.id))
+          parked.set(view.id, {
+            ...freshView(parseFilters(view.filters)),
+            options: parseLogOptions(view.options),
+            fragments: parseFragments(view.fragments),
+            selected: typeof view.selected === "string" ? view.selected : null,
+            selection: Array.isArray(view.selection)
+              ? (view.selection as unknown[]).filter((id): id is string => typeof id === "string")
+              : [],
+          });
+      }
+    const id = typeof value.active === "string" && ids.has(value.active) ? value.active : "log";
+    const view = parked.get(id) ?? freshView(emptyFilters());
+    parked.delete(id);
+    const { options, ...state } = view;
+    setLogOptions(options);
+    const bookmarks =
+      value.bookmarks && typeof value.bookmarks === "object"
+        ? Object.fromEntries(
+            Object.entries(value.bookmarks).filter((entry): entry is [string, string] => typeof entry[1] === "string"),
+          )
+        : {};
+    useGitLog.setState({ ...state, tab: id, shownLog: id, logTabs: tabs, branchScope: root, bookmarks });
+  } catch {
+    /* Invalid or newer state starts with a fresh log. */
+  } finally {
+    restoring = false;
+  }
+}
+
+export function toggleCommitBookmark(commit: Commit) {
+  updateBookmarks((items) => toggleBookmark(items, commitBookmarkPath(commit), 0, commit.summary));
+  useGitLog.setState((state) => {
+    const bookmarks = { ...state.bookmarks };
+    const key = commitKey(commit);
+    if (useBookmarks.getState().items.some((b) => b.path === commitBookmarkPath(commit)))
+      bookmarks[key] = commit.summary;
+    else delete bookmarks[key];
+    return { bookmarks };
+  });
+}
+
+export function recentFilterValues<K extends keyof LogFilters>(name: K): LogFilters[K][] {
+  try {
+    return JSON.parse(
+      localStorage.getItem(`openidea.vcs.logRecent.v1:${useVcs.getState().root}:${name}`) ?? "[]",
+    ) as LogFilters[K][];
+  } catch {
+    return [];
+  }
+}
+
+export function recentLogFilters(): LogFilters[] {
+  try {
+    const raw: unknown = JSON.parse(
+      localStorage.getItem(`openidea.vcs.logFilters.v1:${useVcs.getState().root}`) ?? "[]",
+    );
+    return Array.isArray(raw) ? raw.slice(0, 10).map(parseFilters) : [];
+  } catch {
+    return [];
+  }
+}
+
+function rememberRecentFilters(before: LogFilters) {
+  for (const name of Object.keys(before) as Array<keyof LogFilters>) {
+    const value = before[name];
+    if (value == null || value === "" || (Array.isArray(value) && !value.length)) continue;
+    try {
+      localStorage.setItem(
+        `openidea.vcs.logRecent.v1:${useVcs.getState().root}:${name}`,
+        JSON.stringify(
+          [value, ...recentFilterValues(name).filter((v) => JSON.stringify(v) !== JSON.stringify(value))].slice(0, 10),
+        ),
+      );
+    } catch {
+      /* Storage can be unavailable. */
+    }
+  }
+  if (hasFilters(before)) {
+    try {
+      const recent = [before, ...recentLogFilters().filter((f) => JSON.stringify(f) !== JSON.stringify(before))].slice(
+        0,
+        10,
+      );
+      localStorage.setItem(`openidea.vcs.logFilters.v1:${useVcs.getState().root}`, JSON.stringify(recent));
+    } catch {
+      /* Recent filters are optional session state. */
+    }
+  }
 }
 
 export function setLogFilters(patch: Partial<LogFilters>) {
-  useGitLog.setState((s) => ({ filters: { ...s.filters, ...patch } }));
+  useGitLog.setState({ seek: null });
+  rememberRecentFilters(useGitLog.getState().filters);
+  useGitLog.setState((s) => ({ filters: { ...s.filters, ...("branches" in patch ? { range: null } : {}), ...patch } }));
   // History of a file in another repository: that repository's log.
   void reloadLog();
 }
 
 /** Reloads history, optionally keeping the current view until its replacement arrives. */
-export function reloadLog({ preserve = false }: { preserve?: boolean } = {}): Promise<void> {
-  useGitLog.setState((s) => ({
+export function reloadLog(
+  { preserve = false }: { preserve?: boolean } = {},
+  id = useGitLog.getState().shownLog,
+): Promise<void> {
+  cancelLogRequests(id);
+  const next = nextGeneration();
+  setViewState(id, () => ({
     ...(preserve ? {} : { commits: [], rows: [], graph: emptyGraphState(), done: false }),
     loading: true,
     error: null,
-    generation: s.generation + 1,
+    generation: next,
   }));
-  loadPromise = null;
-  void loadOutgoing();
-  const generation = useGitLog.getState().generation;
+  loadPromises.delete(id);
+  void loadOutgoing(id);
+  const generation = logState(id).generation;
   void currentUser().then((user) => {
-    if (useGitLog.getState().generation === generation) useGitLog.setState({ user });
+    if (logState(id).generation === generation) setViewState(id, { user });
   });
-  return loadPage(true);
+  return loadPage(true, id);
 }
 
-async function loadOutgoing() {
-  const generation = useGitLog.getState().generation;
+async function loadOutgoing(id: string) {
+  const generation = logState(id).generation;
   const roots = useVcs.getState().roots.length ? useVcs.getState().roots : [currentRepo()];
   const outgoing = new Set<string>();
   const tracked = new Set<string>();
@@ -366,7 +806,7 @@ async function loadOutgoing() {
       }
     }),
   );
-  if (useGitLog.getState().generation === generation) useGitLog.setState({ outgoing, tracked });
+  if (logState(id).generation === generation) setViewState(id, { outgoing, tracked });
 }
 
 /** The commit is on the upstream of the current branch (rewriting it needs a force push). */
@@ -376,38 +816,60 @@ export function isPushed(id: string): boolean {
   return !!c && tracked.has(commitRepo(c) ?? "") && !!outgoing && !outgoing.has(id);
 }
 
-export function loadMore(): Promise<void> {
-  return loadPage(false);
+export function loadMore(id = useGitLog.getState().shownLog): Promise<void> {
+  return loadPage(false, id);
 }
 
-function loadPage(replace: boolean): Promise<void> {
-  const s = useGitLog.getState();
-  if (!replace && s.done) return Promise.resolve();
-  if (loadPromise) return loadPromise;
+export function loadNewer(id = useGitLog.getState().shownLog): Promise<void> {
+  return loadPage(false, id, true);
+}
+
+function loadPage(replace: boolean, id: string, before = false): Promise<void> {
+  const s = logState(id);
+  if (!replace && !before && s.done) return Promise.resolve();
+  const existing = loadPromises.get(id);
+  if (existing) return existing;
   const gen = s.generation;
   const f = s.filters;
   // Settings › Version Control › Limit history to N rows (file / folder history).
   const vcs = workflowSettings().vcs;
-  const cap = f.path && vcs.limitHistory ? vcs.historyLimit : Infinity;
+  const cap = (f.path || f.paths?.length) && vcs.limitHistory ? vcs.historyLimit : Infinity;
   const loaded = replace ? 0 : s.commits.length;
   if (loaded >= cap) {
-    useGitLog.setState({ done: true, loading: false });
+    setViewState(id, { done: true, loading: false });
     return Promise.resolve();
   }
-  useGitLog.setState({ loading: true });
+  setViewState(id, { loading: true });
   const p = (async () => {
     try {
-      const o = logOptions();
+      const o = id === useGitLog.getState().shownLog ? logOptions() : parked.get(id)!.options;
       const tab = s.logTabs.find((t) => t.id === s.shownLog);
-      const roots = tab?.repo
-        ? [tab.repo]
-        : f.path
-          ? [repoOf(f.path)]
-          : f.repositories?.length
-            ? f.repositories
-            : useVcs.getState().roots.length
-              ? useVcs.getState().roots
-              : [currentRepo()];
+      if (tab?.readOnly)
+        for (const repo of tab.repositories ?? (tab.repo ? [tab.repo] : []))
+          await call(commands.vcsOpenExternalLog(repo));
+      const tabRoots = tab?.repositories ?? (tab?.repo ? [tab.repo] : []);
+      const ownerOf = (path: string) =>
+        tabRoots
+          .filter((repo) => path === repo || path.startsWith(`${repo}/`))
+          .sort((a, b) => b.length - a.length)[0] ?? repoOf(path);
+      const pathRoots = f.path ? [ownerOf(f.path)] : f.paths?.length ? [...new Set(f.paths.map(ownerOf))] : null;
+      const roots = (
+        tab?.repositories?.length
+          ? tab.repositories
+          : tab?.repo
+            ? [tab.repo]
+            : pathRoots
+              ? pathRoots
+              : f.repositories?.length
+                ? f.repositories
+                : useVcs.getState().roots.length
+                  ? useVcs.getState().roots
+                  : [currentRepo()]
+      ).filter(
+        (repo) =>
+          (!pathRoots || pathRoots.includes(repo)) &&
+          (!f.repositories?.length || (!!repo && f.repositories.includes(repo))),
+      );
       const limit = Math.min(replace ? Math.max(PAGE, s.commits.length) : PAGE, cap - loaded);
       const refs = await branchesByRepo(roots.filter((r): r is string => !!r));
       const knownRefs = new Set(
@@ -415,6 +877,7 @@ function loadPage(replace: boolean): Promise<void> {
           .flat()
           .map((b) => b.name),
       );
+      let joined = false;
       const results = await Promise.allSettled(
         roots.map(async (repo) => {
           const branches = f.branches.filter(
@@ -422,68 +885,163 @@ function loadPage(replace: boolean): Promise<void> {
           );
           if (f.branches.length && !branches.length) return [];
           const config = (key: string) => call(commands.vcsConfigGet(repo, key)).catch(() => null);
-          const user = (await config("user.email")) || (await config("user.name"));
-          const ownAuthors = resolveAuthors(f.authors, user);
+          const [userEmail, userName] = await Promise.all([config("user.email"), config("user.name")]);
+          const user = userEmail || userName;
+          const ownAuthors = [
+            ...new Set([...resolveAuthors(f.authors, user), ...(f.authors.includes(ME) && userName ? [userName] : [])]),
+          ];
           if (f.authors.length && !ownAuthors.length) return [];
-          const page = await call(
-            commands.vcsLog(repo, {
+          if (logState(id).generation !== gen) return [];
+          const previous = s.commits.filter((c) => commitRepo(c) === repo);
+          const boundary =
+            replace &&
+            roots.length === 1 &&
+            previous.length &&
+            branches.length === 1 &&
+            branches[0] === "HEAD" &&
+            !f.text &&
+            !f.authors.length &&
+            !f.path &&
+            !f.paths?.length &&
+            !f.range &&
+            !f.date &&
+            !o.noMerges &&
+            !o.firstParent
+              ? previous[0]!.id
+              : null;
+          const firstPosition = previous[0]?.logPosition ?? 0;
+          if (before && !firstPosition) return [];
+          const fetchPage = (stopAt: string | null) => {
+            const request = nextRequestId();
+            const requests = pageRequests.get(id) ?? new Set<RequestId>();
+            pageRequests.set(id, requests);
+            requests.add(request);
+            const query: LogQuery = {
               branch: null,
               branches,
               authors: ownAuthors,
+              authorsExact: true,
               path: f.path,
+              paths: f.paths?.filter((path) => ownerOf(path) === repo),
+              follow: tab?.kind === "history",
               author: null,
               text: f.text.trim() || null,
               textRegex: f.regex,
               textMatchCase: f.matchCase,
               range: null,
-              skip: replace ? 0 : s.commits.filter((c) => commitRepo(c) === repo).length,
-              limit,
+              ranges: f.range?.split(/\s+/).filter(Boolean) ?? [],
+              request,
+              summaryOnly: true,
+              stopAt,
+              retainUntil: replace ? (previous.at(-1)?.id ?? null) : null,
+              skip: before
+                ? Math.max(0, firstPosition - PAGE)
+                : replace
+                  ? 0
+                  : previous.at(-1)?.logPosition != null
+                    ? previous.at(-1)!.logPosition! + 1
+                    : previous.length,
+              seek: replace ? (s.seek?.repo === repo ? s.seek.id : null) : null,
+              limit: before ? Math.min(PAGE, firstPosition) : limit,
               order: o.sort,
               firstParent: o.firstParent,
               noMerges: o.noMerges,
-              // The date filter runs in the backend so the graph stays connected.
               sinceMs: f.date?.after ?? null,
               untilMs: f.date?.before ?? null,
-            }),
-          );
+            };
+            return call(commands.vcsLog(repo, query)).finally(() => requests.delete(request));
+          };
+          let page: RepoCommit[] = await fetchPage(boundary);
+          if (boundary && page.at(-1)?.id === boundary) {
+            const linear = page
+              .slice(0, -1)
+              .every((c, i) => c.parents.length === 1 && c.parents[0] === page[i + 1]!.id);
+            if (linear) {
+              const decorations = await call(commands.vcsLogRefs(repo)).catch(() => null);
+              if (decorations) {
+                const labels = new Map<string, string[]>();
+                for (const [name, id] of Object.entries(decorations))
+                  if (id) labels.set(id, [...(labels.get(id) ?? []), name]);
+                const old = previous.map((c) => {
+                  const refs = labels.get(c.id) ?? [];
+                  return refs.length === c.refs.length && refs.every((ref) => c.refs.includes(ref))
+                    ? c
+                    : { ...c, refs };
+                });
+                page = [...page.slice(0, -1), ...old];
+                joined = true;
+              } else page = await fetchPage(null);
+            } else page = await fetchPage(null);
+          }
           return page.map((c) => ({
             ...c,
             repo,
             user,
+            userName,
+            readOnly: tab?.readOnly === true,
             remoteNames: repo ? refs[repo]?.filter((b) => b.remote).map((b) => b.name) : undefined,
           }));
         }),
       );
-      const streams = results.flatMap((r) => (r.status === "fulfilled" ? [r.value] : []));
+      const streams = results.map((r, i) =>
+        r.status === "fulfilled" ? r.value : replace ? s.commits.filter((c) => commitRepo(c) === roots[i]) : [],
+      );
       const failures = results.flatMap((r, i) =>
         r.status === "rejected" ? [`${roots[i] ? repoName(roots[i]!) : "Git"}: ${errorMessage(r.reason)}`] : [],
       );
-      const page = mergeRepoLogs(streams, limit);
-      const cur = useGitLog.getState();
+      const currentStreams = before ? roots.map((repo) => s.commits.filter((c) => commitRepo(c) === repo)) : [];
+      const page = mergeRepoLogs(
+        before ? streams.map((stream, i) => [...stream, ...(currentStreams[i] ?? [])]) : streams,
+        before || joined || s.seek || (replace && s.commits.length) ? Number.MAX_SAFE_INTEGER : limit,
+      );
+      const cur = logState(id);
       if (cur.generation !== gen) return;
-      if (replace && failures.length === results.length && cur.commits.length) {
-        useGitLog.setState({ error: failures.join("\n") });
+      if (replace && results.length > 0 && failures.length === results.length && cur.commits.length) {
+        setViewState(id, { error: failures.join("\n") });
         return;
       }
-      const { rows, state } = computeGraph(page.map(graphCommit), replace ? emptyGraphState() : cur.graph);
-      useGitLog.setState({
-        commits: replace ? page : cur.commits.concat(page),
-        rows: replace ? rows : cur.rows.concat(rows),
+      const commits =
+        replace || before
+          ? page
+          : mergeRepoLogs(
+              roots.map((repo) => [
+                ...cur.commits.filter((c) => commitRepo(c) === repo),
+                ...page.filter((c) => commitRepo(c) === repo),
+              ]),
+              Number.MAX_SAFE_INTEGER,
+            );
+      const { rows, state } = computeGraph(commits.map(graphCommit));
+      setViewState(id, {
+        commits,
+        rows,
         graph: state,
-        done: page.length < limit || loaded + page.length >= cap,
+        done: before
+          ? cur.done
+          : commits.length >= cap
+            ? true
+            : page.length && page.every((c) => c.logTotal != null)
+              ? roots.every((repo, i) => {
+                  const last = commits.findLast((c) => commitRepo(c) === repo);
+                  return (
+                    !streams[i]?.length || (last != null && last.logPosition! + 1 >= streams[i]!.at(-1)!.logTotal!)
+                  );
+                })
+              : joined
+                ? s.done
+                : page.length < limit || loaded + page.length >= cap,
         error: failures.join("\n") || null,
       });
     } catch (e) {
-      if (useGitLog.getState().generation === gen)
-        useGitLog.setState({ error: errorMessage(e), done: replace && s.commits.length ? s.done : true });
+      if (logState(id).generation === gen)
+        setViewState(id, { error: errorMessage(e), done: replace && s.commits.length ? s.done : true });
     } finally {
-      if (useGitLog.getState().generation === gen) {
-        useGitLog.setState({ loading: false });
-        loadPromise = null;
+      if (logState(id).generation === gen) {
+        setViewState(id, { loading: false });
+        loadPromises.delete(id);
       }
     }
   })();
-  loadPromise = p;
+  loadPromises.set(id, p);
   return p;
 }
 
@@ -507,8 +1065,7 @@ export function selectCommit(id: string | null, reveal = false) {
 /** Cmd/Ctrl-click: toggles `id` in the selection. */
 export function toggleCommitSelection(id: string) {
   useGitLog.setState((s) => {
-    const repo = commitRepo(s.commits.find((c) => commitKey(c) === id)!);
-    const existing = s.selection.filter((key) => commitRepo(s.commits.find((c) => commitKey(c) === key)!) === repo);
+    const existing = s.selection;
     const on = existing.includes(id);
     const selection = on ? existing.filter((x) => x !== id) : [...existing, id];
     return { selection, selected: on ? (selection[selection.length - 1] ?? null) : id };
@@ -523,10 +1080,7 @@ export function extendCommitSelection(id: string, visible: readonly Commit[]) {
     const b = visible.findIndex((c) => commitKey(c) === id);
     if (a < 0 || b < 0) return { selected: id, selection: [id] };
     const [from, to] = a <= b ? [a, b] : [b, a];
-    const range = visible
-      .slice(from, to + 1)
-      .filter((c) => commitRepo(c) === commitRepo(visible[b]!))
-      .map(commitKey);
+    const range = visible.slice(from, to + 1).map(commitKey);
     // Keep the anchor first so further extensions pivot on it.
     return {
       selected: id,
@@ -542,11 +1096,20 @@ export function selectedCommits(): Commit[] {
   return commits.filter((c) => ids.has(commitKey(c)));
 }
 
-const MAX_SEARCH_PAGES = 30;
+/** Stop on completion, failure, or a superseding view; depth is never a limit. */
+async function pageUntil(find: () => boolean) {
+  const generation = useGitLog.getState().generation;
+  while (!find() && !useGitLog.getState().done && useGitLog.getState().generation === generation) {
+    const before = useGitLog.getState().commits.length;
+    await loadMore();
+    if (useGitLog.getState().commits.length <= before) break;
+  }
+}
 
 /** Selects `id` in the log, clearing filters and paging until it is loaded. */
-export async function revealCommit(id: string, repo = currentRepo()) {
-  selectGitTab("log");
+export async function revealCommit(id: string, repo = currentRepo(), tab = "log") {
+  if (useGitLog.getState().logTabs.find((t) => t.id === tab)?.location === "editor") showLogView(tab);
+  else selectGitTab(tab);
   const f = useGitLog.getState().filters;
   const filtered = hasFilters(f);
   const find = () =>
@@ -555,36 +1118,81 @@ export async function revealCommit(id: string, repo = currentRepo()) {
       .commits.find((c) => (!commitRepo(c) || commitRepo(c) === repo) && (c.id === id || c.id.startsWith(id)));
   if (filtered) {
     useGitLog.setState({ filters: emptyFilters() });
-    await reloadLog();
+    const load = reloadLog();
+    const generation = useGitLog.getState().generation;
+    await load;
+    if (useGitLog.getState().generation !== generation) return;
   } else if (!useGitLog.getState().commits.length) {
-    await reloadLog();
+    const load = reloadLog();
+    const generation = useGitLog.getState().generation;
+    await load;
+    if (useGitLog.getState().generation !== generation) return;
   }
-  for (let i = 0; i < MAX_SEARCH_PAGES && !find() && !useGitLog.getState().done; i++) await loadMore();
+  const generation = useGitLog.getState().generation;
+  await pageUntil(() => !!find());
+  if (useGitLog.getState().generation !== generation) return;
   const hit = find();
   if (hit) selectCommit(commitKey(hit), true);
 }
 
-/** Go to Parent Commit: selects the first parent, paging the log until it is loaded. */
+/** Navigate visible graph parents, offering a choice at a merge. */
+export function displayedLogGraph() {
+  const s = useGitLog.getState();
+  const heads = useVcs.getState().heads;
+  return presentLogGraph(
+    s.commits,
+    logOptions(),
+    s.fragments,
+    new Set([
+      ...s.selection,
+      ...Object.keys(s.bookmarks),
+      ...s.commits
+        .filter((c) => c.refs.includes("HEAD") || c.id === heads[commitRepo(c) ?? ""]?.headCommit)
+        .map(commitKey),
+    ]),
+  );
+}
+
 export async function goToParent(c: Commit) {
-  const parent = c.parents[0];
-  if (!parent) return;
-  const find = () => useGitLog.getState().commits.find((x) => x.id === parent && commitRepo(x) === commitRepo(c));
-  for (let i = 0; i < MAX_SEARCH_PAGES && !find() && !useGitLog.getState().done; i++) await loadMore();
-  if (find()) selectCommit(commitKey(find()!), true);
+  const generation = useGitLog.getState().generation;
+  const parents = () => displayedLogGraph().graph.find((x) => x.id === commitKey(c))?.parents ?? [];
+  if (!parents().length) return;
+  const find = () => displayedLogGraph().commits.filter((x) => parents().includes(commitKey(x)));
+  await pageUntil(() => find().length === parents().length);
+  if (useGitLog.getState().generation !== generation) return;
+  const candidates = find();
+  const chosen = candidates.length > 1 ? await chooseLogCommit(candidates, "Select Parent Commit") : candidates[0];
+  if (chosen && useGitLog.getState().generation === generation) selectCommit(commitKey(chosen), true);
 }
 
 /** Go to Child Commit: the nearest newer loaded commit having `c` as a parent. */
-export function goToChild(c: Commit) {
-  const { commits } = useGitLog.getState();
-  const index = commits.findIndex((x) => commitKey(x) === commitKey(c));
-  for (let i = index - 1; i >= 0; i--) {
-    if (commitRepo(commits[i]!) === commitRepo(c) && commits[i]!.parents.includes(c.id))
-      return selectCommit(commitKey(commits[i]!), true);
-  }
+export async function goToChild(c: Commit) {
+  const { commits, generation } = useGitLog.getState();
+  const children = new Set(
+    displayedLogGraph()
+      .graph.filter((x) => x.parents.includes(commitKey(c)))
+      .map((x) => x.id),
+  );
+  const candidates = commits.filter((x) => children.has(commitKey(x)));
+  const chosen = candidates.length > 1 ? await chooseLogCommit(candidates, "Select Child Commit") : candidates[0];
+  if (chosen && useGitLog.getState().generation === generation) selectCommit(commitKey(chosen), true);
 }
 
 /** Graph / View Options change; options that change the query reload the log. */
 export function updateLogOptions(patch: Partial<LogOptions>) {
+  if ("collapseLinear" in patch && logOptions().linearizeMerges) {
+    useGitLog.setState({ fragments: { ...emptyFragments(), merges: new Set(patch.collapseLinear ? [] : ["*"]) } });
+    setLogOptions({ ...patch, collapseLinear: false });
+    return;
+  }
+  if ("collapseLinear" in patch)
+    useGitLog.setState({
+      fragments: {
+        ...emptyFragments(),
+        merges: new Set(patch.collapseLinear ? [] : ["*"]),
+      },
+    });
+  else if ("linearizeMerges" in patch) useGitLog.setState({ fragments: emptyFragments() });
   if (setLogOptions(patch)) void reloadLog();
 }
 
@@ -592,16 +1200,68 @@ export function updateLogOptions(patch: Partial<LogOptions>) {
 export function isMine(c: Commit, user: string | null): boolean {
   if ("user" in c) user = (c as RepoCommit).user ?? null;
   if (!user) return false;
-  const u = user.toLowerCase();
-  return c.email.toLowerCase() === u || c.author.toLowerCase() === u;
+  const normalize = (value: string) => value.toLocaleLowerCase().replace(/[^\p{L}\p{N}]/gu, "");
+  const name = (c as RepoCommit).userName;
+  return (
+    c.email.toLowerCase() === user.toLowerCase() ||
+    normalize(c.author) === normalize(name ?? user) ||
+    normalize(c.email.split("@")[0]!) === normalize(user.split("@")[0]!)
+  );
 }
 
 /**
  * Go to Hash/Branch/Tag: selects the commit `rev` names, paging the log until it is
  * loaded (and clearing the filters when they hide it). False when there is no such commit.
  */
-export async function goToRef(rev: string): Promise<boolean> {
-  const repo = currentRepo();
+export async function goToRef(rev: string, repository?: string | null): Promise<boolean> {
+  const state = useGitLog.getState();
+  let generation = state.generation;
+  const valid = () =>
+    useGitLog.getState().generation === generation && useGitLog.getState().shownLog === state.shownLog;
+  const reload = async () => {
+    const load = reloadLog();
+    generation = useGitLog.getState().generation;
+    await load;
+  };
+  const logTab = state.logTabs.find((t) => t.id === state.shownLog);
+  const repos =
+    repository !== undefined
+      ? [repository]
+      : logTab?.repositories?.length
+        ? logTab.repositories
+        : logTab?.repo
+          ? [logTab.repo]
+          : state.filters.repositories?.length
+            ? state.filters.repositories
+            : useVcs.getState().roots.length
+              ? useVcs.getState().roots
+              : [currentRepo()];
+  if (repos.length > 1) {
+    const candidates = (
+      await Promise.all(
+        repos.map(async (repo) => {
+          try {
+            const [commit] = await call(
+              commands.vcsLog(repo, { branch: rev.trim(), path: null, author: null, text: null, skip: 0, limit: 1 }),
+            );
+            return commit ? [{ ...commit, repo }] : [];
+          } catch {
+            return [];
+          }
+        }),
+      )
+    ).flat();
+    if (!valid()) return false;
+    const chosen =
+      candidates.length > 1
+        ? await chooseLogCommit(
+            candidates.map((c) => ({ ...c, summary: `${repoName(c.repo ?? "")} · ${c.summary}` })),
+            "Select Repository Commit",
+          )
+        : candidates[0];
+    return chosen && valid() ? goToRef(rev, commitRepo(chosen)) : false;
+  }
+  const repo = repos[0] ?? null;
   const target = rev.trim();
   if (!target) return false;
   let id: string | undefined;
@@ -621,25 +1281,29 @@ export async function goToRef(rev: string): Promise<boolean> {
   } catch {
     id = undefined;
   }
-  if (!id) return false;
-  const tab = useGitLog.getState().tab;
-  selectGitTab(isLogTab(tab) ? tab : "log");
+  if (!id || !valid()) return false;
+  const tab = useGitLog.getState().shownLog;
+  showLogView(isLogTab(tab) ? tab : "log");
   const find = () =>
     useGitLog.getState().commits.some((c) => c.id === id && (!commitRepo(c) || commitRepo(c) === repo));
-  if (!useGitLog.getState().commits.length) await reloadLog();
-  for (let i = 0; i < MAX_SEARCH_PAGES && !find() && !useGitLog.getState().done; i++) await loadMore();
-  if (!find()) await revealCommit(id, repo);
-  if (!find()) return false;
-  // A commit inside a collapsed linear branch: expand them (IDEA does the same).
-  if (logOptions().collapseLinear) {
-    const commits = useGitLog.getState().commits;
-    const heads = useVcs.getState().heads;
-    const headKeys = new Set(commits.filter((c) => c.id === heads[commitRepo(c) ?? ""]?.headCommit).map(commitKey));
-    const shown = collapseLinear(commits.map(graphCommit), headKeys).commits;
-    if (!shown.some((c) => c.id === commitKey({ id: id!, repo }))) {
-      setLogOptions({ collapseLinear: false });
-    }
+  if (!useGitLog.getState().commits.length) await reload();
+  if (!valid()) return false;
+  if (!find()) {
+    useGitLog.setState({ seek: { repo, id } });
+    await reload();
   }
+  if (!valid()) return false;
+  if (!find() && hasFilters(useGitLog.getState().filters)) {
+    useGitLog.setState({ filters: emptyFilters(), seek: { repo, id } });
+    await reload();
+    if (!valid()) return false;
+  }
+  if (!valid()) return false;
+  if (!find() && !useGitLog.getState().error) {
+    useGitLog.setState({ filters: { ...emptyFilters(), branches: [id], ...(repo ? { repositories: [repo] } : {}) } });
+    await reload();
+  }
+  if (!valid() || !find()) return false;
   const hit = useGitLog.getState().commits.find((c) => c.id === id && (!commitRepo(c) || commitRepo(c) === repo));
   if (!hit) return false;
   selectCommit(commitKey(hit), true);
diff --git a/src/features/vcs/multiRoot.ts b/src/features/vcs/multiRoot.ts
index 5057f3b2..6ce6faae 100644
--- a/src/features/vcs/multiRoot.ts
+++ b/src/features/vcs/multiRoot.ts
@@ -1,14 +1,28 @@
 /** Repository identity for log rows and shared repository queries. */
 import type { Branch, Commit } from "@/bindings";
 import { call, commands } from "@/platform/ipc";
+import type { GraphCommit } from "./graph";
 
-export type RepoCommit = Commit & { repo?: string | null; user?: string | null; remoteNames?: string[] };
+export type RepoCommit = Commit & {
+  repo?: string | null;
+  user?: string | null;
+  userName?: string | null;
+  remoteNames?: string[];
+  readOnly?: boolean;
+};
 export const commitRepo = (c: Commit | undefined): string | null | undefined => (c as RepoCommit | undefined)?.repo;
 export const commitKey = (c: Pick<RepoCommit, "id" | "repo">): string => (c.repo ? `${c.repo}\0${c.id}` : c.id);
-export const graphCommit = (c: Commit): Commit => ({
+export const graphCommit = (c: Commit): Commit & GraphCommit => ({
   ...c,
   id: commitKey(c),
-  parents: c.parents.map((id) => commitKey({ ...c, id })),
+  parents: [...(c.graphParents ?? c.parents), ...(c.graphBoundaryParents ?? [])].map((id) => commitKey({ ...c, id })),
+  dashed: c.graphDashed ?? c.dashed,
+  edgeTypes: [
+    ...(c.graphParents ?? c.parents).map((_, i) =>
+      (c.graphDashed ?? c.dashed)?.[i] ? ("filtered" as const) : ("normal" as const),
+    ),
+    ...(c.graphBoundaryParents ?? []).map(() => "shallow" as const),
+  ],
 });
 
 /** Merge ordered streams without breaking any repository's topological order. */
diff --git a/src/features/vcs/operations.tsx b/src/features/vcs/operations.tsx
index 51ac6ec4..4a48ebb5 100644
--- a/src/features/vcs/operations.tsx
+++ b/src/features/vcs/operations.tsx
@@ -7,9 +7,10 @@ import { commitKey, commitRepo } from "./multiRoot";
 import { useEffect, useMemo, useState } from "react";
 import type { ChangedFile, Commit, CompareResult, ResetMode, WorkingTreeChange } from "@/bindings";
 import { executeAction } from "@/platform/actions";
-import { call, commands, nextRequestId } from "@/platform/ipc";
-import { Checkbox, Dialog, Icon, Input, Spinner, T } from "@/ui";
+import { call, commands, isTauri, nextRequestId } from "@/platform/ipc";
+import { Button, Checkbox, Dialog, Icon, Input, Spinner, T } from "@/ui";
 import { notifications } from "@/workbench/contributions";
+import { windowBackgroundHex } from "@/workbench/theme";
 import { diffInput, openDiff, type DiffData, type DiffSide } from "./diffInput";
 import { openDialog, promptText } from "./dialogs";
 import { KIND_COLOR, fileCount } from "./model";
@@ -460,31 +461,32 @@ export function showCompareWithLocal(commit: Commit) {
 
 /** Files that differ between `rev` (a commit or branch) and the working tree. */
 export function showDiffWithWorkingTree(rev: string, label = rev) {
-  openDialog((close) => <ChangesBetweenDialog from={{ rev, label }} to={null} onClose={close} />);
+  showComparison({ rev, label }, null);
 }
 
 /** IDEA's Compare Versions of two Git Log commits: files that differ between them, older first. */
 export function showCompareVersions(older: Commit, newer: Commit) {
-  openDialog((close) => (
-    <ChangesBetweenDialog
-      from={{ rev: older.id, label: short(older.id) }}
-      to={{ rev: newer.id, label: short(newer.id) }}
-      onClose={close}
-    />
-  ));
+  showComparison({ rev: older.id, label: short(older.id) }, { rev: newer.id, label: short(newer.id) });
 }
 
 /** Files that differ between two revisions (e.g. two branches from Compare with Current). */
 export function showCompareRevisions(from: string, to: string, fromLabel = from, toLabel = to) {
-  openDialog((close) => (
-    <ChangesBetweenDialog from={{ rev: from, label: fromLabel }} to={{ rev: to, label: toLabel }} onClose={close} />
-  ));
+  showComparison({ rev: from, label: fromLabel }, { rev: to, label: toLabel });
 }
 
 export function showPathComparison(paths: string[], rev: string, repositories: string[] | null) {
-  openDialog((close) => (
-    <ChangesBetweenDialog from={{ rev, label: rev }} to={null} scope={{ paths, repositories }} onClose={close} />
-  ));
+  showComparison({ rev, label: rev }, null, { paths, repositories });
+}
+
+function showComparison(from: Revision, to: Revision | null, scope?: ScopedComparison) {
+  if (!isTauri()) {
+    openDialog((close) => <ChangesBetweenDialog from={from} to={to} scope={scope} onClose={close} />);
+    return;
+  }
+  const comparison = { from, to, scope: scope ?? null, repo: currentRepo() };
+  void call(commands.windowOpenComparison(comparison, windowBackgroundHex())).catch((error) =>
+    notifications().notify({ level: "error", title: "Could not open comparison", body: String(error) }),
+  );
 }
 
 interface Revision {
@@ -516,11 +518,18 @@ export function ChangesBetweenDialog({
   to,
   scope,
   onClose,
+  native = false,
+  onCaption,
+  onShowDiff,
 }: {
   from: Revision;
   to: Revision | null;
   scope?: ScopedComparison;
   onClose: () => void;
+  /** Content of the comparison window rather than a dialog: its caption goes to `onCaption`. */
+  native?: boolean;
+  onCaption?: (caption: string) => void;
+  onShowDiff?: (data: DiffData) => void;
 }) {
   const [root] = useState(currentRepoRoot);
   const [repo] = useState(currentRepo);
@@ -607,27 +616,20 @@ export function ChangesBetweenDialog({
   const skipped = result?.skippedPaths.map((path) => displayPath(path)) ?? [];
   const skippedNames = skipped.slice(0, 5).join(", ");
   const skippedLabel = skipped.length > 5 ? tx`${skippedNames} and ${skipped.length - 5} more` : skippedNames;
-  return (
-    <Dialog
-      open
-      title={files ? `${title} — ${count}` : title}
-      onClose={onClose}
-      width={input ? 1100 : 680}
-      buttons={[
-        {
-          label: "Show Diff",
-          role: "default",
-          disabled: !current,
-          onClick: () => {
-            if (current) {
-              void openDiff(diffFor(current));
-              onClose();
-            }
-          },
-        },
-        { label: "Close", role: "cancel" },
-      ]}
-    >
+  const caption = files ? `${title} — ${count}` : title;
+  useEffect(() => {
+    if (native) onCaption?.(caption);
+  }, [native, onCaption, caption]);
+  const showDiff = () => {
+    if (!current) return;
+    if (onShowDiff) onShowDiff(diffFor(current));
+    else {
+      void openDiff(diffFor(current));
+      onClose();
+    }
+  };
+  const contents = (
+    <>
       {error && (
         <div className={styles.error} role="alert">
           {error}
@@ -682,6 +684,34 @@ export function ChangesBetweenDialog({
           }
         />
       ) : null}
+    </>
+  );
+  if (native)
+    return (
+      <div className={styles.comparisonWindow}>
+        <div className={styles.comparisonWindowBody}>{contents}</div>
+        <div className={styles.comparisonWindowFooter}>
+          <Button onClick={onClose}>Close</Button>
+          <Button variant="primary" disabled={!current} onClick={showDiff}>
+            Show Diff
+          </Button>
+        </div>
+      </div>
+    );
+  return (
+    <Dialog
+      open
+      title={caption}
+      onClose={onClose}
+      width={input ? 1100 : 680}
+      resizable="both"
+      className={styles.comparisonDialog}
+      buttons={[
+        { label: "Show Diff", role: "default", disabled: !current, onClick: showDiff },
+        { label: "Close", role: "cancel" },
+      ]}
+    >
+      {contents}
     </Dialog>
   );
 }
diff --git a/src/features/vcs/patches.tsx b/src/features/vcs/patches.tsx
index 0f4ee082..8e43c0e9 100644
--- a/src/features/vcs/patches.tsx
+++ b/src/features/vcs/patches.tsx
@@ -305,7 +305,7 @@ function ApplyPatchDialog({ patch, source, onClose }: { patch: string; source: s
                   f.applies ? tx("Applies cleanly") : tx("Does not apply cleanly: a 3-way merge will be attempted")
                 }
               >
-                <Icon name={fileIconName(baseName(f.path))} size={14} />
+                <Icon name={fileIconName(baseName(f.path), f.path)} size={14} />
                 <span
                   className={styles.fileName}
                   style={{
diff --git a/src/features/vcs/selectionHistoryKind.ts b/src/features/vcs/selectionHistoryKind.ts
new file mode 100644
index 00000000..56b56972
--- /dev/null
+++ b/src/features/vcs/selectionHistoryKind.ts
@@ -0,0 +1,47 @@
+/** History for Selection tab input; kept apart from `SelectionHistory` so opening one does not load it. */
+import { activeEditor } from "@/editor/api";
+import { isVirtualUri } from "@/platform/virtualDocs";
+import { editorService, notifications, type EditorInput } from "@/workbench/contributions";
+
+export const SELECTION_HISTORY_KIND = "selectionHistory";
+
+export interface SelectionHistoryData {
+  path: string;
+  /** 0-based first and last selected line of `text`. */
+  lines: [number, number];
+  /** The editor's text when the history was asked for (unsaved edits included). */
+  text: string;
+}
+
+export function selectionHistoryInput(data: SelectionHistoryData): EditorInput {
+  const [from, to] = data.lines;
+  return { kind: SELECTION_HISTORY_KIND, key: `selectionHistory:${data.path}:${from}-${to}`, path: data.path, data };
+}
+
+/**
+ * The selected lines of a text (IDEA): the caret line without a selection, and a
+ * selection ending at the start of a line leaves that line out.
+ */
+export function selectedLines(
+  doc: { lineAt(pos: number): { number: number; from: number } },
+  from: number,
+  to: number,
+): [number, number] {
+  const first = doc.lineAt(from);
+  const last = doc.lineAt(to);
+  const end = to > from && last.from === to && last.number > first.number ? last.number - 1 : last.number;
+  return [first.number - 1, end - 1];
+}
+
+/** Git › Show History for Selection: the active editor's selected lines. */
+export function showSelectionHistory() {
+  const editor = activeEditor();
+  if (!editor || isVirtualUri(editor.ctx.path)) {
+    notifications().notify({ group: "vcs", level: "info", title: "Open a file to show the history of its selection" });
+    return;
+  }
+  const { state } = editor.view;
+  const { from, to } = state.selection.main;
+  const data = { path: editor.ctx.path, lines: selectedLines(state.doc, from, to), text: state.doc.toString() };
+  void editorService().openInput(selectionHistoryInput(data), { focus: true });
+}
diff --git a/src/features/vcs/shelf.tsx b/src/features/vcs/shelf.tsx
index 07d8bf59..0fe4a5e0 100644
--- a/src/features/vcs/shelf.tsx
+++ b/src/features/vcs/shelf.tsx
@@ -116,7 +116,7 @@ export function FileChecklist({
                 onChange(n);
               }}
             />
-            <Icon name={fileIconName(baseName(f.path))} size={14} />
+            <Icon name={fileIconName(baseName(f.path), f.path)} size={14} />
             <span className={styles.fileName} style={{ color: KIND_COLOR[kind] }}>
               {baseName(stripSlash(f.path))}
             </span>
@@ -517,7 +517,7 @@ export function ShelfPanel() {
           renderNode={(n) =>
             n.file ? (
               <>
-                <Icon name={fileIconName(baseName(n.file.path))} size={16} className={viewStyles.icon} />
+                <Icon name={fileIconName(baseName(n.file.path), n.file.path)} size={16} className={viewStyles.icon} />
                 <span
                   className={viewStyles.label}
                   style={{ color: KIND_COLOR[n.file.kind === "untracked" ? "added" : n.file.kind] }}
diff --git a/src/features/viewers/markdown/Markdown.module.css b/src/features/viewers/markdown/Markdown.module.css
index 38cc5e58..de3a9294 100644
--- a/src/features/viewers/markdown/Markdown.module.css
+++ b/src/features/viewers/markdown/Markdown.module.css
@@ -56,7 +56,7 @@
 .preview :global(h5),
 .preview :global(h6) {
   margin: 1.2em 0 0.6em;
-  color: var(--syn-markup-heading, var(--fg-strong));
+  color: var(--fg-editor, var(--fg-strong));
   line-height: 1.25;
 }
 .preview :global(h1) {
@@ -143,46 +143,6 @@
   outline: 1px dashed var(--border-strong);
 }
 
-/* Lezer classHighlighter tokens in fenced code (same colours as documentation popups). */
-.preview :global(.tok-keyword),
-.preview :global(.tok-modifier),
-.preview :global(.tok-controlKeyword),
-.preview :global(.tok-operatorKeyword) {
-  color: var(--syn-keyword);
-}
-.preview :global(.tok-string),
-.preview :global(.tok-string2) {
-  color: var(--syn-string);
-}
-.preview :global(.tok-number),
-.preview :global(.tok-bool),
-.preview :global(.tok-atom) {
-  color: var(--syn-number);
-}
-.preview :global(.tok-typeName),
-.preview :global(.tok-className),
-.preview :global(.tok-namespace) {
-  color: var(--syn-type);
-}
-.preview :global(.tok-comment) {
-  color: var(--syn-comment);
-  font-style: italic;
-}
-.preview :global(.tok-meta),
-.preview :global(.tok-macroName) {
-  color: var(--syn-annotation);
-}
-.preview :global(.tok-propertyName) {
-  color: var(--syn-property);
-}
-.preview :global(.tok-variableName.tok-definition) {
-  color: var(--syn-function);
-}
-.preview :global(.tok-punctuation),
-.preview :global(.tok-operator) {
-  color: var(--syn-punct);
-}
-
 /* Mermaid diagrams: the source stays until the diagram is drawn, and next to an error. */
 .preview :global([data-mermaid]) {
   margin: 0 0 1em;
diff --git a/src/features/viewers/markdown/render.test.ts b/src/features/viewers/markdown/render.test.ts
index 28031903..cc2b8489 100644
--- a/src/features/viewers/markdown/render.test.ts
+++ b/src/features/viewers/markdown/render.test.ts
@@ -1,5 +1,50 @@
 import { describe, expect, it } from "vitest";
-import { joinPath, previewLineAtOffset, previewOffsetForLine, renderMarkdown, resolveLink, slugify } from "./render";
+import {
+  frontMatter,
+  joinPath,
+  previewLineAtOffset,
+  previewOffsetForLine,
+  renderMarkdown,
+  resolveLink,
+  slugify,
+} from "./render";
+
+describe("front matter", () => {
+  const skill =
+    "---\nname: review\ndescription: Reviews a diff: bugs first\ntools:\n  - Read\n  - Grep\nmeta:\n  owner: team\n---\n\n# Review\n\nBody\n";
+
+  it("shows every top-level field above the body, nested values as written", () => {
+    expect(frontMatter(skill)).toEqual({
+      fields: [
+        ["name", "review"],
+        ["description", "Reviews a diff: bugs first"],
+        ["tools", "  - Read\n  - Grep"],
+        ["meta", "  owner: team"],
+      ],
+      lines: 9,
+    });
+    const root = document.createElement("div");
+    root.innerHTML = renderMarkdown(skill);
+    const blocks = [...root.querySelectorAll<HTMLElement>(":scope > [data-line]")];
+    expect(blocks.map((b) => [b.dataset.line, b.firstElementChild?.tagName])).toEqual([
+      ["0", "TABLE"],
+      ["10", "H1"],
+      ["12", "P"],
+    ]);
+    const rows = [...root.querySelectorAll("table[data-front-matter] tr")].map((r) => [
+      r.querySelector("th")?.textContent,
+      r.querySelector("td")?.textContent,
+    ]);
+    expect(rows[1]).toEqual(["description", "Reviews a diff: bugs first"]);
+    expect(root.querySelector("td pre")?.textContent).toBe("- Read\n- Grep");
+  });
+
+  it("leaves a document without front matter, or a thematic break, alone", () => {
+    expect(frontMatter("# Title\n---\nx: y\n---\n")).toBeNull();
+    expect(frontMatter("---\nJust a paragraph between rules.\n---\n")).toBeNull();
+    expect(frontMatter("---\n---\n")).toBeNull();
+  });
+});
 
 describe("markdown preview rendering", () => {
   it("tags blocks with their source line", () => {
@@ -30,6 +75,32 @@ describe("markdown preview rendering", () => {
     expect(root.querySelector("a")?.getAttribute("href")).toBeNull();
   });
 
+  it.each([
+    "<style>body{outline:7px solid red}</style>",
+    '<form action="https://example.com/x"><button>go</button></form>',
+    '<div style="position:fixed">x</div>',
+    '<link rel="stylesheet" href="https://example.com/x.css">',
+    '<meta http-equiv="refresh" content="0;url=https://example.com">',
+    '<base href="https://example.com/">',
+    '<iframe src="https://example.com"></iframe>',
+    '<button formaction="https://example.com/x">go</button>',
+  ])("keeps raw markup from reaching the page: %s", (raw) => {
+    const root = document.createElement("div");
+    root.innerHTML = renderMarkdown(`text\n\n${raw}\n`);
+    expect(root.querySelector("style, form, link, meta, base, iframe, [style], [formaction]")).toBeNull();
+    expect(root.textContent).not.toContain("outline");
+  });
+
+  it("keeps the raw HTML READMEs rely on", () => {
+    const root = document.createElement("div");
+    root.innerHTML = renderMarkdown(
+      '<div align="center"><img src="a.png" width="20"></div>\n\n<details><summary>More</summary>x</details>\n\n- [x] done\n',
+    );
+    expect(root.querySelector("div[align='center'] img")?.getAttribute("width")).toBe("20");
+    expect(root.querySelector("details summary")).not.toBeNull();
+    expect(root.querySelector("input[type='checkbox']")).not.toBeNull();
+  });
+
   it("dedupes heading anchors", () => {
     const root = document.createElement("div");
     root.innerHTML = renderMarkdown("## Same\n\n## Same\n");
diff --git a/src/features/viewers/markdown/render.ts b/src/features/viewers/markdown/render.ts
index 1be1d633..e3fe1cff 100644
--- a/src/features/viewers/markdown/render.ts
+++ b/src/features/viewers/markdown/render.ts
@@ -3,7 +3,8 @@
  * in an element carrying its 0-based source line (`data-line`) for scroll
  * sync; images keep their source in `data-src` and are loaded by the preview
  * (local files through the backend, as the CSP blocks file URLs). Mermaid
- * blocks become `[data-mermaid]` placeholders, drawn by `./mermaid`.
+ * blocks become `[data-mermaid]` placeholders, drawn by `./mermaid`. YAML front matter is shown
+ * as a table of its top-level fields.
  */
 import { Marked, type Token, type TokensList } from "marked";
 import DOMPurify from "dompurify";
@@ -62,11 +63,49 @@ const countLines = (s: string) => {
   return n;
 };
 
+/** The YAML front matter at the start of `text`: its top-level fields and how many lines it spans. */
+export function frontMatter(text: string): { fields: [string, string][]; lines: number } | null {
+  const m = /^---[ \t]*\r?\n([\s\S]*?)\r?\n(?:---|\.\.\.)[ \t]*(?:\r?\n|$)/.exec(text);
+  if (!m) return null;
+  const fields: [string, string][] = [];
+  for (const raw of m[1]!.split(/\r?\n/)) {
+    const field = /^([^\s#:-][^:]*?):(?:[ \t]+(.*))?$/.exec(raw);
+    if (field) fields.push([field[1]!.trim(), (field[2] ?? "").trim()]);
+    else if (raw.trim() && !raw.trimStart().startsWith("#")) {
+      // A nested mapping or a list belongs to the field above it; anything else isn't front matter.
+      const last = fields.at(-1);
+      if (!last || !/^[\s-]/.test(raw)) return null;
+      last[1] = last[1] ? `${last[1]}\n${raw}` : raw;
+    }
+  }
+  return fields.length ? { fields, lines: countLines(m[0]) + (m[0].endsWith("\n") ? 0 : 1) } : null;
+}
+
+/** `text` without the indentation all its lines share. */
+function dedent(text: string): string {
+  const lines = text.split("\n");
+  const indent = Math.min(...lines.filter((l) => l.trim()).map((l) => /^ */.exec(l)![0].length));
+  return lines.map((l) => l.slice(indent)).join("\n");
+}
+
+function frontMatterTable(fields: readonly [string, string][]): string {
+  const rows = fields.map(([key, value]) => {
+    // Nested values keep their YAML layout.
+    const shown = value.includes("\n")
+      ? `<pre>${escapeHtml(dedent(value.replace(/^\n+/, "")))}</pre>`
+      : escapeHtml(value);
+    return `<tr><th>${escapeHtml(key)}</th><td>${shown}</td></tr>`;
+  });
+  return `<table data-front-matter=""><tbody>${rows.join("")}</tbody></table>`;
+}
+
 export function renderMarkdown(text: string): string {
-  const tokens = marked.lexer(text);
+  const front = frontMatter(text);
+  const body = front ? text.split("\n").slice(front.lines).join("\n") : text;
+  const tokens = marked.lexer(body);
   const slugs = new Map<string, number>();
-  let line = 0;
-  let html = "";
+  let line = front?.lines ?? 0;
+  let html = front ? `<div data-line="0">${frontMatterTable(front.fields)}</div>` : "";
   for (const token of tokens) {
     const start = line;
     line += countLines(token.raw);
@@ -81,7 +120,13 @@ export function renderMarkdown(text: string): string {
     }
     html += `<div data-line="${start}">${body}</div>`;
   }
-  return purify().sanitize(html, { USE_PROFILES: { html: true }, ADD_ATTR: ["data-src", "data-line"] });
+  // The preview shares the IDE's document: a `<style>` in a file would restyle the whole IDE.
+  return purify().sanitize(html, {
+    USE_PROFILES: { html: true },
+    ADD_ATTR: ["data-src", "data-line", "data-front-matter"],
+    FORBID_TAGS: ["style", "form"],
+    FORBID_ATTR: ["style"],
+  });
 }
 
 export type LinkTarget =
diff --git a/src/features/vim/rc.ts b/src/features/vim/rc.ts
index 00183421..3d5a550c 100644
--- a/src/features/vim/rc.ts
+++ b/src/features/vim/rc.ts
@@ -228,6 +228,8 @@ export const IDEA_ACTIONS: Readonly<Record<string, string>> = {
   Inline: "refactor.inline",
   Move: "refactor.move",
   SafeDelete: "refactor.safeDelete",
+  MembersPullUp: "refactor.pullMembersUp",
+  MemberPushDown: "refactor.pushMembersDown",
   Run: "run.run",
   Debug: "run.debug",
   RunClass: "run.runContext",
diff --git a/src/main.tsx b/src/main.tsx
index 31825a44..9b55abf3 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -3,13 +3,26 @@ import ReactDOM from "react-dom/client";
 import "./styles/global.css";
 import { Workbench } from "./workbench/Workbench";
 import { activateSecondaryWindow, activateWorkbench } from "./workbench/activate";
-import { activateFeatures, activateSettingsWindowFeatures, SettingsWindow, settingsWindowParent } from "./features";
+import {
+  activateComparisonWindowFeatures,
+  activateDeploymentWindowFeatures,
+  activateFeatures,
+  activateSettingsWindowFeatures,
+  ComparisonWindow,
+  DeploymentWindow,
+  SettingsWindow,
+} from "./features";
+import { auxiliaryWindow } from "./platform/auxWindow";
 import { installRepeatedDoubleClick } from "./platform/doubleClick";
 import { installErrorLogging } from "./platform/errorLog";
+import { guessOs } from "./platform/platformInfo";
+import { installReorderedTapClick } from "./platform/reordered-tap-click";
 import { installKeyboardDispatcher } from "./platform/keymap";
+import { installPointerFocus } from "./platform/pointerFocus";
 import { isTauri } from "./platform/ipc";
 import { hideSplash } from "./platform/splash";
 import { prefetchLazyComponents } from "./ui";
+import { installWindowDrag } from "./workbench/window-drag";
 
 if (import.meta.env.DEV && isTauri()) {
   // The Tauri MCP bridge returns eval results via `window.__TAURI__` on Windows/Linux
@@ -19,14 +32,25 @@ if (import.meta.env.DEV && isTauri()) {
 }
 
 installRepeatedDoubleClick();
+if (guessOs() === "macos") installReorderedTapClick();
+installWindowDrag();
+installPointerFocus();
 installErrorLogging();
 
-// The native Settings window (`settings-<parent>`) loads this page too.
-const settingsParent = settingsWindowParent();
+// Auxiliary windows (Settings `settings-<parent>`, comparisons `comparison-<parent>-<n>`, Sync with
+// Deployed `deployment-<parent>`) load this page too.
+const aux = auxiliaryWindow();
 
-if (settingsParent !== null) {
+if (aux?.kind === "settings") {
   activateSecondaryWindow();
-  activateSettingsWindowFeatures(settingsParent);
+  activateSettingsWindowFeatures(aux.parent);
+} else if (aux?.kind === "comparison") {
+  activateSecondaryWindow();
+  activateComparisonWindowFeatures(aux.parent);
+  installKeyboardDispatcher();
+} else if (aux?.kind === "deployment") {
+  activateSecondaryWindow();
+  activateDeploymentWindowFeatures(aux.parent);
 } else {
   activateWorkbench();
   // `vite build --mode perf` is a production bundle for the performance harness (`perf/`).
@@ -46,8 +70,18 @@ if (settingsParent !== null) {
 }
 
 ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
-  <React.StrictMode>{settingsParent !== null ? <SettingsWindow /> : <Workbench />}</React.StrictMode>,
+  <React.StrictMode>
+    {aux?.kind === "settings" ? (
+      <SettingsWindow />
+    ) : aux?.kind === "comparison" ? (
+      <ComparisonWindow />
+    ) : aux?.kind === "deployment" ? (
+      <DeploymentWindow />
+    ) : (
+      <Workbench />
+    )}
+  </React.StrictMode>,
 );
 hideSplash();
 // Views split out of the start-up bundle load in the background once the UI is up.
-if (settingsParent === null) prefetchLazyComponents();
+if (!aux) prefetchLazyComponents();
diff --git a/src/platform/auxWindow.test.ts b/src/platform/auxWindow.test.ts
new file mode 100644
index 00000000..1eca833f
--- /dev/null
+++ b/src/platform/auxWindow.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { auxiliaryWindow } from "./auxWindow";
+
+describe("auxiliaryWindow", () => {
+  it("reads the kind and parent from the label", () => {
+    expect(auxiliaryWindow("settings-main")).toEqual({ kind: "settings", parent: "main" });
+    expect(auxiliaryWindow("settings-project-2")).toEqual({ kind: "settings", parent: "project-2" });
+    expect(auxiliaryWindow("comparison-main-0")).toEqual({ kind: "comparison", parent: "main" });
+    expect(auxiliaryWindow("comparison-project-2-14")).toEqual({ kind: "comparison", parent: "project-2" });
+    expect(auxiliaryWindow("deployment-project-2")).toEqual({ kind: "deployment", parent: "project-2" });
+  });
+
+  it("leaves project windows and malformed labels alone", () => {
+    for (const label of ["", "main", "project-1", "settings-", "comparison-main", "comparison-main-x"]) {
+      expect(auxiliaryWindow(label)).toBeNull();
+    }
+  });
+});
diff --git a/src/platform/auxWindow.ts b/src/platform/auxWindow.ts
new file mode 100644
index 00000000..15d95c3b
--- /dev/null
+++ b/src/platform/auxWindow.ts
@@ -0,0 +1,78 @@
+/**
+ * Auxiliary windows: Settings, comparison and deployment windows that belong
+ * to a project window (their parent) and share its project. Labels name the
+ * kind and the parent (`settings-main`, `comparison-project-2-3`), mirroring
+ * `windows::auxiliary` in src-tauri/src/windows.rs.
+ */
+import { getAllWindows, getCurrentWindow } from "@tauri-apps/api/window";
+import { TauriEvent } from "@tauri-apps/api/event";
+import { isTauri } from "./ipc";
+
+export type AuxKind = "settings" | "comparison" | "deployment";
+
+/** Kinds with several windows per parent (`<kind>-<parent>-<n>`); the others have one (`<kind>-<parent>`). */
+const MULTIPLE: ReadonlySet<AuxKind> = new Set(["comparison"]);
+const KINDS: readonly AuxKind[] = ["settings", "comparison", "deployment"];
+
+/** An auxiliary window reports to its parent whether it closed, and which documents it released. */
+export const AUX_CLOSED = "openidea://auxiliary/closed";
+
+export interface AuxCloseResult {
+  label: string;
+  closed: boolean;
+  documents: number[];
+}
+
+function currentLabel(): string {
+  if (!isTauri()) return "";
+  try {
+    return getCurrentWindow().label;
+  } catch {
+    return "";
+  }
+}
+
+/** The kind and parent of an auxiliary window, or null for a project window. */
+export function auxiliaryWindow(label = currentLabel()): { kind: AuxKind; parent: string } | null {
+  for (const kind of KINDS) {
+    if (!label.startsWith(`${kind}-`)) continue;
+    const rest = label.slice(kind.length + 1);
+    const parent = MULTIPLE.has(kind) ? /^(.+)-\d+$/.exec(rest)?.[1] : rest;
+    if (parent) return { kind, parent };
+  }
+  return null;
+}
+
+/**
+ * Closes this project window's auxiliary windows that show documents, one at a time: each settles
+ * its own unsaved changes first. False when one stays open (the user cancelled).
+ */
+export async function closeDocumentWindows(): Promise<boolean> {
+  if (!isTauri()) return true;
+  const parent = getCurrentWindow();
+  const children = (await getAllWindows()).filter((window) => {
+    const aux = auxiliaryWindow(window.label);
+    return aux !== null && aux.kind !== "settings" && aux.parent === parent.label;
+  });
+  for (const child of children) {
+    let finish!: (closed: boolean) => void;
+    const result = new Promise<boolean>((resolve) => {
+      finish = resolve;
+    });
+    const offResult = await parent.listen<AuxCloseResult>(AUX_CLOSED, ({ payload }) => {
+      if (payload.label === child.label && !payload.closed) finish(false);
+    });
+    const offDestroyed = await child.once(TauriEvent.WINDOW_DESTROYED, () => finish(true));
+    try {
+      await child.unminimize();
+      await child.show();
+      await child.setFocus();
+      await child.close();
+      if (!(await result)) return false;
+    } finally {
+      offResult();
+      offDestroyed();
+    }
+  }
+  return true;
+}
diff --git a/src/platform/colorScheme.ts b/src/platform/colorScheme.ts
index b9349d3b..93564613 100644
--- a/src/platform/colorScheme.ts
+++ b/src/platform/colorScheme.ts
@@ -113,6 +113,7 @@ export const ATTRIBUTES: readonly AttributeDef[] = [
   syn("keyword", "Keyword", [LD], "keyword"),
   syn("identifier", "Identifiers › Local variable", [LD], "variable"),
   syn("parameter", "Identifiers › Parameter", [LD], "param"),
+  syn("globalVariable", "Identifiers › Global variable", [LD], "global"),
   syn("constant", "Identifiers › Constant", [LD], "constant"),
   syn("field", "Identifiers › Instance field", [LD], "property"),
   { id: "staticSymbol", name: "Identifiers › Static symbol", path: [LD], token: "static", italicOnly: true },
diff --git a/src/platform/filePresentation.ts b/src/platform/filePresentation.ts
index b0e30084..c94acbf7 100644
--- a/src/platform/filePresentation.ts
+++ b/src/platform/filePresentation.ts
@@ -126,7 +126,7 @@ export function presentationIcon(
     (spring || role === "resources" || role === "testResources")
   )
     return "spring-config";
-  if (!info?.kind) return fileIconName(name);
+  if (!info?.kind) return fileIconName(name, path);
   if (info.springBoot) return "spring-boot";
   if (/(Tests?|[a-z\d]IT)\.(java|kt)$/.test(name) || role === "test") return "jvm-test";
   const kind: Record<NonNullable<JvmPresentation["kind"]>, IconName> = {
diff --git a/src/platform/i18n.test.ts b/src/platform/i18n.test.ts
index 09525c09..c66e8cf4 100644
--- a/src/platform/i18n.test.ts
+++ b/src/platform/i18n.test.ts
@@ -82,9 +82,15 @@ describe("t / locales", () => {
     expect(resolveLocale("zh-CN")).toBe("zh");
     expect(resolveLocale("zh_Hans")).toBe("zh");
     expect(resolveLocale("ko-KR")).toBe("ko");
+    expect(resolveLocale("pt-BR")).toBe("pt");
+    expect(resolveLocale("pt_PT")).toBe("pt");
     expect(resolveLocale("EN-us")).toBe("en");
     expect(resolveLocale("fr")).toBe("fr");
     expect(resolveLocale("fr-CA")).toBe("fr");
+    expect(resolveLocale("pl_PL")).toBe("pl");
+    expect(resolveLocale("pl-PL")).toBe("pl");
+    expect(resolveLocale("es-MX")).toBe("es");
+    expect(resolveLocale("es_MX")).toBe("es");
     expect(resolveLocale("xx")).toBe("en");
     expect(resolveLocale(undefined)).toBe(resolveLocale(navigator.language));
   });
@@ -105,6 +111,9 @@ describe("t / locales", () => {
     );
     await setLocale("zh-CN");
     expect(t("app.keymap.count", { count: 1 })).toBe("1 个快捷键");
+    await setLocale("pt-BR");
+    expect(t("app.keymap.count", { count: 1 })).toBe("1 atalho");
+    expect(t("app.keymap.count", { count: 5 })).toBe("5 atalhos");
   });
 
   it("switches to Korean", async () => {
@@ -175,6 +184,14 @@ describe("t / locales", () => {
     expect(tx(zh)).toBe("Run 'orders'");
   });
 
+  it("loads the Portuguese catalogs", async () => {
+    await setLocale("pt-BR");
+    expect(useI18n.getState().locale).toBe("pt");
+    expect(t("common.cancel")).toBe("Cancelar");
+    expect(t("app.keymap.count", { count: 1 })).toBe("1 atalho");
+    expect(t("app.keymap.count", { count: 5 })).toBe("5 atalhos");
+  });
+
   it("loads the French catalogs", async () => {
     await setLocale("fr-FR");
     expect(useI18n.getState().locale).toBe("fr");
@@ -185,6 +202,22 @@ describe("t / locales", () => {
     expect(txTemplate("ruff is not installed")).toBe("ruff n'est pas installé");
   });
 
+  it("loads the Polish catalogs", async () => {
+    await setLocale("pl-PL");
+    expect(useI18n.getState().locale).toBe("pl");
+    expect(t("common.cancel")).toBe("Anuluj");
+    expect(t("app.keymap.count", { count: 1 })).toBe("1 skrót");
+    expect(t("app.keymap.count", { count: 5 })).toBe("5 skrótów");
+  });
+
+  it("loads the Spanish catalogs", async () => {
+    await setLocale("es-MX");
+    expect(useI18n.getState().locale).toBe("es");
+    expect(t("common.cancel")).toBe("Cancelar");
+    expect(t("app.keymap.count", { count: 1 })).toBe("1 atajo");
+    expect(t("app.keymap.count", { count: 5 })).toBe("5 atajos");
+  });
+
   it("lists keys by prefix", () => {
     const keys = keysWithPrefix("menu.");
     expect(keys).toContain("menu.file.save");
diff --git a/src/platform/i18n.ts b/src/platform/i18n.ts
index 2e4b91a6..42ec54c3 100644
--- a/src/platform/i18n.ts
+++ b/src/platform/i18n.ts
@@ -43,6 +43,9 @@ export const LOCALES = {
   zh: { name: "简体中文 (Chinese, Simplified)", tag: "zh-CN" },
   ko: { name: "한국어 (Korean)", tag: "ko" },
   fr: { name: "Français (French)", tag: "fr" },
+  pl: { name: "Polski (Polish)", tag: "pl" },
+  pt: { name: "Português (Portuguese)", tag: "pt-BR" },
+  es: { name: "Español (Spanish)", tag: "es-MX" },
 } as const;
 export type Locale = keyof typeof LOCALES;
 export const SUPPORTED_LOCALES = Object.keys(LOCALES) as Locale[];
diff --git a/src/platform/icls.test.ts b/src/platform/icls.test.ts
index 675a23f2..9e914a56 100644
--- a/src/platform/icls.test.ts
+++ b/src/platform/icls.test.ts
@@ -41,6 +41,17 @@ describe(".icls schemes", () => {
     expect(customs).toEqual(before);
   });
 
+  it("imports the global variable colour", () => {
+    const xml =
+      '<scheme name="G" parent_scheme="Darcula"><attributes><option name="DEFAULT_GLOBAL_VARIABLE"><value>' +
+      '<option name="FOREGROUND" value="9876aa"/><option name="FONT_TYPE" value="2"/></value></option></attributes></scheme>';
+    expect(parseIcls(xml).scheme.attributes.globalVariable).toEqual({
+      foreground: "#9876aa",
+      bold: false,
+      italic: true,
+    });
+  });
+
   it.each([
     ["Darcula", "ffffff", "dark"],
     ["Default", "000000", "light"],
diff --git a/src/platform/icls.ts b/src/platform/icls.ts
index 3e6269f5..7062162e 100644
--- a/src/platform/icls.ts
+++ b/src/platform/icls.ts
@@ -11,6 +11,7 @@ const ATTRIBUTE_NAMES: Record<string, string> = {
   DEFAULT_IDENTIFIER: "identifier",
   DEFAULT_LOCAL_VARIABLE: "identifier",
   DEFAULT_PARAMETER: "parameter",
+  DEFAULT_GLOBAL_VARIABLE: "globalVariable",
   DEFAULT_CONSTANT: "constant",
   DEFAULT_INSTANCE_FIELD: "field",
   DEFAULT_STATIC_FIELD: "constant",
diff --git a/src/platform/iconThemeOptions.ts b/src/platform/iconThemeOptions.ts
new file mode 100644
index 00000000..01b9abc2
--- /dev/null
+++ b/src/platform/iconThemeOptions.ts
@@ -0,0 +1,58 @@
+import type { FileIconThemeOptions } from "@/bindings";
+
+export const ICON_THEME_LIMITS = {
+  saturation: { min: 0, max: 20 },
+  opacity: { min: 10, max: 100 },
+  iconSize: { min: 12, max: 32 },
+  rowHeight: { min: 16, max: 48 },
+} as const;
+
+type Limited = keyof typeof ICON_THEME_LIMITS;
+
+const THEME_KEY = /^[^/\s]+\/[^/\s]+$/;
+const RGB = /^#[0-9a-fA-F]{6}$/;
+
+type Obj = Record<string, unknown>;
+const obj = (v: unknown): Obj => (v && typeof v === "object" && !Array.isArray(v) ? (v as Obj) : {});
+const isObj = (v: unknown) => !!v && typeof v === "object" && !Array.isArray(v);
+
+function only<T>(raw: unknown, keep: (v: unknown) => v is T): Record<string, T> {
+  return Object.fromEntries(Object.entries(obj(raw)).filter((e): e is [string, T] => keep(e[1])));
+}
+
+const isBool = (v: unknown): v is boolean => typeof v === "boolean";
+const isString = (v: unknown): v is string => typeof v === "string";
+const color = (v: unknown) => (typeof v === "string" && RGB.test(v) ? v : null);
+
+function limited(v: unknown, key: Limited): number | null {
+  if (typeof v !== "number" || !Number.isFinite(v)) return null;
+  const { min, max } = ICON_THEME_LIMITS[key];
+  return Math.round(Math.min(max, Math.max(min, v)));
+}
+
+export function validateIconThemeOptions(raw: unknown): FileIconThemeOptions {
+  const o = obj(raw);
+  return {
+    groups: only(o.groups, isBool),
+    choices: only(o.choices, isString),
+    hideFiles: o.hideFiles === true,
+    hideFolders: o.hideFolders === true,
+    hollowFolders: o.hollowFolders === true,
+    hideUiIcons: o.hideUiIcons === true,
+    hidePsiIcons: o.hidePsiIcons === true,
+    monochrome: color(o.monochrome),
+    saturation: limited(o.saturation, "saturation"),
+    opacity: limited(o.opacity, "opacity"),
+    iconSize: limited(o.iconSize, "iconSize"),
+    rowHeight: limited(o.rowHeight, "rowHeight"),
+    accent: color(o.accent),
+  };
+}
+
+export function validateIconThemeOptionsMap(raw: unknown): Record<string, FileIconThemeOptions> {
+  return Object.fromEntries(
+    Object.entries(obj(raw))
+      .filter(([key, v]) => THEME_KEY.test(key) && isObj(v))
+      .map(([key, v]) => [key, validateIconThemeOptions(v)]),
+  );
+}
diff --git a/src/platform/inspections.ts b/src/platform/inspections.ts
index d2269c93..5dce0afd 100644
--- a/src/platform/inspections.ts
+++ b/src/platform/inspections.ts
@@ -216,9 +216,14 @@ export interface BuiltinInspection {
   description: string;
   /** Highlighting level when the profile sets none (else as reported). */
   defaultLevel?: InspectionLevel;
+  /** `false`: off until a profile turns it on. */
+  defaultEnabled?: boolean;
   options?: readonly InspectionOptionSpec[];
 }
 
+/** Turned on, the Java language server's compiler reports it (`ide-sdk` `SERIAL_VERSION_INSPECTION`). */
+export const JAVA_SERIAL_VERSION_INSPECTION = "java:missing-serial-version";
+
 /** Producer key of the Typo inspection's diagnostics. */
 export const SPELLING_PRODUCER = "spelling";
 export const SPELLING_INSPECTION = "builtin:spelling";
@@ -283,6 +288,16 @@ export const BUILTIN_INSPECTIONS: readonly BuiltinInspection[] = [
     group: "General",
     description: "Compiler errors and warnings of the last Build Project, shown at their source positions.",
   },
+  {
+    id: JAVA_SERIAL_VERSION_INSPECTION,
+    producer: "jdt-serial-version",
+    name: "Serializable class without 'serialVersionUID'",
+    group: "Java",
+    description:
+      "Reports classes that implement Serializable but declare no serialVersionUID field. Alt+Enter on the class name adds a default or a generated ID. The Java language server checks it, and restarts when this is changed.",
+    defaultLevel: "warning",
+    defaultEnabled: false,
+  },
   {
     id: "builtin:sql",
     producer: "sql-inspections",
@@ -310,6 +325,11 @@ export const BUILTIN_INSPECTIONS: readonly BuiltinInspection[] = [
 const BUILTIN_BY_PRODUCER = new Map(BUILTIN_INSPECTIONS.map((b) => [b.producer, b]));
 const BUILTIN_BY_ID = new Map(BUILTIN_INSPECTIONS.map((b) => [b.id, b]));
 
+/** Whether inspection `id` is on when a profile doesn't say. */
+export function enabledByDefault(id: string): boolean {
+  return BUILTIN_BY_ID.get(id)?.defaultEnabled ?? true;
+}
+
 /** Option `key` of inspection `id` under `profile` (its default when unset). */
 export function inspectionOption(profile: ProfileOverrides, id: string, key: string): boolean {
   const value = profile[id]?.options?.[key];
@@ -363,7 +383,7 @@ export function applyProfile<D extends Diagnostic>(
 ): readonly D[] {
   const base = producerInspectionId(producer);
   const own = profile[base];
-  if (own?.enabled === false) return [];
+  if (!(own?.enabled ?? enabledByDefault(base))) return [];
   const fallback = BUILTIN_BY_PRODUCER.get(producer)?.defaultLevel;
   let changed = false;
   const out: D[] = [];
diff --git a/src/platform/keymaps/ideaParity.test.ts b/src/platform/keymaps/ideaParity.test.ts
index 31a77539..6478c9fc 100644
--- a/src/platform/keymaps/ideaParity.test.ts
+++ b/src/platform/keymaps/ideaParity.test.ts
@@ -21,6 +21,8 @@ describe("IDEA keymap parity", () => {
     ["vcs.branches", [], ["Ctrl+Shift+`"]],
     // Git.CreateNewBranch shares Inline's shortcut.
     ["vcs.newBranch", ["Meta+Alt+N"], ["Ctrl+Alt+N"]],
+    // ChangesView.AddUnversioned; on Windows the diff viewer's Apply Right Side wins while a diff is focused.
+    ["vcs.addToVcs", ["Meta+Alt+A"], ["Ctrl+Alt+A"]],
     ["refactor.inline", ["Meta+Alt+N"], ["Ctrl+Alt+N"]],
     ["debug.resume", ["Meta+Alt+R", "F9"], ["F9"]],
     ["code.quickDefinition", ["Alt+Space", "Meta+Y"], ["Ctrl+Shift+I"]],
@@ -104,5 +106,6 @@ describe("IDEA keymap parity", () => {
     order(km, "find.inFile", "vcs.log.goToRef");
     // Inline (text editor only) wins over New Branch.
     order(km, "vcs.newBranch", "refactor.inline");
+    order(km, "vcs.addToVcs", "diff.applyRightSide");
   });
 });
diff --git a/src/platform/keymaps/intellij-macos.ts b/src/platform/keymaps/intellij-macos.ts
index 2351a26b..6d939fa8 100644
--- a/src/platform/keymaps/intellij-macos.ts
+++ b/src/platform/keymaps/intellij-macos.ts
@@ -170,6 +170,8 @@ export const intellijMacos: Record<string, string[]> = {
   "refactor.inline": ["Meta+Alt+N"],
   "refactor.move": ["F6"],
   "refactor.safeDelete": ["Meta+Delete"],
+  "refactor.pullMembersUp": [],
+  "refactor.pushMembersDown": [],
 
   // File / editor tabs
   "file.save": ["Meta+S"],
@@ -296,6 +298,7 @@ export const intellijMacos: Record<string, string[]> = {
   "vcs.showMessageHistory": ["Ctrl+M"],
   "vcs.update": ["Meta+T"],
   "vcs.rollback": ["Meta+Alt+Z"],
+  "vcs.addToVcs": ["Meta+Alt+A"],
   "vcs.showDiff": ["Meta+D"],
   "vcs.nextChange": ["Ctrl+Alt+Shift+Down"],
   "vcs.prevChange": ["Ctrl+Alt+Shift+Up"],
@@ -346,6 +349,7 @@ export const intellijMacos: Record<string, string[]> = {
   "markdown.previewOnly": [],
   // HTTP Client / Database console: run the request or statement at the caret.
   "http.runRequest": ["Meta+Enter"],
+  "graphql.runQuery": ["Meta+Enter"],
   "http.runAll": [],
   "db.execute": ["Meta+Enter"],
   "db.showToolWindow": [],
diff --git a/src/platform/keymaps/intellij-windows.ts b/src/platform/keymaps/intellij-windows.ts
index 951641d2..75b0a8c5 100644
--- a/src/platform/keymaps/intellij-windows.ts
+++ b/src/platform/keymaps/intellij-windows.ts
@@ -171,6 +171,8 @@ export const intellijWindows: Record<string, string[]> = {
   "refactor.inline": ["Ctrl+Alt+N"],
   "refactor.move": ["F6"],
   "refactor.safeDelete": ["Alt+Delete"],
+  "refactor.pullMembersUp": [],
+  "refactor.pushMembersDown": [],
 
   // File / editor tabs
   "file.save": ["Ctrl+S"],
@@ -290,6 +292,7 @@ export const intellijWindows: Record<string, string[]> = {
   "vcs.showMessageHistory": ["Ctrl+M"],
   "vcs.update": ["Ctrl+T"],
   "vcs.rollback": ["Ctrl+Alt+Z"],
+  "vcs.addToVcs": ["Ctrl+Alt+A"],
   "vcs.showDiff": ["Ctrl+D"],
   "vcs.nextChange": ["Ctrl+Alt+Shift+Down"],
   "vcs.prevChange": ["Ctrl+Alt+Shift+Up"],
@@ -344,6 +347,7 @@ export const intellijWindows: Record<string, string[]> = {
   "markdown.previewOnly": [],
   // HTTP Client / Database console: run the request or statement at the caret.
   "http.runRequest": ["Ctrl+Enter"],
+  "graphql.runQuery": ["Ctrl+Enter"],
   "http.runAll": [],
   "db.execute": ["Ctrl+Enter"],
   "db.showToolWindow": [],
diff --git a/src/platform/keymaps/vscode-macos.ts b/src/platform/keymaps/vscode-macos.ts
index e9df6a03..883cc29f 100644
--- a/src/platform/keymaps/vscode-macos.ts
+++ b/src/platform/keymaps/vscode-macos.ts
@@ -172,6 +172,8 @@ export const vscodeMacos: Record<string, string[]> = {
   "refactor.inline": [],
   "refactor.move": [],
   "refactor.safeDelete": [],
+  "refactor.pullMembersUp": [],
+  "refactor.pushMembersDown": [],
 
   // File / editor tabs
   "file.save": ["Meta+S"],
@@ -291,6 +293,7 @@ export const vscodeMacos: Record<string, string[]> = {
   "vcs.showMessageHistory": [],
   "vcs.update": [],
   "vcs.rollback": [],
+  "vcs.addToVcs": [],
   "vcs.showDiff": [],
   "vcs.nextChange": ["Alt+F5"],
   "vcs.prevChange": ["Alt+Shift+F5"],
@@ -339,6 +342,7 @@ export const vscodeMacos: Record<string, string[]> = {
   "diff.jumpToSource": [],
   // HTTP Client / Database console: run the request or statement at the caret.
   "http.runRequest": ["Meta+Enter"],
+  "graphql.runQuery": ["Meta+Enter"],
   "http.runAll": [],
   "db.execute": ["Meta+Enter"],
   "db.showToolWindow": [],
diff --git a/src/platform/languageSettings.ts b/src/platform/languageSettings.ts
index e3cfe0f3..8ed81941 100644
--- a/src/platform/languageSettings.ts
+++ b/src/platform/languageSettings.ts
@@ -55,11 +55,33 @@ const DEFAULT_FORMATTER: ExternalFormatterValid = {
   runOnSave: false,
 };
 
+/** `languages.php.languageLevel` values; `""` = Auto (from `composer.json`). */
+export const PHP_LANGUAGE_LEVELS = [
+  "",
+  "5.6",
+  "7.0",
+  "7.1",
+  "7.2",
+  "7.3",
+  "7.4",
+  "8.0",
+  "8.1",
+  "8.2",
+  "8.3",
+  "8.4",
+  "8.5",
+] as const;
+
 export interface LanguagesValid {
   python: { interpreter: string; activateVirtualenv: boolean };
   ruby: { interpreter: string };
   node: { interpreter: string; packageManager: "" | "npm" | "pnpm" | "yarn" | "bun" };
-  php: { interpreter: string };
+  php: {
+    interpreter: string;
+    languageLevel: (typeof PHP_LANGUAGE_LEVELS)[number];
+    includePaths: string[];
+    stubs: string[];
+  };
   rust: {
     toolchain: string;
     stdlib: string;
@@ -81,6 +103,7 @@ export interface LanguagesValid {
     jdtlsJdk: string;
     jdtlsVmArgs: string;
     gradle: {
+      linkedProjects: string[] | null;
       jvm: string;
       distribution: "wrapper" | "local";
       home: string;
@@ -88,7 +111,14 @@ export interface LanguagesValid {
       /** IDEA's "Build and run using": Gradle (`JavaExec`) or the IDE (the language server's classpath). */
       runUsing: "gradle" | "ide";
     };
-    maven: { home: string; userSettings: string; localRepository: string; unlinkedProjects: string[] };
+    maven: {
+      home: string;
+      userSettings: string;
+      localRepository: string;
+      unlinkedProjects: string[];
+      daemon: boolean;
+      mvndHome: string;
+    };
   };
   /** Preview font size in px; `null` follows the editor font size. */
   markdown: { previewFontSize: number | null };
@@ -121,7 +151,7 @@ export const DEFAULT_LANGUAGES: LanguagesValid = {
   python: { interpreter: "", activateVirtualenv: true },
   ruby: { interpreter: "" },
   node: { interpreter: "", packageManager: "" },
-  php: { interpreter: "" },
+  php: { interpreter: "", languageLevel: "", includePaths: [], stubs: [] },
   rust: { toolchain: "", stdlib: "", checkOnSave: true, checkCommand: "check", rustfmtArgs: "" },
   go: { goroot: "", gopath: "", buildTags: DEFAULT_GO_BUILD_TAGS, modules: { env: {}, autoVendor: true } },
   typescript: { version: "bundled" },
@@ -131,8 +161,8 @@ export const DEFAULT_LANGUAGES: LanguagesValid = {
     jdk: "",
     jdtlsJdk: "",
     jdtlsVmArgs: "",
-    gradle: { jvm: "", distribution: "wrapper", home: "", userHome: "", runUsing: "gradle" },
-    maven: { home: "", userSettings: "", localRepository: "", unlinkedProjects: [] },
+    gradle: { linkedProjects: null, jvm: "", distribution: "wrapper", home: "", userHome: "", runUsing: "gradle" },
+    maven: { home: "", userSettings: "", localRepository: "", unlinkedProjects: [], daemon: false, mvndHome: "" },
   },
   markdown: { previewFontSize: null },
 };
@@ -167,6 +197,11 @@ export function normalizeFolder(path: string): string {
 /** A stored preview font size within IDEA's 8..72, or `null` (follow the editor font). */
 const previewSize = (v: unknown): number | null =>
   typeof v === "number" && Number.isFinite(v) ? Math.min(72, Math.max(8, Math.round(v))) : null;
+/** Non-empty trimmed strings, without duplicates. */
+const strings = (v: unknown): string[] =>
+  Array.isArray(v)
+    ? [...new Set(v.filter((x): x is string => typeof x === "string").map((x) => x.trim()))].filter((x) => x)
+    : [];
 const folders = (v: unknown): string[] =>
   Array.isArray(v)
     ? [
@@ -222,7 +257,12 @@ export function validateLanguages(raw: unknown): LanguagesValid {
       interpreter: text(node.interpreter, d.node.interpreter),
       packageManager: oneOf(node.packageManager, ["", "npm", "pnpm", "yarn", "bun"] as const, d.node.packageManager),
     },
-    php: { interpreter: text(php.interpreter, d.php.interpreter) },
+    php: {
+      interpreter: text(php.interpreter, d.php.interpreter),
+      languageLevel: oneOf(php.languageLevel, PHP_LANGUAGE_LEVELS, d.php.languageLevel),
+      includePaths: strings(php.includePaths),
+      stubs: strings(php.stubs),
+    },
     rust: {
       toolchain: text(rust.toolchain, d.rust.toolchain),
       stdlib: text(rust.stdlib, d.rust.stdlib),
@@ -253,6 +293,9 @@ export function validateLanguages(raw: unknown): LanguagesValid {
       jdtlsJdk: text(java.jdtlsJdk, d.java.jdtlsJdk),
       jdtlsVmArgs: text(java.jdtlsVmArgs, d.java.jdtlsVmArgs),
       gradle: {
+        linkedProjects: Array.isArray(gradle.linkedProjects)
+          ? gradle.linkedProjects.filter((p): p is string => typeof p === "string")
+          : null,
         jvm: text(gradle.jvm, d.java.gradle.jvm),
         distribution: oneOf(gradle.distribution, ["wrapper", "local"] as const, d.java.gradle.distribution),
         home: text(gradle.home, d.java.gradle.home),
@@ -264,6 +307,8 @@ export function validateLanguages(raw: unknown): LanguagesValid {
         userSettings: text(maven.userSettings, d.java.maven.userSettings),
         localRepository: text(maven.localRepository, d.java.maven.localRepository),
         unlinkedProjects: folders(maven.unlinkedProjects),
+        daemon: bool(maven.daemon, d.java.maven.daemon),
+        mvndHome: text(maven.mvndHome, d.java.maven.mvndHome),
       },
     },
     markdown: { previewFontSize: previewSize(markdown.previewFontSize) },
diff --git a/src/platform/locales/actionTitles.test.ts b/src/platform/locales/actionTitles.test.ts
index 18274c97..8a1756dc 100644
--- a/src/platform/locales/actionTitles.test.ts
+++ b/src/platform/locales/actionTitles.test.ts
@@ -4,7 +4,7 @@ import ts from "typescript";
 import { expect, it } from "vitest";
 import zh from "./text/zh.json";
 
-const root = fileURLToPath(new URL("../../../", import.meta.url));
+const root = fileURLToPath(new URL("../../../", import.meta.url)).replaceAll("\\", "/");
 const config = ts.readConfigFile(`${root}tsconfig.json`, ts.sys.readFile);
 const parsed = ts.parseJsonConfigFileContent(config.config, ts.sys, root);
 const program = ts.createProgram(parsed.fileNames, parsed.options);
@@ -74,7 +74,7 @@ function actionTitles(): Map<string, string> {
 
 const titles = actionTitles();
 /** Product names shown as they are in every language. */
-const PROPER_NAMES = new Set(["Vim"]);
+const PROPER_NAMES = new Set(["GraphQL", "Vim"]);
 
 it("has a Chinese entry for every literal action title, including action factory arguments", () => {
   // Ensure the helper-argument regression cannot disappear through a scanner change.
diff --git a/src/platform/locales/en.json b/src/platform/locales/en.json
index 42b99e00..05325107 100644
--- a/src/platform/locales/en.json
+++ b/src/platform/locales/en.json
@@ -242,6 +242,8 @@
   "menu.refactor.extractVariable": "Introduce Variable…",
   "menu.refactor.inline": "Inline…",
   "menu.refactor.move": "Move…",
+  "menu.refactor.pullMembersUp": "Pull Members Up…",
+  "menu.refactor.pushMembersDown": "Push Members Down…",
   "menu.refactor.rename": "Rename…",
   "menu.refactor.safeDelete": "Safe Delete…",
   "menu.refactor.thisMenu": "Refactor This…",
@@ -338,6 +340,7 @@
   "menu.vcs.addToVcs": "Add to VCS",
   "menu.vcs.compareWithBranch": "Compare with Branch or Revision…",
   "menu.vcs.showHistory": "Show History",
+  "menu.vcs.showHistoryForSelection": "Show History for Selection",
   "menu.build": "Build",
   "menu.build.buildProject": "Build Project",
   "menu.build.buildModule": "Build Module",
@@ -447,5 +450,7 @@
   "menu.editor.contextInfo": "Context Info",
   "run.services.configurationCount": "{count} configurations",
   "search.bookmarks.count": "{count, plural, one {# bookmark} other {# bookmarks}}",
+  "search.find.matches": "{matches, plural, one {# match} other {# matches}} in {files, plural, one {# file} other {# files}}",
+  "search.find.matchesIncomplete": "{matches, plural, one {#+ match} other {#+ matches}} in {files, plural, one {#+ file} other {#+ files}}",
   "settings.zoom.hint": "Change with {zoomIn} or {zoomOut}. Set to 100% with {reset}"
 }
diff --git a/src/platform/locales/es.json b/src/platform/locales/es.json
new file mode 100644
index 00000000..ec249234
--- /dev/null
+++ b/src/platform/locales/es.json
@@ -0,0 +1,456 @@
+{
+  "app.about.build": "Compilación",
+  "app.about.configDir": "Configuración",
+  "app.about.copyInfo": "Copiar información",
+  "app.about.copyright": "Copyright © 2026 Colaboradores de OpenIDEA",
+  "app.about.disclaimer": "Sin afiliación con JetBrains.",
+  "app.about.license": "Bajo la Licencia Apache 2.0",
+  "app.about.platform": "Plataforma",
+  "app.about.runtime": "Entorno de ejecución",
+  "app.about.showConfig": "Abrir carpeta de configuración",
+  "app.about.tagline": "Un IDE de código abierto inspirado en IntelliJ IDEA",
+  "app.about.thirdParty": "Incluye íconos de IntelliJ Platform (Apache-2.0).",
+  "app.about.title": "Acerca de OpenIDEA",
+  "app.about.version": "Versión",
+  "app.action.about": "Acerca de OpenIDEA",
+  "app.action.checkForUpdates": "Buscar actualizaciones…",
+  "app.action.copy": "Copiar",
+  "app.action.cut": "Cortar",
+  "app.action.keymapReference": "Referencia de atajos de teclado",
+  "app.action.lightEditOpenProject": "Abrir carpeta contenedora como proyecto",
+  "app.action.newWindow": "Nueva ventana",
+  "app.action.nextWindow": "Siguiente ventana de proyecto",
+  "app.action.openFile": "Abrir archivo…",
+  "app.action.openInNewWindow": "Abrir en una ventana nueva…",
+  "app.action.openRecentProject": "Abrir proyecto reciente",
+  "app.action.paste": "Pegar",
+  "app.action.previousWindow": "Ventana de proyecto anterior",
+  "app.action.quit": "{os, select, macos {Salir de OpenIDEA} other {Salir}}",
+  "app.action.redo": "Rehacer",
+  "app.action.selectAll": "Seleccionar todo",
+  "app.action.showLog": "{os, select, macos {Mostrar registro en Finder} windows {Mostrar registro en el Explorador} other {Mostrar registro en Archivos}}",
+  "app.action.toggleFullScreen": "Alternar pantalla completa",
+  "app.action.undo": "Deshacer",
+  "app.category.edit": "Editar",
+  "app.category.file": "Archivo",
+  "app.category.help": "Ayuda",
+  "app.category.view": "Ver",
+  "app.category.window": "Ventana",
+  "app.exit.body": "¿Estás seguro de que quieres salir de OpenIDEA?",
+  "app.exit.confirm": "Salir",
+  "app.exit.dontAsk": "No volver a preguntar",
+  "app.exit.title": "Confirmar salida",
+  "app.keymap.count": "{count, plural, one {# atajo} other {# atajos}}",
+  "app.keymap.empty": "No hay atajos que coincidan",
+  "app.keymap.filter": "Filtrar por acción o atajo",
+  "app.keymap.other": "Otros",
+  "app.keymap.preset": "Mapa de teclado: {preset}",
+  "app.keymap.title": "Referencia de atajos de teclado",
+  "app.lightEdit.openProject": "Abrir como proyecto",
+  "app.lightEdit.openProjectTooltip": "Abrir {folder} como proyecto",
+  "app.log.failed": "No se puede mostrar el registro",
+  "app.project.opening": "Abriendo {name}…",
+  "app.title.default": "OpenIDEA",
+  "app.unsaved.body": "{count, plural, one {# archivo tiene} other {# archivos tienen}} cambios sin guardar en {project}. ¿Guardar antes de cerrar?",
+  "app.unsaved.discard": "No guardar",
+  "app.unsaved.save": "Guardar todo",
+  "app.unsaved.saveFailed": "No se pudieron guardar todos los archivos",
+  "app.unsaved.title": "Cambios sin guardar",
+  "app.update.available": "OpenIDEA {version} está disponible",
+  "app.update.cancel": "Cancelar",
+  "app.update.cancelled": "Actualización cancelada",
+  "app.update.checking": "Buscando actualizaciones…",
+  "app.update.disabled": "Las actualizaciones automáticas no están configuradas",
+  "app.update.disabledBody": "Configura un endpoint de actualización (OPENIDEA_UPDATE_ENDPOINT o plugins.updater.endpoints) para habilitar la búsqueda de actualizaciones.",
+  "app.update.downloading": "Descargando OpenIDEA {version}",
+  "app.update.failed": "Error al buscar actualizaciones",
+  "app.update.install": "Instalar y reiniciar",
+  "app.update.installFailed": "No se pudo instalar la actualización",
+  "app.update.installed": "OpenIDEA {version} está instalado",
+  "app.update.installedBody": "Se aplicará después de reiniciar OpenIDEA.",
+  "app.update.installingMessage": "Instalando…",
+  "app.update.installUncancellable": "La actualización se está instalando; este paso no se puede cancelar",
+  "app.update.none": "OpenIDEA {version} está actualizado",
+  "app.update.progress": "{done} MB de {total} MB",
+  "app.update.progressUnknown": "{done} MB",
+  "app.update.restart": "Reiniciar",
+  "app.update.retry": "Reintentar",
+  "app.window.desktopOnly": "Múltiples ventanas requieren la aplicación de escritorio",
+  "app.window.openFailed": "No se puede abrir {name}",
+  "app.window.pickFileTitle": "Abrir archivo",
+  "app.window.pickTitle": "Abrir en una ventana nueva",
+  "app.window.askTitle": "Abrir proyecto",
+  "app.window.askBody": "Los proyectos se pueden abrir en una ventana nueva, reemplazar el proyecto actual o adjuntarse a los proyectos ya abiertos.\n¿Cómo te gustaría abrir \"{name}\"?",
+  "app.window.askThis": "Esta ventana",
+  "app.window.askAttach": "Adjuntar",
+  "app.window.askNew": "Nueva ventana",
+  "app.window.askRemember": "No volver a preguntar",
+  "common.cancel": "Cancelar",
+  "common.close": "Cerrar",
+  "common.copied": "Copiado",
+  "common.copy": "Copiar",
+  "menu.app": "OpenIDEA",
+  "menu.app.about": "Acerca de OpenIDEA",
+  "menu.app.checkForUpdates": "Buscar actualizaciones…",
+  "menu.app.quit": "{os, select, macos {Salir de OpenIDEA} other {Salir}}",
+  "menu.appearance": "Apariencia",
+  "menu.code": "Código",
+  "menu.code.commentBlock": "Comentar con comentario de bloque",
+  "menu.code.commentLine": "Comentar con comentario de línea",
+  "menu.code.completion": "Básico",
+  "menu.code.deleteLine": "Eliminar línea",
+  "menu.code.duplicateLine": "Duplicar línea o selección",
+  "menu.code.extendSelection": "Ampliar selección",
+  "menu.code.foldAll": "Contraer todo",
+  "menu.code.foldToggle": "Expandir/Contraer",
+  "menu.code.generate": "Generar…",
+  "menu.code.pasteAsPlainText": "Pegar como texto sin formato",
+  "menu.editor.copyReference": "Copiar referencia",
+  "menu.code.cyclicExpandWord": "Expandir palabra cíclicamente",
+  "menu.code.cyclicExpandWordBackward": "Expandir palabra cíclicamente (hacia atrás)",
+  "menu.code.expressionTypeInfo": "Información del tipo de expresión",
+  "menu.code.overrideMethods": "Sobrescribir métodos…",
+  "menu.code.implementMethods": "Implementar métodos…",
+  "menu.code.insertLiveTemplate": "Insertar plantilla activa…",
+  "menu.code.moveLineDown": "Mover línea hacia abajo",
+  "menu.code.moveLineUp": "Mover línea hacia arriba",
+  "menu.code.optimizeImports": "Optimizar importaciones",
+  "menu.code.parameterInfo": "Información de parámetros",
+  "menu.code.quickDocumentation": "Documentación rápida",
+  "menu.code.reformat": "Reformatar código",
+  "menu.code.showIntentions": "Mostrar acciones de contexto",
+  "menu.code.shrinkSelection": "Reducir selección",
+  "menu.code.surroundWith": "Rodear con…",
+  "menu.code.unwrap": "Desenvolver/Quitar…",
+  "menu.code.unfoldAll": "Expandir todo",
+  "menu.debug.evaluate": "Evaluar expresión…",
+  "menu.debug.pause": "Pausar programa",
+  "menu.debug.resume": "Reanudar programa",
+  "menu.debug.runToCursor": "Ejecutar hasta el cursor",
+  "menu.debug.stepInto": "Entrar en (Step Into)",
+  "menu.debug.stepOut": "Salir de (Step Out)",
+  "menu.debug.stepOver": "Saltar por encima (Step Over)",
+  "menu.debug.toggleBreakpoint": "Alternar punto de interrupción de línea",
+  "menu.debug.viewBreakpoints": "Ver puntos de interrupción…",
+  "menu.debug.attachToProcess": "Adjuntar a un proceso…",
+  "menu.debug.forceStepOver": "Forzar salto por encima (Force Step Over)",
+  "menu.debug.forceStepInto": "Forzar entrada (Force Step Into)",
+  "menu.debug.smartStepInto": "Entrada inteligente (Smart Step Into)",
+  "menu.debug.forceRunToCursor": "Forzar ejecución hasta el cursor",
+  "menu.debug.showExecutionPoint": "Mostrar punto de ejecución",
+  "menu.debug.resetFrame": "Restablecer marco",
+  "menu.debug.toggleTemporaryBreakpoint": "Alternar punto de interrupción de línea temporal",
+  "menu.debug.toggleMethodBreakpoint": "Alternar punto de interrupción de método",
+  "menu.debug.toggleFieldWatchpoint": "Alternar punto de observación de campo",
+  "menu.edit": "Editar",
+  "menu.edit.copy": "Copiar",
+  "menu.edit.cut": "Cortar",
+  "menu.edit.paste": "Pegar",
+  "menu.code.pasteFromHistory": "Pegar desde el historial…",
+  "menu.edit.redo": "Rehacer",
+  "menu.edit.selectAll": "Seleccionar todo",
+  "menu.edit.undo": "Deshacer",
+  "menu.editor.copyPath": "Copiar ruta",
+  "menu.code.sortLines": "Ordenar líneas",
+  "menu.code.reverseLines": "Invertir líneas",
+  "menu.editor.toggleColumnSelection": "Modo de selección por columnas",
+  "menu.editor.splitDown": "Dividir hacia abajo",
+  "menu.editor.splitRight": "Dividir a la derecha",
+  "menu.editor.toggleZen": "{distractionFree, select, on {Salir del modo sin distracciones} other {Entrar al modo sin distracciones}}",
+  "menu.editor.unsplit": "Quitar división",
+  "menu.file": "Archivo",
+  "menu.fileProperties": "Propiedades del archivo",
+  "menu.newProjectsSetup": "Configuración de proyectos nuevos",
+  "menu.file.newProjectsSettings": "Configuración para proyectos nuevos…",
+  "menu.file.toggleReadOnly": "Alternar archivo entre solo lectura y escritura",
+  "menu.file.closeProject": "Cerrar proyecto",
+  "menu.remote.reloadEnvironment": "Recargar entorno",
+  "menu.file.new": "Nuevo…",
+  "menu.file.newScratchFile": "Nuevo archivo borrador (Scratch)…",
+  "menu.file.openInNewWindow": "Abrir en una ventana nueva…",
+  "menu.file.openProject": "Abrir…",
+  "menu.file.save": "Guardar todo",
+  "menu.file.settings": "Configuración…",
+  "menu.find": "Buscar",
+  "menu.find.inFile": "Buscar…",
+  "menu.find.inPath": "Buscar en archivos…",
+  "menu.find.replaceInFile": "Reemplazar…",
+  "menu.find.replaceInPath": "Reemplazar en archivos…",
+  "menu.find.showUsages": "Mostrar usos",
+  "menu.find.usages": "Buscar usos",
+  "menu.completion": "Autocompletado de código",
+  "menu.folding": "Plegado",
+  "menu.code.foldSelection": "Plegar selección / Quitar región",
+  "menu.git": "Git",
+  "menu.help": "Ayuda",
+  "menu.mainMenu": "Menú principal",
+  "window.caption.minimize": "Minimizar",
+  "window.caption.maximize": "Maximizar",
+  "window.caption.restore": "Restaurar",
+  "window.caption.close": "Cerrar",
+  "menu.help.keymapReference": "Referencia de atajos de teclado",
+  "menu.help.showLog": "{os, select, macos {Mostrar registro en Finder} windows {Mostrar registro en el Explorador} other {Mostrar registro en Archivos}}",
+  "menu.native.bringAllToFront": "Traer todo al frente",
+  "menu.native.copy": "Copiar",
+  "menu.native.cut": "Cortar",
+  "menu.native.hide": "Ocultar OpenIDEA",
+  "menu.native.hideOthers": "Ocultar otros",
+  "menu.native.minimize": "Minimizar",
+  "menu.native.paste": "Pegar",
+  "menu.native.redo": "Rehacer",
+  "menu.native.selectAll": "Seleccionar todo",
+  "menu.native.services": "Servicios",
+  "menu.native.showAll": "Mostrar todo",
+  "menu.native.undo": "Deshacer",
+  "menu.native.zoom": "Zoom",
+  "menu.navigate": "Navegar",
+  "menu.navigate.back": "Atrás",
+  "menu.navigate.lastEditLocation": "Última ubicación de edición",
+  "menu.navigate.nextEditLocation": "Siguiente ubicación de edición",
+  "menu.navigate.callHierarchy": "Jerarquía de llamadas",
+  "menu.navigate.declaration": "Declaración o usos",
+  "menu.navigate.fileStructure": "Estructura del archivo",
+  "menu.navigate.findAction": "Buscar acción…",
+  "menu.navigate.forward": "Adelante",
+  "menu.navigate.gotoClass": "Clase…",
+  "menu.navigate.gotoFile": "Archivo…",
+  "menu.navigate.gotoLine": "Línea/Columna…",
+  "menu.navigate.gotoSymbol": "Símbolo…",
+  "menu.navigate.implementation": "Implementación(es)",
+  "menu.navigate.nextError": "Siguiente error resaltado",
+  "menu.navigate.prevError": "Error resaltado anterior",
+  "menu.navigate.recentFiles": "Archivos recientes",
+  "menu.navigate.recentLocations": "Ubicaciones recientes",
+  "menu.navigate.searchEverywhere": "Buscar en todas partes",
+  "menu.navigate.selectIn": "Seleccionar en…",
+  "menu.navigate.showBookmarks": "Mostrar marcadores",
+  "menu.navigate.toggleBookmark": "Alternar marcador",
+  "menu.navigate.typeDeclaration": "Declaración de tipo",
+  "menu.navigate.typeHierarchy": "Jerarquía de tipos",
+  "menu.navigate.superMethod": "Método padre (Super Method)",
+  "menu.navigate.gotoTest": "Prueba",
+  "menu.navigate.nextMethod": "Siguiente método",
+  "menu.navigate.previousMethod": "Método anterior",
+  "menu.openRecent": "Abrir reciente",
+  "menu.recent.none": "No hay proyectos recientes",
+  "menu.refactor": "Refactorizar",
+  "menu.refactor.changeSignature": "Cambiar firma…",
+  "menu.refactor.extractConstant": "Introducir constante…",
+  "menu.refactor.extractField": "Introducir campo…",
+  "menu.refactor.extractMethod": "Extraer método…",
+  "menu.refactor.extractParameter": "Introducir parámetro…",
+  "menu.refactor.extractVariable": "Introducir variable…",
+  "menu.refactor.inline": "Integrar en línea (Inline)…",
+  "menu.refactor.move": "Mover…",
+  "menu.refactor.pullMembersUp": "Subir miembros a la superclase…",
+  "menu.refactor.pushMembersDown": "Bajar miembros a la subclase…",
+  "menu.refactor.rename": "Renombrar…",
+  "menu.refactor.safeDelete": "Eliminación segura…",
+  "menu.refactor.thisMenu": "Refactorizar esto…",
+  "menu.run": "Ejecutar",
+  "menu.run.chooseConfig": "Ejecutar…",
+  "menu.run.debug": "Depurar",
+  "menu.run.debugContext": "Depurar configuración de contexto",
+  "menu.run.coverage": "Ejecutar con cobertura",
+  "menu.run.profile": "Perfilar",
+  "menu.coverage.hide": "Ocultar cobertura",
+  "menu.debuggingActions": "Acciones de depuración",
+  "menu.debug.reloadChangedClasses": "Recargar clases modificadas",
+  "menu.toolwindow.coverage": "Cobertura",
+  "menu.toolwindow.profiler": "Perfilador",
+  "menu.run.editConfigs": "Editar configuraciones…",
+  "menu.run.run": "Ejecutar",
+  "menu.run.runContext": "Ejecutar configuración de contexto",
+  "menu.run.stop": "Detener",
+  "menu.toolWindows": "Ventanas de herramientas",
+  "menu.toolwindow.bookmarks": "Marcadores",
+  "menu.toolwindow.commit": "Confirmación (Commit)",
+  "menu.toolwindow.debug": "Depuración",
+  "menu.toolwindow.find": "Buscar",
+  "menu.toolwindow.git": "Git",
+  "menu.toolwindow.hideAll": "Ocultar todas las ventanas de herramientas",
+  "menu.toolwindow.problems": "Problemas",
+  "menu.toolwindow.project": "Proyecto",
+  "menu.toolwindow.run": "Ejecución",
+  "menu.toolwindow.structure": "Estructura",
+  "menu.toolwindow.terminal": "Terminal",
+  "terminal.close.title": "El proceso '{name}' se está ejecutando",
+  "terminal.close.message": "¿Quieres terminar el proceso '{name}'?",
+  "terminal.close.terminate": "Terminar",
+  "menu.vcs.annotate": "Anotar con Git Blame",
+  "menu.vcs.branches": "Ramas…",
+  "menu.vcs.commit": "Confirmar (Commit)…",
+  "menu.vcs.fetch": "Obtener cambios (Fetch)",
+  "menu.vcs.localHistory": "Historial local",
+  "menu.vcs.newBranch": "Nueva rama…",
+  "menu.vcs.push": "Subir cambios (Push)…",
+  "menu.vcs.rollback": "Revertir cambios…",
+  "menu.vcs.showDiff": "Mostrar diferencias",
+  "menu.vcs.showLog": "Mostrar registro de Git",
+  "menu.vcs.stash": "Guardar en stash…",
+  "menu.vcs.unstash": "Recuperar de stash…",
+  "menu.vcs.update": "Actualizar proyecto…",
+  "menu.vcs.pull": "Descargar cambios (Pull)…",
+  "menu.vcs.merge": "Fusionar (Merge)…",
+  "menu.vcs.rebase": "Rebasar (Rebase)…",
+  "menu.vcs.newWorktree": "Nuevo árbol de trabajo (Worktree)…",
+  "menu.vcs.worktrees": "Árboles de trabajo (Worktrees)…",
+  "menu.vcs.manageRemotes": "Administrar remotos…",
+  "menu.vcs.clone": "Clonar…",
+  "menu.vcs.operations": "Menú emergente de operaciones VCS…",
+  "menu.view": "Ver",
+  "menu.view.notifications": "Notificaciones",
+  "menu.view.toggleTheme": "Alternar tema claro/oscuro",
+  "menu.welcome.recentProjects": "Administrar proyectos…",
+  "menu.window": "Ventana",
+  "menu.tools": "Herramientas",
+  "menu.http.newRequest": "Nueva solicitud HTTP",
+  "menu.http.showToolWindow": "Cliente HTTP",
+  "menu.db.showToolWindow": "Base de datos",
+  "menu.db.newDataSource": "Nuevo origen de datos…",
+  "menu.db.openConsole": "Abrir consola de consultas",
+  "menu.vim.toggle": "Vim",
+  "menu.window.new": "Nueva ventana",
+  "menu.window.next": "Siguiente ventana de proyecto",
+  "menu.window.previous": "Ventana de proyecto anterior",
+  "menu.window.toggleFullScreen": "Alternar pantalla completa",
+  "os.linux": "Linux",
+  "os.macos": "macOS",
+  "os.web": "Navegador",
+  "os.windows": "Windows",
+  "menu.gitPatch": "Parche",
+  "menu.vcs.newTag": "Nueva etiqueta…",
+  "menu.vcs.resetHead": "Restablecer HEAD…",
+  "menu.vcs.shelve": "Archivar cambios (Shelve)…",
+  "menu.vcs.showShelf": "Mostrar cambios archivados (Shelf)",
+  "menu.vcs.createPatch": "Crear parche…",
+  "menu.vcs.applyPatch": "Aplicar parche…",
+  "menu.vcs.applyPatchFromClipboard": "Aplicar parche desde el portapapeles…",
+  "menu.vcs.resolveConflicts": "Resolver conflictos…",
+  "menu.vcs.rebase.continue": "Continuar rebase",
+  "menu.vcs.rebase.abort": "Abortar rebase",
+  "menu.vcs.rebase.skip": "Omitir confirmación (commit)",
+  "menu.vcs.merge.abort": "Abortar fusión (merge)",
+  "menu.vcs.cherryPick.continue": "Continuar cherry-pick",
+  "menu.vcs.cherryPick.abort": "Abortar cherry-pick",
+  "menu.vcs.revert.continue": "Continuar reversión",
+  "menu.vcs.revert.abort": "Abortar reversión",
+  "menu.gitUncommittedChanges": "Cambios sin confirmar",
+  "menu.gitCurrentFile": "Archivo actual",
+  "menu.vcs.addToVcs": "Agregar a VCS",
+  "menu.vcs.compareWithBranch": "Comparar con rama o revisión…",
+  "menu.vcs.showHistory": "Mostrar historial",
+  "menu.vcs.showHistoryForSelection": "Mostrar historial de la selección",
+  "menu.build": "Compilar",
+  "menu.build.buildProject": "Compilar proyecto",
+  "menu.build.buildModule": "Compilar módulo",
+  "menu.build.rebuildProject": "Recompilar proyecto",
+  "menu.build.buildArtifacts": "Compilar artefactos",
+  "menu.toolwindow.build": "Compilación",
+  "menu.find.structural": "Buscar estructuralmente…",
+  "menu.find.replaceStructural": "Reemplazar estructuralmente…",
+  "menu.analyze.inspectCode": "Inspeccionar código…",
+  "menu.analyzeCode": "Analizar código",
+  "menu.analyze.locateDuplicates": "Localizar duplicados…",
+  "menu.analyze.stackTrace": "Analizar traza de pila o volcado de hilos…",
+  "menu.toolwindow.services": "Servicios",
+  "menu.gitHub": "GitHub",
+  "menu.github.pullRequests": "Ver pull requests",
+  "menu.github.createPullRequest": "Crear pull request…",
+  "menu.github.checkoutPullRequest": "Hacer checkout de pull request…",
+  "menu.github.openInBrowser": "Abrir en GitHub",
+  "menu.file.newProject": "Nuevo proyecto…",
+  "menu.file.renameProject": "Renombrar proyecto…",
+  "menu.file.reloadAllFromDisk": "Recargar todo desde el disco",
+  "menu.file.invalidateCaches": "Invalidar cachés…",
+  "menu.manageIdeSettings": "Administrar configuración del IDE",
+  "menu.file.exportSettings": "Exportar configuración…",
+  "menu.file.importSettings": "Importar configuración…",
+  "menu.file.togglePowerSave": "Modo de ahorro de energía",
+  "menu.macros": "Macros",
+  "menu.macro.startRecording": "Iniciar grabación de macro",
+  "menu.macro.stopRecording": "Detener grabación de macro",
+  "menu.macro.playBack": "Reproducir última macro",
+  "menu.macro.playSaved": "Reproducir macros guardadas…",
+  "menu.macro.edit": "Editar macros…",
+  "menu.bookmarks": "Marcadores",
+  "menu.navigate.toggleBookmarkWithMnemonic": "Alternar marcador con mnemónico",
+  "menu.navigate.nextBookmark": "Siguiente marcador",
+  "menu.navigate.prevBookmark": "Marcador anterior",
+  "menu.view.toggleCompactMode": "Modo compacto",
+  "menu.view.zoomIn": "Acercar zoom del IDE",
+  "menu.view.zoomOut": "Alejar zoom del IDE",
+  "menu.view.resetZoom": "Restablecer zoom del IDE",
+  "menu.toolbar.customize": "Personalizar barra de herramientas principal…",
+  "menu.code.quickDefinition": "Definición rápida",
+  "menu.code.quickTypeDefinition": "Definición rápida de tipo",
+  "menu.localHistory.recentChanges": "Cambios recientes",
+  "menu.diff.compareWithClipboard": "Comparar con el portapapeles",
+  "menu.view.quickSwitchScheme": "Cambio rápido de esquema…",
+  "menu.editor.resetFontSize": "Restablecer tamaño de fuente en todos los editores",
+  "menu.code.cleanup": "Limpieza de código…",
+  "menu.runAnything.show": "Ejecutar cualquier cosa…",
+  "menu.localHistory.putLabel": "Poner etiqueta…",
+  "menu.toolWindowLayouts": "Diseños de ventanas de herramientas",
+  "menu.layout.save": "Guardar diseño actual como…",
+  "menu.layout.restoreDefault": "Restaurar diseño predeterminado",
+  "menu.layout.rename": "Renombrar diseño…",
+  "menu.layout.delete": "Eliminar diseño…",
+  "menu.activeToolWindow": "Ventana de herramientas activa",
+  "menu.toolwindow.hideActive": "Ocultar ventana de herramientas activa",
+  "menu.toolwindow.maximize": "Maximizar ventana de herramientas",
+  "menu.toolwindow.closeContent": "Cerrar pestaña activa",
+  "menu.toolwindow.jumpToLast": "Ir a la última ventana de herramientas",
+  "menu.toolwindow.focusEditor": "Enfocar editor",
+  "menu.editorTabs": "Pestañas del editor",
+  "menu.editor.nextTab": "Seleccionar siguiente pestaña",
+  "menu.editor.prevTab": "Seleccionar pestaña anterior",
+  "menu.editor.pinTab": "Fijar pestaña",
+  "menu.editor.closeTab": "Cerrar pestaña",
+  "menu.editor.closeOtherTabs": "Cerrar las demás pestañas",
+  "menu.editor.closeAllTabs": "Cerrar todas las pestañas",
+  "menu.editor.reopenClosedTab": "Reabrir pestaña cerrada",
+  "menu.editor.moveToOppositeGroup": "Mover al grupo opuesto",
+  "menu.editor.openInOppositeGroup": "Abrir en el grupo opuesto",
+  "menu.editor.changeSplitOrientation": "Cambiar orientación de la división",
+  "menu.editor.unsplitAll": "Quitar todas las divisiones",
+  "menu.navigate.showFilePath": "Ruta del archivo",
+  "menu.navigate.customRegion": "Plegado personalizado…",
+  "menu.code.showErrorDescription": "Descripción del error",
+  "menu.code.surroundWithLiveTemplate": "Rodear con plantilla activa…",
+  "menu.code.autoIndentLines": "Aplicar sangría automática a las líneas",
+  "menu.code.moveStatementUp": "Mover instrucción hacia arriba",
+  "menu.code.moveStatementDown": "Mover instrucción hacia abajo",
+  "menu.code.moveElementLeft": "Mover elemento a la izquierda",
+  "menu.code.moveElementRight": "Mover elemento a la derecha",
+  "menu.code.collapseBlock": "Plegar bloque de código",
+  "menu.analyze.inspectFile": "Inspeccionar archivo actual",
+  "menu.project.copyElement": "Copiar…",
+  "menu.run.chooseDebugConfig": "Depurar…",
+  "menu.debug.quickEvaluate": "Evaluar expresión rápidamente",
+  "menu.resizeToolWindow": "Cambiar tamaño",
+  "menu.toolwindow.resizeLeft": "Estirar a la izquierda",
+  "menu.toolwindow.resizeRight": "Estirar a la derecha",
+  "menu.toolwindow.resizeUp": "Estirar hacia arriba",
+  "menu.toolwindow.resizeDown": "Estirar hacia abajo",
+  "menu.editor.nextSplitter": "Ir a la siguiente división",
+  "menu.editor.prevSplitter": "Ir a la división anterior",
+  "menu.expandToLevel": "Expandir al nivel",
+  "menu.expandAllToLevel": "Expandir todo al nivel",
+  "menu.code.expandToLevel1": "1",
+  "menu.code.expandAllToLevel1": "1",
+  "menu.code.expandToLevel2": "2",
+  "menu.code.expandAllToLevel2": "2",
+  "menu.code.expandToLevel3": "3",
+  "menu.code.expandAllToLevel3": "3",
+  "menu.code.expandToLevel4": "4",
+  "menu.code.expandAllToLevel4": "4",
+  "menu.code.expandToLevel5": "5",
+  "menu.code.expandAllToLevel5": "5",
+  "menu.editor.contextInfo": "Información de contexto",
+  "run.services.configurationCount": "{count} configuraciones",
+  "search.bookmarks.count": "{count, plural, one {# marcador} other {# marcadores}}",
+  "search.find.matches": "{matches, plural, one {# coincidencia} other {# coincidencias}} en {files, plural, one {# archivo} other {# archivos}}",
+  "search.find.matchesIncomplete": "{matches, plural, one {#+ coincidencia} other {#+ coincidencias}} en {files, plural, one {#+ archivo} other {#+ archivos}}",
+  "settings.zoom.hint": "Cámbialo con {zoomIn} o {zoomOut}. Restablece al 100% con {reset}"
+}
diff --git a/src/platform/locales/fr.json b/src/platform/locales/fr.json
index 11af60f1..02f0c743 100644
--- a/src/platform/locales/fr.json
+++ b/src/platform/locales/fr.json
@@ -241,6 +241,8 @@
   "menu.refactor.extractVariable": "Introduire une variable…",
   "menu.refactor.inline": "Intégrer…",
   "menu.refactor.move": "Déplacer…",
+  "menu.refactor.pullMembersUp": "Remonter les membres…",
+  "menu.refactor.pushMembersDown": "Descendre les membres…",
   "menu.refactor.rename": "Renommer…",
   "menu.refactor.safeDelete": "Suppression sûre…",
   "menu.refactor.thisMenu": "Refactoriser ceci…",
diff --git a/src/platform/locales/ko.json b/src/platform/locales/ko.json
index 43bb78c6..e6e1951c 100644
--- a/src/platform/locales/ko.json
+++ b/src/platform/locales/ko.json
@@ -242,6 +242,8 @@
   "menu.refactor.extractVariable": "변수 도입…",
   "menu.refactor.inline": "인라인…",
   "menu.refactor.move": "이동…",
+  "menu.refactor.pullMembersUp": "멤버 끌어올리기…",
+  "menu.refactor.pushMembersDown": "멤버 끌어내리기…",
   "menu.refactor.rename": "이름 변경…",
   "menu.refactor.safeDelete": "안전 삭제…",
   "menu.refactor.thisMenu": "이 항목 리팩터링…",
@@ -338,6 +340,7 @@
   "menu.vcs.addToVcs": "VCS에 추가",
   "menu.vcs.compareWithBranch": "브랜치 또는 리비전과 비교…",
   "menu.vcs.showHistory": "기록 표시",
+  "menu.vcs.showHistoryForSelection": "선택 영역 기록 표시",
   "menu.build": "빌드",
   "menu.build.buildProject": "프로젝트 빌드",
   "menu.build.buildModule": "모듈 빌드",
diff --git a/src/platform/locales/pl.json b/src/platform/locales/pl.json
new file mode 100644
index 00000000..9ce70195
--- /dev/null
+++ b/src/platform/locales/pl.json
@@ -0,0 +1,454 @@
+{
+  "app.about.build": "Kompilacja",
+  "app.about.configDir": "Konfiguracja",
+  "app.about.copyInfo": "Kopiuj informacje",
+  "app.about.copyright": "Copyright © 2026 Współtwórcy OpenIDEA",
+  "app.about.disclaimer": "Niepowiązane z JetBrains.",
+  "app.about.license": "Licencjonowano na licencji Apache 2.0",
+  "app.about.platform": "Platforma",
+  "app.about.runtime": "Środowisko uruchomieniowe",
+  "app.about.showConfig": "Otwórz folder konfiguracyjny",
+  "app.about.tagline": "Otwartoźródłowe środowisko IDE inspirowane IntelliJ IDEA",
+  "app.about.thirdParty": "Zawiera ikony z platformy IntelliJ (Apache-2.0).",
+  "app.about.title": "Informacje o OpenIDEA",
+  "app.about.version": "Wersja",
+  "app.action.about": "Informacje o OpenIDEA",
+  "app.action.checkForUpdates": "Sprawdź aktualizacje…",
+  "app.action.copy": "Kopiuj",
+  "app.action.cut": "Wytnij",
+  "app.action.keymapReference": "Mapa skrótów klawiszowych",
+  "app.action.lightEditOpenProject": "Otwórz folder zawierający jako projekt",
+  "app.action.newWindow": "Nowe okno",
+  "app.action.nextWindow": "Następne okno projektu",
+  "app.action.openFile": "Otwórz plik…",
+  "app.action.openInNewWindow": "Otwórz w nowym oknie…",
+  "app.action.openRecentProject": "Otwórz ostatni projekt",
+  "app.action.paste": "Wklej",
+  "app.action.previousWindow": "Poprzednie okno projektu",
+  "app.action.quit": "{os, select, macos {Zamknij OpenIDEA} other {Zakończ}}",
+  "app.action.redo": "Ponów",
+  "app.action.selectAll": "Zaznacz wszystko",
+  "app.action.showLog": "{os, select, macos {Pokaż dziennik w programie Finder} windows {Pokaż dziennik w Eksploratorze} other {Pokaż dziennik w plikach}}",
+  "app.action.toggleFullScreen": "Przełącz tryb pełnoekranowy",
+  "app.action.undo": "Cofnij",
+  "app.category.edit": "Edycja",
+  "app.category.file": "Plik",
+  "app.category.help": "Pomoc",
+  "app.category.view": "Widok",
+  "app.category.window": "Okno",
+  "app.exit.body": "Czy na pewno chcesz zamknąć OpenIDEA?",
+  "app.exit.confirm": "Zakończ",
+  "app.exit.dontAsk": "Nie pytaj ponownie",
+  "app.exit.title": "Potwierdzenie zamknięcia",
+  "app.keymap.count": "{count, plural, one {# skrót} few {# skróty} many {# skrótów} other {# skrótu}}",
+  "app.keymap.empty": "Brak pasujących skrótów",
+  "app.keymap.filter": "Filtruj według akcji lub skrótu",
+  "app.keymap.other": "Inne",
+  "app.keymap.preset": "Mapa skrótów klawiszowych: {preset}",
+  "app.keymap.title": "Mapa skrótów klawiszowych",
+  "app.lightEdit.openProject": "Otwórz jako projekt",
+  "app.lightEdit.openProjectTooltip": "Otwórz {folder} jako projekt",
+  "app.log.failed": "Nie udało się pokazać dziennika",
+  "app.project.opening": "Otwieranie {name}…",
+  "app.title.default": "OpenIDEA",
+  "app.unsaved.body": "{count, plural, one {# plik ma} few {# pliki mają} many {# plików ma} other {# pliku ma}} niezapisane zmiany w {project}. Zapisać przed zamknięciem?",
+  "app.unsaved.discard": "Nie zapisuj",
+  "app.unsaved.save": "Zapisz wszystko",
+  "app.unsaved.saveFailed": "Nie udało się zapisać wszystkich plików",
+  "app.unsaved.title": "Niezapisane zmiany",
+  "app.update.available": "Dostępna jest wersja OpenIDEA {version}",
+  "app.update.cancel": "Anuluj",
+  "app.update.cancelled": "Anulowano aktualizację",
+  "app.update.checking": "Sprawdzanie aktualizacji…",
+  "app.update.disabled": "Aktualizacje automatyczne nie są skonfigurowane",
+  "app.update.disabledBody": "Skonfiguruj punkt końcowy aktualizacji (OPENIDEA_UPDATE_ENDPOINT lub plugins.updater.endpoints), aby włączyć sprawdzanie aktualizacji.",
+  "app.update.downloading": "Pobieranie OpenIDEA {version}",
+  "app.update.failed": "Nie udało się sprawdzić aktualizacji",
+  "app.update.install": "Zainstaluj i uruchom ponownie",
+  "app.update.installFailed": "Nie udało się zainstalować aktualizacji",
+  "app.update.installed": "Zainstalowano OpenIDEA {version}",
+  "app.update.installedBody": "Zostanie użyty po ponownym uruchomieniu OpenIDEA.",
+  "app.update.installingMessage": "Instalowanie…",
+  "app.update.installUncancellable": "Trwa instalowanie aktualizacji; tego kroku nie można anulować",
+  "app.update.none": "OpenIDEA {version} jest aktualny",
+  "app.update.progress": "{done} MB z {total} MB",
+  "app.update.progressUnknown": "{done} MB",
+  "app.update.restart": "Uruchom ponownie",
+  "app.update.retry": "Spróbuj ponownie",
+  "app.window.desktopOnly": "Wiele okien wymaga aplikacji komputerowej",
+  "app.window.openFailed": "Nie udało się otworzyć {name}",
+  "app.window.pickFileTitle": "Otwórz plik",
+  "app.window.pickTitle": "Otwórz w nowym oknie",
+  "app.window.askTitle": "Otwórz projekt",
+  "app.window.askBody": "Projekty mogą zostać otwarte w nowym oknie, zastąpić obecny projekt lub zostać dołączone do już otwartych projektów.\nJak chcesz otworzyć „{name}”?",
+  "app.window.askThis": "To okno",
+  "app.window.askAttach": "Dołącz",
+  "app.window.askNew": "Nowe okno",
+  "app.window.askRemember": "Nie pytaj ponownie",
+  "common.cancel": "Anuluj",
+  "common.close": "Zamknij",
+  "common.copied": "Skopiowano",
+  "common.copy": "Kopiuj",
+  "menu.app": "OpenIDEA",
+  "menu.app.about": "Informacje o OpenIDEA",
+  "menu.app.checkForUpdates": "Sprawdź aktualizacje…",
+  "menu.app.quit": "{os, select, macos {Zamknij OpenIDEA} other {Zakończ}}",
+  "menu.appearance": "Wygląd",
+  "menu.code": "Kod",
+  "menu.code.commentBlock": "Zacommentuj za pomocą komentarza blokowego",
+  "menu.code.commentLine": "Zacommentuj za pomocą komentarza liniowego",
+  "menu.code.completion": "Podstawowe",
+  "menu.code.deleteLine": "Usuń linię",
+  "menu.code.duplicateLine": "Powiel linię lub zaznaczenie",
+  "menu.code.extendSelection": "Rozszerz zaznaczenie",
+  "menu.code.foldAll": "Zwiń wszystko",
+  "menu.code.foldToggle": "Rozwiń/Zwiń",
+  "menu.code.generate": "Generuj…",
+  "menu.code.pasteAsPlainText": "Wklej jako zwykły tekst",
+  "menu.editor.copyReference": "Kopiuj odwołanie",
+  "menu.code.cyclicExpandWord": "Cykliczne rozwijanie słowa",
+  "menu.code.cyclicExpandWordBackward": "Cykliczne rozwijanie słowa (wstecz)",
+  "menu.code.expressionTypeInfo": "Informacje o typie wyrażenia",
+  "menu.code.overrideMethods": "Przesłoń metody…",
+  "menu.code.implementMethods": "Zaimplementuj metody…",
+  "menu.code.insertLiveTemplate": "Wstaw szablon dynamiczny…",
+  "menu.code.moveLineDown": "Przenieś linię w dół",
+  "menu.code.moveLineUp": "Przenieś linię w górę",
+  "menu.code.optimizeImports": "Optymalizuj importy",
+  "menu.code.parameterInfo": "Informacje o parametrach",
+  "menu.code.quickDocumentation": "Szybka dokumentacja",
+  "menu.code.reformat": "Sformatuj kod",
+  "menu.code.showIntentions": "Pokaż intencje",
+  "menu.code.shrinkSelection": "Zmniejsz zaznaczenie",
+  "menu.code.surroundWith": "Otocz za pomocą…",
+  "menu.code.unwrap": "Rozwiń/Usuń otoczenie…",
+  "menu.code.unfoldAll": "Rozwiń wszystko",
+  "menu.debug.evaluate": "Wylicz wyrażenie…",
+  "menu.debug.pause": "Wstrzymaj program",
+  "menu.debug.resume": "Wznów program",
+  "menu.debug.runToCursor": "Uruchom do kursora",
+  "menu.debug.stepInto": "Wejdź do",
+  "menu.debug.stepOut": "Wyjdź",
+  "menu.debug.stepOver": "Przejdź nad",
+  "menu.debug.toggleBreakpoint": "Przełącz punkt wstrzymania",
+  "menu.debug.viewBreakpoints": "Wyświetl punkty wstrzymania…",
+  "menu.debug.attachToProcess": "Dołącz do procesu…",
+  "menu.debug.forceStepOver": "Wymuś przejście nad",
+  "menu.debug.forceStepInto": "Wymuś wejście do",
+  "menu.debug.smartStepInto": "Inteligentne wejście do",
+  "menu.debug.forceRunToCursor": "Wymuś uruchomienie do kursora",
+  "menu.debug.showExecutionPoint": "Pokaż punkt wykonania",
+  "menu.debug.resetFrame": "Zresetuj ramkę",
+  "menu.debug.toggleTemporaryBreakpoint": "Przełącz tymczasowy punkt wstrzymania w linii",
+  "menu.debug.toggleMethodBreakpoint": "Przełącz punkt wstrzymania metody",
+  "menu.debug.toggleFieldWatchpoint": "Przełącz punkt obserwacji pola",
+  "menu.edit": "Edycja",
+  "menu.edit.copy": "Kopiuj",
+  "menu.edit.cut": "Wytnij",
+  "menu.edit.paste": "Wklej",
+  "menu.code.pasteFromHistory": "Wklej z historii…",
+  "menu.edit.redo": "Ponów",
+  "menu.edit.selectAll": "Zaznacz wszystko",
+  "menu.edit.undo": "Cofnij",
+  "menu.editor.copyPath": "Kopiuj ścieżkę",
+  "menu.code.sortLines": "Sortuj linie",
+  "menu.code.reverseLines": "Odwróć kolejność linii",
+  "menu.editor.toggleColumnSelection": "Tryb zaznaczania kolumn",
+  "menu.editor.splitDown": "Podziel w dół",
+  "menu.editor.splitRight": "Podziel w prawo",
+  "menu.editor.toggleZen": "{distractionFree, select, on {Wyjdź z trybu bez rozpraszaczy} other {Włącz tryb bez rozpraszaczy}}",
+  "menu.editor.unsplit": "Usuń podział",
+  "menu.file": "Plik",
+  "menu.fileProperties": "Właściwości pliku",
+  "menu.newProjectsSetup": "Konfiguracja nowych projektów",
+  "menu.file.newProjectsSettings": "Ustawienia dla nowych projektów…",
+  "menu.file.toggleReadOnly": "Przełącz tryb tylko do odczytu / edycji pliku",
+  "menu.file.closeProject": "Zamknij projekt",
+  "menu.remote.reloadEnvironment": "Załaduj ponownie środowisko",
+  "menu.file.new": "Nowy…",
+  "menu.file.newScratchFile": "Nowy plik tymczasowy (Scratch)…",
+  "menu.file.openInNewWindow": "Otwórz w nowym oknie…",
+  "menu.file.openProject": "Otwórz…",
+  "menu.file.save": "Zapisz wszystko",
+  "menu.file.settings": "Ustawienia…",
+  "menu.find": "Znajdź",
+  "menu.find.inFile": "Znajdź…",
+  "menu.find.inPath": "Znajdź w plikach…",
+  "menu.find.replaceInFile": "Zamień…",
+  "menu.find.replaceInPath": "Zamień w plikach…",
+  "menu.find.showUsages": "Pokaż użycia",
+  "menu.find.usages": "Znajdź użycia",
+  "menu.completion": "Autouzupełnianie kodu",
+  "menu.folding": "Zwinięcie kodu",
+  "menu.code.foldSelection": "Zwiń zaznaczenie / usuń region",
+  "menu.git": "Git",
+  "menu.help": "Pomoc",
+  "menu.mainMenu": "Menu główne",
+  "window.caption.minimize": "Minimalizuj",
+  "window.caption.maximize": "Maksymalizuj",
+  "window.caption.restore": "Przywróć",
+  "window.caption.close": "Zamknij",
+  "menu.help.keymapReference": "Mapa skrótów klawiszowych",
+  "menu.help.showLog": "{os, select, macos {Pokaż dziennik w programie Finder} windows {Pokaż dziennik w Eksploratorze} other {Pokaż dziennik w plikach}}",
+  "menu.native.bringAllToFront": "Przenieś wszystko na wierzch",
+  "menu.native.copy": "Kopiuj",
+  "menu.native.cut": "Wytnij",
+  "menu.native.hide": "Ukryj OpenIDEA",
+  "menu.native.hideOthers": "Ukryj pozostałe",
+  "menu.native.minimize": "Minimalizuj",
+  "menu.native.paste": "Wklej",
+  "menu.native.redo": "Ponów",
+  "menu.native.selectAll": "Zaznacz wszystko",
+  "menu.native.services": "Usługi",
+  "menu.native.showAll": "Pokaż wszystko",
+  "menu.native.undo": "Cofnij",
+  "menu.native.zoom": "Powiększenie",
+  "menu.navigate": "Nawigacja",
+  "menu.navigate.back": "Wstecz",
+  "menu.navigate.lastEditLocation": "Ostatnie miejsce edycji",
+  "menu.navigate.nextEditLocation": "Następne miejsce edycji",
+  "menu.navigate.callHierarchy": "Hierarchia wywołań",
+  "menu.navigate.declaration": "Deklaracja lub użycia",
+  "menu.navigate.fileStructure": "Struktura pliku",
+  "menu.navigate.findAction": "Znajdź akcję…",
+  "menu.navigate.forward": "Dalej",
+  "menu.navigate.gotoClass": "Klasa…",
+  "menu.navigate.gotoFile": "Plik…",
+  "menu.navigate.gotoLine": "Linia/Kolumna…",
+  "menu.navigate.gotoSymbol": "Symbol…",
+  "menu.navigate.implementation": "Implementacja(-e)",
+  "menu.navigate.nextError": "Następny wyróżniony błąd",
+  "menu.navigate.prevError": "Poprzedni wyróżniony błąd",
+  "menu.navigate.recentFiles": "Ostatnie pliki",
+  "menu.navigate.recentLocations": "Ostatnie lokalizacje",
+  "menu.navigate.searchEverywhere": "Szukaj wszędzie",
+  "menu.navigate.selectIn": "Zaznacz w…",
+  "menu.navigate.showBookmarks": "Pokaż zakładki",
+  "menu.navigate.toggleBookmark": "Przełącz zakładkę",
+  "menu.navigate.typeDeclaration": "Deklaracja typu",
+  "menu.navigate.typeHierarchy": "Hierarchia typów",
+  "menu.navigate.superMethod": "Metoda nadrzędna (Super Method)",
+  "menu.navigate.gotoTest": "Test",
+  "menu.navigate.nextMethod": "Następna metoda",
+  "menu.navigate.previousMethod": "Poprzednia metoda",
+  "menu.openRecent": "Otwórz ostatnie",
+  "menu.recent.none": "Brak ostatnich projektów",
+  "menu.refactor": "Refaktoryzacja",
+  "menu.refactor.changeSignature": "Zmień sygnaturę…",
+  "menu.refactor.extractConstant": "Wprowadź stałą…",
+  "menu.refactor.extractField": "Wprowadź pole…",
+  "menu.refactor.extractMethod": "Wyodrębnij metodę…",
+  "menu.refactor.extractParameter": "Wprowadź parametr…",
+  "menu.refactor.extractVariable": "Wprowadź zmienną…",
+  "menu.refactor.inline": "Wstaw bezpośrednio (Inline)…",
+  "menu.refactor.move": "Przenieś…",
+  "menu.refactor.pullMembersUp": "Przenieś składowe wyżej…",
+  "menu.refactor.pushMembersDown": "Przenieś składowe niżej…",
+  "menu.refactor.rename": "Zmień nazwę…",
+  "menu.refactor.safeDelete": "Bezpieczne usuwanie…",
+  "menu.refactor.thisMenu": "Refaktoryzuj to…",
+  "menu.run": "Uruchom",
+  "menu.run.chooseConfig": "Uruchom…",
+  "menu.run.debug": "Debuguj",
+  "menu.run.debugContext": "Debuguj konfigurację kontekstową",
+  "menu.run.coverage": "Uruchom z pokryciem kodu",
+  "menu.run.profile": "Profiluj",
+  "menu.coverage.hide": "Ukryj pokrycie kodu",
+  "menu.debuggingActions": "Akcje debugowania",
+  "menu.debug.reloadChangedClasses": "Załaduj ponownie zmienione klasy",
+  "menu.toolwindow.coverage": "Pokrycie kodu",
+  "menu.toolwindow.profiler": "Profiler",
+  "menu.run.editConfigs": "Edytuj konfiguracje…",
+  "menu.run.run": "Uruchom",
+  "menu.run.runContext": "Uruchom konfigurację kontekstową",
+  "menu.run.stop": "Zatrzymaj",
+  "menu.toolWindows": "Okna narzędziowe",
+  "menu.toolwindow.bookmarks": "Zakładki",
+  "menu.toolwindow.commit": "Commit",
+  "menu.toolwindow.debug": "Debug",
+  "menu.toolwindow.find": "Znajdź",
+  "menu.toolwindow.git": "Git",
+  "menu.toolwindow.hideAll": "Ukryj wszystkie okna narzędziowe",
+  "menu.toolwindow.problems": "Problemy",
+  "menu.toolwindow.project": "Projekt",
+  "menu.toolwindow.run": "Uruchom",
+  "menu.toolwindow.structure": "Struktura",
+  "menu.toolwindow.terminal": "Terminal",
+  "terminal.close.title": "Proces „{name}” jest uruchomiony",
+  "terminal.close.message": "Czy chcesz zakończyć proces „{name}”?",
+  "terminal.close.terminate": "Zakończ",
+  "menu.vcs.annotate": "Adnotuj za pomocą Git Blame",
+  "menu.vcs.branches": "Gałęzie…",
+  "menu.vcs.commit": "Commit…",
+  "menu.vcs.fetch": "Pobierz (Fetch)",
+  "menu.vcs.localHistory": "Historia lokalna",
+  "menu.vcs.newBranch": "Nowa gałąź…",
+  "menu.vcs.push": "Push…",
+  "menu.vcs.rollback": "Przywróć zmiany (Rollback)…",
+  "menu.vcs.showDiff": "Pokaż różnice (Diff)",
+  "menu.vcs.showLog": "Pokaż dziennik Gita",
+  "menu.vcs.stash": "Schowaj zmiany (Stash)…",
+  "menu.vcs.unstash": "Przywróć schowane zmiany (Unstash)…",
+  "menu.vcs.update": "Aktualizuj projekt…",
+  "menu.vcs.pull": "Pull…",
+  "menu.vcs.merge": "Merge…",
+  "menu.vcs.rebase": "Rebase…",
+  "menu.vcs.newWorktree": "Nowe drzewo robocze (Worktree)…",
+  "menu.vcs.worktrees": "Drzewa robocze (Worktrees)…",
+  "menu.vcs.manageRemotes": "Zarządzaj repozytoriami zdalnymi…",
+  "menu.vcs.clone": "Sklonuj…",
+  "menu.vcs.operations": "Menu operacji VCS…",
+  "menu.view": "Widok",
+  "menu.view.notifications": "Powiadomienia",
+  "menu.view.toggleTheme": "Przełącz motyw jasny/ciemny",
+  "menu.welcome.recentProjects": "Zarządzaj projektami…",
+  "menu.window": "Okno",
+  "menu.tools": "Narzędzia",
+  "menu.http.newRequest": "Nowe żądanie HTTP",
+  "menu.http.showToolWindow": "Klient HTTP",
+  "menu.db.showToolWindow": "Baza danych",
+  "menu.db.newDataSource": "Nowe źródło danych…",
+  "menu.db.openConsole": "Otwórz konsolę zapytań",
+  "menu.vim.toggle": "Vim",
+  "menu.window.new": "Nowe okno",
+  "menu.window.next": "Następne okno projektu",
+  "menu.window.previous": "Poprzednie okno projektu",
+  "menu.window.toggleFullScreen": "Przełącz tryb pełnoekranowy",
+  "os.linux": "Linux",
+  "os.macos": "macOS",
+  "os.web": "Przeglądarka",
+  "os.windows": "Windows",
+  "menu.gitPatch": "Patch",
+  "menu.vcs.newTag": "Nowy znacznik (Tag)…",
+  "menu.vcs.resetHead": "Zresetuj HEAD…",
+  "menu.vcs.shelve": "Odłóż zmiany na półkę (Shelve)…",
+  "menu.vcs.showShelf": "Pokaż odłożone zmiany (Shelf)",
+  "menu.vcs.createPatch": "Utwórz łatę (Patch)…",
+  "menu.vcs.applyPatch": "Zastosuj łatę (Patch)…",
+  "menu.vcs.applyPatchFromClipboard": "Zastosuj łatę ze schowka…",
+  "menu.vcs.resolveConflicts": "Rozwiąż konflikty…",
+  "menu.vcs.rebase.continue": "Kontynuuj rebase",
+  "menu.vcs.rebase.abort": "Przerwij rebase",
+  "menu.vcs.rebase.skip": "Pomiń commit",
+  "menu.vcs.merge.abort": "Przerwij merge",
+  "menu.vcs.cherryPick.continue": "Kontynuuj cherry-pick",
+  "menu.vcs.cherryPick.abort": "Przerwij cherry-pick",
+  "menu.vcs.revert.continue": "Kontynuuj cofanie",
+  "menu.vcs.revert.abort": "Przerwij cofanie",
+  "menu.gitUncommittedChanges": "Niezacommitowane zmiany",
+  "menu.gitCurrentFile": "Aktualny plik",
+  "menu.vcs.addToVcs": "Dodaj do VCS",
+  "menu.vcs.compareWithBranch": "Porównaj z gałęzią lub rewizją…",
+  "menu.vcs.showHistory": "Pokaż historię",
+  "menu.vcs.showHistoryForSelection": "Pokaż historię dla zaznaczenia",
+  "menu.build": "Kompilacja",
+  "menu.build.buildProject": "Kompiluj projekt",
+  "menu.build.buildModule": "Kompiluj moduł",
+  "menu.build.rebuildProject": "Przebuduj projekt",
+  "menu.build.buildArtifacts": "Kompiluj artefakty",
+  "menu.toolwindow.build": "Kompilacja",
+  "menu.find.structural": "Wyszukiwanie strukturalne…",
+  "menu.find.replaceStructural": "Zamiana strukturalna…",
+  "menu.analyze.inspectCode": "Sprawdź kod…",
+  "menu.analyzeCode": "Analizuj kod",
+  "menu.analyze.locateDuplicates": "Znajdź duplikaty…",
+  "menu.analyze.stackTrace": "Analizuj stos wywołań (stack trace) lub zrzut wątków…",
+  "menu.toolwindow.services": "Usługi",
+  "menu.gitHub": "GitHub",
+  "menu.github.pullRequests": "Wyświetl pull requesty",
+  "menu.github.createPullRequest": "Utwórz pull request…",
+  "menu.github.checkoutPullRequest": "Przełącz (checkout) pull request…",
+  "menu.github.openInBrowser": "Otwórz w GitHubie",
+  "menu.file.newProject": "Nowy projekt…",
+  "menu.file.renameProject": "Zmień nazwę projektu…",
+  "menu.file.reloadAllFromDisk": "Załaduj wszystko ponownie z dysku",
+  "menu.file.invalidateCaches": "Unieważnij pamięć podręczną (Caches)…",
+  "menu.manageIdeSettings": "Zarządzaj ustawieniami IDE",
+  "menu.file.exportSettings": "Eksportuj ustawienia…",
+  "menu.file.importSettings": "Importuj ustawienia…",
+  "menu.file.togglePowerSave": "Tryb oszczędzania energii",
+  "menu.macros": "Makra",
+  "menu.macro.startRecording": "Rozpocznij nagrywanie makra",
+  "menu.macro.stopRecording": "Zatrzymaj nagrywanie makra",
+  "menu.macro.playBack": "Odtwórz ostatnie makro",
+  "menu.macro.playSaved": "Odtwórz zapisane makra…",
+  "menu.macro.edit": "Edytuj makra…",
+  "menu.bookmarks": "Zakładki",
+  "menu.navigate.toggleBookmarkWithMnemonic": "Przełącz zakładkę z etykietą",
+  "menu.navigate.nextBookmark": "Następna zakładka",
+  "menu.navigate.prevBookmark": "Poprzednia zakładka",
+  "menu.view.toggleCompactMode": "Tryb kompaktowy",
+  "menu.view.zoomIn": "Powiększ interfejs IDE",
+  "menu.view.zoomOut": "Oddal interfejs IDE",
+  "menu.view.resetZoom": "Zresetuj powiększenie interfejsu IDE",
+  "menu.toolbar.customize": "Dostosuj główny pasek narzędzi…",
+  "menu.code.quickDefinition": "Szybka definicja",
+  "menu.code.quickTypeDefinition": "Szybka definicja typu",
+  "menu.localHistory.recentChanges": "Ostatnie zmiany",
+  "menu.diff.compareWithClipboard": "Porównaj ze schowkiem",
+  "menu.view.quickSwitchScheme": "Szybka zmiana schematu…",
+  "menu.editor.resetFontSize": "Zresetuj rozmiar czcionki we wszystkich edytorach",
+  "menu.code.cleanup": "Czyszczenie kodu…",
+  "menu.runAnything.show": "Uruchom cokolwiek (Run Anything)…",
+  "menu.localHistory.putLabel": "Wstaw etykietę…",
+  "menu.toolWindowLayouts": "Układy okien narzędziowych",
+  "menu.layout.save": "Zapisz bieżący układ jako…",
+  "menu.layout.restoreDefault": "Przywróć układ domyślny",
+  "menu.layout.rename": "Zmień nazwę układu…",
+  "menu.layout.delete": "Usuń układ…",
+  "menu.activeToolWindow": "Aktywne okno narzędziowe",
+  "menu.toolwindow.hideActive": "Ukryj aktywne okno narzędziowe",
+  "menu.toolwindow.maximize": "Maksymalizuj okno narzędziowe",
+  "menu.toolwindow.closeContent": "Zamknij aktywną kartę",
+  "menu.toolwindow.jumpToLast": "Przejdź do ostatniego okna narzędziowego",
+  "menu.toolwindow.focusEditor": "Przełącz na edytor",
+  "menu.editorTabs": "Karty edytora",
+  "menu.editor.nextTab": "Wybierz następną kartę",
+  "menu.editor.prevTab": "Wybierz poprzednią kartę",
+  "menu.editor.pinTab": "Przypnij kartę",
+  "menu.editor.closeTab": "Zamknij kartę",
+  "menu.editor.closeOtherTabs": "Zamknij inne karty",
+  "menu.editor.closeAllTabs": "Zamknij wszystkie karty",
+  "menu.editor.reopenClosedTab": "Otwórz ponownie zamkniętą kartę",
+  "menu.editor.moveToOppositeGroup": "Przenieś do przeciwnej grupy",
+  "menu.editor.openInOppositeGroup": "Otwórz w przeciwnej grupie",
+  "menu.editor.changeSplitOrientation": "Zmień orientację podziału",
+  "menu.editor.unsplitAll": "Usuń wszystkie podziały",
+  "menu.navigate.showFilePath": "Ścieżka pliku",
+  "menu.navigate.customRegion": "Niestandardowy region…",
+  "menu.code.showErrorDescription": "Opis błędu",
+  "menu.code.surroundWithLiveTemplate": "Otocz szablonem dynamicznym…",
+  "menu.code.autoIndentLines": "Automatyczne wcięcia w liniach",
+  "menu.code.moveStatementUp": "Przenieś instrukcję w górę",
+  "menu.code.moveStatementDown": "Przenieś instrukcję w dół",
+  "menu.code.moveElementLeft": "Przenieś element w lewo",
+  "menu.code.moveElementRight": "Przenieś element w prawo",
+  "menu.code.collapseBlock": "Zwiń blok kodu",
+  "menu.analyze.inspectFile": "Sprawdź bieżący plik",
+  "menu.project.copyElement": "Kopiuj…",
+  "menu.run.chooseDebugConfig": "Debuguj…",
+  "menu.debug.quickEvaluate": "Szybka ocena wyrażenia",
+  "menu.resizeToolWindow": "Zmień rozmiar",
+  "menu.toolwindow.resizeLeft": "Rozciągnij w lewo",
+  "menu.toolwindow.resizeRight": "Rozciągnij w prawo",
+  "menu.toolwindow.resizeUp": "Rozciągnij w górę",
+  "menu.toolwindow.resizeDown": "Rozciągnij w dół",
+  "menu.editor.nextSplitter": "Przejdź do następnego podziału",
+  "menu.editor.prevSplitter": "Przejdź do poprzedniego podziału",
+  "menu.expandToLevel": "Rozwiń do poziomu",
+  "menu.expandAllToLevel": "Rozwiń wszystko do poziomu",
+  "menu.code.expandToLevel1": "1",
+  "menu.code.expandAllToLevel1": "1",
+  "menu.code.expandToLevel2": "2",
+  "menu.code.expandAllToLevel2": "2",
+  "menu.code.expandToLevel3": "3",
+  "menu.code.expandAllToLevel3": "3",
+  "menu.code.expandToLevel4": "4",
+  "menu.code.expandAllToLevel4": "4",
+  "menu.code.expandToLevel5": "5",
+  "menu.code.expandAllToLevel5": "5",
+  "menu.editor.contextInfo": "Informacje kontekstowe",
+  "run.services.configurationCount": "{count} konfiguracji",
+  "search.bookmarks.count": "{count, plural, one {# zakładka} few {# zakładki} many {# zakładek} other {# zakładki}}",
+  "settings.zoom.hint": "Zmień za pomocą {zoomIn} lub {zoomOut}. Zresetuj do 100% za pomocą {reset}"
+}
diff --git a/src/platform/locales/pt.json b/src/platform/locales/pt.json
new file mode 100644
index 00000000..edf4f74d
--- /dev/null
+++ b/src/platform/locales/pt.json
@@ -0,0 +1,451 @@
+{
+  "app.about.build": "Build",
+  "app.about.configDir": "Configuração",
+  "app.about.copyInfo": "Copiar informações",
+  "app.about.copyright": "Copyright © 2026 Colaboradores do OpenIDEA",
+  "app.about.disclaimer": "Não associado à JetBrains.",
+  "app.about.license": "Licenciado sob a Licença Apache 2.0",
+  "app.about.platform": "Plataforma",
+  "app.about.runtime": "Runtime",
+  "app.about.showConfig": "Abrir pasta de configuração",
+  "app.about.tagline": "Uma IDE de código aberto inspirada no IntelliJ IDEA",
+  "app.about.thirdParty": "Inclui ícones do IntelliJ Platform (Apache-2.0).",
+  "app.about.title": "Sobre o OpenIDEA",
+  "app.about.version": "Versão",
+  "app.action.about": "Sobre o OpenIDEA",
+  "app.action.checkForUpdates": "Verificar atualizações…",
+  "app.action.copy": "Copiar",
+  "app.action.cut": "Recortar",
+  "app.action.keymapReference": "Referência do mapa de teclas",
+  "app.action.lightEditOpenProject": "Abrir pasta que contém como projeto",
+  "app.action.newWindow": "Nova janela",
+  "app.action.nextWindow": "Próxima janela do projeto",
+  "app.action.openFile": "Abrir arquivo…",
+  "app.action.openInNewWindow": "Abrir em nova janela…",
+  "app.action.openRecentProject": "Abrir projeto recente",
+  "app.action.paste": "Colar",
+  "app.action.previousWindow": "Janela do projeto anterior",
+  "app.action.quit": "{os, select, macos {Encerrar o OpenIDEA} other {Sair}}",
+  "app.action.redo": "Refazer",
+  "app.action.selectAll": "Selecionar tudo",
+  "app.action.showLog": "{os, select, macos {Mostrar log no Finder} windows {Mostrar log no Explorer} other {Mostrar log nos Arquivos}}",
+  "app.action.toggleFullScreen": "Alternar tela cheia",
+  "app.action.undo": "Desfazer",
+  "app.category.edit": "Editar",
+  "app.category.file": "Arquivo",
+  "app.category.help": "Ajuda",
+  "app.category.view": "Exibir",
+  "app.category.window": "Janela",
+  "app.exit.body": "Tem certeza de que deseja sair do OpenIDEA?",
+  "app.exit.confirm": "Sair",
+  "app.exit.dontAsk": "Não perguntar novamente",
+  "app.exit.title": "Confirmar saída",
+  "app.keymap.count": "{count, plural, one {# atalho} other {# atalhos}}",
+  "app.keymap.empty": "Nenhum atalho correspondente",
+  "app.keymap.filter": "Filtrar por ação ou atalho",
+  "app.keymap.other": "Outro",
+  "app.keymap.preset": "Mapa de teclas: {preset}",
+  "app.keymap.title": "Referência do mapa de teclas",
+  "app.lightEdit.openProject": "Abrir como projeto",
+  "app.lightEdit.openProjectTooltip": "Abrir {folder} como projeto",
+  "app.log.failed": "Não foi possível mostrar o log",
+  "app.project.opening": "Abrindo {name}…",
+  "app.title.default": "OpenIDEA",
+  "app.unsaved.body": "{count, plural, one {# arquivo tem} other {# arquivos têm}} alterações não salvas em {project}. Salvar antes de fechar?",
+  "app.unsaved.discard": "Não salvar",
+  "app.unsaved.save": "Salvar tudo",
+  "app.unsaved.saveFailed": "Não foi possível salvar todos os arquivos",
+  "app.unsaved.title": "Alterações não salvas",
+  "app.update.available": "OpenIDEA {version} está disponível",
+  "app.update.cancel": "Cancelar",
+  "app.update.cancelled": "Atualização cancelada",
+  "app.update.checking": "Verificando atualizações…",
+  "app.update.disabled": "Atualizações automáticas não estão configuradas",
+  "app.update.disabledBody": "Defina um endpoint de atualização (OPENIDEA_UPDATE_ENDPOINT ou plugins.updater.endpoints) para ativar a verificação de atualizações.",
+  "app.update.downloading": "Baixando OpenIDEA {version}",
+  "app.update.failed": "Falha ao verificar atualizações",
+  "app.update.install": "Instalar e reiniciar",
+  "app.update.installFailed": "Não foi possível instalar a atualização",
+  "app.update.installed": "OpenIDEA {version} foi instalado",
+  "app.update.installedBody": "Será utilizado após o reinício do OpenIDEA.",
+  "app.update.installingMessage": "Instalando…",
+  "app.update.installUncancellable": "A atualização está sendo instalada; esta etapa não pode ser cancelada",
+  "app.update.none": "OpenIDEA {version} está atualizado",
+  "app.update.progress": "{done} MB de {total} MB",
+  "app.update.progressUnknown": "{done} MB",
+  "app.update.restart": "Reiniciar",
+  "app.update.retry": "Tentar novamente",
+  "app.window.desktopOnly": "Várias janelas exigem o aplicativo desktop",
+  "app.window.openFailed": "Não foi possível abrir {name}",
+  "app.window.pickFileTitle": "Abrir arquivo",
+  "app.window.pickTitle": "Abrir em nova janela",
+  "app.window.askTitle": "Abrir projeto",
+  "app.window.askBody": "Projetos podem ser abertos em uma nova janela, substituir o projeto atual ou ser anexados aos projetos já abertos.\nComo você gostaria de abrir \"{name}\"?",
+  "app.window.askThis": "Esta janela",
+  "app.window.askAttach": "Anexar",
+  "app.window.askNew": "Nova janela",
+  "app.window.askRemember": "Não perguntar novamente",
+  "common.cancel": "Cancelar",
+  "common.close": "Fechar",
+  "common.copied": "Copiado",
+  "common.copy": "Copiar",
+  "menu.app": "OpenIDEA",
+  "menu.app.about": "Sobre o OpenIDEA",
+  "menu.app.checkForUpdates": "Verificar atualizações…",
+  "menu.app.quit": "{os, select, macos {Encerrar o OpenIDEA} other {Sair}}",
+  "menu.appearance": "Aparência",
+  "menu.code": "Código",
+  "menu.code.commentBlock": "Comentar com comentário em bloco",
+  "menu.code.commentLine": "Comentar com comentário de linha",
+  "menu.code.completion": "Básico",
+  "menu.code.deleteLine": "Excluir linha",
+  "menu.code.duplicateLine": "Duplicar linha ou seleção",
+  "menu.code.extendSelection": "Estender seleção",
+  "menu.code.foldAll": "Recolher tudo",
+  "menu.code.foldToggle": "Expandir/Recolher",
+  "menu.code.generate": "Gerar…",
+  "menu.code.pasteAsPlainText": "Colar como texto sem formatação",
+  "menu.editor.copyReference": "Copiar referência",
+  "menu.code.cyclicExpandWord": "Expansão cíclica de palavra",
+  "menu.code.cyclicExpandWordBackward": "Expansão cíclica de palavra (para trás)",
+  "menu.code.expressionTypeInfo": "Informações do tipo da expressão",
+  "menu.code.overrideMethods": "Sobrescrever métodos…",
+  "menu.code.implementMethods": "Implementar métodos…",
+  "menu.code.insertLiveTemplate": "Inserir modelo dinâmico…",
+  "menu.code.moveLineDown": "Mover linha para baixo",
+  "menu.code.moveLineUp": "Mover linha para cima",
+  "menu.code.optimizeImports": "Otimizar imports",
+  "menu.code.parameterInfo": "Informações de parâmetros",
+  "menu.code.quickDocumentation": "Documentação rápida",
+  "menu.code.reformat": "Reformatar código",
+  "menu.code.showIntentions": "Mostrar ações de contexto",
+  "menu.code.shrinkSelection": "Reduzir seleção",
+  "menu.code.surroundWith": "Envolver com…",
+  "menu.code.unwrap": "Desenvolver/Remover…",
+  "menu.code.unfoldAll": "Expandir tudo",
+  "menu.debug.evaluate": "Avaliar expressão…",
+  "menu.debug.pause": "Pausar programa",
+  "menu.debug.resume": "Retomar programa",
+  "menu.debug.runToCursor": "Executar até o cursor",
+  "menu.debug.stepInto": "Step Into",
+  "menu.debug.stepOut": "Step Out",
+  "menu.debug.stepOver": "Step Over",
+  "menu.debug.toggleBreakpoint": "Alternar ponto de interrupção na linha",
+  "menu.debug.viewBreakpoints": "Ver pontos de interrupção…",
+  "menu.debug.attachToProcess": "Anexar ao processo…",
+  "menu.debug.forceStepOver": "Forçar Step Over",
+  "menu.debug.forceStepInto": "Forçar Step Into",
+  "menu.debug.smartStepInto": "Smart Step Into",
+  "menu.debug.forceRunToCursor": "Forçar execução até o cursor",
+  "menu.debug.showExecutionPoint": "Mostrar ponto de execução",
+  "menu.debug.resetFrame": "Redefinir quadro",
+  "menu.debug.toggleTemporaryBreakpoint": "Alternar ponto de interrupção temporário na linha",
+  "menu.debug.toggleMethodBreakpoint": "Alternar ponto de interrupção de método",
+  "menu.debug.toggleFieldWatchpoint": "Alternar ponto de observação de campo",
+  "menu.edit": "Editar",
+  "menu.edit.copy": "Copiar",
+  "menu.edit.cut": "Recortar",
+  "menu.edit.paste": "Colar",
+  "menu.code.pasteFromHistory": "Colar do histórico…",
+  "menu.edit.redo": "Refazer",
+  "menu.edit.selectAll": "Selecionar tudo",
+  "menu.edit.undo": "Desfazer",
+  "menu.editor.copyPath": "Copiar caminho",
+  "menu.code.sortLines": "Ordenar linhas",
+  "menu.code.reverseLines": "Inverter linhas",
+  "menu.editor.toggleColumnSelection": "Modo de seleção de coluna",
+  "menu.editor.splitDown": "Dividir para baixo",
+  "menu.editor.splitRight": "Dividir à direita",
+  "menu.editor.toggleZen": "{distractionFree, select, on {Sair do modo sem distrações} other {Entrar no modo sem distrações}}",
+  "menu.editor.unsplit": "Remover divisão",
+  "menu.file": "Arquivo",
+  "menu.fileProperties": "Propriedades do arquivo",
+  "menu.newProjectsSetup": "Configuração de novos projetos",
+  "menu.file.newProjectsSettings": "Configurações para novos projetos…",
+  "menu.file.toggleReadOnly": "Tornar arquivo somente leitura / gravável",
+  "menu.file.closeProject": "Fechar projeto",
+  "menu.remote.reloadEnvironment": "Recarregar ambiente",
+  "menu.file.new": "Novo…",
+  "menu.file.newScratchFile": "Novo arquivo temporário (Scratch)…",
+  "menu.file.openInNewWindow": "Abrir em nova janela…",
+  "menu.file.openProject": "Abrir…",
+  "menu.file.save": "Salvar tudo",
+  "menu.file.settings": "Configurações…",
+  "menu.find": "Localizar",
+  "menu.find.inFile": "Localizar…",
+  "menu.find.inPath": "Localizar nos arquivos…",
+  "menu.find.replaceInFile": "Substituir…",
+  "menu.find.replaceInPath": "Substituir nos arquivos…",
+  "menu.find.showUsages": "Mostrar usos",
+  "menu.find.usages": "Localizar usos",
+  "menu.completion": "Autocompletar código",
+  "menu.folding": "Recolhimento de código",
+  "menu.code.foldSelection": "Recolher seleção / Remover região",
+  "menu.git": "Git",
+  "menu.help": "Ajuda",
+  "menu.mainMenu": "Menu principal",
+  "window.caption.minimize": "Minimizar",
+  "window.caption.maximize": "Maximizar",
+  "window.caption.restore": "Restaurar",
+  "window.caption.close": "Fechar",
+  "menu.help.keymapReference": "Referência do mapa de teclas",
+  "menu.help.showLog": "{os, select, macos {Mostrar log no Finder} windows {Mostrar log no Explorer} other {Mostrar log nos Arquivos}}",
+  "menu.native.bringAllToFront": "Trazer tudo para a frente",
+  "menu.native.copy": "Copiar",
+  "menu.native.cut": "Recortar",
+  "menu.native.hide": "Ocultar OpenIDEA",
+  "menu.native.hideOthers": "Ocultar outros",
+  "menu.native.minimize": "Minimizar",
+  "menu.native.paste": "Colar",
+  "menu.native.redo": "Refazer",
+  "menu.native.selectAll": "Selecionar tudo",
+  "menu.native.services": "Serviços",
+  "menu.native.showAll": "Mostrar tudo",
+  "menu.native.undo": "Desfazer",
+  "menu.native.zoom": "Zoom",
+  "menu.navigate": "Navegar",
+  "menu.navigate.back": "Voltar",
+  "menu.navigate.lastEditLocation": "Último local de edição",
+  "menu.navigate.nextEditLocation": "Próximo local de edição",
+  "menu.navigate.callHierarchy": "Hierarquia de chamadas",
+  "menu.navigate.declaration": "Declaração ou usos",
+  "menu.navigate.fileStructure": "Estrutura do arquivo",
+  "menu.navigate.findAction": "Localizar ação…",
+  "menu.navigate.forward": "Avançar",
+  "menu.navigate.gotoClass": "Classe…",
+  "menu.navigate.gotoFile": "Arquivo…",
+  "menu.navigate.gotoLine": "Linha/Coluna…",
+  "menu.navigate.gotoSymbol": "Símbolo…",
+  "menu.navigate.implementation": "Implementação(ões)",
+  "menu.navigate.nextError": "Próximo erro destacado",
+  "menu.navigate.prevError": "Erro destacado anterior",
+  "menu.navigate.recentFiles": "Arquivos recentes",
+  "menu.navigate.recentLocations": "Locais recentes",
+  "menu.navigate.searchEverywhere": "Pesquisar em qualquer lugar",
+  "menu.navigate.selectIn": "Selecionar em…",
+  "menu.navigate.showBookmarks": "Mostrar marcadores",
+  "menu.navigate.toggleBookmark": "Alternar marcador",
+  "menu.navigate.typeDeclaration": "Declaração de tipo",
+  "menu.navigate.typeHierarchy": "Hierarquia de tipos",
+  "menu.navigate.superMethod": "Método pai (Super Method)",
+  "menu.navigate.gotoTest": "Teste",
+  "menu.navigate.nextMethod": "Próximo método",
+  "menu.navigate.previousMethod": "Método anterior",
+  "menu.openRecent": "Abrir recente",
+  "menu.recent.none": "Nenhum projeto recente",
+  "menu.refactor": "Refatorar",
+  "menu.refactor.changeSignature": "Alterar assinatura…",
+  "menu.refactor.extractConstant": "Introduzir constante…",
+  "menu.refactor.extractField": "Introduzir campo…",
+  "menu.refactor.extractMethod": "Extrair método…",
+  "menu.refactor.extractParameter": "Introduzir parâmetro…",
+  "menu.refactor.extractVariable": "Introduzir variável…",
+  "menu.refactor.inline": "Substituir ocorrências (Inline)…",
+  "menu.refactor.move": "Mover…",
+  "menu.refactor.rename": "Renomear…",
+  "menu.refactor.safeDelete": "Exclusão segura…",
+  "menu.refactor.thisMenu": "Refatorar este…",
+  "menu.run": "Executar",
+  "menu.run.chooseConfig": "Executar…",
+  "menu.run.debug": "Depurar",
+  "menu.run.debugContext": "Depurar configuração de contexto",
+  "menu.run.coverage": "Executar com cobertura",
+  "menu.run.profile": "Profile",
+  "menu.coverage.hide": "Ocultar cobertura",
+  "menu.debuggingActions": "Ações de depuração",
+  "menu.debug.reloadChangedClasses": "Recarregar classes alteradas",
+  "menu.toolwindow.coverage": "Cobertura",
+  "menu.toolwindow.profiler": "Profiler",
+  "menu.run.editConfigs": "Editar configurações…",
+  "menu.run.run": "Executar",
+  "menu.run.runContext": "Executar configuração de contexto",
+  "menu.run.stop": "Parar",
+  "menu.toolWindows": "Janelas de ferramentas",
+  "menu.toolwindow.bookmarks": "Marcadores",
+  "menu.toolwindow.commit": "Commit",
+  "menu.toolwindow.debug": "Depurar",
+  "menu.toolwindow.find": "Localizar",
+  "menu.toolwindow.git": "Git",
+  "menu.toolwindow.hideAll": "Ocultar todas as janelas de ferramentas",
+  "menu.toolwindow.problems": "Problemas",
+  "menu.toolwindow.project": "Projeto",
+  "menu.toolwindow.run": "Executar",
+  "menu.toolwindow.structure": "Estrutura",
+  "menu.toolwindow.terminal": "Terminal",
+  "terminal.close.title": "Processo '{name}' em execução",
+  "terminal.close.message": "Deseja encerrar o processo '{name}'?",
+  "terminal.close.terminate": "Encerrar",
+  "menu.vcs.annotate": "Anotar com Git Blame",
+  "menu.vcs.branches": "Branches…",
+  "menu.vcs.commit": "Commit…",
+  "menu.vcs.fetch": "Buscar (Fetch)",
+  "menu.vcs.localHistory": "Histórico local",
+  "menu.vcs.newBranch": "Nova branch…",
+  "menu.vcs.push": "Push…",
+  "menu.vcs.rollback": "Reverter alterações (Rollback)…",
+  "menu.vcs.showDiff": "Mostrar diff",
+  "menu.vcs.showLog": "Mostrar log do Git",
+  "menu.vcs.stash": "Guardar alterações (Stash)…",
+  "menu.vcs.unstash": "Restaurar alterações (Unstash)…",
+  "menu.vcs.update": "Atualizar projeto…",
+  "menu.vcs.pull": "Pull…",
+  "menu.vcs.merge": "Merge…",
+  "menu.vcs.rebase": "Rebase…",
+  "menu.vcs.newWorktree": "Nova worktree…",
+  "menu.vcs.worktrees": "Worktrees…",
+  "menu.vcs.manageRemotes": "Gerenciar remotos…",
+  "menu.vcs.clone": "Clonar…",
+  "menu.vcs.operations": "Menu de operações VCS…",
+  "menu.view": "Exibir",
+  "menu.view.notifications": "Notificações",
+  "menu.view.toggleTheme": "Alternar tema claro/escuro",
+  "menu.welcome.recentProjects": "Gerenciar projetos…",
+  "menu.window": "Janela",
+  "menu.tools": "Ferramentas",
+  "menu.http.newRequest": "Nova requisição HTTP",
+  "menu.http.showToolWindow": "Cliente HTTP",
+  "menu.db.showToolWindow": "Banco de dados",
+  "menu.db.newDataSource": "Nova fonte de dados…",
+  "menu.db.openConsole": "Abrir console de consulta",
+  "menu.vim.toggle": "Vim",
+  "menu.window.new": "Nova janela",
+  "menu.window.next": "Próxima janela do projeto",
+  "menu.window.previous": "Janela do projeto anterior",
+  "menu.window.toggleFullScreen": "Alternar tela cheia",
+  "os.linux": "Linux",
+  "os.macos": "macOS",
+  "os.web": "Navegador",
+  "os.windows": "Windows",
+  "menu.gitPatch": "Patch",
+  "menu.vcs.newTag": "Nova tag…",
+  "menu.vcs.resetHead": "Redefinir HEAD…",
+  "menu.vcs.shelve": "Arquivar alterações (Shelve)…",
+  "menu.vcs.showShelf": "Mostrar alterações arquivadas (Shelf)",
+  "menu.vcs.createPatch": "Criar patch…",
+  "menu.vcs.applyPatch": "Aplicar patch…",
+  "menu.vcs.applyPatchFromClipboard": "Aplicar patch da área de transferência…",
+  "menu.vcs.resolveConflicts": "Resolver conflitos…",
+  "menu.vcs.rebase.continue": "Continuar rebase",
+  "menu.vcs.rebase.abort": "Abortar rebase",
+  "menu.vcs.rebase.skip": "Pular commit",
+  "menu.vcs.merge.abort": "Abortar merge",
+  "menu.vcs.cherryPick.continue": "Continuar cherry-pick",
+  "menu.vcs.cherryPick.abort": "Abortar cherry-pick",
+  "menu.vcs.revert.continue": "Continuar reversão",
+  "menu.vcs.revert.abort": "Abortar reversão",
+  "menu.gitUncommittedChanges": "Alterações não commitadas",
+  "menu.gitCurrentFile": "Arquivo atual",
+  "menu.vcs.addToVcs": "Adicionar ao VCS",
+  "menu.vcs.compareWithBranch": "Comparar com branch ou revisão…",
+  "menu.vcs.showHistory": "Mostrar histórico",
+  "menu.build": "Compilar",
+  "menu.build.buildProject": "Compilar projeto",
+  "menu.build.buildModule": "Compilar módulo",
+  "menu.build.rebuildProject": "Recompilar projeto",
+  "menu.build.buildArtifacts": "Compilar artefatos",
+  "menu.toolwindow.build": "Compilação",
+  "menu.find.structural": "Pesquisar estruturalmente…",
+  "menu.find.replaceStructural": "Substituir estruturalmente…",
+  "menu.analyze.inspectCode": "Inspecionar código…",
+  "menu.analyzeCode": "Analisar código",
+  "menu.analyze.locateDuplicates": "Localizar duplicatas…",
+  "menu.analyze.stackTrace": "Analisar stack trace ou dump de threads…",
+  "menu.toolwindow.services": "Serviços",
+  "menu.gitHub": "GitHub",
+  "menu.github.pullRequests": "Ver pull requests",
+  "menu.github.createPullRequest": "Criar pull request…",
+  "menu.github.checkoutPullRequest": "Fazer checkout de pull request…",
+  "menu.github.openInBrowser": "Abrir no GitHub",
+  "menu.file.newProject": "Novo projeto…",
+  "menu.file.renameProject": "Renomear projeto…",
+  "menu.file.reloadAllFromDisk": "Recarregar tudo do disco",
+  "menu.file.invalidateCaches": "Invalidar caches…",
+  "menu.manageIdeSettings": "Gerenciar configurações da IDE",
+  "menu.file.exportSettings": "Exportar configurações…",
+  "menu.file.importSettings": "Importar configurações…",
+  "menu.file.togglePowerSave": "Modo de economia de energia",
+  "menu.macros": "Macros",
+  "menu.macro.startRecording": "Iniciar gravação de macro",
+  "menu.macro.stopRecording": "Parar gravação de macro",
+  "menu.macro.playBack": "Executar última macro",
+  "menu.macro.playSaved": "Executar macros salvas…",
+  "menu.macro.edit": "Editar macros…",
+  "menu.bookmarks": "Marcadores",
+  "menu.navigate.toggleBookmarkWithMnemonic": "Alternar marcador com mnemônico",
+  "menu.navigate.nextBookmark": "Próximo marcador",
+  "menu.navigate.prevBookmark": "Marcador anterior",
+  "menu.view.toggleCompactMode": "Modo compacto",
+  "menu.view.zoomIn": "Aumentar zoom da IDE",
+  "menu.view.zoomOut": "Diminuir zoom da IDE",
+  "menu.view.resetZoom": "Redefinir zoom da IDE",
+  "menu.toolbar.customize": "Personalizar barra de ferramentas principal…",
+  "menu.code.quickDefinition": "Definição rápida",
+  "menu.code.quickTypeDefinition": "Definição rápida de tipo",
+  "menu.localHistory.recentChanges": "Alterações recentes",
+  "menu.diff.compareWithClipboard": "Comparar com a área de transferência",
+  "menu.view.quickSwitchScheme": "Troca rápida de esquema…",
+  "menu.editor.resetFontSize": "Redefinir tamanho da fonte em todos os editores",
+  "menu.code.cleanup": "Limpeza de código…",
+  "menu.runAnything.show": "Executar qualquer coisa…",
+  "menu.localHistory.putLabel": "Inserir rótulo…",
+  "menu.toolWindowLayouts": "Layouts de janelas de ferramentas",
+  "menu.layout.save": "Salvar layout atual como…",
+  "menu.layout.restoreDefault": "Restaurar layout padrão",
+  "menu.layout.rename": "Renomear layout…",
+  "menu.layout.delete": "Excluir layout…",
+  "menu.activeToolWindow": "Janela de ferramentas ativa",
+  "menu.toolwindow.hideActive": "Ocultar janela de ferramentas ativa",
+  "menu.toolwindow.maximize": "Maximizar janela de ferramentas",
+  "menu.toolwindow.closeContent": "Fechar aba ativa",
+  "menu.toolwindow.jumpToLast": "Ir para a última janela de ferramentas",
+  "menu.toolwindow.focusEditor": "Focar editor",
+  "menu.editorTabs": "Abas do editor",
+  "menu.editor.nextTab": "Selecionar próxima aba",
+  "menu.editor.prevTab": "Selecionar aba anterior",
+  "menu.editor.pinTab": "Fixar aba",
+  "menu.editor.closeTab": "Fechar aba",
+  "menu.editor.closeOtherTabs": "Fechar outras abas",
+  "menu.editor.closeAllTabs": "Fechar todas as abas",
+  "menu.editor.reopenClosedTab": "Reabrir aba fechada",
+  "menu.editor.moveToOppositeGroup": "Mover para o grupo oposto",
+  "menu.editor.openInOppositeGroup": "Abrir no grupo oposto",
+  "menu.editor.changeSplitOrientation": "Alterar orientação da divisão",
+  "menu.editor.unsplitAll": "Remover todas as divisões",
+  "menu.navigate.showFilePath": "Caminho do arquivo",
+  "menu.navigate.customRegion": "Recolhimento personalizado…",
+  "menu.code.showErrorDescription": "Descrição do erro",
+  "menu.code.surroundWithLiveTemplate": "Envolver com modelo dinâmico…",
+  "menu.code.autoIndentLines": "Autoindentar linhas",
+  "menu.code.moveStatementUp": "Mover instrução para cima",
+  "menu.code.moveStatementDown": "Mover instrução para baixo",
+  "menu.code.moveElementLeft": "Mover elemento para a esquerda",
+  "menu.code.moveElementRight": "Mover elemento para a direita",
+  "menu.code.collapseBlock": "Recolher bloco de código",
+  "menu.analyze.inspectFile": "Inspecionar arquivo atual",
+  "menu.project.copyElement": "Copiar…",
+  "menu.run.chooseDebugConfig": "Depurar…",
+  "menu.debug.quickEvaluate": "Avaliação rápida de expressão",
+  "menu.resizeToolWindow": "Redimensionar",
+  "menu.toolwindow.resizeLeft": "Alongar para a esquerda",
+  "menu.toolwindow.resizeRight": "Alongar para a direita",
+  "menu.toolwindow.resizeUp": "Alongar para cima",
+  "menu.toolwindow.resizeDown": "Alongar para baixo",
+  "menu.editor.nextSplitter": "Ir para a próxima divisão",
+  "menu.editor.prevSplitter": "Ir para a divisão anterior",
+  "menu.expandToLevel": "Expandir para o nível",
+  "menu.expandAllToLevel": "Expandir tudo para o nível",
+  "menu.code.expandToLevel1": "1",
+  "menu.code.expandAllToLevel1": "1",
+  "menu.code.expandToLevel2": "2",
+  "menu.code.expandAllToLevel2": "2",
+  "menu.code.expandToLevel3": "3",
+  "menu.code.expandAllToLevel3": "3",
+  "menu.code.expandToLevel4": "4",
+  "menu.code.expandAllToLevel4": "4",
+  "menu.code.expandToLevel5": "5",
+  "menu.code.expandAllToLevel5": "5",
+  "menu.editor.contextInfo": "Informações de contexto",
+  "run.services.configurationCount": "{count} configurações",
+  "search.bookmarks.count": "{count, plural, one {# marcador} other {# marcadores}}",
+  "settings.zoom.hint": "Altere com {zoomIn} ou {zoomOut}. Redefina para 100% com {reset}"
+}
diff --git a/src/platform/locales/text/es.json b/src/platform/locales/text/es.json
new file mode 100644
index 00000000..be1386c7
--- /dev/null
+++ b/src/platform/locales/text/es.json
@@ -0,0 +1,6182 @@
+{
+  "Unity": "Unity",
+  "Show Meta Files": "Mostrar archivos meta",
+  "Show Generated Files": "Mostrar archivos generados",
+  "C# project files are missing. In Unity, select an external script editor in Preferences > External Tools, then regenerate project files.": "Faltan los archivos de proyecto de C#. En Unity, selecciona un editor de scripts externo en Preferences > External Tools y luego regenera los archivos del proyecto.",
+  "Edit {name}": "Editar {name}",
+  "Whitespace-only changes": "Cambios solo en espacios en blanco",
+  " · Whitespace-only changes": " · Cambios solo en espacios en blanco",
+  " · 1 moved block": " · 1 bloque movido",
+  " · {moves} moved blocks": " · {moves} bloques movidos",
+  "Moved to line {line} with internal edits": "Movido a la línea {line} con ediciones internas",
+  "Moved from line {line} with internal edits": "Movido desde la línea {line} con ediciones internas",
+  "To L{line} (edited)": "A L{line} (editado)",
+  "From L{line} (edited)": "De L{line} (editado)",
+  "Moved to line {line}": "Movido a la línea {line}",
+  "Moved from line {line}": "Movido desde la línea {line}",
+  "Go to moved code at line {line}": "Ir al código movido en la línea {line}",
+  "Go to original code at line {line}": "Ir al código original en la línea {line}",
+  "Edited within moved code": "Editado dentro del código movido",
+  "The language server JDK ({path}) must be a full JDK with jdk.compiler, jdk.jdi and jdk.unsupported for Java language support and debugging. jdtls needs JDK {version} or newer. Download JDK {version}, choose a full JDK in {setting}, or set it to Auto.": "El JDK del servidor de lenguaje ({path}) debe ser un JDK completo con jdk.compiler, jdk.jdi y jdk.unsupported para la compatibilidad con el lenguaje Java y la depuración. jdtls requiere JDK {version} o superior. Descarga JDK {version}, elige un JDK completo en {setting} o establécelo en Automático.",
+  "ACP Registry": "Registro ACP",
+  "Apple's clangd does not run clang-tidy, so checks from .clang-tidy are not shown. Install clangd (LLVM) to get them.": "El clangd de Apple no ejecuta clang-tidy, por lo que las comprobaciones de .clang-tidy no se muestran. Instala clangd (LLVM) para obtenerlas.",
+  "Auto-detect ({defaultProgram})": "Detectar automáticamente ({defaultProgram})",
+  "Built-in": "Integrado",
+  "Built-in agents": "Agentes integrados",
+  "Custom executable": "Ejecutable personalizado",
+  "Found on PATH": "Encontrado en PATH",
+  "Launch command": "Comando de inicio",
+  "Sign in": "Iniciar sesión",
+  "Leave empty to find the executable on PATH. Changes apply to new sessions.": "Déjalo vacío para buscar el ejecutable en PATH. Los cambios se aplican a las sesiones nuevas.",
+  "Newer dependency version available": "Versión más reciente de la dependencia disponible",
+  "Not found": "No encontrado",
+  "Not found on PATH": "No encontrado en PATH",
+  "Reports newer crate versions that Cargo.toml requirements do not already allow.": "Informa sobre versiones más recientes de crates que los requisitos de Cargo.toml aún no permiten.",
+  "Run `auggie login` in a terminal.": "Ejecuta `auggie login` en una terminal.",
+  "Run `claude` in a terminal and sign in.": "Ejecuta `claude` en una terminal e inicia sesión.",
+  "Run `codex login` in a terminal.": "Ejecuta `codex login` en una terminal.",
+  "Run `copilot` in a terminal and sign in.": "Ejecuta `copilot` en una terminal e inicia sesión.",
+  "Run `cursor-agent login` in a terminal.": "Ejecuta `cursor-agent login` en una terminal.",
+  "Run `gemini` in a terminal and sign in.": "Ejecuta `gemini` en una terminal e inicia sesión.",
+  "Run `goose configure` in a terminal.": "Ejecuta `goose configure` en una terminal.",
+  "Run `kimi` in a terminal and sign in.": "Ejecuta `kimi` en una terminal e inicia sesión.",
+  "Run `kiro-cli login` in a terminal.": "Ejecuta `kiro-cli login` en una terminal.",
+  "Run `opencode auth login` in a terminal.": "Ejecuta `opencode auth login` en una terminal.",
+  "Run `qwen` in a terminal and sign in.": "Ejecuta `qwen` en una terminal e inicia sesión.",
+  "Run `vibe` in a terminal and sign in.": "Ejecuta `vibe` en una terminal e inicia sesión.",
+  "Sign in with the agent's own command line first.": "Inicia sesión primero con la línea de comandos del propio agente.",
+  "This agent is configured in its agent file.": "Este agente se configura en su archivo de agente.",
+  "This agent is installed from the ACP Registry. Manage its installation in the ACP Registry tab.": "Este agente se instaló desde el Registro ACP. Administra su instalación en la pestaña Registro ACP.",
+  "This agent runs through a package runner (npm or uv) and has no executable to choose.": "Este agente se ejecuta mediante un ejecutor de paquetes (npm o uv) y no tiene un ejecutable para elegir.",
+  "Update to {latest}": "Actualizar a {latest}",
+  "A newer version is available: {latest}": "Hay una versión más reciente disponible: {latest}",
+  "Kotlin bridge requires a Maven build root": "El puente de Kotlin requiere una raíz de compilación de Maven",
+  "Kotlin bridge bundle is unavailable": "El paquete del puente de Kotlin no está disponible",
+  "Kotlin bridge command did not acknowledge its library snapshot": "El comando del puente de Kotlin no confirmó su instantánea de biblioteca",
+  "Kotlin editor compilation failed": "Error en la compilación del editor de Kotlin",
+  "Updating results…": "Actualizando resultados…",
+  "Uploading files": "Subiendo archivos",
+  "No files on the clipboard": "No hay archivos en el portapapeles",
+  "File name is not valid UTF-8": "El nombre del archivo no es UTF-8 válido",
+  "Project opening cancelled": "Apertura del proyecto cancelada",
+  "Project is in Restricted Mode": "El proyecto está en Modo restringido",
+  "Project is in Restricted Mode. Trust the project to enable execution.": "El proyecto está en Modo restringido. Confía en el proyecto para habilitar la ejecución.",
+  "Trust and Open Project?": "¿Confiar y abrir el proyecto?",
+  "Preview in Restricted Mode": "Vista previa en Modo restringido",
+  "Don't Open": "No abrir",
+  "If you don't trust the source, preview the project in Restricted Mode, where project commands and tools can't run.": "Si no confías en el origen, previsualiza el proyecto en Modo restringido, donde no se pueden ejecutar los comandos ni las herramientas del proyecto.",
+  "Loading, running or building a project may execute potentially malicious code from its build scripts.": "Cargar, ejecutar o compilar un proyecto puede ejecutar código potencialmente malicioso desde sus scripts de compilación.",
+  "Trust projects in": "Confiar en los proyectos en",
+  "Restricted Mode: project commands and tools are disabled.": "Modo restringido: los comandos y herramientas del proyecto están deshabilitados.",
+  "Trust Project": "Confiar en el proyecto",
+  "Trust decisions are saved in your user data and take effect immediately.": "Las decisiones de confianza se guardan en tus datos de usuario y surten efecto de inmediato.",
+  "Trusted projects": "Proyectos de confianza",
+  "Trusted locations": "Ubicaciones de confianza",
+  "Revoke Trust": "Revocar confianza",
+  "Project Trust": "Confianza del proyecto",
+  "Security": "Seguridad",
+  "Remove Trusted Location": "Quitar ubicación de confianza",
+  "Cannot determine the module for main class '{value}'": "No se puede determinar el módulo para la clase principal '{value}'",
+  "Java module '{value}' is not imported. Wait for Java project import to finish. If it still fails, check the run configuration's module and whether it is included in the parent Maven or Gradle build, or open its folder as a project.": "El módulo de Java '{value}' no está importado. Espera a que termine la importación del proyecto Java. Si sigue fallando, verifica el módulo de la configuración de ejecución y si está incluido en la compilación principal de Maven o Gradle, o abre su carpeta como un proyecto.",
+  "Attach": "Adjuntar",
+  "Remove from Workspace": "Quitar del espacio de trabajo",
+  "Downloading Java {0} language server runtime": "Descargando el entorno de ejecución del servidor de lenguaje Java {0}",
+  "auto-managed; uses an installed JDK or downloads a runtime when needed": "administrado automáticamente; usa un JDK instalado o descarga un entorno de ejecución cuando es necesario",
+  "Runs jdtls only; the project keeps its Project JDK. When empty, a suitable installed JDK is used first, otherwise Eclipse Temurin is downloaded automatically into a separate language-server folder. The jdtls executable itself is set in Language Servers.": "Ejecuta solo jdtls; el proyecto conserva su JDK del proyecto. Cuando está vacío, se usa primero un JDK instalado adecuado; de lo contrario, Eclipse Temurin se descarga automáticamente en una carpeta separada del servidor de lenguaje. El ejecutable de jdtls se configura en Servidores de lenguaje.",
+  "Semantic Highlighting": "Resaltado semántico",
+  "Rainbow Brackets": "Rainbow Brackets",
+  "Comment with Line Comment": "Comentar con comentario de línea",
+  "Comment with Block Comment": "Comentar con comentario de bloque",
+  "Duplicate Line or Selection": "Duplicar línea o selección",
+  "Delete Line": "Eliminar línea",
+  "Move Line Up": "Mover línea hacia arriba",
+  "Move Line Down": "Mover línea hacia abajo",
+  "Move Statement Up": "Mover instrucción hacia arriba",
+  "Move Statement Down": "Mover instrucción hacia abajo",
+  "Extend Selection": "Ampliar selección",
+  "Shrink Selection": "Reducir selección",
+  "Toggle Fold": "Alternar plegado",
+  "Cyclic Expand Word": "Expandir palabra cíclicamente",
+  "Cyclic Expand Word (Backward)": "Expandir palabra cíclicamente (hacia atrás)",
+  "Paste as Plain Text": "Pegar como texto sin formato",
+  "Add Selection for Next Occurrence": "Agregar selección para la siguiente coincidencia",
+  "Select All Occurrences": "Seleccionar todas las coincidencias",
+  "Complete Current Statement": "Completar instrucción actual",
+  "Start New Line": "Iniciar nueva línea",
+  "Start New Line Before Current": "Iniciar nueva línea antes de la actual",
+  "Split Line": "Dividir línea",
+  "Scroll to Center": "Desplazar al centro",
+  "Move Caret to Code Block Start": "Mover cursor al inicio del bloque de código",
+  "Move Caret to Code Block End": "Mover cursor al final del bloque de código",
+  "Clone Caret Above": "Clonar cursor arriba",
+  "Clone Caret Below": "Clonar cursor abajo",
+  "Join Lines": "Unir líneas",
+  "Toggle Case": "Alternar mayúsculas y minúsculas",
+  "Add Carets to Ends of Selected Lines": "Agregar cursores al final de las líneas seleccionadas",
+  "Unselect Occurrence": "Deseleccionar coincidencia",
+  "Paste from History…": "Pegar desde el historial…",
+  "Sort Lines": "Ordenar líneas",
+  "Reverse Lines": "Invertir líneas",
+  "Unwrap/Remove…": "Desenvolver/quitar…",
+  "Basic": "Básico",
+  "Quick Definition": "Definición rápida",
+  "Reformat File…": "Reformatar archivo…",
+  "Go to Declaration or Usages": "Ir a declaración o usos",
+  "Go to Implementation(s)": "Ir a implementación(es)",
+  "Go to Type Declaration": "Ir a declaración de tipo",
+  "Next Highlighted Error": "Siguiente error resaltado",
+  "Previous Highlighted Error": "Error resaltado anterior",
+  "Highlight Usages in File": "Resaltar usos en el archivo",
+  "Implement Methods…": "Implementar métodos…",
+  "Override Methods…": "Sobrescribir métodos…",
+  "Expression Type Info": "Información del tipo de expresión",
+  "Next Method": "Siguiente método",
+  "Previous Method": "Método anterior",
+  "Copy Absolute Path": "Copiar ruta absoluta",
+  "Copy Path From Content Root": "Copiar ruta desde la raíz de contenido",
+  "Copy File Name": "Copiar nombre del archivo",
+  "Fixup…": "Fixup…",
+  "Step Over": "Paso por encima",
+  "Step Out": "Paso afuera",
+  "Zoom In": "Acercar",
+  "Zoom Out": "Alejar",
+  "Actual Size": "Tamaño real",
+  "Fit Zoom to Window": "Ajustar zoom a la ventana",
+  "Show Chessboard": "Mostrar tablero de ajedrez",
+  "Editor Only": "Solo editor",
+  "Editor and Preview": "Editor y vista previa",
+  "Preview Only": "Solo vista previa",
+  "Add Maven Projects": "Agregar proyectos Maven",
+  "Unlink Maven Projects": "Desvincular proyectos Maven",
+  "Unlink Maven projects?": "¿Desvincular proyectos Maven?",
+  "Remove this project and its modules from Maven? Files will remain in the Project view.": "¿Quitar este proyecto y sus módulos de Maven? Los archivos permanecerán en la vista Proyecto.",
+  "Remove this module and its submodules from Maven? The Java language server stops importing them, so they no longer use memory. Files will remain in the Project view; add the pom.xml again to restore them.": "¿Quitar este módulo y sus submódulos de Maven? El servidor de lenguaje Java dejará de importarlos, por lo que ya no usarán memoria. Los archivos permanecerán en la vista Proyecto; vuelve a agregar el archivo pom.xml para restaurarlos.",
+  "Unlink": "Desvincular",
+  "(does not exist)": "(no existe)",
+  ", e.g.": ", p. ej.",
+  ", then press Tab.": ", luego presiona Tab.",
+  "? This cannot be undone.": "? Esto no se puede deshacer.",
+  "API request failed, retrying (attempt {attempt})": "Falló la solicitud de API, reintentando (intento {attempt})",
+  "API request failed, retrying in {wait}s (attempt {attempt})": "Falló la solicitud de API, reintentando en {wait}s (intento {attempt})",
+  "A charset in .editorconfig takes precedence. Change one file's encoding from the status bar.": "Un juego de caracteres en .editorconfig tiene prioridad. Cambia la codificación de un archivo desde la barra de estado.",
+  "A command line, e.g. /bin/zsh --login. Leave empty to use the login shell.": "Una línea de comandos, p. ej., /bin/zsh --login. Déjalo vacío para usar el shell de inicio de sesión.",
+  "A line breakpoint that is removed after it is hit": "Un punto de interrupción de línea que se elimina después de alcanzarse",
+  "Abbreviation": "Abreviatura",
+  "Abort Cherry-Pick": "Abortar cherry-pick",
+  "Abort Merge": "Abortar fusión",
+  "Abort Rebase": "Abortar rebase",
+  "Abort Revert": "Abortar reversión",
+  "Absolute Path": "Ruta absoluta",
+  "Absolute path of the current file": "Ruta absoluta del archivo actual",
+  "Accent color": "Color de acento",
+  "Accent colour": "Color de acento",
+  "Accept Both (Conflict at Caret)": "Aceptar ambos (conflicto en el cursor)",
+  "Accept Theirs": "Aceptar los suyos",
+  "Accept Theirs (Conflict at Caret)": "Aceptar los suyos (conflicto en el cursor)",
+  "Accept Yours": "Aceptar los tuyos",
+  "Accept Yours (Conflict at Caret)": "Aceptar los tuyos (conflicto en el cursor)",
+  "Accessibility": "Accesibilidad",
+  "Action id (bind it in Keymap)": "ID de acción (asígnalo en Mapa de teclado)",
+  "Actions": "Acciones",
+  "Actions on Save": "Acciones al guardar",
+  "Actions run when a file is saved with Save (⌘S) or Save All. Trailing spaces and the final line break are configured in": "Las acciones se ejecutan cuando se guarda un archivo con Guardar (⌘S) o Guardar todo. Los espacios finales y el salto de línea final se configuran en",
+  "Activate on Save": "Activar al guardar",
+  "Activate virtualenv": "Activar virtualenv",
+  "Add": "Agregar",
+  "Add Column": "Agregar columna",
+  "Add Field Watchpoint": "Agregar punto de observación de campo",
+  "Add File to Git": "Agregar archivo a Git",
+  "Add GitHub Pattern": "Agregar patrón de GitHub",
+  "Add Interpreter…": "Agregar intérprete…",
+  "Add JIRA Pattern": "Agregar patrón de JIRA",
+  "Add Keyboard Shortcut": "Agregar atajo de teclado",
+  "Add Kind": "Agregar tipo",
+  "Add Method Breakpoint": "Agregar punto de interrupción de método",
+  "Add New Configuration": "Agregar nueva configuración",
+  "Add Pattern": "Agregar patrón",
+  "Add Python Interpreter": "Agregar intérprete de Python",
+  "Add Row": "Agregar fila",
+  "Add Template": "Agregar plantilla",
+  "Add YouTrack Pattern": "Agregar patrón de YouTrack",
+  "Add one in the Database tool window.": "Agrega uno en la ventana de herramientas Base de datos.",
+  "Add pattern": "Agregar patrón",
+  "Add silently": "Agregar silenciosamente",
+  "Add to Favorites": "Agregar a favoritos",
+  "Add to VCS": "Agregar a VCS",
+  "Add to Watches": "Agregar a expresiones de inspección",
+  "Add unambiguous imports on the fly": "Agregar importaciones no ambiguas sobre la marcha",
+  "Added to the environment of new terminal sessions.": "Se agrega al entorno de las nuevas sesiones de terminal.",
+  "Additional arguments": "Argumentos adicionales",
+  "Adjust colors for red-green vision deficiency": "Ajustar colores para deficiencia visual rojo-verde",
+  "After Replace": "Después de reemplazar",
+  "After Stop, the process gets this long to exit after the interrupt before it is killed.": "Después de Detener, el proceso dispone de este tiempo para terminar tras la interrupción antes de ser forzado a cerrar.",
+  "Align Changes": "Alinear cambios",
+  "All": "Todo",
+  "All Places": "Todos los lugares",
+  "All breakpoints": "Todos los puntos de interrupción",
+  "All conflicts resolved": "Todos los conflictos resueltos",
+  "All letters": "Todas las letras",
+  "All lines": "Todas las líneas",
+  "All settings…": "Toda la configuración…",
+  "Allow placing breakpoints in any file": "Permitir colocar puntos de interrupción en cualquier archivo",
+  "Also expand in comments and strings": "Expandir también en comentarios y cadenas",
+  "Always": "Siempre",
+  "Always show full path in window header": "Mostrar siempre la ruta completa en el encabezado de la ventana",
+  "Amend": "Enmendar",
+  "Analysing…": "Analizando…",
+  "Analyze": "Analizar",
+  "Analyze Stack Trace": "Analizar traza de pila",
+  "Analyze Stack Trace or Thread Dump…": "Analizar traza de pila o volcado de hilos…",
+  "Analyze code": "Analizar código",
+  "Annotate with Git Blame": "Anotar con Git Blame",
+  "Annotation": "Anotación",
+  "Anonymize literals": "Anonimizar literales",
+  "Anonymize variables, fields, methods and types": "Anonimizar variables, campos, métodos y tipos",
+  "Another Docker operation is still running": "Otra operación de Docker sigue en ejecución",
+  "Another Git operation is in progress": "Otra operación de Git está en curso",
+  "Another GitHub operation is still running": "Otra operación de GitHub sigue en ejecución",
+  "Another remote operation is in progress": "Otra operación remota está en curso",
+  "Antialiasing": "Suavizado de bordes",
+  "Appearance": "Apariencia",
+  "Appearance & Behavior": "Apariencia y comportamiento",
+  "Appearance…": "Apariencia…",
+  "Application Settings": "Configuración de la aplicación",
+  "Applies cleanly": "Se aplica limpiamente",
+  "Applies fix-all code actions.": "Aplica acciones de código para corregir todo.",
+  "Applies the import quick fix of an unresolved reference when the language server offers exactly one.": "Aplica la corrección rápida de importación de una referencia no resuelta cuando el servidor de lenguaje ofrece exactamente una.",
+  "Applies the language server's fix-all action (source.fixAll).": "Aplica la acción de corregir todo del servidor de lenguaje (source.fixAll).",
+  "Applies to editor tabs and tool window buttons": "Se aplica a las pestañas del editor y a los botones de las ventanas de herramientas",
+  "Apply": "Aplicar",
+  "Apply Patch from Clipboard…": "Aplicar parche desde el portapapeles…",
+  "Apply Patch…": "Aplicar parche…",
+  "Apply Stash": "Aplicar stash",
+  "Arguments": "Argumentos",
+  "Arrow function": "Función flecha",
+  "As new branch:": "Como nueva rama:",
+  "As typed": "Como se escribió",
+  "Ask": "Preguntar",
+  "Asks for a value when the tool runs": "Pide un valor cuando se ejecuta la herramienta",
+  "Async function": "Función asíncrona",
+  "Async test case": "Caso de prueba asíncrono",
+  "Attach Debugger": "Adjuntar depurador",
+  "Attach the debugger to a running Java, Node.js, Python, Go or native process": "Adjuntar el depurador a un proceso en ejecución de Java, Node.js, Python, Go o nativo",
+  "Attach to Process": "Adjuntar al proceso",
+  "Attach to Process…": "Adjuntar al proceso…",
+  "Attach to process": "Adjuntar al proceso",
+  "Attach to subprocess automatically while debugging": "Adjuntar automáticamente a subprocesos durante la depuración",
+  "Attaching needs the desktop app": "Para adjuntar se necesita la aplicación de escritorio",
+  "Audible bell": "Campana audible",
+  "Authentication:": "Autenticación:",
+  "Auto": "Automático",
+  "Auto Import": "Importación automática",
+  "Auto-detected": "Detectado automáticamente",
+  "Auto-update if push of the current branch was rejected": "Actualizar automáticamente si se rechazó el push de la rama actual",
+  "Autosave": "Guardado automático",
+  "Autoscroll from Source": "Desplazamiento automático desde el código fuente",
+  "Autoscroll to Source": "Desplazamiento automático hacia el código fuente",
+  "Available": "Disponibles",
+  "Available plugins": "Complementos disponibles",
+  "Back": "Atrás",
+  "Backend malloc in use": "malloc del backend en uso",
+  "Backend set-up": "Configuración del backend",
+  "Background": "Segundo plano",
+  "Background Tasks": "Tareas en segundo plano",
+  "Background tasks": "Tareas en segundo plano",
+  "Balloon": "Globo",
+  "Base branch": "Rama base",
+  "Base interpreter": "Intérprete base",
+  "Base interpreter:": "Intérprete base:",
+  "Based on syntax (language server not ready)": "Basado en sintaxis (el servidor de lenguaje no está listo)",
+  "Behavior": "Comportamiento",
+  "Benchmark function": "Función de benchmark",
+  "Binary response": "Respuesta binaria",
+  "Blank line between subject and body": "Línea en blanco entre el asunto y el cuerpo",
+  "Blinking cursor": "Cursor parpadeante",
+  "Block": "Bloque",
+  "Blue": "Azul",
+  "Bold": "Negrita",
+  "Bookmarks": "Marcadores",
+  "Bottom": "Inferior",
+  "Bottom Left": "Inferior izquierda",
+  "Bottom Right": "Inferior derecha",
+  "Branch": "Rama",
+  "Branch '{name}' has no tracked branch": "La rama '{name}' no tiene ninguna rama rastreada",
+  "Branch, %": "Rama, %",
+  "Branch, tag or commit hash": "Rama, etiqueta o hash de confirmación",
+  "Branches": "Ramas",
+  "Branches…": "Ramas…",
+  "Breadcrumb": "Ruta de navegación",
+  "Breadcrumbs": "Rutas de navegación",
+  "Breakpoint properties": "Propiedades del punto de interrupción",
+  "Breakpoints": "Puntos de interrupción",
+  "Breakpoints can't be placed in this file": "No se pueden colocar puntos de interrupción en este archivo",
+  "Browse": "Examinar",
+  "Browse…": "Examinar…",
+  "Build": "Compilar",
+  "Build Artifacts": "Compilar artefactos",
+  "Build Module": "Compilar módulo",
+  "Build Project": "Compilar proyecto",
+  "Build failed": "Error de compilación",
+  "Build files changed since the last reload": "Los archivos de compilación cambiaron desde la última recarga",
+  "Build output": "Salida de compilación",
+  "Build the project to see compiler messages here": "Compila el proyecto para ver los mensajes del compilador aquí",
+  "Build, Execution, Deployment": "Compilación, ejecución, implementación",
+  "Building": "Compilando",
+  "Bundled": "Incluido",
+  "Caches cleared": "Cachés borrados",
+  "Call Hierarchy": "Jerarquía de llamadas",
+  "Call Tree": "Árvore de llamadas",
+  "Call hierarchy": "Jerarquía de llamadas",
+  "Call tree": "Árbol de llamadas",
+  "Calls on the current line": "Llamadas en la línea actual",
+  "Cancel": "Cancelar",
+  "Cancel Exclusion": "Cancelar exclusión",
+  "Cancel Running Statement": "Cancelar instrucción en ejecución",
+  "Cannot add a field watchpoint": "No se puede agregar un punto de observación de campo",
+  "Cannot annotate": "No se puede anotar",
+  "Cannot change line separators": "No se pueden cambiar los separadores de línea",
+  "Cannot commit": "No se puede confirmar",
+  "Cannot connect to {target}": "No se puede conectar a {target}",
+  "Cannot convert encoding": "No se puede convertir la codificación",
+  "Cannot create scratch file": "No se puede crear el archivo temporal",
+  "Cannot create the HTTP request file": "No se puede crear el archivo de solicitud HTTP",
+  "Cannot generate the HTTP request": "No se puede generar la solicitud HTTP",
+  "Cannot duplicate the data source": "No se puede duplicar el origen de datos",
+  "Cannot execute": "No se puede ejecutar",
+  "Cannot execute on {target}": "No se puede ejecutar en {target}",
+  "Cannot export data": "No se pueden exportar los datos",
+  "Cannot find usages of '{name}'": "No se pueden encontrar usos de '{name}'",
+  "Cannot generate the DDL": "No se puede generar el DDL",
+  "Cannot generate the SQL script": "No se puede generar el script SQL",
+  "Cannot get the DDL of {name}": "No se puede obtener el DDL de {name}",
+  "Cannot open file": "No se puede abrir el archivo",
+  "Cannot open library class": "No se puede abrir la clase de biblioteca",
+  "Cannot open link": "No se puede abrir el enlace",
+  "Cannot open the query console": "No se puede abrir la consola de consultas",
+  "Cannot open the response": "No se puede abrir la respuesta",
+  "Cannot profile '{name}'": "No se puede perfilar '{name}'",
+  "Cannot put label": "No se puede colocar la etiqueta",
+  "Cannot read data sources": "No se pueden leer los orígenes de datos",
+  "Cannot read the patch": "No se puede leer el parche",
+  "Cannot reload Gradle projects": "No se pueden recargar los proyectos Gradle",
+  "Cannot reload Maven projects": "No se pueden recargar los proyectos Maven",
+  "Cannot reload from disk": "No se puede recargar desde el disco",
+  "Cannot reload with encoding": "No se puede recargar con la codificación",
+  "Cannot remove recent project": "No se puede quitar el proyecto reciente",
+  "Cannot roll back": "No se pueden revertir los cambios",
+  "Cannot run '{name}' with coverage": "No se puede ejecutar '{name}' con cobertura",
+  "Cannot run the script": "No se puede ejecutar el script",
+  "Cannot save run configurations": "No se pueden guardar las configuraciones de ejecución",
+  "Cannot save setting": "No se puede guardar la configuración",
+  "Cannot send the request": "No se puede enviar la solicitud",
+  "Cannot stop process": "No se puede detener el proceso",
+  "Cannot undo": "No se puede deshacer",
+  "Cannot undo refactoring": "No se puede deshacer la refactorización",
+  "Cannot preview replacements": "No se pueden previsualizar los reemplazos",
+  "Caret blinking (ms):": "Parpadeo del cursor (ms):",
+  "Caret column number (1-based)": "Número de columna del cursor (base 1)",
+  "Caret line number (1-based)": "Número de línea del cursor (base 1)",
+  "Caret should be positioned at the name of the element to be refactored": "El cursor debe estar posicionado en el nombre del elemento que se va a refactorizar",
+  "Cascade": "En cascada",
+  "Case sensitive": "Distinguir mayúsculas y minúsculas",
+  "Change Splitter Orientation": "Cambiar orientación del divisor",
+  "Change Signature…": "Cambiar firma…",
+  "Change actions": "Cambiar acciones",
+  "Change font size with Command+Mouse Wheel": "Cambiar el tamaño de fuente con Command+Rueda del ratón",
+  "Changed files": "Archivos modificados",
+  "Changelist:": "Lista de cambios:",
+  "Changes": "Cambios",
+  "Changes to include:": "Cambios a incluir:",
+  "Changes were not submitted": "Los cambios no se enviaron",
+  "Check TODO": "Comprobar TODO",
+  "Checked out pull request #{number}": "Se hizo checkout del pull request #{number}",
+  "Checking installed tools…": "Comprobando herramientas instaladas…",
+  "Checking tools": "Comprobando herramientas",
+  "Checkout": "Checkout",
+  "Checkout Pull Request…": "Hacer checkout de pull request…",
+  "Checkout Revision": "Hacer checkout de revisión",
+  "Checkout Tag or Revision": "Hacer checkout de etiqueta o revisión",
+  "Checkout Tag or Revision…": "Hacer checkout de etiqueta o revisión…",
+  "Checkout branch": "Hacer checkout de rama",
+  "Checks out the selected pull request, a number given as argument, or asks for one.": "Hace checkout del pull request seleccionado, de un número indicado como argumento o solicita uno.",
+  "Cherry-Pick": "Cherry-pick",
+  "Children": "Hijos",
+  "Choose Content to Paste": "Elegir contenido para pegar",
+  "Choose a data source for this console": "Elige un origen de datos para esta consola",
+  "Choose a start or end date": "Elige una fecha de inicio o de fin",
+  "Choose configuration to debug": "Elige la configuración para depurar",
+  "Choose configuration to run": "Elige la configuración para ejecutar",
+  "Choose the Statement to Unwrap/Remove": "Elige la instrucción para desenvolver/quitar",
+  "Choose which call on the current line to step into": "Elige en qué llamada de la línea actual entrar",
+  "Class": "Clase",
+  "Classes": "Clases",
+  "Classes changed": "Clases modificadas",
+  "Cleans the build outputs, then builds the project": "Limpia las salidas de compilación y luego compila el proyecto",
+  "Cleanup": "Limpieza",
+  "Clear": "Limpiar",
+  "Clear All": "Limpiar todo",
+  "Clear Buffer": "Limpiar búfer",
+  "Clear Caches": "Limpiar cachés",
+  "Clear Console": "Limpiar consola",
+  "Clear Filtering": "Limpiar filtrado",
+  "Clear History": "Limpiar historial",
+  "Clear Terminal Buffer": "Limpiar búfer de la terminal",
+  "Clear build tool caches (Maven / Gradle sync results)": "Limpiar cachés de herramientas de compilación (resultados de sincronización de Maven / Gradle)",
+  "Clear caches": "Limpiar cachés",
+  "Clear file system cache and Local History": "Limpiar caché del sistema de archivos e Historial local",
+  "Clear language server workspaces (Java import data and indexes)": "Limpiar espacios de trabajo del servidor de lenguaje (datos de importación e índices de Java)",
+  "Clipboard": "Portapapeles",
+  "Clone": "Clonar",
+  "Clone depth": "Profundidad de clonación",
+  "Clone Repository": "Clonar repositorio",
+  "Clone Repository…": "Clonar repositorio…",
+  "Clone progress": "Progreso de clonación",
+  "Clone source": "Origen de clonación",
+  "Cloned, but the project could not be opened": "Clonado, pero no se pudo abrir el proyecto",
+  "Cloning requires the desktop app": "Clonar requiere la aplicación de escritorio",
+  "Close": "Cerrar",
+  "Close All Read-Only Tabs": "Cerrar todas las pestañas de solo lectura",
+  "Close All Tabs": "Cerrar todas las pestañas",
+  "Close All but Pinned": "Cerrar todas excepto las fijadas",
+  "Close Annotations": "Cerrar anotaciones",
+  "Close Other Tabs": "Cerrar las demás pestañas",
+  "Close Project": "Cerrar proyecto",
+  "Close Session": "Cerrar sesión",
+  "Close Tab": "Cerrar pestaña",
+  "Close Tabs to the Left": "Cerrar pestañas a la izquierda",
+  "Close Tabs to the Right": "Cerrar pestañas a la derecha",
+  "Close Terminal Session": "Cerrar sesión de terminal",
+  "Close Unmodified Tabs": "Cerrar pestañas sin modificar",
+  "Close least recently used files": "Cerrar los archivos usados menos recientemente",
+  "Close non-modified files first": "Cerrar primero los archivos no modificados",
+  "Close performance overlay": "Cerrar superposición de rendimiento",
+  "Close session when it ends": "Cerrar sesión cuando termine",
+  "Closing Policy": "Política de cierre",
+  "Code": "Código",
+  "Code Completion": "Autocompletado de código",
+  "Code Editing": "Edición de código",
+  "Code Folding": "Plegado de código",
+  "Code Style": "Estilo de código",
+  "Code breadcrumbs": "Rutas de navegación de código",
+  "Collapse": "Contraer",
+  "Collapse All": "Contraer todo",
+  "Collapse Unchanged Fragments": "Contraer fragmentos sin cambios",
+  "Color Scheme": "Esquema de colores",
+  "Color scheme attributes": "Atributos del esquema de colores",
+  "Color scheme preview": "Vista previa del esquema de colores",
+  "Color theme": "Tema de color",
+  "Column": "Columna",
+  "Column Selection Mode": "Modo de selección por columna",
+  "Columns": "Columnas",
+  "Comma-separated column numbers, e.g. 80, 100.": "Números de columna separados por comas, p. ej., 80, 100.",
+  "Command": "Comando",
+  "Command line": "Línea de comandos",
+  "Commands": "Comandos",
+  "Comment": "Comentario",
+  "Comment:": "Comentario:",
+  "Commit": "Confirmar",
+  "Commit Anyway": "Confirmar de todos modos",
+  "Commit Changelist…": "Confirmar lista de cambios…",
+  "Commit Checks": "Comprobaciones de confirmación",
+  "Commit File…": "Confirmar archivo…",
+  "Commit Message": "Mensaje de confirmación",
+  "Commit Message History": "Historial de mensajes de confirmación",
+  "Commit Message Inspections": "Inspecciones de mensajes de confirmación",
+  "Commit Options": "Opciones de confirmación",
+  "Commit message": "Mensaje de confirmación",
+  "Commit message is empty": "El mensaje de confirmación está vacío",
+  "Commit:": "Confirmar:",
+  "Commits": "Confirmaciones",
+  "Commits are applied from top to bottom.": "Las confirmaciones se aplican de arriba hacia abajo.",
+  "Commits to rebase": "Confirmaciones para rebase",
+  "commits": "confirmaciones",
+  "Commit…": "Confirmar…",
+  "Compact mode": "Modo compacto",
+  "Companion object": "Objeto companion",
+  "Compare Files": "Comparar archivos",
+  "Compare Texts": "Comparar textos",
+  "Compare With": "Comparar con",
+  "Compare With…": "Comparar con…",
+  "Compare with Branch or Revision…": "Comparar con rama o revisión…",
+  "Compare with Branch…": "Comparar con rama…",
+  "Compare with Clipboard": "Comparar con el portapapeles",
+  "Compare with Current": "Comparar con la versión actual",
+  "Compare with Local": "Comparar con la versión local",
+  "Compilation failed: fix the errors and reload again.": "Falló la compilación: corrige los errores y vuelve a recargar.",
+  "Compiles and runs the project: the default jdtls runtime, Run/Debug, and JAVA_HOME for Maven and Gradle.": "Compila y ejecuta el proyecto: el entorno de ejecución predeterminado de jdtls, Ejecutar/Depurar y JAVA_HOME para Maven y Gradle.",
+  "Compiles the module of the current file": "Compila el módulo del archivo actual",
+  "Compiles the project's sources and tests with its build system": "Compila el código fuente y las pruebas del proyecto con su sistema de compilación",
+  "Completions": "Sugerencias de completado",
+  "Component with CSS module": "Componente con módulo CSS",
+  "Condition": "Condición",
+  "Configurations": "Configuraciones",
+  "Configure Editor Tabs…": "Configurar pestañas del editor…",
+  "Configure Indents…": "Configurar sangrías…",
+  "Configure Keymap…": "Configurar mapa de teclado…",
+  "Configure…": "Configurar…",
+  "Confirm Drop": "Confirmar eliminación",
+  "Confirm before exiting the IDE": "Confirmar antes de salir del IDE",
+  "Confirm rerun with process termination": "Confirmar volver a ejecutar con terminación del proceso",
+  "Confirmation": "Confirmación",
+  "Conflicted files": "Archivos con conflictos",
+  "Conflicts": "Conflictos",
+  "Conflicts:": "Conflictos:",
+  "Connect": "Conectar",
+  "Connected": "Conectado",
+  "Connecting to Docker…": "Conectando a Docker…",
+  "Connecting to GitHub…": "Conectando a GitHub…",
+  "Console": "Consola",
+  "Container log": "Registro del contenedor",
+  "Content root": "Raíz de contenido",
+  "Context menu": "Menú contextual",
+  "Contexts": "Contextos",
+  "Continue": "Continuar",
+  "Continue Cherry-Pick": "Continuar cherry-pick",
+  "Continue Rebase": "Continuar rebase",
+  "Continue Revert": "Continuar reversión",
+  "Contributes": "Contribuciones",
+  "Convert to Encoding": "Convertir a codificación",
+  "Copied code keeps the editor's syntax colors and font when pasted into documents and mail.": "El código copiado conserva los colores de sintaxis y la fuente del editor al pegarse en documentos y correos.",
+  "Copy": "Copiar",
+  "Copy / Paste Special": "Copiado / pegado especial",
+  "Copy All": "Copiar todo",
+  "Copy Commit Message": "Copiar mensaje de confirmación",
+  "Copy Configuration": "Copiar configuración",
+  "Copy Container ID": "Copiar ID del contenedor",
+  "Copy Coordinates": "Copiar coordenadas",
+  "Copy Image ID": "Copiar ID de la imagen",
+  "Copy Image Name": "Copiar nombre de la imagen",
+  "Copy Name": "Copiar nombre",
+  "Copy Original Text": "Copiar texto original",
+  "Copy Path": "Copiar ruta",
+  "Copy Path from Project Root": "Copiar ruta desde la raíz del proyecto",
+  "Copy Path/Reference…": "Copiar ruta/referencia…",
+  "Copy Problem Description": "Copiar descripción del problema",
+  "Copy Reference": "Copiar referencia",
+  "Copy Revision Number": "Copiar número de revisión",
+  "Copy Revision Numbers": "Copiar números de revisión",
+  "Copy Rows as CSV": "Copiar filas como CSV",
+  "Copy Rows as TSV": "Copiar filas como TSV",
+  "Copy Stack": "Copiar pila",
+  "Copy Value": "Copiar valor",
+  "Copy as rich text by default": "Copiar como texto enriquecido de forma predeterminada",
+  "Copy revision number": "Copiar número de revisión",
+  "Copy to clipboard": "Copiar al portapapeles",
+  "Copy to clipboard on selection": "Copiar al portapapeles al seleccionar",
+  "Copy with Header": "Copiar con encabezado",
+  "Copy/Paste": "Copiar/Pegar",
+  "Could not apply theme": "No se pudo aplicar el tema",
+  "Could not clear caches": "No se pudieron limpiar los cachés",
+  "Could not fill the new file": "No se pudo rellenar el archivo nuevo",
+  "Could not install plugin": "No se pudo instalar el complemento",
+  "Could not invalidate caches": "No se pudieron invalidar los cachés",
+  "Could not open project": "No se pudo abrir el proyecto",
+  "Could not open the file picker": "No se pudo abrir el selector de archivos",
+  "Plugin package": "Paquete del complemento",
+  "Could not reach GitHub": "No se pudo conectar con GitHub",
+  "Could not save": "No se pudo guardar",
+  "Coverage": "Cobertura",
+  "Coverage is hidden in editors and the project view.": "La cobertura está oculta en los editores y en la vista del proyecto.",
+  "Coverage needs the desktop app": "La cobertura necesita la aplicación de escritorio",
+  "Coverage suites": "Conjuntos de cobertura",
+  "Create": "Crear",
+  "Create Branch": "Crear rama",
+  "Create New Branch": "Crear nueva rama",
+  "Create New Test…": "Crear nueva prueba…",
+  "Create Patch": "Crear parche",
+  "Create Patch…": "Crear parche…",
+  "Create Pull Request": "Crear pull request",
+  "Create Pull Request…": "Crear pull request…",
+  "Create Run Configuration": "Crear configuración de ejecución",
+  "Create Run Configuration…": "Crear configuración de ejecución…",
+  "Create Stash": "Crear stash",
+  "Create Tag": "Crear etiqueta",
+  "Create Terminal": "Crear terminal",
+  "Create Terminal in Container": "Crear terminal en el contenedor",
+  "Create UTF-8 files": "Crear archivos UTF-8",
+  "Creating virtual environment": "Creando entorno virtual",
+  "Current": "Actual",
+  "Current Branch": "Rama actual",
+  "Current File": "Archivo actual",
+  "Current date": "Fecha actual",
+  "Current window": "Ventana actual",
+  "Cursor shape": "Forma del cursor",
+  "Custom colour": "Color personalizado",
+  "Custom colour hex": "Hexadecimal del color personalizado",
+  "Customize": "Personalizar",
+  "Cut": "Cortar",
+  "Data Source": "Origen de datos",
+  "Data Source Properties…": "Propiedades del origen de datos…",
+  "Data Source from File…": "Origen de datos desde archivo…",
+  "Data Source from URL": "Origen de datos desde URL",
+  "Data Source from URL…": "Origen de datos desde URL…",
+  "Data Views": "Vistas de datos",
+  "Data class": "Clase de datos",
+  "Data source": "Origen de datos",
+  "Data source settings": "Configuración del origen de datos",
+  "Data sources": "Orígenes de datos",
+  "Data type": "Tipo de datos",
+  "Database": "Base de datos",
+  "Database actions": "Acciones de base de datos",
+  "Database output": "Salida de base de datos",
+  "Database:": "Base de datos:",
+  "Date": "Fecha",
+  "Date Formats": "Formatos de fecha",
+  "Date format": "Formato de fecha",
+  "Deactivate": "Desactivar",
+  "Debug": "Depurar",
+  "Debug Configuration": "Configuración de depuración",
+  "Debug Context Configuration": "Depurar configuración de contexto",
+  "Debug adapter": "Adaptador de depuración",
+  "Debug adapters & processes": "Adaptadores de depuración y procesos",
+  "Debug console": "Consola de depuración",
+  "Debug console input": "Entrada de la consola de depuración",
+  "Debug sessions": "Sesiones de depuración",
+  "Debug views": "Vistas de depuración",
+  "Debuggable configurations": "Configuraciones depurables",
+  "Debugger": "Depurador",
+  "Debugger actions": "Acciones del depurador",
+  "Debugger is not available": "El depurador no está disponible",
+  "Debugging": "Depuración",
+  "Debugging Java needs Microsoft java-debug, loaded into the Java language server. Install it and debug again once jdtls has restarted.": "Para depurar Java se necesita Microsoft java-debug cargado en el servidor de lenguaje Java. Instálalo y vuelve a depurar una vez que jdtls se haya reiniciado.",
+  "Debugging needs the desktop app": "La depuración necesita la aplicación de escritorio",
+  "Debug…": "Depurar…",
+  "Declaration or Usages": "Declaración o usos",
+  "Decoded text": "Texto decodificado",
+  "Decodes files outside the project that are not valid UTF-8.": "Decodifica archivos fuera del proyecto que no son UTF-8 válido.",
+  "Default": "Predeterminado",
+  "Default Directory": "Directorio predeterminado",
+  "Default Tab name": "Nombre de pestaña predeterminado",
+  "Default directory": "Directorio predeterminado",
+  "Default encoding": "Codificación predeterminada",
+  "Transparent native-to-ascii conversion": "Conversión transparente de nativo a ASCII",
+  "Default encoding for properties files": "Codificación predeterminada para archivos properties",
+  "Default value": "Valor predeterminado",
+  "Definition": "Definición",
+  "Delete": "Eliminar",
+  "Delete '{name}'?": "¿Eliminar '{name}'?",
+  "Delete '{name}' and its contents?": "¿Eliminar '{name}' y su contenido?",
+  "Delete {count} items?": "¿Eliminar {count} elementos?",
+  "Delete {count} items (including folder contents)?": "¿Eliminar {count} elementos (incluido el contenido de las carpetas)?",
+  "Items are moved to the Trash.": "Los elementos se mueven a la Papelera.",
+  "Delete Anyway": "Eliminar de todos modos",
+  "Delete Bookmark": "Eliminar marcador",
+  "Delete Branch": "Eliminar rama",
+  "Delete Changelist": "Eliminar lista de cambios",
+  "Delete Docker Object…": "Eliminar objeto de Docker…",
+  "Delete Keymap": "Eliminar mapa de teclado",
+  "Delete Remote Branch": "Eliminar rama remota",
+  "Delete Rows": "Eliminar filas",
+  "Delete Shelved Changes": "Eliminar cambios guardados en shelf",
+  "Delete all rows of": "Eliminar todas las filas de",
+  "Delete local copies of added files": "Eliminar copias locales de los archivos agregados",
+  "Deleted": "Eliminado",
+  "Delete…": "Eliminar…",
+  "Description": "Descripción",
+  "Details": "Detalles",
+  "Detect again": "Detectar de nuevo",
+  "Detect and use existing file indents for editing": "Detectar y usar las sangrías existentes del archivo para editar",
+  "Detected from the project. Changes are saved as a user configuration that overrides it.": "Detectado a partir del proyecto. Los cambios se guardan como una configuración de usuario que la reemplaza.",
+  "Detected from the toolchain": "Detectado a partir de la cadena de herramientas",
+  "Detecting installations": "Detectando instalaciones",
+  "Detecting…": "Detectando…",
+  "Diff": "Diferencias",
+  "Different tool window background": "Fondo diferente para las ventanas de herramientas",
+  "Direction": "Dirección",
+  "Directory": "Directorio",
+  "Staging State": "Estado de preparación (stage)",
+  "Staged Changes": "Cambios preparados (staged)",
+  "Unstaged Changes": "Cambios sin preparar (unstaged)",
+  "Directory (relative to project root)": "Directorio (relativo a la raíz del proyecto)",
+  "Directory Mappings": "Asignaciones de directorios",
+  "Directory mappings": "Asignaciones de directorios",
+  "Directory of the current file": "Directorio del archivo actual",
+  "Directory of the current file relative to the project": "Directorio del archivo actual relativo al proyecto",
+  "Directory to Clone Into": "Directorio donde clonar",
+  "Directory:": "Directorio:",
+  "Disable": "Deshabilitar",
+  "Disable All Downloaded Plugins": "Deshabilitar todos los complementos descargados",
+  "Disabled": "Deshabilitado",
+  "Dismiss": "Descartar",
+  "Display balloon notifications": "Mostrar notificaciones en globo",
+  "Display icons in menu items": "Mostrar iconos en los elementos de menú",
+  "Distinguish projects with different colors in the main toolbar": "Distinguir proyectos con diferentes colores en la barra de herramientas principal",
+  "Distraction free mode text width:": "Ancho del texto en el modo sin distracciones:",
+  "Do Refactor": "Refactorizar",
+  "Do not add": "No agregar",
+  "Do not ask again": "No volver a preguntar",
+  "Do not highlight": "No resaltar",
+  "Do not ignore": "No ignorar",
+  "Do not remove": "No quitar",
+  "Do not step into library scripts": "No entrar en scripts de bibliotecas",
+  "Docker is not installed": "Docker no está instalado",
+  "Docker is not running": "Docker no se está ejecutando",
+  "Documentation": "Documentación",
+  "Documentation comments": "Comentarios de documentación",
+  "Does not apply cleanly": "No se aplica limpiamente",
+  "Does not apply cleanly: a 3-way merge will be attempted": "No se aplica limpiamente: se intentará una fusión de 3 vías",
+  "Don't ask again": "No volver a preguntar",
+  "Done": "Listo",
+  "Down": "Abajo",
+  "Downloaded": "Descargados",
+  "Download…": "Descargar…",
+  "Drag-and-drop with Alt pressed only": "Arrastrar y soltar solo con Alt presionado",
+  "Driver": "Controlador",
+  "Driver:": "Controlador:",
+  "Drop": "Eliminar",
+  "Drop Column": "Eliminar columna",
+  "Drop Commit": "Descartar confirmación",
+  "Drop Commits": "Descartar confirmaciones",
+  "Drop Stash": "Descartar stash",
+  "Drop a folder to open it as a project, or files to edit them": "Suelta una carpeta para abrirla como proyecto, o archivos para editarlos",
+  "Drop files here to open them": "Suelta archivos aquí para abrirlos",
+  "Drop syntax trees and EditorConfig caches, compact the index": "Descartar árboles de sintaxis y cachés de EditorConfig, compactar el índice",
+  "Drop…": "Eliminar…",
+  "Duplicate": "Duplicar",
+  "Duplicate Keymap": "Duplicar mapa de teclado",
+  "Duplicate groups": "Grupos de duplicados",
+  "Duplicates": "Duplicados",
+  "Duplicate…": "Duplicar…",
+  "Edit": "Editar",
+  "Edit Cell": "Editar celda",
+  "Edit Changelist": "Editar lista de cambios",
+  "Edit Changelist…": "Editar lista de cambios…",
+  "Edit Commit Message…": "Editar mensaje de confirmación…",
+  "Edit Configurations…": "Editar configuraciones…",
+  "Edit Configuration…": "Editar configuración…",
+  "Edit Data": "Editar datos",
+  "Edit the configuration that would run the context before saving it": "Editar la configuración que ejecutaría el contexto antes de guardarla",
+  "Editor": "Editor",
+  "Editor Actions": "Acciones del editor",
+  "Editor Tabs": "Pestañas del editor",
+  "Editor color scheme": "Esquema de colores del editor",
+  "Editor resynchronised": "Editor resincronizado",
+  "Editor tabs": "Pestañas del editor",
+  "Editor › Font": "Editor › Fuente",
+  "Editor › General": "Editor › General",
+  "Effect": "Efecto",
+  "Effect color": "Color del efecto",
+  "Effects": "Efectos",
+  "Element": "Elemento",
+  "Empty": "Vacío",
+  "Empty file": "Archivo vacío",
+  "Enable All Downloaded Plugins": "Habilitar todos los complementos descargados",
+  "Enable EditorConfig support": "Habilitar compatibilidad con EditorConfig",
+  "Enable Settings › Build, Execution, Deployment › Debugger › Allow placing breakpoints in any file.": "Habilita Configuración › Compilación, ejecución, implementación › Depurador › Permitir colocar puntos de interrupción en cualquier archivo.",
+  "Enable drag-and-drop functionality in editor": "Habilitar la funcionalidad de arrastrar y soltar en el editor",
+  "Enable ligatures": "Habilitar ligaduras",
+  "Enable postfix completion": "Habilitar completado posfijo",
+  "Enable preview tab": "Habilitar pestaña de vista previa",
+  "Enable when debugging code that uses gevent monkey-patching.": "Habilítalo al depurar código que utilice monkey-patching de gevent.",
+  "Enabled": "Habilitado",
+  "Enabled tools appear in Find Action (⇧⌘A) under “External Tools” and can get shortcuts in Keymap. Output is shown in the Run tool window.": "Las herramientas habilitadas aparecen en Buscar acción (⇧⌘A) bajo “Herramientas externas” y se les pueden asignar atajos en el Mapa de teclado. La salida se muestra en la ventana de herramientas Ejecutar.",
+  "Encoding of the output of processes started from Run configurations.": "Codificación de la salida de los procesos iniciados desde las configuraciones de ejecución.",
+  "Enhanced for loop": "Bucle for mejorado",
+  "Ensure every saved file ends with a line break": "Asegurar que cada archivo guardado termine con un salto de línea",
+  "Enter a positive number of commits": "Ingresa un número positivo de confirmaciones",
+  "Enter a tag, branch or commit hash:": "Ingresa una etiqueta, rama o hash de confirmación:",
+  "Enter the name of new tag:": "Ingresa el nombre de la nueva etiqueta:",
+  "Enum": "Enum",
+  "Enum class": "Clase enum",
+  "Environment": "Entorno",
+  "Environment variables": "Variables de entorno",
+  "Error Highlighting": "Resaltado de errores",
+  "Evaluate": "Evaluar",
+  "Evaluate Expression…": "Evaluar expresión…",
+  "Evaluate expression": "Evaluar expresión",
+  "Evaluate expression (↩) or add a watch (⇧⌘↩)": "Evaluar expresión (↩) o agregar una expresión de inspección (⇧⌘↩)",
+  "Evaluate in the debug console": "Evaluar en la consola de depuración",
+  "Evaluation result": "Resultado de la evaluación",
+  "Everything is up to date": "Todo está actualizado",
+  "Exception Breakpoints": "Puntos de interrupción de excepción",
+  "Exception breakpoints": "Puntos de interrupción de excepción",
+  "Exclude": "Excluir",
+  "Exclude / include (⌫)": "Excluir / incluir (⌫)",
+  "Exclude patterns": "Patrones de exclusión",
+  "Excluded": "Excluido",
+  "Excluded Folders": "Carpetas excluidas",
+  "Excluded usages are skipped.": "Los usos excluidos se omiten.",
+  "Execute": "Ejecutar",
+  "Execute Gradle Task…": "Ejecutar tarea de Gradle…",
+  "Execute Maven Goal…": "Ejecutar objetivo de Maven…",
+  "Execute SQL Statement": "Ejecutar instrucción SQL",
+  "Execute a statement in a query console with ⌘↩.": "Ejecuta una instrucción en una consola de consultas con ⌘↩.",
+  "Existing changelist": "Lista de cambios existente",
+  "Existing changelist:": "Lista de cambios existente:",
+  "Existing environment": "Entorno existente",
+  "Exit": "Salir",
+  "Expand": "Expandir",
+  "Expand All": "Expandir todo",
+  "Expand abbreviations with Tab": "Expandir abreviaturas con Tab",
+  "Expand folded lines": "Expandir líneas plegadas",
+  "Expand templates with Tab": "Expandir plantillas con Tab",
+  "Explicitly check for incoming commits on remotes": "Comprobar explícitamente si hay confirmaciones entrantes en los remotos",
+  "Export Data": "Exportar datos",
+  "Expression": "Expresión",
+  "Expression to evaluate in the selected frame": "Expresión a evaluar en el marco seleccionado",
+  "Expressions": "Expresiones",
+  "Extension": "Extensión",
+  "Extension of the current file": "Extensión del archivo actual",
+  "External Linters": "Linters externos",
+  "External Tools": "Herramientas externas",
+  "External tool": "Herramienta externa",
+  "External tools": "Herramientas externas",
+  "External tools actions": "Acciones de herramientas externas",
+  "Extract Method…": "Extraer método…",
+  "Failed to install {name}": "Error al instalar {name}",
+  "Failed to uninstall {name}": "Error al desinstalar {name}",
+  "FIXME comment": "Comentario FIXME",
+  "Failed": "Falló",
+  "Failed to restart language server": "Error al reiniciar el servidor de lenguaje",
+  "Fallback font": "Fuente de respaldo",
+  "Fallback font:": "Fuente de respaldo:",
+  "Fetch": "Fetch",
+  "Fetches remotes in the background so incoming commits show in the Branches popup. Auto stops after an authentication failure.": "Obtiene los remotos en segundo plano para que las confirmaciones entrantes aparezcan en la ventana emergente Ramas. El modo Automático se detiene tras un fallo de autenticación.",
+  "Field access": "Acceso a campo",
+  "Field modification": "Modificación de campo",
+  "Field watchpoints can be set on Java field declarations, or from the Variables view while suspended.": "Los puntos de observación de campo se pueden establecer en declaraciones de campos de Java o desde la vista Variables mientras está suspendido.",
+  "File": "Archivo",
+  "File Encoding": "Codificación de archivo",
+  "File Encodings": "Codificaciones de archivos",
+  "File Encodings Settings…": "Configuración de codificaciones de archivos…",
+  "File Name": "Nombre del archivo",
+  "File Structure": "Estructura del archivo",
+  "File Types": "Tipos de archivo",
+  "File and Code Templates": "Plantillas de archivos y código",
+  "File encoding": "Codificación del archivo",
+  "File header": "Encabezado de archivo",
+  "File mask": "Máscara de archivo",
+  "File mask:": "Máscara de archivo:",
+  "File name": "Nombre del archivo",
+  "File name style": "Estilo de nombre de archivo",
+  "File name with extension": "Nombre del archivo con extensión",
+  "File name without extension": "Nombre del archivo sin extensión",
+  "File not found": "Archivo no encontrado",
+  "File patterns": "Patrones de archivo",
+  "File templates": "Plantillas de archivo",
+  "File:": "Archivo:",
+  "Files": "Archivos",
+  "Files to include": "Archivos a incluir",
+  "Files to roll back": "Archivos a revertir",
+  "Files to shelve": "Archivos para guardar en shelf",
+  "Files will be reverted to the state of the selected commit, but local changes will be kept intact.": "Los archivos se revertirán al estado de la confirmación seleccionada, pero los cambios locales se mantendrán intactos.",
+  "Files will be reverted to the state of the selected commit. Warning: any local changes will be lost.": "Los archivos se revertirán al estado de la confirmación seleccionada. Advertencia: se perderán todos los cambios locales.",
+  "Files won't change, differences will be staged for commit.": "Los archivos no cambiarán; las diferencias se prepararán (staged) para confirmar.",
+  "Files won't change, differences won't be staged.": "Los archivos no cambiarán; las diferencias no se prepararán (staged).",
+  "Filter": "Filtrar",
+  "Filter TODO Items": "Filtrar elementos TODO",
+  "Filter by Branch": "Filtrar por rama",
+  "Filter by Date": "Filtrar por fecha",
+  "Filter by User": "Filtrar por usuario",
+  "Filter by message": "Filtrar por mensaje",
+  "Filter by name, PID or command line": "Filtrar por nombre, PID o línea de comandos",
+  "Filter by tool or language": "Filtrar por herramienta o lenguaje",
+  "Filter language servers": "Filtrar servidores de lenguaje",
+  "Filter plugins": "Filtrar complementos",
+  "Filter processes": "Filtrar procesos",
+  "Filter recent files": "Filtrar archivos recientes",
+  "Filter recent locations": "Filtrar ubicaciones recientes",
+  "Filter symbols": "Filtrar símbolos",
+  "Filter templates": "Filtrar plantillas",
+  "Find": "Buscar",
+  "Find Actions by Shortcut": "Buscar acciones por atajo",
+  "Find Action…": "Buscar acción…",
+  "Find Next Occurrence": "Buscar siguiente coincidencia",
+  "Find Previous Occurrence": "Buscar coincidencia anterior",
+  "Find Usages": "Buscar usos",
+  "Find Usages of File": "Buscar usos del archivo",
+  "Find actions by shortcut": "Buscar acciones por atajo",
+  "Find in Directory…": "Buscar en directorio…",
+  "Find in Files": "Buscar en archivos",
+  "Find in Files…": "Buscar en archivos…",
+  "Find in Folder…": "Buscar en carpeta…",
+  "Find in Terminal": "Buscar en la terminal",
+  "Find in console": "Buscar en la consola",
+  "Find in file": "Buscar en el archivo",
+  "Find in terminal": "Buscar en la terminal",
+  "Find results": "Resultados de búsqueda",
+  "Find…": "Buscar…",
+  "First letter only": "Solo la primera letra",
+  "First stroke": "Primera combinación de teclas",
+  "First stroke:": "Primera combinación de teclas:",
+  "Fix the highlighted fields": "Corrige los campos resaltados",
+  "Flame Graph": "Gráfico de llamas",
+  "Flame graph": "Gráfico de llamas",
+  "Focus Editor": "Enfocar el editor",
+  "Focus application on breakpoint": "Enfocar la aplicación en el punto de interrupción",
+  "Fold Selection / Remove Region": "Plegar selección / Quitar región",
+  "Fold by default:": "Plegar de forma predeterminada:",
+  "Fold console lines that contain": "Plegar líneas de la consola que contengan",
+  "Folding": "Plegado",
+  "Font": "Fuente",
+  "Font preview": "Vista previa de la fuente",
+  "For protanopia and deuteranopia.": "Para protanopía y deuteranopía.",
+  "For symbols not supported by the main font": "Para símbolos no admitidos por la fuente principal",
+  "Force": "Forzar",
+  "Force (with lease)": "Forzar (con lease)",
+  "Force Push": "Push forzado",
+  "Force Run to Cursor": "Forzar ejecución hasta el cursor",
+  "Force Step Into": "Forzar paso adentro",
+  "Force Step Over": "Forzar paso por encima",
+  "Foreground": "Primer plano",
+  "Formats the whole file with the language server's formatter.": "Formatea todo el archivo con el formateador del servidor de lenguaje.",
+  "Forward": "Adelante",
+  "Found usages": "Usos encontrados",
+  "Fragment": "Fragmento",
+  "Frames": "Marcos",
+  "From Template…": "Desde plantilla…",
+  "From settings.xml, else ~/.m2/repository": "De settings.xml; si no, ~/.m2/repository",
+  "From:": "De:",
+  "Function": "Función",
+  "Function component": "Componente de función",
+  "Function with return type": "Función con tipo de retorno",
+  "Functions:": "Funciones:",
+  "General": "General",
+  "Generate": "Generar",
+  "Generate DDL to Clipboard": "Generar DDL al portapapeles",
+  "Generate DDL to Query Console": "Generar DDL a la consola de consultas",
+  "Generate Request in HTTP Client": "Generar solicitud en el cliente HTTP",
+  "Generate Requests for Controller": "Generar solicitudes para el controlador",
+  "Generate…": "Generar…",
+  "Get from Version Control…": "Obtener del control de versiones…",
+  "Gevent compatible": "Compatible con gevent",
+  "Git Branches": "Ramas de Git",
+  "Git Log": "Registro de Git",
+  "Git Reset": "Git Reset",
+  "Git commands run by the IDE appear here.": "Los comandos de Git ejecutados por el IDE aparecen aquí.",
+  "Git console": "Consola de Git",
+  "GitHub CLI is not installed": "GitHub CLI no está instalado",
+  "Gliding": "Deslizante",
+  "Glob patterns (e.g. **/dist, *.log) hidden from the project tree and skipped by search and indexing.": "Patrones glob (p. ej., **/dist, *.log) ocultos del árbol del proyecto y omitidos en la búsqueda e indexación.",
+  "Global Encoding": "Codificación global",
+  "Go SDK used by gopls and the go run / test configurations.": "SDK de Go usado por gopls y las configuraciones de ejecución y prueba de go.",
+  "Go To": "Ir a",
+  "Go to Child Commit": "Ir a la confirmación hija",
+  "Go to Class…": "Ir a clase…",
+  "Go to DDL": "Ir a DDL",
+  "Go to File": "Ir a archivo",
+  "Go to File…": "Ir a archivo…",
+  "Go to Line:Column": "Ir a línea:columna",
+  "Go to Line:Column…": "Ir a línea:columna…",
+  "Go to Parent Commit": "Ir a la confirmación padre",
+  "Go to Referenced Table": "Ir a la tabla referenciada",
+  "Go to Source": "Ir al código fuente",
+  "Go to Symbol…": "Ir a símbolo…",
+  "Gradle actions": "Acciones de Gradle",
+  "Gradle command line": "Línea de comandos de Gradle",
+  "Gradle projects": "Proyectos Gradle",
+  "Gradle sync failed": "Falló la sincronización de Gradle",
+  "Green": "Verde",
+  "Grey": "Gris",
+  "Greyscale": "Escala de grises",
+  "Group": "Grupo",
+  "Group by Severity": "Agrupar por gravedad",
+  "Groups": "Grupos",
+  "Gutter Icons": "Iconos del margen",
+  "HACK comment": "Comentario HACK",
+  "HEAD (Current Branch)": "HEAD (rama actual)",
+  "HTML 5 file": "Archivo HTML 5",
+  "HTTP Client": "Cliente HTTP",
+  "HTTP Client environments": "Entornos del cliente HTTP",
+  "Hard": "Estricto",
+  "Hard wrap at": "Ajuste de línea estricto en",
+  "Hello: Insert Date": "Hello: Insertar fecha",
+  "Hello: Word Count of Active File": "Hello: Conteo de palabras del archivo activo",
+  "Help": "Ayuda",
+  "Hex view": "Vista hexadecimal",
+  "Hide": "Ocultar",
+  "Hide Active Tool Window": "Ocultar ventana de herramientas activa",
+  "Hide All Tool Windows": "Ocultar todas las ventanas de herramientas",
+  "Hide changes": "Ocultar cambios",
+  "Hide Coverage": "Ocultar cobertura",
+  "Hide Library Frames": "Ocultar marcos de bibliotecas",
+  "Hide Replace": "Ocultar reemplazar",
+  "Hide debug window on process termination": "Ocultar ventana de depuración al terminar el proceso",
+  "Auto-detect": "Detectar automáticamente",
+  "Hide install log": "Ocultar registro de instalación",
+  "Hierarchies": "Jerarquías",
+  "Hierarchy": "Jerarquía",
+  "Hierarchy actions": "Acciones de jerarquía",
+  "High Contrast": "Alto contraste",
+  "Highlight hyperlinks": "Resaltar hipervínculos",
+  "Highlight lines": "Resaltar líneas",
+  "Highlight on Caret Movement": "Resaltar al mover el cursor",
+  "Highlight words": "Resaltar palabras",
+  "Highlighting": "Resaltado",
+  "Hit count": "Conteo de aciertos",
+  "Hit count condition": "Condición de conteo de aciertos",
+  "Home moves caret to first non-whitespace character": "Inicio mueve el cursor al primer carácter que no sea espacio en blanco",
+  "Homepage": "Página de inicio",
+  "Host:": "Host:",
+  "Hot Swap": "Hot Swap",
+  "Hot Swap failed": "Falló Hot Swap",
+  "HotSwap: compile and reload the changed classes into the running Java debug session": "HotSwap: compilar y recargar las clases modificadas en la sesión de depuración de Java en ejecución",
+  "Hovering a variable while suspended evaluates it in the selected frame.": "Al pasar el cursor sobre una variable mientras está suspendido, se evalúa en el marco seleccionado.",
+  "IDE Updates": "Actualizaciones del IDE",
+  "IDE and Project Settings": "Configuración del IDE y del proyecto",
+  "IDE font": "Fuente del IDE",
+  "IDE font size": "Tamaño de fuente del IDE",
+  "Installed {name} {version}": "{name} {version} instalado",
+  "Installing {name}": "Instalando {name}",
+  "IPC round trip": "Viaje de ida y vuelta de IPC",
+  "Already ignored": "Ya ignorado",
+  "Idle seconds": "Segundos de inactividad",
+  "Ignore files and folders": "Ignorar archivos y carpetas",
+  "Ignore whitespace": "Ignorar espacios en blanco",
+  "Ignore whitespaces": "Ignorar espacios en blanco",
+  "Ignore whitespaces and empty lines": "Ignorar espacios en blanco y líneas vacías",
+  "Ignored": "Ignorado",
+  "Ignored Files and Folders": "Archivos y carpetas ignorados",
+  "Ignored names": "Nombres ignorados",
+  "Image": "Imagen",
+  "Image viewer": "Visor de imágenes",
+  "Implement Members": "Implementar miembros",
+  "Implementation(s)": "Implementación(es)",
+  "Imports": "Importaciones",
+  "In Project": "En el proyecto",
+  "Include": "Incluir",
+  "Include non-project items": "Incluir elementos fuera del proyecto",
+  "Include untracked files": "Incluir archivos sin seguimiento",
+  "Incoming commits": "Confirmaciones entrantes",
+  "Indent": "Aplicar sangría",
+  "Indent Block": "Aplicar sangría al bloque",
+  "Indent Each Line": "Aplicar sangría a cada línea",
+  "Collapse Recursively": "Contraer recursivamente",
+  "Expand Recursively": "Expandir recursivamente",
+  "Move Caret to Matching Brace": "Mover cursor a la llave coincidente",
+  "Toggle Insert/Overwrite": "Alternar insertar/sobrescribir",
+  "Indentation": "Sangría",
+  "Indents Detection": "Detección de sangrías",
+  "Index": "Índice",
+  "Index (indexing…)": "Índice (indexando…)",
+  "Indexed for loop": "Bucle for indexado",
+  "Indexing": "Indexación",
+  "Inlay Hints": "Sugerencias incrustadas",
+  "Inline…": "Integrar en línea…",
+  "Inner": "Interno",
+  "Insert Live Template…": "Insertar plantilla activa…",
+  "Insert Macro…": "Insertar macro…",
+  "Insert pair quote": "Insertar comilla de cierre automáticamente",
+  "Insert selected suggestion by pressing space, dot, or other context-dependent keys": "Insertar sugerencia seleccionada al presionar espacio, punto u otras teclas dependientes del contexto",
+  "Inspect": "Inspeccionar",
+  "Inspect Code": "Inspeccionar código",
+  "Inspect Code…": "Inspeccionar código…",
+  "Inspect Docker Object": "Inspeccionar objeto de Docker",
+  "Inspecting…": "Inspeccionando…",
+  "Inspection Results": "Resultados de la inspección",
+  "Inspection progress": "Progreso de la inspección",
+  "Inspection results": "Resultados de la inspección",
+  "Install": "Instalar",
+  "Install Docker Desktop, OrbStack, Colima or the Docker Engine and make sure": "Instala Docker Desktop, OrbStack, Colima o Docker Engine y asegúrate de que",
+  "Install Language Server / Debugger": "Instalar servidor de lenguaje / depurador",
+  "Install Package": "Instalar paquete",
+  "Install Plugin from Disk": "Instalar complemento desde el disco",
+  "Install Plugin from Disk…": "Instalar complemento desde el disco…",
+  "Install a plugin folder with": "Instala una carpeta de complemento con",
+  "Install and Debug": "Instalar y depurar",
+  "Install gh…": "Instalar gh…",
+  "Installed": "Instalados",
+  "Installed packages": "Paquetes instalados",
+  "Installed plugins": "Complementos instalados",
+  "Installing plugin": "Instalando complemento",
+  "Intentions": "Acciones de intención",
+  "Interactively Rebase from Here…": "Hacer rebase interactivo desde aquí…",
+  "Interface": "Interfaz",
+  "Interface type": "Tipo de interfaz",
+  "Interpreter": "Intérprete",
+  "Interpreter type": "Tipo de intérprete",
+  "Interpreter:": "Intérprete:",
+  "Introduce Constant…": "Introducir constante…",
+  "Introduce Field…": "Introducir campo…",
+  "Introduce Parameter…": "Introducir parámetro…",
+  "Introduce Variable…": "Introducir variable…",
+  "Invalid": "No válido",
+  "Invalidate Caches": "Invalidar cachés",
+  "Invalidate Caches…": "Invalidar cachés…",
+  "Invalidate and Restart": "Invalidar y reiniciar",
+  "Islands Dark": "Islands Dark",
+  "Islands Light": "Islands Light",
+  "Issue ID": "ID de incidencia",
+  "Issue Link": "Enlace de incidencia",
+  "Issue Navigation": "Navegación de incidencias",
+  "Issue navigation": "Navegación de incidencias",
+  "Issue navigation links": "Enlaces de navegación de incidencias",
+  "Italic": "Cursiva",
+  "JUnit 5 Test": "Prueba de JUnit 5",
+  "JUnit test": "Prueba de JUnit",
+  "JVM options": "Opciones de JVM",
+  "Jump outside closing bracket/quote with Tab": "Saltar fuera del corchete/comilla de cierre con Tab",
+  "Jump to Last Tool Window": "Ir a la última ventana de herramientas",
+  "Jump to Navigation Bar": "Ir a la barra de navegación",
+  "Jump to Query Console…": "Ir a la consola de consultas…",
+  "Jump to Source": "Ir al código fuente",
+  "Just Restart": "Solo reiniciar",
+  "Keep": "Conservar",
+  "Keep Tab Open": "Mantener pestaña abierta",
+  "Keep Column": "Conservar columna",
+  "Keep index": "Conservar índice",
+  "Keep local history for": "Conservar historial local durante",
+  "Keep trailing spaces on caret line": "Conservar espacios finales en la línea del cursor",
+  "Key pair": "Par de claves",
+  "Keymap": "Mapa de teclado",
+  "Keymap:": "Mapa de teclado:",
+  "Keymap…": "Mapa de teclado…",
+  "Keys are recorded as pressed, including Tab and Esc. Use the buttons to finish.": "Las teclas se graban tal como se presionan, incluidos Tab y Esc. Usa los botones para terminar.",
+  "Keystroke → paint": "Pulsación de tecla → pintado",
+  "Keystroke-to-paint latency, IPC round trips and long tasks": "Latencia de pulsación de tecla a pintado, viajes de ida y vuelta de IPC y tareas largas",
+  "Keyword": "Palabra clave",
+  "Kind": "Tipo",
+  "Kind label": "Etiqueta de tipo",
+  "Kinds": "Tipos",
+  "Label name:": "Nombre de la etiqueta:",
+  "Language": "Idioma",
+  "Language Defaults": "Valores predeterminados del lenguaje",
+  "Language Server": "Servidor de lenguaje",
+  "Language server '{name}' is not installed": "El servidor de lenguaje '{name}' no está instalado",
+  "Language Servers": "Servidores de lenguaje",
+  "Language Servers…": "Servidores de lenguaje…",
+  "Language Services": "Servicios de lenguaje",
+  "Language and Region": "Idioma y región",
+  "Language servers": "Servidores de lenguaje",
+  "Language servers and debug adapters": "Servidores de lenguaje y adaptadores de depuración",
+  "Language support for .toy files: detection, comments and indentation.": "Compatibilidad de lenguaje para archivos .toy: detección, comentarios y sangría.",
+  "Languages": "Lenguajes",
+  "Languages & Frameworks": "Lenguajes y frameworks",
+  "Last 24 Hours": "Últimas 24 horas",
+  "Last 30 Days": "Últimos 30 días",
+  "Last 7 Days": "Últimos 7 días",
+  "Last Edit Location": "Última ubicación de edición",
+  "Last Year": "Último año",
+  "Last commit": "Última confirmación",
+  "Leading": "Interlineado",
+  "Leave": "Salir",
+  "Left Bottom": "Izquierda inferior",
+  "Left Top": "Izquierda superior",
+  "LightEdit": "LightEdit",
+  "Limit body line": "Limitar línea del cuerpo",
+  "Limit history to": "Limitar historial a",
+  "Limit subject line": "Limitar línea de asunto",
+  "Line Separator": "Separador de línea",
+  "Line and column": "Línea y columna",
+  "Line height": "Altura de línea",
+  "Line separator": "Separador de línea",
+  "Line, %": "Línea, %",
+  "Line:Column Number": "Número de línea:columna",
+  "Live Templates": "Plantillas activas",
+  "Live templates": "Plantillas activas",
+  "Loaded classes are up to date. Nothing to reload.": "Las clases cargadas están actualizadas. No hay nada que recargar.",
+  "Loading packages": "Cargando paquetes",
+  "Loading packages…": "Cargando paquetes…",
+  "Loading plugins": "Cargando complementos",
+  "Loading processes…": "Cargando procesos…",
+  "Loading…": "Cargando…",
+  "Local": "Local",
+  "Local History": "Historial local",
+  "Local History of all projects will be deleted.": "Se eliminará el Historial local de todos los proyectos.",
+  "Local History: Put Label…": "Historial local: Poner etiqueta…",
+  "Local History: Show History": "Historial local: Mostrar historial",
+  "Local repository": "Repositorio local",
+  "Locate Duplicates": "Localizar duplicados",
+  "Locate Duplicates…": "Localizar duplicados…",
+  "Location": "Ubicación",
+  "Location:": "Ubicación:",
+  "Log": "Registro",
+  "Log filters": "Filtros de registro",
+  "Long tasks": "Tareas largas",
+  "Looking for references…": "Buscando referencias…",
+  "Finding navigation target…": "Buscando destino de navegación…",
+  "Looks for TODO and FIXME in added lines.": "Busca TODO y FIXME en las líneas agregadas.",
+  "Macros": "Macros",
+  "Main Menu": "Menú principal",
+  "Make File Read-only": "Hacer que el archivo sea de solo lectura",
+  "Make File Writable": "Hacer que el archivo sea editable",
+  "Make Read-only": "Hacer de solo lectura",
+  "Make Writable": "Hacer editable",
+  "Make another changelist active first.": "Primero activa otra lista de cambios.",
+  "Manage": "Administrar",
+  "Manage Plugins": "Administrar complementos",
+  "Mark Directory as": "Marcar directorio como",
+  "Mark Resolved": "Marcar como resuelto",
+  "Mark as": "Marcar como",
+  "Mark as:": "Marcar como:",
+  "Mark modified (*)": "Marcar modificados (*)",
+  "Markdown editor layout": "Diseño del editor de Markdown",
+  "Markdown file": "Archivo Markdown",
+  "Markdown preview": "Vista previa de Markdown",
+  "Marked folders": "Carpetas marcadas",
+  "Match Case": "Distinguir mayúsculas y minúsculas",
+  "Match case:": "Distinguir mayúsculas y minúsculas:",
+  "Matched brace": "Llave coincidente",
+  "Matches": "Coincidencias",
+  "Maven actions": "Acciones de Maven",
+  "Maven command line": "Línea de comandos de Maven",
+  "Maven Daemon home path": "Ruta de inicio de Maven Daemon",
+  "Maven home path": "Ruta de inicio de Maven",
+  "Maven projects": "Proyectos Maven",
+  "Maven Settings…": "Configuración de Maven…",
+  "Maven sync finished with errors": "La sincronización de Maven terminó con errores",
+  "Maven wrapper, else mvn on PATH": "Maven Wrapper; si no, mvn en PATH",
+  "MVND_HOME, else auto-detected": "MVND_HOME; si no, detectado automáticamente",
+  "Maximize": "Maximizar",
+  "Maximize Tool Window": "Maximizar ventana de herramientas",
+  "Maximum local history size per project": "Tamaño máximo del historial local por proyecto",
+  "Maximum number of lines": "Número máximo de líneas",
+  "Memory Indicator": "Indicador de memoria",
+  "Memory and diagnostics": "Memoria y diagnósticos",
+  "Merge": "Fusionar",
+  "Merge and Push": "Fusionar y hacer push",
+  "Merge conflicts": "Conflictos de fusión",
+  "Merge incoming changes into the current branch": "Fusionar los cambios entrantes en la rama actual",
+  "Merge…": "Fusionar…",
+  "Message:": "Mensaje:",
+  "Method": "Método",
+  "Method List": "Lista de métodos",
+  "Method name": "Nombre del método",
+  "Mine": "Míos",
+  "Minimize": "Minimizar",
+  "Minimum duplicate size in tokens": "Tamaño mínimo de duplicados en tokens",
+  "Minimum size": "Tamaño mínimo",
+  "Mixed": "Mixto",
+  "Modified": "Modificado",
+  "Modified lines": "Líneas modificadas",
+  "Modify Column…": "Modificar columna…",
+  "Modify Run Configuration…": "Modificar configuración de ejecución…",
+  "Modify Table…": "Modificar tabla…",
+  "Module": "Módulo",
+  "More": "Más",
+  "More Filters": "Más filtros",
+  "More Actions": "Más acciones",
+  "More Run/Debug": "Más de Ejecutar/Depurar",
+  "More Terminal Options": "Más opciones de terminal",
+  "More Tool Windows": "Más ventanas de herramientas",
+  "Most recently opened tab": "Pestaña abierta más recientemente",
+  "Mouse Control": "Control del mouse",
+  "Mouse reporting": "Reporte del mouse",
+  "Move": "Mover",
+  "Move Changes to Another Changelist": "Mover cambios a otra lista de cambios",
+  "Move Down": "Mover hacia abajo",
+  "Move File…": "Mover archivo…",
+  "Move To": "Mover a",
+  "Move Up": "Mover hacia arriba",
+  "Move to Another Changelist…": "Mover a otra lista de cambios…",
+  "Move to Opposite Group": "Mover al grupo opuesto",
+  "Move…": "Mover…",
+  "Multiple occurrences found": "Se encontraron múltiples coincidencias",
+  "Mute Breakpoints": "Silenciar puntos de interrupción",
+  "Mute breakpoints": "Silenciar puntos de interrupción",
+  "Name": "Nombre",
+  "Name for the new constant": "Nombre para la nueva constante",
+  "Name for the new variable": "Nombre para la nueva variable",
+  "Name of the current file": "Nombre del archivo actual",
+  "Name:": "Nombre:",
+  "Named scope": "Ámbito con nombre",
+  "Names (e.g. .DS_Store, *.pyc) hidden from the project tree, navigation bar, search, indexing and Git changes.": "Nombres (p. ej., .DS_Store, *.pyc) ocultos del árbol del proyecto, barra de navegación, búsqueda, indexación y cambios de Git.",
+  "Narrow down on typing": "Filtrar al escribir",
+  "Navigate": "Navegar",
+  "Navigation": "Navegación",
+  "Navigation Bar": "Barra de navegación",
+  "Navigation bar": "Barra de navegación",
+  "Never": "Nunca",
+  "New": "Nuevo",
+  "New Branch…": "Nueva rama…",
+  "New Changelist": "Nueva lista de cambios",
+  "New Changelist…": "Nueva lista de cambios…",
+  "New Data Source": "Nuevo origen de datos",
+  "New Data Source…": "Nuevo origen de datos…",
+  "New Directory": "Nuevo directorio",
+  "New Empty File…": "Nuevo archivo vacío…",
+  "New File": "Nuevo archivo",
+  "New HTTP Request": "Nueva solicitud HTTP",
+  "New Scratch File": "Nuevo archivo de borrador",
+  "New Scratch File…": "Nuevo archivo de borrador…",
+  "New Tab": "Nueva pestaña",
+  "New Tag…": "Nueva etiqueta…",
+  "New Terminal Tab": "Nueva pestaña de terminal",
+  "New branch name:": "Nombre de la nueva rama:",
+  "New changelist:": "Nueva lista de cambios:",
+  "New environment": "Nuevo entorno",
+  "New file from template": "Nuevo archivo desde plantilla",
+  "New from Template…": "Nuevo desde plantilla…",
+  "New kind": "Nuevo tipo",
+  "New name": "Nuevo nombre",
+  "New terminal sessions run the interpreter's virtualenv activate script.": "Las nuevas sesiones de terminal ejecutan el script de activación de virtualenv del intérprete.",
+  "New window": "Nueva ventana",
+  "New…": "Nuevo…",
+  "Next Bookmark": "Siguiente marcador",
+  "Next Change": "Siguiente cambio",
+  "Next Conflict Marker": "Siguiente marcador de conflicto",
+  "Next Difference": "Siguiente diferencia",
+  "Next Edit Location": "Siguiente ubicación de edición",
+  "Next Occurrence": "Siguiente coincidencia",
+  "Next Page": "Siguiente página",
+  "Next error action goes to high priority problems only": "La acción Siguiente error va solo a problemas de alta prioridad",
+  "No coverage data for '{name}'": "Sin datos de cobertura para '{name}'",
+  "No Environment": "Sin entorno",
+  "No GitHub repository": "Sin repositorio de GitHub",
+  "No Gradle projects": "No hay proyectos de Gradle",
+  "No HTTP request at the caret": "No hay ninguna solicitud HTTP en el cursor",
+  "No Spring controller at the caret": "No hay ningún controlador de Spring en el cursor",
+  "No Spring request mapping at the caret": "No hay ningún mapeo de solicitud de Spring en el cursor",
+  "No Maven projects": "No hay proyectos de Maven",
+  "No profile for '{name}'": "No hay perfil para '{name}'",
+  "No Python found": "No se encontró Python",
+  "No recent repository URLs": "No hay URL de repositorios recientes",
+  "No recent searches": "No hay búsquedas recientes",
+  "No TODO items found": "No se encontraron elementos TODO",
+  "No TODO items in this file": "No hay elementos TODO en este archivo",
+  "No active editor": "No hay ningún editor activo",
+  "No antialiasing": "Sin suavizado de bordes",
+  "No backend caches to clear": "No hay cachés del backend para limpiar",
+  "No breakpoints. Click a line number to add one.": "No hay puntos de interrupción. Haz clic en un número de línea para agregar uno.",
+  "No build output": "Sin salida de compilación",
+  "No changes": "Sin cambios",
+  "No changes selected for commit": "No hay cambios seleccionados para confirmar",
+  "No changes to create a patch from": "No hay cambios para crear un parche",
+  "No changes to roll back": "No hay cambios para revertir",
+  "No changes to shelve": "No hay cambios para archivar en el shelf",
+  "No commits": "No hay confirmaciones",
+  "No conflicts": "Sin conflictos",
+  "No coverage data": "Sin datos de cobertura",
+  "No data sources": "No hay orígenes de datos",
+  "No debug session can reload classes": "Ninguna sesión de depuración puede recargar clases",
+  "No differences": "Sin diferencias",
+  "No document": "Sin documento",
+  "No duplicates found": "No se encontraron duplicados",
+  "No editor available": "No hay ningún editor disponible",
+  "No external tools. Click + to add one.": "No hay herramientas externas. Haz clic en + para agregar una.",
+  "No failed tests to rerun": "No hay pruebas fallidas para volver a ejecutar",
+  "No field declaration on this line": "No hay ninguna declaración de campo en esta línea",
+  "No file is open": "No hay ningún archivo abierto",
+  "No interpreter selected. Choose one above or add a new one.": "No se seleccionó ningún intérprete. Elige uno arriba o agrega uno nuevo.",
+  "No language server available": "No hay ningún servidor de lenguaje disponible",
+  "No languages": "No hay lenguajes",
+  "No local changes": "Sin cambios locales",
+  "No matches": "Sin coincidencias",
+  "No matching branches": "No hay ramas coincidentes",
+  "No matching languages": "No hay lenguajes coincidentes",
+  "No matching projects": "No hay proyectos coincidentes",
+  "No matching templates": "No hay plantillas coincidentes",
+  "No merge conflicts": "Sin conflictos de fusión",
+  "No merge, rebase, cherry-pick or revert in progress": "No hay ninguna fusión, rebase, cherry-pick o reversión en curso",
+  "No method declaration on this line": "No hay ninguna declaración de método en esta línea",
+  "No notifications": "No hay notificaciones",
+  "No occurrences found": "No se encontraron coincidencias",
+  "No patterns": "No hay patrones",
+  "No plugin selected": "No se seleccionó ningún plugin",
+  "No popup": "Sin ventana emergente",
+  "No problems found": "No se encontraron problemas",
+  "No problems in this file": "No hay problemas en este archivo",
+  "No profiler snapshots": "No hay instantáneas del generador de perfiles",
+  "No project is open": "No hay ningún proyecto abierto",
+  "No requests yet": "Aún no hay solicitudes",
+  "No response selected": "No se seleccionó ninguna respuesta",
+  "No results": "Sin resultados",
+  "No reviews": "Sin revisiones",
+  "No run configuration in this project has a debug adapter.": "Ninguna configuración de ejecución en este proyecto tiene un adaptador de depuración.",
+  "No run or test configuration of the project matches this file.": "Ninguna configuración de ejecución o prueba del proyecto coincide con este archivo.",
+  "No search results": "Sin resultados de búsqueda",
+  "No special permissions.": "Sin permisos especiales.",
+  "No stashes": "No hay stashes",
+  "No structure to show": "No hay estructura para mostrar",
+  "No tools match.": "Ninguna herramienta coincide.",
+  "No usages found": "No se encontraron usos",
+  "No usages of '{name}' found": "No se encontraron usos de '{name}'",
+  "Node interpreter": "Intérprete de Node",
+  "None": "Ninguno",
+  "None configured": "Ninguno configurado",
+  "Not debugging": "No se está depurando",
+  "Not logged in to GitHub": "No has iniciado sesión en GitHub",
+  "Not null": "No nulo",
+  "Nothing found": "No se encontró nada",
+  "Nothing found in project files": "No se encontró nada en los archivos del proyecto",
+  "Nothing here": "No hay nada aquí",
+  "Nothing matches": "Nada coincide",
+  "Nothing recorded before this label": "No se registró nada antes de esta etiqueta",
+  "Nothing to add: the files are already under version control": "Nada que agregar: los archivos ya están bajo control de versiones",
+  "Nothing to debug": "Nada que depurar",
+  "Nothing to run here": "Nada que ejecutar aquí",
+  "Nothing to show": "Nada que mostrar",
+  "Nothing to undo": "Nada que deshacer",
+  "Notification groups": "Grupos de notificaciones",
+  "Notifications": "Notificaciones",
+  "OK": "Aceptar",
+  "Object": "Objeto",
+  "Object Actions": "Acciones de objeto",
+  "Occurrences": "Coincidencias",
+  "Occurrences of selected text": "Coincidencias del texto seleccionado",
+  "Older output is discarded": "La salida más antigua se descarta",
+  "Only in comments": "Solo en comentarios",
+  "Only one usage in Project Files": "Solo un uso en archivos del proyecto",
+  "Open": "Abrir",
+  "Open Diff": "Abrir diferencias",
+  "Open File": "Abrir archivo",
+  "Open Files": "Archivos abiertos",
+  "Open Folder": "Abrir carpeta",
+  "Open In": "Abrir en",
+  "Open In Right Split": "Abrir en división derecha",
+  "Open Paths": "Rutas abiertas",
+  "Open Project Path": "Abrir ruta del proyecto",
+  "Open Projects": "Proyectos abiertos",
+  "Open Recent…": "Abrir reciente…",
+  "Open a Git repository to commit changes.": "Abre un repositorio de Git para confirmar cambios.",
+  "Open a file to annotate it": "Abre un archivo para anotarlo",
+  "Open a file to show its local history": "Abre un archivo para mostrar su historial local",
+  "Open a folder": "Abrir una carpeta",
+  "Open a project first": "Abre un proyecto primero",
+  "Open a project to configure its folders.": "Abre un proyecto para configurar sus carpetas.",
+  "Open as Text": "Abrir como texto",
+  "Open console for tool output": "Abrir consola para la salida de la herramienta",
+  "Open documents": "Documentos abiertos",
+  "Open in Browser": "Abrir en el navegador",
+  "Open in Find Tool Window": "Abrir en la ventana de herramientas Buscar",
+  "Open in Find Window": "Abrir en la ventana Buscar",
+  "Open in Opposite Group": "Abrir en el grupo opuesto",
+  "Open in New Window": "Abrir en una nueva ventana",
+  "Open in Terminal": "Abrir en la terminal",
+  "Open in editor": "Abrir en el editor",
+  "Open moved files in editor": "Abrir archivos movidos en el editor",
+  "Open new tabs at the end": "Abrir nuevas pestañas al final",
+  "Open on GitHub": "Abrir en GitHub",
+  "Open or select a file to compare": "Abre o selecciona un archivo para comparar",
+  "Open pom.xml": "Abrir pom.xml",
+  "Open project in": "Abrir proyecto en",
+  "Open to the Side": "Abrir al lado",
+  "OpenSSH config and authentication agent": "Configuración de OpenSSH y agente de autenticación",
+  "Opening Policy": "Política de apertura",
+  "Opening folders requires the desktop app": "Abrir carpetas requiere la aplicación de escritorio",
+  "Opening projects requires the desktop app": "Abrir proyectos requiere la aplicación de escritorio",
+  "Open…": "Abrir…",
+  "Optimize Imports": "Optimizar importaciones",
+  "Optimize Imports in File": "Optimizar importaciones en el archivo",
+  "Optimize imports": "Optimizar importaciones",
+  "Optimize imports on the fly": "Optimizar importaciones sobre la marcha",
+  "Optional": "Opcional",
+  "Optional:": "Opcional:",
+  "Options": "Opciones",
+  "Orange": "Naranja",
+  "Original": "Original",
+  "Other": "Otro",
+  "Other File Types": "Otros tipos de archivo",
+  "Other hints (chaining, closing labels…)": "Otras sugerencias (encadenamiento, etiquetas de cierre…)",
+  "Other names or emails (comma-separated):": "Otros nombres o correos electrónicos (separados por comas):",
+  "Otherwise line breakpoints can only be set in files of languages that have a debugger.": "De lo contrario, los puntos de interrupción de línea solo se pueden establecer en archivos de lenguajes que tengan un depurador.",
+  "Outgoing commits": "Confirmaciones salientes",
+  "Output": "Salida",
+  "Override IDE shortcuts": "Sobrescribir atajos del IDE",
+  "Override Members": "Sobrescribir miembros",
+  "Override console cycle buffer size": "Sobrescribir tamaño del búfer cíclico de la consola",
+  "Override system date and time format": "Sobrescribir formato de fecha y hora del sistema",
+  "Overview": "Resumen",
+  "Package": "Paquete",
+  "Package manager": "Administrador de paquetes",
+  "Package to install": "Paquete a instalar",
+  "Packages": "Paquetes",
+  "Packages the project (mvn package, gradle assemble, cargo build --release, npm run build)": "Empaqueta el proyecto (mvn package, gradle assemble, cargo build --release, npm run build)",
+  "Page size": "Tamaño de página",
+  "Parameter Info": "Información de parámetros",
+  "Parameter names": "Nombres de parámetros",
+  "Parameters": "Parámetros",
+  "Parses (hit / incr. / full)": "Análisis sintácticos (acierto / incr. / completo)",
+  "Partially staged: only staged hunks are committed": "Parcialmente preparado: solo los bloques preparados se confirman",
+  "Passed": "Aprobado",
+  "Passed as -Dmaven.repo.local.": "Se pasa como -Dmaven.repo.local.",
+  "Passed as -s (mirrors, servers, proxies).": "Se pasa como -s (espejos, servidores, proxies).",
+  "Passed to rustfmt when reformatting, e.g. --edition 2024": "Se pasa a rustfmt al reformatear, p. ej., --edition 2024",
+  "Passed to the JVM running jdtls (java.jdt.ls.vmargs), e.g. -Xmx4g. jdtls runs with -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=30 -Xmx2G -Xms100m by default; an option set here replaces the default for the same setting, and another collector (e.g. -XX:+UseZGC) replaces the default collector options. A Lombok agent is added automatically: the one installed in Language Servers, else, when the project uses Lombok (its build, an inherited parent POM or Gradle build, or its sources' imports), the newest from the Maven / Gradle caches.": "Se pasa a la JVM que ejecuta jdtls (java.jdt.ls.vmargs), p. ej., -Xmx4g. Por defecto, jdtls se ejecuta con -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=30 -Xmx2G -Xms100m; una opción definida aquí reemplaza el valor predeterminado para la misma configuración, y otro recolector (p. ej., -XX:+UseZGC) reemplaza las opciones predeterminadas del recolector. Se agrega un agente Lombok automáticamente: el instalado en Servidores de lenguaje o, cuando el proyecto usa Lombok (en su compilación, un POM padre heredado o compilación de Gradle, o en las importaciones de su código fuente), el más reciente de las cachés de Maven / Gradle.",
+  "Pop stash": "Aplicar y eliminar stash (pop)",
+  "Preview Source": "Vista previa del código fuente",
+  "Reinstate index": "Restablecer índice",
+  "Rerun Search": "Volver a ejecutar búsqueda",
+  "Right Bottom": "Abajo a la derecha",
+  "Right Top": "Arriba a la derecha",
+  "Language server JDK": "JDK del servidor de lenguaje",
+  "Password": "Contraseña",
+  "Password:": "Contraseña:",
+  "Password already stored": "Contraseña ya guardada",
+  "Paste": "Pegar",
+  "Paste on middle mouse button click": "Pegar al hacer clic con el botón central del mouse",
+  "Patch copied to the clipboard": "Parche copiado al portapapeles",
+  "Patch destination": "Destino del parche",
+  "Patch file": "Archivo de parche",
+  "Patch files": "Archivos de parche",
+  "Path From Content Root": "Ruta desde la raíz de contenido",
+  "Path of the current file relative to the project": "Ruta del archivo actual relativa al proyecto",
+  "Path to Git executable": "Ruta al ejecutable de Git",
+  "Paths": "Rutas",
+  "Pattern": "Patrón",
+  "Patterns": "Patrones",
+  "Pause": "Pausar",
+  "Pause Program": "Pausar programa",
+  "Pause the program to evaluate": "Pausa el programa para evaluar",
+  "Pending": "Pendiente",
+  "Performance (dev diagnostics)": "Rendimiento (diagnóstico de desarrollo)",
+  "Performance overlay (dev diagnostics)": "Superposición de rendimiento (diagnóstico de desarrollo)",
+  "Permissions": "Permisos",
+  "Physical memory": "Memoria física",
+  "Pick": "Elegir (pick)",
+  "Pick one in the toolbar above the editor.": "Elige uno en la barra de herramientas sobre el editor.",
+  "Pin / Unpin Tab": "Fijar / Desfijar pestaña",
+  "Pin Tab": "Fijar pestaña",
+  "Pinned": "Fijado",
+  "Placeholders:": "Marcadores de posición:",
+  "Placeholders: yyyy, yy, MMMM, MMM, MM, M, dd, d": "Marcadores de posición: yyyy, yy, MMMM, MMM, MM, M, dd, d",
+  "Play sound": "Reproducir sonido",
+  "Plugin": "Plugin",
+  "Plugin details": "Detalles del plugin",
+  "Plugin sources": "Orígenes de plugins",
+  "Plugins": "Plugins",
+  "Plugins are folders with a": "Los plugins son carpetas con un",
+  "Plugins…": "Plugins…",
+  "Pop Stash": "Extraer stash (Pop)",
+  "Pop Stash (Apply and Drop)": "Extraer stash (Aplicar y descartar)",
+  "Popup type": "Tipo de ventana emergente",
+  "Port:": "Puerto:",
+  "Postfix Completion": "Autocompletado sufijo",
+  "Postfix templates": "Plantillas de sufijo",
+  "Prefer": "Preferir",
+  "Prefer moving caret line to minimize editor scrolling": "Preferir mover la línea del cursor para minimizar el desplazamiento del editor",
+  "Prefer scrolling editor canvas to keep caret line centered": "Preferir desplazar el lienzo del editor para mantener centrada la línea del cursor",
+  "Preferred dark theme": "Tema oscuro preferido",
+  "Preferred light theme": "Tema claro preferido",
+  "Preferred theme for dark OS mode": "Tema preferido para el modo oscuro del SO",
+  "Preferred theme for light OS mode": "Tema preferido para el modo claro del SO",
+  "Preferred themes": "Temas preferidos",
+  "Preferred themes for light and dark OS mode": "Temas preferidos para el modo claro y oscuro del SO",
+  "Prepares a fixup! commit of the local changes for the selected commit.": "Prepara una confirmación fixup! de los cambios locales para la confirmación seleccionada.",
+  "Prepares a squash! commit of the local changes for the selected commit.": "Prepara una confirmación squash! de los cambios locales para la confirmación seleccionada.",
+  "Preserve Case": "Conservar mayúsculas y minúsculas",
+  "Press a shortcut": "Presiona un atajo",
+  "Press a shortcut to find actions": "Presiona un atajo para buscar acciones",
+  "Preview": "Vista previa",
+  "Preview Replacement": "Vista previa del reemplazo",
+  "Preview failed": "Error en la vista previa",
+  "Previous Bookmark": "Marcador anterior",
+  "Previous Change": "Cambio anterior",
+  "Previous Conflict Marker": "Marcador de conflicto anterior",
+  "Previous Difference": "Diferencia anterior",
+  "Previous Occurrence": "Coincidencia anterior",
+  "Previous Page": "Página anterior",
+  "Primary key": "Clave primaria",
+  "Print class and method name": "Imprimir nombre de clase y método",
+  "Private Key File": "Archivo de clave privada",
+  "Private key:": "Clave privada:",
+  "Problems": "Problemas",
+  "Problems scope": "Ámbito de problemas",
+  "Process → backend ready": "Proceso → backend listo",
+  "Process → first IPC": "Proceso → primer IPC",
+  "Process → main": "Proceso → main",
+  "Processes": "Procesos",
+  "Profile": "Perfilar",
+  "Profile Context Configuration": "Perfilar configuración de contexto",
+  "Profile a run configuration to see where it spends its time.": "Perfila una configuración de ejecución para ver en qué emplea su tiempo.",
+  "Profile the program or test in the active file": "Perfila el programa o la prueba en el archivo activo",
+  "Profiler": "Generador de perfiles",
+  "Profiler snapshots": "Instantáneas del generador de perfiles",
+  "Profiler views": "Vistas del generador de perfiles",
+  "Profiling needs the desktop app": "El perfilado requiere la aplicación de escritorio",
+  "Program": "Programa",
+  "Project": "Proyecto",
+  "Project (.openidea/plugins)": "Proyecto (.openidea/plugins)",
+  "Project Encoding": "Codificación del proyecto",
+  "Project Errors": "Errores del proyecto",
+  "Project Files": "Archivos del proyecto",
+  "Project GOPATH": "GOPATH del proyecto",
+  "Project JDK": "JDK del proyecto",
+  "Project Production Files": "Archivos de producción del proyecto",
+  "Project Settings": "Configuración del proyecto",
+  "Project Structure": "Estructura del proyecto",
+  "Project Test Files": "Archivos de prueba del proyecto",
+  "Project View": "Vista del proyecto",
+  "Project actions": "Acciones del proyecto",
+  "Project name": "Nombre del proyecto",
+  "Project root": "Raíz del proyecto",
+  "Project root directory": "Directorio raíz del proyecto",
+  "Project to run in": "Proyecto en el cual ejecutar",
+  "Project:": "Proyecto:",
+  "Projects": "Proyectos",
+  "Properties": "Propiedades",
+  "Properties Files (*.properties)": "Archivos de propiedades (*.properties)",
+  "Property": "Propiedad",
+  "Protected branches": "Ramas protegidas",
+  "Prune": "Depurar (Prune)",
+  "Prune Docker…": "Limpiar Docker (Prune)…",
+  "Public function": "Función pública",
+  "Pull Again": "Volver a hacer pull",
+  "Pull Docker Image…": "Descargar imagen de Docker (Pull)…",
+  "Pull Image…": "Descargar imagen (Pull)…",
+  "Pull Requests": "Pull Requests",
+  "Pull request number": "Número de pull request",
+  "Pull request number:": "Número de pull request:",
+  "Pull requests": "Pull requests",
+  "Pull requests use the": "Los pull requests usan la",
+  "Pull…": "Pull…",
+  "Purple": "Morado",
+  "Push": "Push",
+  "Push All up to Here…": "Hacer push de todo hasta aquí…",
+  "Push Commits": "Hacer push de confirmaciones",
+  "Push rejected": "Push rechazado",
+  "Push tags:": "Hacer push de etiquetas:",
+  "Push…": "Push…",
+  "Put Label": "Poner etiqueta",
+  "Put Label…": "Poner etiqueta…",
+  "Put a stack trace or a complete thread dump here:": "Coloca aquí una traza de pila o un volcado de hilos completo:",
+  "Put the caret on a method declaration, or add a method breakpoint by name in View Breakpoints.": "Coloca el cursor en una declaración de método o agrega un punto de interrupción de método por nombre en Ver puntos de interrupción.",
+  "Python Debugger": "Depurador de Python",
+  "Python Interpreter": "Intérprete de Python",
+  "Python Package": "Paquete de Python",
+  "Python interpreter": "Intérprete de Python",
+  "Python: only your code (justMyCode). JavaScript: skips node_modules and Node.js internals.": "Python: solo tu código (justMyCode). JavaScript: omite node_modules y componentes internos de Node.js.",
+  "Query Console": "Consola de consultas",
+  "Quick Documentation": "Documentación rápida",
+  "Re-check installed tools": "Volver a comprobar herramientas instaladas",
+  "Re-reads the effective POMs and dependency trees with Maven": "Vuelve a leer los POM efectivos y los árboles de dependencias con Maven",
+  "Re-reads the task list with Gradle": "Vuelve a leer la lista de tareas con Gradle",
+  "React useEffect hook": "Hook useEffect de React",
+  "React useState hook": "Hook useState de React",
+  "Read-only": "Solo lectura",
+  "Read-only Attribute": "Atributo de solo lectura",
+  "Rebase": "Rebase",
+  "Rebase Current Branch onto Selected Commit": "Hacer rebase de la rama actual sobre la confirmación seleccionada",
+  "Rebase and Push": "Hacer rebase y push",
+  "Rebase the current branch on top of incoming changes": "Hacer rebase de la rama actual sobre los cambios entrantes",
+  "Rebuild Last": "Recompilar último",
+  "Rebuild Project": "Recompilar proyecto",
+  "Recent Actions": "Acciones recientes",
+  "Recent Files": "Archivos recientes",
+  "Recent Locations": "Ubicaciones recientes",
+  "Recent Projects": "Proyectos recientes",
+  "Recent Projects…": "Proyectos recientes…",
+  "Recent commit messages": "Mensajes de confirmación recientes",
+  "Recent file masks": "Máscaras de archivo recientes",
+  "Recent files": "Archivos recientes",
+  "Recent locations": "Ubicaciones recientes",
+  "Recent projects": "Proyectos recientes",
+  "Recent repository URLs": "URL de repositorios recientes",
+  "Recent Searches": "Búsquedas recientes",
+  "Recently Viewed Files": "Archivos vistos recientemente",
+  "Record": "Grabar",
+  "Red": "Rojo",
+  "Refactor": "Refactorizar",
+  "Refactor This": "Refactorizar esto",
+  "Refactor This…": "Refactorizar esto…",
+  "Refactoring undone": "Refactorización deshecha",
+  "Refactoring applied": "Refactorización aplicada",
+  "Reformat Code": "Reformatear código",
+  "Reformat with Prettier": "Reformatear con Prettier",
+  "Reformat with oxfmt": "Reformatear con oxfmt",
+  "Prettier path": "Ruta de Prettier",
+  "oxfmt path": "Ruta de oxfmt",
+  "Auto: nearest project node_modules, managed installation, then PATH. An explicit path overrides auto detection.": "Automático: node_modules del proyecto más cercano, instalación administrada y luego PATH. Una ruta explícita reemplaza la detección automática.",
+  "Formatting provider": "Proveedor de formato",
+  "Automatic (language server first)": "Automático (servidor de lenguaje primero)",
+  "Run on save": "Ejecutar al guardar",
+  "Run Prettier on save for enabled languages when it is the selected formatting provider.": "Ejecutar Prettier al guardar para los lenguajes habilitados cuando sea el proveedor de formato seleccionado.",
+  "Run oxfmt on save for enabled languages when it is the selected formatting provider.": "Ejecutar oxfmt al guardar para los lenguajes habilitados cuando sea el proveedor de formato seleccionado.",
+  "oxfmt formats an enabled language instead of Prettier below an oxfmt configuration file (.oxfmtrc.json, oxfmt.config.ts) or when it is the selected provider.": "oxfmt formatea un lenguaje habilitado en lugar de Prettier bajo un archivo de configuración de oxfmt (.oxfmtrc.json, oxfmt.config.ts) o cuando es el proveedor seleccionado.",
+  "Enabled languages": "Lenguajes habilitados",
+  "Reformat Code needs {name}. Install it via {method}?": "Reformatear código necesita {name}. ¿Instalarlo mediante {method}?",
+  "Install Missing Tool": "Instalar herramienta faltante",
+  "Prettier formatting failed": "Error al formatear con Prettier",
+  "Prettier formatting timed out": "Se agotó el tiempo de espera al formatear con Prettier",
+  "oxfmt formatting failed": "Error al formatear con oxfmt",
+  "oxfmt formatting timed out": "Se agotó el tiempo de espera al formatear con oxfmt",
+  "{name} does not support selection formatting for this language; formatted the whole file": "{name} no admite el formato de selección para este lenguaje; se formateó todo el archivo",
+  "Formatting timed out": "Se agotó el tiempo de espera de formato",
+  "{name} executable": "Ejecutable de {name}",
+  "{name}: Node.js is required": "{name}: se requiere Node.js",
+  "Formatter": "Formateador",
+  "JSON with Comments": "JSON con comentarios",
+  "Unknown external formatter: {tool}": "Formateador externo desconocido: {tool}",
+  "{name}: package has no CLI entry point": "{name}: el paquete no tiene punto de entrada CLI",
+  "{name}: CLI does not exist: {path}": "{name}: la CLI no existe: {path}",
+  "{name}: file has no directory": "{name}: el archivo no tiene directorio",
+  "{name}: {error}": "{name}: {error}",
+  "Reformat File": "Reformatear archivo",
+  "Reformat code": "Reformatear código",
+  "Reformat code on save": "Reformatear código al guardar",
+  "Reformat on paste": "Reformatear al pegar",
+  "Refresh": "Actualizar",
+  "Refresh Docker": "Actualizar Docker",
+  "Refresh TODO Items": "Actualizar elementos TODO",
+  "Refresh VCS Status": "Actualizar estado de VCS",
+  "Regex": "Regex",
+  "Regular expression": "Expresión regular",
+  "Relative paths resolve against the project root. “Open in Terminal” still opens the chosen folder.": "Las rutas relativas se resuelven respecto a la raíz del proyecto. “Abrir en la terminal” sigue abriendo la carpeta elegida.",
+  "Reload": "Recargar",
+  "Reload All Gradle Projects": "Recargar todos los proyectos de Gradle",
+  "Reload All Maven Projects": "Recargar todos los proyectos de Maven",
+  "Reload Changed Classes": "Recargar clases modificadas",
+  "Reload Environments": "Recargar entornos",
+  "Reload History": "Recargar historial",
+  "Reload List of Packages": "Recargar lista de paquetes",
+  "Reload Page": "Recargar página",
+  "Reload Plugins": "Recargar plugins",
+  "Reload Project Tree from Disk": "Recargar árbol del proyecto desde el disco",
+  "Reload Run Configurations": "Recargar configuraciones de ejecución",
+  "Reload from Disk": "Recargar desde el disco",
+  "Reload from disk": "Recargar desde el disco",
+  "Reload the changed classes into the running debug session?": "¿Recargar las clases modificadas en la sesión de depuración en ejecución?",
+  "Reload with Encoding": "Recargar con codificación",
+  "Remote": "Remoto",
+  "Remove": "Quitar",
+  "Remove All Bookmarks": "Quitar todos los marcadores",
+  "Remove All Breakpoints": "Quitar todos los puntos de interrupción",
+  "Remove Configuration": "Quitar configuración",
+  "Remove Data Source": "Quitar origen de datos",
+  "Remove Data Source…": "Quitar origen de datos…",
+  "Remove File from Git": "Quitar archivo de Git",
+  "Remove Kind": "Quitar tipo",
+  "Remove Override (restore detected)": "Quitar reemplazo (restaurar detectado)",
+  "Remove Pattern": "Quitar patrón",
+  "Remove Template": "Quitar plantilla",
+  "Remove Watch": "Quitar expresión vigilada",
+  "Remove coverage highlighting from editors and the project view": "Quitar resaltado de cobertura de los editores y la vista del proyecto",
+  "Remove from Favorites": "Quitar de favoritos",
+  "Remove from Recent Projects": "Quitar de proyectos recientes",
+  "Remove from Recent Projects…": "Quitar de proyectos recientes…",
+  "Remove once hit": "Quitar al alcanzarse",
+  "Remove silently": "Quitar silenciosamente",
+  "Remove successfully applied files from the shelf": "Quitar del shelf los archivos aplicados correctamente",
+  "Remove trailing blank lines at the end of saved files": "Quitar líneas en blanco al final de los archivos guardados",
+  "Remove trailing spaces on:": "Quitar espacios finales en:",
+  "Rename": "Renombrar",
+  "Rename File Inline": "Renombrar archivo en línea",
+  "Rename File…": "Renombrar archivo…",
+  "Rename Keymap": "Renombrar mapa de teclado",
+  "Rename Session…": "Renombrar sesión…",
+  "Rename Shelved Changes": "Renombrar cambios en el shelf",
+  "Rename Shelved Changes…": "Renombrar cambios en el shelf…",
+  "Rename tab": "Renombrar pestaña",
+  "Rename…": "Renombrar…",
+  "Reopen Closed Tab": "Reabrir pestaña cerrada",
+  "Reopen last project on startup": "Reabrir el último proyecto al iniciar",
+  "Reopen projects on startup": "Reabrir proyectos al iniciar",
+  "Replace": "Reemplazar",
+  "Replace All": "Reemplazar todo",
+  "Replace Preview": "Vista previa del reemplazo",
+  "Replace Selected": "Reemplazar seleccionados",
+  "Replace Structurally": "Reemplazar estructuralmente",
+  "Replace Structurally: Preview": "Reemplazar estructuralmente: Vista previa",
+  "Replace Structurally…": "Reemplazar estructuralmente…",
+  "Replace failed": "Error al reemplazar",
+  "Replace in Files": "Reemplazar en archivos",
+  "Replace in Files…": "Reemplazar en archivos…",
+  "Replace in file": "Reemplazar en el archivo",
+  "Replace template": "Plantilla de reemplazo",
+  "Replace this occurrence only": "Reemplazar solo esta coincidencia",
+  "Replace with": "Reemplazar con",
+  "Replacements": "Reemplazos",
+  "Reports errors and warnings from language servers.": "Reporta errores y advertencias de los servidores de lenguaje.",
+  "Repository": "Repositorio",
+  "Repository URL": "URL del repositorio",
+  "Request": "Solicitud",
+  "Require": "Requerir",
+  "Rerun": "Volver a ejecutar",
+  "Rerun Failed Tests": "Volver a ejecutar pruebas fallidas",
+  "Rerun Find Usages": "Volver a ejecutar Buscar usos",
+  "Rerun Inspection": "Volver a ejecutar inspección",
+  "Rerun Query": "Volver a ejecutar consulta",
+  "Rescan Plugins": "Volver a escanear plugins",
+  "Reset": "Restablecer",
+  "Reset Current Branch to Here…": "Restablecer la rama actual hasta aquí…",
+  "Reset Frame": "Restablecer marco",
+  "Reset HEAD…": "Restablecer HEAD…",
+  "Reset IDE Zoom": "Restablecer zoom del IDE",
+  "Reset Shortcuts": "Restablecer atajos",
+  "Reset Zoom": "Restablecer zoom",
+  "Reset to Language Defaults": "Restablecer a los valores predeterminados del lenguaje",
+  "Comment Code": "Comentar código",
+  "Line comment at first column": "Comentario de línea en la primera columna",
+  "Add a space at line comment start": "Agregar un espacio al inicio del comentario de línea",
+  "Reset type": "Tipo de restablecimiento",
+  "Resize": "Redimensionar",
+  "Resize right tool window bar": "Redimensionar barra derecha de ventanas de herramientas",
+  "Resize tool window bar": "Redimensionar barra de ventanas de herramientas",
+  "Resolve Conflicts…": "Resolver conflictos…",
+  "Resolve all conflicts before continuing": "Resuelve todos los conflictos antes de continuar",
+  "Resolve merge conflicts before committing": "Resuelve los conflictos de fusión antes de confirmar",
+  "Resolve…": "Resolver…",
+  "Resource Folders": "Carpetas de recursos",
+  "Resources": "Recursos",
+  "Response": "Respuesta",
+  "Response body": "Cuerpo de la respuesta",
+  "Response history": "Historial de respuestas",
+  "Restart": "Reiniciar",
+  "Restart Container": "Reiniciar contenedor",
+  "Restart IDE": "Reiniciar IDE",
+  "Restart Session": "Reiniciar sesión",
+  "Restart identity": "Reiniciar identidad",
+  "Restart is only available in the desktop app": "El reinicio solo está disponible en la aplicación de escritorio",
+  "Restore Default": "Restaurar valor predeterminado",
+  "Restore Default Layout": "Restaurar diseño predeterminado",
+  "Restore Defaults": "Restaurar valores predeterminados",
+  "Restore Rows": "Restaurar filas",
+  "Restore Size": "Restaurar tamaño",
+  "Maximize Editor": "Maximizar editor",
+  "Restore detected roots": "Restaurar raíces detectadas",
+  "Result": "Resultado",
+  "Select a file to preview its changes": "Selecciona un archivo para previsualizar sus cambios",
+  "Select a problem to see its details": "Selecciona un problema para ver sus detalles",
+  "Select an item to preview": "Selecciona un elemento para previsualizar",
+  "Severity": "Gravedad",
+  "Selecting a changed file shows its diff in the editor's preview tab": "Al seleccionar un archivo modificado se muestran sus diferencias en la pestaña de vista previa del editor",
+  "Show Diff Preview": "Mostrar vista previa de diferencias",
+  "Show Quick Fixes": "Mostrar correcciones rápidas",
+  "Snappy": "Rápido",
+  "Sort By": "Ordenar por",
+  "Tags": "Etiquetas",
+  "The start date is after the end date": "La fecha de inicio es posterior a la fecha de fin",
+  "To:": "Hasta:",
+  "Unstash Changes": "Recuperar cambios del stash",
+  "Unstash…": "Recuperar del stash…",
+  "result": "resultado",
+  "results": "resultados",
+  "Results": "Resultados",
+  "Resume Program": "Reanudar programa",
+  "Retry": "Reintentar",
+  "Return to the start of the selected frame's method": "Volver al inicio del método del marco seleccionado",
+  "Reveal in Project View": "Mostrar en la vista del proyecto",
+  "Reverse patch": "Invertir parche",
+  "Revert": "Revertir",
+  "Revert Change": "Revertir cambio",
+  "Revert Commit": "Revertir confirmación",
+  "Revert Commits": "Revertir confirmaciones",
+  "Reverts the last file move or rename and its reference updates": "Revierte el último movimiento o cambio de nombre de archivo y sus actualizaciones de referencias",
+  "Review comment": "Comentario de revisión",
+  "Reviewers": "Revisores",
+  "Revision": "Revisión",
+  "Revisions": "Revisiones",
+  "Reword": "Editar mensaje (reword)",
+  "Rich-Text Copy": "Copiar como texto enriquecido",
+  "Right tool windows": "Ventanas de herramientas derechas",
+  "Roll Back": "Revertir cambios",
+  "Rollback": "Revertir",
+  "Rollback Changes": "Revertir cambios",
+  "Rollback…": "Revertir…",
+  "Row limit": "Límite de filas",
+  "Run": "Ejecutar",
+  "Run All HTTP Requests in File": "Ejecutar todas las solicitudes HTTP en el archivo",
+  "Run All Requests in File": "Ejecutar todas las solicitudes en el archivo",
+  "Run Code › Analyze Code › Locate Duplicates… to find copied code": "Ejecuta Código › Analizar código › Localizar duplicados… para buscar código copiado",
+  "Run Code › Inspect Code… to analyse files": "Ejecuta Código › Inspeccionar código… para analizar archivos",
+  "Run Command in Terminal": "Ejecutar comando en la terminal",
+  "Run `pnpm tauri dev` to use the file system.": "Ejecuta `pnpm tauri dev` para usar el sistema de archivos.",
+  "Run Configuration": "Configuración de ejecución",
+  "Run Context Configuration": "Ejecutar configuración de contexto",
+  "Run Context Configuration with Coverage": "Ejecutar configuración de contexto con cobertura",
+  "Run Gradle Task": "Ejecutar tarea de Gradle",
+  "Run HTTP Request at Caret": "Ejecutar solicitud HTTP en el cursor",
+  "Run Maven Build": "Ejecutar compilación de Maven",
+  "Run SQL Script": "Ejecutar script SQL",
+  "Run SQL Script…": "Ejecutar script SQL…",
+  "Run a configuration with coverage to see which lines its tests execute.": "Ejecuta una configuración con cobertura para ver qué líneas ejecutan sus pruebas.",
+  "Run a request from an .http file with the gutter ▶ or ⌘↩.": "Ejecuta una solicitud desde un archivo .http con el icono ▶ del margen o ⌘↩.",
+  "Run actions": "Acciones de ejecución",
+  "Run and Debug": "Ejecutar y depurar",
+  "Run code cleanup": "Ejecutar limpieza de código",
+  "Run configurations": "Configuraciones de ejecución",
+  "Run configurations and tests": "Configuraciones de ejecución y pruebas",
+  "Run external linter on save": "Ejecutar linter externo al guardar",
+  "Run gh auth login": "Ejecutar gh auth login",
+  "Run sessions": "Sesiones de ejecución",
+  "Run the selected configuration under a sampling profiler": "Ejecutar la configuración seleccionada bajo un generador de perfiles por muestreo",
+  "Run the selected configuration with coverage": "Ejecutar la configuración seleccionada con cobertura",
+  "Run the test or program in the active file": "Ejecutar la prueba o el programa en el archivo activo",
+  "Run the test or program in the active file with coverage": "Ejecutar la prueba o el programa en el archivo activo con cobertura",
+  "Run to Cursor": "Ejecutar hasta el cursor",
+  "Run to the caret, ignoring breakpoints on the way": "Ejecutar hasta el cursor, ignorando los puntos de interrupción en el camino",
+  "Run with Coverage": "Ejecutar con cobertura",
+  "Run with Executor": "Ejecutar con ejecutor",
+  "Run with:": "Ejecutar con:",
+  "Run/Debug": "Ejecutar/Depurar",
+  "Run/Debug Configurations": "Configuraciones de Ejecución/Depuración",
+  "Running": "En ejecución",
+  "Running processes requires the desktop app.": "Ejecutar procesos requiere la aplicación de escritorio.",
+  "Runs Gradle with --offline": "Ejecuta Gradle con --offline",
+  "Runs Maven with -DskipTests": "Ejecuta Maven con -DskipTests",
+  "Runs Maven with -o": "Ejecuta Maven con -o",
+  "Runs Optimize Imports when the file has no errors, unless it would change the caret line.": "Ejecuta Optimizar importaciones cuando el archivo no tiene errores, a menos que modifique la línea del cursor.",
+  "Runs npm scripts and Node-based language servers (vtsls, eslint, pyright…).": "Ejecuta scripts de npm y servidores de lenguaje basados en Node (vtsls, eslint, pyright…).",
+  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw. Bypassed while the Maven daemon is enabled.": "Ejecuta sincronización, compilaciones y configuraciones de ejecución de Maven. Se usa el directorio elegido en lugar del mvnw del proyecto. Se omite mientras el daemon de Maven esté habilitado.",
+  "Runs the language server's Organize Imports action.": "Ejecuta la acción Organizar importaciones del servidor de lenguaje.",
+  "Runs the language server's formatter before an explicit save (Actions on Save).": "Ejecuta el formateador del servidor de lenguaje antes de un guardado explícito (Acciones al guardar).",
+  "Search history": "Historial de búsqueda",
+  "Search history ({previous} / {next})": "Historial de búsqueda ({previous} / {next})",
+  "Searching for usages of '{symbol}'": "Buscando usos de '{symbol}'",
+  "SQL completion": "Autocompletado SQL",
+  "SQL Inserts": "Inserciones SQL",
+  "SQL Script Template": "Plantilla de script SQL",
+  "SQL Scripts": "Scripts SQL",
+  "SQLite Database File": "Archivo de base de datos SQLite",
+  "SQLite can rename or drop an existing column, not change its type, NOT NULL or default.": "SQLite puede renombrar o eliminar una columna existente, pero no cambiar su tipo, NOT NULL ni su valor predeterminado.",
+  "SSH authentication type": "Tipo de autenticación SSH",
+  "SSL mode": "Modo SSL",
+  "Safe Delete…": "Eliminación segura…",
+  "Sample plugin: inserts today's date and counts words in the active file.": "Plugin de ejemplo: inserta la fecha de hoy y cuenta las palabras en el archivo activo.",
+  "Save": "Guardar",
+  "Save All": "Guardar todo",
+  "Save Files": "Guardar archivos",
+  "Save files if the IDE is idle for": "Guardar archivos si el IDE está inactivo durante",
+  "Save files when switching to a different application or a built-in terminal": "Guardar archivos al cambiar a otra aplicación o a una terminal integrada",
+  "Synchronize external changes when switching to the IDE window": "Sincronizar cambios externos al cambiar a la ventana del IDE",
+  "Save or roll back the changes before reloading it from disk.": "Guarda o revierte los cambios antes de recargarlo desde el disco.",
+  "Save password": "Guardar contraseña",
+  "Save to file:": "Guardar en archivo:",
+  "Scanning for TODO items…": "Escaneando elementos TODO…",
+  "Scheme": "Esquema",
+  "Scope": "Ámbito",
+  "Scratches": "Borradores",
+  "Script": "Script",
+  "Scroll to End": "Desplazarse hasta el final",
+  "Scrolling": "Desplazamiento",
+  "Search Everywhere": "Buscar en todas partes",
+  "Search Structurally": "Buscar estructuralmente",
+  "Search Structurally…": "Buscar estructuralmente…",
+  "Search Text Everywhere": "Buscar texto en todas partes",
+  "Search actions": "Buscar acciones",
+  "Search branches": "Buscar ramas",
+  "Search branches and actions": "Buscar ramas y acciones",
+  "Search configurations": "Buscar configuraciones",
+  "Search for references": "Buscar referencias",
+  "Search frames": "Buscar marcos",
+  "Search in comments and strings": "Buscar en comentarios y cadenas de texto",
+  "Search installed plugins": "Buscar plugins instalados",
+  "Search packages": "Buscar paquetes",
+  "Search plugins": "Buscar plugins",
+  "Search projects": "Buscar proyectos",
+  "Search pull requests": "Buscar pull requests",
+  "Search query": "Consulta de búsqueda",
+  "Search recent projects": "Buscar proyectos recientes",
+  "Search scope": "Ámbito de búsqueda",
+  "Search settings": "Buscar en configuración",
+  "Search template": "Plantilla de búsqueda",
+  "Searches": "Búsquedas",
+  "Searching": "Buscando",
+  "Searching for usages": "Buscando usos",
+  "Second stroke": "Segunda combinación",
+  "Second stroke:": "Segunda combinación:",
+  "Select All": "Seleccionar todo",
+  "Select Base Interpreter": "Seleccionar intérprete base",
+  "Select Folders…": "Seleccionar carpetas…",
+  "Select GOPATH": "Seleccionar GOPATH",
+  "Select JDK Home Directory": "Seleccionar directorio raíz del JDK",
+  "Select Local Repository": "Seleccionar repositorio local",
+  "Select Maven Daemon Home Directory": "Seleccionar directorio raíz del daemon de Maven",
+  "Select Maven Home Directory": "Seleccionar directorio raíz de Maven",
+  "Select Search Directory": "Seleccionar directorio de búsqueda",
+  "Select Maven settings.xml": "Seleccionar settings.xml de Maven",
+  "Select Next Tab": "Seleccionar pestaña siguiente",
+  "Select Opened File": "Seleccionar archivo abierto",
+  "Select Previous Tab": "Seleccionar pestaña anterior",
+  "Select Python Interpreter": "Seleccionar intérprete de Python",
+  "Select Run/Debug Configuration…": "Seleccionar configuración de ejecución/depuración…",
+  "Select Standard Library Sources": "Seleccionar código fuente de la biblioteca estándar",
+  "Select TypeScript lib Directory": "Seleccionar directorio lib de TypeScript",
+  "Select a changed file to show its diff": "Selecciona un archivo modificado para mostrar sus diferencias",
+  "Select a column": "Selecciona una columna",
+  "Select a commit in the Git log": "Selecciona una confirmación en el registro de Git",
+  "Select a commit to view changes": "Selecciona una confirmación para ver los cambios",
+  "Select a container, image, volume or network.": "Selecciona un contenedor, imagen, volumen o red.",
+  "Select a group": "Selecciona un grupo",
+  "Select a result to preview": "Selecciona un resultado para previsualizar",
+  "Select a revision": "Selecciona una revisión",
+  "Select a template to edit it": "Selecciona una plantilla para editarla",
+  "Select an interpreter": "Selecciona un intérprete",
+  "Select changes to move": "Selecciona los cambios que deseas mover",
+  "Select in Project View": "Seleccionar en la vista del proyecto",
+  "Selection": "Selección",
+  "Select…": "Seleccionar…",
+  "Services": "Servicios",
+  "Services actions": "Acciones de servicios",
+  "Session finished": "Sesión finalizada",
+  "Set Active Changelist": "Establecer lista de cambios activa",
+  "Set NULL": "Establecer como NULL",
+  "Set Value…": "Establecer valor…",
+  "Set active": "Establecer como activa",
+  "Set upstream": "Establecer rama remota (upstream)",
+  "Settings": "Configuración",
+  "Settings pages": "Páginas de configuración",
+  "Settings scope": "Ámbito de configuración",
+  "Settings…": "Configuración…",
+  "Settings for New Projects": "Configuración para proyectos nuevos",
+  "Settings for New Projects…": "Configuración para proyectos nuevos…",
+  "Saved to the global settings: used by new projects and by projects without their own value.": "Guardado en la configuración global: usado por los proyectos nuevos y por los proyectos sin un valor propio.",
+  "Shelf": "Shelf",
+  "Shell integration": "Integración de shell",
+  "Shell path": "Ruta del shell",
+  "Shallow clone with a history truncated to": "Clonación superficial con historial truncado a",
+  "Shelve Changes": "Archivar cambios en el shelf",
+  "Shelve Changes…": "Archivar cambios en el shelf…",
+  "Shelved changes": "Cambios en el shelf",
+  "Show": "Mostrar",
+  "Show \"Today\", \"Yesterday\" and \"N min ago\" for recent dates": "Mostrar \"Hoy\", \"Ayer\" y \"hace N min\" para fechas recientes",
+  "Show All": "Mostrar todo",
+  "Show All Frames": "Mostrar todos los marcos",
+  "Show Bookmarks": "Mostrar marcadores",
+  "Show Inherited": "Mostrar heredados",
+  "Show inherited members": "Mostrar miembros heredados",
+  "Show Build": "Mostrar compilación",
+  "Show Commit in Git Log": "Mostrar confirmación en el registro de Git",
+  "Show Container Log": "Mostrar registro del contenedor",
+  "Show Context Actions": "Mostrar acciones de contexto",
+  "Show changes": "Mostrar cambios",
+  "Show Coverage": "Mostrar cobertura",
+  "Show Debug Tool Window": "Mostrar ventana de herramientas de depuración",
+  "Show Diff": "Mostrar diferencias",
+  "Show Diff with Working Tree": "Mostrar diferencias con el árbol de trabajo",
+  "Show Editor Hint": "Mostrar sugerencia del editor",
+  "Show Errors": "Mostrar errores",
+  "Show Execution Point": "Mostrar punto de ejecución",
+  "Show Formatted": "Mostrar formateado",
+  "Show Git Log": "Mostrar registro de Git",
+  "Show Hidden Tabs": "Mostrar pestañas ocultas",
+  "Show History": "Mostrar historial",
+  "Show History for File": "Mostrar historial del archivo",
+  "Show History for Selection": "Mostrar historial de la selección",
+  "History for Selection": "Historial de la selección",
+  "Open a file to show the history of its selection": "Abre un archivo para mostrar el historial de su selección",
+  "No commits changed these lines": "Ninguna confirmación modificó estas líneas",
+  "These lines are not committed yet": "Estas líneas aún no se han confirmado",
+  "Not Committed Yet": "Aún sin confirmar",
+  "Show Ignored": "Mostrar ignorados",
+  "Show Infos and Hints": "Mostrar información y sugerencias",
+  "Show Local History": "Mostrar historial local",
+  "Show Log": "Mostrar registro",
+  "Show Memory Indicator Details": "Mostrar detalles del indicador de memoria",
+  "Show Passed": "Mostrar aprobadas",
+  "Show Preview": "Mostrar vista previa",
+  "Show Raw": "Mostrar sin formato",
+  "Show Replace": "Mostrar reemplazo",
+  "Show Run/Debug window when a process is started": "Mostrar ventana Ejecutar/Depurar al iniciar un proceso",
+  "Show Scheme Actions": "Mostrar acciones de esquema",
+  "Show Shelf": "Mostrar Shelf",
+  "Show TODO Items in Current File": "Mostrar elementos TODO en el archivo actual",
+  "Show Tool Window Names": "Mostrar nombres de ventanas de herramientas",
+  "Show Usage Results": "Mostrar resultados de uso",
+  "Select Configuration": "Seleccionar configuración",
+  "Show Usages": "Mostrar usos",
+  "Show Warnings": "Mostrar advertencias",
+  "Show all output": "Mostrar toda la salida",
+  "Show breadcrumbs for:": "Mostrar ruta de navegación para:",
+  "Show breadcrumbs:": "Mostrar ruta de navegación:",
+  "Show changed only": "Mostrar solo modificados",
+  "Show code folding outline": "Mostrar contorno de plegado de código",
+  "Show debug window on breakpoint hit": "Mostrar ventana de depuración al alcanzar un punto de interrupción",
+  "Show details": "Mostrar detalles",
+  "Show edited only": "Mostrar solo editados",
+  "Show file extension": "Mostrar extensión de archivo",
+  "Show gutter icons": "Mostrar iconos del margen",
+  "Show hard wrap and visual guides (configured in Code Style options)": "Mostrar ajuste de línea fijo y guías visuales (configurado en las opciones de Estilo de código)",
+  "Show in Finder": "Mostrar en Finder",
+  "Show in tool window": "Mostrar en ventana de herramientas",
+  "Show inlay Run to Cursor popup": "Mostrar ventana emergente integrada Ejecutar hasta el cursor",
+  "Show indent guides": "Mostrar guías de sangría",
+  "Show inlay hints": "Mostrar sugerencias incrustadas",
+  "Show inlay hints for:": "Mostrar sugerencias incrustadas para:",
+  "Show install log": "Mostrar registro de instalación",
+  "Show intention bulb": "Mostrar foco de intenciones",
+  "Show line numbers": "Mostrar números de línea",
+  "Show live templates in code completion": "Mostrar plantillas dinámicas en el autocompletado de código",
+  "Show method separators": "Mostrar separadores de métodos",
+  "Show only monospaced fonts": "Mostrar solo fuentes monoespaciadas",
+  "Show or hide the memory indicator in the status bar": "Mostrar u ocultar el indicador de memoria en la barra de estado",
+  "Show postfix templates in code completion": "Mostrar plantillas de sufijo en el autocompletado de código",
+  "Show quick documentation on hover": "Mostrar documentación rápida al pasar el cursor",
+  "Show results in the test runner": "Mostrar resultados en el ejecutor de pruebas",
+  "Show right margin": "Mostrar margen derecho",
+  "Show sticky lines while scrolling": "Mostrar líneas fijas al desplazarse",
+  "Show suggestions as you type": "Mostrar sugerencias al escribir",
+  "Show table data": "Mostrar datos de la tabla",
+  "Show the documentation popup in": "Mostrar la ventana emergente de documentación en",
+  "Show the parameter info popup in": "Mostrar la ventana emergente de información de parámetros en",
+  "Show the selected coverage suite in editors and the project view": "Mostrar el conjunto de cobertura seleccionado en los editores y en la vista del proyecto",
+  "Show tool window bars": "Mostrar barras de ventanas de herramientas",
+  "Show tool window badges": "Mostrar insignias en ventanas de herramientas",
+  "Counts on the stripe icons, e.g. changed files or agent tasks needing input": "Contadores en los iconos de la barra lateral, p. ej., archivos modificados o tareas del agente que requieren intervención",
+  "Show tool window names": "Mostrar nombres de ventanas de herramientas",
+  "Show value tooltip on code selection": "Mostrar descripción emergente del valor al seleccionar código",
+  "Show value tooltip on mouse hover": "Mostrar descripción emergente del valor al pasar el cursor",
+  "Show values inline": "Mostrar valores en línea",
+  "Show virtual space at file bottom": "Mostrar espacio virtual al final del archivo",
+  "Show whitespaces": "Mostrar espacios en blanco",
+  "Shown as the right margin guide in the editor.": "Se muestra como la guía del margen derecho en el editor.",
+  "Side-by-side Viewer": "Visor lado a lado",
+  "Sign-off commit": "Firmar confirmación (sign-off)",
+  "Size": "Tamaño",
+  "Size:": "Tamaño:",
+  "Skip": "Omitir",
+  "Skip Commit": "Omitir confirmación",
+  "Skip if defined": "Omitir si está definido",
+  "Smart Keys": "Teclas inteligentes",
+  "Smart Step Into": "Paso adentro inteligente",
+  "Smart Step Into failed": "Error en Paso adentro inteligente",
+  "Smart indent": "Sangría inteligente",
+  "Soft": "Suave (Soft)",
+  "Soft Wraps": "Ajustes de línea dinámicos",
+  "Soft-Wrap": "Ajuste de línea dinámico",
+  "Soft-wrap": "Ajuste de línea dinámico",
+  "Soft-wrap files": "Ajustar líneas dinámicamente en archivos",
+  "Some items could not be copied": "Algunos elementos no se pudieron copiar",
+  "Some items could not be deleted": "Algunos elementos no se pudieron eliminar",
+  "Some items could not be moved": "Algunos elementos no se pudieron mover",
+  "Some references may not have been updated": "Es posible que algunas referencias no se hayan actualizado",
+  "Sort Alphabetically": "Ordenar alfabéticamente",
+  "Source": "Origen",
+  "Source Folders": "Carpetas de código fuente",
+  "Sources": "Código fuente",
+  "Sources of std for navigation and completion (RUST_SRC_PATH).": "Código fuente de std para navegación y autocompletado (RUST_SRC_PATH).",
+  "Specify Inspection Scope": "Especificar ámbito de inspección",
+  "Split Down": "Dividir hacia abajo",
+  "Split Right": "Dividir a la derecha",
+  "Split and Move Down": "Dividir y mover hacia abajo",
+  "Split and Move Right": "Dividir y mover a la derecha",
+  "Squash": "Combinar (Squash)",
+  "Squash Commits…": "Combinar confirmaciones (Squash)…",
+  "Squash Into…": "Combinar en (Squash)…",
+  "Stage": "Preparar (Stage)",
+  "Stage Change (git add hunk)": "Preparar cambio (git add hunk)",
+  "Standard library": "Biblioteca estándar",
+  "Start": "Iniciar",
+  "Start Container": "Iniciar contenedor",
+  "Start Rebasing": "Iniciar rebase",
+  "Start a debug configuration with": "Inicia una configuración de depuración con",
+  "Start a debug session to see the exception filters of its adapter.": "Inicia una sesión de depuración para ver los filtros de excepciones de su adaptador.",
+  "Start debugging a run configuration": "Iniciar la depuración de una configuración de ejecución",
+  "Start directory": "Directorio de inicio",
+  "Startup": "Inicio",
+  "Stash Changes…": "Guardar cambios en el stash…",
+  "Stashes": "Stashes",
+  "State": "Estado",
+  "Status": "Estado",
+  "Status bar": "Barra de estado",
+  "Step Into": "Paso adentro",
+  "Step over, ignoring breakpoints in the called code": "Pasar por encima, ignorando los puntos de interrupción en el código invocado",
+  "Stepping": "Ejecución paso a paso",
+  "Sticky Lines": "Líneas fijas",
+  "Sticky balloon": "Globo fijo",
+  "Stop": "Detener",
+  "Stop All": "Detener todo",
+  "Stop Build": "Detener compilación",
+  "Stop Container": "Detener contenedor",
+  "Stop Process": "Detener proceso",
+  "Stop Reloading Gradle Projects": "Detener recarga de proyectos de Gradle",
+  "Stop Reloading Maven Projects": "Detener recarga de proyectos de Maven",
+  "Stop Request": "Detener solicitud",
+  "Stop and Rerun": "Detener y volver a ejecutar",
+  "Stop to Edit": "Detener para editar",
+  "Stopped after {count} matches": "Detenido después de {count} coincidencias",
+  "Strikeout": "Tachado",
+  "Struct": "Struct",
+  "Struct type": "Tipo struct",
+  "Structural Replace": "Reemplazo estructural",
+  "Structural Search": "Búsqueda estructural",
+  "Structure": "Estructura",
+  "Structure actions": "Acciones de estructura",
+  "Structure unavailable": "Estructura no disponible",
+  "Subject line length": "Longitud de la línea de asunto",
+  "Submit": "Enviar",
+  "Submodule changes cannot be rolled back here": "Los cambios de submódulos no se pueden revertir aquí",
+  "Subpixel": "Subpíxel",
+  "Suggested names": "Nombres sugeridos",
+  "Super Method": "Método de la superclase",
+  "Surround With": "Rodear con",
+  "Surround With…": "Rodear con…",
+  "Surround selection on typing quote or brace": "Rodear selección al escribir comillas o llaves",
+  "Suspend on": "Suspender en",
+  "Switch to Auto-Commit": "Cambiar a confirmación automática",
+  "Switcher": "Selector",
+  "Switcher (Backward)": "Selector (hacia atrás)",
+  "Symbols": "Símbolos",
+  "Sync with OS": "Sincronizar con el SO",
+  "Synchronize Scrolling": "Sincronizar desplazamiento",
+  "Synchronize files after execution": "Sincronizar archivos después de la ejecución",
+  "Syntax trees": "Árboles sintácticos",
+  "System Messages": "Mensajes del sistema",
+  "System Settings": "Configuración del sistema",
+  "System default": "Predeterminado del sistema",
+  "System-Dependent": "Dependiente del sistema",
+  "Tests failed: {detail}": "Pruebas fallidas: {detail}",
+  "TODO comment": "Comentario TODO",
+  "TODO filters": "Filtros TODO",
+  "TODO items": "Elementos TODO",
+  "TODO items unavailable": "Elementos TODO no disponibles",
+  "TODO patterns": "Patrones TODO",
+  "TODO scope": "Ámbito TODO",
+  "Tab Actions": "Acciones de pestaña",
+  "Tab actions": "Acciones de pestaña",
+  "Tab limit": "Límite de pestañas",
+  "Tab name": "Nombre de la pestaña",
+  "Tab placement": "Ubicación de las pestañas",
+  "Tab size": "Tamaño de tabulación",
+  "Tab to complete, Enter to run": "Tab para completar, Enter para ejecutar",
+  "Table": "Tabla",
+  "Table:": "Tabla:",
+  "Tabs": "Pestañas",
+  "Tabs and Indents": "Tabulaciones y sangrías",
+  "Tag": "Etiqueta",
+  "Tag name:": "Nombre de la etiqueta:",
+  "Tags to push": "Etiquetas para hacer push",
+  "Target changelist": "Lista de cambios de destino",
+  "Target directory": "Directorio de destino",
+  "Teal": "Verde azulado",
+  "Template body": "Cuerpo de la plantilla",
+  "Template name": "Nombre de la plantilla",
+  "Template text": "Texto de la plantilla",
+  "Terminal": "Terminal",
+  "Terminal fallback font": "Fuente de respaldo de la terminal",
+  "Terminal font": "Fuente de la terminal",
+  "Terminal font size": "Tamaño de fuente de la terminal",
+  "Terminal line height": "Altura de línea de la terminal",
+  "Terminal sessions": "Sesiones de terminal",
+  "Test": "Prueba",
+  "Test (pytest)": "Prueba (pytest)",
+  "Test Connection": "Probar conexión",
+  "Test Resource Folders": "Carpetas de recursos de prueba",
+  "Test Resources": "Recursos de prueba",
+  "Test Source Folders": "Carpetas de código fuente de prueba",
+  "Test case": "Caso de prueba",
+  "Test case (test)": "Caso de prueba (test)",
+  "Test file": "Archivo de prueba",
+  "Test function": "Función de prueba",
+  "Test module": "Módulo de prueba",
+  "Test results": "Resultados de pruebas",
+  "Test suite": "Conjunto de pruebas",
+  "Tests": "Pruebas",
+  "Text": "Texto",
+  "Text occurrences (language server not ready)": "Coincidencias de texto (servidor de lenguaje no preparado)",
+  "Text or hash": "Texto o hash",
+  "Text selected in the editor": "Texto seleccionado en el editor",
+  "Text to find": "Texto a buscar",
+  "The Kotlin debugger is not installed": "El depurador de Kotlin no está instalado",
+  "The Java debugger is not installed": "El depurador de Java no está instalado",
+  "The action already has this shortcut": "La acción ya tiene este atajo",
+  "The active changelist cannot be deleted": "La lista de cambios activa no se puede eliminar",
+  "The active file has no runnable element, test or run configuration.": "El archivo activo no tiene ningún elemento ejecutable, prueba ni configuración de ejecución.",
+  "The caches will be invalidated and rebuilt on the next startup: the symbol index of every project and the syntax caches.": "Las cachés se invalidarán y reconstruirán en el próximo inicio: el índice de símbolos de cada proyecto y las cachés de sintaxis.",
+  "The caret is not inside a conflict": "El cursor no está dentro de un conflicto",
+  "The clipboard does not contain a patch": "El portapapeles no contiene ningún parche",
+  "The mvnd home (or its executable). Empty = $MVND_HOME, else mvnd on PATH.": "El directorio raíz de mvnd (o su ejecutable). Vacío = $MVND_HOME, o bien mvnd en PATH.",
+  "The patch file is empty": "El archivo de parche está vacío",
+  "Builds, sync and Maven run configurations run through mvnd for speed. It embeds its own Maven (the home and mvnw are bypassed), needs Java 17+ and builds in parallel by default. Falls back to mvn when mvnd is missing or the JDK is too old.": "Las compilaciones, la sincronización y las configuraciones de ejecución de Maven se ejecutan a través de mvnd para mayor velocidad. Incluye su propio Maven (se omiten el directorio raíz y mvnw), necesita Java 17+ y compila en paralelo de forma predeterminada. Recurre a mvn cuando falta mvnd o el JDK es demasiado antiguo.",
+  "The project is not a Git repository.": "El proyecto no es un repositorio de Git.",
+  "The project path is always shown in the status bar navigation bar.": "La ruta del proyecto se muestra siempre en la barra de navegación de la barra de estado.",
+  "The remote contains commits that are not in your branch. Update the branch, then push again.": "El repositorio remoto contiene confirmaciones que no están en tu rama. Actualiza la rama y vuelve a hacer push.",
+  "The report covers no files": "El informe no abarca ningún archivo",
+  "The shortcut is already assigned to other actions. Do you want to remove other assignments?": "El atajo ya está asignado a otras acciones. ¿Deseas quitar las demás asignaciones?",
+  "The tab on the left": "La pestaña de la izquierda",
+  "The tab on the right": "La pestaña de la derecha",
+  "The template content could not be inserted.": "No se pudo insertar el contenido de la plantilla.",
+  "Their version": "Su versión",
+  "Theirs (incoming)": "Suya (entrante)",
+  "Theme": "Tema",
+  "Theme default": "Predeterminado del tema",
+  "Themes": "Temas",
+  "There is no online plugin repository": "No hay ningún repositorio de plugins en línea",
+  "This directory is preselected in \"Open…\" and \"New Window\" dialogs.": "Este directorio aparece preseleccionado en los diálogos \"Abrir…\" y \"Nueva ventana\".",
+  "This element can't be renamed": "Este elemento no se puede renombrar",
+  "This page could not be displayed": "No se pudo mostrar esta página",
+  "This project has no remote on GitHub.": "Este proyecto no tiene ningún repositorio remoto en GitHub.",
+  "This version has no release notes.": "Esta versión no tiene notas de la versión.",
+  "This will reset the current branch head to the selected commit, and update the working tree and the index according to the selected mode:": "Esto restablecerá el HEAD de la rama actual a la confirmación seleccionada y actualizará el árbol de trabajo y el índice según el modo seleccionado:",
+  "Thread": "Hilo",
+  "Time limit for Run/Debug process termination": "Límite de tiempo para finalizar procesos de Ejecución/Depuración",
+  "Timestamps": "Marcas de tiempo",
+  "Title": "Título",
+  "To commit:": "A la confirmación:",
+  "To directory:": "Al directorio:",
+  "To nearest indent position": "A la posición de sangría más cercana",
+  "To proper indent position": "A la posición de sangría adecuada",
+  "Toggle 'Skip Tests' Mode": "Alternar modo 'Omitir pruebas'",
+  "Toggle Bookmark": "Alternar marcador",
+  "Toggle Field Watchpoint": "Alternar punto de observación de campo",
+  "Toggle Light/Dark Theme": "Alternar tema claro/oscuro",
+  "Toggle Line Breakpoint": "Alternar punto de interrupción de línea",
+  "Toggle Method Breakpoint": "Alternar punto de interrupción de método",
+  "Toggle Offline Mode": "Alternar modo sin conexión",
+  "Toggle Performance Overlay (Dev)": "Alternar superposición de rendimiento (Dev)",
+  "Toggle Read-only Attribute": "Alternar atributo de solo lectura",
+  "Toggle Temporary Line Breakpoint": "Alternar punto de interrupción de línea temporal",
+  "Tool Settings": "Configuración de la herramienta",
+  "Tool Windows": "Ventanas de herramientas",
+  "Tool windows": "Ventanas de herramientas",
+  "Toolchain": "Cadena de herramientas (Toolchain)",
+  "Toolchain location": "Ubicación de la cadena de herramientas",
+  "Tools": "Herramientas",
+  "Tooltip delay": "Retraso de descripciones emergentes",
+  "Top": "Arriba",
+  "Total": "Total",
+  "Trailing": "Al final",
+  "Trait implementation": "Implementación de trait",
+  "Transaction mode": "Modo de transacción",
+  "Trim whitespaces": "Recortar espacios en blanco",
+  "Truncate": "Truncar",
+  "Truncate…": "Truncar…",
+  "Trust Host and Retry": "Confiar en el host y reintentar",
+  "Trust and Connect": "Confiar y conectar",
+  "Tx: Auto": "Tx: Automático",
+  "Tx: Manual": "Tx: Manual",
+  "Type / to see commands": "Escribe / para ver los comandos",
+  "Type Declaration": "Declaración de tipo",
+  "Type Hierarchy": "Jerarquía de tipos",
+  "Type an expression followed by": "Escribe una expresión seguida de",
+  "Type hierarchy": "Jerarquía de tipos",
+  "Type to filter by file name or code": "Escribe para filtrar por nombre de archivo o código",
+  "Type to filter symbols": "Escribe para filtrar símbolos",
+  "Type to search": "Escribe para buscar",
+  "TypeScript version": "Versión de TypeScript",
+  "Types": "Tipos",
+  "Typography Settings": "Configuración de tipografía",
+  "Main menu": "Menú principal",
+  "Hamburger button": "Botón de menú (hamburguesa)",
+  "Merged with main toolbar": "Integrado en la barra de herramientas principal",
+  "UI Options": "Opciones de la interfaz",
+  "UI elements take up less screen space": "Los elementos de la interfaz ocupan menos espacio en pantalla",
+  "UI fallback font": "Fuente de respaldo de la interfaz",
+  "UI font": "Fuente de la interfaz",
+  "UI font size": "Tamaño de fuente de la interfaz",
+  "Uninstalled {name}": "Se desinstaló {name}",
+  "URL:": "URL:",
+  "Unchecked values are inherited from the scheme.": "Los valores desmarcados se heredan del esquema.",
+  "Uncommitted changes are stashed before the update and restored afterwards.": "Los cambios sin confirmar se guardan en el stash antes de la actualización y se restauran después.",
+  "Underline": "Subrayado",
+  "Underscored": "Subrayado simple",
+  "Underwaved": "Subrayado ondulado",
+  "Undo": "Deshacer",
+  "Unread": "No leído",
+  "Undo Commit": "Deshacer confirmación",
+  "Undo Commit…": "Deshacer confirmación…",
+  "Undo Move / Rename": "Deshacer mover / renombrar",
+  "Unified Viewer": "Visor unificado",
+  "Unindent": "Reducir sangría",
+  "Uninstall": "Desinstalar",
+  "Uninstall…": "Desinstalar…",
+  "Unknown SSH Host": "Host SSH desconocido",
+  "Unmute Breakpoints": "Reactivar puntos de interrupción",
+  "Unpause": "Reanudar",
+  "Unpin Tab": "Desfijar pestaña",
+  "Unshelve": "Recuperar del shelf",
+  "Unshelve Changes": "Recuperar cambios del shelf",
+  "Unshelve…": "Recuperar del shelf…",
+  "Unsplit": "Quitar división",
+  "Unsplit All": "Quitar todas las divisiones",
+  "Unstage": "Quitar del área de preparación (Unstage)",
+  "Unstash Changes…": "Recuperar cambios del stash…",
+  "Update": "Actualizar",
+  "Update Project": "Actualizar proyecto",
+  "Update Project…": "Actualizar proyecto…",
+  "Update method": "Método de actualización",
+  "Update type": "Tipo de actualización",
+  "Update type:": "Tipo de actualización:",
+  "Upgrade": "Actualizar versión",
+  "Uptime": "Tiempo de actividad",
+  "Usage searches": "Búsquedas de usos",
+  "Usage search did not finish; nothing was deleted": "La búsqueda de usos no terminó; no se eliminó nada",
+  "usage": "uso",
+  "usages": "usos",
+  "more": "más",
+  "Usages": "Usos",
+  "Code author": "Autor del código",
+  "Usages Detected": "Usos detectados",
+  "Usages actions": "Acciones de usos",
+  "Usages of '{symbol}'": "Usos de '{symbol}'",
+  "Usages of element at caret": "Usos del elemento en el cursor",
+  "Use \"CamelHumps\" words": "Usar palabras \"CamelHumps\"",
+  "Use 24-hour time format": "Usar formato de 24 horas",
+  "Use Call Hierarchy (⌃⌥H) or Type Hierarchy (⌃H) on a symbol to see its hierarchy here": "Usa Jerarquía de llamadas (⌃⌥H) o Jerarquía de tipos (⌃H) en un símbolo para ver su jerarquía aquí",
+  "Use DROP CASCADE syntax": "Usar sintaxis DROP CASCADE",
+  "Use Default Theme": "Usar tema predeterminado",
+  "Use Find Usages (⌥F7) on a symbol to see its usages here": "Usa Buscar usos (⌥F7) en un símbolo para ver sus usos aquí",
+  "Use Maven Daemon (mvnd)": "Usar daemon de Maven (mvnd)",
+  "Use IF EXISTS syntax": "Usar sintaxis IF EXISTS",
+  "Use Option as Meta key": "Usar Option como tecla Meta",
+  "Use SSH tunnel": "Usar túnel SSH",
+  "Use block caret": "Usar cursor de bloque",
+  "Use contrast scrollbars": "Usar barras de desplazamiento con contraste",
+  "Use custom font": "Usar fuente personalizada",
+  "Use custom font:": "Usar fuente personalizada:",
+  "Use editor font": "Usar fuente del editor",
+  "Use lighter color in the dark theme and darker color in the light theme as a background": "Usar un color más claro en el tema oscuro y uno más oscuro en el tema claro como fondo",
+  "Use original line's indent for wrapped parts": "Usar la sangría de la línea original para las partes ajustadas",
+  "Use pretty formatting": "Usar formato legible",
+  "Use project colors in main toolbar": "Usar colores del proyecto en la barra de herramientas principal",
+  "Use smooth caret blinking": "Usar parpadeo suave del cursor",
+  "Use smooth caret movement": "Usar movimiento suave del cursor",
+  "Use soft wraps in console": "Usar ajustes de línea dinámicos en la consola",
+  "Use tab character": "Usar carácter de tabulación",
+  "Used by the npm run configurations detected from package.json scripts.": "Usado por las configuraciones de ejecución de npm detectadas a partir de los scripts de package.json.",
+  "Used for new files.": "Usado para archivos nuevos.",
+  "User": "Usuario",
+  "User settings file": "Archivo de configuración de usuario",
+  "User:": "Usuario:",
+  "Uses HostName, User, Port, IdentityFile and ProxyJump from ~/.ssh/config, and keys of the SSH agent.": "Usa HostName, User, Port, IdentityFile y ProxyJump de ~/.ssh/config, así como las claves del agente SSH.",
+  "VCS Operations": "Operaciones de VCS",
+  "VCS Operations…": "Operaciones de VCS…",
+  "Value": "Valor",
+  "Value tooltip delay (ms)": "Retraso de descripción emergente del valor (ms)",
+  "Value tooltips are off": "Las descripciones emergentes de valores están desactivadas",
+  "Values are inserted as SQL: quote strings, e.g. 'abc'.": "Los valores se insertan como SQL: pon las cadenas entre comillas, p. ej., 'abc'.",
+  "Values of local variables are shown after the lines that use them while suspended.": "Los valores de las variables locales se muestran después de las líneas que las usan mientras está en pausa.",
+  "Variable": "Variable",
+  "Variables": "Variables",
+  "Variables:": "Variables:",
+  "Version": "Versión",
+  "Version Control": "Control de versiones",
+  "Version control": "Control de versiones",
+  "Version control:": "Control de versiones:",
+  "Version control is not configured": "El control de versiones no está configurado",
+  "Version used by vtsls / typescript-language-server (typescript.tsdk, tsserver.path).": "Versión usada por vtsls / typescript-language-server (typescript.tsdk, tsserver.path).",
+  "Vertical": "Vertical",
+  "View": "Ver",
+  "View Breakpoints…": "Ver puntos de interrupción…",
+  "View Pull Requests": "Ver pull requests",
+  "View Usages": "Ver usos",
+  "View in Browser": "Ver en el navegador",
+  "Violet": "Violeta",
+  "Virtual Space": "Espacio virtual",
+  "Virtualenv Environment": "Entorno Virtualenv",
+  "Virtualenv Location": "Ubicación de Virtualenv",
+  "Visual guides": "Guías visuales",
+  "WHERE filter": "Filtro WHERE",
+  "Warn if CRLF line separators are about to be committed": "Advertir si se están por confirmar separadores de línea CRLF",
+  "Warn when committing in detached HEAD or during rebase": "Advertir al confirmar en HEAD desacoplado o durante un rebase",
+  "Warning": "Advertencia",
+  "Welcome": "Bienvenido",
+  "Welcome to OpenIDEA": "Bienvenido a OpenIDEA",
+  "What's New": "Novedades",
+  "When caret is moved": "Cuando se mueve el cursor",
+  "When files are created": "Cuando se crean archivos",
+  "When files are deleted": "Cuando se eliminan archivos",
+  "When the current tab is closed, activate": "Cuando se cierre la pestaña actual, activar",
+  "When the tab limit is reached": "Cuando se alcance el límite de pestañas",
+  "Widescreen tool window layout": "Diseño de ventanas de herramientas para pantalla ancha",
+  "Window": "Ventana",
+  "Words": "Palabras",
+  "Working": "Trabajando",
+  "Working directory": "Directorio de trabajo",
+  "Wrap when typing reaches right margin": "Ajustar línea cuando la escritura alcance el margen derecho",
+  "Wrapping": "Ajuste de línea",
+  "Yellow": "Amarillo",
+  "You can also drop a folder onto this window.": "También puedes arrastrar y soltar una carpeta en esta ventana.",
+  "Your version": "Tu versión",
+  "Zoom": "Zoom",
+  "Zoom In IDE": "Acercar IDE",
+  "Zoom Out IDE": "Alejar IDE",
+  "a dollar sign. Leading tabs are indent units.": "un signo de pesos. Las tabulaciones iniciales son unidades de sangría.",
+  "any number of nodes (arguments, statements). A placeholder used twice must match equal code.": "cualquier número de nodos (argumentos, instrucciones). Un marcador de posición usado dos veces debe coincidir con código idéntico.",
+  "any, rust, typescript…": "any, rust, typescript…",
+  "cargo run configurations and rust-analyzer use this toolchain (PATH, RUSTUP_TOOLCHAIN).": "Las configuraciones de ejecución de cargo y rust-analyzer usan esta cadena de herramientas (PATH, RUSTUP_TOOLCHAIN).",
+  "chord prefix": "prefijo de combinación",
+  "command line tool. Install it, then run": "herramienta de línea de comandos. Instálala y luego ejecuta",
+  "compact the conversation": "compactar la conversación",
+  "configured in": "configurado en",
+  "const declaration": "declaración const",
+  "current branch": "rama actual",
+  "debugpy is not installed": "debugpy no está instalado",
+  "delete specific rows from a table": "eliminar filas específicas de una tabla",
+  "failed to load": "error al cargar",
+  "for loop": "ciclo for",
+  "for range loop": "ciclo for range",
+  "for…in loop": "ciclo for…in",
+  "for…of loop": "ciclo for…of",
+  "from packageManager / lock file": "de packageManager / archivo de bloqueo",
+  "from ~/.ssh/config": "de ~/.ssh/config",
+  "host or ~/.ssh/config alias": "host o alias de ~/.ssh/config",
+  "if statement": "instrucción if",
+  "impl block": "bloque impl",
+  "import default": "import predeterminado",
+  "in a terminal, then retry.": "en una terminal y vuelve a intentarlo.",
+  "insert rows into a table": "insertar filas en una tabla",
+  "inside your project.": "dentro de tu proyecto.",
+  "is already assigned to:": "ya está asignado a:",
+  "is omitted (with one following blank line) when there is no package.": "se omite (con una línea en blanco después) cuando no hay paquete.",
+  "is on PATH.": "está en PATH.",
+  "last · p50 · p95 · max": "último · p50 · p95 · máx.",
+  "let binding": "vinculación let",
+  "let mut binding": "vinculación let mut",
+  "main function": "función main",
+  "main function with __main__ guard": "función main con guarda __main__",
+  "main() function": "función main()",
+  "main() method": "método main()",
+  "main(args) function": "función main(args)",
+  "match expression": "expresión match",
+  "match one node,": "coincide con un nodo,",
+  "new column definition": "definición de nueva columna",
+  "new remote branch": "nueva rama remota",
+  "new table definition": "definición de nueva tabla",
+  "new view definition": "definición de nueva vista",
+  "no file is open in the editor": "no hay ningún archivo abierto en el editor",
+  "no symbols": "sin símbolos",
+  "not found": "no encontrado",
+  "not installed in this project": "no instalado en este proyecto",
+  "or click a line number to set a breakpoint.": "o haz clic en un número de línea para establecer un punto de interrupción.",
+  "per module, the JDK of its Java version": "por módulo, el JDK de su versión de Java",
+  "pip output": "salida de pip",
+  "places the caret. A line with": "coloca el cursor. Una línea con",
+  "println! with Debug": "println! con Debug",
+  "pytest test function": "función de prueba de pytest",
+  "replaced ·": "reemplazados ·",
+  "rust-analyzer runs the tool after each save and reports its diagnostics.": "rust-analyzer ejecuta la herramienta después de cada guardado y reporta sus diagnósticos.",
+  "select a limited number of rows from a table": "seleccionar un número limitado de filas de una tabla",
+  "select all rows from a table": "seleccionar todas las filas de una tabla",
+  "select specific rows from a table": "seleccionar filas específicas de una tabla",
+  "select the number of specific rows in a table": "seleccionar el número de filas específicas en una tabla",
+  "surrounded text,": "texto rodeado,",
+  "the language server's own TypeScript": "el propio TypeScript del servidor de lenguaje",
+  "update values in a table": "actualizar valores en una tabla",
+  "val declaration": "declaración val",
+  "var declaration": "declaración var",
+  "variables (repeated ones are linked),": "variables (las repetidas están vinculadas),",
+  "via the gear menu › Install Plugin from Disk….": "mediante el menú de engrane › Instalar plugin desde disco….",
+  "with BOM": "con BOM",
+  "with BOM under Windows, with no BOM otherwise": "con BOM en Windows, sin BOM en otros sistemas",
+  "with NO BOM": "SIN BOM",
+  "with statement": "instrucción with",
+  "{count} rows exported": "{count} filas exportadas",
+  "{index} of {total}": "{index} de {total}",
+  "{name} failed": "{name} falló",
+  "{name} has unsaved changes": "{name} tiene cambios sin guardar",
+  "{name} installed": "{name} instalado",
+  "{name} is not installed": "{name} no está instalado",
+  "{key} to open in Find tool window": "{key} para abrir en la ventana de herramientas Buscar",
+  "⌥← / ⌥→ and ⌥⌫ stop at humps of camelCase names.": "⌥← / ⌥→ y ⌥⌫ se detienen en las mayúsculas de nombres en camelCase.",
+  "Specify commit message": "Especificar mensaje de confirmación",
+  "Author:": "Autor:",
+  "Run Git hooks": "Ejecutar hooks de Git",
+  "Advanced Commit Checks": "Comprobaciones avanzadas de confirmación",
+  "Configure": "Configurar",
+  "View Options": "Opciones de vista",
+  "Stash": "Stash",
+  "Remove Recent Project": "Quitar proyecto reciente",
+  "Group By": "Agrupar por",
+  "The search hit its limit; only usages found so far are replaced.": "La búsqueda alcanzó su límite; solo se reemplazaron los usos encontrados hasta ahora.",
+  "Review": "Revisar",
+  "Commit and Push…": "Confirmar y hacer push…",
+  "Language server": "Servidor de lenguaje",
+  "Path": "Ruta",
+  "Missing": "Faltante",
+  "Installs into the IDE's own tools folder via {installMethod}": "Se instala en la carpeta de herramientas del propio IDE mediante {installMethod}",
+  "No tool selected": "Ninguna herramienta seleccionada",
+  "Custom": "Personalizado",
+  "On PATH": "En PATH",
+  "Reinstall": "Reinstalar",
+  "Move focus to the Editor with Escape": "Mover el foco al editor con Escape",
+  "Otherwise Escape goes to the shell.": "De lo contrario, Escape se envía al shell.",
+  "Configure terminal keybindings": "Configurar atajos de teclado de la terminal",
+  "Used for characters the main font lacks.": "Se usa para los caracteres que faltan en la fuente principal.",
+  "Column width": "Ancho de columna",
+  "Installed Shells": "Shells instalados",
+  "Installed shells": "Shells instalados",
+  "Shell Path": "Ruta del shell",
+  "New Predefined Session": "Nueva sesión predefinida",
+  "Suspend": "Suspender",
+  "\"Breakpoint hit\" message": "Mensaje de \"Punto de interrupción alcanzado\"",
+  "Evaluate and log": "Evaluar y registrar",
+  "History": "Historial",
+  "Expand value": "Expandir valor",
+  "Expression history": "Historial de expresiones",
+  "Allow multiple instances": "Permitir múltiples instancias",
+  "Hold Shift to Debug, F4 to edit, Delete to remove": "Mantén presionado Shift para depurar, F4 para editar, Supr para eliminar",
+  "Hold Shift to Run, F4 to edit, Delete to remove": "Mantén presionado Shift para ejecutar, F4 para editar, Supr para eliminar",
+  "Send EOF": "Enviar EOF",
+  "Collapse folded lines": "Contraer líneas plegadas",
+  "Close Tool Window Tab": "Cerrar pestaña de la ventana de herramientas",
+  "No open files": "No hay archivos abiertos",
+  "Open files": "Archivos abiertos",
+  "New name:": "Nuevo nombre:",
+  "Open copy in editor": "Abrir copia en el editor",
+  "Safe delete (with usage search)": "Eliminación segura (con búsqueda de usos)",
+  "Looking for usages…": "Buscando usos…",
+  "Delete Without Search": "Eliminar sin buscar",
+  "Rebasing {commit} from {branch}": "Haciendo rebase de {commit} desde {branch}",
+  "Already rebased commits and commits from {branch}": "Confirmaciones ya aplicadas en rebase y confirmaciones de {branch}",
+  "Already rebased commits": "Confirmaciones ya aplicadas en rebase",
+  "Changes from {name}": "Cambios de {name}",
+  "Your changes": "Tus cambios",
+  "Changes from diverging branches": "Cambios de ramas divergentes",
+  "Local Changes": "Cambios locales",
+  "Changes from cherry-pick {commit}": "Cambios de cherry-pick {commit}",
+  "Changes from cherry-pick": "Cambios de cherry-pick",
+  "Your version, branch {branch}": "Tu versión, rama {branch}",
+  "Git Checkout Problem": "Problema al hacer checkout en Git",
+  "Smart Checkout": "Checkout inteligente",
+  "Force Checkout": "Forzar checkout",
+  "Don't Checkout": "No hacer checkout",
+  "Rebase onto Remote": "Hacer rebase sobre el remoto",
+  "Drop Local Commits": "Descartar confirmaciones locales",
+  "Checkout {name}": "Hacer checkout de {name}",
+  "Restore": "Restaurar",
+  "View Commits": "Ver confirmaciones",
+  "Delete Tracked Branch": "Eliminar rama rastreada",
+  "Deleted branch {name}": "Rama {name} eliminada",
+  "Unmerged commits were discarded": "Se descartaron las confirmaciones no fusionadas",
+  "Restored branch {name}": "Rama {name} restaurada",
+  "Commits of {name}": "Confirmaciones de {name}",
+  "All files are up-to-date": "Todos los archivos están actualizados",
+  "Update Info": "Información de actualización",
+  "Press again to go to the next file": "Presiona de nuevo para ir al siguiente archivo",
+  "Press again to go to the previous file": "Presiona de nuevo para ir al archivo anterior",
+  "Include in commit": "Incluir en la confirmación",
+  "Code analysis": "Análisis de código",
+  "Line separators": "Separadores de línea",
+  "Commit during rebase": "Confirmar durante rebase",
+  "Commit in detached HEAD": "Confirmar en HEAD desacoplado",
+  "Amend Commit": "Enmendar confirmación",
+  "Show Commit Message History": "Mostrar historial de mensajes de confirmación",
+  "Don't warn about this target": "No advertir sobre este destino",
+  "Target branch": "Rama de destino",
+  "Checked out {name}": "Checkout realizado en {name}",
+  "Pin Window": "Fijar ventana",
+  "Search Context": "Contexto de búsqueda",
+  "Anywhere": "En cualquier lugar",
+  "In Comments": "En comentarios",
+  "In String Literals": "En literales de cadena",
+  "Except Comments": "Excepto en comentarios",
+  "Except String Literals": "Excepto en literales de cadena",
+  "Except Comments and String Literals": "Excepto en comentarios y literales de cadena",
+  "Recent Replacements": "Reemplazos recientes",
+  "No recent replacements": "No hay reemplazos recientes",
+  "Replace {count} Occurrences": "Reemplazar {count} coincidencias",
+  "Add Mnemonic Bookmark": "Agregar marcador mnemotécnico",
+  "Change Mnemonic": "Cambiar mnemotécnico",
+  "Assign Mnemonic": "Asignar mnemotécnico",
+  "Assigned bookmark": "Marcador asignado",
+  "Current bookmark": "Marcador actual",
+  "No bookmarks": "Sin marcadores",
+  "Edit Bookmark Description": "Editar descripción del marcador",
+  "Toggle Bookmark with Mnemonic": "Alternar marcador con mnemotécnico",
+  "Toggle Bookmark {n}": "Alternar marcador {n}",
+  "Go to Bookmark {n}": "Ir al marcador {n}",
+  "Select In": "Seleccionar en",
+  "Select In…": "Seleccionar en…",
+  "Next Result": "Siguiente resultado",
+  "Previous Result": "Resultado anterior",
+  "Open Result": "Abrir resultado",
+  "Graph Options": "Opciones del gráfico",
+  "Go to Hash/Branch/Tag": "Ir a Hash/Rama/Etiqueta",
+  "Enter hash or branch/tag name": "Ingresa el hash o nombre de rama/etiqueta",
+  "Sort": "Ordenar",
+  "By Commit Date": "Por fecha de confirmación",
+  "Topologically": "Topológicamente",
+  "First Parent": "Primer padre",
+  "No Merges": "Sin fusiones",
+  "Branch Actions": "Acciones de rama",
+  "Collapse Linear Branches": "Contraer ramas lineales",
+  "Expand Linear Branches": "Expandir ramas lineales",
+  "Compact References View": "Vista compacta de referencias",
+  "Tag Names": "Nombres de etiquetas",
+  "Long Edges": "Aristas largas",
+  "Commit Timestamp": "Marca de tiempo de la confirmación",
+  "References on the Left": "Referencias a la izquierda",
+  "Hash": "Hash",
+  "Highlight": "Resaltar",
+  "My Commits": "Mis confirmaciones",
+  "Merge Commits": "Confirmaciones de fusión",
+  "Rebase…": "Hacer rebase…",
+  "Manage Remotes…": "Administrar remotos…",
+  "Clone…": "Clonar…",
+  "New Worktree…": "Nuevo árbol de trabajo…",
+  "Worktrees…": "Árboles de trabajo…",
+  "Worktrees": "Árboles de trabajo",
+  "New Worktree": "Nuevo árbol de trabajo",
+  "Git Remotes": "Remotos de Git",
+  "Define Remote": "Definir remoto",
+  "Edit Remote": "Editar remoto",
+  "Add Remote…": "Agregar remoto…",
+  "Remove Remote": "Quitar remoto",
+  "Edit Remote…": "Editar remoto…",
+  "Remove Worktree": "Quitar árbol de trabajo",
+  "Branch to merge:": "Rama para fusionar:",
+  "Check out:": "Hacer checkout:",
+  "Create a new branch": "Crear una nueva rama",
+  "Folder:": "Carpeta:",
+  "Options:": "Opciones:",
+  "No remotes": "Sin remotos",
+  "Include disabled actions": "Incluir acciones deshabilitadas",
+  "Symbol Kinds": "Tipos de símbolos",
+  "{key} to assign a shortcut": "{key} para asignar un atajo",
+  "Open Settings Page": "Abrir página de configuración",
+  "Assign Shortcut…": "Asignar atajo…",
+  "New List…": "Nueva lista…",
+  "Rename List…": "Renombrar lista…",
+  "Make Default": "Establecer como predeterminada",
+  "Delete List": "Eliminar lista",
+  "Move to Another List": "Mover a otra lista",
+  "New Bookmark List…": "Nueva lista de marcadores…",
+  "Toggle File Bookmark": "Alternar marcador de archivo",
+  "New Bookmark List": "Nueva lista de marcadores",
+  "Rename Bookmark List": "Renombrar lista de marcadores",
+  "Delete Bookmark List": "Eliminar lista de marcadores",
+  "Add Bookmark": "Agregar marcador",
+  "Remove Bookmark": "Quitar marcador",
+  "Interfaces": "Interfaces",
+  "Structs": "Structs",
+  "Enums": "Enums",
+  "Traits": "Traits",
+  "Type Aliases": "Alias de tipos",
+  "Functions": "Funciones",
+  "Methods": "Métodos",
+  "Constructors": "Constructores",
+  "Fields": "Campos",
+  "Constants": "Constantes",
+  "Enum Members": "Miembros de enum",
+  "Modules": "Módulos",
+  "Namespaces": "Espacios de nombres",
+  "List name": "Nombre de la lista",
+  "Add Service": "Agregar servicio",
+  "Add service": "Agregar servicio",
+  "No services configured.": "No hay servicios configurados.",
+  "Select service to view details": "Selecciona un servicio para ver los detalles",
+  "Run Configuration Type": "Tipo de configuración de ejecución",
+  "Docker Registry…": "Registro de Docker…",
+  "Docker Connection…": "Conexión de Docker…",
+  "Address:": "Dirección:",
+  "Username:": "Nombre de usuario:",
+  "Scope Based": "Basado en ámbito",
+  "Scope:": "Ámbito:",
+  "Edit Scopes…": "Editar ámbitos…",
+  "Import a report collected in CI from disk": "Importar desde el disco un reporte recopilado en CI",
+  "Manage Coverage Reports…": "Administrar reportes de cobertura…",
+  "Coverage Reports": "Reportes de cobertura",
+  "Show Selected": "Mostrar seleccionados",
+  "Import…": "Importar…",
+  "Reload All from Disk": "Recargar todo desde el disco",
+  "Reset Font Size in All Editors": "Restablecer tamaño de fuente en todos los editores",
+  "Library source (read-only).": "Código fuente de biblioteca (solo lectura).",
+  "Search In Selection": "Buscar en la selección",
+  "Search Scope": "Ámbito de búsqueda",
+  "Filter Search Results": "Filtrar resultados de búsqueda",
+  "Filter search results": "Filtrar resultados de búsqueda",
+  "Replace ({key})": "Reemplazar ({key})",
+  "Replace All ({key})": "Reemplazar todo ({key})",
+  "Include ({key})": "Incluir ({key})",
+  "Exclude ({key})": "Excluir ({key})",
+  "Recent searches": "Búsquedas recientes",
+  "New Line": "Nueva línea",
+  "New Line in Search Field": "Nueva línea en el campo de búsqueda",
+  "Quick Type Definition": "Definición rápida de tipo",
+  "Code Cleanup in File": "Limpieza de código en el archivo",
+  "Nothing to generate here": "No hay nada que generar aquí",
+  "Sort by name": "Ordenar por nombre",
+  "Sort suggestions by relevance": "Ordenar sugerencias por relevancia",
+  "Sort suggestions alphabetically": "Ordenar sugerencias alfabéticamente",
+  "Press ↵ to insert, ⇥ to replace": "Presiona ↵ para insertar, ⇥ para reemplazar",
+  "Formatting is turned off for this file (Code Style › Formatter › Do not format)": "El formato está desactivado para este archivo (Estilo de código › Formateador › No formatear)",
+  "No type definition found": "No se encontró definición de tipo",
+  "No definition found": "No se encontró definición",
+  "Typo: Change to…": "Error ortográfico: Cambiar a…",
+  "Spelling": "Ortografía",
+  "No refactoring applies here": "No se aplica ninguna refactorización aquí",
+  "Inline Completion": "Autocompletado en línea",
+  "Call Inline Completion": "Invocar autocompletado en línea",
+  "Inline completion is off for this language": "El autocompletado en línea está desactivado para este lenguaje",
+  "No inline suggestions": "No hay sugerencias en línea",
+  "{servers} doesn't support {feature}": "{servers} no admite {feature}",
+  "completion": "autocompletado",
+  "inline completion": "autocompletado en línea",
+  "hover": "información al pasar el cursor",
+  "signature help": "ayuda de firma",
+  "go to definition": "ir a la definición",
+  "go to declaration": "ir a la declaración",
+  "go to type definition": "ir a la definición de tipo",
+  "go to implementation": "ir a la implementación",
+  "find references": "buscar referencias",
+  "document highlights": "resaltado en el documento",
+  "code actions": "acciones de código",
+  "rename": "renombrar",
+  "formatting": "formateo",
+  "range formatting": "formateo de rango",
+  "inlay hints": "sugerencias incrustadas",
+  "code lens": "lente de código",
+  "document links": "enlaces del documento",
+  "call hierarchy": "jerarquía de llamadas",
+  "type hierarchy": "jerarquía de tipos",
+  "workspace symbols": "símbolos del espacio de trabajo",
+  "Insert Inline Proposal": "Insertar propuesta en línea",
+  "Insert Inline Proposal: Next Word": "Insertar propuesta en línea: Siguiente palabra",
+  "Hide Inline Proposal": "Ocultar propuesta en línea",
+  "Show Next Inline Proposal": "Mostrar siguiente propuesta en línea",
+  "Show Previous Inline Proposal": "Mostrar propuesta en línea anterior",
+  "Inspection profile:": "Perfil de inspección:",
+  "Inspection profile": "Perfil de inspección",
+  "Configure inspections": "Configurar inspecciones",
+  "Run Code Cleanup": "Ejecutar limpieza de código",
+  "Apply the language servers' automatic fixes": "Aplicar las correcciones automáticas de los servidores de lenguaje",
+  "No files with a language server in this scope": "No hay archivos con un servidor de lenguaje en este ámbito",
+  "Code Cleanup": "Limpieza de código",
+  "Code Cleanup…": "Limpieza de código…",
+  "Clean Up": "Limpiar",
+  "No custom scopes": "No hay ámbitos personalizados",
+  "Custom scope": "Ámbito personalizado",
+  "Custom Scopes": "Ámbitos personalizados",
+  "Choose a scope": "Elige un ámbito",
+  "Enter a project name": "Ingresa un nombre para el proyecto",
+  "The name contains characters a folder name cannot have": "El nombre contiene caracteres que un nombre de carpeta no puede tener",
+  "Project Location": "Ubicación del proyecto",
+  "New Project": "Nuevo proyecto",
+  "New Project…": "Nuevo proyecto…",
+  "Create Git repository": "Crear repositorio Git",
+  "Export Settings": "Exportar configuración",
+  "Export Settings…": "Exportar configuración…",
+  "OpenIDEA settings": "Configuración de OpenIDEA",
+  "Settings exported": "Configuración exportada",
+  "Cannot export settings": "No se puede exportar la configuración",
+  "Import Settings": "Importar configuración",
+  "Import Settings…": "Importar configuración…",
+  "Settings imported": "Configuración importada",
+  "Restart to apply imported templates, macros, layouts and view options.": "Reinicia para aplicar las plantillas, macros, diseños y opciones de vista importados.",
+  "Cannot import settings": "No se puede importar la configuración",
+  "Rename Project": "Renombrar proyecto",
+  "Rename Project…": "Renombrar proyecto…",
+  "New project name:": "Nuevo nombre del proyecto:",
+  "Cannot rename project": "No se puede renombrar el proyecto",
+  "Power Save Mode": "Modo de ahorro de energía",
+  "Cannot change Power Save Mode": "No se puede cambiar el modo de ahorro de energía",
+  "Power save mode is on: completion and documentation popups and usage highlighting are off.": "El modo de ahorro de energía está activado: las ventanas emergentes de autocompletado y documentación y el resaltado de usos están desactivados.",
+  "This needs the desktop app": "Esto requiere la aplicación de escritorio",
+  "Turn Off": "Desactivar",
+  "Build Tools": "Herramientas de compilación",
+  "Import a Coverage Report…": "Importar un reporte de cobertura…",
+  "Choose the shown coverage suite, delete suites and imported reports": "Elige la suite de cobertura mostrada, elimina suites y reportes importados",
+  "Import Coverage Report": "Importar reporte de cobertura",
+  "Coverage reports (lcov, JaCoCo XML, Go cover profile)": "Reportes de cobertura (lcov, JaCoCo XML, perfil Go cover)",
+  "All files": "Todos los archivos",
+  "Importing coverage needs the desktop app": "Importar cobertura requiere la aplicación de escritorio",
+  "Coverage reports": "Reportes de cobertura",
+  "not loaded": "no cargado",
+  "No coverage reports. Run with coverage or import a report.": "No hay reportes de cobertura. Ejecuta con cobertura o importa un reporte.",
+  "No color": "Sin color",
+  "Verify CA": "Verificar CA",
+  "Verify Full": "Verificación completa",
+  "Manual": "Manual",
+  "Name or pattern, e.g. app_*": "Nombre o patrón, p. ej. app_*",
+  "Schemas": "Esquemas",
+  "Advanced": "Avanzado",
+  "Data source type": "Tipo de origen de datos",
+  "path/to/database.db (absolute or project-relative)": "ruta/a/base_de_datos.db (absoluta o relativa al proyecto)",
+  "Connection type:": "Tipo de conexión:",
+  "Connection type": "Tipo de conexión",
+  "URL only": "Solo URL",
+  "from the URL": "desde la URL",
+  "Connects with the URL alone: host, port, database, SSL and parameters come from it.": "Se conecta solo con la URL: el host, el puerto, la base de datos, SSL y los parámetros se obtienen de ella.",
+  "Editing the URL fills in the settings above.": "Editar la URL completa la configuración de arriba.",
+  "Connection": "Conexión",
+  "Transaction control:": "Control de transacciones:",
+  "Transaction control": "Control de transacciones",
+  "Default schema:": "Esquema predeterminado:",
+  "public (search_path, e.g. app, public)": "public (search_path, p. ej. app, public)",
+  "Time zone:": "Zona horaria:",
+  "Server default, e.g. UTC or Europe/Berlin": "Predeterminada del servidor, p. ej. UTC o Europe/Berlin",
+  "UTC (+00:00), e.g. Europe/Berlin or +08:00": "UTC (+00:00), p. ej. Europe/Berlin o +08:00",
+  "Run keep-alive query each": "Ejecutar consulta keep-alive cada",
+  "Auto-disconnect after": "Desconectar automáticamente después de",
+  "Startup script:": "Script de inicio:",
+  "Runs on every new connection, before any other statement.": "Se ejecuta en cada nueva conexión, antes de cualquier otra instrucción.",
+  "Passphrase:": "Frase de contraseña:",
+  "Passphrase": "Frase de contraseña",
+  "Mode:": "Modo:",
+  "CA file:": "Archivo de CA:",
+  "System roots when empty": "Raíces del sistema si está vacío",
+  "CA Certificate File": "Archivo de certificado de CA",
+  "Client certificate file:": "Archivo de certificado de cliente:",
+  "Client Certificate File": "Archivo de certificado de cliente",
+  "Client key file:": "Archivo de clave de cliente:",
+  "Client Key File": "Archivo de clave de cliente",
+  "Load Names from Server": "Cargar nombres desde el servidor",
+  "Driver properties": "Propiedades del controlador",
+  "Property name": "Nombre de la propiedad",
+  "Property value": "Valor de la propiedad",
+  "Remove property": "Quitar propiedad",
+  "Add Property": "Agregar propiedad",
+  "Color:": "Color:",
+  "Color": "Color",
+  "Add comment": "Agregar comentario",
+  "Connecting…": "Conectando…",
+  "OceanBase (MySQL mode)": "OceanBase (modo MySQL)",
+  "HTTP Request": "Solicitud HTTP",
+  "External Libraries": "Bibliotecas externas",
+  "library root": "raíz de la biblioteca",
+  "Scratch File": "Archivo de borrador",
+  "Stop Macro Recording": "Detener grabación de macro",
+  "Start Macro Recording": "Iniciar grabación de macro",
+  "Recording macro…": "Grabando macro…",
+  "Rename Macro": "Renombrar macro",
+  "Enter a macro name": "Ingresa un nombre para la macro",
+  "A macro with this name exists": "Ya existe una macro con este nombre",
+  "Delete Macro": "Eliminar macro",
+  "Edit Macros": "Editar macros",
+  "Edit Macros…": "Editar macros…",
+  "No saved macros": "No hay macros guardadas",
+  "Recorded steps": "Pasos grabados",
+  "Macro playback stopped": "Reproducción de macro detenida",
+  "A recorded step could not run here.": "Un paso grabado no se pudo ejecutar aquí.",
+  "Nothing was recorded": "No se grabó nada",
+  "Enter Macro Name": "Ingresar nombre de la macro",
+  "Name (leave empty to keep it only as the last macro):": "Nombre (déjalo vacío para conservarla solo como la última macro):",
+  "Play Back Last Macro": "Reproducir última macro",
+  "Play Saved Macros…": "Reproducir macros guardadas…",
+  "Play Saved Macro": "Reproducir macro guardada",
+  "Search for file type": "Buscar tipo de archivo",
+  "File types": "Tipos de archivo",
+  "this view": "esta vista",
+  "New in This Directory…": "Nuevo en este directorio…",
+  "All Changed Files": "Todos los archivos modificados",
+  "Scratches and Consoles": "Borradores y consolas",
+  "Run Anything": "Ejecutar cualquier cosa",
+  "Run Anything…": "Ejecutar cualquier cosa…",
+  "Run a command, configuration or goal": "Ejecutar un comando, configuración o meta",
+  "Run Anything entries": "Entradas de Ejecutar cualquier cosa",
+  "Press Enter to run the command in the project directory": "Presiona Enter para ejecutar el comando en el directorio del proyecto",
+  "Type a command": "Escribe un comando",
+  "Enter to run, Tab to complete. Other commands run in the project directory.": "Enter para ejecutar, Tab para completar. Otros comandos se ejecutan en el directorio del proyecto.",
+  "Recent": "Recientes",
+  "Search types": "Buscar tipos",
+  "Search configuration types": "Buscar tipos de configuración",
+  "Configuration types": "Tipos de configuración",
+  "Redirect input": "Redirigir entrada",
+  "Paths to \".env\" files": "Rutas a archivos \".env\"",
+  "Save console output to file": "Guardar salida de la consola en un archivo",
+  "Show console when a message is printed to stdout": "Mostrar consola cuando se imprima un mensaje en stdout",
+  "Show console when a message is printed to stderr": "Mostrar consola cuando se imprima un mensaje en stderr",
+  "Add before launch task": "Agregar tarea previa al lanzamiento",
+  "Open run/debug tool window when started": "Abrir ventana de herramientas de ejecución/depuración al iniciar",
+  "Focus run/debug tool window when started": "Enfocar ventana de herramientas de ejecución/depuración al iniciar",
+  "Emulate terminal in output console": "Emular terminal en la consola de salida",
+  "Operating System": "Sistema operativo",
+  "Logs": "Registros",
+  "Before Launch": "Antes de iniciar",
+  "Before launch": "Antes de iniciar",
+  "Before launch tasks": "Tareas previas al inicio",
+  "Store as project file": "Guardar como archivo de proyecto",
+  "Modify options": "Modificar opciones",
+  "e.g. ./gradlew or cargo": "p. ej. ./gradlew o cargo",
+  "Edit Environment Variables": "Editar variables de entorno",
+  "Browse for .env Files": "Explorar archivos .env",
+  "System environment variables are not passed": "Las variables de entorno del sistema no se pasan",
+  "Redirect input from": "Redirigir entrada desde",
+  "File relative to the project root": "Archivo relativo a la raíz del proyecto",
+  "Shell command, e.g. make generate": "Comando de shell, p. ej. make generate",
+  "Remove Task": "Quitar tarea",
+  "Add task": "Agregar tarea",
+  "Add configuration…": "Agregar configuración…",
+  "Add configuration": "Agregar configuración",
+  "New Folder": "Nueva carpeta",
+  "Remove Folder": "Quitar carpeta",
+  "Create New Folder": "Crear nueva carpeta",
+  "Unnamed": "Sin nombre",
+  "No run configurations added.": "No se han agregado configuraciones de ejecución.",
+  "Add new…": "Agregar nueva…",
+  "Edit configuration templates…": "Editar plantillas de configuración…",
+  "Import from .vscode/launch.json": "Importar desde .vscode/launch.json",
+  "Import Run Configurations from .vscode/launch.json": "Importar configuraciones de ejecución desde .vscode/launch.json",
+  "Cannot import run configurations": "No se pueden importar las configuraciones de ejecución",
+  "No run configurations imported from {file}": "No se importaron configuraciones de ejecución desde {file}",
+  "Imported {n} run configuration from {file}": "Se importó {n} configuración de ejecución desde {file}",
+  "Imported {n} run configurations from {file}": "Se importaron {n} configuraciones de ejecución desde {file}",
+  "Skipped '{name}': {reason}": "Se omitió '{name}': {reason}",
+  "Left out of '{name}': {keys}": "Excluido de '{name}': {keys}",
+  "Click OK or Apply to save them.": "Haz clic en Aceptar o Aplicar para guardarlas.",
+  "A configuration with this name already exists": "Ya existe una configuración con este nombre",
+  "Type '{type}' has no equivalent here": "El tipo '{type}' no tiene equivalente aquí",
+  "Request '{request}' isn't supported": "La solicitud '{request}' no es compatible",
+  "Only attaching to a host and port is supported": "Solo se admite adjuntar a un host y puerto",
+  "Uses {variable}, which is known only when VS Code starts it": "Usa {variable}, que solo se conoce cuando VS Code lo inicia",
+  "No program, module or command to run": "No hay programa, módulo o comando para ejecutar",
+  "Its configuration '{member}' isn't imported": "Su configuración '{member}' no se importó",
+  "Not a configuration with a name": "No es una configuración con nombre",
+  "'{name}' is saved in run.local.toml because it uses values from this machine": "'{name}' se guardó en run.local.toml porque usa valores de este equipo",
+  "This project has no .vscode/launch.json": "Este proyecto no tiene .vscode/launch.json",
+  "Import from JetBrains run configurations": "Importar desde configuraciones de ejecución de JetBrains",
+  "Import Run Configurations from JetBrains (.run, .idea)": "Importar configuraciones de ejecución de JetBrains (.run, .idea)",
+  "This project has no JetBrains run configurations (.run, .idea)": "Este proyecto no tiene configuraciones de ejecución de JetBrains (.run, .idea)",
+  "{file} isn't in the project": "{file} no está en el proyecto",
+  "Uses {variable}, a path variable with no value here": "Usa {variable}, una variable de ruta sin valor aquí",
+  "Uses {variable}, and the project has several modules": "Usa {variable}, y el proyecto tiene varios módulos",
+  "The file can't be read: {detail}": "No se puede leer el archivo: {detail}",
+  "Templates": "Plantillas",
+  "Configuration templates": "Plantillas de configuración",
+  "Back to configurations": "Volver a las configuraciones",
+  "Select a configuration type": "Selecciona un tipo de configuración",
+  "Add new run configuration…": "Agregar nueva configuración de ejecución…",
+  "or select run configuration to edit": "o selecciona una configuración de ejecución para editar",
+  "Folder name": "Nombre de la carpeta",
+  "Name is required": "El nombre es obligatorio",
+  "Environment variable names can't be empty": "Los nombres de las variables de entorno no pueden estar vacíos",
+  "Environment Variables": "Variables de entorno",
+  "User environment variables:": "Variables de entorno del usuario:",
+  "User environment variables": "Variables de entorno del usuario",
+  "Include system environment variables": "Incluir variables de entorno del sistema",
+  "System environment variables": "Variables de entorno del sistema",
+  "Click the Run icon in the editor gutter": "Haz clic en el ícono Ejecutar en el margen del editor",
+  "Select \"Run…\" in the editor context menu": "Selecciona \"Ejecutar…\" en el menú contextual del editor",
+  "Launch a": "Inicia una",
+  "run configuration": "configuración de ejecución",
+  "Run Current File": "Ejecutar archivo actual",
+  "Debug Current File": "Depurar archivo actual",
+  "Run Another Configuration": "Ejecutar otra configuración",
+  "Run External Tool": "Ejecutar herramienta externa",
+  "Run Shell Command": "Ejecutar comando de shell",
+  "Run shell command": "Ejecutar comando de shell",
+  "Activate Tool Window": "Activar ventana de herramientas",
+  "Building is not available": "La compilación no está disponible",
+  "A build is already running": "Ya hay una compilación en ejecución",
+  "The before launch tasks run in a cycle": "Las tareas previas al inicio se ejecutan en un ciclo",
+  "No command": "Sin comando",
+  "Compound": "Compuesta",
+  "Add at least one configuration": "Agrega al menos una configuración",
+  "A compound configuration can't include itself": "Una configuración compuesta no puede incluirse a sí misma",
+  "Some configurations no longer exist": "Algunas configuraciones ya no existen",
+  "Command is required": "El comando es obligatorio",
+  "A before launch task runs a missing configuration or this one": "Una tarea previa al inicio ejecuta una configuración faltante o esta misma",
+  "A before launch task is incomplete": "Una tarea previa al inicio está incompleta",
+  "Run Widget": "Widget de ejecución",
+  "Run Configurations": "Configuraciones de ejecución",
+  "Starting": "Iniciando",
+  "Stopped": "Detenido",
+  "Finished": "Finalizado",
+  "Remove from Services": "Quitar de Servicios",
+  "Show in Run Tool Window": "Mostrar en la ventana de herramientas Ejecutar",
+  "Configuration": "Configuración",
+  "Type": "Tipo",
+  "Not started": "No iniciado",
+  "Shell Script": "Script de shell",
+  "Run a script file, script text or command line": "Ejecutar un archivo de script, texto de script o línea de comandos",
+  "Script file": "Archivo de script",
+  "Script text": "Texto del script",
+  "Script path": "Ruta del script",
+  "Script options": "Opciones del script",
+  "Interpreter path": "Ruta del intérprete",
+  "Run the script directly": "Ejecutar el script directamente",
+  "Interpreter options": "Opciones del intérprete",
+  "Run an executable with arguments": "Ejecutar un ejecutable con argumentos",
+  "Executable": "Ejecutable",
+  "Path or command on PATH": "Ruta o comando en PATH",
+  "Program arguments": "Argumentos del programa",
+  "VM options": "Opciones de VM",
+  "e.g. -Xmx1g -Dkey=value --add-opens java.base/java.lang=ALL-UNNAMED": "p. ej. -Xmx1g -Dkey=value --add-opens java.base/java.lang=ALL-UNNAMED",
+  "Main class": "Clase principal",
+  "e.g. com.example.Application": "p. ej. com.example.Application",
+  "Active profiles": "Perfiles activos",
+  "e.g. dev,local": "p. ej. dev,local",
+  "Comma separated; passed as --spring.profiles.active": "Separados por comas; se pasan como --spring.profiles.active",
+  "Comma separated; passed as -Dspring-boot.run.profiles": "Separados por comas; se pasan como -Dspring-boot.run.profiles",
+  "Comma separated; passed as -Dspring.profiles.active": "Separados por comas; se pasan como -Dspring.profiles.active",
+  "Classpath": "Classpath",
+  "Runtime classpath of the module": "Classpath de tiempo de ejecución del módulo",
+  "Test classpath of the module": "Classpath de prueba del módulo",
+  "Run a Java main class": "Ejecutar una clase principal de Java",
+  "Run a Spring Boot application": "Ejecutar una aplicación Spring Boot",
+  "Passed to the JVM that spring-boot:run or the tests start, not to Maven": "Se pasa a la JVM que inicia spring-boot:run o las pruebas, no a Maven",
+  "Passed to the JVMs the tasks start (bootRun, run, test), not to Gradle": "Se pasa a las JVM que inician las tareas (bootRun, run, test), no a Gradle",
+  "Run a package.json script": "Ejecutar un script de package.json",
+  "package.json directory": "Directorio de package.json",
+  "Tasks": "Tareas",
+  "Use the Gradle wrapper": "Usar el wrapper de Gradle",
+  "Goals": "Metas",
+  "Use the Maven wrapper": "Usar el wrapper de Maven",
+  "Run or debug several configurations together": "Ejecutar o depurar varias configuraciones juntas",
+  " · default": " · predeterminado",
+  "Bookmarked file": "Archivo con marcador",
+  "(empty line)": "(línea vacía)",
+  "Name cannot be empty": "El nombre no puede estar vacío",
+  "Every scope needs a name": "Cada ámbito necesita un nombre",
+  "Scopes": "Ámbitos",
+  "Add Scope": "Agregar ámbito",
+  "Remove Scope": "Quitar ámbito",
+  "Pattern:": "Patrón:",
+  "files by name, anywhere": "archivos por nombre, en cualquier lugar",
+  "files directly in a folder": "archivos directamente en una carpeta",
+  "at any depth": "en cualquier nivel de profundidad",
+  "Add a scope to define it by a file pattern.": "Agrega un ámbito para definirlo mediante un patrón de archivos.",
+  "Just now": "Justo ahora",
+  "Show Fields": "Mostrar campos",
+  "Show Non-Public": "Mostrar no públicos",
+  "Sort by Visibility": "Ordenar por visibilidad",
+  "Show fields": "Mostrar campos",
+  "Show non-public": "Mostrar no públicos",
+  "Docker CLI default (DOCKER_HOST / current context)": "Predeterminado de Docker CLI (DOCKER_HOST / contexto actual)",
+  "Docker CLI default": "Predeterminado de Docker CLI",
+  "Unix socket": "Socket Unix",
+  "TCP / SSH host": "Host TCP / SSH",
+  "Docker context": "Contexto de Docker",
+  "Edit Docker Connection": "Editar conexión de Docker",
+  "New Docker Connection": "Nueva conexión de Docker",
+  "Connect to Docker daemon with:": "Conectar al daemon de Docker con:",
+  "Socket path or Engine API URL:": "Ruta del socket o URL de la API del motor:",
+  "Engine API URL:": "URL de la API del motor:",
+  "tcp://build-host:2376 or ssh://me@build-host": "tcp://build-host:2376 o ssh://me@build-host",
+  "Certificates folder (TLS, optional):": "Carpeta de certificados (TLS, opcional):",
+  "contains ca.pem, cert.pem and key.pem": "contiene ca.pem, cert.pem y key.pem",
+  "Certificates Folder": "Carpeta de certificados",
+  "Context name:": "Nombre del contexto:",
+  "e.g. desktop-linux, orbstack, colima": "p. ej. desktop-linux, orbstack, colima",
+  "Docker Registry": "Registro de Docker",
+  "Edit Docker Registry": "Editar registro de Docker",
+  "New Docker Registry": "Nuevo registro de Docker",
+  "docker.io, ghcr.io, registry.example.com:5000": "docker.io, ghcr.io, registry.example.com:5000",
+  "Unchanged": "Sin cambios",
+  "Password or access token": "Contraseña o token de acceso",
+  "Images from this registry are pulled with these credentials.": "Las imágenes de este registro se descargan con estas credenciales.",
+  "not running": "no está en ejecución",
+  "Remove Docker Connection": "Quitar conexión de Docker",
+  "Remove Docker Registry": "Quitar registro de Docker",
+  "Edit Registry…": "Editar registro…",
+  "Test Login": "Probar inicio de sesión",
+  "Remove Registry": "Quitar registro",
+  "Edit Connection…": "Editar conexión…",
+  "Remove Connection": "Quitar conexión",
+  "Waiting for output…": "Esperando salida…",
+  "No output": "Sin salida",
+  "Address": "Dirección",
+  "Username": "Nombre de usuario",
+  "Edit…": "Editar…",
+  "Add a run configuration type, Docker connection or registry to the Services tool window": "Agregar un tipo de configuración de ejecución, conexión de Docker o registro a la ventana de herramientas Servicios",
+  "Dangling Images": "Imágenes huérfanas",
+  "Compose Down": "Compose Down",
+  "Cannot read Docker settings": "No se puede leer la configuración de Docker",
+  "Cannot save Docker settings": "No se puede guardar la configuración de Docker",
+  "Cannot save the registry password": "No se puede guardar la contraseña del registro",
+  "Server": "Servidor",
+  "Container name": "Nombre del contenedor",
+  "Derived from the image": "Derivado de la imagen",
+  "Bind ports": "Vincular puertos",
+  "Bind mounts": "Montajes vinculados",
+  "Container environment": "Entorno del contenedor",
+  "Run options": "Opciones de ejecución",
+  "e.g. --rm --network host": "p. ej. --rm --network host",
+  "Build an image from a Dockerfile and run a container from it": "Compilar una imagen a partir de un Dockerfile y ejecutar un contenedor desde ella",
+  "Relative to the project root": "Relativo a la raíz del proyecto",
+  "Context folder": "Carpeta de contexto",
+  "The Dockerfile's folder": "La carpeta del Dockerfile",
+  "Image tag": "Etiqueta de la imagen",
+  "Derived from the context folder": "Derivada de la carpeta de contexto",
+  "Build stage": "Etapa de compilación",
+  "The last stage": "La última etapa",
+  "Build args": "Argumentos de compilación",
+  "Build options": "Opciones de compilación",
+  "e.g. --no-cache --platform linux/amd64": "p. ej. --no-cache --platform linux/amd64",
+  "Run built image": "Ejecutar imagen compilada",
+  "The image's default": "El predeterminado de la imagen",
+  "Docker Image": "Imagen de Docker",
+  "Run a container from an image": "Ejecutar un contenedor a partir de una imagen",
+  "Image ID or name": "ID o nombre de la imagen",
+  "e.g. postgres:16": "p. ej. postgres:16",
+  "Pull the image before running": "Hacer pull de la imagen antes de ejecutar",
+  "Compose files": "Archivos de Compose",
+  "All services": "Todos los servicios",
+  "The folder name": "El nombre de la carpeta",
+  "Run in the background (-d)": "Ejecutar en segundo plano (-d)",
+  "Build images before starting (--build)": "Compilar imágenes antes de iniciar (--build)",
+  "Up options": "Opciones de up",
+  "e.g. --force-recreate --remove-orphans": "p. ej. --force-recreate --remove-orphans",
+  "Compact Mode": "Modo compacto",
+  "Override File Type": "Anular tipo de archivo",
+  "Revert File Type Override": "Revertir anulación de tipo de archivo",
+  "Add Content Root": "Agregar raíz de contenido",
+  "Exclude files:": "Excluir archivos:",
+  "Filter file types": "Filtrar tipos de archivo",
+  "Recognized file types": "Tipos de archivo reconocidos",
+  "Recognized File Types": "Tipos de archivo reconocidos",
+  "File name patterns": "Patrones de nombre de archivo",
+  "* matches any characters, ? one (e.g. *.foo, Jenkinsfile).": "* coincide con cualquier carácter, ? con uno (p. ej. *.foo, Jenkinsfile).",
+  "Hashbang patterns": "Patrones de hashbang",
+  "Interpreters run by a #! first line, e.g. node for #!/usr/bin/env node.": "Intérpretes ejecutados por una primera línea #!, p. ej. node para #!/usr/bin/env node.",
+  "Also recognized by its first line:": "También reconocido por su primera línea:",
+  "Default (IDE)": "Predeterminado (IDE)",
+  "Stored in the project.": "Guardado en el proyecto.",
+  "Copy to Project": "Copiar al proyecto",
+  "Copy to IDE": "Copiar al IDE",
+  "Copy to Project…": "Copiar al proyecto…",
+  "Copy to IDE…": "Copiar al IDE…",
+  "Do not format": "No formatear",
+  "File name patterns and folders (glob), e.g. *.min.js, generated/**.": "Patrones de nombre de archivo y carpetas (glob), p. ej. *.min.js, generated/**.",
+  "Turn formatter on/off with markers in code comments": "Activar/desactivar el formateador con marcadores en los comentarios del código",
+  "Off": "Desactivar",
+  "On": "Activar",
+  "Enable regular expressions in formatter markers": "Habilitar expresiones regulares en los marcadores del formateador",
+  "Show inline completion for:": "Mostrar autocompletado en línea para:",
+  "Automatically insert single suggestions": "Insertar sugerencias únicas automáticamente",
+  "When Basic Completion (⌃Space) finds only one suggestion.": "Cuando el Autocompletado básico (⌃Espacio) encuentra solo una sugerencia.",
+  "Also toggled by Sort by name in the completion popup.": "También se alterna con Ordenar por nombre en la ventana emergente de autocompletado.",
+  "Insert parentheses automatically when applicable": "Insertar paréntesis automáticamente cuando corresponda",
+  "Left": "Izquierda",
+  "Right": "Derecha",
+  "Show tabs in:": "Mostrar pestañas en:",
+  "Show tabs in": "Mostrar pestañas en",
+  "Show pinned tabs in a separate row": "Mostrar pestañas fijadas en una fila separada",
+  "Show file icon": "Mostrar ícono del archivo",
+  "Show directory for non-unique file names": "Mostrar directorio para nombres de archivo no únicos",
+  "Show full path on mouse hover": "Mostrar ruta completa al pasar el cursor",
+  "Close button position:": "Posición del botón cerrar:",
+  "Close button position": "Posición del botón cerrar",
+  "Tab Order": "Orden de las pestañas",
+  "Sort values alphabetically": "Ordenar valores alfabéticamente",
+  "Sort tabs alphabetically": "Ordenar pestañas alfabéticamente",
+  "One row, and if tabs don't fit:": "Una fila y, si las pestañas no caben:",
+  "If tabs don't fit": "Si las pestañas no caben",
+  "Scroll the tabs panel": "Desplazar el panel de pestañas",
+  "Squeeze tabs": "Comprimir pestañas",
+  "Multiple rows": "Varias filas",
+  "Gray suggestions at the caret from language servers that support inline completion. Tab accepts a suggestion, Escape dismisses it.": "Sugerencias en gris en el cursor provenientes de servidores de lenguaje compatibles con autocompletado en línea. Tab acepta una sugerencia, Escape la descarta.",
+  "Enable inline completion": "Habilitar autocompletado en línea",
+  "Show only when typing pauses for": "Mostrar solo cuando la escritura se pause durante",
+  "Inspections": "Inspecciones",
+  "Delete Profile": "Eliminar perfil",
+  "Rename Profile": "Renombrar perfil",
+  "Copy Profile": "Copiar perfil",
+  "Profile:": "Perfil:",
+  "Profile Actions": "Acciones del perfil",
+  "Stored in Project": "Guardado en el proyecto",
+  "Stored in IDE": "Guardado en el IDE",
+  "Search inspections": "Buscar inspecciones",
+  "Reset to Default": "Restablecer valores predeterminados",
+  "Select an inspection to see its description and change its severity.": "Selecciona una inspección para ver su descripción y cambiar su severidad.",
+  "Severity:": "Severidad:",
+  "As reported": "Según lo reportado",
+  "Error": "Error",
+  "Weak Warning": "Advertencia leve",
+  "Server Problem": "Problema del servidor",
+  "Typo": "Error ortográfico",
+  "No highlighting": "Sin resaltado",
+  "Project Default": "Predeterminado del proyecto",
+  "Profile name cannot be empty": "El nombre del perfil no puede estar vacío",
+  "Unresolved file references": "Referencias de archivo sin resolver",
+  "Reports paths in HTML attributes, CSS url() and @import that do not name an existing file, resolved relative to the file, the project root and its resource roots.": "Reporta rutas en atributos HTML, CSS url() y @import que no corresponden a un archivo existente, resueltas con respecto al archivo, la raíz del proyecto y sus raíces de recursos.",
+  "Build problems": "Problemas de compilación",
+  "Unresolved database references": "Referencias de base de datos sin resolver",
+  "Reports tables, columns and aliases in query consoles that the data source's schema does not contain.": "Reporta tablas, columnas y alias en consolas de consulta que no están en el esquema del origen de datos.",
+  "Proofreading": "Revisión de texto",
+  "Reports misspelt words in comments, string literals and the names declarations introduce (camelCase and snake_case parts checked separately), and in plain text and Markdown. Agent nouns of known words (checkpointer) and, in names, two known words run together (filepath) are accepted. Words can be saved to the project or application dictionary (Editor › Natural Languages › Spelling). Correcting a name renames the symbol and its references.": "Reporta palabras mal escritas en comentarios, literales de cadena y los nombres que introducen las declaraciones (las partes en camelCase y snake_case se revisan por separado), así como en texto plano y Markdown. Se aceptan sustantivos de agente de palabras conocidas (checkpointer) y, en los nombres, dos palabras conocidas unidas (filepath). Las palabras pueden guardarse en el diccionario del proyecto o de la aplicación (Editor › Idiomas naturales › Ortografía). Corregir un nombre renombra el símbolo y sus referencias.",
+  "English (USA, UK)": "Inglés (EE. UU., Reino Unido)",
+  "Bundled Hunspell dictionaries (SCOWL en_US and en_GB) and common programming terms.": "Diccionarios Hunspell incluidos (SCOWL en_US y en_GB) y términos comunes de programación.",
+  "Used by Proofreading › Typo": "Usado por Revisión de texto › Error ortográfico",
+  "Accepted words": "Palabras aceptadas",
+  "Project dictionary": "Diccionario del proyecto",
+  "Stored with the project.": "Guardado con el proyecto.",
+  "No words": "Sin palabras",
+  "Word": "Palabra",
+  "Application dictionary": "Diccionario de la aplicación",
+  "Accepted in every project.": "Aceptadas en todos los proyectos.",
+  "Custom dictionaries": "Diccionarios personalizados",
+  "Dictionary files": "Archivos de diccionario",
+  "Plain-text word lists (one word per line) or Hunspell .dic files. Relative paths resolve against the project root, ~/ against the home folder.": "Listas de palabras en texto plano (una palabra por línea) o archivos .dic de Hunspell. Las rutas relativas se resuelven respecto a la raíz del proyecto y ~/ respecto a la carpeta personal.",
+  "No custom dictionaries": "No hay diccionarios personalizados",
+  "Dictionary path": "Ruta del diccionario",
+  "Natural Languages": "Idiomas naturales",
+  "Java Class › JUnit 5 Test": "Clase Java › Prueba JUnit 5",
+  "Kotlin Class/File › JUnit 5 Test": "Clase/Archivo Kotlin › Prueba JUnit 5",
+  "Go File › Test file": "Archivo Go › Archivo de prueba",
+  "Rust File › Test module": "Archivo Rust › Módulo de prueba",
+  "TypeScript File › Test": "Archivo TypeScript › Prueba",
+  "Python File › Test (pytest)": "Archivo Python › Prueba (pytest)",
+  "CSS File": "Archivo CSS",
+  "SCSS File": "Archivo SCSS",
+  "Sass File": "Archivo Sass",
+  "Less File": "Archivo Less",
+  "JSON file": "Archivo JSON",
+  "YAML file": "Archivo YAML",
+  "TOML file": "Archivo TOML",
+  "Bash script": "Script Bash",
+  "POSIX sh script": "Script POSIX sh",
+  "Zsh script": "Script Zsh",
+  "Default properties": "Propiedades predeterminadas",
+  "Root only": "Solo raíz",
+  ".gitignore file": "Archivo .gitignore",
+  "Includes": "Inclusiones",
+  "Template kinds": "Tipos de plantillas",
+  "Reformat according to style": "Reformatear según el estilo",
+  "New Include": "Nueva inclusión",
+  "Add Include": "Agregar inclusión",
+  "Remove Include": "Quitar inclusión",
+  "Include name": "Nombre de la inclusión",
+  "Include body": "Cuerpo de la inclusión",
+  "Code templates": "Plantillas de código",
+  "Used by": "Usado por",
+  "Code template body": "Cuerpo de la plantilla de código",
+  "Changelist": "Lista de cambios",
+  "No TODO items found in this scope": "No se encontraron elementos TODO en este ámbito",
+  "No TODO items in changed files": "No hay elementos TODO en los archivos modificados",
+  "Author": "Autor",
+  "Merge options": "Opciones de fusión",
+  "Pull": "Pull",
+  "No remotes are configured. Add one with Git › Manage Remotes….": "No hay remotos configurados. Agrega uno en Git › Administrar remotos….",
+  "Remote branch": "Rama remota",
+  "Uncommitted changes are stashed before the pull and restored afterwards.": "Los cambios sin confirmar se guardan en stash antes del pull y se restauran después.",
+  "Branch to merge": "Rama para fusionar",
+  "Select branch": "Seleccionar rama",
+  "-m (commit message)": "-m (mensaje de confirmación)",
+  "Upstream": "Upstream",
+  "New base": "Nueva base",
+  "Uncommitted changes are stashed before the rebase and restored afterwards.": "Los cambios sin confirmar se guardan en stash antes del rebase y se restauran después.",
+  "Enter a remote name": "Ingresa un nombre para el remoto",
+  "Invalid remote name": "Nombre de remoto no válido",
+  "Remotes": "Remotos",
+  "Enter the remote URL": "Ingresa la URL del remoto",
+  "Force Remove": "Forzar eliminación",
+  "(bare)": "(bare)",
+  "Choose what to check out": "Elige a qué hacer checkout",
+  "Enter a folder": "Ingresa una carpeta",
+  "Check out": "Hacer checkout",
+  "New branch name": "Nombre de la nueva rama",
+  "Folder": "Carpeta",
+  "VCS Widget": "Widget de VCS",
+  "Recent Changes": "Cambios recientes",
+  "Cannot read Local History": "No se puede leer el Historial local",
+  "No recent changes": "No hay cambios recientes",
+  "Local History has no entries yet": "El Historial local aún no tiene entradas",
+  "Customize Main Toolbar": "Personalizar barra de herramientas principal",
+  "Customize Main Toolbar…": "Personalizar barra de herramientas principal…",
+  "Left group": "Grupo izquierdo",
+  "Right group": "Grupo derecho",
+  "Add…": "Agregar…",
+  "Move to Right": "Mover a la derecha",
+  "Move to Left": "Mover a la izquierda",
+  "Widget": "Widget",
+  "Actions and widgets to add": "Acciones y widgets para agregar",
+  "Don't Show Again": "No volver a mostrar",
+  "Customize Toolbar…": "Personalizar barra de herramientas…",
+  "Restore Default Toolbar": "Restaurar barra de herramientas predeterminada",
+  "View Mode": "Modo de vista",
+  "Value must not be empty": "El valor no debe estar vacío",
+  "Nothing to choose from": "No hay opciones para elegir",
+  "Project Widget": "Widget del proyecto",
+  "Editor Color Scheme": "Esquema de colores del editor",
+  "Quick Switch Scheme…": "Cambio rápido de esquema…",
+  "No saved layouts. Use Save Current Layout as… first.": "No hay diseños guardados. Usa Guardar diseño actual como… primero.",
+  "Enter a layout name": "Ingresa un nombre para el diseño",
+  "A layout with this name exists": "Ya existe un diseño con este nombre",
+  "Save Current Layout as…": "Guardar diseño actual como…",
+  "Save Current Layout as": "Guardar diseño actual como",
+  "Layout name:": "Nombre del diseño:",
+  "Restore Tool Window Layout": "Restaurar diseño de ventanas de herramientas",
+  "Restores the saved layout named `arg`, or asks which one.": "Restaura el diseño guardado llamado `arg`, o pregunta cuál restaurar.",
+  "Restore Layout": "Restaurar diseño",
+  "Rename Tool Window Layout…": "Renombrar diseño de ventanas de herramientas…",
+  "Rename Layout": "Renombrar diseño",
+  "Delete Tool Window Layout…": "Eliminar diseño de ventanas de herramientas…",
+  "Delete Layout": "Eliminar diseño",
+  "Formatted {count} lines": "Se formatearon {count} líneas",
+  "Formatted {count} line": "Se formateó {count} línea",
+  " the Reformat dialog": " el cuadro de diálogo Reformatear",
+  "The file changed while formatting; try again": "El archivo cambió mientras se formateaba; inténtalo de nuevo",
+  "No lines changed: content is already properly formatted": "No se modificaron líneas: el contenido ya tiene el formato correcto",
+  "The file is read-only": "El archivo es de solo lectura",
+  "No documentation found": "No se encontró documentación",
+  "Cannot read the definition's file": "No se puede leer el archivo de la definición",
+  "Cannot find declaration to go to": "No se puede encontrar la declaración a la cual ir",
+  "No structure information for this file": "No hay información de estructura para este archivo",
+  "No super method found": "No se encontró ningún supermétodo",
+  "No super class found": "No se encontró ninguna superclase",
+  "No parameters": "Sin parámetros",
+  "No usages found in file": "No se encontraron usos en el archivo",
+  "No type information found": "No se encontró información de tipos",
+  "Nothing to rename": "No hay nada que renombrar",
+  "Rename Anyway": "Renombrar de todos modos",
+  "May be incomplete: the language server is still indexing": "Puede estar incompleto: el servidor de lenguaje sigue indexando",
+  "May be incomplete: too many files mention '{word}' to search them all": "Puede estar incompleto: demasiados archivos mencionan '{word}' como para buscar en todos",
+  "May be incomplete: too many files mention the name to search them all": "Puede estar incompleto: demasiados archivos mencionan el nombre como para buscar en todos",
+  "May be incomplete: some files that mention '{word}' are too large or unreadable": "Puede estar incompleto: algunos archivos que mencionan '{word}' son demasiado grandes o no se pueden leer",
+  "May be incomplete: some files that mention the name are too large or unreadable": "Puede estar incompleto: algunos archivos que mencionan el nombre son demasiado grandes o no se pueden leer",
+  "The file changed; rename cancelled": "El archivo cambió; se canceló el cambio de nombre",
+  "No suggestions": "No hay sugerencias",
+  "No intentions available": "No hay acciones de intención disponibles",
+  "No quick fixes available": "No hay correcciones rápidas disponibles",
+  "No abstract methods to implement": "No hay métodos abstractos por implementar",
+  "Implement abstract methods": "Implementar métodos abstractos",
+  "Apply Quick Fix": "Aplicar corrección rápida",
+  "The document changed; invoke the refactoring again": "El documento cambió; vuelve a invocar la refactorización",
+  "The document changed; the name was not applied": "El documento cambió; no se aplicó el nombre",
+  "The file changed; Safe Delete cancelled": "El archivo cambió; se canceló la eliminación segura",
+  "No language server is available": "No hay ningún servidor de lenguaje disponible",
+  "Separate variables with semicolon: VAR=value; VAR1=value1": "Separa las variables con punto y coma: VAR=valor; VAR1=valor1",
+  "Relative to the project root; separate with semicolon": "Relativo a la raíz del proyecto; separa con punto y coma",
+  "Configurations of the compound": "Configuraciones de la compuesta",
+  "Another configuration has this name": "Otra configuración ya tiene este nombre",
+  "Invalid directory": "Directorio no válido",
+  "Application": "Aplicación",
+  "Java Single File": "Archivo único de Java",
+  "Rust Single File": "Archivo único de Rust",
+  "Kotlin Single File": "Archivo único de Kotlin",
+  "C/C++ Single File": "Archivo único de C/C++",
+  "Native Executable": "Ejecutable nativo",
+  "Kotlin Script": "Script de Kotlin",
+  "{name} is required": "{name} es obligatorio",
+  "{name} project": "Proyecto {name}",
+  "{adapter} (no launch template)": "{adapter} (sin plantilla de inicio)",
+  "Before launch command {n}": "Comando previo al inicio {n}",
+  "Invalid environment variable name: {key}": "Nombre de variable de entorno no válido: {key}",
+  "Run '{name}'": "Ejecutar '{name}'",
+  "'{name}' failed": "'{name}' falló",
+  "'{name}' was not started": "No se inició '{name}'",
+  "External tool '{name}'": "Herramienta externa '{name}'",
+  "Activate '{name}' tool window": "Activar ventana de herramientas '{name}'",
+  "Configuration '{name}' no longer exists": "La configuración '{name}' ya no existe",
+  "External tool '{name}' no longer exists": "La herramienta externa '{name}' ya no existe",
+  "'{name}' was not run": "No se ejecutó '{name}'",
+  "Tool window '{name}' is not available": "La ventana de herramientas '{name}' no está disponible",
+  "Unknown before launch task '{name}'": "Tarea previa al inicio desconocida '{name}'",
+  "Variable {n} name": "Nombre de la variable {n}",
+  "Variable {n} value": "Valor de la variable {n}",
+  "Duplicate environment variable: {key}": "Variable de entorno duplicada: {key}",
+  "Nothing to show in {view}": "No hay nada que mostrar en {view}",
+  "Stopped Containers": "Contenedores detenidos",
+  "Unused Images": "Imágenes sin usar",
+  "Unused Volumes": "Volúmenes sin usar",
+  "Unused Networks": "Redes sin usar",
+  "Everything Unused (System Prune)": "Todo lo no utilizado (System Prune)",
+  "Remove all stopped containers?": "¿Eliminar todos los contenedores detenidos?",
+  "Remove all dangling (untagged) images?": "¿Eliminar todas las imágenes huérfanas (sin etiqueta)?",
+  "Remove all images not used by a container?": "¿Eliminar todas las imágenes que no usa ningún contenedor?",
+  "Remove all anonymous volumes not used by a container? Their data is lost.": "¿Eliminar todos los volúmenes anónimos que no usa ningún contenedor? Sus datos se perderán.",
+  "Remove all networks not used by a container?": "¿Eliminar todas las redes que no usa ningún contenedor?",
+  "Remove stopped containers, unused networks, dangling images and the build cache?": "¿Eliminar contenedores detenidos, redes sin usar, imágenes huérfanas y la caché de compilación?",
+  "Prune {target}": "Limpiar {target}",
+  "Pulling {name}…": "Haciendo pull de {name}…",
+  "containers": "contenedores",
+  "images": "imágenes",
+  "volumes": "volúmenes",
+  "networks": "redes",
+  "Compose project '{name}'": "Proyecto de Compose '{name}'",
+  "Engine {server} · CLI {client}": "Motor {server} · CLI {client}",
+  " · context {name}": " · contexto {name}",
+  "Failed (exit {code})": "Falló (salida {code})",
+  "No configurations of this type": "No hay configuraciones de este tipo",
+  "system": "sistema",
+  "{name} cancelled": "{name} cancelado",
+  "Image to pull:": "Imagen para hacer pull:",
+  "Pull Image": "Hacer pull de imagen",
+  "Not a {name} URL": "No es una URL de {name}",
+  "Duplicate scope name '{name}'": "Nombre de ámbito duplicado '{name}'",
+  "Scope '{name}' has no pattern": "El ámbito '{name}' no tiene patrón",
+  "Unnamed ({n})": "Sin nombre ({n})",
+  "Project will be created in: {path}": "El proyecto se creará en: {path}",
+  "(or": "(o",
+  "inserts a template from the Includes or Code tab.": "inserta una plantilla de la pestaña Inclusiones o Código.",
+  "File templates insert this with {code}, indented like the directive; a directive line whose include is empty is dropped. The file template variables apply.": "Las plantillas de archivo insertan esto con {code}, con la misma sangría que la directiva; una línea de directiva cuya inclusión esté vacía se descarta. Se aplican las variables de la plantilla de archivo.",
+  "Inserted where a file template says {code}.": "Se inserta donde una plantilla de archivo indica {code}.",
+  "Agents": "Agentes",
+  "New Agent Task": "Nueva tarea de agente",
+  "No agent tasks yet": "Aún no hay tareas de agente",
+  "New Task…": "Nueva tarea…",
+  "Needs Input": "Requiere respuesta",
+  "Ready to Review": "Listo para revisar",
+  "Archived": "Archivadas",
+  "Archive": "Archivar",
+  "Copy Agent Task to a New Task": "Copiar tarea de agente en una nueva tarea",
+  "Delete Agent Task": "Eliminar tarea de agente",
+  "Also remove its worktree folder": "También quitar su carpeta de árbol de trabajo",
+  "needs input": "requiere respuesta",
+  "running": "en ejecución",
+  "unread": "no leído",
+  "This agent task no longer exists": "Esta tarea de agente ya no existe",
+  "Local checkout": "Checkout local",
+  "Needs input": "Requiere respuesta",
+  "Ready": "Listo",
+  "Starting the agent…": "Iniciando el agente…",
+  "Working…": "Trabajando…",
+  "Thinking": "Pensando",
+  "Plan": "Plan",
+  "Message": "Mensaje",
+  "Reply to the agent": "Responder al agente",
+  "Send": "Enviar",
+  "vs": "vs",
+  "file": "archivo",
+  "files": "archivos",
+  "No changes yet": "Aún no hay cambios",
+  "What should the agent do?": "¿Qué debe hacer el agente?",
+  "New worktree": "Nuevo árbol de trabajo",
+  "Building and resolving the classpath of {name}…": "Compilando y resolviendo el classpath de {name}…",
+  "Build completed with errors; launching with the last compiled classes.": "La compilación terminó con errores; iniciando con las últimas clases compiladas.",
+  "Build failed; launching with the last compiled classes.": "La compilación falló; iniciando con las últimas clases compiladas.",
+  "The classpath is empty: is the module imported by the Java language server?": "El classpath está vacío: ¿el servidor de lenguaje Java importó el módulo?",
+  "Launch cancelled.": "Inicio cancelado.",
+  "Starting debugger for {name}…": "Iniciando depurador para {name}…",
+  "Starting…": "Iniciando…",
+  "Waiting for your answer": "Esperando tu respuesta",
+  "Waiting for your answer…": "Esperando tu respuesta…",
+  "Subagent": "Subagente",
+  "Subagents at work": "Subagentes trabajando",
+  "Stop Subagent": "Detener subagente",
+  "Open the subagent's conversation": "Abrir la conversación del subagente",
+  "Subagents take their instructions from the agent that started them.": "Los subagentes reciben sus instrucciones del agente que los inició.",
+  "Task from the parent agent": "Tarea del agente principal",
+  "Report to the parent agent": "Reporte para el agente principal",
+  "Task": "Tarea",
+  "tool call": "llamada a herramienta",
+  "tool calls": "llamadas a herramientas",
+  "The agent stopped": "El agente se detuvo",
+  "Not installed": "No instalado",
+  "{command} was not found on PATH": "No se encontró {command} en PATH",
+  "Agent tasks": "Tareas de agente",
+  "Describe a task for the agent. @ references a file or folder, / runs a command": "Describe una tarea para el agente. @ referencia un archivo o carpeta, / ejecuta un comando",
+  "away from your changes": "separado de tus cambios",
+  "edits your files directly": "edita tus archivos directamente",
+  "from": "desde",
+  "on": "en",
+  "Models and modes appear after this agent's first task.": "Los modelos y modos aparecen después de la primera tarea de este agente.",
+  "Queue a message for when the agent is done (⌘↵ sends it now)": "Pon en cola un mensaje para cuando el agente termine (⌘↵ lo envía ahora)",
+  "Couldn't send the message": "No se pudo enviar el mensaje",
+  "Couldn't change the setting": "No se pudo cambiar la configuración",
+  "Couldn't update the queue": "No se pudo actualizar la cola",
+  "Queued messages": "Mensajes en cola",
+  "Send now": "Enviar ahora",
+  "Queue": "Poner en cola",
+  "Reference a File (@)": "Referenciar un archivo (@)",
+  "Attach Image…": "Adjuntar imagen…",
+  "Remove Image": "Quitar imagen",
+  "Image too large": "La imagen es demasiado grande",
+  "Send to Agent": "Enviar al agente",
+  "Enable Vim emulation": "Habilitar emulación de Vim",
+  "Configuration file": "Archivo de configuración",
+  "mappings": "asignaciones",
+  "No ~/.openideavimrc or ~/.ideavimrc found.": "No se encontró ~/.openideavimrc ni ~/.ideavimrc.",
+  "Supported: set options, map / nmap / imap / vmap / noremap variants, let mapleader, source, and :action / <Action>() mappings that run IDE actions. :w saves, :q closes the editor tab.": "Compatible con: opciones de set, variantes de map / nmap / imap / vmap / noremap, let mapleader, source y asignaciones :action / <Action>() que ejecutan acciones del IDE. :w guarda, :q cierra la pestaña del editor.",
+  "Shortcut conflicts": "Conflictos de atajos",
+  "Keys Vim also handles. With Vim as the handler the key goes to the editor while Vim mode is on and an editor has focus; with IDE, an enabled IDE action runs first.": "Teclas que Vim también maneja. Con Vim como manejador, la tecla pasa al editor mientras el modo Vim está activo y un editor tiene el foco; con IDE, se ejecuta primero una acción habilitada del IDE.",
+  "Shortcut": "Atajo",
+  "IDE action": "Acción del IDE",
+  "Handler": "Manejador",
+  "Reset to Defaults": "Restablecer valores predeterminados",
+  "Exit to Normal mode": "Salir al modo Normal",
+  "Increment number": "Incrementar número",
+  "Decrement number": "Decrementar número",
+  "Page up": "Re Pág",
+  "Page down": "Av Pág",
+  "Scroll half page down / unindent": "Desplazar media página hacia abajo / reducir sangría",
+  "Scroll half page up / delete to line start": "Desplazar media página hacia arriba / eliminar hasta el inicio de la línea",
+  "Scroll line down": "Desplazar una línea hacia abajo",
+  "Scroll line up": "Desplazar una línea hacia arriba",
+  "Jump forward": "Saltar hacia adelante",
+  "Jump back / one Normal command": "Saltar hacia atrás / un comando Normal",
+  "Next line": "Siguiente línea",
+  "Previous line": "Línea anterior",
+  "Visual block": "Bloque visual",
+  "Redo / insert register": "Rehacer / insertar registro",
+  "Delete word before caret": "Eliminar palabra antes del cursor",
+  "Reload .ideavimrc": "Recargar .ideavimrc",
+  "Vim Settings…": "Configuración de Vim…",
+  "Vim mode": "Modo Vim",
+  "Vim (disabled)": "Vim (deshabilitado)",
+  "Turn Vim emulation on or off in all editors": "Activar o desactivar la emulación de Vim en todos los editores",
+  "Remote JVM Debug": "Depuración remota de JVM",
+  "Attach the debugger to a JVM started with a JDWP agent, here or on another machine": "Adjuntar el depurador a una JVM iniciada con un agente JDWP, aquí o en otro equipo",
+  "Debugger mode": "Modo del depurador",
+  "Attach to remote JVM": "Adjuntar a JVM remota",
+  "Listen to remote JVM": "Escuchar a JVM remota",
+  "Host": "Host",
+  "Port": "Puerto",
+  "Port must be a number from 1 to 65535": "El puerto debe ser un número entre 1 y 65535",
+  "JDK version of the remote JVM": "Versión del JDK de la JVM remota",
+  "JDK 9 or later": "JDK 9 o posterior",
+  "Command line arguments for remote JVM": "Argumentos de línea de comandos para la JVM remota",
+  "Add to the remote JVM's command line (or JAVA_TOOL_OPTIONS)": "Agregar a la línea de comandos de la JVM remota (o JAVA_TOOL_OPTIONS)",
+  "Use module classpath": "Usar classpath del módulo",
+  "Module directory whose sources the debugger shows": "Directorio del módulo cuyos archivos fuente muestra el depurador",
+  "Go Remote": "Go remoto",
+  "Attach to a Delve server (dlv --headless) here or on another machine": "Adjuntar a un servidor Delve (dlv --headless) aquí o en otro equipo",
+  "Start the remote side with": "Inicia el lado remoto con",
+  "Delve 1.7.3 or later; dlv exec ./app or dlv attach <pid> take the same flags": "Delve 1.7.3 o posterior; dlv exec ./app o dlv attach <pid> aceptan las mismas opciones",
+  "Local root": "Raíz local",
+  "Remote root": "Raíz remota",
+  "Where the project's sources are on the remote machine, when the paths differ": "Dónde están los archivos fuente del proyecto en el equipo remoto, cuando las rutas difieren",
+  "Python Remote Debug (debugpy)": "Depuración remota de Python (debugpy)",
+  "Attach to a Python process listening with debugpy here or on another machine": "Adjuntar a un proceso de Python que escucha con debugpy aquí o en otro equipo",
+  "pip install debugpy on the remote machine": "pip install debugpy en el equipo remoto",
+  "Attach to Node.js": "Adjuntar a Node.js",
+  "Attach to a Node.js process started with --inspect here or on another machine": "Adjuntar a un proceso de Node.js iniciado con --inspect aquí o en otro equipo",
+  "Copied": "Copiado",
+  "'{name}' can only be debugged": "'{name}' solo se puede depurar",
+  "It attaches the debugger to a process started elsewhere.": "Adjunta el depurador a un proceso iniciado en otro lugar.",
+  "Not found, press again to search from the top": "No encontrado, presiona de nuevo para buscar desde el principio",
+  "Cannot change the setting": "No se puede cambiar la configuración",
+  "Increase Font Size": "Aumentar tamaño de fuente",
+  "Decrease Font Size": "Disminuir tamaño de fuente",
+  "Cannot make {path} writable": "No se puede hacer que {path} sea escribible",
+  "Cannot make {path} read-only": "No se puede hacer que {path} sea de solo lectura",
+  "Configure Soft Wraps…": "Configurar ajuste de línea…",
+  "Configure Gutter Icons…": "Configurar íconos del margen…",
+  "line[:column]": "línea[:columna]",
+  "Edit Source": "Editar código fuente",
+  "Show in Documentation Tool Window": "Mostrar en la ventana de herramientas Documentación",
+  "No documentation": "Sin documentación",
+  "Whole file": "Todo el archivo",
+  "Selected text": "Texto seleccionado",
+  "Code Cleanup on `{ path, fixAll?, optimizeImports?, reformat? }` (all steps by default), opened first.": "Limpieza de código en `{ path, fixAll?, optimizeImports?, reformat? }` (todos los pasos de forma predeterminada), abierto primero.",
+  "Shows `{ text, tone? }` as a transient hint at the caret of the active editor.": "Muestra `{ text, tone? }` como una sugerencia transitoria en el cursor del editor activo.",
+  "Inlay Hints Settings…": "Configuración de sugerencias incrustadas…",
+  "Preview isn't available for this action": "La vista previa no está disponible para esta acción",
+  "No changes in this file": "No hay cambios en este archivo",
+  "{kind}: no language server is running for this file": "{kind}: no hay ningún servidor de lenguaje en ejecución para este archivo",
+  "Cannot find declaration of '{label}'": "No se puede encontrar la declaración de '{label}'",
+  "Rename in place: ↵ to finish, Esc to cancel": "Renombrar en el lugar: ↵ para terminar, Esc para cancelar",
+  "Cannot rename safely: {why}. '{word}' was left unchanged": "No se puede renombrar de forma segura: {why}. '{word}' se dejó sin cambios",
+  "'{newName}' is not a valid identifier": "'{newName}' no es un identificador válido",
+  "{note}: renamed {length} occurrence": "{note}: se renombró {length} coincidencia",
+  "{note}: renamed {length} occurrences": "{note}: se renombraron {length} coincidencias",
+  "No suggestions for '{word}'": "No hay sugerencias para '{word}'",
+  "Typo: Rename to…": "Error ortográfico: Renombrar a…",
+  "Cannot perform refactoring: {why}": "No se puede realizar la refactorización: {why}",
+  "'{chosen}' is not a valid name; kept '{current}'": "'{chosen}' no es un nombre válido; se conservó '{current}'",
+  "'{name}' is also used elsewhere in this file": "'{name}' también se usa en otra parte de este archivo",
+  "Safe Delete": "Eliminación segura",
+  "Replace all occurrences": "Reemplazar todas las coincidencias",
+  "↵ to finish, Esc to keep the name": "↵ para terminar, Esc para conservar el nombre",
+  "Agent": "Agente",
+  "Isolation": "Aislamiento",
+  "Opens the New Task page; a string `arg` pre-fills the task description.": "Abre la página Nueva tarea; un `arg` de tipo cadena rellena previamente la descripción de la tarea.",
+  "Adds the editor selection (or the file) as an @ reference to the agent message typed last; a string[] `arg` sends those paths.": "Agrega la selección del editor (o el archivo) como referencia @ al último mensaje escrito para el agente; un `arg` de tipo string[] envía esas rutas.",
+  "Files are checked by their language servers; files without one are skipped.": "Los archivos son revisados por sus servidores de lenguaje; los archivos sin uno se omiten.",
+  "Files are cleaned up by their language servers and saved; files without one are skipped.": "Los archivos son limpiados por sus servidores de lenguaje y guardados; los archivos sin uno se omiten.",
+  "Code Cleanup cancelled after {done} of {length} files": "Limpieza de código cancelada después de {done} de {length} archivos",
+  "Code Cleanup processed {done} files": "La limpieza de código procesó {done} archivos",
+  "Load Maven Changes": "Cargar cambios de Maven",
+  "Load Gradle Changes": "Cargar cambios de Gradle",
+  "recent": "reciente",
+  "Shows `{ symbol, locations }` (found elsewhere, e.g. by Safe Delete) in the Find Usages tool window.": "Muestra `{ symbol, locations }` (encontrados en otro lugar, p. ej. mediante Eliminación segura) en la ventana de herramientas Buscar usos.",
+  "Code insight features are unavailable for these files until it is installed.": "Las funciones de análisis de código no están disponibles para estos archivos hasta que se instale.",
+  "Coverage of '{name}': {totals} lines": "Cobertura de '{name}': {totals} líneas",
+  "Show a report collected elsewhere (CI): lcov, JaCoCo XML or a Go cover profile; argument: the file path": "Mostrar un reporte recopilado en otro lugar (CI): lcov, JaCoCo XML o un perfil Go cover; argumento: la ruta del archivo",
+  "Imported coverage '{name}': {total} lines": "Cobertura importada '{name}': {total} líneas",
+  "The report covers no files of this project.": "El reporte no cubre ningún archivo de este proyecto.",
+  "Cannot import {file}": "No se puede importar {file}",
+  "shown": "mostrado",
+  "No aggregation": "Sin agregación",
+  "Sum": "Suma",
+  "Mean": "Media",
+  "Count": "Recuento",
+  "Min": "Mín.",
+  "Max": "Máx.",
+  "X axis": "Eje X",
+  "Y axis": "Eje Y",
+  "Aggregation": "Agregación",
+  "Chart type": "Tipo de gráfico",
+  "Bar": "Barras",
+  "Line": "Líneas",
+  "Chart Settings": "Configuración del gráfico",
+  "No numeric values to plot": "No hay valores numéricos para graficar",
+  "Search": "Buscar",
+  "Search…": "Buscar…",
+  "Statements": "Instrucciones",
+  "No statements": "Sin instrucciones",
+  "Statement": "Instrucción",
+  "Comma": "Coma",
+  "Tab": "Tabulador",
+  "Semicolon": "Punto y coma",
+  "Pipe": "Barra vertical",
+  "Import Data from File": "Importar datos desde archivo",
+  "Cannot read the file": "No se puede leer el archivo",
+  "{table}: {n} row(s) imported": "{table}: {n} fila(s) importada(s)",
+  "Nothing was imported": "No se importó nada",
+  "Choose a CSV or TSV file": "Elige un archivo CSV o TSV",
+  "Choose File…": "Elegir archivo…",
+  "Separator:": "Separador:",
+  "Separator": "Separador",
+  "First row is header (columns matched by name)": "La primera fila es el encabezado (columnas asociadas por nombre)",
+  "Treat empty values as NULL": "Tratar valores vacíos como NULL",
+  "Columns:": "Columnas:",
+  "Export Data…": "Exportar datos…",
+  "Data extractor": "Extractor de datos",
+  "Hide Record / Value / Aggregates": "Ocultar Registro / Valor / Agregados",
+  "Show Record / Value / Aggregates": "Mostrar Registro / Valor / Agregados",
+  "Clear local filter": "Limpiar filtro local",
+  "Search values": "Buscar valores",
+  "No matching values": "No hay valores coincidentes",
+  "Clear Filter": "Limpiar filtro",
+  "Clear Local Filter For All Columns": "Limpiar filtro local en todas las columnas",
+  "Value panel": "Panel de valor",
+  "Aggregates": "Agregados",
+  "Select a cell": "Selecciona una celda",
+  "Copy to Clipboard": "Copiar al portapapeles",
+  "Export to File": "Exportar a archivo",
+  "Source:": "Origen:",
+  "Extractor:": "Extractor:",
+  "Extractor": "Extractor",
+  "Transpose": "Transponer",
+  "Add column header": "Agregar encabezado de columna",
+  "Add row header": "Agregar encabezado de fila",
+  "Output file:": "Archivo de salida:",
+  "Output file": "Archivo de salida",
+  "Export preview:": "Vista previa de exportación:",
+  "Export preview": "Vista previa de exportación",
+  "expression": "expresión",
+  "Chart": "Gráfico",
+  "Explain Again": "Explicar de nuevo",
+  "Operation": "Operación",
+  "Params": "Parámetros",
+  "Query plan": "Plan de consulta",
+  "Empty plan": "Plan vacío",
+  "Sent as run-time parameters when connecting (any server setting, e.g. statement_timeout). application_name names the session; connect_timeout is in seconds.": "Se envían como parámetros en tiempo de ejecución al conectar (cualquier ajuste del servidor, p. ej. statement_timeout). application_name da nombre a la sesión; connect_timeout está en segundos.",
+  "Set as session variables after connecting (SET SESSION name = value). charset and collation pick the connection character set; connect_timeout is in seconds.": "Se establecen como variables de sesión después de conectar (SET SESSION name = value). charset y collation eligen el conjunto de caracteres de la conexión; connect_timeout está en segundos.",
+  "Applied as pragmas when opening the file (PRAGMA name = value).": "Se aplican como pragmas al abrir el archivo (PRAGMA name = value).",
+  "sec.": "seg.",
+  "default": "predeterminado",
+  "<unchanged>": "<sin cambios>",
+  "Single database mode (show only the configured database)": "Modo de base de datos única (mostrar solo la base de datos configurada)",
+  "schemas": "esquemas",
+  "Object filter:": "Filtro de objetos:",
+  "e.g. order*, customers (tables, views, routines, sequences)": "p. ej., order*, customers (tablas, vistas, rutinas, secuencias)",
+  "Show internal system schemas": "Mostrar esquemas internos del sistema",
+  "Show template databases": "Mostrar bases de datos de plantilla",
+  "<user defined>": "<definido por el usuario>",
+  "<value>": "<valor>",
+  "{table}: {n} row(s) changed": "{table}: {n} fila(s) modificada(s)",
+  "Import Data from File…": "Importar datos desde archivo…",
+  "Explain Plan": "Explicar plan",
+  "Browse Query History": "Explorar historial de consultas",
+  "<data source>": "<origen de datos>",
+  "Cannot explain the statement": "No se puede explicar la instrucción",
+  "Cannot get the definition of {name}": "No se puede obtener la definición de {name}",
+  "Script finished: {length} statement": "Script finalizado: {length} instrucción",
+  "Script finished: {length} statements": "Script finalizado: {length} instrucciones",
+  "Import from Clipboard": "Importar desde el portapapeles",
+  "No data source on the clipboard": "No hay origen de datos en el portapapeles",
+  "Import/Export": "Importar/Exportar",
+  "{what} is not supported by {debugger}": "{what} no es compatible con {debugger}",
+  "'{name}': listening for the remote JVM on port {port}": "'{name}': escuchando a la JVM remota en el puerto {port}",
+  "“{name}” can't be debugged": "“{name}” no se puede depurar",
+  "It has no debug adapter.": "No tiene adaptador de depuración.",
+  "The Java debugger can't start this command itself. Debug an Application, Spring Boot, Maven or Gradle configuration, or start the JVM with a JDWP agent and attach with a Remote JVM Debug configuration.": "El depurador de Java no puede iniciar este comando por sí mismo. Depure una configuración de Application, Spring Boot, Maven o Gradle, o inicie la JVM con un agente JDWP y conéctese con una configuración de depuración remota de JVM.",
+  "Attach the Java debugger to a JVM listening for JDWP (arg: { name, module, hostName, port, process })": "Conectar el depurador de Java a una JVM que escuche JDWP (arg: { name, module, hostName, port, process })",
+  "'{name}' has compile errors; debugging the last compiled classes": "'{name}' tiene errores de compilación; depurando las últimas clases compiladas",
+  "Attach to Godot": "Conectar a Godot",
+  "Debug the game the Godot editor is running, through the editor's debug adapter": "Depurar el juego que está ejecutando el editor Godot a través del adaptador de depuración del editor",
+  "Before attaching": "Antes de conectar",
+  "Cannot start debugger for {name}": "No se puede iniciar el depurador para {name}",
+  "suspended": "suspendido",
+  "e.g. order.total > 100": "p. ej., order.total > 100",
+  "e.g. 5 or >= 3": "p. ej., 5 o >= 3",
+  "Value: {expression}": "Valor: {expression}",
+  "Cannot attach to {name} ({pid})": "No se puede conectar a {name} ({pid})",
+  "“{name}” can't be watched": "“{name}” no se puede inspeccionar",
+  "(deleted)": "(eliminado)",
+  "Macro '{name}' stopped": "Macro '{name}' detenida",
+  "Id": "Id",
+  "Enable": "Habilitar",
+  "The plugin failed to start.": "El plugin no pudo iniciarse.",
+  "Move Directory…": "Mover directorio…",
+  "Cannot move {name}": "No se puede mover {name}",
+  "Cannot rename {name}": "No se puede renombrar {name}",
+  "Store as project file (.openidea/run.toml); otherwise in the workspace (.openidea/run.local.toml)": "Guardar como archivo de proyecto (.openidea/run.toml); de lo contrario, en el espacio de trabajo (.openidea/run.local.toml)",
+  "This command line doesn't fit the type's form; it is edited as a command.": "Esta línea de comandos no se ajusta al formulario del tipo; se edita como un comando.",
+  "Space separated; quote with ' or \"": "Separados por espacios; use comillas ' o \"",
+  "New configurations of this type start with these values.": "Las nuevas configuraciones de este tipo comienzan con estos valores.",
+  "To run your code, do one of the following:": "Para ejecutar su código, realice una de las siguientes acciones:",
+  "The terminal is not available; turn off \"Emulate terminal in output console\" to see the output.": "La terminal no está disponible; desactive \"Emular terminal en la consola de salida\" para ver la salida.",
+  "Expected": "Esperado",
+  "Actual": "Real",
+  "Terminate": "Terminar",
+  "Cannot run '{name}'": "No se puede ejecutar '{name}'",
+  "External tool '{name}' has no program": "La herramienta externa '{name}' no tiene programa",
+  "'{name}' needs an open file": "'{name}' necesita un archivo abierto",
+  "Run a configuration (hold Shift to debug); the title bar widget passes \"select\" to only select one": "Ejecutar una configuración (mantenga presionado Shift para depurar); el widget de la barra de título pasa \"select\" solo para seleccionar una",
+  "Runs with a contributed executor (`{ executor, config? }` or `{ executor, context }`): the given or selected configuration, or the context.": "Se ejecuta con un ejecutor contribuido (`{ executor, config? }` o `{ executor, context }`): la configuración indicada o seleccionada, o el contexto.",
+  "Saves the given `RunConfig` as a user configuration and opens it in Edit Configurations.": "Guarda la `RunConfig` indicada como una configuración de usuario y la abre en Editar configuraciones.",
+  "No sources for this class": "No hay código fuente para esta clase",
+  "Error running '{name}'": "Error al ejecutar '{name}'",
+  "No JDK can run '{name}'": "Ningún JDK puede ejecutar '{name}'",
+  "'{name}' exited with code {code}": "'{name}' finalizó con el código {code}",
+  "Run a Godot project's main scene or a chosen scene": "Ejecutar la escena principal de un proyecto Godot o una escena elegida",
+  "Project directory": "Directorio del proyecto",
+  "Project root (holds project.godot)": "Raíz del proyecto (contiene project.godot)",
+  "Scene": "Escena",
+  "Main scene": "Escena principal",
+  "Godot command line options, e.g. --debug-collisions": "Opciones de línea de comandos de Godot, p. ej., --debug-collisions",
+  "Bookmark description": "Descripción del marcador",
+  "Cannot open {path}": "No se puede abrir {path}",
+  "Search context": "Contexto de búsqueda",
+  "not": "no",
+  "and": "y",
+  "or": "o",
+  "grouping": "agrupación",
+  "Cannot log in to {name}": "No se puede iniciar sesión en {name}",
+  "Argument: `containers`, `images`, `allImages`, `volumes`, `networks` or `system` (default).": "Argumento: `containers`, `images`, `allImages`, `volumes`, `networks` o `system` (predeterminado).",
+  "Force (also untag / remove when used by stopped containers)": "Forzar (también quitar etiqueta / eliminar cuando lo usen contenedores detenidos)",
+  "Start the services of Compose files": "Iniciar los servicios de archivos Compose",
+  "Saved to .openidea/settings.toml in this project; overrides the global value.": "Guardado en .openidea/settings.toml en este proyecto; reemplaza el valor global.",
+  "custom": "personalizado",
+  "Resolving the latest build…": "Resolviendo la compilación más reciente…",
+  "Download JDK": "Descargar JDK",
+  "Download": "Descargar",
+  "Vendor:": "Proveedor:",
+  "Vendor": "Proveedor",
+  "Version:": "Versión:",
+  "Select a version": "Seleccione una versión",
+  "JDK Location": "Ubicación del JDK",
+  "Downloading JDK": "Descargando JDK",
+  "Use ; to separate name patterns, * for any number of symbols, ? for one.": "Use ; para separar patrones de nombres, * para cualquier cantidad de símbolos, ? para uno.",
+  "Folders are detected from build files (pom.xml, build.gradle, Cargo.toml, go.mod, pyproject.toml, package.json); marking or unmarking a folder overrides detection. Excluded folders are skipped by the Project view, Find in Files and the index (reopen the project to re-index).": "Las carpetas se detectan a partir de archivos de compilación (pom.xml, build.gradle, Cargo.toml, go.mod, pyproject.toml, package.json); marcar o desmarcar una carpeta anula la detección. Las carpetas excluidas se omiten en la vista Proyecto, Buscar en archivos y el índice (vuelva a abrir el proyecto para reindexar).",
+  "Project virtualenv (auto-detect)": "Virtualenv del proyecto (detección automática)",
+  "<No interpreter>": "<Sin intérprete>",
+  "Package name or requirement, e.g. requests or django==5.1": "Nombre del paquete o requisito, p. ej., requests o django==5.1",
+  "Download JDK…": "Descargar JDK…",
+  "interpreter": "intérprete",
+  "Side tool windows take the full height; the bottom ones fit between them": "Las ventanas de herramientas laterales ocupan toda la altura; las inferiores se ajustan entre ellas",
+  "Days on which files changed; older revisions are removed when a project opens.": "Días en los que cambiaron archivos; las revisiones más antiguas se eliminan al abrir un proyecto.",
+  "Language of menus and dialogs; untranslated text stays in English.": "Idioma de menús y diálogos; el texto sin traducir permanece en inglés.",
+  "Unix and macOS (\\n)": "Unix y macOS (\\n)",
+  "Classic Mac OS (\\r)": "Mac OS clásico (\\r)",
+  "Encoding of new files; decodes project files that are not valid UTF-8 and have no BOM.": "Codificación de archivos nuevos; decodifica archivos del proyecto que no sean UTF-8 válido y no tengan BOM.",
+  "Stored in the IDE; used by projects without their own scheme.": "Almacenado en el IDE; usado por proyectos sin su propio esquema.",
+  "Semantic highlighting": "Resaltado semántico",
+  "Local variables and parameters get a colour derived from their name (needs a language server).": "Las variables locales y los parámetros reciben un color derivado de su nombre (requiere un servidor de lenguaje).",
+  "Rainbow brackets": "Paréntesis y llaves de colores",
+  "Color (), [] and {} by nesting depth; unmatched brackets use the error color.": "Colorear (), [] y {} según la profundidad de anidación; los paréntesis sin pareja usan el color de error.",
+  "Main font weight": "Grosor de la fuente principal",
+  "Bold font weight": "Grosor de la fuente en negrita",
+  "Used wherever the color scheme shows text in bold": "Se usa donde el esquema de colores muestre texto en negrita",
+  "Use ; to separate patterns. * matches every file.": "Use ; para separar patrones. * coincide con todos los archivos.",
+  "Function and method suggestions get (); the caret goes inside unless there are no parameters.": "Las sugerencias de funciones y métodos agregan (); el cursor se coloca adentro a menos que no haya parámetros.",
+  "Insert paired brackets (), [], {}": "Insertar paréntesis, corchetes y llaves en pares (), [], {}",
+  "word": "palabra",
+  "Runs of consecutive matching lines collapse into one expandable “<N internal lines>” row.": "Las secuencias de líneas coincidentes consecutivas se contraen en una fila expandible “<N líneas internas>”.",
+  "Confirm closing a tab with a running process": "Confirmar el cierre de una pestaña con un proceso en ejecución",
+  "value": "valor",
+  "Login shell": "Shell de inicio de sesión",
+  "Terminal column width": "Ancho de columna de la terminal",
+  "e.g. /usr/bin/env": "p. ej., /usr/bin/env",
+  "Force push is not allowed to these branches. Separate patterns with ; (wildcards * and ? are supported).": "No se permite hacer push forzado a estas ramas. Separe los patrones con ; (se admiten los comodines * y ?).",
+  "Adds a Signed-off-by trailer by default; it can still be switched per commit in Commit Options.": "Agrega una línea Signed-off-by de forma predeterminada; aún se puede cambiar por confirmación en Opciones de confirmación.",
+  "Configure Live Templates…": "Configurar plantillas dinámicas…",
+  "Update Tag with Emmet": "Actualizar etiqueta con Emmet",
+  "Created {fileName}": "Se creó {fileName}",
+  "No tag at the caret": "No hay ninguna etiqueta en el cursor",
+  "Cannot update the tag": "No se puede actualizar la etiqueta",
+  "Templates of this project only": "Plantillas solo de este proyecto",
+  "none": "ninguno",
+  "Opens a terminal tab running the shell at `arg` (a path from `termAvailableShells`).": "Abre una pestaña de terminal ejecutando el shell en `arg` (una ruta de `termAvailableShells`).",
+  "Opens a terminal tab running `{ program, args, name?, cwd? }` instead of the shell.": "Abre una pestaña de terminal ejecutando `{ program, args, name?, cwd? }` en lugar del shell.",
+  "TODO items in files of a changelist": "Elementos TODO en archivos de una lista de cambios",
+  "Too many matches; showing the first 10 000.": "Demasiadas coincidencias; mostrando las primeras 10 000.",
+  "{name} downloaded": "{name} descargado",
+  "The Java language server restarts on it.": "El servidor de lenguaje Java se reinicia con él.",
+  "Failed to download JDK {version}": "Error al descargar JDK {version}",
+  "Java Settings…": "Configuración de Java…",
+  "{name} needs JDK {version} to run": "{name} necesita JDK {version} para ejecutarse",
+  "Search for branches, actions, repositories": "Buscar ramas, acciones, repositorios",
+  "Repositories and branches": "Repositorios y ramas",
+  "Name <email>; empty uses the configured Git user": "Nombre <correo>; si se deja vacío, se usa el usuario de Git configurado",
+  "Amend and Push…": "Enmendar y hacer Push…",
+  "Select revisions of one file to compare them": "Seleccione revisiones de un archivo para compararlas",
+  "local": "local",
+  "remote": "remoto",
+  "tag": "etiqueta",
+  "revision": "revisión",
+  "{success}, with conflicts": "{success}, con conflictos",
+  "As new branch": "Como rama nueva",
+  "A rebase is in progress. The commit will become part of the rebased history; usually you continue the rebase instead.": "Hay un rebase en curso. La confirmación pasará a formar parte del historial con rebase; por lo general, conviene continuar el rebase en su lugar.",
+  "HEAD is detached: the commit won't belong to any branch and may be lost after checking out another branch. Create a branch first to keep it.": "HEAD está desacoplado: la confirmación no pertenecerá a ninguna rama y podría perderse al cambiar a otra rama. Cree una rama primero para conservarla.",
+  "Opens the diff viewer for a `DiffData` argument (e.g. a pull request file).": "Abre el visor de diferencias para un argumento `DiffData` (p. ej., un archivo de pull request).",
+  "From": "Desde",
+  "To": "Hasta",
+  "Created worktree at {trim}": "Se creó el árbol de trabajo en {trim}",
+  "No web URL for remote '{remote}'": "No hay URL web para el remoto '{remote}'",
+  "'{rev}' was not found in the log": "No se encontró '{rev}' en el registro",
+  "Compare Versions": "Comparar versiones",
+  "Select two commits to compare": "Seleccione dos confirmaciones para comparar",
+  "Label '{value}' added to Local History": "Etiqueta '{value}' agregada al historial local",
+  "{doneTitle} successful": "{doneTitle} exitoso",
+  "{file} updated in {commit}": "{file} actualizado en {commit}",
+  "Shelved {length} file": "Se guardó {length} archivo en el estante",
+  "Shelved {length} files": "Se guardaron {length} archivos en el estante",
+  "{what}: {length} file with conflicts": "{what}: {length} archivo con conflictos",
+  "{what}: {length} files with conflicts": "{what}: {length} archivos con conflictos",
+  "{what}: {n} file changed": "{what}: {n} archivo modificado",
+  "{what}: {n} files changed": "{what}: {n} archivos modificados",
+  "Built-in Preview": "Vista previa integrada",
+  "Cannot open the browser": "No se puede abrir el navegador",
+  "Browser": "Navegador",
+  "Default Browser": "Navegador predeterminado",
+  "Open the HTML or SVG file in the default browser through the built-in server": "Abrir el archivo HTML o SVG en el navegador predeterminado mediante el servidor integrado",
+  "Show the HTML file rendered beside the editor": "Mostrar el archivo HTML renderizado junto al editor",
+  "Project folder not found: {name}": "No se encontró la carpeta del proyecto: {name}",
+  "Cannot reopen {name}": "No se puede volver a abrir {name}",
+  "Edit inspection profile setting": "Editar configuración del perfil de inspección",
+  "Disable inspection": "Deshabilitar inspección",
+  "Change Severity": "Cambiar severidad",
+  "Edit Inspection Profile Setting…": "Editar configuración del perfil de inspección…",
+  "Compiler errors and warnings of the last Build Project, shown at their source positions.": "Errores y advertencias del compilador de la última compilación del proyecto, mostrados en sus posiciones en el código fuente.",
+  "Process code": "Procesar código",
+  "Process literals": "Procesar literales",
+  "Process comments": "Procesar comentarios",
+  "Distraction Free Mode": "Modo sin distracciones",
+  "Exit Distraction Free Mode": "Salir del modo sin distracciones",
+  "Show Hidden Files": "Mostrar archivos ocultos",
+  "Show Members": "Mostrar miembros",
+  "Show Excluded Files": "Mostrar archivos excluidos",
+  "Compact Middle Packages": "Compactar paquetes intermedios",
+  "Sort Folders First": "Ordenar carpetas primero",
+  "Open Files with Single Click": "Abrir archivos con un solo clic",
+  "Expand Directories with Single Click": "Expandir directorios con un solo clic",
+  "Enable Preview Tab": "Habilitar pestaña de vista previa",
+  "Analyze Dependencies…": "Analizar dependencias…",
+  "Shows a Maven module's dependency tree, version conflicts and where each library comes from": "Muestra el árbol de dependencias de un módulo de Maven, los conflictos de versiones y de dónde proviene cada biblioteca",
+  "Dependency Analyzer": "Analizador de dependencias",
+  "Search dependencies": "Buscar dependencias",
+  "Show conflicts only": "Mostrar solo conflictos",
+  "All scopes": "Todos los ámbitos",
+  "Show as List": "Mostrar como lista",
+  "Show as Tree": "Mostrar como árbol",
+  "Dependency trees may be out of date": "Los árboles de dependencias pueden estar desactualizados",
+  "Dependency trees are read when Maven projects are reloaded": "Los árboles de dependencias se leen cuando se recargan los proyectos de Maven",
+  "No Maven modules": "No hay módulos de Maven",
+  "Dependencies": "Dependencias",
+  "No dependencies match the filter": "Ninguna dependencia coincide con el filtro",
+  "No dependencies": "Sin dependencias",
+  "Select a dependency to see its usages": "Seleccione una dependencia para ver sus usos",
+  "Versions requested": "Versiones solicitadas",
+  "omitted": "omitida",
+  "resolved": "resuelta",
+  "omitted for conflict with {version}": "omitida por conflicto con {version}",
+  "omitted for conflict": "omitida por conflicto",
+  "omitted for duplicate": "omitida por duplicado",
+  "omitted for cycle": "omitida por ciclo",
+  "version managed from {version}": "versión administrada desde {version}",
+  "No Maven or Gradle projects": "No hay proyectos de Maven o Gradle",
+  "Resolving dependencies…": "Resolviendo dependencias…",
+  "Cannot resolve dependencies": "No se pueden resolver las dependencias",
+  "requested {version}": "solicitada {version}",
+  "not resolved": "no resuelta",
+  "Shows a Gradle project's resolved dependencies per configuration, version conflicts and where each library comes from": "Muestra las dependencias resueltas de un proyecto de Gradle por configuración, los conflictos de versiones y de dónde proviene cada biblioteca",
+  "Cannot find the declaration": "No se puede encontrar la declaración",
+  "Cannot exclude {name}": "No se puede excluir {name}",
+  "Solarized Light": "Solarized claro",
+  "Solarized Dark": "Solarized oscuro",
+  "One Light": "One Light",
+  "One Dark": "One Dark",
+  "Copied reference: {reference}": "Referencia copiada: {reference}",
+  "{count} lines": "{count} líneas",
+  "Preview of {path}": "Vista previa de {path}",
+  "Editor for {path}": "Editor de {path}",
+  "Unwrap '{label}'": "Desenvolver '{label}'",
+  "'{name}' is read-only. Make it writable?": "'{name}' es de solo lectura. ¿Desea hacerlo editable?",
+  "Make '{name}' read-only?": "¿Hacer que '{name}' sea de solo lectura?",
+  "Some unsaved edits to {path} could not be applied and were replaced by the file's current content.": "Algunos cambios sin guardar en {path} no se pudieron aplicar y fueron reemplazados por el contenido actual del archivo.",
+  "No editor for “{kind}”": "No hay editor para “{kind}”",
+  "Show usages of {name}": "Mostrar usos de {name}",
+  "Cannot resolve file '{value}'": "No se puede resolver el archivo '{value}'",
+  "Reformat File: {name}": "Reformatear archivo: {name}",
+  "Inspection '{name}' options": "Opciones de la inspección '{name}'",
+  "Choose Declaration of '{label}' ({count} found)": "Elegir declaración de '{label}' ({count} encontradas)",
+  "Press {keys} to show dialog with more options": "Presione {keys} para mostrar el diálogo con más opciones",
+  "Rename '{oldName}' to '{newName}'": "Renombrar '{oldName}' a '{newName}'",
+  "Rename '{name}'": "Renombrar '{name}'",
+  "Change '{word}' to": "Cambiar '{word}' a",
+  "Rename '{word}' to": "Renombrar '{word}' a",
+  "Save '{word}' to project-level dictionary": "Guardar '{word}' en el diccionario del proyecto",
+  "Save '{word}' to application-level dictionary": "Guardar '{word}' en el diccionario de la aplicación",
+  "Typo: In word '{word}'": "Error tipográfico: en la palabra '{word}'",
+  "Choose Super Class or Interface ({count} found)": "Elegir superclase o interfaz ({count} encontradas)",
+  "Choose Super Method of {name} ({count} found)": "Elegir supermétodo de {name} ({count} encontrados)",
+  "Choose Implementation of {name} ({count} found)": "Elegir implementación de {name} ({count} encontradas)",
+  "Choose Subclass of {name} ({count} found)": "Elegir subclase de {name} ({count} encontradas)",
+  "Choose Overriding Method of {name} ({count} found)": "Elegir método que sobrescribe a {name} ({count} encontrados)",
+  "Is implemented by {names}": "Es implementado por {names}",
+  "Is subclassed by {names}": "Tiene como subclase a {names}",
+  "Is implemented in {names}": "Se implementa en {names}",
+  "Is overridden in {names}": "Se sobrescribe en {names}",
+  "Implements method in {names}": "Implementa el método en {names}",
+  "Overrides method in {names}": "Sobrescribe el método en {names}",
+  "{names} and {count} more": "{names} y {count} más",
+  "Implemented and overridden": "Implementado y sobrescrito",
+  "Implementing and overriding": "Que implementan y sobrescriben",
+  "Implemented and overridden declarations": "Declaraciones implementadas y sobrescritas",
+  "Color preview": "Vista previa de color",
+  "Implementing and overriding methods": "Métodos que implementan y sobrescriben",
+  "Replace all {count} occurrences": "Reemplazar todas las {count} coincidencias",
+  "↵ Apply · Esc Keep '{name}'": "↵ Aplicar · Esc Conservar '{name}'",
+  " (in {files} files)": " (en {files} archivos)",
+  "{subject} have {n} usage that is not safe to delete{where}.": "{subject} tienen {n} uso que no es seguro eliminar{where}.",
+  "{subject} have {n} usages that are not safe to delete{where}.": "{subject} tienen {n} usos que no es seguro eliminar{where}.",
+  "{subject} has {n} usage that is not safe to delete{where}.": "{subject} tiene {n} uso que no es seguro eliminar{where}.",
+  "{subject} has {n} usages that are not safe to delete{where}.": "{subject} tiene {n} usos que no es seguro eliminar{where}.",
+  "{n} usage found": "{n} uso encontrado",
+  "{n} usages found": "{n} usos encontrados",
+  "Safe Delete {kind} '{name}'": "Eliminación segura de {kind} '{name}'",
+  "Delete {kind} '{name}'?": "¿Eliminar {kind} '{name}'?",
+  "File '{name}'": "Archivo '{name}'",
+  "The {count} files": "Los {count} archivos",
+  "Delete “{title}”? Its branch {branch} is kept.": "¿Eliminar “{title}”? Su rama {branch} se conservará.",
+  "Delete “{title}”? Files it changed are kept.": "¿Eliminar “{title}”? Los archivos modificados se conservarán.",
+  "{name} is over 5 MB.": "{name} supera los 5 MB.",
+  "{used} / {size} tokens": "{used} / {size} tokens",
+  "Replace in {path}:{line}": "Reemplazar en {path}:{line}",
+  "Clean up {count} files?": "¿Limpiar {count} archivos?",
+  "Leave empty to use the folder name ({folder}).": "Déjelo vacío para usar el nombre de la carpeta ({folder}).",
+  "Debug '{name}'": "Depurar '{name}'",
+  "Open {file}": "Abrir {file}",
+  "{direction} Hierarchy": "Jerarquía {direction}",
+  "Language servers: {text}": "Servidores de lenguaje: {text}",
+  "Install {name}": "Instalar {name}",
+  "Restart {name}": "Reiniciar {name}",
+  "{count} error": "{count} error",
+  "{count} errors": "{count} errores",
+  "{count} warning": "{count} advertencia",
+  "{count} warnings": "{count} advertencias",
+  "{errors} and {warnings}": "{errors} y {warnings}",
+  "{found} found in {n} file": "{found} encontrado en {n} archivo",
+  "{found} found in {n} files": "{found} encontrados en {n} archivos",
+  "{message} Install it with: {command}": "{message} Instálelo con: {command}",
+  "Import Data into {schema}.{table}": "Importar datos en {schema}.{table}",
+  "Import {count} Rows": "Importar {count} filas",
+  "{source} Query History": "Historial de consultas de {source}",
+  "Local filter of {column}": "Filtro local de {column}",
+  "Values of {column}": "Valores de {column}",
+  "Copy as {format}": "Copiar como {format}",
+  "Connect to {name}": "Conectar a {name}",
+  "SSH: {name}": "SSH: {name}",
+  "Modify Table {table}": "Modificar tabla {table}",
+  "{label} (seconds)": "{label} (segundos)",
+  "Succeeded: {version}": "Exitoso: {version}",
+  "All databases": "Todas las bases de datos",
+  "Add databases pattern": "Agregar patrón de bases de datos",
+  "All schemas (databases)": "Todos los esquemas (bases de datos)",
+  "All schemas": "Todos los esquemas",
+  "Add schemas (databases) pattern": "Agregar patrón de esquemas (bases de datos)",
+  "Add schemas pattern": "Agregar patrón de esquemas",
+  "Data Source: {name}": "Origen de datos: {name}",
+  "{table} data": "Datos de {table}",
+  "{count} rows": "{count} filas",
+  "Remove data source '{name}'? Its query console file stays on disk.": "¿Quitar el origen de datos '{name}'? Su archivo de consola de consultas permanecerá en el disco.",
+  "Result {n}": "Resultado {n}",
+  "{name} has uncommitted changes. Commit or roll them back before switching to auto-commit?": "{name} tiene cambios sin confirmar. ¿Desea confirmarlos o revertirlos antes de cambiar a confirmación automática?",
+  "Cannot copy the name": "No se puede copiar el nombre",
+  "Cannot copy the reference": "No se puede copiar la referencia",
+  "Cannot copy the DDL": "No se puede copiar el DDL",
+  "Start the remote JVM with -agentlib:jdwp=transport=dt_socket,server=n,address={host}:{port},suspend=y": "Inicie la JVM remota con -agentlib:jdwp=transport=dt_socket,server=n,address={host}:{port},suspend=y",
+  "{class} reloaded": "{class} recargada",
+  "{count} class": "{count} clase",
+  "{count} classes": "{count} clases",
+  "The JavaScript debugger (vscode-js-debug) is not installed": "El depurador de JavaScript (vscode-js-debug) no está instalado",
+  "Delve is not installed": "Delve no está instalado",
+  "CodeLLDB is not installed": "CodeLLDB no está instalado",
+  "{name} (child)": "{name} (hijo)",
+  "Enable breakpoint at {path}:{line}": "Habilitar punto de interrupción en {path}:{line}",
+  "Headers ({count})": "Encabezados ({count})",
+  "Headers": "Encabezados",
+  "Delete the macro '{name}'?": "¿Eliminar la macro '{name}'?",
+  "{count} processes": "{count} procesos",
+  "Memory: {usage}": "Memoria: {usage}",
+  " Memory {before} → {after}.": " Memoria {before} → {after}.",
+  "{count} syntax tree dropped, index compacted.{memory}": "{count} árbol sintáctico descartado, índice compactado.{memory}",
+  "{count} syntax trees dropped, index compacted.{memory}": "{count} árboles sintácticos descartados, índice compactado.{memory}",
+  "Disable {name}": "Deshabilitar {name}",
+  "Enable {name}": "Habilitar {name}",
+  "Run {name}": "Ejecutar {name}",
+  "Apply theme {name}": "Aplicar tema {name}",
+  "Confirm uninstall {name}": "Confirmar desinstalación de {name}",
+  "From plugin {name}": "Del plugin {name}",
+  "{count} items": "{count} elementos",
+  "Refactoring Preview: {title}": "Vista previa de refactorización: {title}",
+  "Include {path}": "Incluir {path}",
+  "Project View: {option}": "Vista del proyecto: {option}",
+  "Project View: Show {view}": "Vista del proyecto: Mostrar {view}",
+  "Reveal in {fileManager}": "Mostrar en {fileManager}",
+  "Unmark as {role}": "Desmarcar como {role}",
+  "Updated references in {count} file": "Referencias actualizadas en {count} archivo",
+  "Updated references in {count} files": "Referencias actualizadas en {count} archivos",
+  "Changed since the refactoring, not reverted: {files}": "Modificado desde la refactorización, no revertido: {files}",
+  "Remove '{name}'": "Quitar '{name}'",
+  "{name} output": "Salida de {name}",
+  "Finished in {duration}, exit code {code}": "Finalizado en {duration}, código de salida {code}",
+  "{name} terminal": "Terminal de {name}",
+  "Stop ({count} running)": "Detener ({count} en ejecución)",
+  "Rerun '{name}'": "Volver a ejecutar '{name}'",
+  "Stop '{name}'": "Detener '{name}'",
+  "Comparison Failure: {name}": "Fallo de comparación: {name}",
+  "Process '{name}' Is Running": "El proceso '{name}' está en ejecución",
+  "'{name}' is not allowed to run in parallel.\nWould you like to stop {count} running instances?": "'{name}' no tiene permitido ejecutarse en paralelo.\n¿Desea detener las {count} instancias en ejecución?",
+  "'{name}' is not allowed to run in parallel.\nWould you like to stop the running one?": "'{name}' no tiene permitido ejecutarse en paralelo.\n¿Desea detener la instancia en ejecución?",
+  "Do you want to terminate the process '{name}'?": "¿Desea terminar el proceso '{name}'?",
+  "Running '{name}' without the debugger.": "Ejecutando '{name}' sin el depurador.",
+  "{className} is not part of the project, and no library sources are available for it.": "{className} no forma parte del proyecto y no hay código fuente de biblioteca disponible para ella.",
+  "{count} running": "{count} en ejecución",
+  "Stack trace {title}": "Traza de pila {title}",
+  "Error running '{name}': {message}\n": "Error al ejecutar '{name}': {message}\n",
+  "Cannot write to stdin: {message}\n": "No se puede escribir en stdin: {message}\n",
+  "Run Gradle tasks": "Ejecutar tareas de Gradle",
+  "Run Maven goals": "Ejecutar fases/goals de Maven",
+  "Delete the list '{name}' with its {count} bookmark?": "¿Eliminar la lista '{name}' con su {count} marcador?",
+  "Delete the list '{name}' with its {count} bookmarks?": "¿Eliminar la lista '{name}' con sus {count} marcadores?",
+  "Delete {count} Bookmarks": "Eliminar {count} marcadores",
+  "Remove the connection '{name}' from Services?": "¿Quitar la conexión '{name}' de Servicios?",
+  "Remove the registry '{name}' and its saved password?": "¿Quitar el registro '{name}' y su contraseña guardada?",
+  "Prune Unused Containers…": "Limpiar contenedores no utilizados…",
+  "Prune Dangling Images…": "Limpiar imágenes huérfanas…",
+  "Prune Unused Images…": "Limpiar imágenes no utilizadas…",
+  "Prune Unused Volumes…": "Limpiar volúmenes no utilizados…",
+  "Prune Unused Networks…": "Limpiar redes no utilizadas…",
+  "Prune Everything Unused…": "Limpiar todo lo no utilizado…",
+  "Delete Container": "Eliminar contenedor",
+  "Delete container '{name}'? It is running and will be stopped.": "¿Eliminar el contenedor '{name}'? Está en ejecución y se detendrá.",
+  "Delete container '{name}'?": "¿Eliminar el contenedor '{name}'?",
+  "Delete Image": "Eliminar imagen",
+  "Delete image '{name}'?": "¿Eliminar la imagen '{name}'?",
+  "Delete Volume": "Eliminar volumen",
+  "Delete volume '{name}'?": "¿Eliminar el volumen '{name}'?",
+  "Delete Network": "Eliminar red",
+  "Delete network '{name}'?": "¿Eliminar la red '{name}'?",
+  "Stop and remove the containers and networks of '{name}'?": "¿Detener y eliminar los contenedores y redes de '{name}'?",
+  "Build Image '{tag}'": "Compilar imagen '{tag}'",
+  "Enter a value between {min} and {max}": "Ingrese un valor entre {min} y {max}",
+  "based on {parent}": "basado en {parent}",
+  "Delete keymap '{name}'?": "¿Eliminar el mapa de teclado '{name}'?",
+  "Remove {shortcut}": "Quitar {shortcut}",
+  "Keyboard Shortcut: {action}": "Atajo de teclado: {action}",
+  "Remove content root {path}": "Quitar raíz de contenido {path}",
+  "Unmark {folder}": "Desmarcar {folder}",
+  "File name patterns of {name}": "Patrones de nombre de archivo de {name}",
+  "Hashbang patterns of {name}": "Patrones hashbang de {name}",
+  "{group} popup type": "Tipo de ventana emergente de {group}",
+  "Show {group} in tool window": "Mostrar {group} en ventana de herramientas",
+  "{label} hex": "{label} hexadecimal",
+  "{label} custom value": "Valor personalizado de {label}",
+  "Delete inspection profile '{name}'?": "¿Eliminar el perfil de inspección '{name}'?",
+  "{server} problems with code {code} ({source}).": "Problemas de {server} con el código {code} ({source}).",
+  "{server} problems with code {code}.": "Problemas de {server} con el código {code}.",
+  "{description}\n\nExample: {sample}": "{description}\n\nEjemplo: {sample}",
+  "Problems the {server} language server reports in {languages} files. Severity \"As reported\" keeps the level the server assigns; a code below can override it.": "Problemas que reporta el servidor de lenguaje {server} en archivos {languages}. La severidad \"Según lo reportado\" conserva el nivel asignado por el servidor; un código abajo puede reemplazarlo.",
+  "Problems the {server} language server reports. Severity \"As reported\" keeps the level the server assigns; a code below can override it.": "Problemas que reporta el servidor de lenguaje {server}. La severidad \"Según lo reportado\" conserva el nivel asignado por el servidor; un código abajo puede reemplazarlo.",
+  "Auto-detected: {path}": "Detectado automáticamente: {path}",
+  "New {name}": "Nuevo {name}",
+  "Name (.{extension})": "Nombre (.{extension})",
+  "'{abbreviation}' does not describe a single element.": "'{abbreviation}' no describe un único elemento.",
+  "New {name}…": "Nuevo {name}…",
+  "{name} expression": "Expresión de {name}",
+  "{name} default value": "Valor predeterminado de {name}",
+  "Skip {name} if defined": "Omitir {name} si está definido",
+  "Enable .{key}": "Habilitar .{key}",
+  "{keyword} colour": "Color de {keyword}",
+  "{count} file": "{count} archivo",
+  "{count} files": "{count} archivos",
+  "Reinstall {name}": "Reinstalar {name}",
+  "Installed in {path}; it is used for projects targeting Java {version}.": "Instalado en {path}; se utiliza para proyectos dirigidos a Java {version}.",
+  "Code insight for {languages} needs {command}. Install it via {method}?": "El análisis de código para {languages} requiere {command}. ¿Desea instalarlo mediante {method}?",
+  "Version {version}": "Versión {version}",
+  "Branch {name}": "Rama {name}",
+  "Tag {name}": "Etiqueta {name}",
+  "Branch {branch} of {repository}": "Rama {branch} de {repository}",
+  "Branches of {root}": "Ramas de {root}",
+  "Include {name} in commit": "Incluir {name} en la confirmación",
+  "Compare {current} with {branch}": "Comparar {current} con {branch}",
+  "Rebase '{head}' onto Selected Commit": "Hacer rebase de '{head}' sobre la confirmación seleccionada",
+  "Revert {file} to the revision from {time} ({label})?": "¿Revertir {file} a la revisión de {time} ({label})?",
+  "Revert {count} files under {folder} to label '{label}'?": "¿Revertir {count} archivos en {folder} a la etiqueta '{label}'?",
+  "Revert {file} to label '{label}'?": "¿Revertir {file} a la etiqueta '{label}'?",
+  "Revert from Local History": "Revertir desde el historial local",
+  "{submodule} points to another commit. Check out the recorded commit in the submodule (git submodule update) to revert it.": "{submodule} apunta a otra confirmación. Cambie a la confirmación registrada en el submódulo (git submodule update) para revertirlo.",
+  "New Branch from '{name}'…": "Nueva rama a partir de '{name}'…",
+  "Rebase Current onto '{name}'": "Hacer rebase de la rama actual sobre '{name}'",
+  "Merge '{name}' into Current": "Fusionar '{name}' en la rama actual",
+  "Checkout and Rebase onto '{current}'": "Cambiar de rama y hacer rebase sobre '{current}'",
+  "Compare with '{current}'": "Comparar con '{current}'",
+  "Rebase '{current}' onto '{name}'": "Hacer rebase de '{current}' sobre '{name}'",
+  "Merge '{name}' into '{current}'": "Fusionar '{name}' en '{current}'",
+  "Create New Branch from {from}": "Crear nueva rama a partir de {from}",
+  "Rename Branch {name}": "Renombrar rama {name}",
+  "Delete branch '{name}' on the remote? The remote-tracking branch '{tracking}' is removed as well.": "¿Eliminar la rama '{name}' en el remoto? También se quitará la rama de seguimiento remoto '{tracking}'.",
+  "New branch name (in {count} repositories):": "Nombre de la nueva rama (en {count} repositorios):",
+  "Delete branch '{name}' in {count} repositories? Unmerged commits are discarded.": "¿Eliminar la rama '{name}' en {count} repositorios? Se descartarán las confirmaciones no fusionadas.",
+  "Your local changes to the following files would be overwritten by checkout:\n{files}\n\nSmart Checkout can stash the changes, checkout and unstash them after that.": "Sus cambios locales en los siguientes archivos serían sobrescritos al cambiar de rama:\n{files}\n\nEl cambio inteligente puede guardar los cambios en el stash, cambiar de rama y restaurarlos después.",
+  "Unstash {ref} as branch {branch}": "Restaurar del stash {ref} como la rama {branch}",
+  "Pop {ref}": "Extraer (pop) {ref}",
+  "Apply {ref}": "Aplicar {ref}",
+  "Drop {ref} “{message}”? This cannot be undone.": "¿Descartar {ref} “{message}”? Esta acción no se puede deshacer.",
+  "Drop {ref}? This cannot be undone.": "¿Descartar {ref}? Esta acción no se puede deshacer.",
+  "Changelist '{name}' contains {count} change. It will be moved to '{target}'. Delete the changelist?": "La lista de cambios '{name}' contiene {count} cambio. Se moverá a '{target}'. ¿Eliminar la lista de cambios?",
+  "Changelist '{name}' contains {count} changes. They will be moved to '{target}'. Delete the changelist?": "La lista de cambios '{name}' contiene {count} cambios. Se moverán a '{target}'. ¿Eliminar la lista de cambios?",
+  "{name} (active)": "{name} (activa)",
+  "from {path}": "de {path}",
+  "{dir} · from {path}": "{dir} · de {path}",
+  "Clipboard ↔ {file} (selection)": "Portapapeles ↔ {file} (selección)",
+  "Clipboard ↔ {file}": "Portapapeles ↔ {file}",
+  "Pull to {head}": "Hacer pull a {head}",
+  "Merge into {head}": "Fusionar en {head}",
+  "Merge branch '{branch}' into {head}": "Fusionar la rama '{branch}' en {head}",
+  "Remove remote '{name}'? Its remote-tracking branches are deleted.": "¿Quitar el remoto '{name}'? Se eliminarán sus ramas de seguimiento remoto.",
+  "Remove the worktree at {path}? Its folder is deleted.": "¿Quitar el árbol de trabajo en {path}? Se eliminará su carpeta.",
+  "{error}\n\nRemove it anyway, discarding its changes?": "{error}\n\n¿Quitarlo de todos modos, descartando sus cambios?",
+  "{count} file has conflicts: {files}": "{count} archivo tiene conflictos: {files}",
+  "{count} files have conflicts: {files}": "{count} archivos tienen conflictos: {files}",
+  "{status} (from {path})": "{status} (de {path})",
+  "Create New Tag On {commit}": "Crear nueva etiqueta en {commit}",
+  "Changes between {from} and Local Working Tree": "Cambios entre {from} y el árbol de trabajo local",
+  "Changes between {from} and {to}": "Cambios entre {from} y {to}",
+  "No rebase in progress": "No hay ningún rebase en curso",
+  "No merge in progress": "No hay ninguna fusión en curso",
+  "No cherry-pick in progress": "No hay ningún cherry-pick en curso",
+  "No revert in progress": "No hay ninguna reversión en curso",
+  "No patch application in progress": "No hay ninguna aplicación de parche en curso",
+  "Apply Patch: {source}": "Aplicar parche: {source}",
+  "Drop {count} commits from the current branch? Their changes are removed.": "¿Descartar {count} confirmaciones de la rama actual? Sus cambios serán eliminados.",
+  "Drop commit {id} “{summary}” from the current branch? Its changes are removed.": "¿Descartar la confirmación {id} “{summary}” de la rama actual? Sus cambios serán eliminados.",
+  "Action for {id}": "Acción para {id}",
+  "Rebasing {n} commit onto {onto}": "Haciendo rebase de {n} confirmación sobre {onto}",
+  "Rebasing {n} commits onto {onto}": "Haciendo rebase de {n} confirmaciones sobre {onto}",
+  "Rebasing {n} commit from the root": "Haciendo rebase de {n} confirmación desde la raíz",
+  "Rebasing {n} commits from the root": "Haciendo rebase de {n} confirmaciones desde la raíz",
+  "Push Commits to {remote}": "Hacer push de confirmaciones a {remote}",
+  "Pushed {n} commit to {remote}": "Se hizo push de {n} confirmación a {remote}",
+  "Pushed {n} commits to {remote}": "Se hizo push de {n} confirmaciones a {remote}",
+  "You're going to force push to '{target}'. It may overwrite commits at the remote. Are you sure you want to proceed?": "Está a punto de hacer push forzado a '{target}'. Esto puede sobrescribir confirmaciones en el remoto. ¿Está seguro de que desea continuar?",
+  "Delete “{name}” from the shelf? This cannot be undone.": "¿Eliminar “{name}” del estante? Esta acción no se puede deshacer.",
+  "Handler for {keystroke}": "Manejador para {keystroke}",
+  "Open '{path}' in Browser": "Abrir '{path}' en el navegador",
+  "Open ({shortcut})": "Abrir ({shortcut})",
+  "Remove '{name}' from the list of recent projects?": "¿Quitar '{name}' de la lista de proyectos recientes?",
+  "Disable Inspection '{name}'": "Deshabilitar inspección '{name}'",
+  "Download JDK {version}": "Descargar JDK {version}",
+  "Cancel {title}": "Cancelar {title}",
+  "Background tasks: {title}": "Tareas en segundo plano: {title}",
+  "{files} files · {symbols} symbols": "{files} archivos · {symbols} símbolos",
+  "{title} view options": "Opciones de vista de {title}",
+  "{title} views": "Vistas de {title}",
+  "{title} options": "Opciones de {title}",
+  "Delete the layout '{name}'?": "¿Eliminar el diseño '{name}'?",
+  "In {left}, not in {right}": "En {left}, no en {right}",
+  "Local branch '{local}' has commits that do not exist in '{remote}'. Rebase '{local}' onto '{remote}', or drop local commits?": "La rama local '{local}' tiene confirmaciones que no existen en '{remote}'. ¿Hacer rebase de '{local}' sobre '{remote}' o descartar las confirmaciones locales?",
+  "Add Language Server…": "Agregar servidor de lenguaje…",
+  "Use {displayName}": "Usar {displayName}",
+  "Select {name}": "Seleccionar {name}",
+  "Root markers": "Marcadores de raíz",
+  "Initialization options": "Opciones de inicialización",
+  "Global": "Global",
+  "This project": "Este proyecto",
+  "Executable name or path": "Nombre o ruta del ejecutable",
+  "Select the server executable": "Seleccionar el ejecutable del servidor",
+  "Remove Language Server": "Quitar servidor de lenguaje",
+  "Missing ({missingCount})": "Faltantes ({missingCount})",
+  "Choose languages…": "Elegir lenguajes…",
+  "Filter languages": "Filtrar lenguajes",
+  "No languages match.": "Ningún lenguaje coincide.",
+  "Checked when the settings are applied.": "Se verifica al aplicar la configuración.",
+  "Using": "Usando",
+  "Not found on PATH.": "No se encontró en PATH.",
+  "Use {displayName} for {join} files": "Usar {displayName} para archivos {join}",
+  "Files marking the workspace root.": "Archivos que marcan la raíz del espacio de trabajo.",
+  "Merged over the defaults shown when empty.": "Se combina sobre los valores predeterminados mostrados cuando está vacío.",
+  "Workspace Configuration": "Configuración del espacio de trabajo",
+  "Enter the command that starts the server.": "Ingrese el comando que inicia el servidor.",
+  "Name: letters, digits, - _ + only.": "Nombre: solo letras, dígitos, - _ +.",
+  "{effectiveName} already exists.": "{effectiveName} ya existe.",
+  "Choose the languages it serves.": "Elija los lenguajes que atiende.",
+  "New Language Server": "Nuevo servidor de lenguaje",
+  "Any language server that talks LSP over stdio, with its arguments.": "Cualquier servidor de lenguaje que se comunique mediante LSP por stdio, con sus argumentos.",
+  "Changing these restarts the server.": "Cambiar estas opciones reinicia el servidor.",
+  "Sent to the running server; no restart needed.": "Se envía al servidor en ejecución; no requiere reinicio.",
+  "SSH Configurations": "Configuraciones SSH",
+  "User name": "Nombre de usuario",
+  "Authentication type": "Tipo de autenticación",
+  "Key pair (OpenSSH or PuTTY)": "Par de claves (OpenSSH o PuTTY)",
+  "Private key file": "Archivo de clave privada",
+  "Save passphrase": "Guardar frase de contraseña",
+  "SSH Password": "Contraseña SSH",
+  "Yes": "Sí",
+  "No": "No",
+  "Configuration:": "Configuración:",
+  "SSH configuration": "Configuración SSH",
+  "The authenticity of the host cannot be established. Trust it and add the key to ~/.ssh/known_hosts?": "No se puede establecer la autenticidad del host. ¿Confiar en él y agregar la clave a ~/.ssh/known_hosts?",
+  "No SSH configurations. Click + to add one.": "No hay configuraciones SSH. Haga clic en + para agregar una.",
+  "SSH configurations are shared by all projects: data source tunnels, deployment servers, run targets and Tools › Start SSH Session connect with them.": "Las configuraciones SSH son compartidas por todos los proyectos: los túneles de orígenes de datos, servidores de despliegue, destinos de ejecución y Herramientas › Iniciar sesión SSH se conectan con ellas.",
+  "SSH configurations actions": "Acciones de configuraciones SSH",
+  "SSH configurations": "Configuraciones SSH",
+  "No host": "Sin host",
+  "Edit SSH Configurations…": "Editar configuraciones SSH…",
+  "No SSH configurations. Add one…": "No hay configuraciones SSH. Agregar una…",
+  "Cannot start SSH session": "No se puede iniciar la sesión SSH",
+  "Start SSH Session": "Iniciar sesión SSH",
+  "Start SSH Session…": "Iniciar sesión SSH…",
+  "SSH Configurations…": "Configuraciones SSH…",
+  "SSH Session…": "Sesión SSH…",
+  "Custom (fields below)": "Personalizado (campos de abajo)",
+  "Connects to {target}.": "Se conecta a {target}.",
+  "SSH configuration {id} no longer exists.": "La configuración SSH {id} ya no existe.",
+  "Run Targets": "Destinos de ejecución",
+  "Target Settings": "Configuración del destino",
+  "Project folder on target": "Carpeta del proyecto en el destino",
+  "Files are uploaded here and the working directory is mapped into it.": "Los archivos se suben aquí y el directorio de trabajo se asigna a esta carpeta.",
+  "Upload changed project files before each run": "Subir archivos modificados del proyecto antes de cada ejecución",
+  "Node.js interpreter": "Intérprete de Node.js",
+  "Java executable": "Ejecutable de Java",
+  "No run targets. Click + to add one.": "No hay destinos de ejecución. Haga clic en + para agregar uno.",
+  "Run targets actions": "Acciones de destinos de ejecución",
+  "Run targets": "Destinos de ejecución",
+  "Choose a target under “Run on” in a run configuration. Interpreters left empty are looked up on the target's PATH. SSH configurations are managed in Tools › SSH Configurations.": "Elija un destino en “Ejecutar en” dentro de una configuración de ejecución. Los intérpretes que se dejan vacíos se buscan en el PATH del destino. Las configuraciones SSH se administran en Herramientas › Configuraciones SSH.",
+  "Select Folder on Target": "Seleccionar carpeta en el destino",
+  "Parent Folder": "Carpeta superior",
+  "Remote path": "Ruta remota",
+  "Remote folders": "Carpetas remotas",
+  "Trust Host": "Confiar en el host",
+  "Password or passphrase": "Contraseña o frase de contraseña",
+  "No subfolders": "Sin subcarpetas",
+  "{name} (missing)": "{name} (faltante)",
+  "Run on": "Ejecutar en",
+  "Local machine": "Máquina local",
+  "Debugging is not available on run targets.": "La depuración no está disponible en destinos de ejecución.",
+  "Add SSH hosts in Settings › Build, Execution, Deployment › Run Targets.": "Agregue hosts SSH en Configuración › Compilación, ejecución, despliegue › Destinos de ejecución.",
+  "Debugging on run targets is not supported": "No se admite la depuración en destinos de ejecución",
+  "'{name}' runs on {target}. Run it, or choose “Local machine” under “Run on” to debug it.": "'{name}' se ejecuta en {target}. Ejecútelo o elija “Máquina local” en “Ejecutar en” para depurarlo.",
+  "SSH Authentication": "Autenticación SSH",
+  "Deployment": "Despliegue",
+  "Deployment servers": "Servidores de despliegue",
+  "Mappings": "Asignaciones",
+  "Excluded Paths": "Rutas excluidas",
+  "Root path": "Ruta raíz",
+  "Mappings' deployment paths are relative to this folder.": "Las rutas de despliegue de las asignaciones son relativas a esta carpeta.",
+  "Login folder": "Carpeta de inicio de sesión",
+  "Web server URL": "URL del servidor web",
+  "Choose Folder": "Elegir carpeta",
+  "Home folder is unavailable": "La carpeta personal no está disponible",
+  "Folder does not exist: {path}": "La carpeta no existe: {path}",
+  "Not a folder: {path}": "No es una carpeta: {path}",
+  "Folder is not writable: {path}: {error}": "La carpeta no tiene permisos de escritura: {path}: {error}",
+  "Source and destination are the same file: {path}": "El origen y el destino son el mismo archivo: {path}",
+  "Local or mounted folder": "Carpeta local o montada",
+  "Folder path": "Ruta de la carpeta",
+  "SFTP": "SFTP",
+  "Connected successfully": "Conectado correctamente",
+  "Trust Host Key and Retry": "Confiar en la clave del host y reintentar",
+  "Choose Remote Folder": "Elegir carpeta remota",
+  "Local path": "Ruta local",
+  "Deployment path": "Ruta de despliegue",
+  "Web path": "Ruta web",
+  "Use as Default": "Usar como predeterminado",
+  "Mappings actions": "Acciones de asignaciones",
+  "No mappings: nothing is deployed": "Sin asignaciones: no se despliega nada",
+  "Local paths are relative to the project root or absolute inside it (empty: the whole project); deployment paths are relative to the server's root path.": "Las rutas locales son relativas a la raíz del proyecto o absolutas dentro de ella (vacío: todo el proyecto); las rutas de despliegue son relativas a la ruta raíz del servidor.",
+  "No excluded paths": "No hay rutas excluidas",
+  "Excluded remote paths": "Rutas remotas excluidas",
+  "Remote paths that are never uploaded to, downloaded from or deleted.": "Rutas remotas a las que nunca se suben, descargan ni eliminan archivos.",
+  "Deployment servers actions": "Acciones de servidores de despliegue",
+  "No servers. Click + to add one.": "No hay servidores. Haga clic en + para agregar uno.",
+  "Server settings": "Configuración del servidor",
+  "Add an SFTP server to upload, download and synchronize project files.": "Agregue un servidor SFTP para subir, descargar y sincronizar archivos del proyecto.",
+  "Exclude items by name": "Excluir elementos por nombre",
+  "Names or wildcards separated by “;”, e.g. .git;*.pyc. Matching files and folders are never transferred.": "Nombres o comodines separados por “;”, p. ej., .git;*.pyc. Los archivos y carpetas coincidentes nunca se transfieren.",
+  "Upload changed files automatically to the default server": "Subir automáticamente los archivos modificados al servidor predeterminado",
+  "On explicit save action": "Al guardar explícitamente",
+  "Delete remote files when local are deleted": "Eliminar archivos remotos cuando se eliminen los locales",
+  "Preserve files timestamps": "Conservar las marcas de tiempo de los archivos",
+  "Upload to Default Server": "Subir al servidor predeterminado",
+  "Upload to {server}": "Subir a {server}",
+  "Download from {server}": "Descargar de {server}",
+  "Sync with Deployed to {server}…": "Sincronizar con lo desplegado en {server}…",
+  "Sync with Deployed to Default Server": "Sincronizar con lo desplegado en el servidor predeterminado",
+  "Compare local files with the default deployment server and synchronize them": "Comparar archivos locales con el servidor de despliegue predeterminado y sincronizarlos",
+  "Upload the selected files and folders to the default deployment server": "Subir los archivos y carpetas seleccionados al servidor de despliegue predeterminado",
+  "Upload to…": "Subir a…",
+  "Upload the selected files and folders to a deployment server": "Subir los archivos y carpetas seleccionados a un servidor de despliegue",
+  "Download from Default Server": "Descargar del servidor predeterminado",
+  "Replace the selected files and folders with their copies on the default deployment server": "Reemplazar los archivos y carpetas seleccionados con sus copias del servidor de despliegue predeterminado",
+  "Download from…": "Descargar de…",
+  "Replace the selected files and folders with their copies on a deployment server": "Reemplazar los archivos y carpetas seleccionados con sus copias de un servidor de despliegue",
+  "Sync with Deployed to…": "Sincronizar con lo desplegado en…",
+  "Compare local files with a deployment server and synchronize them": "Comparar archivos locales con un servidor de despliegue y sincronizarlos",
+  "Delete from Server": "Eliminar del servidor",
+  "Delete the remote copies of the selected files and folders on the default server": "Eliminar las copias remotas de los archivos y carpetas seleccionados en el servidor predeterminado",
+  "Automatic Upload": "Subida automática",
+  "Upload changed files to the default server automatically": "Subir archivos modificados al servidor predeterminado automáticamente",
+  "Browse Remote Host": "Explorar host remoto",
+  "Show the files of a deployment server in the Remote Host tool window": "Mostrar los archivos de un servidor de despliegue en la ventana de herramientas Host remoto",
+  "Open in Browser (Deployed)": "Abrir en el navegador (desplegado)",
+  "Open the deployed URL of the file on the default server's web server": "Abrir la URL desplegada del archivo en el servidor web del servidor predeterminado",
+  "Deployment Configuration…": "Configuración de despliegue…",
+  "Edit the deployment servers and options": "Editar los servidores y opciones de despliegue",
+  "Configuration…": "Configuración…",
+  "No deployment server configured": "No hay ningún servidor de despliegue configurado",
+  "Select files in the Project view or open a file in the editor": "Seleccione archivos en la vista Proyecto o abra un archivo en el editor",
+  "Upload to": "Subir a",
+  "Download from": "Descargar de",
+  "Sync with Deployed to": "Sincronizar con lo desplegado en",
+  "Skipped: {n}": "Omitidos: {n}",
+  "and {n} more": "y {n} más",
+  "Uploaded {n} files to {server}": "Se subieron {n} archivos a {server}",
+  "Upload to {server} finished with errors": "La subida a {server} finalizó con errores",
+  "Downloaded {n} files from {server}": "Se descargaron {n} archivos de {server}",
+  "Download from {server} finished with errors": "La descarga de {server} finalizó con errores",
+  "Deleted {n} files from {server}": "Se eliminaron {n} archivos de {server}",
+  "Delete from {server} finished with errors": "La eliminación en {server} finalizó con errores",
+  "Synchronized {n} files with {server}": "Se sincronizaron {n} archivos con {server}",
+  "Sync with {server} finished with errors": "La sincronización con {server} finalizó con errores",
+  "Cannot upload to {server}": "No se puede subir a {server}",
+  "Cannot download from {server}": "No se puede descargar de {server}",
+  "Cannot delete from {server}": "No se puede eliminar de {server}",
+  "Delete the remote copy of {name} from {server}?": "¿Eliminar la copia remota de {name} de {server}?",
+  "Delete the remote copies of {n} items from {server}?": "¿Eliminar las copias remotas de {n} elementos de {server}?",
+  "No web server URL for this file": "No hay URL de servidor web para este archivo",
+  "This file is not mapped to the default server": "Este archivo no está asignado al servidor predeterminado",
+  "Cannot open in browser": "No se puede abrir en el navegador",
+  "Cannot change automatic upload": "No se puede cambiar la subida automática",
+  "Remote Host": "Host remoto",
+  "No deployment servers": "No hay servidores de despliegue",
+  "Download to Project": "Descargar al proyecto",
+  "New Folder…": "Nueva carpeta…",
+  "Remote files": "Archivos remotos",
+  "Empty folder": "Carpeta vacía",
+  "Deployment server": "Servidor de despliegue",
+  "Remote host actions": "Acciones del host remoto",
+  "Enter a name": "Ingrese un nombre",
+  "A name cannot contain “/”": "Un nombre no puede contener “/”",
+  "Cannot create folder": "No se puede crear la carpeta",
+  "Cannot delete {name}": "No se puede eliminar {name}",
+  "Delete folder “{path}” from the server?": "¿Eliminar la carpeta “{path}” del servidor?",
+  "Delete file “{path}” from the server?": "¿Eliminar el archivo “{path}” del servidor?",
+  "Delete {n} items from the server?": "¿Eliminar {n} elementos del servidor?",
+  "Not mapped to a project path": "No está asignado a una ruta del proyecto",
+  "Unknown Host Key": "Clave de host desconocida",
+  "{n} of {total} files will change": "{n} de {total} archivos cambiarán",
+  "Comparing local and remote files…": "Comparando archivos locales y remotos…",
+  "Files to synchronize": "Archivos para sincronizar",
+  "Action": "Acción",
+  "Synchronizing…": "Sincronizando…",
+  "Local only": "Solo local",
+  "Remote only": "Solo remoto",
+  "Local is newer": "El local es más reciente",
+  "Remote is newer": "El remoto es más reciente",
+  "Identical": "Idéntico",
+  "Upload": "Subir",
+  "Delete remote": "Eliminar remoto",
+  "Delete local": "Eliminar local",
+  "Remote Development": "Desarrollo remoto",
+  "The project runs on the remote host; the IDE backend is installed there on first use.": "El proyecto se ejecuta en el host remoto; el backend del IDE se instala allí en el primer uso.",
+  "SSH configuration:": "Configuración SSH:",
+  "No SSH configurations": "No hay configuraciones SSH",
+  "Project directory:": "Directorio del proyecto:",
+  "Remote Development…": "Desarrollo remoto…",
+  "Opens a project folder on an SSH host; the IDE backend runs on that host.": "Abre una carpeta de proyecto en un host SSH; el backend del IDE se ejecuta en ese host.",
+  "Disconnect from Remote Host": "Desconectar del host remoto",
+  "Reload Environment": "Recargar entorno",
+  "Reads the login shell's environment (and devcontainer.json remoteEnv on a remote host) again for new terminals and processes.": "Vuelve a leer el entorno del shell de inicio de sesión (y remoteEnv de devcontainer.json en un host remoto) para nuevas terminales y procesos.",
+  "No variables changed.": "Ninguna variable cambió.",
+  "Changed: {names} and {more} more.": "Modificadas: {names} y {more} más.",
+  "Changed: {names}.": "Modificadas: {names}.",
+  "Terminals and processes already running keep their old environment; new ones get the new one.": "Las terminales y procesos que ya están en ejecución conservan su entorno anterior; los nuevos reciben el nuevo.",
+  "Restart Language Servers": "Reiniciar servidores de lenguaje",
+  "Could not reload the environment": "No se pudo recargar el entorno",
+  "Environment reloaded": "Entorno recargado",
+  "devcontainer.json was not applied": "No se aplicó devcontainer.json",
+  "postStartCommand failed": "postStartCommand falló",
+  "Opens a terminal tab connected to an SSH configuration (`arg`: its id; otherwise a chooser).": "Abre una pestaña de terminal conectada a una configuración SSH (`arg`: su id; de lo contrario, un selector).",
+  "Connecting to the host…": "Conectando al host…",
+  "Checking the IDE backend on the host…": "Comprobando el backend del IDE en el host…",
+  "Downloading the IDE backend…": "Descargando el backend del IDE…",
+  "Installing the IDE backend on the host…": "Instalando el backend del IDE en el host…",
+  "Starting the IDE backend…": "Iniciando el backend del IDE…",
+  "Opening the project…": "Abriendo el proyecto…",
+  "Cannot load agent tasks": "No se pueden cargar las tareas del agente",
+  "Opening {name}…": "Abriendo {name}…",
+  "Copy Code": "Copiar código",
+  "Quote": "Citar",
+  "Find in Conversation": "Buscar en la conversación",
+  "Find in conversation": "Buscar en la conversación",
+  "0 results": "0 resultados",
+  "Time the agent took to answer": "Tiempo que tardó el agente en responder",
+  "Time the agent spent on this task": "Tiempo que dedicó el agente a esta tarea",
+  "Send Again": "Enviar de nuevo",
+  "Customize IDE appearance and behavior: change themes and font size, configure system settings and notifications.": "Personalice la apariencia y el comportamiento del IDE: cambie temas y tamaño de fuente, configure ajustes del sistema y notificaciones.",
+  "Configure code editing: completion, folding, tabs, fonts, colors, code style and inspections.": "Configure la edición de código: autocompletado, plegado, pestañas, fuentes, colores, estilo de código e inspecciones.",
+  "Configure build tools, run configurations, debugger and deployment.": "Configure herramientas de compilación, configuraciones de ejecución, depurador y despliegue.",
+  "Configure language servers, interpreters, SDKs and framework support.": "Configure servidores de lenguaje, intérpretes, SDK y compatibilidad con frameworks.",
+  "Configure external tools, terminal, database and other integrations.": "Configure herramientas externas, terminal, base de datos y otras integraciones.",
+  "Unversioned Files": "Archivos sin control de versiones",
+  "Merge Conflicts": "Conflictos de fusión",
+  "current": "actual",
+  "No matching repositories or branches": "No hay repositorios ni ramas coincidentes",
+  "partial": "parcial",
+  "editable": "editable",
+  "on {date}": "el {date}",
+  "renamed from {name}": "renombrado de {name}",
+  "Label '{label}'": "Etiqueta '{label}'",
+  "{n} file recorded before it": "{n} archivo registrado antes",
+  "{n} files recorded before it": "{n} archivos registrados antes",
+  "No local history for this folder yet": "Aún no hay historial local para esta carpeta",
+  "No local history for this path yet": "Aún no hay historial local para esta ruta",
+  "{name} has been resolved and staged.": "{name} ha sido resuelto y preparado (staged).",
+  "{selected} of {total} file will be reverted to their last committed state. Uncommitted changes are lost.": "{selected} de {total} archivo se revertirá a su último estado confirmado. Los cambios sin confirmar se perderán.",
+  "{selected} of {total} files will be reverted to their last committed state. Uncommitted changes are lost.": "{selected} de {total} archivos se revertirán a su último estado confirmado. Los cambios sin confirmar se perderán.",
+  "Current branch: {branch}": "Rama actual: {branch}",
+  "{count} TODO item found in the changed lines:": "Se encontró {count} elemento TODO en las líneas modificadas:",
+  "{count} TODO items found in the changed lines:": "Se encontraron {count} elementos TODO en las líneas modificadas:",
+  "{count} file ({names}) contain CRLF line separators and core.autocrlf is not set, so they would be committed with CRLF. Convert them with the line separator widget in the status bar, or set": "{count} archivo ({names}) contiene separadores de línea CRLF y core.autocrlf no está configurado, por lo que se confirmaría con CRLF. Conviértalo con el widget de separador de línea en la barra de estado, o configure",
+  "{count} files ({names}) contain CRLF line separators and core.autocrlf is not set, so they would be committed with CRLF. Convert them with the line separator widget in the status bar, or set": "{count} archivos ({names}) contienen separadores de línea CRLF y core.autocrlf no está configurado, por lo que se confirmarían con CRLF. Conviértalos con el widget de separador de línea en la barra de estado, o configure",
+  "Optional; creates an annotated tag": "Opcional; crea una etiqueta anotada",
+  "{count} file will be merged; conflicts open in the merge tool": "Se fusionará {count} archivo; los conflictos se abrirán en la herramienta de fusión",
+  "{count} files will be merged; conflicts open in the merge tool": "Se fusionarán {count} archivos; los conflictos se abrirán en la herramienta de fusión",
+  "{selected} of {total} file will be shelved and reverted in the working tree.": "{selected} de {total} archivo se guardará en el estante y se revertirá en el árbol de trabajo.",
+  "{selected} of {total} files will be shelved and reverted in the working tree.": "{selected} de {total} archivos se guardarán en el estante y se revertirán en el árbol de trabajo.",
+  "tokens": "tokens",
+  "{count} occurrences · {lines} lines": "{count} coincidencias · {lines} líneas",
+  "{tokens} tokens": "{tokens} tokens",
+  "— no callers found": "— no se encontraron llamadores",
+  "— no callees found": "— no se encontraron llamados",
+  "— no supertypes found": "— no se encontraron supertipos",
+  "— no subtypes found": "— no se encontraron subtipos",
+  "({calls} calls)": "({calls} llamadas)",
+  "Usages of {symbol}": "Usos de {symbol}",
+  "{shown} of {total} found": "{shown} de {total} encontrados",
+  "{total} found": "{total} encontrados",
+  "Nothing matches '{filter}'": "Nada coincide con '{filter}'",
+  "{shown} of {rowCount} rows": "{shown} de {rowCount} filas",
+  "Local filter": "Filtro local",
+  "Rename {what} '{initial}' to:": "Renombrar {what} '{initial}' a:",
+  "Drop {kind}": "Eliminar {kind}",
+  "{count} row": "{count} fila",
+  "(limit reached)": "(límite alcanzado)",
+  "Reached from the SSH host {label}.": "Alcanzado desde el host SSH {label}.",
+  "table": "tabla",
+  "view": "vista",
+  "materialized view": "vista materializada",
+  "column": "columna",
+  "index": "índice",
+  "schema": "esquema",
+  "function": "función",
+  "procedure": "procedimiento",
+  "trigger": "disparador",
+  "sequence": "secuencia",
+  "data source": "origen de datos",
+  "{count} library frames hidden": "{count} marcos de biblioteca ocultos",
+  "unverified": "no verificado",
+  "temp": "temp",
+  "Watching {dataId}": "Observando {dataId}",
+  "No attachable processes match the filter.": "Ningún proceso acoplable coincide con el filtro.",
+  "No attachable processes.": "No hay procesos acoplables.",
+  "{failed} failing": "{failed} con fallos",
+  "Sending request #{n}…": "Enviando solicitud #{n}…",
+  "Memory & Diagnostics": "Memoria y diagnóstico",
+  "Over budget ({budget})": "Por encima del presupuesto ({budget})",
+  "dev": "dev",
+  "Zoomed into {name}": "Acercado a {name}",
+  "Rename directory '{current}' and its usages to:": "Renombrar el directorio '{current}' y sus usos a:",
+  "Rename file '{current}' and its usages to:": "Renombrar el archivo '{current}' y sus usos a:",
+  "{count} occurrence": "{count} coincidencia",
+  "{count} occurrences": "{count} coincidencias",
+  "References to update: {a} in {b}": "Referencias por actualizar: {a} en {b}",
+  "Save '{name}' Configuration": "Guardar configuración '{name}'",
+  "test": "prueba",
+  "user": "usuario",
+  "temporary": "temporal",
+  "<{count} internal line>": "<{count} línea interna>",
+  "<{count} internal lines>": "<{count} líneas internas>",
+  "{count} earlier lines were discarded": "Se descartaron {count} líneas anteriores",
+  "{count} passed": "{count} aprobadas",
+  "{count} ignored": "{count} ignoradas",
+  "Running…": "Ejecutando…",
+  "No tests": "Sin pruebas",
+  "Replacing… {done}/{total} files": "Reemplazando… {done}/{total} archivos",
+  "changed": "modificado",
+  "Start Docker (context '{context}'); this view connects automatically.": "Inicie Docker (contexto '{context}'); esta vista se conecta automáticamente.",
+  "Start Docker; this view connects automatically.": "Inicie Docker; esta vista se conecta automáticamente.",
+  "Could not save: {error}": "No se pudo guardar: {error}",
+  "{count} modified action": "{count} acción modificada",
+  "{count} modified actions": "{count} acciones modificadas",
+  "Runs “<base> -m venv <location>”; the new interpreter becomes the project interpreter.": "Ejecuta “<base> -m venv <location>”; el nuevo intérprete se convierte en el intérprete del proyecto.",
+  "{vendor} {version} is unpacked into a folder of its own in {location}, where JDK detection finds it.": "{vendor} {version} se descomprime en su propia carpeta en {location}, donde la detección de JDK lo encuentra.",
+  "detected from {source}": "detectado desde {source}",
+  "modified": "modificado",
+  "seconds": "segundos",
+  "columns": "columnas",
+  "Defaults from the {lang} language definition: tab.": "Valores predeterminados de la definición del lenguaje {lang}: tabulación.",
+  "Defaults from the {lang} language definition: {size} spaces.": "Valores predeterminados de la definición del lenguaje {lang}: {size} espacios.",
+  "Follows the IDE theme: currently {name}.": "Sigue el tema del IDE: actualmente {name}.",
+  "<Project>": "<Proyecto>",
+  "<none>": "<ninguno>",
+  "Invalid pattern: {patterns}": "Patrón no válido: {patterns}",
+  "Matches of an Issue ID regular expression in commit messages (Git log, commit details) become links; $0 is the whole match, $1… the groups.": "Las coincidencias de una expresión regular de ID de incidencia en los mensajes de confirmación (registro de Git, detalles de la confirmación) se convierten en enlaces; $0 es la coincidencia completa, $1… los grupos.",
+  "Abbreviation for <{tag}>, e.g.": "Abreviatura de <{tag}>, p. ej.,",
+  "caret,": "el cursor,",
+  "{count} item": "{count} elemento",
+  "Language servers and debug adapters used by the IDE. Missing tools can be installed into the IDE's own tools folder; nothing is downloaded until you click Install.": "Servidores de lenguaje y adaptadores de depuración utilizados por el IDE. Las herramientas faltantes se pueden instalar en la carpeta de herramientas propia del IDE; no se descarga nada hasta que haga clic en Instalar.",
+  "Large file": "Archivo grande",
+  "Binary file": "Archivo binario",
+  "read-only": "solo lectura",
+  "Offset 0x{hex} ({offset})": "Desplazamiento 0x{hex} ({offset})",
+  "Cannot read the file: {error}": "No se puede leer el archivo: {error}",
+  "Cannot show the image: {error}": "No se puede mostrar la imagen: {error}",
+  "HTML preview": "Vista previa de HTML",
+  "Open a folder from disk or clone a repository from version control.": "Abra una carpeta del disco o clone un repositorio desde el control de versiones.",
+  "Open a folder from disk.": "Abra una carpeta del disco.",
+  "No bookmarks yet. Toggle a line bookmark with {key}": "Aún no hay marcadores. Alterne un marcador de línea con {key}",
+  "Use Find in Files ({key}) and choose “Open in Find Window”.": "Use Buscar en archivos ({key}) y elija “Abrir en ventana de búsqueda”.",
+  "Build message": "Mensaje de compilación",
+  "Ignored lines": "Líneas ignoradas",
+  "Open in browser": "Abrir en el navegador",
+  "Plan node properties": "Propiedades del nodo del plan",
+  "Values": "Valores",
+  "Vim rc file": "Archivo rc de Vim",
+  "Breakpoints are not supported in output classes without source code.": "No se admiten puntos de interrupción en clases de salida sin código fuente.",
+  "Decompiled .class file: sources are not available.": "Archivo .class descompilado: el código fuente no está disponible.",
+  "No column of the file matches the table": "Ninguna columna del archivo coincide con la tabla",
+  "Not a URL of PostgreSQL, MySQL, SQLite or a compatible database": "No es una URL de PostgreSQL, MySQL, SQLite o una base de datos compatible",
+  "The Database tree shows only the checked names and patterns (* and ?); the connected database always shows.": "El árbol de Base de datos muestra solo los nombres y patrones (* y ?) marcados; la base de datos conectada siempre se muestra.",
+  "Save the data source to pick from the server's names; patterns (* and ?) work any time.": "Guarde el origen de datos para elegir entre los nombres del servidor; los patrones (* y ?) funcionan en cualquier momento.",
+  "Read-only data source.": "Origen de datos de solo lectura.",
+  "Use the query console to change ClickHouse data.": "Use la consola de consultas para modificar datos de ClickHouse.",
+  "Read-only: the table has no primary key to identify rows.": "Solo lectura: la tabla no tiene clave primaria para identificar las filas.",
+  "The session has finished.": "La sesión ha finalizado.",
+  "Variables are available while suspended.": "Las variables están disponibles mientras está en suspensión.",
+  "Verified": "Verificado",
+  "Press Enter to evaluate": "Presione Enter para evaluar",
+  "Evaluation is available while the program is suspended": "La evaluación está disponible mientras el programa está suspendido",
+  "unknown type": "tipo desconocido",
+  "Dev plugin loaded": "Plugin de desarrollo cargado",
+  "WebAssembly component (sandboxed)": "Componente WebAssembly (en entorno aislado)",
+  "None — contributions only": "Ninguno — solo contribuciones",
+  "Dark": "Oscuro",
+  "Light": "Claro",
+  "No plugins installed.": "No hay plugins instalados.",
+  "No plugins match.": "Ningún plugin coincide.",
+  "No local plugin packages.": "No hay paquetes de plugins locales.",
+  "Waiting for test results…": "Esperando resultados de las pruebas…",
+  "No test results": "Sin resultados de pruebas",
+  "Passed tests are hidden": "Las pruebas aprobadas están ocultas",
+  "Search failed": "La búsqueda falló",
+  "No edited files": "No hay archivos editados",
+  "No matching files": "No hay archivos coincidentes",
+  "No recent files": "No hay archivos recientes",
+  "Recently Changed Locations": "Ubicaciones modificadas recientemente",
+  "No changed locations": "No hay ubicaciones modificadas",
+  "No recent locations": "No hay ubicaciones recientes",
+  "Open a file first": "Abra un archivo primero",
+  "1 detected folder is unmarked.": "1 carpeta detectada está desmarcada.",
+  "No packages match": "Ningún paquete coincide",
+  "No packages installed": "No hay paquetes instalados",
+  "Installing": "Instalando",
+  "Upgrading": "Actualizando",
+  "Uninstalling": "Desinstalando",
+  "Contents are identical": "Los contenidos son idénticos",
+  "working copy": "copia de trabajo",
+  "No commits match the filters": "Ninguna confirmación coincide con los filtros",
+  "No commits yet": "Aún no hay confirmaciones",
+  " · commit to conclude": " · confirme para concluir",
+  "Abort": "Abortar",
+  "The current branch has no tracked branch; git pull may fail.": "La rama actual no tiene una rama rastreada; git pull puede fallar.",
+  "HEAD is detached; check out a branch to push.": "HEAD está desacoplado; cambie a una rama para hacer push.",
+  "No shelved changes": "No hay cambios en el estante",
+  "No recent projects": "No hay proyectos recientes",
+  "Current position {line}:{col}": "Posición actual {line}:{col}",
+  "{count} detected folders are unmarked.": "{count} carpetas detectadas están desmarcadas.",
+  "Rebase commits of {head} not on:": "Hacer rebase de las confirmaciones de {head} que no están en:",
+  "{head} has no upstream: commits up to {revision} will be pushed as a new branch:": "{head} no tiene rama remota de seguimiento (upstream): las confirmaciones hasta {revision} se enviarán con push como una rama nueva:",
+  "{head} has no upstream: it will be pushed as a new branch and tracked:": "{head} no tiene rama remota de seguimiento (upstream): se enviará con push como una rama nueva y se rastreará:",
+  "{count} excluded": "{count} excluidos",
+  "{count} file with conflicts": "{count} archivo con conflictos",
+  "{count} files with conflicts": "{count} archivos con conflictos",
+  "Clear {label} filter": "Limpiar filtro {label}",
+  "in {count} commits": "en {count} confirmaciones",
+  "Callers": "Llamadores",
+  "Callees": "Llamados",
+  "Supertypes": "Supertipos",
+  "Subtypes": "Subtipos",
+  "Callers of {name}": "Llamadores de {name}",
+  "Callees of {name}": "Llamados por {name}",
+  "Supertypes of {name}": "Supertipos de {name}",
+  "Subtypes of {name}": "Subtipos de {name}",
+  "Changes requested": "Cambios solicitados",
+  "Review required": "Revisión requerida",
+  "requested changes": "solicitó cambios",
+  "{n} minute ago": "hace {n} minuto",
+  "{n} minutes ago": "hace {n} minutos",
+  "just now": "justo ahora",
+  "No symbols": "Sin símbolos",
+  "{behind} incoming, {ahead} outgoing commits": "{behind} confirmaciones entrantes, {ahead} salientes",
+  "{behind} incoming commits": "{behind} confirmaciones entrantes",
+  "{ahead} outgoing commits": "{ahead} confirmaciones salientes",
+  "Repository: {repo}": "Repositorio: {repo}",
+  "Git branch: {head}": "Rama de Git: {head}",
+  "Tracking {upstream}": "Rastreando {upstream}",
+  "In all {count} repositories": "En los {count} repositorios",
+  "{current} of {count} differences": "{current} de {count} diferencias",
+  "{count} difference": "{count} diferencia",
+  "{count} differences": "{count} diferencias",
+  "Cloning…": "Clonando…",
+  "locked": "bloqueado",
+  "prunable": "depurable",
+  "Rebasing": "Haciendo rebase",
+  "Merging": "Fusionando",
+  "Cherry-picking": "Haciendo cherry-pick",
+  "Reverting": "Revirtiendo",
+  "Applying patches": "Aplicando parches",
+  "Rebasing {head}": "Haciendo rebase de {head}",
+  "Merging {head}": "Fusionando {head}",
+  "Cherry-picking {head}": "Haciendo cherry-pick de {head}",
+  "Reverting {head}": "Revirtiendo {head}",
+  "Applying patches to {head}": "Aplicando parches a {head}",
+  "Rebase in progress": "Rebase en curso",
+  "Merge in progress": "Fusión en curso",
+  "Cherry-pick in progress": "Cherry-pick en curso",
+  "Revert in progress": "Reversión en curso",
+  "Patch application in progress": "Aplicación de parches en curso",
+  "{conflicts} conflict": "{conflicts} conflicto",
+  "{conflicts} conflicts": "{conflicts} conflictos",
+  "Continuing rebase": "Continuando rebase",
+  "Continuing merge": "Continuando fusión",
+  "Continuing cherry-pick": "Continuando cherry-pick",
+  "Continuing revert": "Continuando reversión",
+  "Continuing patch application": "Continuando aplicación de parches",
+  "Skipping commit": "Omitiendo confirmación",
+  "Aborting rebase": "Abortando rebase",
+  "Aborting merge": "Abortando fusión",
+  "Aborting cherry-pick": "Abortando cherry-pick",
+  "Aborting revert": "Abortando reversión",
+  "Aborting patch application": "Abortando aplicación de parches",
+  "Rebase continued": "Rebase continuado",
+  "Merge continued": "Fusión continuada",
+  "Cherry-pick continued": "Cherry-pick continuado",
+  "Revert continued": "Reversión continuada",
+  "Patch application continued": "Aplicación de parches continuada",
+  "Commit skipped": "Confirmación omitida",
+  "Rebase aborted": "Rebase abortado",
+  "Merge aborted": "Fusión abortada",
+  "Cherry-pick aborted": "Cherry-pick abortado",
+  "Revert aborted": "Reversión abortada",
+  "Patch application aborted": "Aplicación de parches abortada",
+  "Rebase failed": "Falló el rebase",
+  "Cherry-pick failed": "Falló el cherry-pick",
+  "Revert failed": "Falló la reversión",
+  "Reset failed": "Falló el restablecimiento (reset)",
+  "Rebase stopped for editing; continue the rebase when done": "Rebase detenido para edición; continúe el rebase cuando termine",
+  "Cherry-picked {label}": "Se hizo cherry-pick de {label}",
+  "Reverted {label}": "Se revirtió {label}",
+  "Reset {head} to {rev} ({mode})": "Restablecer {head} a {rev} ({mode})",
+  "Resetting": "Restableciendo",
+  "Fetching": "Obteniendo (fetch)",
+  "Updating project": "Actualizando proyecto",
+  "Pulling": "Haciendo pull",
+  "Pushing": "Haciendo push",
+  "Deleting remote branch": "Eliminando rama remota",
+  "Updating branch": "Actualizando rama",
+  "Delete remote branch": "Eliminar rama remota",
+  "binary": "binario",
+  "Common Local Branches": "Ramas locales comunes",
+  "Common Remote Branches": "Ramas remotas comunes",
+  "Recent Branches in {name}": "Ramas recientes en {name}",
+  "Local Branches in {name}": "Ramas locales en {name}",
+  "Remote Branches in {name}": "Ramas remotas en {name}",
+  "Tags in {name}": "Etiquetas en {name}",
+  "Moments ago": "Hace unos momentos",
+  "{min} min ago": "hace {min} min",
+  "Today {time}": "Hoy {time}",
+  "Yesterday {time}": "Ayer {time}",
+  "Added lines": "Líneas agregadas",
+  "Deleted lines": "Líneas eliminadas",
+  "Added": "Agregado",
+  "Renamed": "Renombrado",
+  "Unversioned": "Sin control de versiones",
+  "Merge conflict": "Conflicto de fusión",
+  "Automatic": "Automático",
+  "Custom combination": "Combinación personalizada",
+  "Language server for {languages}": "Servidor de lenguaje para {languages}",
+  "Only one of these runs at a time. Automatic uses the first one available: {order}.": "Solo se ejecuta uno de estos a la vez. Automático utiliza el primero disponible: {order}.",
+  "Configure the settings related to version control used in your project": "Configure los ajustes relacionados con el control de versiones utilizado en su proyecto",
+  "Use non-modal commit interface": "Usar interfaz de confirmación no modal",
+  "When off, Local Changes and Stash are tabs of the Git tool window and Commit opens a dialog.": "Cuando está desactivado, Cambios locales y Stash son pestañas de la ventana de herramientas de Git y Confirmar abre un diálogo.",
+  "Clear initial commit message": "Limpiar mensaje inicial de confirmación",
+  "Show options before Update": "Mostrar opciones antes de Actualizar",
+  "Ask for confirmation to drop commits": "Pedir confirmación para descartar confirmaciones",
+  "Applicable to Git": "Aplicable a Git",
+  "Highlight directories that contain modified files in the Project tree": "Resaltar directorios que contengan archivos modificados en el árbol del Proyecto",
+  "When patch is created": "Cuando se crea un parche",
+  "Warn when committing files larger than": "Advertir al confirmar archivos mayores que",
+  "Warn when committing files with names that might cause issues on other systems": "Advertir al confirmar archivos con nombres que puedan causar problemas en otros sistemas",
+  "Show Push dialog for Commit and Push": "Mostrar diálogo de Push al Confirmar y hacer Push",
+  "Show Push dialog only when committing to protected branches": "Mostrar diálogo de Push solo al confirmar en ramas protegidas",
+  "Combine stashes and shelves in one tab": "Combinar stashes y estantes en una sola pestaña",
+  "Patch file created successfully. Show it in Finder?": "Archivo de parche creado correctamente. ¿Mostrarlo en Finder?",
+  "File names": "Nombres de archivo",
+  "Large files": "Archivos grandes",
+  "Some files use reserved names that are not allowed on Windows: '{name}'. If you commit, it will not be possible to check out the Git repository on Windows.": "Algunos archivos usan nombres reservados que no están permitidos en Windows: '{name}'. Si confirma, no será posible descargar (checkout) el repositorio de Git en Windows.",
+  "Some of the file names contain characters that are not allowed on Windows: '{name}'. If you commit, it might not be possible to check out the Git repository on Windows.": "Algunos de los nombres de archivo contienen caracteres que no están permitidos en Windows: '{name}'. Si confirma, es posible que no se pueda descargar (checkout) el repositorio de Git en Windows.",
+  "You are about to commit a large file into the repository: {name} ({size} MB). It is not recommended to store large files in a Git repository. Consider using Git LFS.": "Está a punto de confirmar un archivo grande en el repositorio: {name} ({size} MB). No se recomienda almacenar archivos grandes en un repositorio de Git. Considere usar Git LFS.",
+  "You are about to commit {count} large files into the repository with the total size of {size} MB. It is not recommended to store large files in a Git repository. Consider using Git LFS.": "Está a punto de confirmar {count} archivos grandes en el repositorio con un tamaño total de {size} MB. No se recomienda almacenar archivos grandes en un repositorio de Git. Considere usar Git LFS.",
+  "Hide Branches": "Ocultar ramas",
+  "Show Branches": "Mostrar ramas",
+  "Update Selected": "Actualizar seleccionado",
+  "Navigate Log to Selected Branch": "Navegar en el registro a la rama seleccionada",
+  "Branch or tag": "Rama o etiqueta",
+  "Filter branches and tags": "Filtrar ramas y etiquetas",
+  "Revert Selected Changes": "Revertir cambios seleccionados",
+  "Show only the first reference": "Mostrar solo la primera referencia",
+  "Show tag names": "Mostrar nombres de etiquetas",
+  "Show commit time rather than author time": "Mostrar fecha y hora de la confirmación en lugar de la del autor",
+  "Show references on the left": "Mostrar referencias a la izquierda",
+  "Visible columns": "Columnas visibles",
+  "Visible columns:": "Columnas visibles:",
+  "Get from Revision": "Obtener de la revisión",
+  "Replace '{path}' with its content from the revision? Local changes to it are lost.": "¿Reemplazar '{path}' con su contenido de la revisión? Los cambios locales se perderán.",
+  "Replace {length} files with their content from the revision? Local changes to them are lost.": "¿Reemplazar {length} archivos con su contenido de la revisión? Los cambios locales en ellos se perderán.",
+  "Get": "Obtener",
+  "Got 1 file from revision": "Se obtuvo 1 archivo de la revisión",
+  "Got {n} files from revision": "Se obtuvieron {n} archivos de la revisión",
+  "Nothing to revert": "Nada que revertir",
+  "Mark/Unmark As Favorite": "Marcar/Desmarcar como favorito",
+  "Compare Before with Local": "Comparar anterior con local",
+  "Group by Directory": "Agrupar por directorio",
+  "Stashes and Shelves": "Stashes y estantes",
+  "History: {name}": "Historial: {name}",
+  "Log: {name}": "Registro: {name}",
+  "Commit Changes": "Confirmar cambios",
+  "Group by Prefix": "Agrupar por prefijo",
+  "Show Recent Branches": "Mostrar ramas recientes",
+  "Show Tags": "Mostrar etiquetas",
+  "Branches Popup Options": "Opciones del menú emergente de ramas",
+  "Pull into '{cur}' Using Rebase": "Hacer pull en '{cur}' usando Rebase",
+  "Pull into '{cur}' Using Merge": "Hacer pull en '{cur}' usando Fusión",
+  "No problems at the caret": "No hay problemas en el cursor",
+  "Error Description": "Descripción del error",
+  "Next Highlighted Usage": "Siguiente uso resaltado",
+  "Previous Highlighted Usage": "Uso resaltado anterior",
+  "Move Caret to Code Block Start with Selection": "Mover el cursor al inicio del bloque de código con selección",
+  "Move Caret to Code Block End with Selection": "Mover el cursor al final del bloque de código con selección",
+  "Auto-Indent Lines": "Sangrar líneas automáticamente",
+  "Stretch to Left": "Estirar a la izquierda",
+  "Stretch to Right": "Estirar a la derecha",
+  "Stretch to Top": "Estirar hacia arriba",
+  "Stretch to Bottom": "Estirar hacia abajo",
+  "Copy File…": "Copiar archivo…",
+  "Copy Directory…": "Copiar directorio…",
+  "Copy…": "Copiar…",
+  "Fold Code Block": "Plegar bloque de código",
+  "Go to Next Splitter": "Ir al siguiente divisor",
+  "Go to Previous Splitter": "Ir al divisor anterior",
+  "File Path": "Ruta del archivo",
+  "Cannot reveal in {fileManager}": "No se puede mostrar en {fileManager}",
+  "Surround with Live Template": "Rodear con plantilla dinámica",
+  "Surround with Live Template…": "Rodear con plantilla dinámica…",
+  "Quick Evaluate Expression": "Evaluación rápida de expresión",
+  "Nothing to evaluate at the caret": "Nada que evaluar en el cursor",
+  "Choose a run/debug configuration and debug it": "Elija una configuración de ejecución/depuración y depúrela",
+  "Inspect Current File": "Inspeccionar archivo actual",
+  "No custom folding regions in this file": "No hay regiones de plegado personalizadas en este archivo",
+  "Custom Folding Regions": "Regiones de plegado personalizadas",
+  "(no description)": "(sin descripción)",
+  "Custom Folding…": "Plegado personalizado…",
+  "Move Element Left": "Mover elemento a la izquierda",
+  "Move Element Right": "Mover elemento a la derecha",
+  "Stop Background Processes…": "Detener procesos en segundo plano…",
+  "No background processes to stop": "No hay procesos en segundo plano para detener",
+  "Expand to Level 1": "Expandir al nivel 1",
+  "Expand All to Level 1": "Expandir todo al nivel 1",
+  "Expand to Level 2": "Expandir al nivel 2",
+  "Expand All to Level 2": "Expandir todo al nivel 2",
+  "Expand to Level 3": "Expandir al nivel 3",
+  "Expand All to Level 3": "Expandir todo al nivel 3",
+  "Expand to Level 4": "Expandir al nivel 4",
+  "Expand All to Level 4": "Expandir todo al nivel 4",
+  "Expand to Level 5": "Expandir al nivel 5",
+  "Expand All to Level 5": "Expandir todo al nivel 5",
+  "Surround with Callable": "Rodear con Callable",
+  "Surround with ReadWriteLock.readLock": "Rodear con ReadWriteLock.readLock",
+  "Surround with ReadWriteLock.writeLock": "Rodear con ReadWriteLock.writeLock",
+  "Iterate Iterable or array": "Iterar Iterable o arreglo",
+  "No live templates to surround with": "No hay plantillas dinámicas para rodear",
+  "Sort by Name": "Ordenar por nombre",
+  "Sort by Type": "Ordenar por tipo",
+  "Sort by Modification Time": "Ordenar por fecha de modificación",
+  "Add Mouse Shortcut": "Agregar atajo de ratón",
+  "Click here with Ctrl, Alt or Command held, or use a mouse side button": "Haga clic aquí manteniendo presionado Ctrl, Alt o Command, o use un botón lateral del ratón",
+  "Mouse shortcut": "Atajo de ratón",
+  "Mouse Shortcut: {action}": "Atajo de ratón: {action}",
+  "Accept Left Side": "Aceptar lado izquierdo",
+  "Accept Right Side": "Aceptar lado derecho",
+  "Copies the change at the caret from the left side to the right one": "Copia el cambio en el cursor del lado izquierdo al derecho",
+  "Copies the change at the caret from the right side to the left one": "Copia el cambio en el cursor del lado derecho al izquierdo",
+  "Compare Next File": "Comparar siguiente archivo",
+  "Compare Previous File": "Comparar archivo anterior",
+  "Context Info": "Información de contexto",
+  "No context information here": "No hay información de contexto aquí",
+  "Diff Settings": "Configuración de diferencias",
+  "Viewer": "Visor",
+  "Ignore Whitespace": "Ignorar espacios en blanco",
+  "Browse Console History": "Explorar historial de la consola",
+  "Focus the debug console input first": "Enfoque primero la entrada de la consola de depuración",
+  "No history": "Sin historial",
+  "More Agents…": "Más agentes…",
+  "More agents…": "Más agentes…",
+  "Opens Settings › Build, Execution, Deployment › Maven": "Abre Configuración › Compilación, ejecución, despliegue › Maven",
+  "Opens Settings › Tools › Agents: installs, updates or removes agents from the ACP Registry.": "Abre Configuración › Herramientas › Agentes: instala, actualiza o elimina agentes del Registro ACP.",
+  "Search the ACP Registry": "Buscar en el Registro ACP",
+  "Search agents": "Buscar agentes",
+  "Agents in the ACP Registry are third-party software. They run on this computer with your permissions and can read and change your files. Install only agents you trust.": "Los agentes en el Registro ACP son software de terceros. Se ejecutan en esta computadora con sus permisos y pueden leer y modificar sus archivos. Instale únicamente agentes en los que confíe.",
+  "Cannot load the ACP Registry: {error}": "No se puede cargar el Registro ACP: {error}",
+  "Loading the ACP Registry…": "Cargando el Registro ACP…",
+  "No agents match": "Ningún agente coincide",
+  "The registry has no agents for this system": "El registro no tiene agentes para este sistema",
+  "{version} available": "{version} disponible",
+  "Installing {name} {version}…": "Instalando {name} {version}…",
+  "Website": "Sitio web",
+  "Removing…": "Eliminando…",
+  "Registry agents": "Agentes del registro",
+  "No checksum provided": "No se proporcionó suma de comprobación",
+  "{name} provides no checksum for its download, so the downloaded file cannot be verified. Install it anyway?": "{name} no proporciona suma de comprobación para su descarga, por lo que no se puede verificar el archivo descargado. ¿Desea instalarlo de todos modos?",
+  "Usage limit": "Límite de uso",
+  "{provider} didn't start: {error}": "{provider} no se inició: {error}",
+  "resets {resetsMs}": "se restablece en {resetsMs}",
+  "Copy to a New Task": "Copiar a una nueva tarea",
+  "Couldn't copy the task": "No se pudo copiar la tarea",
+  "Copy to a New Task From Here": "Copiar a una nueva tarea desde aquí",
+  "Run Again From Here": "Volver a ejecutar desde aquí",
+  "The messages after this one are replaced. Files the agent changed stay as they are.": "Los mensajes posteriores a este se reemplazan. Los archivos que el agente modificó permanecen tal como están.",
+  "Cancelling…": "Cancelando…",
+  "Code insight needs the index; it can't be stopped": "El análisis de código necesita el índice; no se puede detener",
+  "Waiting for other tasks": "Esperando otras tareas",
+  "This task can't be cancelled": "Esta tarea no se puede cancelar",
+  "Cancelled": "Cancelado",
+  "No proxy": "Sin proxy",
+  "Auto-detect proxy settings": "Detectar configuración de proxy automáticamente",
+  "Uses the system proxy: the HTTP_PROXY, HTTPS_PROXY and NO_PROXY environment variables.": "Usa el proxy del sistema: las variables de entorno HTTP_PROXY, HTTPS_PROXY y NO_PROXY.",
+  "Manual proxy configuration": "Configuración manual de proxy",
+  "Proxy": "Proxy",
+  "Proxy type": "Tipo de proxy",
+  "Host name": "Nombre del host",
+  "Port number": "Número de puerto",
+  "No proxy for": "Sin proxy para",
+  "Comma-separated host names; * matches any characters, e.g. *.example.com, 192.168.*": "Nombres de host separados por comas; * coincide con cualquier carácter, p. ej., *.example.com, 192.168.*",
+  "Proxy authentication": "Autenticación de proxy",
+  "Login": "Usuario",
+  "Connection successful: {status}": "Conexión exitosa: {status}",
+  "Problem with connection: {message}": "Problema con la conexión: {message}",
+  "Check connection…": "Comprobar conexión…",
+  "Check connection": "Comprobar conexión",
+  "Enter any URL to check connection to:": "Ingrese cualquier URL para comprobar la conexión:",
+  "Check": "Comprobar",
+  "HTTP Proxy": "Proxy HTTP",
+  "Proxy host is empty": "El host del proxy está vacío",
+  "Invalid proxy host": "Host de proxy no válido",
+  "Proxy port must be between 1 and 65535": "El puerto del proxy debe estar entre 1 y 65535",
+  "Proxy login is empty": "El usuario del proxy está vacío",
+  "No interpreter": "Sin intérprete",
+  "Add New Interpreter…": "Agregar nuevo intérprete…",
+  "Interpreter Settings…": "Configuración del intérprete…",
+  "Connection settings for SQL Server.": "Configuración de conexión para SQL Server.",
+  "ClickHouse settings sent with each HTTP request. connect_timeout is in seconds.": "Configuración de ClickHouse enviada con cada solicitud HTTP. connect_timeout está en segundos.",
+  "Microsoft SQL Server": "Microsoft SQL Server",
+  "Add to .gitignore": "Agregar a .gitignore",
+  "Add to .git/info/exclude": "Agregar a .git/info/exclude",
+  "Delete Agent Tasks": "Eliminar tareas del agente",
+  "Open Agent Task": "Abrir tarea del agente",
+  "Open Agent Task in Editor": "Abrir tarea del agente en el editor",
+  "Open Agent Task in Tool Window": "Abrir tarea del agente en la ventana de herramientas",
+  "Archive Agent Tasks": "Archivar tareas del agente",
+  "Delete {count} agent tasks? Their branches and files outside worktrees are kept.": "¿Eliminar {count} tareas del agente? Sus ramas y archivos fuera de los árboles de trabajo se conservarán.",
+  "Also remove their worktree folders": "También eliminar sus carpetas de árbol de trabajo",
+  "Cannot delete agent tasks": "No se pueden eliminar las tareas del agente",
+  "Cannot archive agent tasks": "No se pueden archivar las tareas del agente",
+  "Archive ({count})": "Archivar ({count})",
+  "Delete ({count})…": "Eliminar ({count})…",
+  "Run pytest tests": "Ejecutar pruebas de pytest",
+  "e.g. pytest, uv, poetry, .venv/bin/pytest, python": "p. ej., pytest, uv, poetry, .venv/bin/pytest, python",
+  "Runner arguments": "Argumentos del ejecutor",
+  "e.g. `run pytest` for uv/poetry, `-m pytest` for python; empty calls the command itself": "p. ej., `run pytest` para uv/poetry, `-m pytest` para python; vacío llama al comando en sí",
+  "Target": "Destino",
+  "Directory, file or test id; empty runs the whole suite": "Directorio, archivo o ID de prueba; vacío ejecuta toda la suite",
+  "pytest options": "Opciones de pytest",
+  "e.g. -x -q --tb=short": "p. ej., -x -q --tb=short",
+  "Ruby": "Ruby",
+  "Run a Ruby script": "Ejecutar un script de Ruby",
+  "Ruby script": "Script de Ruby",
+  "e.g. bin/rails or lib/app.rb": "p. ej., bin/rails o lib/app.rb",
+  "Script arguments": "Argumentos del script",
+  "e.g. server -p 3000": "p. ej., server -p 3000",
+  "Ruby arguments": "Argumentos de Ruby",
+  "e.g. -Ilib -w": "p. ej., -Ilib -w",
+  "Run with Bundler (bundle exec)": "Ejecutar con Bundler (bundle exec)",
+  "Launcher": "Iniciador",
+  "Path of the tool (bundle when run with Bundler); empty uses the interpreter from Settings › Ruby": "Ruta de la herramienta (bundle cuando se ejecuta con Bundler); vacío usa el intérprete de Configuración › Ruby",
+  "Rake": "Rake",
+  "Run a Rake task": "Ejecutar una tarea de Rake",
+  "Task name with arguments, e.g. db:migrate or test TEST=test/a_test.rb; empty runs the default task": "Nombre de la tarea con argumentos, p. ej., db:migrate o test TEST=test/a_test.rb; vacío ejecuta la tarea predeterminada",
+  "Rake options": "Opciones de Rake",
+  "e.g. --trace": "p. ej., --trace",
+  "RSpec": "RSpec",
+  "Run RSpec examples": "Ejecutar ejemplos de RSpec",
+  "e.g. spec": "p. ej., spec",
+  "Directory, file or file:line; empty runs the whole suite": "Directorio, archivo o archivo:línea; vacío ejecuta toda la suite",
+  "RSpec options": "Opciones de RSpec",
+  "e.g. --format documentation --fail-fast": "p. ej., --format documentation --fail-fast",
+  "Ruby interpreter": "Intérprete de Ruby",
+  "Runs the ruby, rake and rspec configurations and lists the standard library and gems under External Libraries. Installs from rbenv, rvm, chruby, mise and asdf are detected.": "Ejecuta las configuraciones de ruby, rake y rspec y lista la biblioteca estándar y las gemas en Bibliotecas externas. Se detectan instalaciones de rbenv, rvm, chruby, mise y asdf.",
+  "Monospaced": "Monoespaciada",
+  "Proportional": "Proporcional",
+  "Loading system fonts…": "Cargando fuentes del sistema…",
+  "Refresh system fonts": "Actualizar fuentes del sistema",
+  "No matching fonts. Enter a family name manually.": "No hay fuentes coincidentes. Ingrese un nombre de familia manualmente.",
+  "This name was not found on this desktop. The saved preference is kept.": "No se encontró este nombre en este equipo. Se conserva la preferencia guardada.",
+  "No system fonts were returned. Bundled fonts and manual input are available.": "No se devolvieron fuentes del sistema. Las fuentes incluidas y la entrada manual están disponibles.",
+  "Type a family name or search installed fonts.": "Escriba un nombre de familia o busque en las fuentes instaladas.",
+  "Add Code Cell": "Agregar celda de código",
+  "Add Markdown Cell": "Agregar celda de Markdown",
+  "Cell": "Celda",
+  "Cell outputs": "Salidas de la celda",
+  "Cell type": "Tipo de celda",
+  "Delete Cell": "Eliminar celda",
+  "Discard Changes and Reload": "Descartar cambios y recargar",
+  "Discard all unsaved notebook changes and stop execution? This cannot be undone.": "¿Descartar todos los cambios sin guardar del notebook y detener la ejecución? Esto no se puede deshacer.",
+  "Edit Markdown": "Editar Markdown",
+  "Inert JavaScript source": "Código fuente JavaScript inerte",
+  "Insert Code Cell Below": "Insertar celda de código debajo",
+  "Install ipykernel in the selected Python environment, then restart the kernel. No packages are installed automatically.": "Instale ipykernel en el entorno de Python seleccionado y luego reinicie el kernel. No se instalan paquetes automáticamente.",
+  "Interrupt Kernel": "Interrumpir kernel",
+  "JavaScript output is inert. Interactive widgets are not supported.": "La salida de JavaScript es inerte. No se admiten widgets interactivos.",
+  "Loading notebook…": "Cargando notebook…",
+  "Markdown cell source": "Código fuente de la celda de Markdown",
+  "Move Cell Down": "Mover celda hacia abajo",
+  "Move Cell Up": "Mover celda hacia arriba",
+  "Notebook Python interpreter": "Intérprete de Python del notebook",
+  "Notebook editing and execution require the desktop app.": "La edición y ejecución de notebooks requieren la aplicación de escritorio.",
+  "Notebook image output": "Salida de imagen del notebook",
+  "Notebook path is missing": "Falta la ruta del notebook",
+  "Notebook toolbar": "Barra de herramientas del notebook",
+  "Notebook unavailable": "Notebook no disponible",
+  "Output preview truncated; full output is retained in the notebook.": "Vista previa de salida truncada; la salida completa se conserva en el notebook.",
+  "Preview Markdown": "Vista previa de Markdown",
+  "Python cell source": "Código fuente de la celda de Python",
+  "Raw": "Sin formato",
+  "Raw or unknown cell; original content is preserved read-only.": "Celda sin formato o desconocida; el contenido original se conserva como solo lectura.",
+  "Redo": "Rehacer",
+  "Refresh Python interpreters": "Actualizar intérpretes de Python",
+  "Reload Notebook from Disk": "Recargar notebook desde el disco",
+  "Restart Kernel": "Reiniciar kernel",
+  "Retry Pending Edits": "Reintentar ediciones pendientes",
+  "Run All": "Ejecutar todo",
+  "Run Cell": "Ejecutar celda",
+  "Select Python interpreter": "Seleccionar intérprete de Python",
+  "Static notebook HTML output": "Salida HTML estática del notebook",
+  "This notebook has no cells": "Este notebook no tiene celdas",
+  "Uncommitted source edits": "Ediciones de código fuente no confirmadas",
+  "Unsupported output MIME type; original data is preserved.": "Tipo MIME de salida no admitido; se conservan los datos originales.",
+  "Unsupported output type; original data is preserved.": "Tipo de salida no admitido; se conservan los datos originales.",
+  "busy": "ocupado",
+  "dead": "inactivo",
+  "idle": "en espera",
+  "starting": "iniciando",
+  "Gradle JVM": "JVM de Gradle",
+  "Distribution": "Distribución",
+  "Gradle wrapper": "Gradle wrapper",
+  "Local installation": "Instalación local",
+  "Gradle home": "Directorio principal de Gradle",
+  "Gradle user home": "Directorio de usuario de Gradle",
+  "Gradle installation directory": "Directorio de instalación de Gradle",
+  "Select Gradle Home Directory": "Seleccionar directorio principal de Gradle",
+  "Select Gradle User Home Directory": "Seleccionar directorio de usuario de Gradle",
+  "JDK used for Gradle sync, tasks, run configurations and tests. An explicit JAVA_HOME in a run configuration takes precedence.": "JDK utilizado para la sincronización, tareas, configuraciones de ejecución y pruebas de Gradle. Un JAVA_HOME explícito en una configuración de ejecución tiene prioridad.",
+  "Uses the Gradle wrapper when present, otherwise the project-pinned mise/asdf Gradle, then Gradle on PATH.": "Usa el Gradle wrapper cuando está presente; de lo contrario, usa el Gradle de mise/asdf fijado en el proyecto y luego el Gradle en PATH.",
+  "Uses bin/gradle (bin/gradle.bat on Windows) instead of the wrapper or pinned toolchain.": "Usa bin/gradle (bin/gradle.bat en Windows) en lugar del wrapper o de la cadena de herramientas fijada.",
+  "Sets GRADLE_USER_HOME. Empty uses Gradle's default.": "Establece GRADLE_USER_HOME. Vacío usa el valor predeterminado de Gradle.",
+  "Passwords": "Contraseñas",
+  "Credentials the IDE answers git's HTTPS prompts with. Saved after a successful fetch / pull / push when \"Remember for this host\" was checked.": "Credenciales con las que el IDE responde a las solicitudes HTTPS de git. Se guardan tras un fetch / pull / push exitoso cuando se marcó \"Recordar para este host\".",
+  "No saved credentials": "No hay credenciales guardadas",
+  "Credentials the IDE answers git's HTTPS prompts with, stored in the app's own secret file (not git's credential.helper). A rejected credential is forgotten automatically.": "Credenciales con las que el IDE responde a las solicitudes HTTPS de git, almacenadas en el archivo secreto propio de la aplicación (no en el credential.helper de git). Una credencial rechazada se olvida automáticamente.",
+  "Saved git credentials": "Credenciales de git guardadas",
+  "Forget": "Olvidar",
+  "Remember for this host": "Recordar para este host",
+  "Unarchive Task": "Desarchivar tarea",
+  "This task is archived. Unarchive it to continue the conversation.": "Esta tarea está archivada. Desarchívela para continuar la conversación.",
+  "Unarchive": "Desarchivar",
+  "Unarchive Agent Tasks": "Desarchivar tareas del agente",
+  "Cannot unarchive agent tasks": "No se pueden desarchivar las tareas del agente",
+  "Unarchive ({archived})": "Desarchivar ({archived})",
+  "New Workspace…": "Nuevo espacio de trabajo…",
+  "New Workspace": "Nuevo espacio de trabajo",
+  "Open Workspace…": "Abrir espacio de trabajo…",
+  "Open Workspace": "Abrir espacio de trabajo",
+  "Manage Workspace…": "Administrar espacio de trabajo…",
+  "Manage Workspace": "Administrar espacio de trabajo",
+  "Merge All Project Windows": "Combinar todas las ventanas del proyecto",
+  "Move Tab to New Window": "Mover pestaña a una ventana nueva",
+  "Next Project Tab": "Pestaña de proyecto siguiente",
+  "Previous Project Tab": "Pestaña de proyecto anterior",
+  "Project windows": "Ventanas del proyecto",
+  "Linked projects": "Proyectos vinculados",
+  "Workspace name": "Nombre del espacio de trabajo",
+  "Workspace location": "Ubicación del espacio de trabajo",
+  "Workspace Location": "Ubicación del espacio de trabajo",
+  "Choose workspace location": "Elegir ubicación del espacio de trabajo",
+  "Add Projects": "Agregar proyectos",
+  "Add Projects…": "Agregar proyectos…",
+  "Project folder path": "Ruta de la carpeta del proyecto",
+  "Add the projects you want to work on together.": "Agregue los proyectos en los que desea trabajar en conjunto.",
+  "Project folders stay in place. Removing a project here keeps its files.": "Las carpetas del proyecto permanecen en su lugar. Quitar un proyecto de aquí conserva sus archivos.",
+  "Window group": "Grupo de ventanas",
+  "Select Project Tab": "Seleccionar pestaña de proyecto",
+  "Close Project Tab": "Cerrar pestaña de proyecto",
+  "Close Other Project Tabs": "Cerrar las demás pestañas de proyecto",
+  "Close Project Tabs to the Left": "Cerrar pestañas de proyecto a la izquierda",
+  "Close Project Tabs to the Right": "Cerrar pestañas de proyecto a la derecha",
+  "Reorder Project Tabs": "Reordenar pestañas de proyecto",
+  "Close {name}": "Cerrar {name}",
+  "Tomcat Server": "Servidor Tomcat",
+  "Run a WAR application in a local Tomcat server": "Ejecutar una aplicación WAR en un servidor Tomcat local",
+  "Tomcat installation directory": "Directorio de instalación de Tomcat",
+  "Project WAR artifact (exploded)": "Artefacto WAR del proyecto (exploded)",
+  "WAR file": "Archivo WAR",
+  "Exploded directory": "Directorio exploded",
+  "Context path": "Ruta de contexto",
+  "Enter / or a context path such as /app": "Ingrese / o una ruta de contexto como /app",
+  "HTTP port": "Puerto HTTP",
+  "JRE": "JRE",
+  "Java installation directory; empty uses the project JDK": "Directorio de instalación de Java; vacío usa el JDK del proyecto",
+  "Open browser after launch": "Abrir navegador después de iniciar",
+  "Browser URL": "URL del navegador",
+  "Server URL from the HTTP port and context path": "URL del servidor a partir del puerto HTTP y la ruta de contexto",
+  "Enter an HTTP or HTTPS URL": "Ingrese una URL HTTP o HTTPS",
+  "Before launch: build the artifact": "Antes de iniciar: compilar el artefacto",
+  "WAR artifact": "Artefacto WAR",
+  "Choose a WAR module": "Elija un módulo WAR",
+  "No WAR modules found. Choose a WAR file or an exploded directory.": "No se encontraron módulos WAR. Elija un archivo WAR o un directorio exploded.",
+  "Invalid Tomcat installation: check bin/catalina and lib/catalina.jar": "Instalación de Tomcat no válida: verifique bin/catalina y lib/catalina.jar",
+  "Update Application": "Actualizar aplicación",
+  "Update resources": "Actualizar recursos",
+  "Update classes and resources": "Actualizar clases y recursos",
+  "Redeploy": "Volver a implementar",
+  "Restart server": "Reiniciar servidor",
+  "Application updated": "Aplicación actualizada",
+  "Application update failed": "Error al actualizar la aplicación",
+  "Tomcat Local requires the local machine": "Tomcat Local requiere el equipo local",
+  "/artifact-name": "/artifact-name",
+  "Choose a WAR artifact": "Elija un artefacto WAR",
+  "Choose a Maven WAR module": "Elija un módulo WAR de Maven",
+  "Choose a Gradle WAR module": "Elija un módulo WAR de Gradle",
+  "Build the selected WAR artifact before launching Tomcat": "Compilar el artefacto WAR seleccionado antes de iniciar Tomcat",
+  "Build the WAR artifact before launching Tomcat": "Compilar el artefacto WAR antes de iniciar Tomcat",
+  "The built WAR artifact does not exist: {path}": "El artefacto WAR compilado no existe: {path}",
+  "Cannot resolve Maven WAR artifact: {details}": "No se puede resolver el artefacto WAR de Maven: {details}",
+  "Choose a WAR file or exploded directory": "Elija un archivo WAR o un directorio exploded",
+  "Invalid Tomcat deployment: {path}": "Implementación de Tomcat no válida: {path}",
+  "Unknown Tomcat deployment type": "Tipo de implementación de Tomcat desconocido",
+  "Choose a Tomcat installation directory": "Elija un directorio de instalación de Tomcat",
+  "HTTP port must be between 1 and 65535": "El puerto HTTP debe estar entre 1 y 65535",
+  "Unknown Tomcat update operation": "Operación de actualización de Tomcat desconocida",
+  "Start this Tomcat configuration before updating it": "Inicie esta configuración de Tomcat antes de actualizarla",
+  "This Tomcat configuration is already running": "Esta configuración de Tomcat ya se está ejecutando",
+  "Tomcat server.xml has no HTTP connector": "El archivo server.xml de Tomcat no tiene ningún conector HTTP",
+  "WAR contains an invalid path": "El WAR contiene una ruta no válida",
+  "Context path must start with / and contain only letters, digits, /, - or _": "La ruta de contexto debe comenzar con / y contener solo letras, dígitos, /, - o _",
+  "Tomcat home must contain bin/catalina.sh or bin/catalina.bat and lib/catalina.jar": "El directorio principal de Tomcat debe contener bin/catalina.sh o bin/catalina.bat y lib/catalina.jar",
+  "Can't rename '{name}' based on syntax: only local variables can be renamed this way": "No se puede renombrar '{name}' según la sintaxis: solo las variables locales se pueden renombrar de esta manera",
+  "Returns true when the value is falsey or the variable does not exist. Checking an undefined variable does not emit a warning.": "Devuelve true cuando el valor es falso (falsey) o la variable no existe. Comprobar una variable no definida no emite ninguna advertencia.",
+  "Returns true only when every supplied variable exists and is not null. Checks stop at the first unset or null variable.": "Devuelve true solo cuando todas las variables proporcionadas existen y no son nulas. Las comprobaciones se detienen en la primera variable no definida o nula.",
+  "Cannot save service order": "No se puede guardar el orden de los servicios",
+  "The order will be kept for this session only.": "El orden se conservará solo para esta sesión.",
+  "View Timeline": "Ver línea de tiempo",
+  "View in browser": "Ver en el navegador",
+  "Refresh Pull Requests List": "Actualizar lista de pull requests",
+  "Change Repository or Account…": "Cambiar repositorio o cuenta…",
+  "Select Opened Pull Request": "Seleccionar pull request abierto",
+  "View Pull Request": "Ver pull request",
+  "View pull request information and timeline": "Ver información y línea de tiempo del pull request",
+  "View pull request timeline": "Ver línea de tiempo del pull request",
+  "Refresh Pull Request": "Actualizar pull request",
+  "Refresh Timeline": "Actualizar línea de tiempo",
+  "Check for new timeline events": "Buscar nuevos eventos en la línea de tiempo",
+  "View Pull Request in Browser": "Ver pull request en el navegador",
+  "Copy Pull Request URL": "Copiar URL del pull request",
+  "Checkout Branch": "Cambiar a la rama (Checkout)",
+  "Fetch and checkout the pull request branch": "Obtener (fetch) y cambiar a la rama del pull request",
+  "Open in Worktree": "Abrir en árbol de trabajo",
+  "Fetch and open the pull request branch in a Git worktree": "Obtener (fetch) y abrir la rama del pull request en un árbol de trabajo de Git",
+  "Delete the merged branch on GitHub": "Eliminar la rama fusionada en GitHub",
+  "Submit Review…": "Enviar revisión…",
+  "Toggle viewed/not viewed state": "Alternar estado visto/no visto",
+  "Toggle viewed/not viewed state for the selection or file": "Alternar estado visto/no visto para la selección o el archivo",
+  "Show Pull Request in the Tool Window": "Mostrar pull request en la ventana de herramientas",
+  "Update to Enable Review Mode…": "Actualizar para habilitar el modo de revisión…",
+  "Review Mode": "Modo de revisión",
+  "Can't load pull requests": "No se pueden cargar los pull requests",
+  "Connect the Pull Requests tool window to this repository to see the timeline": "Conecte la ventana de herramientas Pull Requests a este repositorio para ver la línea de tiempo",
+  "Pull request tabs": "Pestañas de pull request",
+  "New Pull Request at {repo}": "Nuevo pull request en {repo}",
+  "Something went wrong": "Algo salió mal",
+  "Merge commit message:": "Mensaje de confirmación de fusión:",
+  "Merge commit message": "Mensaje de confirmación de fusión",
+  "1 minute ago": "hace 1 minuto",
+  "1 hour ago": "hace 1 hora",
+  "{n} hours ago": "hace {n} horas",
+  "{n} days ago": "hace {n} días",
+  "yesterday": "ayer",
+  "Today": "Hoy",
+  "Yesterday": "Ayer",
+  "Select pull request base and head to view changes": "Seleccione base y head del pull request para ver los cambios",
+  "Failed to load commits": "Error al cargar las confirmaciones",
+  "Pull request does not contain any commits": "El pull request no contiene ninguna confirmación",
+  "Changes from": "Cambios de",
+  "Next Commit": "Confirmación siguiente",
+  "Previous Commit": "Confirmación anterior",
+  "Search commits": "Buscar confirmaciones",
+  "Hide details": "Ocultar detalles",
+  "Failed to load changes": "Error al cargar los cambios",
+  "Commit does not contain any changes": "La confirmación no contiene ningún cambio",
+  "Checking pull request branches": "Comprobando ramas del pull request",
+  "Failed to check pull request branches": "Error al comprobar las ramas del pull request",
+  "Pull request already exists": "El pull request ya existe",
+  "No changes between '{base}' and '{head}'": "No hay cambios entre '{base}' y '{head}'",
+  "Pushing a pull request branch": "Enviando (push) rama del pull request",
+  "Creating a pull request": "Creando un pull request",
+  "Updating pull request fields": "Actualizando campos del pull request",
+  "Failed to create a pull request": "Error al crear un pull request",
+  "Create Draft Pull Request": "Crear borrador de pull request",
+  "More create options": "Más opciones de creación",
+  "Create options": "Opciones de creación",
+  "Head branch": "Rama head",
+  "Repository:": "Repositorio:",
+  "Head repository": "Repositorio head",
+  "Reviewers:": "Revisores:",
+  "No reviewers": "Sin revisores",
+  "Assignees:": "Asignados:",
+  "Unassigned": "Sin asignar",
+  "Assignees": "Asignados",
+  "Labels:": "Etiquetas:",
+  "No labels": "Sin etiquetas",
+  "Labels": "Etiquetas",
+  "New Remote Branch for Pull Request": "Nueva rama remota para el pull request",
+  "Remote branch name:": "Nombre de la rama remota:",
+  "Remote branch name": "Nombre de la rama remota",
+  "Your changes will be pushed to the remote repository to create the pull request": "Sus cambios se enviarán (push) al repositorio remoto para crear el pull request",
+  "Unrelated branches {baseName} {headBranch}": "Ramas no relacionadas {baseName} {headBranch}",
+  "Push failed: {error}": "Error al hacer push: {error}",
+  "Checkout as detached HEAD": "Cambiar como HEAD desacoplado",
+  "Show in Git Log": "Mostrar en el registro de Git",
+  "Copy Branch Name": "Copiar nombre de la rama",
+  "Remote branches are not available for private forks": "Las ramas remotas no están disponibles para bifurcaciones (forks) privadas",
+  "Show Diff in a New Tab or Window": "Mostrar diferencias en una pestaña o ventana nueva",
+  "Pull request does not contain any changes": "El pull request no contiene ningún cambio",
+  "Mark as Viewed": "Marcar como visto",
+  "Mark as Not Viewed": "Marcar como no visto",
+  "Mark All as Viewed": "Marcar todo como visto",
+  "Mark All as Not Viewed": "Marcar todo como no visto",
+  "{count} commit": "{count} confirmación",
+  "{count} commits": "{count} confirmaciones",
+  "1 commit": "1 confirmación",
+  "All commits ({count})": "Todas las confirmaciones ({count})",
+  "Can't load changes": "No se pueden cargar los cambios",
+  "Reopen Pull Request": "Reabrir pull request",
+  "Post Pull Request": "Publicar pull request",
+  "Request Review…": "Solicitar revisión…",
+  "Re-request Review…": "Volver a solicitar revisión…",
+  "Merge Review…": "Fusionar revisión…",
+  "Squash and Merge…": "Compactar (Squash) y fusionar…",
+  "Close Pull Request": "Cerrar pull request",
+  "Submit Review ({count})…": "Enviar revisión ({count})…",
+  "Set Myself as Reviewer": "Asignarme como revisor",
+  "More merge options": "Más opciones de fusión",
+  "Loading pull request status": "Cargando estado del pull request",
+  "At least {count} approving review is required by reviewers with write access": "Se requiere al menos {count} revisión aprobatoria por parte de revisores con acceso de escritura",
+  "You are not authorized to merge request into this branch": "No tiene autorización para fusionar esta solicitud en esta rama",
+  "Missing reviewer": "Falta revisor",
+  "Details…": "Detalles…",
+  "Checking branch for conflicts": "Comprobando conflictos en la rama",
+  "Branch has conflicts that must be resolved": "La rama tiene conflictos que deben resolverse",
+  "Resolve": "Resolver",
+  "Re-request Review from {name}": "Volver a solicitar revisión de {name}",
+  "Remove {name} from reviewers": "Quitar a {name} de los revisores",
+  "Discard Pending Review": "Descartar revisión pendiente",
+  "Are you sure you want to delete all pending comments?": "¿Está seguro de que desea eliminar todos los comentarios pendientes?",
+  "Submit Review": "Enviar revisión",
+  "{count} pending comment": "{count} comentario pendiente",
+  "{count} pending comments": "{count} comentarios pendientes",
+  "Discard pending comments": "Descartar comentarios pendientes",
+  "Failed to submit review": "Error al enviar la revisión",
+  "Approve": "Aprobar",
+  "Request Changes": "Solicitar cambios",
+  "Submit general feedback without explicit approval": "Enviar comentarios generales sin aprobación explícita",
+  "Pull request action failed": "Error en la acción del pull request",
+  "Adjusting reviewers…": "Ajustando revisores…",
+  "Merge Review": "Fusionar revisión",
+  "Squash and Merge Review": "Compactar (Squash) y fusionar revisión",
+  "All required checks have passed": "Todas las comprobaciones obligatorias han pasado",
+  "Checks in progress, and some already failed…": "Comprobaciones en curso, y algunas ya fallaron…",
+  "Checks in progress…": "Comprobaciones en curso…",
+  "Checks failed": "Las comprobaciones fallaron",
+  "{name} approved review": "{name} aprobó la revisión",
+  "{name} is waiting for updates": "{name} está esperando actualizaciones",
+  "Waiting for review from {name}": "Esperando revisión de {name}",
+  "Re-requested review from {name}": "Se volvió a solicitar revisión de {name}",
+  "{name} left comments": "{name} dejó comentarios",
+  "{side} repository not found": "Repositorio {side} no encontrado",
+  "{side} remote not found: {url}": "Remoto {side} no encontrado: {url}",
+  "Merge is already in progress": "La fusión ya está en curso",
+  "Details have not finished loading": "Los detalles no han terminado de cargarse",
+  "Already resolved locally, push your changes to resolve": "Ya se resolvió localmente; envíe (push) sus cambios para resolverlo",
+  "Repository access required to manage pull requests": "Se requiere acceso al repositorio para administrar pull requests",
+  "Repository write access required to merge pull requests": "Se requiere acceso de escritura al repositorio para fusionar pull requests",
+  "Merging is disabled for this project": "La fusión está deshabilitada para este proyecto",
+  "Refresh List": "Actualizar lista",
+  "No pull requests in {name}": "No hay pull requests en {name}",
+  "No pull requests matching filters": "No hay pull requests que coincidan con los filtros",
+  "Clear filters": "Limpiar filtros",
+  "Pull request cannot be merged": "El pull request no se puede fusionar",
+  "Quick Filters": "Filtros rápidos",
+  "Clear {count} Filters": "Limpiar {count} filtros",
+  "Reset {name}": "Restablecer {name}",
+  "Assignee": "Asignado",
+  "Label": "Etiqueta",
+  "Reviewer": "Revisor",
+  "Your pull requests": "Sus pull requests",
+  "Assigned to you": "Asignados a usted",
+  "Review requests": "Solicitudes de revisión",
+  "Closed": "Cerrados",
+  "Merged": "Fusionados",
+  "Approved review": "Revisión aprobada",
+  "Reviewed": "Revisados",
+  "Reviewed by you": "Revisados por usted",
+  "Not reviewed": "No revisados",
+  "Not reviewed by you": "No revisados por usted",
+  "Awaiting review": "Esperando revisión",
+  "Awaiting review from you": "Esperando su revisión",
+  "Newest": "Más recientes",
+  "Oldest": "Más antiguos",
+  "Most commented": "Más comentados",
+  "Least commented": "Menos comentados",
+  "Recently updated": "Actualizados recientemente",
+  "Least recently updated": "Actualizados hace más tiempo",
+  "No unresolved comments": "No hay comentarios sin resolver",
+  "{count} unresolved comment": "{count} comentario sin resolver",
+  "{count} unresolved comments": "{count} comentarios sin resolver",
+  "{id} · created {date}, by {author}": "{id} · creado {date}, por {author}",
+  "{id} · created {date}": "{id} · creado {date}",
+  "Can't load pull request details": "No se pueden cargar los detalles del pull request",
+  "Can't load timeline items": "No se pueden cargar los elementos de la línea de tiempo",
+  "{submitShortcut} to comment": "{submitShortcut} para comentar",
+  "Pull Request Successfully Merged": "Pull request fusionado correctamente",
+  "You can now {delete} {branch}.": "Ahora puede {delete} {branch}.",
+  "delete": "eliminar",
+  "{branch} has been deleted. {restore}": "Se ha eliminado {branch}. {restore}",
+  "Restore…": "Restaurar…",
+  "{newLineShortcut} to add new line": "{newLineShortcut} para agregar una nueva línea",
+  "Mentions": "Menciones",
+  "Delete Comment": "Eliminar comentario",
+  "Are you sure you want to delete this comment?": "¿Está seguro de que desea eliminar este comentario?",
+  "{submitShortcut} to save changes": "{submitShortcut} para guardar los cambios",
+  "Add reaction": "Agregar reacción",
+  "{users} reacted with '{name}' emoji": "{users} reaccionó con el emoji '{name}'",
+  "Suggested change": "Cambio sugerido",
+  "Apply Locally": "Aplicar localmente",
+  "{submitShortcut} to reply": "{submitShortcut} para responder",
+  "Could not load diff hunk for thread": "No se pudo cargar el bloque de diferencias para el hilo",
+  "Reply": "Responder",
+  "{n} reply": "{n} respuesta",
+  "{n} replies": "{n} respuestas",
+  "{hidden} more replies": "{hidden} respuestas más",
+  "Committing suggested change": "Confirmando cambio sugerido",
+  "Applying suggested change": "Aplicando cambio sugerido",
+  "Conflicts in {files}": "Conflictos en {files}",
+  "{path}: nothing to commit": "{path}: nada para confirmar",
+  "Resolving thread": "Resolviendo hilo",
+  "added labels {added} and removed labels {removed}": "agregó las etiquetas {added} y quitó las etiquetas {removed}",
+  "added labels {labels}": "agregó las etiquetas {labels}",
+  "removed labels {labels}": "quitó las etiquetas {labels}",
+  "assigned {assigned} and unassigned {unassigned}": "asignó a {assigned} y quitó la asignación de {unassigned}",
+  "assigned {users}": "asignó a {users}",
+  "unassigned {users}": "quitó la asignación de {users}",
+  "requested a review from {added} and removed review request from {removed}": "solicitó una revisión de {added} y quitó la solicitud de revisión de {removed}",
+  "requested a review from {reviewers}": "solicitó una revisión de {reviewers}",
+  "removed review request from {reviewers}": "quitó la solicitud de revisión de {reviewers}",
+  "renamed this pull request from '{from}' to '{to}'": "renombró este pull request de '{from}' a '{to}'",
+  "closed this": "cerró esto",
+  "reopened this": "reabrió esto",
+  "merged commit {commit} into {branch}": "fusionó la confirmación {commit} en {branch}",
+  "merged this": "fusionó esto",
+  "changed the base branch": "cambió la rama base",
+  "force-pushed the {branch} branch": "hizo push forzado en la rama {branch}",
+  "deleted the {branch} branch": "eliminó la rama {branch}",
+  "restored head branch": "restauró la rama head",
+  "dismissed {login}'s stale review": "descartó la revisión obsoleta de {login}",
+  "marked this pull request as ready for review": "marcó este pull request como listo para revisión",
+  "marked this pull request as draft": "marcó este pull request como borrador",
+  "mentioned this pull request": "mencionó este pull request",
+  "linked an issue that may be closed by this": "vinculó un issue que puede cerrarse con esto",
+  "removed a link to an issue": "quitó un vínculo a un issue",
+  "added a commit to this pull request": "agregó una confirmación a este pull request",
+  "added {n} commits to this pull request": "agregó {n} confirmaciones a este pull request",
+  "Cannot display item - {type}": "No se puede mostrar el elemento - {type}",
+  "approved the changes": "aprobó los cambios",
+  "started a review": "inició una revisión",
+  "reviewed the changes": "revisó los cambios",
+  "No description provided": "No se proporcionó ninguna descripción",
+  "Save Changes": "Guardar cambios",
+  "Unresolve": "Marcar como no resuelto",
+  "Outdated suggestions cannot be applied": "Las sugerencias obsoletas no se pueden aplicar",
+  "This suggestion has been resolved": "Esta sugerencia ha sido resuelta",
+  "Unable to apply the suggested change from a pull request in a different branch": "No se puede aplicar el cambio sugerido de un pull request en una rama diferente",
+  "Add Review Comment": "Agregar comentario de revisión",
+  "Add Multiline Review Comment": "Agregar comentario de revisión multilínea",
+  "Previous Comment": "Comentario anterior",
+  "Next Comment": "Comentario siguiente",
+  "Refresh Review Data": "Actualizar datos de revisión",
+  "Automatically mark opened files as viewed": "Marcar automáticamente los archivos abiertos como vistos",
+  "Discard Comment": "Descartar comentario",
+  "Are you sure you want to discard the unsaved comment?": "¿Está seguro de que desea descartar el comentario sin guardar?",
+  "Create a new code review comment on the line under the caret": "Crear un nuevo comentario de revisión de código en la línea bajo el cursor",
+  "Create a new code review comment on the selected lines": "Crear un nuevo comentario de revisión de código en las líneas seleccionadas",
+  "Go to previous visible comment": "Ir al comentario visible anterior",
+  "Go to next visible comment": "Ir al comentario visible siguiente",
+  "Unresolved Only": "Solo no resueltos",
+  "Do Not Show": "No mostrar",
+  "Show Review Threads": "Mostrar hilos de revisión",
+  "Mark File as Viewed": "Marcar archivo como visto",
+  "Mark File as Not Viewed": "Marcar archivo como no visto",
+  "Leave a comment": "Dejar un comentario",
+  "Discard a comment": "Descartar un comentario",
+  "Start Review": "Iniciar revisión",
+  "Add Single Comment": "Agregar comentario único",
+  "Drag to select several lines for commenting": "Arrastre para seleccionar varias líneas para comentar",
+  "The range of this comment is not adjustable as it contains suggestion": "El rango de este comentario no es ajustable ya que contiene una sugerencia",
+  "Comment range cannot be adjusted while reviewing a single commit": "El rango del comentario no se puede ajustar mientras se revisa una única confirmación",
+  "Update Branch to Enable Review Mode…": "Actualizar rama para habilitar el modo de revisión…",
+  "Disable Review Mode": "Deshabilitar modo de revisión",
+  "Show Unresolved Comments Only": "Mostrar solo comentarios no resueltos",
+  "Show All Comments": "Mostrar todos los comentarios",
+  "Configure review mode": "Configurar modo de revisión",
+  "In Review Mode, you can see review comments and proposed changes right in the editor": "En el modo de revisión, puede ver los comentarios de revisión y los cambios propuestos directamente en el editor",
+  "Pull request #{n} exists for current branch {branch}, but local branch is out of sync with remote": "El pull request #{n} existe para la rama actual {branch}, pero la rama local no está sincronizada con la remota",
+  "Loading changes for pull request #{n}": "Cargando cambios para el pull request #{n}",
+  "Pull request #{n} exists for current branch {branch}, but pull request details loading failed": "El pull request #{n} existe para la rama actual {branch}, pero falló la carga de los detalles del pull request",
+  "Pull request #{n} exists for current branch {branch}": "El pull request #{n} existe para la rama actual {branch}",
+  "Show Review Diff": "Mostrar diferencias de revisión",
+  "Pull Request branch update failed": "Error al actualizar la rama del pull request",
+  "#{n} on {branch}": "#{n} en {branch}",
+  "Markdown Images": "Imágenes de Markdown",
+  "Preview font size": "Tamaño de fuente de vista previa",
+  "Also used by Markdown cells in Jupyter notebooks. Defaults to the editor font size, independent of the UI font size.": "También lo usan las celdas de Markdown en notebooks de Jupyter. Usa de forma predeterminada el tamaño de fuente del editor, independientemente del tamaño de fuente de la interfaz.",
+  "Image folder": "Carpeta de imágenes",
+  "Relative to the Markdown file.": "Relativa al archivo Markdown.",
+  "Image name pattern": "Patrón de nombre de imagen",
+  "For clipboard images: {timestamp} becomes YYYYMMDD-HHmmss. Source file names are preserved.": "Para imágenes del portapapeles: {timestamp} se convierte en YYYYMMDD-HHmmss. Los nombres de los archivos de origen se conservan.",
+  "Image folder must be relative.": "La carpeta de imágenes debe ser relativa.",
+  "Image exceeds 16 MB.": "La imagen supera los 16 MB.",
+  "Cannot insert image": "No se puede insertar la imagen",
+  "Import Scheme": "Importar esquema",
+  "Export Scheme": "Exportar esquema",
+  "Delete Scheme": "Eliminar esquema",
+  "Keep Both": "Conservar ambos",
+  "Scheme exported.": "Esquema exportado.",
+  "Invalid .icls color scheme": "Esquema de colores .icls no válido",
+  "IntelliJ Color Scheme": "Esquema de colores de IntelliJ",
+  "A scheme named '{name}' already exists.": "Ya existe un esquema llamado '{name}'.",
+  "Applied {applied} values; skipped {skipped} unsupported or invalid values.": "Se aplicaron {applied} valores; se omitieron {skipped} valores no admitidos o no válidos.",
+  "Delete color scheme '{name}'?": "¿Eliminar el esquema de colores '{name}'?",
+  "Overwrite": "Sobrescribir",
+  "Open Results in Find Window": "Abrir resultados en la ventana de búsqueda",
+  "Multiple Cursors": "Múltiples cursores",
+  "Scroll to Results During Typing": "Desplazarse a los resultados al escribir",
+  "Find options": "Opciones de búsqueda",
+  "Occurrences of '{0}'": "Ocurrencias de '{0}'",
+  "Shelved base": "Base guardada en shelf",
+  "Shelved version": "Versión guardada en shelf",
+  "Local version": "Versión local",
+  "Show Diff in a New Tab": "Mostrar diferencias en una pestaña nueva",
+  "Copy as Patch to Clipboard": "Copiar como parche al portapapeles",
+  "Import Patches…": "Importar parches…",
+  "Import patches": "Importar parches",
+  "Refresh Shelf": "Actualizar Shelf",
+  "Show Shelved Diff": "Mostrar diferencias del Shelf",
+  "Compare Shelved Changes with Local": "Comparar cambios del Shelf con la versión local",
+  "Create Patch from Shelved Changes…": "Crear parche a partir de cambios del Shelf…",
+  "Build Tags": "Etiquetas de compilación",
+  "Go Version": "Versión de Go",
+  "Custom Tags": "Etiquetas personalizadas",
+  "Experiments": "Experimentos",
+  "Open a project to configure Go build tags.": "Abra un proyecto para configurar las etiquetas de compilación de Go.",
+  "This Go file is excluded by the current build constraints.": "Este archivo Go está excluido por las restricciones de compilación actuales.",
+  "Select one Go test file": "Seleccione un archivo de prueba de Go",
+  "Go configuration": "Configuración de Go",
+  "Go Build": "Compilación de Go",
+  "Go Test": "Prueba de Go",
+  "Run kind": "Tipo de ejecución",
+  "Output directory": "Directorio de salida",
+  "Run after build": "Ejecutar después de compilar",
+  "Go tool arguments": "Argumentos de la herramienta Go",
+  "Use all custom build tags": "Usar todas las etiquetas de compilación personalizadas",
+  "Build and run a Go application": "Compilar y ejecutar una aplicación Go",
+  "Run Go tests": "Ejecutar pruebas de Go",
+  "Go test file has no directory": "El archivo de prueba de Go no tiene directorio",
+  "Go package discovery timed out": "Se agotó el tiempo de espera del descubrimiento de paquetes de Go",
+  "Go package discovery failed: {value}": "Error en el descubrimiento de paquetes de Go: {value}",
+  "Go test file target is missing": "Falta el destino del archivo de prueba de Go",
+  "Go build and run requires the output console": "La compilación y ejecución de Go requieren la consola de salida",
+  "run stopped after build": "ejecución detenida después de la compilación",
+  "Go Modules": "Módulos de Go",
+  "Enable vendoring support automatically": "Habilitar compatibilidad con vendoring automáticamente",
+  "Inherit from environment": "Heredar del entorno",
+  "Open a project to configure Go modules.": "Abra un proyecto para configurar los módulos de Go.",
+  "Go Mod Tidy": "Go Mod Tidy",
+  "Download Go Modules": "Descargar módulos de Go",
+  "Sync Go Workspace": "Sincronizar espacio de trabajo de Go",
+  "Add Directory to Go Workspace…": "Agregar directorio al espacio de trabajo de Go…",
+  "Add Directory to Go Workspace": "Agregar directorio al espacio de trabajo de Go",
+  "Module directory": "Directorio del módulo",
+  "Path relative to go.work, or an absolute directory containing go.mod": "Ruta relativa a go.work o un directorio absoluto que contenga go.mod",
+  "Reload External Libraries": "Recargar bibliotecas externas",
+  "Run Go Generate": "Ejecutar Go Generate",
+  "Go Generate File": "Go Generate en archivo",
+  "Go Generate Package": "Go Generate en paquete",
+  "Architecture": "Arquitectura",
+  "Compiler": "Compilador",
+  "No CMake executable target for this file": "No hay ningún destino ejecutable de CMake para este archivo",
+  "Run CMake Configure from the Run selector, then choose the executable target. Files in a CMake project are built with their target.": "Ejecute Configurar CMake desde el selector de ejecución y luego elija el destino ejecutable. Los archivos de un proyecto CMake se compilan con su destino.",
+  "Cannot check deployment mappings": "No se pueden comprobar las asignaciones de implementación",
+  "No selected paths can be deployed to {server}": "Ninguna ruta seleccionada se puede implementar en {server}",
+  "No deployment server covers the selected paths": "Ningún servidor de implementación cubre las rutas seleccionadas",
+  "Not covered by this server's mappings": "No cubierto por las asignaciones de este servidor",
+  "Excluded from deployment": "Excluido de la implementación",
+  "No debug output available": "No hay salida de depuración disponible",
+  "The attached process may not provide standard output to the debugger.": "Es posible que el proceso adjunto no proporcione salida estándar al depurador.",
+  "Show in Debug Tool Window": "Mostrar en la ventana de herramientas de depuración",
+  "Suspended": "Suspendido",
+  "Usage access filters": "Filtros de acceso de uso",
+  "Show read accesses": "Mostrar accesos de lectura",
+  "Show write accesses": "Mostrar accesos de escritura",
+  "No usages match the access filters": "Ningún uso coincide con los filtros de acceso",
+  "On 'Update' action": "Al realizar la acción 'Actualizar'",
+  "Show chooser": "Mostrar selector",
+  "On frame deactivation": "Al desactivar la ventana",
+  "When all project windows lose focus to another application": "Cuando todas las ventanas del proyecto pierdan el foco frente a otra aplicación",
+  "Resources updated": "Recursos actualizados",
+  "Classes were compiled. Restart the application to load them, or launch with the debugger to use HotSwap.": "Las clases fueron compiladas. Reinicie la aplicación para cargarlas o iníciela con el depurador para usar HotSwap.",
+  "Application update build failed": "Error en la compilación de actualización de la aplicación",
+  "The Spring Boot configuration has no main class": "La configuración de Spring Boot no tiene clase principal",
+  "Do nothing": "No hacer nada",
+  "Cannot compare {root} against {label}: {error}": "No se puede comparar {root} con {label}: {error}",
+  "Compare with Branch or Revision": "Comparar con rama o revisión",
+  "No changes against {revision} in 1 repository": "No hay cambios respecto a {revision} en 1 repositorio",
+  "No changes against {revision} in {repositories} repositories": "No hay cambios respecto a {revision} en {repositories} repositorios",
+  "Open or select a file or folder to compare": "Abra o seleccione un archivo o carpeta para comparar",
+  "Selection is outside Git repositories": "La selección está fuera de los repositorios Git",
+  "Skipped content outside Git repositories: {skippedLabel}": "Se omitió el contenido fuera de los repositorios Git: {skippedLabel}",
+  "in {length} repositories": "en {length} repositorios",
+  "No repository in the selection has revision {label}": "Ningún repositorio de la selección tiene la revisión {label}",
+  "{repoName} has no revision {label}": "{repoName} no tiene la revisión {label}",
+  "Waiting for language server…": "Esperando al servidor de lenguaje…",
+  "Compare Directories": "Comparar directorios",
+  "Select two directories to compare": "Seleccione dos directorios para comparar",
+  "Select a directory to compare": "Seleccione un directorio para comparar",
+  "Directory path": "Ruta del directorio",
+  "Only on left": "Solo a la izquierda",
+  "Only on right": "Solo a la derecha",
+  "Contents differ": "Los contenidos difieren",
+  "Comparing directories": "Comparando directorios",
+  "Filter by name": "Filtrar por nombre",
+  "Show identical files": "Mostrar archivos idénticos",
+  "Copy to Left": "Copiar a la izquierda",
+  "Copy to Right": "Copiar a la derecha",
+  "Compared files": "Archivos comparados",
+  "Comparison cancelled": "Comparación cancelada",
+  "No matching differences": "No hay diferencias coincidentes",
+  "Overwrite files?": "¿Sobrescribir archivos?",
+  "Copy to {to} and overwrite existing files?": "¿Copiar a {to} y sobrescribir los archivos existentes?",
+  "Left: {left}": "Izquierda: {left}",
+  "Right: {right}": "Derecha: {right}",
+  "Compared {compared} of {total} entries": "Se compararon {compared} de {total} entradas",
+  "Scanned {scanned} entries": "Se escanearon {scanned} entradas",
+  "Binary content": "Contenido binario",
+  "Binary files cannot be shown as text": "Los archivos binarios no se pueden mostrar como texto",
+  "Delete {path}?": "¿Eliminar {path}?",
+  "copy requires an absolute path": "la copia requiere una ruta absoluta",
+  "missing file name": "falta el nombre del archivo",
+  "copy requires absolute paths": "la copia requiere rutas absolutas",
+  "copy paths must belong to the comparison roots": "las rutas de copia deben pertenecer a las raíces de comparación",
+  "cannot copy overlapping paths": "no se pueden copiar rutas superpuestas",
+  "cannot copy through a destination symlink": "no se puede copiar a través de un enlace simbólico de destino",
+  "expected a relative comparison entry path": "se esperaba una ruta relativa de entrada de comparación",
+  "Agent sessions": "Sesiones del agente",
+  "Back to conversation": "Volver a la conversación",
+  "Conversation location": "Ubicación de la conversación",
+  "Chat in Tool Window": "Chat en ventana de herramientas",
+  "Chat in Editor": "Chat en el editor",
+  "Agent settings": "Configuración del agente",
+  "Describe a task…": "Describa una tarea…",
+  "Formatting profile": "Perfil de formato",
+  "Custom Eclipse formatter XML": "XML del formateador de Eclipse personalizado",
+  "Eclipse formatter XML": "XML del formateador de Eclipse",
+  "Changes take effect after Apply without restarting the Java language server.": "Los cambios surten efecto después de Aplicar sin reiniciar el servidor de lenguaje Java.",
+  "Absolute or project-relative path. To reload an edited XML file, switch to Default, apply, then select Custom again.": "Ruta absoluta o relativa al proyecto. Para recargar un archivo XML editado, cambie a Predeterminado, aplique y luego seleccione Personalizado de nuevo.",
+  "Cannot read Java formatter XML {path}: {error}": "No se puede leer el XML del formateador de Java {path}: {error}",
+  "Java formatter configuration unavailable": "Configuración del formateador de Java no disponible",
+  "Choose an Eclipse formatter XML file.": "Elija un archivo XML del formateador de Eclipse.",
+  "Not a formatter XML file: {path}": "No es un archivo XML de formateador: {path}",
+  "CMake profiles": "Perfiles de CMake",
+  "CMake profile actions": "Acciones del perfil de CMake",
+  "No CMake profiles. Click + to add one.": "No hay perfiles de CMake. Haga clic en + para agregar uno.",
+  "Profile settings": "Configuración del perfil",
+  "Build type": "Tipo de compilación",
+  "Generator": "Generador",
+  "CMake arguments": "Argumentos de CMake",
+  "Build directory": "Directorio de compilación",
+  "Build arguments": "Argumentos de compilación",
+  "CMake default": "Predeterminado de CMake",
+  "Quote arguments containing spaces. Build arguments go to cmake --build; use -- before native build tool options.": "Ponga entre comillas los argumentos que contengan espacios. Los argumentos de compilación van a cmake --build; use -- antes de las opciones de la herramienta de compilación nativa.",
+  "CMake profile {0}": "Perfil de CMake {0}",
+  ".NET Project": "Proyecto .NET",
+  ".NET project": "Proyecto .NET",
+  "Run a .NET project with a launch profile": "Ejecutar un proyecto .NET con un perfil de inicio",
+  "Target framework": "Framework de destino",
+  "Launch profile": "Perfil de inicio",
+  "Empty disables launch profiles": "Vacío deshabilita los perfiles de inicio",
+  "Empty uses the launch profile's arguments": "Vacío usa los argumentos del perfil de inicio",
+  "Application URL": "URL de la aplicación",
+  "Profile environment variables": "Variables de entorno del perfil",
+  "Environment variables below override the profile": "Las siguientes variables de entorno reemplazan las del perfil",
+  "Build .NET project": "Compilar proyecto .NET",
+  "Run .NET tests": "Ejecutar pruebas de .NET",
+  "Test arguments": "Argumentos de prueba",
+  "netcoredbg is not installed": "netcoredbg no está instalado",
+  ".NET Project requires the local machine": "El Proyecto .NET requiere el equipo local",
+  "Select a .NET project": "Seleccione un proyecto .NET",
+  "Invalid .NET project path": "Ruta de proyecto .NET no válida",
+  ".NET launch profile '{profile_name}' is missing or is not a Project profile": "El perfil de inicio de .NET '{profile_name}' no existe o no es un perfil de Proyecto",
+  ".NET output resolution timed out": "Se agotó el tiempo de espera de la resolución de salida de .NET",
+  ".NET build output is missing; run dotnet build before debugging": "Falta la salida de compilación de .NET; ejecute dotnet build antes de depurar",
+  "Cannot paste clipboard media": "No se puede pegar el contenido multimedia del portapapeles",
+  "Cannot paste this path safely in cmd.exe. Use PowerShell or a POSIX shell.": "No se puede pegar esta ruta de forma segura en cmd.exe. Use PowerShell o un shell POSIX.",
+  "Remote server does not support image paste.": "El servidor remoto no admite el pegado de imágenes.",
+  "Clipboard image reading is unavailable.": "La lectura de imágenes del portapapeles no está disponible.",
+  "Clipboard media is too large to paste (limit {limit} MB).": "El contenido multimedia del portapapeles es demasiado grande para pegarlo (límite de {limit} MB).",
+  "unsupported clipboard media type": "tipo de contenido multimedia del portapapeles no admitido",
+  "Show inline blame for the current line": "Mostrar autoría (blame) en línea para la línea actual",
+  "You, now · Uncommitted changes": "Usted, ahora · Cambios sin confirmar",
+  "now": "ahora",
+  "Django tests": "Pruebas de Django",
+  "Run Django tests with manage.py test": "Ejecutar pruebas de Django con manage.py test",
+  "e.g. python3, .venv/bin/python, uv, poetry": "p. ej., python3, .venv/bin/python, uv, poetry",
+  "e.g. `run python` for uv/poetry; empty calls the interpreter itself": "p. ej., `run python` para uv/poetry; vacío llama al propio intérprete",
+  "App labels, modules or dotted test paths; empty runs every test": "Etiquetas de aplicaciones, módulos o rutas de prueba separadas por puntos; vacío ejecuta todas las pruebas",
+  "Settings module": "Módulo de configuración",
+  "Passed as --settings; empty keeps DJANGO_SETTINGS_MODULE or the default in manage.py": "Se pasa como --settings; vacío conserva DJANGO_SETTINGS_MODULE o el valor predeterminado en manage.py",
+  "e.g. --keepdb --parallel": "p. ej., --keepdb --parallel",
+  "Run PHPUnit tests": "Ejecutar pruebas de PHPUnit",
+  "e.g. vendor/bin/phpunit, phpunit, vendor/bin/pest": "p. ej., vendor/bin/phpunit, phpunit, vendor/bin/pest",
+  "Test file or directory; empty runs the suites of the configuration file": "Archivo o directorio de prueba; vacío ejecuta las suites del archivo de configuración",
+  "Passed as --configuration; empty lets PHPUnit find phpunit.xml(.dist)": "Se pasa como --configuration; vacío permite que PHPUnit busque phpunit.xml(.dist)",
+  "Test filter": "Filtro de pruebas",
+  "Passed as --filter: a test name or a regular expression": "Se pasa como --filter: un nombre de prueba o una expresión regular",
+  "PHPUnit options": "Opciones de PHPUnit",
+  "e.g. --stop-on-failure --testsuite unit": "p. ej., --stop-on-failure --testsuite unit",
+  "CLI Interpreter": "Intérprete CLI",
+  "PHP interpreter": "Intérprete de PHP",
+  "Runs PHP scripts, PHPUnit, Composer and artisan, and the PHP-based language servers (phpactor). Its folder is put first on PATH, so vendor/bin/phpunit and other #!/usr/bin/env php scripts use it too.": "Ejecuta scripts de PHP, PHPUnit, Composer y artisan, así como los servidores de lenguaje basados en PHP (phpactor). Su carpeta se coloca primero en PATH, por lo que vendor/bin/phpunit y otros scripts #!/usr/bin/env php también lo utilizan.",
+  "Select PHP Interpreter": "Seleccionar intérprete de PHP",
+  "PHP language level": "Nivel de lenguaje PHP",
+  "The PHP version Intelephense checks the code against: newer syntax and functions are reported. Auto uses config.platform.php from composer.json, else the lowest version require.php allows.": "La versión de PHP con la que Intelephense verifica el código: se informan la sintaxis y las funciones más recientes. Automático usa config.platform.php de composer.json o, en su defecto, la versión más baja que permita require.php.",
+  "from composer.json": "de composer.json",
+  "PHP Language Level": "Nivel de lenguaje PHP",
+  "PHP Language Level: {label}": "Nivel de lenguaje PHP: {label}",
+  "Select PHP Language Level": "Seleccionar nivel de lenguaje PHP",
+  "Cannot select PHP language level": "No se puede seleccionar el nivel de lenguaje PHP",
+  "No PHP version in the settings or composer.json: Intelephense uses its default": "No hay versión de PHP en la configuración ni en composer.json: Intelephense usa su valor predeterminado",
+  "PHP {version}, set in the settings": "PHP {version}, establecido en la configuración",
+  "PHP {version}, from config.platform.php in composer.json": "PHP {version}, de config.platform.php en composer.json",
+  "PHP {version}, the lowest version require.php in composer.json allows": "PHP {version}, la versión más baja que permite require.php en composer.json",
+  "Set in the settings of the linked project {name}": "Establecido en la configuración del proyecto vinculado {name}",
+  "Include paths": "Rutas de inclusión",
+  "Folders outside the project whose classes and functions Intelephense indexes too, such as the platform a module extends. Absolute, or relative to the project.": "Carpetas fuera del proyecto cuyas clases y funciones Intelephense también indexa, como la plataforma que extiende un módulo. Absolutas o relativas al proyecto.",
+  "No include paths": "Sin rutas de inclusión",
+  "Include path": "Ruta de inclusión",
+  "Additional stubs": "Stubs adicionales",
+  "Intelephense stub sets loaded on top of its defaults, such as wordpress. Each ext-* in require or require-dev of composer.json adds its own.": "Conjuntos de stubs de Intelephense cargados además de los predeterminados, como wordpress. Cada ext-* en require o require-dev de composer.json agrega el suyo propio.",
+  "No additional stubs": "Sin stubs adicionales",
+  "Stub": "Stub",
+  "Stub name, e.g. wordpress": "Nombre del stub, p. ej., wordpress",
+  "select files in a git repository to shelve": "seleccione archivos en un repositorio git para guardar en el shelf",
+  "select files from a single git repository to shelve": "seleccione archivos de un único repositorio git para guardar en el shelf",
+  "External file changes sync may be slow": "La sincronización de cambios externos de archivos puede ser lenta",
+  "Cannot select Python interpreter": "No se puede seleccionar el intérprete de Python",
+  "Python Interpreter: {label}": "Intérprete de Python: {label}",
+  "recursive": "recursivo",
+  "Java project import failed": "Error al importar el proyecto Java",
+  "The Java project cannot be imported because these files use a name Windows reserves for devices: {paths}. Delete or rename them, then restart the Java language server.": "No se puede importar el proyecto Java porque estos archivos usan un nombre que Windows reserva para dispositivos: {paths}. Elimínelos o cámbieles el nombre y luego reinicie el servidor de lenguaje Java.",
+  "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.": "Este archivo está fuera de las carpetas de código fuente de su módulo Java: solo se informan errores de sintaxis y la navegación y el autocompletado no funcionan.",
+  "This file does not belong to an imported Java project: only syntax errors are reported, and only JDK classes resolve.": "Este archivo no pertenece a un proyecto Java importado: solo se informan errores de sintaxis y solo se resuelven las clases del JDK.",
+  "This Go file belongs to no package of the workspace: code insight is limited.": "Este archivo Go no pertenece a ningún paquete del espacio de trabajo: el análisis de código es limitado.",
+  "This Rust file is not included in any crate: rust-analyzer can't offer code insight for it.": "Este archivo Rust no está incluido en ningún crate: rust-analyzer no puede ofrecer análisis de código para él.",
+  "Reload Maven Projects": "Recargar proyectos de Maven",
+  "Reload Gradle Project": "Recargar proyecto de Gradle",
+  "Binary files cannot be resolved in the merge editor.": "Los archivos binarios no se pueden resolver en el editor de fusión.",
+  "Accept (hold the modifier key to resolve using this side)": "Aceptar (mantenga presionada la tecla modificadora para resolver usando este lado)",
+  "Ignore (hold the modifier key to ignore both sides)": "Ignorar (mantenga presionada la tecla modificadora para ignorar ambos lados)",
+  "Unresolved Changes": "Cambios sin resolver",
+  "{remaining} change is unresolved and keeps the base text. Save and mark the file as resolved anyway?": "{remaining} cambio está sin resolver y conserva el texto base. ¿Guardar y marcar el archivo como resuelto de todos modos?",
+  "{remaining} changes are unresolved and keep the base text. Save and mark the file as resolved anyway?": "{remaining} cambios están sin resolver y conservan el texto base. ¿Guardar y marcar el archivo como resuelto de todos modos?",
+  "Apply Non-Conflicting Changes from the Left Side": "Aplicar cambios sin conflicto del lado izquierdo",
+  "Apply All Non-Conflicting Changes": "Aplicar todos los cambios sin conflicto",
+  "Apply Non-Conflicting Changes from the Right Side": "Aplicar cambios sin conflicto del lado derecho",
+  "Automatically Apply Non-Conflicting Changes": "Aplicar automáticamente cambios sin conflicto",
+  "Resolve Automatically": "Resolver automáticamente",
+  "Resolve Simple Conflicts": "Resolver conflictos simples",
+  "Revert Conflict Resolution": "Revertir resolución de conflictos",
+  "Ignore": "Ignorar",
+  "Accept": "Aceptar",
+  "Resolve Using Yours": "Resolver usando los suyos",
+  "Resolve Using Theirs": "Resolver usando los de ellos",
+  "All changes processed": "Todos los cambios procesados",
+  "{pending} change left": "Queda {pending} cambio",
+  "{pending} changes left": "Quedan {pending} cambios",
+  "Compare Contents": "Comparar contenidos",
+  "Yours and Result": "Los suyos y el resultado",
+  "Result and Theirs": "El resultado y los de ellos",
+  "Yours and Theirs": "Los suyos y los de ellos",
+  "Base and Yours": "Base y los suyos",
+  "Base and Result": "Base y el resultado",
+  "Base and Theirs": "Base y los de ellos",
+  "Base": "Base",
+  "Discard Changes": "Descartar cambios",
+  "The result was changed. Discard the changes and take this version as it is?": "El resultado fue modificado. ¿Descartar los cambios y tomar esta versión tal como está?",
+  "Cancel Merge": "Cancelar fusión",
+  "Exit without applying the changes made in the result?": "¿Salir sin aplicar los cambios realizados en el resultado?",
+  "Apply Merge Result": "Aplicar resultado de la fusión",
+  "Merge Settings": "Configuración de fusión",
+  "Resolve Merge Change": "Resolver cambio de fusión",
+  "File has unresolved merge conflicts": "El archivo tiene conflictos de fusión sin resolver",
+  "Resolve conflicts…": "Resolver conflictos…",
+  "Unresolved merge conflict marker": "Marcador de conflicto de fusión sin resolver",
+  "Unresolved merge conflicts": "Conflictos de fusión sin resolver",
+  "Reports the <<<<<<<, ======= and >>>>>>> lines a merge leaves in a file, whatever its language and whether or not a language server is installed.": "Informa las líneas <<<<<<<, ======= y >>>>>>> que una fusión deja en un archivo, sea cual sea su lenguaje y esté o no instalado un servidor de lenguaje.",
+  "Merge/Rebase Widget": "Widget de fusión/rebase",
+  "Unresolved merge conflict markers": "Marcadores de conflicto de fusión sin resolver",
+  "What the session has cost so far, as the agent reports it": "Lo que ha costado la sesión hasta ahora, según lo informa el agente",
+  "{name}: {percent}% used": "{name}: {percent}% utilizado",
+  "{used}, resets in {reset}": "{used}, se restablece en {reset}",
+  "5-hour limit": "Límite de 5 horas",
+  "Weekly limit": "Límite semanal",
+  "Weekly Opus limit": "Límite semanal de Opus",
+  "Weekly Sonnet limit": "Límite semanal de Sonnet",
+  "Chat": "Chat",
+  "Shown in the Task Header": "Se muestra en el encabezado de la tarea",
+  "Context window usage": "Uso de la ventana de contexto",
+  "Time spent on the task": "Tiempo dedicado a la tarea",
+  "Usage limits": "Límites de uso",
+  "The account's 5-hour and weekly limits, when the agent reports them (Claude Code)": "Los límites de 5 horas y semanales de la cuenta, cuando el agente los informa (Claude Code)",
+  "Session cost": "Costo de la sesión",
+  "What the session has cost so far, as the agent reports it (API pricing, also shown on subscriptions)": "Lo que ha costado la sesión hasta ahora, según lo informa el agente (precios de API, también se muestran en suscripciones)",
+  "Local: {path}": "Local: {path}",
+  "Local: (does not exist)": "Local: (no existe)",
+  "Synchronize All": "Sincronizar todo",
+  "Deployment comparison options": "Opciones de comparación de implementación",
+  "Refresh comparison": "Actualizar comparación",
+  "Show local-only files": "Mostrar archivos solo locales",
+  "Show different files": "Mostrar archivos diferentes",
+  "Show remote-only files": "Mostrar archivos solo remotos",
+  "Compare by:": "Comparar por:",
+  "Compare by": "Comparar por",
+  "Size and Timestamp": "Tamaño y marca de tiempo",
+  "Binary Content": "Contenido binario",
+  "Synchronize Selected": "Sincronizar seleccionados",
+  "Stop content comparison": "Detener comparación de contenido",
+  "Filter:": "Filtro:",
+  "Local files": "Archivos locales",
+  "Local name": "Nombre local",
+  "Remote name": "Nombre remoto",
+  "Space changes the selected operation. Enter synchronizes the selected file. Synchronize All applies all chosen operations.": "Espacio cambia la operación seleccionada. Enter sincroniza el archivo seleccionado. Sincronizar todo aplica todas las operaciones elegidas.",
+  "Resize file list and diff preview": "Redimensionar lista de archivos y vista previa de diferencias",
+  "The deployment server or project is no longer available": "El servidor de implementación o el proyecto ya no está disponible",
+  "Select a file to compare its contents": "Seleccione un archivo para comparar su contenido",
+  "Loading file contents…": "Cargando contenido del archivo…",
+  "This file is too large for the text preview. Use Binary Content to compare it.": "Este archivo es demasiado grande para la vista previa de texto. Use Contenido binario para compararlo.",
+  "Deployment comparison": "Comparación de implementación",
+  "Wait for synchronization to finish before opening another comparison.": "Espere a que termine la sincronización antes de abrir otra comparación.",
+  "Save local changes?": "¿Guardar cambios locales?",
+  "Save the local files edited in this comparison before closing.": "Guarde los archivos locales editados en esta comparación antes de cerrar.",
+  "Save and Close": "Guardar y cerrar",
+  "Cannot close deployment comparison": "No se puede cerrar la comparación de implementación",
+  "Deployment Comparison": "Comparación de implementación",
+  "Opening deployment comparison…": "Abriendo comparación de implementación…",
+  "Diff Between 'local files' and 'files on {server}'": "Diferencias entre 'archivos locales' y 'archivos en {server}'",
+  "Comparing contents: {done} of {total}": "Comparando contenido: {done} de {total}",
+  "A file changed during comparison. Refresh and compare again.": "Un archivo cambió durante la comparación. Actualice y vuelva a comparar.",
+  "The project is no longer open.": "El proyecto ya no está abierto.",
+  "The deployment server is no longer available.": "El servidor de implementación ya no está disponible.",
+  "No selected files are mapped to this deployment server.": "Ninguno de los archivos seleccionados está asignado a este servidor de implementación.",
+  "Cannot open comparison for {server}": "No se puede abrir la comparación para {server}",
+  "Could not refresh comparison: {error}": "No se pudo actualizar la comparación: {error}",
+  "Build and run using": "Compilar y ejecutar usando",
+  "Gradle runs a main class as a JavaExec task on its source set's runtime classpath (Gradle's resource processing included). OpenIDEA launches it on the Java language server's classpath.": "Gradle ejecuta una clase principal como una tarea JavaExec en el classpath de ejecución de su conjunto de código fuente (incluido el procesamiento de recursos de Gradle). OpenIDEA la inicia en el classpath del servidor de lenguaje Java.",
+  "Set an absolute root path on the Connection tab first": "Primero establezca una ruta raíz absoluta en la pestaña Conexión",
+  "Needs permission": "Requiere permiso",
+  "linked": "vinculado",
+  "Revoke {id}": "Revocar {id}",
+  "Allow {id}": "Permitir {id}",
+  "This version asks for new permissions. It stays off until you allow them.": "Esta versión solicita nuevos permisos. Permanecerá desactivada hasta que los permita.",
+  "Plugins from a project folder run only after you allow them.": "Los plugins de una carpeta de proyecto solo se ejecutan después de que usted los permita.",
+  "Review Permissions…": "Revisar permisos…",
+  "Statistics": "Estadísticas",
+  "Activated {activations}× (last in {toFixed} ms), {calls} calls, {errors} errors, slowest {toFixed} ms": "Activado {activations}× (última en {toFixed} ms), {calls} llamadas, {errors} errores, más lenta {toFixed} ms",
+  "Recent calls p95 {toFixed} ms; {crashes} crashes, {slowCalls} editor results too late, reclaimed {reclaims}× when idle": "Llamadas recientes p95 {toFixed} ms; {crashes} fallos, {slowCalls} resultados del editor demasiado tarde, recuperado {reclaims}× cuando está inactivo",
+  "Linked plugin": "Plugin vinculado",
+  "Project plugin": "Plugin del proyecto",
+  "Signed by {publisher}": "Firmado por {publisher}",
+  "Unsigned": "Sin firmar",
+  "Roll Back to {previousVersion}": "Revertir a {previousVersion}",
+  "Install Plugin from Package File…": "Instalar plugin desde archivo de paquete…",
+  "Import Theme from IntelliJ IDE…": "Importar tema desde IntelliJ IDE…",
+  "Import IntelliJ Theme from File…": "Importar tema de IntelliJ desde archivo…",
+  "Import Theme from IntelliJ IDE": "Importar tema desde IntelliJ IDE",
+  "Import IntelliJ Theme": "Importar tema de IntelliJ",
+  "IntelliJ theme plugin or theme file": "Plugin de tema o archivo de tema de IntelliJ",
+  "Could not import the IntelliJ theme": "No se pudo importar el tema de IntelliJ",
+  "Import": "Importar",
+  "In use": "En uso",
+  "IntelliJ themes": "Temas de IntelliJ",
+  "Looking for IntelliJ themes": "Buscando temas de IntelliJ",
+  "Looking for IntelliJ themes…": "Buscando temas de IntelliJ…",
+  "Theme plugins installed in the JetBrains IDEs on this computer. Importing a theme brings every theme of its plugin and applies the chosen one. Colours without an OpenIDEA counterpart keep the default theme colours.": "Plugins de temas instalados en los IDE de JetBrains en este equipo. Al importar un tema se incluyen todos los temas de su plugin y se aplica el elegido. Los colores sin equivalente en OpenIDEA conservan los colores del tema predeterminado.",
+  "1 theme": "1 tema",
+  "{count} themes": "{count} temas",
+  "No theme plugins found in JetBrains IDEs on this computer. Choose a theme plugin downloaded from the JetBrains Marketplace (.jar or .zip) or a .theme.json file instead.": "No se encontraron plugins de temas en los IDE de JetBrains en este equipo. En su lugar, elija un plugin de tema descargado de JetBrains Marketplace (.jar o .zip) o un archivo .theme.json.",
+  "Marketplace": "Marketplace",
+  "Plugin Repository…": "Repositorio de plugins…",
+  "Plugin Repository": "Repositorio de plugins",
+  "Marketplace index URL:": "URL del índice de Marketplace:",
+  "Leave empty to use the default repository.": "Déjelo vacío para usar el repositorio predeterminado.",
+  "Could not download plugin": "No se pudo descargar el plugin",
+  "Rolled back {name} to {version}": "Se revirtió {name} a {version}",
+  "Could not roll back": "No se pudo revertir",
+  "Could not open the package": "No se pudo abrir el paquete",
+  "Settings of the plugin; projects can override them.": "Configuración del plugin; los proyectos pueden reemplazarla.",
+  "Menus": "Menús",
+  "Shortcuts": "Atajos",
+  "Status Bar Items": "Elementos de la barra de estado",
+  "Editors": "Editores",
+  "Open With": "Abrir con",
+  "The plugin could not show this view": "El plugin no pudo mostrar esta vista",
+  "Loading": "Cargando",
+  "Insert Row Above": "Insertar fila arriba",
+  "Insert Row Below": "Insertar fila debajo",
+  "Delete {length} Rows": "Eliminar {length} filas",
+  "Delete Row": "Eliminar fila",
+  "No rows": "No hay filas",
+  "Cell value": "Valor de la celda",
+  "Secrets": "Secretos",
+  "Stored": "Almacenado",
+  "Not set": "No establecido",
+  "Replace…": "Reemplazar…",
+  "Value of {label}": "Valor de {label}",
+  "The plugin can only send these with its network requests; it cannot read them.": "El plugin solo puede enviar estos valores con sus solicitudes de red; no puede leerlos.",
+  "Editor Providers": "Proveedores de editor",
+  "Linked for development": "Vinculado para desarrollo",
+  "Low": "Bajo",
+  "Medium": "Medio",
+  "High": "Alto",
+  "Install {name} {version}?": "¿Instalar {name} {version}?",
+  "Allow {name} to run?": "¿Permitir que {name} se ejecute?",
+  "Allow": "Permitir",
+  "This package is not signed. Only continue if you trust where it came from.": "Este paquete no está firmado. Continúe solo si confía en su procedencia.",
+  "This plugin needs no special permissions.": "Este plugin no necesita permisos especiales.",
+  "Requested permissions": "Permisos solicitados",
+  "Required": "Obligatorio",
+  "High-risk permissions are equivalent to running arbitrary code on this machine.": "Los permisos de alto riesgo equivalen a ejecutar código arbitrario en este equipo.",
+  "{icons} icons": "{icons} iconos",
+  "Use Default Icons": "Usar iconos predeterminados",
+  "Apply icon theme {label}": "Aplicar tema de iconos {label}",
+  "File Icon Themes": "Temas de iconos de archivo",
+  "File Icons": "Iconos de archivo",
+  "File Templates": "Plantillas de archivo",
+  "Cannot show {label}": "No se puede mostrar {label}",
+  "{title} layout": "Diseño de {title}",
+  "Editor and {title}": "Editor y {title}",
+  "{title} Only": "Solo {title}",
+  "File icon theme": "Tema de iconos de archivo",
+  "Plugin not enabled": "Plugin no habilitado",
+  "Problems the {plugin} plugin reports. Severity \"As reported\" keeps the level the plugin assigns; a code below can override it.": "Problemas que informa el plugin {plugin}. La gravedad \"Según lo informado\" conserva el nivel que asigna el plugin; un código a continuación puede reemplazarlo.",
+  "The plugin system is a preview: its API and the plugins may still change.": "El sistema de plugins es una versión preliminar: su API y los plugins aún pueden cambiar.",
+  "'{expected}' expected": "Se esperaba '{expected}'",
+  "Unexpected token": "Token inesperado",
+  "Syntax": "Sintaxis",
+  "Syntax errors": "Errores de sintaxis",
+  "Reports code the built-in parser cannot read, in files no language server checks (none is configured for the language, or it is not installed, stopped or crashed). A running language server reports syntax errors itself.": "Informa el código que el analizador integrado no puede leer, en archivos que ningún servidor de lenguaje verifica (no hay ninguno configurado para el lenguaje, o no está instalado, se detuvo o falló). Un servidor de lenguaje en ejecución informa los errores de sintaxis por sí mismo.",
+  "Some items could not be restored": "Algunos elementos no se pudieron restaurar",
+  "Not in Local History: {names}. They are in the Trash.": "No están en el historial local: {names}. Están en la Papelera.",
+  "Show All Commits": "Mostrar todas las confirmaciones",
+  "Pin": "Fijar",
+  "Unpin": "Desfijar",
+  "Project default": "Predeterminado del proyecto",
+  "The node executable this script runs on; empty uses Settings › Languages & Frameworks › Node.js.": "El ejecutable de node en el que se ejecuta este script; vacío usa Configuración › Lenguajes y frameworks › Node.js.",
+  "Loading repositories…": "Cargando repositorios…",
+  "GitHub repositories are listed with the": "Los repositorios de GitHub se listan con el",
+  "Search repositories": "Buscar repositorios",
+  "Repositories": "Repositorios",
+  "No matching repositories": "No hay repositorios coincidentes",
+  "No repositories": "No hay repositorios",
+  "fork": "fork",
+  "archived": "archivado",
+  "Could not forward port {port}": "No se pudo reenviar el puerto {port}",
+  "Remote port": "Puerto remoto",
+  "Remote port, e.g. 3000": "Puerto remoto, p. ej., 3000",
+  "Forward Port": "Reenviar puerto",
+  "No forwarded ports": "No hay puertos reenviados",
+  "Forward a port of the remote host to reach it from this machine, e.g. a web server in a browser.": "Reenvíe un puerto del host remoto para acceder a él desde este equipo, p. ej., un servidor web en un navegador.",
+  "Forwarded ports": "Puertos reenviados",
+  "Open {addr} in Browser": "Abrir {addr} en el navegador",
+  "Copy {addr}": "Copiar {addr}",
+  "Stop Forwarding Port {remotePort}": "Dejar de reenviar el puerto {remotePort}",
+  "Ports": "Puertos",
+  "GraphQL views": "Vistas de GraphQL",
+  "Schemas and Project Structure": "Esquemas y estructura del proyecto",
+  "Query Result": "Resultado de la consulta",
+  "Default project-wide schema": "Esquema predeterminado para todo el proyecto",
+  "the configuration is code and is not evaluated": "la configuración es código y no se evalúa",
+  "schema is empty": "el esquema está vacío",
+  "Schema discovery summary": "Resumen de descubrimiento de esquemas",
+  "Schema errors": "Errores de esquema",
+  "No errors found": "No se encontraron errores",
+  "Endpoints": "Endpoints",
+  "No endpoints available in this schema": "No hay endpoints disponibles en este esquema",
+  "No endpoints available in the default schema": "No hay endpoints disponibles en el esquema predeterminado",
+  "GraphQL actions": "Acciones de GraphQL",
+  "Discovering GraphQL schemas": "Descubriendo esquemas de GraphQL",
+  "GraphQL schemas": "Esquemas de GraphQL",
+  "Running GraphQL query": "Ejecutando consulta de GraphQL",
+  "No query results": "No hay resultados de consulta",
+  "Add Schema Configuration": "Agregar configuración de esquema",
+  "Open the project's graphql-config, creating graphql.config.yml when there is none": "Abre el graphql-config del proyecto, creando graphql.config.yml cuando no existe ninguno",
+  "Restart Schema Discovery": "Reiniciar descubrimiento de esquemas",
+  "Find the project's GraphQL schemas and configurations again": "Volver a buscar los esquemas y configuraciones de GraphQL del proyecto",
+  "GraphQL schema discovery failed": "Error en el descubrimiento de esquemas de GraphQL",
+  "Cannot create the GraphQL configuration": "No se puede crear la configuración de GraphQL",
+  "No GraphQL endpoint": "No hay endpoint de GraphQL",
+  "Declare one under extensions.endpoints in graphql.config.yml.": "Declare uno en extensions.endpoints dentro de graphql.config.yml.",
+  "The field type '{name}' is not present when resolving type '{owner}'": "El tipo de campo '{name}' no está presente al resolver el tipo '{owner}'",
+  "GraphQL editor actions": "Acciones del editor de GraphQL",
+  "Open Configuration File": "Abrir archivo de configuración",
+  "Toggle Variables Editor": "Alternar editor de variables",
+  "GraphQL endpoint": "Endpoint de GraphQL",
+  "No endpoints": "No hay endpoints",
+  "Execute GraphQL": "Ejecutar GraphQL",
+  "Rerun Introspection Query": "Volver a ejecutar consulta de introspección",
+  "Open Introspection Schema": "Abrir esquema de introspección",
+  "GraphQL variables": "Variables de GraphQL",
+  "{types} types, {inputs} inputs, {enums} enums, {directives} directives": "{types} tipos, {inputs} entradas, {enums} enumeraciones, {directives} directivas",
+  "Run a query with Execute GraphQL in the toolbar of a GraphQL file.": "Ejecute una consulta con Ejecutar GraphQL en la barra de herramientas de un archivo GraphQL.",
+  "Query result": "Resultado de la consulta",
+  "Opens the GraphQL config file for the current file's schema": "Abre el archivo de configuración de GraphQL para el esquema del archivo actual",
+  "Reruns the latest introspection query to update the local schema file": "Vuelve a ejecutar la última consulta de introspección para actualizar el archivo de esquema local",
+  "Executes the current GraphQL file against the specified GraphQL endpoint": "Ejecuta el archivo GraphQL actual contra el endpoint de GraphQL especificado",
+  "Invalid GraphQL variables": "Variables de GraphQL no válidas",
+  "Get GraphQL Schema from Endpoint": "Obtener esquema de GraphQL desde el endpoint",
+  "Replace the contents of {target} with the schema of {name}?": "¿Reemplazar el contenido de {target} con el esquema de {name}?",
+  "Cannot write the GraphQL schema": "No se puede escribir el esquema de GraphQL",
+  "{target} did not open in an editor": "{target} no se abrió en un editor",
+  "GraphQL schema updated": "Esquema de GraphQL actualizado",
+  "No introspection schema yet": "Aún no hay esquema de introspección",
+  "Run Introspection Query on an endpoint to generate it.": "Ejecute la consulta de introspección en un endpoint para generarlo.",
+  ", 1 error": ", 1 error",
+  ", {count} errors": ", {count} errores",
+  "GraphQL Environment Variables": "Variables de entorno de GraphQL",
+  "Environment variables actions": "Acciones de variables de entorno",
+  "{file}: {ms} ms execution time, {size} response": "{file}: {ms} ms de tiempo de ejecución, respuesta de {size}",
+  "GraphQL error": "Error de GraphQL",
+  "GraphQL request to {url} failed.": "Error en la solicitud de GraphQL a {url}.",
+  "Show error": "Mostrar error",
+  "Run to Cursor failed": "Error al ejecutar hasta el cursor",
+  "Cannot start debugging": "No se puede iniciar la depuración",
+  "Cannot attach the debugger": "No se puede adjuntar el depurador",
+  "Resume failed": "Error al reanudar",
+  "Pause failed": "Error al pausar",
+  "Force Step Over failed": "Error al forzar paso por encima (Force Step Over)",
+  "Force Step Into failed": "Error al forzar paso adentro (Force Step Into)",
+  "Reset Frame failed": "Error al restablecer el marco",
+  "Force Run to Cursor failed": "Error al forzar la ejecución hasta el cursor",
+  "Cannot create file": "No se puede crear el archivo",
+  "Cannot access the clipboard": "No se puede acceder al portapapeles",
+  "Could not start container": "No se pudo iniciar el contenedor",
+  "Could not stop container": "No se pudo detener el contenedor",
+  "Could not restart container": "No se pudo reiniciar el contenedor",
+  "Could not pause container": "No se pudo pausar el contenedor",
+  "Could not unpause container": "No se pudo reanudar el contenedor",
+  "Could not kill container": "No se pudo terminar forzosamente el contenedor",
+  "Could not remove container": "No se pudo eliminar el contenedor",
+  "Could not remove image": "No se pudo eliminar la imagen",
+  "Could not remove volume": "No se pudo eliminar el volumen",
+  "Could not remove network": "No se pudo eliminar la red",
+  "Could not pull {reference}": "No se pudo extraer (pull) {reference}",
+  "Could not prune": "No se pudo depurar (prune)",
+  "Pruning stopped containers…": "Limpiando contenedores detenidos…",
+  "Pruning dangling images…": "Limpiando imágenes huérfanas…",
+  "Pruning unused images…": "Limpiando imágenes no utilizadas…",
+  "Pruning unused volumes…": "Limpiando volúmenes no utilizados…",
+  "Pruning unused networks…": "Limpiando redes no utilizadas…",
+  "Pruning the system…": "Limpiando el sistema…",
+  "Starting Compose project {project}…": "Iniciando proyecto de Compose {project}…",
+  "Stopping Compose project {project}…": "Deteniendo proyecto de Compose {project}…",
+  "Restarting Compose project {project}…": "Reiniciando proyecto de Compose {project}…",
+  "Taking down Compose project {project}…": "Dando de baja el proyecto de Compose {project}…",
+  "Could not start Compose project {project}": "No se pudo iniciar el proyecto de Compose {project}",
+  "Could not stop Compose project {project}": "No se pudo detener el proyecto de Compose {project}",
+  "Could not restart Compose project {project}": "No se pudo reiniciar el proyecto de Compose {project}",
+  "Could not take down Compose project {project}": "No se pudo dar de baja el proyecto de Compose {project}",
+  "Stage hunk of {path}": "Preparar (stage) bloque de {path}",
+  "{path} reverted": "{path} revertido",
+  "{length} files reverted": "{length} archivos revertidos",
+  "Resolve {path}": "Resolver {path}",
+  "{path}: conflicts resolved": "{path}: conflictos resueltos",
+  "Create branch {value}": "Crear rama {value}",
+  "Merge {branch} into {current}": "Fusionar {branch} en {current}",
+  "Merged {branch} into {current}": "Se fusionó {branch} en {current}",
+  "Rebase {current} onto {branch}": "Hacer rebase de {current} sobre {branch}",
+  "Rebased {current} onto {branch}": "Se hizo rebase de {current} sobre {branch}",
+  "Rename branch {name}": "Renombrar rama {name}",
+  "Renamed branch {name} to {to}": "Se renombró la rama {name} a {to}",
+  "Delete branch {name}": "Eliminar rama {name}",
+  "Restore branch {name}": "Restaurar rama {name}",
+  "Merge {branch} ({root})": "Fusionar {branch} ({root})",
+  "Rebase onto {branch} ({root})": "Hacer rebase sobre {branch} ({root})",
+  "Delete branch {name} ({root})": "Eliminar rama {name} ({root})",
+  "1 file amended in {several} repositories": "1 archivo enmendado en {several} repositorios",
+  "{n} files amended in {several} repositories": "{n} archivos enmendados en {several} repositorios",
+  "1 file amended": "1 archivo enmendado",
+  "{n} files amended": "{n} archivos enmendados",
+  "1 file committed in {several} repositories": "1 archivo confirmado en {several} repositorios",
+  "{n} files committed in {several} repositories": "{n} archivos confirmados en {several} repositorios",
+  "1 file committed": "1 archivo confirmado",
+  "{n} files committed": "{n} archivos confirmados",
+  "Rolled back 1 file": "Se revirtió 1 archivo",
+  "Rolled back {length} files": "Se revirtieron {length} archivos",
+  "Add 1 file to Git": "Agregar 1 archivo a Git",
+  "Add {length} files to Git": "Agregar {length} archivos a Git",
+  "Stash changes": "Guardar cambios en stash",
+  "Changes stashed": "Cambios guardados en stash",
+  "Unstashed {ref} on branch {branch}": "Se restauró {ref} del stash en la rama {branch}",
+  "Unstashed {ref}": "Se restauró {ref} del stash",
+  "Applied {ref}": "Se aplicó {ref}",
+  "Dropped {ref}": "Se descartó {ref}",
+  "Remove 1 file from Git": "Quitar 1 archivo de Git",
+  "Remove {n} files from Git": "Quitar {n} archivos de Git",
+  "Accept yours for {path}": "Aceptar los suyos para {path}",
+  "Accept theirs for {path}": "Aceptar los de ellos para {path}",
+  "{path} resolved": "{path} resuelto",
+  "Revert selected changes": "Revertir cambios seleccionados",
+  "Create tag {value}": "Crear etiqueta {value}",
+  "Created tag {value} on {id}": "Se creó la etiqueta {value} en {id}",
+  "Created tag {tag}": "Se creó la etiqueta {tag}",
+  "Create patch": "Crear parche",
+  "Apply patch ({source})": "Aplicar parche ({source})",
+  "Undo commit {id}": "Deshacer confirmación {id}",
+  "Undid commit {id} “{summary}”; its changes are staged": "Se deshizo la confirmación {id} “{summary}”; sus cambios están preparados (staged)",
+  "Shelve changes “{trim}”": "Guardar cambios en el shelf “{trim}”",
+  "Unshelve “{name}”": "Restaurar “{name}” del shelf",
+  "Delete shelved changes “{name}”": "Eliminar cambios del shelf “{name}”",
+  "Rename shelved changes": "Renombrar cambios del shelf",
+  "Passed to the agent process, replacing variables of the same name. Changes apply to new sessions.": "Se pasa al proceso del agente, reemplazando variables con el mismo nombre. Los cambios se aplican a las sesiones nuevas.",
+  "Expected NAME=value: {pair}": "Se esperaba NOMBRE=valor: {pair}",
+  "Checking out #{number}…": "Cambiando a #{number}…",
+  "Couldn't check out #{number}": "No se pudo cambiar a #{number}",
+  "Fetching #{number}…": "Obteniendo (fetch) #{number}…",
+  "Couldn't fetch #{number}": "No se pudo obtener #{number}",
+  "Creating worktree for #{number}…": "Creando árbol de trabajo para #{number}…",
+  "Couldn't create the worktree for #{number}": "No se pudo crear el árbol de trabajo para #{number}",
+  "Couldn't commit the suggested change": "No se pudo confirmar el cambio sugerido",
+  "Couldn't apply the suggested change": "No se pudo aplicar el cambio sugerido",
+  "Couldn't resolve the thread": "No se pudo resolver el hilo",
+  "Could not close comparison": "No se pudo cerrar la comparación",
+  "Could not open comparison": "No se pudo abrir la comparación",
+  "Could not show diff": "No se pudieron mostrar las diferencias",
+  "Back to Changed Files": "Volver a Archivos modificados",
+  "Default (the module's JDK)": "Predeterminado (el JDK del módulo)",
+  "Use classpath of module": "Usar classpath del módulo",
+  "Find by main class": "Buscar por clase principal",
+  "Pull Members Up…": "Subir miembros (Pull Up)…",
+  "Push Members Down…": "Bajar miembros (Push Down)…",
+  "Pull Members Up": "Subir miembros (Pull Up)",
+  "Push Members Down": "Bajar miembros (Push Down)",
+  "Caret should be inside a class that has members to pull up": "El cursor debe estar dentro de una clase que tenga miembros para subir",
+  "Caret should be inside a class that has members to push down": "El cursor debe estar dentro de una clase que tenga miembros para bajar",
+  "Problems Detected": "Problemas detectados",
+  "Nothing to change": "Nada que cambiar",
+  "Pull Members Up from '{name}'": "Subir miembros de '{name}'",
+  "Push Members Down from '{name}'": "Bajar miembros de '{name}'",
+  "Pull up members of {name} to:": "Subir miembros de {name} a:",
+  "Push members of {name} down to:": "Bajar miembros de {name} a:",
+  "Checking for conflicts…": "Comprobando conflictos…",
+  "Destination class": "Clase de destino",
+  "Members to be pulled up": "Miembros que se subirán",
+  "Members to be pushed down": "Miembros que se bajarán",
+  "Member": "Miembro",
+  "Make abstract": "Hacer abstracto",
+  "Keep abstract": "Mantener abstracto",
+  "Methods pulled up to an interface are declared abstract there.": "Los métodos que se suben a una interfaz se declaran abstractos allí.",
+  "The file changed; open the dialog again": "El archivo cambió; vuelva a abrir el cuadro de diálogo",
+  "Type search query to find in files": "Escriba la consulta de búsqueda para buscar en archivos",
+  "Invalid pattern": "Patrón no válido",
+  "Searching…": "Buscando…",
+  "No search text entered": "No se ingresó texto de búsqueda",
+  "Search with Regex": "Buscar con expresión regular",
+  "Search option used: {label}": "Opción de búsqueda utilizada: {label}",
+  "Search options used:": "Opciones de búsqueda utilizadas:",
+  "Clear option": "Limpiar opción",
+  "Clear all options": "Limpiar todas las opciones",
+  "Open results in new tab": "Abrir resultados en una pestaña nueva",
+  "Use {next} and {previous} to select usages": "Use {next} y {previous} para seleccionar usos",
+  "Replace preview": "Vista previa de reemplazo",
+  "Bookmarked Commits": "Confirmaciones marcadas",
+  "Open Another Log Tab": "Abrir otra pestaña de registro",
+  "In Tool Window": "En ventana de herramientas",
+  "In Editor": "En el editor",
+  "External Repository…": "Repositorio externo…",
+  "Recent Filters": "Filtros recientes",
+  "All commits": "Todas las confirmaciones",
+  "Incoming Commits First": "Confirmaciones entrantes primero",
+  "Linearize Merges": "Linealizar fusiones",
+  "Remove Commit Bookmark": "Quitar marcador de confirmación",
+  "Bookmark Commit": "Marcar confirmación",
+  "Browse Repository at Revision": "Explorar repositorio en la revisión",
+  "Signature": "Firma",
+  "Commit is outside the loaded history": "La confirmación está fuera del historial cargado",
+  "Move Left": "Mover a la izquierda",
+  "Move Right": "Mover a la derecha",
+  "Reset Width": "Restablecer ancho",
+  "Resize {title} column": "Redimensionar columna {title}",
+  "Commit graph": "Gráfico de confirmaciones",
+  "Go to connected commit": "Ir a la confirmación conectada",
+  "Expand this fragment": "Expandir este fragmento",
+  "Collapse this fragment": "Contraer este fragmento",
+  "Collapse or expand this branch": "Contraer o expandir esta rama",
+  "Diff Preview Location": "Ubicación de la vista previa de diferencias",
+  "Parent": "Padre",
+  "Commit {shortId}": "Confirmación {shortId}",
+  "Expand Commit Message": "Expandir mensaje de confirmación",
+  "Committed by": "Confirmado por",
+  "Merge of": "Fusión de",
+  "Containing branches": "Ramas que lo contienen",
+  "Could not load containing branches or signature details": "No se pudieron cargar las ramas que lo contienen o los detalles de la firma",
+  "Could not verify": "No se pudo verificar",
+  "Choose an absolute path inside a selected repository.": "Elija una ruta absoluta dentro de un repositorio seleccionado.",
+  "Filter by Paths": "Filtrar por rutas",
+  "Files and folders": "Archivos y carpetas",
+  "Additional absolute path": "Ruta absoluta adicional",
+  "Selected paths": "Rutas seleccionadas",
+  "Open Git Log": "Abrir registro de Git",
+  "Could not open Git log": "No se pudo abrir el registro de Git",
+  "Search repository files": "Buscar archivos del repositorio",
+  "Repository files": "Archivos del repositorio",
+  "Open Revision in Editor": "Abrir revisión en el editor",
+  "Open External Git Log…": "Abrir registro de Git externo…",
+  "Repository at {slice}": "Repositorio en {slice}",
+  "Select a file to view its repository version": "Seleccione un archivo para ver su versión del repositorio",
+  "Branches, patterns, exclusions or ranges (comma-separated):": "Ramas, patrones, exclusiones o rangos (separados por comas):",
+  "Select Parent Commit": "Seleccionar confirmación padre",
+  "Select Child Commit": "Seleccionar confirmación hija",
+  "Select Repository Commit": "Seleccionar confirmación del repositorio",
+  "Good signature with unknown trust": "Firma válida con confianza desconocida",
+  "Bad signature": "Firma incorrecta",
+  "Expired signature": "Firma expirada",
+  "Expired signing key": "Clave de firma expirada",
+  "Revoked signing key": "Clave de firma revocada",
+  "Load Newer Commits": "Cargar confirmaciones más recientes",
+  "Shallow history boundary": "Límite de historial superficial (shallow)",
+  "All Parents": "Todos los padres",
+  "Show Commit Bookmark": "Mostrar marcador de confirmación",
+  "Indexing Git log: {indexed} / {total}": "Indexando registro de Git: {indexed} / {total}",
+  "Resume Indexing": "Reanudar indexación",
+  "Pause Indexing": "Pausar indexación",
+  "Incompatible": "Incompatible",
+  "Needs plugin API {engine}. Update OpenIDEA to install it.": "Requiere la API de plugins {engine}. Actualice OpenIDEA para instalarlo.",
+  "Icon Themes": "Temas de iconos",
+  "Linters & Formatters": "Linters y formateadores",
+  "AI": "IA",
+  "Frameworks": "Frameworks",
+  "All Categories": "Todas las categorías",
+  "Category": "Categoría",
+  "Update All Plugins": "Actualizar todos los plugins",
+  "Update All Plugins ({updates})": "Actualizar todos los plugins ({updates})",
+  "Update All": "Actualizar todo",
+  "Show Plugins": "Mostrar plugins",
+  "Plugin update available": "Actualización de plugin disponible",
+  "{length} plugin updates available": "{length} actualizaciones de plugins disponibles",
+  "Updated {updated} plugins": "Se actualizaron {updated} plugins",
+  "This version is signed with a different key than the installed one, and the publisher's earlier key doesn't vouch for it. Only continue if you know the publisher changed keys.": "Esta versión está firmada con una clave diferente a la instalada y la clave anterior del editor no la avala. Continúe solo si sabe que el editor cambió de clave."
+}
diff --git a/src/platform/locales/text/fr.json b/src/platform/locales/text/fr.json
index 64a26e97..c72eb66c 100644
--- a/src/platform/locales/text/fr.json
+++ b/src/platform/locales/text/fr.json
@@ -787,7 +787,6 @@
   "File name with extension": "Nom du fichier avec extension",
   "File name without extension": "Nom du fichier sans extension",
   "File not found": "Fichier introuvable",
-  "File or folder": "Fichier ou dossier",
   "File patterns": "Motifs de fichiers",
   "File templates": "Modèles de fichiers",
   "File:": "Fichier :",
@@ -803,7 +802,6 @@
   "Filter TODO Items": "Filtrer les éléments TODO",
   "Filter by Branch": "Filtrer par branche",
   "Filter by Date": "Filtrer par date",
-  "Filter by Path": "Filtrer par chemin",
   "Filter by User": "Filtrer par utilisateur",
   "Filter by message": "Filtrer par message",
   "Filter by name, PID or command line": "Filtrer par nom, PID ou ligne de commande",
@@ -1393,7 +1391,6 @@
   "Other File Types": "Autres types de fichiers",
   "Other hints (chaining, closing labels…)": "Autres indications (chaînage, libellés de fermeture…)",
   "Other names or emails (comma-separated):": "Autres noms ou e-mails (séparés par des virgules) :",
-  "Other revisions (comma-separated):": "Autres révisions (séparées par des virgules) :",
   "Otherwise line breakpoints can only be set in files of languages that have a debugger.": "Sinon, les points d'arrêt de ligne ne peuvent être posés que dans les fichiers de langages dotés d'un débogueur.",
   "Outgoing commits": "Commits sortants",
   "Output": "Sortie",
@@ -1672,7 +1669,6 @@
   "Reopen projects on startup": "Rouvrir les projets au démarrage",
   "Replace": "Remplacer",
   "Replace All": "Tout remplacer",
-  "Replace All in This File": "Tout remplacer dans ce fichier",
   "Replace Preview": "Aperçu du remplacement",
   "Replace Selected": "Remplacer la sélection",
   "Replace Structurally": "Remplacement structurel",
@@ -1682,7 +1678,6 @@
   "Replace in Files": "Remplacer dans les fichiers",
   "Replace in Files…": "Remplacer dans les fichiers…",
   "Replace in file": "Remplacer dans le fichier",
-  "Replace preview": "Aperçu du remplacement",
   "Replace template": "Modèle de remplacement",
   "Replace this occurrence only": "Remplacer cette occurrence uniquement",
   "Replace with": "Remplacer par",
@@ -1815,11 +1810,11 @@
   "Runs Maven with -o": "Exécute Maven avec -o",
   "Runs Optimize Imports when the file has no errors, unless it would change the caret line.": "Exécute Optimiser les imports lorsque le fichier ne contient pas d'erreur, sauf si cela modifie la ligne du curseur.",
   "Runs npm scripts and Node-based language servers (vtsls, eslint, pyright…).": "Exécute les scripts npm et les serveurs de langage basés sur Node (vtsls, eslint, pyright…).",
-  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw.": "Exécute la synchronisation, les builds et les configurations d'exécution Maven. Un répertoire choisi remplace le mvnw du projet.",
+  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw. Bypassed while the Maven daemon is enabled.": "Exécute la synchronisation, les builds et les configurations d'exécution Maven. Un répertoire choisi remplace le mvnw du projet. Ignoré lorsque le démon Maven est activé.",
   "Runs the language server's Organize Imports action.": "Exécute l'action Organiser les imports du serveur de langage.",
   "Runs the language server's formatter before an explicit save (Actions on Save).": "Exécute le formateur du serveur de langage avant un enregistrement explicite (Actions à l'enregistrement).",
   "Search history": "Historique de recherche",
-  "Search history (⌥↑ / ⌥↓)": "Historique de recherche (⌥↑ / ⌥↓)",
+  "Search history ({previous} / {next})": "Historique de recherche ({previous} / {next})",
   "Searching for usages of '{symbol}'": "Recherche des utilisations de '{symbol}'",
   "SQL completion": "Complétion SQL",
   "SQL Inserts": "Insertions SQL",
@@ -1859,7 +1854,6 @@
   "Search frames": "Rechercher des cadres",
   "Search in comments and strings": "Rechercher dans les commentaires et les chaînes",
   "Search installed plugins": "Rechercher parmi les plugins installés",
-  "Search local plugins": "Rechercher parmi les plugins locaux",
   "Search packages": "Rechercher des paquets",
   "Search projects": "Rechercher des projets",
   "Search pull requests": "Rechercher des pull requests",
@@ -2441,8 +2435,7 @@
   "{name} has unsaved changes": "{name} contient des modifications non enregistrées",
   "{name} installed": "{name} installé",
   "{name} is not installed": "{name} n'est pas installé",
-  "↵ Open · ⇧↵ Open to the side · ⌘↵ Open in Find Window": "↵ Ouvrir · ⇧↵ Ouvrir sur le côté · ⌘↵ Ouvrir dans la fenêtre de recherche",
-  "⌘↵ to open in Find tool window": "⌘↵ pour ouvrir dans la fenêtre d'outil Recherche",
+  "{key} to open in Find tool window": "{key} pour ouvrir dans la fenêtre d'outil Recherche",
   "⌥← / ⌥→ and ⌥⌫ stop at humps of camelCase names.": "⌥← / ⌥→ et ⌥⌫ s'arrêtent aux bosses des noms en camelCase.",
   "Specify commit message": "Saisir le message de commit",
   "Author:": "Auteur :",
@@ -2540,7 +2533,6 @@
   "Except Comments and String Literals": "Sauf les commentaires et les chaînes littérales",
   "Recent Replacements": "Remplacements récents",
   "No recent replacements": "Aucun remplacement récent",
-  "↵ Replace Selected · ⇧⌥↵ Replace All · ⌘↵ Open in Find Window": "↵ Remplacer la sélection · ⇧⌥↵ Tout remplacer · ⌘↵ Ouvrir dans la fenêtre de recherche",
   "Replace {count} Occurrences": "Remplacer {count} occurrences",
   "Add Mnemonic Bookmark": "Ajouter un signet mnémonique",
   "Change Mnemonic": "Modifier le mnémonique",
@@ -2599,7 +2591,7 @@
   "No remotes": "Aucun dépôt distant",
   "Include disabled actions": "Inclure les actions désactivées",
   "Symbol Kinds": "Types de symboles",
-  "⌥↵ to assign a shortcut": "⌥↵ pour attribuer un raccourci",
+  "{key} to assign a shortcut": "{key} pour attribuer un raccourci",
   "Open Settings Page": "Ouvrir la page de paramètres",
   "Assign Shortcut…": "Attribuer un raccourci…",
   "New List…": "Nouvelle liste…",
@@ -2652,10 +2644,10 @@
   "Search Scope": "Portée de la recherche",
   "Filter Search Results": "Filtrer les résultats de recherche",
   "Filter search results": "Filtrer les résultats de recherche",
-  "Replace (⌥P)": "Remplacer (⌥P)",
-  "Replace All (⌥A)": "Tout remplacer (⌥A)",
-  "Include (⌥L)": "Inclure (⌥L)",
-  "Exclude (⌥L)": "Exclure (⌥L)",
+  "Replace ({key})": "Remplacer ({key})",
+  "Replace All ({key})": "Tout remplacer ({key})",
+  "Include ({key})": "Inclure ({key})",
+  "Exclude ({key})": "Exclure ({key})",
   "Recent searches": "Recherches récentes",
   "New Line": "Nouvelle ligne",
   "New Line in Search Field": "Nouvelle ligne dans le champ de recherche",
@@ -3385,7 +3377,7 @@
   "Not installed": "Non installé",
   "{command} was not found on PATH": "{command} est introuvable dans le PATH",
   "Agent tasks": "Tâches d'agent",
-  "Describe a task for the agent. @ references a file, / runs a command": "Décrivez une tâche pour l'agent. @ référence un fichier, / lance une commande",
+  "Describe a task for the agent. @ references a file or folder, / runs a command": "Décrivez une tâche pour l'agent. @ référence un fichier ou un dossier, / lance une commande",
   "away from your changes": "à l'écart de vos modifications",
   "edits your files directly": "modifie directement vos fichiers",
   "from": "depuis",
@@ -3660,7 +3652,6 @@
   "Godot command line options, e.g. --debug-collisions": "Options de ligne de commande Godot, p. ex. --debug-collisions",
   "Bookmark description": "Description du signet",
   "Cannot open {path}": "Impossible d'ouvrir {path}",
-  "Replace All (⇧⌥↵, ⌥A)": "Tout remplacer (⇧⌥↵, ⌥A)",
   "Search context": "Contexte de recherche",
   "not": "non",
   "and": "et",
@@ -4284,24 +4275,15 @@
   "Delete {n} items from the server?": "Supprimer {n} éléments du serveur ?",
   "Not mapped to a project path": "Non associé à un chemin du projet",
   "Unknown Host Key": "Clé d'hôte inconnue",
-  "Sync with {server}": "Synchroniser avec {server}",
-  "Hide identical files ({n})": "Masquer les fichiers identiques ({n})",
-  "Synchronize": "Synchroniser",
   "{n} of {total} files will change": "{n} fichiers sur {total} seront modifiés",
   "Comparing local and remote files…": "Comparaison des fichiers locaux et distants…",
   "Files to synchronize": "Fichiers à synchroniser",
   "Action": "Action",
-  "Local size": "Taille locale",
-  "Local modified": "Modification locale",
-  "Remote size": "Taille distante",
-  "Remote modified": "Modification distante",
-  "Local and remote files are identical": "Les fichiers locaux et distants sont identiques",
   "Synchronizing…": "Synchronisation…",
   "Local only": "Local uniquement",
   "Remote only": "Distant uniquement",
   "Local is newer": "Le local est plus récent",
   "Remote is newer": "Le distant est plus récent",
-  "Different size": "Taille différente",
   "Identical": "Identique",
   "Upload": "Envoyer",
   "Delete remote": "Supprimer le distant",
@@ -4354,7 +4336,6 @@
   "partial": "partiel",
   "editable": "modifiable",
   "on {date}": "le {date}",
-  "Merge of {parents}": "Fusion de {parents}",
   "renamed from {name}": "renommé depuis {name}",
   "Label '{label}'": "Étiquette '{label}'",
   "{n} file recorded before it": "{n} fichier enregistré avant",
@@ -4415,7 +4396,6 @@
   "Memory & Diagnostics": "Mémoire et diagnostics",
   "Over budget ({budget})": "Budget dépassé ({budget})",
   "dev": "dev",
-  "{label}. Showing plugin packages available on this machine.": "{label}. Affichage des packages de plugins disponibles sur cette machine.",
   "Zoomed into {name}": "Zoom sur {name}",
   "Rename directory '{current}' and its usages to:": "Renommer le répertoire '{current}' et ses utilisations en :",
   "Rename file '{current}' and its usages to:": "Renommer le fichier '{current}' et ses utilisations en :",
@@ -4528,7 +4508,6 @@
   "Rebase commits of {head} not on:": "Rebaser les commits de {head} absents de :",
   "{head} has no upstream: commits up to {revision} will be pushed as a new branch:": "{head} n'a pas de branche amont : les commits jusqu'à {revision} seront poussés comme nouvelle branche :",
   "{head} has no upstream: it will be pushed as a new branch and tracked:": "{head} n'a pas de branche amont : elle sera poussée comme nouvelle branche et suivie :",
-  "{count} matches in {files} files": "{count} correspondances dans {files} fichiers",
   "{count} excluded": "{count} exclus",
   "{count} file with conflicts": "{count} fichier en conflit",
   "{count} files with conflicts": "{count} fichiers en conflit",
@@ -5503,7 +5482,7 @@
   "oxfmt formatting failed": "Échec du formatage avec oxfmt",
   "oxfmt formatting timed out": "Le formatage avec oxfmt a expiré",
   "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.": "Ce fichier est en dehors des dossiers sources de son module Java : seules les erreurs de syntaxe sont signalées, et la navigation et la complétion ne fonctionnent pas.",
-  "This file does not belong to an imported Java project: only syntax errors are reported, and navigation and completion don't work.": "Ce fichier n'appartient à aucun projet Java importé : seules les erreurs de syntaxe sont signalées, et la navigation et la complétion ne fonctionnent pas.",
+  "This file does not belong to an imported Java project: only syntax errors are reported, and only JDK classes resolve.": "Ce fichier n'appartient à aucun projet Java importé : seules les erreurs de syntaxe sont signalées, et seules les classes du JDK sont résolues.",
   "This Go file belongs to no package of the workspace: code insight is limited.": "Ce fichier Go n'appartient à aucun paquet de l'espace de travail : l'analyse du code est limitée.",
   "This Rust file is not included in any crate: rust-analyzer can't offer code insight for it.": "Ce fichier Rust n'est inclus dans aucune crate : rust-analyzer ne peut pas proposer d'analyse du code pour celui-ci.",
   "Reload Maven Projects": "Recharger les projets Maven",
@@ -5557,8 +5536,6 @@
   "Unsigned": "Non signé",
   "Roll Back to {previousVersion}": "Revenir à {previousVersion}",
   "Install Plugin from Package File…": "Installer un plugin depuis un fichier de paquet…",
-  "Marketplace index URL": "URL de l'index de la marketplace",
-  "Refresh Marketplace": "Actualiser la marketplace",
   "The plugin system is a preview: its API and the plugins may still change.": "Le système de plugins est en préversion : son API et les plugins peuvent encore changer.",
   "Linked for development": "Lié pour le développement",
   "Marketplace": "Marketplace",
@@ -5781,6 +5758,18 @@
   "{name}: {error}": "{name} : {error}",
   "unsupported clipboard media type": "type de média du presse-papiers non pris en charge",
   "Select PHP Interpreter": "Sélectionner l'interpréteur PHP",
+  "PHP language level": "Niveau de langage PHP",
+  "The PHP version Intelephense checks the code against: newer syntax and functions are reported. Auto uses config.platform.php from composer.json, else the lowest version require.php allows.": "La version de PHP par rapport à laquelle Intelephense vérifie le code : la syntaxe et les fonctions plus récentes sont signalées. Auto utilise config.platform.php de composer.json, sinon la version la plus basse autorisée par require.php.",
+  "from composer.json": "depuis composer.json",
+  "PHP Language Level": "Niveau de langage PHP",
+  "PHP Language Level: {label}": "Niveau de langage PHP : {label}",
+  "Select PHP Language Level": "Sélectionner le niveau de langage PHP",
+  "Cannot select PHP language level": "Impossible de sélectionner le niveau de langage PHP",
+  "No PHP version in the settings or composer.json: Intelephense uses its default": "Aucune version de PHP dans les paramètres ni dans composer.json : Intelephense utilise sa version par défaut",
+  "PHP {version}, set in the settings": "PHP {version}, défini dans les paramètres",
+  "PHP {version}, from config.platform.php in composer.json": "PHP {version}, depuis config.platform.php de composer.json",
+  "PHP {version}, the lowest version require.php in composer.json allows": "PHP {version}, la version la plus basse autorisée par require.php de composer.json",
+  "Set in the settings of the linked project {name}": "Défini dans les paramètres du projet lié {name}",
   "select files in a git repository to shelve": "sélectionnez les fichiers d'un dépôt git à mettre de côté",
   "select files from a single git repository to shelve": "sélectionnez les fichiers d'un seul dépôt git à mettre de côté",
   "External file changes sync may be slow": "La synchronisation des modifications externes de fichiers peut être lente",
@@ -5791,7 +5780,28 @@
   "Weekly limit": "Limite hebdomadaire",
   "Weekly Opus limit": "Limite hebdomadaire Opus",
   "Weekly Sonnet limit": "Limite hebdomadaire Sonnet",
-  "Marketplace index URL (https://…/index.json or a folder path)": "URL de l'index de la marketplace (https://…/index.json ou un chemin de dossier)",
   "Editor Providers": "Fournisseurs d'éditeurs",
-  "Syntax errors": "Erreurs de syntaxe"
+  "Syntax errors": "Erreurs de syntaxe",
+  "Pull Members Up…": "Remonter les membres…",
+  "Push Members Down…": "Descendre les membres…",
+  "Pull Members Up": "Remonter les membres",
+  "Push Members Down": "Descendre les membres",
+  "Caret should be inside a class that has members to pull up": "Le curseur doit se trouver dans une classe ayant des membres à remonter",
+  "Caret should be inside a class that has members to push down": "Le curseur doit se trouver dans une classe ayant des membres à descendre",
+  "Problems Detected": "Problèmes détectés",
+  "Nothing to change": "Rien à modifier",
+  "Pull Members Up from '{name}'": "Remonter les membres de '{name}'",
+  "Push Members Down from '{name}'": "Descendre les membres de '{name}'",
+  "Pull up members of {name} to:": "Remonter les membres de {name} vers :",
+  "Push members of {name} down to:": "Descendre les membres de {name} vers :",
+  "Checking for conflicts…": "Recherche de conflits…",
+  "Destination class": "Classe de destination",
+  "Members to be pulled up": "Membres à remonter",
+  "Members to be pushed down": "Membres à descendre",
+  "Member": "Membre",
+  "Make abstract": "Rendre abstrait",
+  "Keep abstract": "Garder abstrait",
+  "Methods pulled up to an interface are declared abstract there.": "Les méthodes remontées dans une interface y sont déclarées abstraites.",
+  "The file changed; open the dialog again": "Le fichier a changé ; rouvrez la boîte de dialogue",
+  "Replace preview": "Aperçu du remplacement"
 }
diff --git a/src/platform/locales/text/ko.json b/src/platform/locales/text/ko.json
index 18d7826c..893c520c 100644
--- a/src/platform/locales/text/ko.json
+++ b/src/platform/locales/text/ko.json
@@ -847,7 +847,6 @@
   "File name with extension": "확장자를 포함한 파일 이름",
   "File name without extension": "확장자를 제외한 파일 이름",
   "File not found": "파일을 찾을 수 없습니다",
-  "File or folder": "파일 또는 폴더",
   "File patterns": "파일 패턴",
   "File templates": "파일 템플릿",
   "File:": "파일:",
@@ -863,7 +862,6 @@
   "Filter TODO Items": "TODO 항목 필터링",
   "Filter by Branch": "브랜치별 필터링",
   "Filter by Date": "날짜별 필터링",
-  "Filter by Path": "경로별 필터링",
   "Filter by User": "사용자별 필터링",
   "Filter by message": "메시지별 필터링",
   "Filter by name, PID or command line": "이름, PID 또는 명령줄로 필터링",
@@ -1453,7 +1451,6 @@
   "Other File Types": "기타 파일 유형",
   "Other hints (chaining, closing labels…)": "기타 힌트(체이닝, 닫는 레이블…)",
   "Other names or emails (comma-separated):": "기타 이름 또는 이메일(쉼표로 구분):",
-  "Other revisions (comma-separated):": "기타 리비전(쉼표로 구분):",
   "Otherwise line breakpoints can only be set in files of languages that have a debugger.": "그렇지 않으면 디버거가 있는 언어의 파일에서만 줄 중단점을 설정할 수 있습니다.",
   "Outgoing commits": "나가는 커밋",
   "Output": "출력",
@@ -1747,7 +1744,6 @@
   "Reopen projects on startup": "시작 시 프로젝트 다시 열기",
   "Replace": "바꾸기",
   "Replace All": "모두 바꾸기",
-  "Replace All in This File": "이 파일에서 모두 바꾸기",
   "Replace Preview": "바꾸기 미리 보기",
   "Replace Selected": "선택 항목 바꾸기",
   "Replace Structurally": "구조적 바꾸기",
@@ -1757,7 +1753,6 @@
   "Replace in Files": "파일에서 바꾸기",
   "Replace in Files…": "파일에서 바꾸기…",
   "Replace in file": "파일에서 바꾸기",
-  "Replace preview": "바꾸기 미리 보기",
   "Replace template": "바꾸기 템플릿",
   "Replace this occurrence only": "이 항목만 바꾸기",
   "Replace with": "바꿀 내용",
@@ -1893,11 +1888,11 @@
   "Runs Maven with -o": "-o로 Maven을 실행합니다",
   "Runs Optimize Imports when the file has no errors, unless it would change the caret line.": "파일에 오류가 없으면 import 최적화를 실행합니다. 단, 캐럿 줄이 변경되는 경우는 제외합니다.",
   "Runs npm scripts and Node-based language servers (vtsls, eslint, pyright…).": "npm 스크립트와 Node 기반 언어 서버(vtsls, eslint, pyright…)를 실행합니다.",
-  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw.": "동기화, 빌드 및 Maven 실행 구성을 실행합니다. 선택한 홈이 프로젝트의 mvnw 대신 사용됩니다.",
+  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw. Bypassed while the Maven daemon is enabled.": "동기화, 빌드 및 Maven 실행 구성을 실행합니다. 선택한 홈이 프로젝트의 mvnw 대신 사용됩니다. Maven 데몬이 활성화되어 있으면 사용되지 않습니다.",
   "Runs the language server's Organize Imports action.": "언어 서버의 import 정리 액션을 실행합니다.",
   "Runs the language server's formatter before an explicit save (Actions on Save).": "명시적으로 저장하기 전에 언어 서버의 포매터를 실행합니다(저장 시 액션).",
   "Search history": "검색 기록",
-  "Search history (⌥↑ / ⌥↓)": "검색 기록(⌥↑ / ⌥↓)",
+  "Search history ({previous} / {next})": "검색 기록({previous} / {next})",
   "Searching for usages of '{symbol}'": "'{symbol}'의 사용 위치 검색 중",
   "SQL completion": "SQL 완성",
   "SQL Inserts": "SQL Insert 문",
@@ -1937,7 +1932,6 @@
   "Search frames": "프레임 검색",
   "Search in comments and strings": "주석 및 문자열에서 검색",
   "Search installed plugins": "설치된 플러그인 검색",
-  "Search local plugins": "로컬 플러그인 검색",
   "Search packages": "패키지 검색",
   "Search projects": "프로젝트 검색",
   "Search pull requests": "풀 리퀘스트 검색",
@@ -2027,6 +2021,12 @@
   "Show Hidden Tabs": "숨겨진 탭 표시",
   "Show History": "기록 표시",
   "Show History for File": "파일 기록 표시",
+  "Show History for Selection": "선택 영역 기록 표시",
+  "History for Selection": "선택 영역 기록",
+  "Open a file to show the history of its selection": "선택 영역의 기록을 보려면 파일을 여세요",
+  "No commits changed these lines": "이 줄을 변경한 커밋이 없습니다",
+  "These lines are not committed yet": "이 줄은 아직 커밋되지 않았습니다",
+  "Not Committed Yet": "아직 커밋되지 않음",
   "Show Ignored": "무시된 항목 표시",
   "Show Infos and Hints": "정보 및 힌트 표시",
   "Show Local History": "로컬 기록 표시",
@@ -2521,8 +2521,7 @@
   "{name} has unsaved changes": "{name}에 저장되지 않은 변경 사항이 있습니다",
   "{name} installed": "{name} 설치됨",
   "{name} is not installed": "{name}이(가) 설치되어 있지 않습니다",
-  "↵ Open · ⇧↵ Open to the side · ⌘↵ Open in Find Window": "↵ 열기 · ⇧↵ 옆에 열기 · ⌘↵ 찾기 창에서 열기",
-  "⌘↵ to open in Find tool window": "⌘↵ 찾기 도구 창에서 열기",
+  "{key} to open in Find tool window": "{key} 찾기 도구 창에서 열기",
   "⌥← / ⌥→ and ⌥⌫ stop at humps of camelCase names.": "⌥← / ⌥→ 및 ⌥⌫가 camelCase 이름의 대문자 경계에서 멈춥니다.",
   "Specify commit message": "커밋 메시지를 입력하세요",
   "Author:": "작성자:",
@@ -2620,7 +2619,6 @@
   "Except Comments and String Literals": "주석 및 문자열 리터럴 제외",
   "Recent Replacements": "최근 바꾸기",
   "No recent replacements": "최근 바꾸기 없음",
-  "↵ Replace Selected · ⇧⌥↵ Replace All · ⌘↵ Open in Find Window": "↵ 선택 항목 바꾸기 · ⇧⌥↵ 모두 바꾸기 · ⌘↵ 찾기 창에서 열기",
   "Replace {count} Occurrences": "{count}개 항목 바꾸기",
   "Add Mnemonic Bookmark": "니모닉 북마크 추가",
   "Change Mnemonic": "니모닉 변경",
@@ -2679,7 +2677,7 @@
   "No remotes": "원격 없음",
   "Include disabled actions": "비활성화된 액션 포함",
   "Symbol Kinds": "심볼 종류",
-  "⌥↵ to assign a shortcut": "⌥↵ 단축키 할당",
+  "{key} to assign a shortcut": "{key} 단축키 할당",
   "Open Settings Page": "설정 페이지 열기",
   "Assign Shortcut…": "단축키 할당…",
   "New List…": "새 목록…",
@@ -2732,10 +2730,10 @@
   "Search Scope": "검색 범위",
   "Filter Search Results": "검색 결과 필터링",
   "Filter search results": "검색 결과 필터링",
-  "Replace (⌥P)": "바꾸기(⌥P)",
-  "Replace All (⌥A)": "모두 바꾸기(⌥A)",
-  "Include (⌥L)": "포함(⌥L)",
-  "Exclude (⌥L)": "제외(⌥L)",
+  "Replace ({key})": "바꾸기({key})",
+  "Replace All ({key})": "모두 바꾸기({key})",
+  "Include ({key})": "포함({key})",
+  "Exclude ({key})": "제외({key})",
   "Recent searches": "최근 검색",
   "New Line": "새 줄",
   "New Line in Search Field": "검색 필드에 새 줄",
@@ -3492,7 +3490,7 @@
   "Not installed": "설치되지 않음",
   "{command} was not found on PATH": "PATH에서 {command}을(를) 찾을 수 없습니다",
   "Agent tasks": "에이전트 작업",
-  "Describe a task for the agent. @ references a file, / runs a command": "에이전트에게 맡길 작업을 설명하세요. @는 파일 참조, /는 명령 실행",
+  "Describe a task for the agent. @ references a file or folder, / runs a command": "에이전트에게 맡길 작업을 설명하세요. @는 파일·폴더 참조, /는 명령 실행",
   "away from your changes": "변경 사항과 분리됨",
   "edits your files directly": "파일을 직접 편집함",
   "from": "기준",
@@ -3767,7 +3765,6 @@
   "Godot command line options, e.g. --debug-collisions": "Godot 명령줄 옵션, 예: --debug-collisions",
   "Bookmark description": "북마크 설명",
   "Cannot open {path}": "{path}을(를) 열 수 없습니다",
-  "Replace All (⇧⌥↵, ⌥A)": "모두 바꾸기(⇧⌥↵, ⌥A)",
   "Search context": "검색 컨텍스트",
   "not": "아님",
   "and": "그리고",
@@ -4395,24 +4392,15 @@
   "Delete {n} items from the server?": "서버에서 항목 {n}개를 삭제하시겠습니까?",
   "Not mapped to a project path": "프로젝트 경로에 매핑되지 않음",
   "Unknown Host Key": "알 수 없는 호스트 키",
-  "Sync with {server}": "{server}와(과) 동기화",
-  "Hide identical files ({n})": "동일한 파일 숨기기({n})",
-  "Synchronize": "동기화",
   "{n} of {total} files will change": "파일 {total}개 중 {n}개가 변경됩니다",
   "Comparing local and remote files…": "로컬 파일과 원격 파일 비교 중…",
   "Files to synchronize": "동기화할 파일",
   "Action": "액션",
-  "Local size": "로컬 크기",
-  "Local modified": "로컬 수정 시간",
-  "Remote size": "원격 크기",
-  "Remote modified": "원격 수정 시간",
-  "Local and remote files are identical": "로컬 파일과 원격 파일이 동일합니다",
   "Synchronizing…": "동기화 중…",
   "Local only": "로컬에만 있음",
   "Remote only": "원격에만 있음",
   "Local is newer": "로컬이 더 최신임",
   "Remote is newer": "원격이 더 최신임",
-  "Different size": "크기가 다름",
   "Identical": "동일함",
   "Upload": "업로드",
   "Delete remote": "원격 삭제",
@@ -4465,7 +4453,6 @@
   "partial": "부분",
   "editable": "편집 가능",
   "on {date}": "{date}에",
-  "Merge of {parents}": "{parents} 병합",
   "renamed from {name}": "{name}에서 이름 변경됨",
   "Label '{label}'": "레이블 '{label}'",
   "{n} file recorded before it": "이전에 기록된 파일 {n}개",
@@ -4526,7 +4513,6 @@
   "Memory & Diagnostics": "메모리 및 진단",
   "Over budget ({budget})": "예산 초과({budget})",
   "dev": "개발",
-  "{label}. Showing plugin packages available on this machine.": "{label}. 이 머신에서 사용 가능한 플러그인 패키지를 표시합니다.",
   "Zoomed into {name}": "{name} 확대됨",
   "Rename directory '{current}' and its usages to:": "디렉터리 '{current}' 및 해당 사용 위치의 새 이름:",
   "Rename file '{current}' and its usages to:": "파일 '{current}' 및 해당 사용 위치의 새 이름:",
@@ -4639,7 +4625,6 @@
   "Rebase commits of {head} not on:": "다음에 없는 {head}의 커밋 리베이스:",
   "{head} has no upstream: commits up to {revision} will be pushed as a new branch:": "{head}에 업스트림이 없습니다. {revision}까지의 커밋이 새 브랜치로 푸시됩니다:",
   "{head} has no upstream: it will be pushed as a new branch and tracked:": "{head}에 업스트림이 없습니다. 새 브랜치로 푸시되고 추적됩니다:",
-  "{count} matches in {files} files": "파일 {files}개에서 일치 항목 {count}개",
   "{count} excluded": "{count}개 제외됨",
   "{count} file with conflicts": "충돌이 있는 파일 {count}개",
   "{count} files with conflicts": "충돌이 있는 파일 {count}개",
@@ -5627,6 +5612,18 @@
   "PHP interpreter": "PHP 인터프리터",
   "Runs PHP scripts, PHPUnit, Composer and artisan, and the PHP-based language servers (phpactor). Its folder is put first on PATH, so vendor/bin/phpunit and other #!/usr/bin/env php scripts use it too.": "PHP 스크립트, PHPUnit, Composer, artisan 및 PHP 기반 언어 서버(phpactor)를 실행합니다. 해당 폴더가 PATH 맨 앞에 추가되므로 vendor/bin/phpunit 및 기타 #!/usr/bin/env php 스크립트도 이 인터프리터를 사용합니다.",
   "Select PHP Interpreter": "PHP 인터프리터 선택",
+  "PHP language level": "PHP 언어 레벨",
+  "The PHP version Intelephense checks the code against: newer syntax and functions are reported. Auto uses config.platform.php from composer.json, else the lowest version require.php allows.": "Intelephense가 코드를 검사하는 기준 PHP 버전입니다. 더 새로운 문법과 함수가 보고됩니다. 자동은 composer.json의 config.platform.php를 사용하고, 없으면 require.php가 허용하는 가장 낮은 버전을 사용합니다.",
+  "from composer.json": "composer.json 기준",
+  "PHP Language Level": "PHP 언어 레벨",
+  "PHP Language Level: {label}": "PHP 언어 레벨: {label}",
+  "Select PHP Language Level": "PHP 언어 레벨 선택",
+  "Cannot select PHP language level": "PHP 언어 레벨을 선택할 수 없습니다",
+  "No PHP version in the settings or composer.json: Intelephense uses its default": "설정과 composer.json에 PHP 버전이 없습니다. Intelephense가 기본 버전을 사용합니다",
+  "PHP {version}, set in the settings": "PHP {version}, 설정에서 지정",
+  "PHP {version}, from config.platform.php in composer.json": "PHP {version}, composer.json의 config.platform.php 기준",
+  "PHP {version}, the lowest version require.php in composer.json allows": "PHP {version}, composer.json의 require.php가 허용하는 가장 낮은 버전",
+  "Set in the settings of the linked project {name}": "연결된 프로젝트 {name}의 설정에서 지정",
   "select files in a git repository to shelve": "셸브할 git 저장소의 파일을 선택하세요",
   "select files from a single git repository to shelve": "셸브할 단일 git 저장소의 파일을 선택하세요",
   "External file changes sync may be slow": "외부 파일 변경 사항 동기화가 느릴 수 있습니다",
@@ -5636,7 +5633,7 @@
   "Java project import failed": "Java 프로젝트 가져오기 실패",
   "The Java project cannot be imported because these files use a name Windows reserves for devices: {paths}. Delete or rename them, then restart the Java language server.": "다음 파일이 Windows에서 장치용으로 예약된 이름을 사용하므로 Java 프로젝트를 가져올 수 없습니다: {paths}. 파일을 삭제하거나 이름을 변경한 후 Java 언어 서버를 다시 시작하세요.",
   "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.": "이 파일은 해당 Java 모듈의 소스 폴더 밖에 있습니다. 구문 오류만 보고되며 탐색과 코드 완성이 작동하지 않습니다.",
-  "This file does not belong to an imported Java project: only syntax errors are reported, and navigation and completion don't work.": "이 파일은 가져온 Java 프로젝트에 속하지 않습니다. 구문 오류만 보고되며 탐색과 코드 완성이 작동하지 않습니다.",
+  "This file does not belong to an imported Java project: only syntax errors are reported, and only JDK classes resolve.": "이 파일은 가져온 Java 프로젝트에 속하지 않습니다. 구문 오류만 보고되며 JDK 클래스만 확인됩니다.",
   "This Go file belongs to no package of the workspace: code insight is limited.": "이 Go 파일은 작업 공간의 어떤 패키지에도 속하지 않습니다. 코드 인사이트가 제한됩니다.",
   "This Rust file is not included in any crate: rust-analyzer can't offer code insight for it.": "이 Rust 파일은 어떤 crate에도 포함되어 있지 않습니다. rust-analyzer가 코드 인사이트를 제공할 수 없습니다.",
   "Reload Maven Projects": "Maven 프로젝트 다시 로드",
@@ -5717,14 +5714,11 @@
   "Unsigned": "서명되지 않음",
   "Roll Back to {previousVersion}": "{previousVersion}(으)로 롤백",
   "Install Plugin from Package File…": "패키지 파일에서 플러그인 설치…",
-  "Marketplace index URL": "마켓플레이스 인덱스 URL",
-  "Refresh Marketplace": "마켓플레이스 새로 고침",
   "Marketplace": "마켓플레이스",
   "Could not download plugin": "플러그인을 다운로드할 수 없습니다",
   "Rolled back {name} to {version}": "{name}을(를) {version}(으)로 롤백했습니다",
   "Could not roll back": "롤백할 수 없습니다",
   "Could not open the package": "패키지를 열 수 없습니다",
-  "Marketplace index URL (https://…/index.json or a folder path)": "마켓플레이스 인덱스 URL(https://…/index.json 또는 폴더 경로)",
   "Settings of the plugin; projects can override them.": "플러그인 설정입니다. 프로젝트에서 재정의할 수 있습니다.",
   "Menus": "메뉴",
   "Shortcuts": "단축키",
@@ -5839,5 +5833,27 @@
   "Could not start Compose project {project}": "Compose 프로젝트 {project}을(를) 시작할 수 없습니다",
   "Could not stop Compose project {project}": "Compose 프로젝트 {project}을(를) 중지할 수 없습니다",
   "Could not restart Compose project {project}": "Compose 프로젝트 {project}을(를) 다시 시작할 수 없습니다",
-  "Could not take down Compose project {project}": "Compose 프로젝트 {project}을(를) 중지 및 제거할 수 없습니다"
+  "Could not take down Compose project {project}": "Compose 프로젝트 {project}을(를) 중지 및 제거할 수 없습니다",
+  "Pull Members Up…": "멤버 끌어올리기…",
+  "Push Members Down…": "멤버 끌어내리기…",
+  "Pull Members Up": "멤버 끌어올리기",
+  "Push Members Down": "멤버 끌어내리기",
+  "Caret should be inside a class that has members to pull up": "캐럿은 끌어올릴 멤버가 있는 클래스 안에 있어야 합니다",
+  "Caret should be inside a class that has members to push down": "캐럿은 끌어내릴 멤버가 있는 클래스 안에 있어야 합니다",
+  "Problems Detected": "문제 감지됨",
+  "Nothing to change": "변경할 내용이 없습니다",
+  "Pull Members Up from '{name}'": "'{name}'에서 멤버 끌어올리기",
+  "Push Members Down from '{name}'": "'{name}'에서 멤버 끌어내리기",
+  "Pull up members of {name} to:": "{name}의 멤버를 끌어올릴 위치:",
+  "Push members of {name} down to:": "{name}의 멤버를 끌어내릴 위치:",
+  "Checking for conflicts…": "충돌 확인 중…",
+  "Destination class": "대상 클래스",
+  "Members to be pulled up": "끌어올릴 멤버",
+  "Members to be pushed down": "끌어내릴 멤버",
+  "Member": "멤버",
+  "Make abstract": "추상으로 만들기",
+  "Keep abstract": "추상 선언 유지",
+  "Methods pulled up to an interface are declared abstract there.": "인터페이스로 끌어올린 메서드는 그곳에 추상 메서드로 선언됩니다.",
+  "The file changed; open the dialog again": "파일이 변경되었습니다. 대화상자를 다시 여세요",
+  "Replace preview": "바꾸기 미리 보기"
 }
diff --git a/src/platform/locales/text/pl.json b/src/platform/locales/text/pl.json
new file mode 100644
index 00000000..16d33e9e
--- /dev/null
+++ b/src/platform/locales/text/pl.json
@@ -0,0 +1,5986 @@
+{
+  "Edit {name}": "Edytuj {name}",
+  "Whitespace-only changes": "Zmiany dotyczące wyłącznie białych znaków",
+  " · Whitespace-only changes": " · Zmiany dotyczące wyłącznie białych znaków",
+  " · 1 moved block": " · 1 przeniesiony blok",
+  " · {moves} moved blocks": " · Przeniesione bloki: {moves}",
+  "Moved to line {line} with internal edits": "Przeniesiono do wiersza {line} z wewnętrznymi edycjami",
+  "Moved from line {line} with internal edits": "Przeniesiono z wiersza {line} z wewnętrznymi edycjami",
+  "To L{line} (edited)": "Do L{line} (edytowano)",
+  "From L{line} (edited)": "Z L{line} (edytowano)",
+  "Moved to line {line}": "Przeniesiono do wiersza {line}",
+  "Moved from line {line}": "Przeniesiono z wiersza {line}",
+  "Go to moved code at line {line}": "Przejdź do przeniesionego kodu w wierszu {line}",
+  "Go to original code at line {line}": "Przejdź do oryginalnego kodu w wierszu {line}",
+  "Edited within moved code": "Edytowano w obrębie przeniesionego kodu",
+  "The language server JDK ({path}) must be a full JDK with jdk.compiler, jdk.jdi and jdk.unsupported for Java language support and debugging. jdtls needs JDK {version} or newer. Download JDK {version}, choose a full JDK in {setting}, or set it to Auto.": "JDK serwera językowego ({path}) musi być pełnym pakietem JDK zawierającym jdk.compiler, jdk.jdi oraz jdk.unsupported dla obsługi języka Java i debugowania. jdtls wymaga JDK w wersji {version} lub nowszej. Pobierz JDK {version}, wybierz pełne JDK w {setting} lub ustaw opcję Automatycznie.",
+  "ACP Registry": "Rejestr ACP",
+  "Apple's clangd does not run clang-tidy, so checks from .clang-tidy are not shown. Install clangd (LLVM) to get them.": "Wersja clangd od Apple nie uruchamia clang-tidy, więc kontrole z .clang-tidy nie są wyświetlane. Zainstaluj clangd (LLVM), aby je uzyskać.",
+  "Auto-detect ({defaultProgram})": "Wykryj automatycznie ({defaultProgram})",
+  "Built-in": "Wbudowane",
+  "Built-in agents": "Wbudowani agenci",
+  "Custom executable": "Własny plik wykonywalny",
+  "Found on PATH": "Znaleziono w PATH",
+  "Launch command": "Polecenie uruchomienia",
+  "Sign in": "Zaloguj się",
+  "Leave empty to find the executable on PATH. Changes apply to new sessions.": "Pozostaw puste, aby znaleźć plik wykonywalny w PATH. Zmiany zostaną zastosowane do nowych sesji.",
+  "Newer dependency version available": "Dostępna jest nowsza wersja zależności",
+  "Not found": "Nie znaleziono",
+  "Not found on PATH": "Nie znaleziono w PATH",
+  "Reports newer crate versions that Cargo.toml requirements do not already allow.": "Zgłasza nowsze wersje pakietów (crates), na które wymagania w Cargo.toml jeszcze nie pozwalają.",
+  "Run `auggie login` in a terminal.": "Uruchom `auggie login` w terminalu.",
+  "Run `claude` in a terminal and sign in.": "Uruchom `claude` w terminalu i zaloguj się.",
+  "Run `codex login` in a terminal.": "Uruchom `codex login` w terminalu.",
+  "Run `copilot` in a terminal and sign in.": "Uruchom `copilot` w terminalu i zaloguj się.",
+  "Run `cursor-agent login` in a terminal.": "Uruchom `cursor-agent login` w terminalu.",
+  "Run `gemini` in a terminal and sign in.": "Uruchom `gemini` w terminalu i zaloguj się.",
+  "Run `goose configure` in a terminal.": "Uruchom `goose configure` w terminalu.",
+  "Run `kimi` in a terminal and sign in.": "Uruchom `kimi` w terminalu i zaloguj się.",
+  "Run `kiro-cli login` in a terminal.": "Uruchom `kiro-cli login` w terminalu.",
+  "Run `opencode auth login` in a terminal.": "Uruchom `opencode auth login` w terminalu.",
+  "Run `qwen` in a terminal and sign in.": "Uruchom `qwen` w terminalu i zaloguj się.",
+  "Run `vibe` in a terminal and sign in.": "Uruchom `vibe` w terminalu i zaloguj się.",
+  "Sign in with the agent's own command line first.": "Najpierw zaloguj się za pomocą własnego wiersza poleceń agenta.",
+  "This agent is configured in its agent file.": "Ten agent jest skonfigurowany w swoim pliku agenta.",
+  "This agent is installed from the ACP Registry. Manage its installation in the ACP Registry tab.": "Ten agent został zainstalowany z Rejestru ACP. Zarządzaj jego instalacją w karcie Rejestr ACP.",
+  "This agent runs through a package runner (npm or uv) and has no executable to choose.": "Ten agent uruchamia się poprzez narzędzie do uruchamiania pakietów (npm lub uv) i nie posiada pliku wykonywalnego do wyboru.",
+  "Update to {latest}": "Zaktualizuj do {latest}",
+  "A newer version is available: {latest}": "Dostępna jest nowsza wersja: {latest}",
+  "Kotlin bridge requires a Maven build root": "Mostek Kotlin wymaga katalogu głównego budowania Maven",
+  "Kotlin bridge bundle is unavailable": "Pakiet mostka Kotlin jest niedostępny",
+  "Kotlin bridge command did not acknowledge its library snapshot": "Polecenie mostka Kotlin nie potwierdziło migawki swojej biblioteki",
+  "Kotlin editor compilation failed": "Kompilacja edytora Kotlin nie powiodła się",
+  "Updating results…": "Aktualizowanie wyników…",
+  "Uploading files": "Przesyłanie plików",
+  "No files on the clipboard": "Brak plików w schowku",
+  "File name is not valid UTF-8": "Nazwa pliku nie jest prawidłowym ciągiem UTF-8",
+  "Project opening cancelled": "Otwieranie projektu zostało anulowane",
+  "Project is in Restricted Mode": "Projekt jest w trybie zastrzeżonym",
+  "Project is in Restricted Mode. Trust the project to enable execution.": "Projekt jest w trybie zastrzeżonym. Zaufaj projektowi, aby włączyć wykonywanie.",
+  "Trust and Open Project?": "Zaufać i otworzyć projekt?",
+  "Preview in Restricted Mode": "Podgląd w trybie zastrzeżonym",
+  "Don't Open": "Nie otwieraj",
+  "If you don't trust the source, preview the project in Restricted Mode, where project commands and tools can't run.": "Jeśli nie ufasz źródłu, wyświetl podgląd projektu w trybie zastrzeżonym, w którym polecenia i narzędzia projektu nie mogą być uruchamiane.",
+  "Loading, running or building a project may execute potentially malicious code from its build scripts.": "Wczytywanie, uruchamianie lub budowanie projektu może spowodować wykonanie potencjalnie złośliwego kodu ze skryptów budowania.",
+  "Trust projects in": "Zaufaj projektom w",
+  "Restricted Mode: project commands and tools are disabled.": "Tryb zastrzeżony: polecenia i narzędzia projektu są wyłączone.",
+  "Trust Project": "Zaufaj projektowi",
+  "Trust decisions are saved in your user data and take effect immediately.": "Decyzje dotyczące zaufania są zapisywane w danych użytkownika i wchodzą w życie natychmiast.",
+  "Trusted projects": "Zaufane projekty",
+  "Trusted locations": "Zaufane lokalizacje",
+  "Revoke Trust": "Cofnij zaufanie",
+  "Project Trust": "Zaufanie do projektu",
+  "Security": "Bezpieczeństwo",
+  "Remove Trusted Location": "Usuń zaufaną lokalizację",
+  "Cannot determine the module for main class '{value}'": "Nie można określić modułu dla klasy głównej '{value}'",
+  "Java module '{value}' is not imported. Wait for Java project import to finish. If it still fails, check the run configuration's module and whether it is included in the parent Maven or Gradle build, or open its folder as a project.": "Moduł Java '{value}' nie został zaimportowany. Poczekaj na zakończenie importu projektu Java. Jeśli problem nadal występuje, sprawdź moduł w konfiguracji uruchamiania i upewnij się, że jest dołączony do nadrzędnego kompilatu Maven lub Gradle, lub otwórz jego folder jako projekt.",
+  "Attach": "Dołącz",
+  "Remove from Workspace": "Usuń z obszaru roboczego",
+  "Downloading Java {0} language server runtime": "Pobieranie środowiska uruchomieniowego serwera językowego Java {0}",
+  "auto-managed; uses an installed JDK or downloads a runtime when needed": "zarządzane automatycznie; używa zainstalowanego JDK lub pobiera środowisko uruchomieniowe w razie potrzeby",
+  "Runs jdtls only; the project keeps its Project JDK. When empty, a suitable installed JDK is used first, otherwise Eclipse Temurin is downloaded automatically into a separate language-server folder. The jdtls executable itself is set in Language Servers.": "Uruchamia tylko jdtls; projekt zachowuje swoje JDK Projektu. Gdy opcja jest pusta, najpierw używane jest odpowiednie zainstalowane JDK, w przeciwnym razie Eclipse Temurin jest pobierany automatycznie do osobnego folderu serwera językowego. Sam plik wykonywalny jdtls jest ustawiany w części Serwery językowe.",
+  "Semantic Highlighting": "Podświetlanie semantyczne",
+  "Rainbow Brackets": "Kolorowe nawiasy (Rainbow Brackets)",
+  "Comment with Line Comment": "Zakomentuj komentarzem jednowierszowym",
+  "Comment with Block Comment": "Zakomentuj komentarzem blokowym",
+  "Duplicate Line or Selection": "Duplikuj wiersz lub zaznaczenie",
+  "Delete Line": "Usuń wiersz",
+  "Move Line Up": "Przesuń wiersz w górę",
+  "Move Line Down": "Przesuń wiersz w dół",
+  "Move Statement Up": "Przesuń instrukcję w górę",
+  "Move Statement Down": "Przesuń instrukcję w dół",
+  "Extend Selection": "Rozszerz zaznaczenie",
+  "Shrink Selection": "Zmniejsz zaznaczenie",
+  "Toggle Fold": "Przełącz zwijanie",
+  "Cyclic Expand Word": "Cykl rozszerzania słowa",
+  "Cyclic Expand Word (Backward)": "Cykl rozszerzania słowa (w wstecz)",
+  "Paste as Plain Text": "Wklej jako zwykły tekst",
+  "Add Selection for Next Occurrence": "Dodaj zaznaczenie dla następnego wystąpienia",
+  "Select All Occurrences": "Zaznacz wszystkie wystąpienia",
+  "Complete Current Statement": "Dokończ bieżącą instrukcję",
+  "Start New Line": "Rozpocznij nowy wiersz",
+  "Start New Line Before Current": "Rozpocznij nowy wiersz przed bieżącym",
+  "Split Line": "Podziel wiersz",
+  "Scroll to Center": "Przewiń do środka",
+  "Move Caret to Code Block Start": "Przesuń kursor na początek bloku kodu",
+  "Move Caret to Code Block End": "Przesuń kursor na koniec bloku kodu",
+  "Clone Caret Above": "Klonuj kursor powyżej",
+  "Clone Caret Below": "Klonuj kursor poniżej",
+  "Join Lines": "Połącz wiersze",
+  "Toggle Case": "Przełącz wielkość liter",
+  "Add Carets to Ends of Selected Lines": "Dodaj kursory na końcach zaznaczonych wierszy",
+  "Unselect Occurrence": "Odznacz wystąpienie",
+  "Paste from History…": "Wklej z historii…",
+  "Sort Lines": "Sortuj wiersze",
+  "Reverse Lines": "Odwróć kolejność wierszy",
+  "Unwrap/Remove…": "Owiń/usuń…",
+  "Basic": "Podstawowy",
+  "Quick Definition": "Szybka definicja",
+  "Reformat File…": "Prformatuj plik…",
+  "Go to Declaration or Usages": "Przejdź do deklaracji lub użyć",
+  "Go to Implementation(s)": "Przejdź do implementacji",
+  "Go to Type Declaration": "Przejdź do deklaracji typu",
+  "Next Highlighted Error": "Następny podświetlony błąd",
+  "Previous Highlighted Error": "Poprzedni podświetlony błąd",
+  "Highlight Usages in File": "Podświetl użycia w pliku",
+  "Implement Methods…": "Zaimplementuj metody…",
+  "Override Methods…": "Przesłoń metody…",
+  "Expression Type Info": "Informacje o typie wyrażenia",
+  "Next Method": "Następna metoda",
+  "Previous Method": "Poprzednia metoda",
+  "Copy Absolute Path": "Kopiuj ścieżkę bezwzględną",
+  "Copy Path From Content Root": "Kopiuj ścieżkę od katalogu głównego zawartości",
+  "Copy File Name": "Kopiuj nazwę pliku",
+  "Fixup…": "Poprawka (Fixup)…",
+  "Step Over": "Krok nad",
+  "Step Out": "Krok na zewnątrz",
+  "Zoom In": "Powiększ",
+  "Zoom Out": "Pomniejsz",
+  "Actual Size": "Rzeczywisty rozmiar",
+  "Fit Zoom to Window": "Dopasuj powiększenie do okna",
+  "Show Chessboard": "Pokaż szachownicę",
+  "Editor Only": "Tylko edytor",
+  "Editor and Preview": "Edytor i podgląd",
+  "Preview Only": "Tylko podgląd",
+  "Add Maven Projects": "Dodaj projekty Maven",
+  "Unlink Maven Projects": "Odłącz projekty Maven",
+  "Unlink Maven projects?": "Odłączyć projekty Maven?",
+  "Remove this project and its modules from Maven? Files will remain in the Project view.": "Usunąć ten projekt i jego moduły z Maven? Pliki pozostaną w widoku Projektu.",
+  "Remove this module and its submodules from Maven? The Java language server stops importing them, so they no longer use memory. Files will remain in the Project view; add the pom.xml again to restore them.": "Usunąć ten moduł i jego podmoduły z Maven? Serwer językowy Java przestanie je importować, dzięki czemu nie będą już zużywać pamięci. Pliki pozostaną w widoku Projektu; dodaj ponownie pom.xml, aby je przywrócić.",
+  "Unlink": "Odłącz",
+  "(does not exist)": "(nie istnieje)",
+  ", e.g.": ", np.",
+  ", then press Tab.": ", a następnie naciśnij Tab.",
+  "? This cannot be undone.": "? Tego nie można cofnąć.",
+  "API request failed, retrying (attempt {attempt})": "Żądanie API nie powiodło się, ponawianie próby (próba {attempt})",
+  "API request failed, retrying in {wait}s (attempt {attempt})": "Żądanie API nie powiodło się, ponawianie próby za {wait} s (próba {attempt})",
+  "A charset in .editorconfig takes precedence. Change one file's encoding from the status bar.": "Zestaw znaków w pliku .editorconfig ma priorytet. Zmień kodowanie pojedynczego pliku na pasku stanu.",
+  "A command line, e.g. /bin/zsh --login. Leave empty to use the login shell.": "Wiersz poleceń, np. /bin/zsh --login. Pozostaw puste, aby użyć powłoki logowania.",
+  "A line breakpoint that is removed after it is hit": "Punkt przerwania wiersza, który jest usuwany po osiągnięciu",
+  "Abbreviation": "Skrót",
+  "Abort Cherry-Pick": "Anuluj cherry-pick",
+  "Abort Merge": "Anuluj scalanie",
+  "Abort Rebase": "Anuluj zmianę bazy (rebase)",
+  "Abort Revert": "Anuluj cofanie (revert)",
+  "Absolute Path": "Ścieżka bezwzględna",
+  "Absolute path of the current file": "Ścieżka bezwzględna bieżącego pliku",
+  "Accent color": "Kolor akcentu",
+  "Accent colour": "Kolor akcentu",
+  "Accept Both (Conflict at Caret)": "Zaakceptuj oba (konflikt przy kursorze)",
+  "Accept Theirs": "Zaakceptuj ich (ze zmian)",
+  "Accept Theirs (Conflict at Caret)": "Zaakceptuj ich (konflikt przy kursorze)",
+  "Accept Yours": "Zaakceptuj swoje",
+  "Accept Yours (Conflict at Caret)": "Zaakceptuj swoje (konflikt przy kursorze)",
+  "Accessibility": "Dostępność",
+  "Action id (bind it in Keymap)": "Identyfikator akcji (przypisz go w Mapie skrótów)",
+  "Actions": "Akcje",
+  "Actions on Save": "Akcje podczas zapisywania",
+  "Actions run when a file is saved with Save (⌘S) or Save All. Trailing spaces and the final line break are configured in": "Akcje uruchamiane podczas zapisywania pliku za pomocą Zapisz (⌘S) lub Zapisz wszystko. Końcowe spacje i końcowy znak końca wiersza są konfigurowane w",
+  "Activate on Save": "Aktywuj przy zapisie",
+  "Activate virtualenv": "Aktywuj środowisko virtualenv",
+  "Add": "Dodaj",
+  "Add Column": "Dodaj kolumnę",
+  "Add Field Watchpoint": "Dodaj punkt obserwacji pola",
+  "Add File to Git": "Dodaj plik do Git",
+  "Add GitHub Pattern": "Dodaj wzorzec GitHub",
+  "Add Interpreter…": "Dodaj interpreter…",
+  "Add JIRA Pattern": "Dodaj wzorzec JIRA",
+  "Add Keyboard Shortcut": "Dodaj skrót klawiszowy",
+  "Add Kind": "Dodaj rodzaj",
+  "Add Method Breakpoint": "Dodaj punkt przerwania metody",
+  "Add New Configuration": "Dodaj nową konfigurację",
+  "Add Pattern": "Dodaj wzorzec",
+  "Add Python Interpreter": "Dodaj interpreter Pythona",
+  "Add Row": "Dodaj wiersz",
+  "Add Template": "Dodaj szablon",
+  "Add YouTrack Pattern": "Dodaj wzorzec YouTrack",
+  "Add one in the Database tool window.": "Dodaj jeden w oknie narzędziowym Baza danych.",
+  "Add pattern": "Dodaj wzorzec",
+  "Add silently": "Dodaj po cichu",
+  "Add to Favorites": "Dodaj do ulubionych",
+  "Add to VCS": "Dodaj do VCS",
+  "Add to Watches": "Dodaj do obserwowanych",
+  "Add unambiguous imports on the fly": "Dodawaj jednoznaczne importy na bieżąco",
+  "Added to the environment of new terminal sessions.": "Dodano do środowiska nowych sesji terminala.",
+  "Additional arguments": "Dodatkowe argumenty",
+  "Adjust colors for red-green vision deficiency": "Dostosuj kolory dla zaburzeń rozpoznawania barwy czerwonej i zielonej",
+  "After Replace": "Po zastąpieniu",
+  "After Stop, the process gets this long to exit after the interrupt before it is killed.": "Po zatrzymaniu proces ma tyle czasu na zakończenie po przerwaniu, zanim zostanie wymuszone jego zamknięcie.",
+  "Align Changes": "Wyrównaj zmiany",
+  "All": "Wszystko",
+  "All Places": "Wszystkie miejsca",
+  "All breakpoints": "Wszystkie punkty przerwania",
+  "All conflicts resolved": "Rozwiązano wszystkie konflikty",
+  "All letters": "Wszystkie litery",
+  "All lines": "Wszystkie wiersze",
+  "All settings…": "Wszystkie ustawienia…",
+  "Allow placing breakpoints in any file": "Zezwalaj na umieszczanie punktów przerwania w dowolnym pliku",
+  "Also expand in comments and strings": "Rozwijaj również w komentarzach i ciągach znaków",
+  "Always": "Zawsze",
+  "Always show full path in window header": "Zawsze pokazuj pełną ścieżkę w nagłówku okna",
+  "Amend": "Popraw (Amend)",
+  "Analysing…": "Analizowanie…",
+  "Analyze": "Analizuj",
+  "Analyze Stack Trace": "Analizuj ślad stosu",
+  "Analyze Stack Trace or Thread Dump…": "Analizuj ślad stosu lub zrzut wątków…",
+  "Analyze code": "Analizuj kod",
+  "Annotate with Git Blame": "Adnotuj za pomocą Git Blame",
+  "Annotation": "Adnotacja",
+  "Anonymize literals": "Anonimizuj literały",
+  "Anonymize variables, fields, methods and types": "Anonimizuj zmienne, pola, metody i typy",
+  "Another Docker operation is still running": "Inna operacja Docker jest nadal uruchomiona",
+  "Another Git operation is in progress": "Trwa inna operacja Git",
+  "Another GitHub operation is still running": "Inna operacja GitHub jest nadal uruchomiona",
+  "Another remote operation is in progress": "Trwa inna operacja zdalna",
+  "Antialiasing": "Wygładzanie krawędzi (Antialiasing)",
+  "Appearance": "Wygląd",
+  "Appearance & Behavior": "Wygląd i zachowanie",
+  "Appearance…": "Wygląd…",
+  "Application Settings": "Ustawienia aplikacji",
+  "Applies cleanly": "Nakłada się bez konfliktów",
+  "Applies fix-all code actions.": "Stosuje akcje kodu naprawiające wszystko.",
+  "Applies the import quick fix of an unresolved reference when the language server offers exactly one.": "Stosuje szybką poprawkę importu dla nierozwiązanej referencji, gdy serwer językowy oferuje dokładnie jedną.",
+  "Applies the language server's fix-all action (source.fixAll).": "Stosuje akcję naprawiania wszystkiego z serwera językowego (source.fixAll).",
+  "Applies to editor tabs and tool window buttons": "Dotyczy kart edytora i przycisków okien narzędziowych",
+  "Apply": "Zastosuj",
+  "Apply Patch from Clipboard…": "Zastosuj łatkę ze schowka…",
+  "Apply Patch…": "Zastosuj łatkę…",
+  "Apply Stash": "Zastosuj schowek (Stash)",
+  "Arguments": "Argumenty",
+  "Arrow function": "Funkcja strzałkowa",
+  "As new branch:": "Jako nowa gałąź:",
+  "As typed": "Tak jak wpisano",
+  "Ask": "Pytaj",
+  "Asks for a value when the tool runs": "Pytaj o wartość podczas uruchamiania narzędzia",
+  "Async function": "Funkcja asynchroniczna",
+  "Async test case": "Asynchroniczny przypadek testowy",
+  "Attach Debugger": "Dołącz debugger",
+  "Attach the debugger to a running Java, Node.js, Python, Go or native process": "Dołącz debugger do uruchomionego procesu Java, Node.js, Python, Go lub natywnego",
+  "Attach to Process": "Dołącz do procesu",
+  "Attach to Process…": "Dołącz do procesu…",
+  "Attach to process": "Dołącz do procesu",
+  "Attach to subprocess automatically while debugging": "Automatycznie dołączaj do podprocesów podczas debugowania",
+  "Attaching needs the desktop app": "Dołączanie wymaga aplikacji stacjonarnej",
+  "Audible bell": "Sygnał dźwiękowy",
+  "Authentication:": "Uwierzytelnianie:",
+  "Auto": "Automatycznie",
+  "Auto Import": "Automatyczny import",
+  "Auto-detected": "Wykryto automatycznie",
+  "Auto-update if push of the current branch was rejected": "Automatycznie aktualizuj, jeśli wysłanie (push) bieżącej gałęzi zostało odrzucone",
+  "Autosave": "Automatyczny zapis",
+  "Autoscroll from Source": "Automatyczne przewijanie ze źródła",
+  "Autoscroll to Source": "Automatyczne przewijanie do źródła",
+  "Available": "Dostępne",
+  "Available plugins": "Dostępne wtyczki",
+  "Back": "Wstecz",
+  "Backend malloc in use": "Funkcja malloc backendu jest w użyciu",
+  "Backend set-up": "Konfiguracja backendu",
+  "Background": "Tło",
+  "Background Tasks": "Zadania w tle",
+  "Background tasks": "Zadania w tle",
+  "Balloon": "Chmurka powiadomień",
+  "Base branch": "Gałąź bazowa",
+  "Base interpreter": "Interpreter bazowy",
+  "Base interpreter:": "Interpreter bazowy:",
+  "Based on syntax (language server not ready)": "Na podstawie składni (serwer językowy nie jest gotowy)",
+  "Behavior": "Zachowanie",
+  "Benchmark function": "Funkcja benchmarku",
+  "Binary response": "Odpowiedź binarna",
+  "Blank line between subject and body": "Pusta linia między tematem a treścią",
+  "Blinking cursor": "Migający kursor",
+  "Block": "Blok",
+  "Blue": "Niebieski",
+  "Bold": "Pogrubienie",
+  "Bookmarks": "Zakładki",
+  "Bottom": "Dół",
+  "Bottom Left": "Dół po lewej",
+  "Bottom Right": "Dół po prawej",
+  "Branch": "Gałąź",
+  "Branch '{name}' has no tracked branch": "Gałąź '{name}' nie ma śledzonej gałęzi",
+  "Branch, %": "Gałąź, %",
+  "Branch, tag or commit hash": "Gałąź, tag lub hasz zatwierdzenia (commit)",
+  "Branches": "Gałęzie",
+  "Branches…": "Gałęzie…",
+  "Breadcrumb": "Ścieżka nawigacyjna (Breadcrumb)",
+  "Breadcrumbs": "Ścieżka nawigacyjna (Breadcrumbs)",
+  "Breakpoint properties": "Właściwości punktu przerwania",
+  "Breakpoints": "Punkty przerwania",
+  "Breakpoints can't be placed in this file": "Nie można umieścić punktów przerwania w tym pliku",
+  "Browse": "Przeglądaj",
+  "Browse…": "Przeglądaj…",
+  "Build": "Kompiluj/Buduj",
+  "Build Artifacts": "Buduj artefakty",
+  "Build Module": "Buduj moduł",
+  "Build Project": "Buduj projekt",
+  "Build failed": "Budowanie nie powiodło się",
+  "Build files changed since the last reload": "Pliki budowania uległy zmianie od ostatniego przeładowania",
+  "Build output": "Dane wyjściowe budowania",
+  "Build the project to see compiler messages here": "Zbuduj projekt, aby zobaczyć tutaj komunikaty kompilatora",
+  "Build, Execution, Deployment": "Budowanie, Wykonanie, Wdrożenie",
+  "Building": "Budowanie",
+  "Bundled": "Dołączone",
+  "Caches cleared": "Pamięć podręczna została wyczyszczona",
+  "Call Hierarchy": "Hierarchia wywołań",
+  "Call Tree": "Drzewo wywołań",
+  "Call hierarchy": "Hierarchia wywołań",
+  "Call tree": "Drzewo wywołań",
+  "Calls on the current line": "Wywołania w bieżącym wierszu",
+  "Cancel": "Anuluj",
+  "Cancel Exclusion": "Anuluj wykluczenie",
+  "Cancel Running Statement": "Anuluj wykonywaną instrukcję",
+  "Cannot add a field watchpoint": "Nie można dodać punktu obserwacji pola",
+  "Cannot annotate": "Nie można dodać adnotacji",
+  "Cannot change line separators": "Nie można zmienić separatorów wierszy",
+  "Cannot commit": "Nie można zatwierdzić (commit)",
+  "Cannot connect to {target}": "Nie można połączyć się z {target}",
+  "Cannot convert encoding": "Nie można przekonwertować kodowania",
+  "Cannot create scratch file": "Nie można utworzyć pliku roboczego (scratch file)",
+  "Cannot create the HTTP request file": "Nie można utworzyć pliku żądania HTTP",
+  "Cannot generate the HTTP request": "Nie można wygenerować żądania HTTP",
+  "Cannot duplicate the data source": "Nie można zduplikować źródła danych",
+  "Cannot execute": "Nie można wykonać",
+  "Cannot execute on {target}": "Nie można wykonać na {target}",
+  "Cannot export data": "Nie można wyeksportować danych",
+  "Cannot find usages of '{name}'": "Nie można znaleźć użyć '{name}'",
+  "Cannot generate the DDL": "Nie można wygenerować DDL",
+  "Cannot generate the SQL script": "Nie można wygenerować skryptu SQL",
+  "Cannot get the DDL of {name}": "Nie można pobrać DDL dla {name}",
+  "Cannot open file": "Nie można otworzyć pliku",
+  "Cannot open library class": "Nie można otworzyć klasy bibliotecznej",
+  "Cannot open link": "Nie można otworzyć linku",
+  "Cannot open the query console": "Nie można otworzyć konsoli zapytań",
+  "Cannot open the response": "Nie można otworzyć odpowiedzi",
+  "Cannot profile '{name}'": "Nie można przeprowadzić profilowania dla '{name}'",
+  "Cannot put label": "Nie można umieścić etykiety",
+  "Cannot read data sources": "Nie można odczytać źródeł danych",
+  "Cannot read the patch": "Nie można odczytać łatki",
+  "Cannot reload Gradle projects": "Nie można przeładować projektów Gradle",
+  "Cannot reload Maven projects": "Nie można przeładować projektów Maven",
+  "Cannot reload from disk": "Nie można przeładować z dysku",
+  "Cannot reload with encoding": "Nie można przeładować z podanym kodowaniem",
+  "Cannot remove recent project": "Nie można usunąć niedawnego projektu",
+  "Cannot roll back": "Nie można wycofać zmian",
+  "Cannot run '{name}' with coverage": "Nie można uruchomić '{name}' z pokryciem kodu",
+  "Cannot run the script": "Nie można uruchomić skryptu",
+  "Cannot save run configurations": "Nie można zapisać konfiguracji uruchamiania",
+  "Cannot save setting": "Nie można zapisać ustawienia",
+  "Cannot send the request": "Nie można wysłać żądania",
+  "Cannot stop process": "Nie można zatrzymać procesu",
+  "Cannot undo": "Nie można cofnąć",
+  "Cannot undo refactoring": "Nie można cofnąć refaktoryzacji",
+  "Cannot preview replacements": "Nie można wyświetlić podglądu zastąpień",
+  "Caret blinking (ms):": "Miganie kursora (ms):",
+  "Caret column number (1-based)": "Numer kolumny kursora (od 1)",
+  "Caret line number (1-based)": "Numer wiersza kursora (od 1)",
+  "Caret should be positioned at the name of the element to be refactored": "Kursor powinien znajdować się na nazwie elementu do refaktoryzacji",
+  "Cascade": "Kaskadowo",
+  "Case sensitive": "Uwzględniaj wielkość liter",
+  "Change Splitter Orientation": "Zmień orientację podziału",
+  "Change Signature…": "Zmień sygnaturę…",
+  "Change actions": "Zmień akcje",
+  "Change font size with Command+Mouse Wheel": "Zmień rozmiar czcionki za pomocą Command+Kółko myszy",
+  "Changed files": "Zmienione pliki",
+  "Changelist:": "Lista zmian:",
+  "Changes": "Zmiany",
+  "Changes to include:": "Zmiany do dołączenia:",
+  "Changes were not submitted": "Zmiany nie zostały przesłane",
+  "Check TODO": "Sprawdź TODO",
+  "Checked out pull request #{number}": "Pobrano zgłoszenie pull request #{number}",
+  "Checking installed tools…": "Sprawdzanie zainstalowanych narzędzi…",
+  "Checking tools": "Sprawdzanie narzędzi",
+  "Checkout": "Pobierz (Checkout)",
+  "Checkout Pull Request…": "Pobierz pull request…",
+  "Checkout Revision": "Pobierz rewizję",
+  "Checkout Tag or Revision": "Pobierz tag lub rewizję",
+  "Checkout Tag or Revision…": "Pobierz tag lub rewizję…",
+  "Checkout branch": "Pobierz gałąź",
+  "Checks out the selected pull request, a number given as argument, or asks for one.": "Pobiera wybrane zgłoszenie pull request, podany numer jako argument lub prosi o podanie numeru.",
+  "Cherry-Pick": "Wybieraj (Cherry-Pick)",
+  "Children": "Elementy podrzędne",
+  "Choose Content to Paste": "Wybierz zawartość do wklejenia",
+  "Choose a data source for this console": "Wybierz źródło danych dla tej konsoli",
+  "Choose a start or end date": "Wybierz datę początkową lub końcową",
+  "Choose configuration to debug": "Wybierz konfigurację do debugowania",
+  "Choose configuration to run": "Wybierz konfigurację do uruchomienia",
+  "Choose the Statement to Unwrap/Remove": "Wybierz instrukcję do odpakowania/usunięcia",
+  "Choose which call on the current line to step into": "Wybierz wywołanie w bieżącym wierszu, do którego chcesz wejść",
+  "Class": "Klasa",
+  "Classes": "Klasy",
+  "Classes changed": "Zmieniono klasy",
+  "Cleans the build outputs, then builds the project": "Czyści pliki wyjściowe kompilacji, a następnie buduje projekt",
+  "Cleanup": "Czyszczenie",
+  "Clear": "Wyczyść",
+  "Clear All": "Wyczyść wszystko",
+  "Clear Buffer": "Wyczyść bufor",
+  "Clear Caches": "Wyczyść pamięć podręczną",
+  "Clear Console": "Wyczyść konsolę",
+  "Clear Filtering": "Wyczyść filtrowanie",
+  "Clear History": "Wyczyść historię",
+  "Clear Terminal Buffer": "Wyczyść bufor terminala",
+  "Clear build tool caches (Maven / Gradle sync results)": "Wyczyść pamięć podręczną narzędzi budowania (wyniki synchronizacji Maven / Gradle)",
+  "Clear caches": "Wyczyść pamięć podręczną",
+  "Clear file system cache and Local History": "Wyczyść pamięć podręczną systemu plików i historię lokalną",
+  "Clear language server workspaces (Java import data and indexes)": "Wyczyść obszary robocze serwera językowego (dane importu Java i indeksy)",
+  "Clipboard": "Schowek",
+  "Clone": "Klonuj",
+  "Clone depth": "Głębokość klonowania",
+  "Clone Repository": "Klonuj repozytorium",
+  "Clone Repository…": "Klonuj repozytorium…",
+  "Clone progress": "Postęp klonowania",
+  "Clone source": "Źródło klonowania",
+  "Cloned, but the project could not be opened": "Sklonowano, ale nie można było otworzyć projektu",
+  "Cloning requires the desktop app": "Klonowanie wymaga aplikacji stacjonarnej",
+  "Close": "Zamknij",
+  "Close All Read-Only Tabs": "Zamknij wszystkie karty tylko do odczytu",
+  "Close All Tabs": "Zamknij wszystkie karty",
+  "Close All but Pinned": "Zamknij wszystkie z wyjątkiem przypiętych",
+  "Close Annotations": "Zamknij adnotacje",
+  "Close Other Tabs": "Zamknij pozostałe karty",
+  "Close Project": "Zamknij projekt",
+  "Close Session": "Zamknij sesję",
+  "Close Tab": "Zamknij kartę",
+  "Close Tabs to the Left": "Zamknij karty po lewej",
+  "Close Tabs to the Right": "Zamknij karty po prawej",
+  "Close Terminal Session": "Zamknij sesję terminala",
+  "Close Unmodified Tabs": "Zamknij niezmodyfikowane karty",
+  "Close least recently used files": "Zamknij najdawniej używane pliki",
+  "Close non-modified files first": "Zamykaj najpierw niezmodyfikowane pliki",
+  "Close performance overlay": "Zamknij nakładkę wydajności",
+  "Close session when it ends": "Zamknij sesję po jej zakończeniu",
+  "Closing Policy": "Zasady zamykania",
+  "Code": "Kod",
+  "Code Completion": "Uzupełnianie kodu",
+  "Code Editing": "Edycja kodu",
+  "Code Folding": "Zwijanie kodu",
+  "Code Style": "Styl kodu",
+  "Code breadcrumbs": "Ścieżka nawigacyjna kodu",
+  "Collapse": "Zwiń",
+  "Collapse All": "Zwiń wszystko",
+  "Collapse Unchanged Fragments": "Zwiń niezmienione fragmenty",
+  "Color Scheme": "Schemat kolorów",
+  "Color scheme attributes": "Atrybuty schematu kolorów",
+  "Color scheme preview": "Podgląd schematu kolorów",
+  "Color theme": "Motyw kolorystyczny",
+  "Column": "Kolumna",
+  "Column Selection Mode": "Tryb zaznaczania kolumn",
+  "Columns": "Kolumny",
+  "Comma-separated column numbers, e.g. 80, 100.": "Numery kolumn rozdzielone przecinkami, np. 80, 100.",
+  "Command": "Polecenie",
+  "Command line": "Wiersz poleceń",
+  "Commands": "Polecenia",
+  "Comment": "Komentarz",
+  "Comment:": "Komentarz:",
+  "Commit": "Zatwierdź (Commit)",
+  "Commit Anyway": "Zatwierdź mimo to",
+  "Commit Changelist…": "Zatwierdź listę zmian…",
+  "Commit Checks": "Kontrole przed zatwierdzeniem",
+  "Commit File…": "Zatwierdź plik…",
+  "Commit Message": "Wiadomość zatwierdzenia",
+  "Commit Message History": "Historia wiadomości zatwierdzenia",
+  "Commit Message Inspections": "Inspekcje wiadomości zatwierdzenia",
+  "Commit Options": "Opcje zatwierdzania",
+  "Commit message": "Wiadomość zatwierdzenia",
+  "Commit message is empty": "Wiadomość zatwierdzenia jest pusta",
+  "Commit:": "Zatwierdzenie:",
+  "Commits": "Zatwierdzenia (Commits)",
+  "Commits are applied from top to bottom.": "Zatwierdzenia są nakładane od góry do dołu.",
+  "Commits to rebase": "Zatwierdzenia do zmiany bazy",
+  "commits": "zatwierdzenia",
+  "Commit…": "Zatwierdź…",
+  "Compact mode": "Tryb kompaktowy",
+  "Companion object": "Obiekt towarzyszący (Companion object)",
+  "Compare Files": "Porównaj pliki",
+  "Compare Texts": "Porównaj teksty",
+  "Compare With": "Porównaj z",
+  "Compare With…": "Porównaj z…",
+  "Compare with Branch or Revision…": "Porównaj z gałęzią lub rewizją…",
+  "Compare with Branch…": "Porównaj z gałęzią…",
+  "Compare with Clipboard": "Porównaj ze schowkiem",
+  "Compare with Current": "Porównaj z bieżącym",
+  "Compare with Local": "Porównaj z lokalnym",
+  "Compilation failed: fix the errors and reload again.": "Kompilacja nie powiodła się: napraw błędy i przeładuj ponownie.",
+  "Compiles and runs the project: the default jdtls runtime, Run/Debug, and JAVA_HOME for Maven and Gradle.": "Kompiluje i uruchamia projekt: domyślne środowisko uruchomieniowe jdtls, Uruchom/Debuguj oraz JAVA_HOME dla Maven i Gradle.",
+  "Compiles the module of the current file": "Kompiluje moduł bieżącego pliku",
+  "Compiles the project's sources and tests with its build system": "Kompiluje źródła i testy projektu za pomocą jego systemu budowania",
+  "Completions": "Uzupełnienia kodu",
+  "Component with CSS module": "Komponent z modułem CSS",
+  "Condition": "Warunek",
+  "Configurations": "Konfiguracje",
+  "Configure Editor Tabs…": "Konfiguruj karty edytora…",
+  "Configure Indents…": "Konfiguruj wcięcia…",
+  "Configure Keymap…": "Konfiguruj mapę skrótów…",
+  "Configure…": "Konfiguruj…",
+  "Confirm Drop": "Potwierdź odrzucenie",
+  "Confirm before exiting the IDE": "Potwierdź przed wyjściem z IDE",
+  "Confirm rerun with process termination": "Potwierdź ponowne uruchomienie z zakończeniem procesu",
+  "Confirmation": "Potwierdzenie",
+  "Conflicted files": "Pliki w konflikcie",
+  "Conflicts": "Konflikty",
+  "Conflicts:": "Konflikty:",
+  "Connect": "Połącz",
+  "Connected": "Połączono",
+  "Connecting to Docker…": "Łączenie z Docker…",
+  "Connecting to GitHub…": "Łączenie z GitHub…",
+  "Console": "Konsola",
+  "Container log": "Dziennik kontenera",
+  "Content root": "Katalog główny zawartości",
+  "Context menu": "Menu kontekstowe",
+  "Contexts": "Konteksty",
+  "Continue": "Kontynuuj",
+  "Continue Cherry-Pick": "Kontynuuj cherry-pick",
+  "Continue Rebase": "Kontynuuj zmianę bazy (rebase)",
+  "Continue Revert": "Kontynuuj cofanie (revert)",
+  "Contributes": "Wkład",
+  "Convert to Encoding": "Konwertuj na kodowanie",
+  "Copied code keeps the editor's syntax colors and font when pasted into documents and mail.": "Skopiowany kod zachowuje kolory składni i czcionkę edytora po wklejeniu do dokumentów i wiadomości e-mail.",
+  "Copy": "Kopiuj",
+  "Copy / Paste Special": "Kopiuj / Wklej specjalnie",
+  "Copy All": "Kopiuj wszystko",
+  "Copy Commit Message": "Kopiuj wiadomość zatwierdzenia",
+  "Copy Configuration": "Kopiuj konfigurację",
+  "Copy Container ID": "Kopiuj ID kontenera",
+  "Copy Coordinates": "Kopiuj współrzędne",
+  "Copy Image ID": "Kopiuj ID obrazu",
+  "Copy Image Name": "Kopiuj nazwę obrazu",
+  "Copy Name": "Kopiuj nazwę",
+  "Copy Original Text": "Kopiuj oryginalny tekst",
+  "Copy Path": "Kopiuj ścieżkę",
+  "Copy Path from Project Root": "Kopiuj ścieżkę od katalogu głównego projektu",
+  "Copy Path/Reference…": "Kopiuj ścieżkę/referencję…",
+  "Copy Problem Description": "Kopiuj opis problemu",
+  "Copy Reference": "Kopiuj referencję",
+  "Copy Revision Number": "Kopiuj numer rewizji",
+  "Copy Revision Numbers": "Kopiuj numery rewizji",
+  "Copy Rows as CSV": "Kopiuj wiersze jako CSV",
+  "Copy Rows as TSV": "Kopiuj wiersze jako TSV",
+  "Copy Stack": "Kopiuj stos",
+  "Copy Value": "Kopiuj wartość",
+  "Copy as rich text by default": "Domyślnie kopiuj jako tekst sformatowany (rich text)",
+  "Copy revision number": "Kopiuj numer rewizji",
+  "Copy to clipboard": "Kopiuj do schowka",
+  "Copy to clipboard on selection": "Kopiuj do schowka przy zaznaczeniu",
+  "Copy with Header": "Kopiuj z nagłówkiem",
+  "Copy/Paste": "Kopiuj/Wklej",
+  "Could not apply theme": "Nie można zastosować motywu",
+  "Could not clear caches": "Nie można wyczyścić pamięci podręcznej",
+  "Could not fill the new file": "Nie można wypełnić nowego pliku",
+  "Could not install plugin": "Nie można zainstalować wtyczki",
+  "Could not invalidate caches": "Nie można unieważnić pamięci podręcznej",
+  "Could not open project": "Nie można otworzyć projektu",
+  "Could not open the file picker": "Nie można otworzyć okna wyboru plików",
+  "Plugin package": "Pakiet wtyczki",
+  "Could not reach GitHub": "Nie można połączyć się z GitHubem",
+  "Could not save": "Nie można zapisać",
+  "Coverage": "Pokrycie kodu",
+  "Coverage is hidden in editors and the project view.": "Pokrycie kodu jest ukryte w edytorach i widoku projektu.",
+  "Coverage needs the desktop app": "Pokrycie kodu wymaga aplikacji stacjonarnej",
+  "Coverage suites": "Zestawy pokrycia kodu",
+  "Create": "Utwórz",
+  "Create Branch": "Utwórz gałąź",
+  "Create New Branch": "Utwórz nową gałąź",
+  "Create New Test…": "Utwórz nowy test…",
+  "Create Patch": "Utwórz łatkę",
+  "Create Patch…": "Utwórz łatkę…",
+  "Create Pull Request": "Utwórz pull request",
+  "Create Pull Request…": "Utwórz pull request…",
+  "Create Run Configuration": "Utwórz konfigurację uruchamiania",
+  "Create Run Configuration…": "Utwórz konfigurację uruchamiania…",
+  "Create Stash": "Utwórz schowek (Stash)",
+  "Create Tag": "Utwórz tag",
+  "Create Terminal": "Utwórz terminal",
+  "Create Terminal in Container": "Utwórz terminal w kontenerze",
+  "Create UTF-8 files": "Twórz pliki w kodowaniu UTF-8",
+  "Creating virtual environment": "Tworzenie środowiska wirtualnego",
+  "Current": "Bieżący",
+  "Current Branch": "Bieżąca gałąź",
+  "Current File": "Bieżący plik",
+  "Current date": "Bieżąca data",
+  "Current window": "Bieżące okno",
+  "Cursor shape": "Kształt kursora",
+  "Custom colour": "Własny kolor",
+  "Custom colour hex": "Kod szesnastkowy własnego koloru",
+  "Customize": "Dostosuj",
+  "Cut": "Wytnij",
+  "Data Source": "Źródło danych",
+  "Data Source Properties…": "Właściwości źródła danych…",
+  "Data Source from File…": "Źródło danych z pliku…",
+  "Data Source from URL": "Źródło danych z adresu URL",
+  "Data Source from URL…": "Źródło danych z adresu URL…",
+  "Data Views": "Widoki danych",
+  "Data class": "Klasa danych",
+  "Data source": "Źródło danych",
+  "Data source settings": "Ustawienia źródła danych",
+  "Data sources": "Źródła danych",
+  "Data type": "Typ danych",
+  "Database": "Baza danych",
+  "Database actions": "Akcje bazy danych",
+  "Database output": "Dane wyjściowe bazy danych",
+  "Database:": "Baza danych:",
+  "Date": "Data",
+  "Date Formats": "Formaty daty",
+  "Date format": "Format daty",
+  "Deactivate": "Dezaktywuj",
+  "Debug": "Debuguj",
+  "Debug Configuration": "Konfiguracja debugowania",
+  "Debug Context Configuration": "Konfiguracja kontekstu debugowania",
+  "Debug adapter": "Adapter debugowania",
+  "Debug adapters & processes": "Adaptery debugowania i procesy",
+  "Debug console": "Konsola debugowania",
+  "Debug console input": "Wejście konsoli debugowania",
+  "Debug sessions": "Sesje debugowania",
+  "Debug views": "Widoki debugowania",
+  "Debuggable configurations": "Konfiguracje z możliwością debugowania",
+  "Debugger": "Debugger",
+  "Debugger actions": "Akcje debuggera",
+  "Debugger is not available": "Debugger nie jest dostępny",
+  "Debugging": "Debugowanie",
+  "Debugging Java needs Microsoft java-debug, loaded into the Java language server. Install it and debug again once jdtls has restarted.": "Debugowanie kodu Java wymaga modułu Microsoft java-debug wczytanego do serwera językowego Java. Zainstaluj go i uruchom debugowanie ponownie po ponownym uruchomieniu jdtls.",
+  "Debugging needs the desktop app": "Debugowanie wymaga aplikacji stacjonarnej",
+  "Debug…": "Debuguj…",
+  "Declaration or Usages": "Deklaracja lub użycia",
+  "Decoded text": "Zdekodowany tekst",
+  "Decodes files outside the project that are not valid UTF-8.": "Dekoduje pliki spoza projektu, które nie są prawidłowymi plikami UTF-8.",
+  "Default": "Domyślny",
+  "Default Directory": "Katalog domyślny",
+  "Default Tab name": "Domyślna nazwa karty",
+  "Default directory": "Katalog domyślny",
+  "Default encoding": "Kodowanie domyślne",
+  "Transparent native-to-ascii conversion": "Przezroczysta konwersja native-to-ascii",
+  "Default encoding for properties files": "Domyślne kodowanie dla plików właściwości (.properties)",
+  "Default value": "Wartość domyślna",
+  "Definition": "Definicja",
+  "Delete": "Usuń",
+  "Delete '{name}'?": "Usunąć '{name}'?",
+  "Delete '{name}' and its contents?": "Usunąć '{name}' wraz z zawartością?",
+  "Delete {count} items?": "Usunąć elementy ({count})?",
+  "Delete {count} items (including folder contents)?": "Usunąć elementy ({count}) (w tym zawartość folderu)?",
+  "Items are moved to the Trash.": "Elementy zostaną przeniesione do Kosza.",
+  "Delete Anyway": "Usuń mimo to",
+  "Delete Bookmark": "Usuń zakładkę",
+  "Delete Branch": "Usuń gałąź",
+  "Delete Changelist": "Usuń listę zmian",
+  "Delete Docker Object…": "Usuń obiekt Dockera…",
+  "Delete Keymap": "Usuń mapę skrótów",
+  "Delete Remote Branch": "Usuń gałąź zdalną",
+  "Delete Rows": "Usuń wiersze",
+  "Delete Shelved Changes": "Usuń odłożone zmiany (shelf)",
+  "Delete all rows of": "Usuń wszystkie wiersze z",
+  "Delete local copies of added files": "Usuń lokalne kopie dodanych plików",
+  "Deleted": "Usunięto",
+  "Delete…": "Usuń…",
+  "Description": "Opis",
+  "Details": "Szczegóły",
+  "Detect again": "Wykryj ponownie",
+  "Detect and use existing file indents for editing": "Wykrywaj i używaj istniejących wcięć pliku podczas edycji",
+  "Detected from the project. Changes are saved as a user configuration that overrides it.": "Wykryto z projektu. Zmiany są zapisywane jako konfiguracja użytkownika, która ją nadpisuje.",
+  "Detected from the toolchain": "Wykryto z łańcucha narzędzi (toolchain)",
+  "Detecting installations": "Wykrywanie instalacji",
+  "Detecting…": "Wykrywanie…",
+  "Diff": "Różnice (Diff)",
+  "Different tool window background": "Inne tło okien narzędziowych",
+  "Direction": "Kierunek",
+  "Directory": "Katalog",
+  "Staging State": "Stan poczekalni (Staging)",
+  "Staged Changes": "Zmiany w poczekalni (Staged)",
+  "Unstaged Changes": "Zmiany poza poczekalnią (Unstaged)",
+  "Directory (relative to project root)": "Katalog (względnie do katalogu głównego projektu)",
+  "Directory Mappings": "Mapowanie katalogów",
+  "Directory mappings": "Mapowanie katalogów",
+  "Directory of the current file": "Katalog bieżącego pliku",
+  "Directory of the current file relative to the project": "Katalog bieżącego pliku względnie do projektu",
+  "Directory to Clone Into": "Katalog do sklonowania",
+  "Directory:": "Katalog:",
+  "Disable": "Wyłącz",
+  "Disable All Downloaded Plugins": "Wyłącz wszystkie pobrane wtyczki",
+  "Disabled": "Wyłączone",
+  "Dismiss": "Odrzuć",
+  "Display balloon notifications": "Wyświetlaj powiadomienia w chmurkach",
+  "Display icons in menu items": "Wyświetlaj ikony w elementach menu",
+  "Distinguish projects with different colors in the main toolbar": "Wyróżniaj projekty różnymi kolorami na głównym pasku narzędzi",
+  "Distraction free mode text width:": "Szerokość tekstu w trybie bez rozpraszania uwagi:",
+  "Do Refactor": "Wykonaj refaktoryzację",
+  "Do not add": "Nie dodawaj",
+  "Do not ask again": "Nie pytaj ponownie",
+  "Do not highlight": "Nie podświetlaj",
+  "Do not ignore": "Nie ignoruj",
+  "Do not remove": "Nie usuwaj",
+  "Do not step into library scripts": "Nie wchodź do skryptów bibliotecznych",
+  "Docker is not installed": "Docker nie jest zainstalowany",
+  "Docker is not running": "Docker nie jest uruchomiony",
+  "Documentation": "Dokumentacja",
+  "Documentation comments": "Komentarze dokumentacyjne",
+  "Does not apply cleanly": "Nie nakłada się czysto",
+  "Does not apply cleanly: a 3-way merge will be attempted": "Nie nakłada się czysto: zostanie podjęta próba scalania 3-stronnego",
+  "Don't ask again": "Nie pytaj ponownie",
+  "Done": "Gotowe",
+  "Down": "W dół",
+  "Downloaded": "Pobrane",
+  "Download…": "Pobierz…",
+  "Drag-and-drop with Alt pressed only": "Przeciągnij i upuść tylko z wciśniętym klawiszem Alt",
+  "Driver": "Sterownik",
+  "Driver:": "Sterownik:",
+  "Drop": "Odrzuć",
+  "Drop Column": "Usuń kolumnę",
+  "Drop Commit": "Odrzuć zatwierdzenie (commit)",
+  "Drop Commits": "Odrzuć zatwierdzenia (commits)",
+  "Drop Stash": "Odrzuć schowek (Stash)",
+  "Drop a folder to open it as a project, or files to edit them": "Upuść folder, aby otworzyć go jako projekt, lub pliki, aby je edytować",
+  "Drop files here to open them": "Upuść pliki tutaj, aby je otworzyć",
+  "Drop syntax trees and EditorConfig caches, compact the index": "Odrzuć drzewa składniowe i pamięć podręczną EditorConfig, skompresuj indeks",
+  "Drop…": "Odrzuć…",
+  "Duplicate": "Duplikuj",
+  "Duplicate Keymap": "Duplikuj mapę skrótów",
+  "Duplicate groups": "Zduplikuj grupy",
+  "Duplicates": "Duplikaty",
+  "Duplicate…": "Duplikuj…",
+  "Edit": "Edycja",
+  "Edit Cell": "Edytuj komórkę",
+  "Edit Changelist": "Edytuj listę zmian",
+  "Edit Changelist…": "Edytuj listę zmian…",
+  "Edit Commit Message…": "Edytuj wiadomość zatwierdzenia…",
+  "Edit Configurations…": "Edytuj konfiguracje…",
+  "Edit Configuration…": "Edytuj konfigurację…",
+  "Edit Data": "Edytuj dane",
+  "Edit the configuration that would run the context before saving it": "Edytuj konfigurację, która uruchomiłaby kontekst, przed jej zapisaniem",
+  "Editor": "Edytor",
+  "Editor Actions": "Akcje edytora",
+  "Editor Tabs": "Karty edytora",
+  "Editor color scheme": "Schemat kolorów edytora",
+  "Editor resynchronised": "Edytor został ponownie zsynchronizowany",
+  "Editor tabs": "Karty edytora",
+  "Editor › Font": "Edytor › Czcionka",
+  "Editor › General": "Edytor › Ogólne",
+  "Effect": "Efekt",
+  "Effect color": "Kolor efektu",
+  "Effects": "Efekty",
+  "Element": "Element",
+  "Empty": "Pusty",
+  "Empty file": "Pusty plik",
+  "Enable All Downloaded Plugins": "Włącz wszystkie pobrane wtyczki",
+  "Enable EditorConfig support": "Włącz obsługę EditorConfig",
+  "Enable Settings › Build, Execution, Deployment › Debugger › Allow placing breakpoints in any file.": "Włącz Ustawienia › Budowanie, Wykonanie, Wdrożenie › Debugger › Zezwalaj na umieszczanie punktów przerwania w dowolnym pliku.",
+  "Enable drag-and-drop functionality in editor": "Włącz funkcję przeciągnij i upuść w edytorze",
+  "Enable ligatures": "Włącz ligatury",
+  "Enable postfix completion": "Włącz uzupełnianie postfiksowe",
+  "Enable preview tab": "Włącz kartę podglądu",
+  "Enable when debugging code that uses gevent monkey-patching.": "Włącz podczas debugowania kodu używającego monkey-patching gevent.",
+  "Enabled": "Włączone",
+  "Enabled tools appear in Find Action (⇧⌘A) under “External Tools” and can get shortcuts in Keymap. Output is shown in the Run tool window.": "Włączone narzędzia pojawiają się w Znajdź akcję (⇧⌘A) w sekcji „Narzędzia zewnętrzne” i mogą otrzymać skróty w Mapie skrótów. Dane wyjściowe są wyświetlane w oknie narzędziowym Uruchom.",
+  "Encoding of the output of processes started from Run configurations.": "Kodowanie danych wyjściowych procesów uruchamianych z konfiguracji uruchamiania.",
+  "Enhanced for loop": "Ulepszona pętla for",
+  "Ensure every saved file ends with a line break": "Upewnij się, że każdy zapisany plik kończy się znakiem końca wiersza",
+  "Enter a positive number of commits": "Wprowadź dodatnią liczbę zatwierdzeń",
+  "Enter a tag, branch or commit hash:": "Wprowadź tag, gałąź lub hasz zatwierdzenia:",
+  "Enter the name of new tag:": "Wprowadź nazwę nowego tagu:",
+  "Enum": "Typ wyliczeniowy (Enum)",
+  "Enum class": "Klasa wyliczeniowa (Enum)",
+  "Environment": "Środowisko",
+  "Environment variables": "Zmienne środowiskowe",
+  "Error Highlighting": "Podświetlanie błędów",
+  "Evaluate": "Oblicz/Ewaluuj",
+  "Evaluate Expression…": "Oblicz wyrażenie…",
+  "Evaluate expression": "Oblicz wyrażenie",
+  "Evaluate expression (↩) or add a watch (⇧⌘↩)": "Oblicz wyrażenie (↩) lub dodaj do obserwowanych (⇧⌘↩)",
+  "Evaluate in the debug console": "Oblicz w konsoli debugowania",
+  "Evaluation result": "Wynik obliczenia",
+  "Everything is up to date": "Wszystko jest aktualne",
+  "Exception Breakpoints": "Punkty przerwania wyjątków",
+  "Exception breakpoints": "Punkty przerwania wyjątków",
+  "Exclude": "Wyklucz",
+  "Exclude / include (⌫)": "Wyklucz / dołącz (⌫)",
+  "Exclude patterns": "Wzorce wykluczeń",
+  "Excluded": "Wykluczone",
+  "Excluded Folders": "Wykluczone foldery",
+  "Excluded usages are skipped.": "Wykluczone użycia są pomijane.",
+  "Execute": "Wykonaj",
+  "Execute Gradle Task…": "Wykonaj zadanie Gradle…",
+  "Execute Maven Goal…": "Wykonaj cel (goal) Maven…",
+  "Execute SQL Statement": "Wykonaj instrukcję SQL",
+  "Execute a statement in a query console with ⌘↩.": "Wykonaj instrukcję w konsoli zapytań za pomocą ⌘↩.",
+  "Existing changelist": "Istniejąca lista zmian",
+  "Existing changelist:": "Istniejąca lista zmian:",
+  "Existing environment": "Istniejące środowisko",
+  "Exit": "Wyjście",
+  "Expand": "Rozwiń",
+  "Expand All": "Rozwiń wszystko",
+  "Expand abbreviations with Tab": "Rozwijaj skróty za pomocą klawisza Tab",
+  "Expand folded lines": "Rozwiń zwinięte wiersze",
+  "Expand templates with Tab": "Rozwijaj szablony za pomocą klawisza Tab",
+  "Explicitly check for incoming commits on remotes": "Jawnie sprawdzaj przychodzące zatwierdzenia w repozytoriach zdalnych",
+  "Export Data": "Eksportuj dane",
+  "Expression": "Wyrażenie",
+  "Expression to evaluate in the selected frame": "Wyrażenie do obliczenia w wybranej ramce",
+  "Expressions": "Wyrażenia",
+  "Extension": "Rozszerzenie",
+  "Extension of the current file": "Rozszerzenie bieżącego pliku",
+  "External Linters": "Zewnętrzne lintery",
+  "External Tools": "Narzędzia zewnętrzne",
+  "External tool": "Narzędzie zewnętrzne",
+  "External tools": "Narzędzia zewnętrzne",
+  "External tools actions": "Akcje narzędzi zewnętrznych",
+  "Extract Method…": "Wyodrębnij metodę…",
+  "Failed to install {name}": "Nie udało się zainstalować {name}",
+  "Failed to uninstall {name}": "Nie udało się odinstalować {name}",
+  "FIXME comment": "Komentarz FIXME",
+  "Failed": "Nie powiodło się",
+  "Failed to restart language server": "Nie udało się zrestartować serwera językowego",
+  "Fallback font": "Czcionka zastępcza",
+  "Fallback font:": "Czcionka zastępcza:",
+  "Fetch": "Pobierz dane (Fetch)",
+  "Fetches remotes in the background so incoming commits show in the Branches popup. Auto stops after an authentication failure.": "Pobiera dane z repozytoriów zdalnych w tle, aby przychodzące zatwierdzenia pojawiały się w oknie wyskakującym Gałęzie. Tryb Auto zatrzymuje się po niepowodzeniu uwierzytelniania.",
+  "Field access": "Dostęp do pola",
+  "Field modification": "Modyfikacja pola",
+  "Field watchpoints can be set on Java field declarations, or from the Variables view while suspended.": "Punkty obserwacji pola można ustawiać na deklaracjach pól Java lub w widoku Zmienne podczas wstrzymania.",
+  "File": "Plik",
+  "File Encoding": "Kodowanie pliku",
+  "File Encodings": "Kodowania plików",
+  "File Encodings Settings…": "Ustawienia kodowania plików…",
+  "File Name": "Nazwa pliku",
+  "File Structure": "Struktura pliku",
+  "File Types": "Typy plików",
+  "File and Code Templates": "Szablony plików i kodu",
+  "File encoding": "Kodowanie pliku",
+  "File header": "Nagłówek pliku",
+  "File mask": "Maska pliku",
+  "File mask:": "Maska pliku:",
+  "File name": "Nazwa pliku",
+  "File name style": "Styl nazwy pliku",
+  "File name with extension": "Nazwa pliku z rozszerzeniem",
+  "File name without extension": "Nazwa pliku bez rozszerzenia",
+  "File not found": "Nie znaleziono pliku",
+  "File patterns": "Wzorze plików",
+  "File templates": "Szablony plików",
+  "File:": "Plik:",
+  "Files": "Pliki",
+  "Files to include": "Pliki do dołączenia",
+  "Files to roll back": "Pliki do cofnięcia",
+  "Files to shelve": "Pliki do odłożenia na półkę (shelve)",
+  "Files will be reverted to the state of the selected commit, but local changes will be kept intact.": "Pliki zostaną przywrócone do stanu z wybranego zatwierdzenia, ale zmiany lokalne pozostaną nienaruszone.",
+  "Files will be reverted to the state of the selected commit. Warning: any local changes will be lost.": "Pliki zostaną przywrócone do stanu z wybranego zatwierdzenia. Ostrzeżenie: wszelkie zmiany lokalne zostaną utracone.",
+  "Files won't change, differences will be staged for commit.": "Pliki nie ulegną zmianie, różnice zostaną przeniesione do poczekalni (staged) do zatwierdzenia.",
+  "Files won't change, differences won't be staged.": "Pliki nie ulegną zmianie, różnice nie zostaną przeniesione do poczekalni.",
+  "Filter": "Filtruj",
+  "Filter TODO Items": "Filtruj elementy TODO",
+  "Filter by Branch": "Filtruj według gałęzi",
+  "Filter by Date": "Filtruj według daty",
+  "Filter by User": "Filtruj według użytkownika",
+  "Filter by message": "Filtruj według wiadomości",
+  "Filter by name, PID or command line": "Filtruj według nazwy, PID lub wiersza poleceń",
+  "Filter by tool or language": "Filtruj według narzędzia lub języka",
+  "Filter language servers": "Filtruj serwery językowe",
+  "Filter plugins": "Filtruj wtyczki",
+  "Filter processes": "Filtruj procesy",
+  "Filter recent files": "Filtruj niedawne pliki",
+  "Filter recent locations": "Filtruj niedawne lokalizacje",
+  "Filter symbols": "Filtruj symbole",
+  "Filter templates": "Filtruj szablony",
+  "Find": "Znajdź",
+  "Find Actions by Shortcut": "Znajdź akcje według skrótu",
+  "Find Action…": "Znajdź akcję…",
+  "Find Next Occurrence": "Znajdź następne wystąpienie",
+  "Find Previous Occurrence": "Znajdź poprzednie wystąpienie",
+  "Find Usages": "Znajdź użycia",
+  "Find Usages of File": "Znajdź użycia pliku",
+  "Find actions by shortcut": "Znajdź akcje według skrótu",
+  "Find in Directory…": "Znajdź w katalogu…",
+  "Find in Files": "Znajdź w plikach",
+  "Find in Files…": "Znajdź w plikach…",
+  "Find in Folder…": "Znajdź w folderze…",
+  "Find in Terminal": "Znajdź w terminalu",
+  "Find in console": "Znajdź w konsoli",
+  "Find in file": "Znajdź w pliku",
+  "Find in terminal": "Znajdź w terminalu",
+  "Find results": "Wyniki wyszukiwania",
+  "Find…": "Znajdź…",
+  "First letter only": "Tylko pierwsza litera",
+  "First stroke": "Naciśnięcie pierwsze",
+  "First stroke:": "Naciśnięcie pierwsze:",
+  "Fix the highlighted fields": "Popraw podświetlone pola",
+  "Flame Graph": "Wykres płomieniowy (Flame Graph)",
+  "Flame graph": "Wykres płomieniowy",
+  "Focus Editor": "Przejdź do edytora",
+  "Focus application on breakpoint": "Przenieś fokus na aplikację w punkcie przerwania",
+  "Fold Selection / Remove Region": "Zwiń zaznaczenie / Usuń region",
+  "Fold by default:": "Zwijaj domyślnie:",
+  "Fold console lines that contain": "Zwijaj wiersze konsoli zawierające",
+  "Folding": "Zwijanie kodu",
+  "Font": "Czcionka",
+  "Font preview": "Podgląd czcionki",
+  "For protanopia and deuteranopia.": "Dla protanopii i deuteranopii.",
+  "For symbols not supported by the main font": "Dla symboli nieobsługiwanych przez czcionkę główną",
+  "Force": "Wymuś",
+  "Force (with lease)": "Wymuś (z ograniczeniem/with lease)",
+  "Force Push": "Wymuś wysłanie (Force Push)",
+  "Force Run to Cursor": "Wymuś uruchomienie do kursora",
+  "Force Step Into": "Wymuś krok do środka",
+  "Force Step Over": "Wymuś krok nad",
+  "Foreground": "Pierwszy plan",
+  "Formats the whole file with the language server's formatter.": "Formatuje cały plik za pomocą formatowania serwera językowego.",
+  "Forward": "Dalej",
+  "Found usages": "Znalezione użycia",
+  "Fragment": "Fragment",
+  "Frames": "Ramki",
+  "From Template…": "Z szablonu…",
+  "From settings.xml, else ~/.m2/repository": "Z settings.xml, w przeciwnym razie ~/.m2/repository",
+  "From:": "Od:",
+  "Function": "Funkcja",
+  "Function component": "Komponent funkcyjny",
+  "Function with return type": "Funkcja z typem zwracanym",
+  "Functions:": "Funkcje:",
+  "General": "Ogólne",
+  "Generate": "Generuj",
+  "Generate DDL to Clipboard": "Wygeneruj DDL do schowka",
+  "Generate DDL to Query Console": "Wygeneruj DDL do konsoli zapytań",
+  "Generate Request in HTTP Client": "Wygeneruj żądanie w kliencie HTTP",
+  "Generate Requests for Controller": "Wygeneruj żądania dla kontrolera",
+  "Generate…": "Generuj…",
+  "Get from Version Control…": "Pobierz z systemu kontroli wersji…",
+  "Gevent compatible": "Zgodny z gevent",
+  "Git Branches": "Gałęzie Git",
+  "Git Log": "Dziennik Git",
+  "Git Reset": "Resetowanie Git",
+  "Git commands run by the IDE appear here.": "Polecenia Git uruchamiane przez IDE pojawiają się tutaj.",
+  "Git console": "Konsola Git",
+  "GitHub CLI is not installed": "Interfejs CLI systemu GitHub nie jest zainstalowany",
+  "Gliding": "Płynne",
+  "Glob patterns (e.g. **/dist, *.log) hidden from the project tree and skipped by search and indexing.": "Wzorce glob (np. **/dist, *.log) ukryte w drzewie projektu oraz pomijane podczas wyszukiwania i indeksowania.",
+  "Global Encoding": "Kodowanie globalne",
+  "Go SDK used by gopls and the go run / test configurations.": "SDK języka Go używane przez gopls oraz konfiguracje go run / test.",
+  "Go To": "Przejdź do",
+  "Go to Child Commit": "Przejdź do zatwierdzenia potomnego",
+  "Go to Class…": "Przejdź do klasy…",
+  "Go to DDL": "Przejdź do DDL",
+  "Go to File": "Przejdź do pliku",
+  "Go to File…": "Przejdź do pliku…",
+  "Go to Line:Column": "Przejdź do Wiersz:Kolumna",
+  "Go to Line:Column…": "Przejdź do Wiersz:Kolumna…",
+  "Go to Parent Commit": "Przejdź do zatwierdzenia nadrzędnego",
+  "Go to Referenced Table": "Przejdź do tabeli docelowej",
+  "Go to Source": "Przejdź do źródła",
+  "Go to Symbol…": "Przejdź do symbolu…",
+  "Gradle actions": "Akcje Gradle",
+  "Gradle command line": "Wiersz poleceń Gradle",
+  "Gradle projects": "Projekty Gradle",
+  "Gradle sync failed": "Synchronizacja Gradle nie powiodła się",
+  "Green": "Zielony",
+  "Grey": "Szary",
+  "Greyscale": "Skala szarości",
+  "Group": "Grupa",
+  "Group by Severity": "Grupuj według ważności",
+  "Groups": "Grupy",
+  "Gutter Icons": "Ikony na marginesie",
+  "HACK comment": "Komentarz HACK",
+  "HEAD (Current Branch)": "HEAD (bieżąca gałąź)",
+  "HTML 5 file": "Plik HTML 5",
+  "HTTP Client": "Klient HTTP",
+  "HTTP Client environments": "Środowiska klienta HTTP",
+  "Hard": "Twarde",
+  "Hard wrap at": "Twarde zawijanie przy",
+  "Hello: Insert Date": "Hello: Wstaw datę",
+  "Hello: Word Count of Active File": "Hello: Liczba słów w aktywnym pliku",
+  "Help": "Pomoc",
+  "Hex view": "Widok szesnastkowy",
+  "Hide": "Ukryj",
+  "Hide Active Tool Window": "Ukryj aktywne okno narzędziowe",
+  "Hide All Tool Windows": "Ukryj wszystkie okna narzędziowe",
+  "Hide changes": "Ukryj zmiany",
+  "Hide Coverage": "Ukryj pokrycie kodu",
+  "Hide Library Frames": "Ukryj ramki biblioteczne",
+  "Hide Replace": "Ukryj zastępowanie",
+  "Hide debug window on process termination": "Ukryj okno debugowania po zakończeniu procesu",
+  "Auto-detect": "Wykryj automatycznie",
+  "Hide install log": "Ukryj dziennik instalacji",
+  "Hierarchies": "Hierarchie",
+  "Hierarchy": "Hierarchia",
+  "Hierarchy actions": "Akcje hierarchii",
+  "High Contrast": "Wysoki kontrast",
+  "Highlight hyperlinks": "Podświetl hiperłącza",
+  "Highlight lines": "Podświetl wiersze",
+  "Highlight on Caret Movement": "Podświetl przy ruchu kursora",
+  "Highlight words": "Podświetl słowa",
+  "Highlighting": "Podświetlanie",
+  "Hit count": "Liczba trafień",
+  "Hit count condition": "Warunek liczby trafień",
+  "Home moves caret to first non-whitespace character": "Klawisz Home przesuwa kursor do pierwszego znaku niebędącego białym znakiem",
+  "Homepage": "Strona główna",
+  "Host:": "Host:",
+  "Hot Swap": "Zamiana na gorąco (Hot Swap)",
+  "Hot Swap failed": "Zamiana na gorąco (Hot Swap) nie powiodła się",
+  "HotSwap: compile and reload the changed classes into the running Java debug session": "HotSwap: skompiluj i przeładuj zmienione klasy do uruchomionej sesji debugowania Java",
+  "Hovering a variable while suspended evaluates it in the selected frame.": "Najedchanie kursorem na zmienną podczas wstrzymania oblicza jej wartość w wybranej ramce.",
+  "IDE Updates": "Aktualizacje IDE",
+  "IDE and Project Settings": "Ustawienia IDE i projektu",
+  "IDE font": "Czcionka IDE",
+  "IDE font size": "Rozmiar czcionki IDE",
+  "Installed {name} {version}": "Zainstalowano {name} {version}",
+  "Installing {name}": "Instalowanie {name}",
+  "IPC round trip": "Cykl komunikacji IPC",
+  "Already ignored": "Już zignorowano",
+  "Idle seconds": "Sekundy bezczynności",
+  "Ignore files and folders": "Ignoruj pliki i foldery",
+  "Ignore whitespace": "Ignoruj białe znaki",
+  "Ignore whitespaces": "Ignoruj białe znaki",
+  "Ignore whitespaces and empty lines": "Ignoruj białe znaki i puste wiersze",
+  "Ignored": "Zignorowano",
+  "Ignored Files and Folders": "Zignorowane pliki i foldery",
+  "Ignored names": "Zignorowane nazwy",
+  "Image": "Obraz",
+  "Image viewer": "Przeglądarka obrazów",
+  "Implement Members": "Zaimplementuj składowe",
+  "Implementation(s)": "Implementacje",
+  "Imports": "Importy",
+  "In Project": "W projekcie",
+  "Include": "Dołącz",
+  "Include non-project items": "Dołącz elementy spoza projektu",
+  "Include untracked files": "Dołącz niesformatowane/nieśledzone pliki",
+  "Incoming commits": "Przychodzące zatwierdzenia",
+  "Indent": "Wcięcie",
+  "Indent Block": "Zwiększ wcięcie bloku",
+  "Indent Each Line": "Zwiększ wcięcie każdego wiersza",
+  "Collapse Recursively": "Zwiń rekurencyjnie",
+  "Expand Recursively": "Rozwiń rekurencyjnie",
+  "Move Caret to Matching Brace": "Przesuń kursor do pasującego nawiasu",
+  "Toggle Insert/Overwrite": "Przełącz Wstawianie/Nadpisywanie",
+  "Indentation": "Wcięcia",
+  "Indents Detection": "Wykrywanie wcięć",
+  "Index": "Indeks",
+  "Index (indexing…)": "Indeks (indeksowanie…)",
+  "Indexed for loop": "Indeksowana pętla for",
+  "Indexing": "Indeksowanie",
+  "Inlay Hints": "Wskazówki wewnątrzlinijkowe (Inlay Hints)",
+  "Inline…": "Wstaw w miejscu (Inline)…",
+  "Inner": "Wewnętrzne",
+  "Insert Live Template…": "Wstaw aktywny szablon…",
+  "Insert Macro…": "Wstaw makro…",
+  "Insert pair quote": "Wstawiaj parzyste cudzysłowy",
+  "Insert selected suggestion by pressing space, dot, or other context-dependent keys": "Wstawiaj wybraną sugestię po naciśnięciu spacji, kropki lub innych klawiszy zależnych od kontekstu",
+  "Inspect": "Inspekcjonuj",
+  "Inspect Code": "Inspekcjonuj kod",
+  "Inspect Code…": "Inspekcjonuj kod…",
+  "Inspect Docker Object": "Inspekcjonuj obiekt Dockera",
+  "Inspecting…": "Inspekcjonowanie…",
+  "Inspection Results": "Wyniki inspekcji",
+  "Inspection progress": "Postęp inspekcji",
+  "Inspection results": "Wyniki inspekcji",
+  "Install": "Zainstaluj",
+  "Install Docker Desktop, OrbStack, Colima or the Docker Engine and make sure": "Zainstaluj Docker Desktop, OrbStack, Colima lub Docker Engine i upewnij się, że",
+  "Install Language Server / Debugger": "Zainstaluj serwer językowy / debugger",
+  "Install Package": "Zainstaluj pakiet",
+  "Install Plugin from Disk": "Zainstaluj wtyczkę z dysku",
+  "Install Plugin from Disk…": "Zainstaluj wtyczkę z dysku…",
+  "Install a plugin folder with": "Zainstaluj folder wtyczki za pomocą",
+  "Install and Debug": "Zainstaluj i debuguj",
+  "Install gh…": "Zainstaluj gh…",
+  "Installed": "Zainstalowane",
+  "Installed packages": "Zainstalowane pakiety",
+  "Installed plugins": "Zainstalowane wtyczki",
+  "Installing plugin": "Instalowanie wtyczki",
+  "Intentions": "Intencje",
+  "Interactively Rebase from Here…": "Interaktywnie zmień bazę od tego miejsca…",
+  "Interface": "Interfejs",
+  "Interface type": "Typ interfejsu",
+  "Interpreter": "Interpreter",
+  "Interpreter type": "Typ interpretera",
+  "Interpreter:": "Interpreter:",
+  "Introduce Constant…": "Wprowadź stałą…",
+  "Introduce Field…": "Wprowadź pole…",
+  "Introduce Parameter…": "Wprowadź parametr…",
+  "Introduce Variable…": "Wprowadź zmienną…",
+  "Invalid": "Nieprawidłowe",
+  "Invalidate Caches": "Unieważnij pamięć podręczną",
+  "Invalidate Caches…": "Unieważnij pamięć podręczną…",
+  "Invalidate and Restart": "Unieważnij i zrestartuj",
+  "Islands Dark": "Islands Ciemny",
+  "Islands Light": "Islands Jasny",
+  "Issue ID": "ID zgłoszenia",
+  "Issue Link": "Link do zgłoszenia",
+  "Issue Navigation": "Nawigacja zgłoszeń",
+  "Issue navigation": "Nawigacja zgłoszeń",
+  "Issue navigation links": "Linki nawigacyjne do zgłoszeń",
+  "Italic": "Kursywa",
+  "JUnit 5 Test": "Test JUnit 5",
+  "JUnit test": "Test JUnit",
+  "JVM options": "Opcje JVM",
+  "Jump outside closing bracket/quote with Tab": "Przeskocz poza zamykający nawias/cudzysłów klawiszem Tab",
+  "Jump to Last Tool Window": "Przejdź do ostatniego okna narzędziowego",
+  "Jump to Navigation Bar": "Przejdź do paska nawigacji",
+  "Jump to Query Console…": "Przejdź do konsoli zapytań…",
+  "Jump to Source": "Przejdź do źródła",
+  "Just Restart": "Tylko zrestartuj",
+  "Keep": "Zachowaj",
+  "Keep Tab Open": "Zachowaj kartę otwartą",
+  "Keep Column": "Zachowaj kolumnę",
+  "Keep index": "Zachowaj indeks",
+  "Keep local history for": "Zachowuj historię lokalną przez",
+  "Keep trailing spaces on caret line": "Zachowuj końcowe spacje w wierszu kursora",
+  "Key pair": "Para kluczy",
+  "Keymap": "Mapa skrótów",
+  "Keymap:": "Mapa skrótów:",
+  "Keymap…": "Mapa skrótów…",
+  "Keys are recorded as pressed, including Tab and Esc. Use the buttons to finish.": "Klawisze są nagrywane zgodnie z ich naciśnięciem, w tym Tab i Esc. Użyj przycisków, aby zakończyć.",
+  "Keystroke → paint": "Naciśnięcie klawisza → wyrenderowanie",
+  "Keystroke-to-paint latency, IPC round trips and long tasks": "Opóźnienie między naciśnięciem klawisza a wyrenderowaniem, cykle komunikacji IPC oraz długie zadania",
+  "Keyword": "Słowo kluczowe",
+  "Kind": "Rodzaj",
+  "Kind label": "Etykieta rodzaju",
+  "Kinds": "Rodzaje",
+  "Label name:": "Nazwa etykiety:",
+  "Language": "Język",
+  "Language Defaults": "Domyślne ustawienia języka",
+  "Language Server": "Serwer językowy",
+  "Language server '{name}' is not installed": "Serwer językowy '{name}' nie jest zainstalowany",
+  "Language Servers": "Serwery językowe",
+  "Language Servers…": "Serwery językowe…",
+  "Language Services": "Usługi językowe",
+  "Language and Region": "Język i region",
+  "Language servers": "Serwery językowe",
+  "Language servers and debug adapters": "Serwery językowe i adaptery debugowania",
+  "Language support for .toy files: detection, comments and indentation.": "Obsługa języka dla plików .toy: wykrywanie, komentarze i wcięcia.",
+  "Languages": "Języki",
+  "Languages & Frameworks": "Języki i technologie",
+  "Last 24 Hours": "Ostatnie 24 godziny",
+  "Last 30 Days": "Ostatnie 30 dni",
+  "Last 7 Days": "Ostatnie 7 dni",
+  "Last Edit Location": "Ostatnia lokalizacja edycji",
+  "Last Year": "Ostatni rok",
+  "Last commit": "Ostatnie zatwierdzenie (commit)",
+  "Leading": "Odstęp międzywierszowy (interlinia)",
+  "Leave": "Opuść",
+  "Left Bottom": "Lewo dół",
+  "Left Top": "Lewo góra",
+  "LightEdit": "Tryb LightEdit",
+  "Limit body line": "Limit długości wiersza treści",
+  "Limit history to": "Ogranicz historię do",
+  "Limit subject line": "Limit długości wiersza tematu",
+  "Line Separator": "Separator wierszy",
+  "Line and column": "Wiersz i kolumna",
+  "Line height": "Wysokość wiersza",
+  "Line separator": "Separator wierszy",
+  "Line, %": "Wiersze, %",
+  "Line:Column Number": "Numer Wiersza:Kolumny",
+  "Live Templates": "Aktywne szablony",
+  "Live templates": "Aktywne szablony",
+  "Loaded classes are up to date. Nothing to reload.": "Wczytane klasy są aktualne. Brak elementów do przeładowania.",
+  "Loading packages": "Wczytywanie pakietów",
+  "Loading packages…": "Wczytywanie pakietów…",
+  "Loading plugins": "Wczytywanie wtyczek",
+  "Loading processes…": "Wczytywanie procesów…",
+  "Loading…": "Wczytywanie…",
+  "Local": "Lokalne",
+  "Local History": "Historia lokalna",
+  "Local History of all projects will be deleted.": "Historia lokalna wszystkich projektów zostanie usunięta.",
+  "Local History: Put Label…": "Historia lokalna: Umieść etykietę…",
+  "Local History: Show History": "Historia lokalna: Pokaż historię",
+  "Local repository": "Repozytorium lokalne",
+  "Locate Duplicates": "Lokalizuj duplikaty",
+  "Locate Duplicates…": "Lokalizuj duplikaty…",
+  "Location": "Lokalizacja",
+  "Location:": "Lokalizacja:",
+  "Log": "Dziennik (Log)",
+  "Log filters": "Filtry dziennika",
+  "Long tasks": "Długie zadania",
+  "Looking for references…": "Wyszukiwanie referencji…",
+  "Finding navigation target…": "Wyszukiwanie celu nawigacji…",
+  "Looks for TODO and FIXME in added lines.": "Wyszukuje wpisy TODO i FIXME w dodanych wierszach.",
+  "Macros": "Makra",
+  "Main Menu": "Menu główne",
+  "Make File Read-only": "Oznacz plik jako tylko do odczytu",
+  "Make File Writable": "Zezwól na zapis do pliku",
+  "Make Read-only": "Oznacz jako tylko do odczytu",
+  "Make Writable": "Zezwól na zapis",
+  "Make another changelist active first.": "Najpierw aktywuj inną listę zmian.",
+  "Manage": "Zarządzaj",
+  "Manage Plugins": "Zarządzaj wtyczkami",
+  "Mark Directory as": "Oznacz katalog jako",
+  "Mark Resolved": "Oznacz jako rozwiązane",
+  "Mark as": "Oznacz jako",
+  "Mark as:": "Oznacz jako:",
+  "Mark modified (*)": "Oznacz zmodyfikowane (*)",
+  "Markdown editor layout": "Układ edytora Markdown",
+  "Markdown file": "Plik Markdown",
+  "Markdown preview": "Podgląd Markdown",
+  "Marked folders": "Oznaczone foldery",
+  "Match Case": "Uwzględniaj wielkość liter",
+  "Match case:": "Uwzględniaj wielkość liter:",
+  "Matched brace": "Pasujący nawias",
+  "Matches": "Dopasowania",
+  "Maven actions": "Akcje Maven",
+  "Maven command line": "Wiersz poleceń Maven",
+  "Maven home path": "Ścieżka główna Maven (Maven home)",
+  "Maven projects": "Projekty Maven",
+  "Maven Settings…": "Ustawienia Maven…",
+  "Maven sync finished with errors": "Synchronizacja Maven zakończyła się z błędami",
+  "Maven wrapper, else mvn on PATH": "Opalacz (wrapper) Maven, w przeciwnym razie mvn z PATH",
+  "Maximize": "Maksymalizuj",
+  "Maximize Tool Window": "Maksymalizuj okno narzędziowe",
+  "Maximum local history size per project": "Maksymalny rozmiar historii lokalnej na projekt",
+  "Maximum number of lines": "Maksymalna liczba wierszy",
+  "Memory Indicator": "Wskaźnik pamięci",
+  "Memory and diagnostics": "Pamięć i diagnostyka",
+  "Merge": "Scal (Merge)",
+  "Merge and Push": "Scal i wyślij (Merge and Push)",
+  "Merge conflicts": "Konflikty scalania",
+  "Merge incoming changes into the current branch": "Scal przychodzące zmiany z bieżącą gałęzią",
+  "Merge…": "Scal…",
+  "Message:": "Wiadomość:",
+  "Method": "Metoda",
+  "Method List": "Lista metod",
+  "Method name": "Nazwa metody",
+  "Mine": "Moje",
+  "Minimize": "Minimalizuj",
+  "Minimum duplicate size in tokens": "Minimalny rozmiar duplikatu w tokenach",
+  "Minimum size": "Minimalny rozmiar",
+  "Mixed": "Mieszane",
+  "Modified": "Zmodyfikowano",
+  "Modified lines": "Zmodyfikowane wiersze",
+  "Modify Column…": "Modyfikuj kolumnę…",
+  "Modify Run Configuration…": "Modyfikuj konfigurację uruchamiania…",
+  "Modify Table…": "Modyfikuj tabelę…",
+  "Module": "Moduł",
+  "More": "Więcej",
+  "More Filters": "Więcej filtrów",
+  "More Actions": "Więcej akcji",
+  "More Run/Debug": "Więcej opcji Uruchom/Debuguj",
+  "More Terminal Options": "Więcej opcji terminala",
+  "More Tool Windows": "Więcej okien narzędziowych",
+  "Most recently opened tab": "Ostatnio otwarta karta",
+  "Mouse Control": "Sterowanie myszą",
+  "Mouse reporting": "Raportowanie myszy",
+  "Move": "Przenieś",
+  "Move Changes to Another Changelist": "Przenieś zmiany do innej listy zmian",
+  "Move Down": "Przesuń w dół",
+  "Move File…": "Przenieś plik…",
+  "Move To": "Przenieś do",
+  "Move Up": "Przesuń w górę",
+  "Move to Another Changelist…": "Przenieś do innej listy zmian…",
+  "Move to Opposite Group": "Przenieś do przeciwnej grupy",
+  "Move…": "Przenieś…",
+  "Multiple occurrences found": "Znaleziono wiele wystąpień",
+  "Mute Breakpoints": "Wycisz punkty przerwania",
+  "Mute breakpoints": "Wycisz punkty przerwania",
+  "Name": "Nazwa",
+  "Name for the new constant": "Nazwa dla nowej stałej",
+  "Name for the new variable": "Nazwa dla nowej zmiennej",
+  "Name of the current file": "Nazwa bieżącego pliku",
+  "Name:": "Nazwa:",
+  "Named scope": "Nazwany zakres",
+  "Names (e.g. .DS_Store, *.pyc) hidden from the project tree, navigation bar, search, indexing and Git changes.": "Nazwy (np. .DS_Store, *.pyc) ukryte w drzewie projektu, pasku nawigacji, wyszukiwaniu, indeksowaniu i zmianach Git.",
+  "Narrow down on typing": "Zwężaj podczas pisania",
+  "Navigate": "Nawigacja",
+  "Navigation": "Nawigacja",
+  "Navigation Bar": "Pasek nawigacji",
+  "Navigation bar": "Pasek nawigacji",
+  "Never": "Nigdy",
+  "New": "Nowy",
+  "New Branch…": "Nowa gałąź…",
+  "New Changelist": "Nowa lista zmian",
+  "New Changelist…": "Nowa lista zmian…",
+  "New Data Source": "Nowe źródło danych",
+  "New Data Source…": "Nowe źródło danych…",
+  "New Directory": "Nowy katalog",
+  "New Empty File…": "Nowy pusty plik…",
+  "New File": "Nowy plik",
+  "New HTTP Request": "Nowe żądanie HTTP",
+  "New Scratch File": "Nowy plik roboczy (scratch file)",
+  "New Scratch File…": "Nowy plik roboczy…",
+  "New Tab": "Nowa karta",
+  "New Tag…": "Nowy tag…",
+  "New Terminal Tab": "Nowa karta terminala",
+  "New branch name:": "Nazwa nowej gałęzi:",
+  "New changelist:": "Nowa lista zmian:",
+  "New environment": "Nowe środowisko",
+  "New file from template": "Nowy plik z szablonu",
+  "New from Template…": "Nowy z szablonu…",
+  "New kind": "Nowy rodzaj",
+  "New name": "Nowa nazwa",
+  "New terminal sessions run the interpreter's virtualenv activate script.": "Nowe sesje terminala uruchamiają skrypt aktywacyjny virtualenv interpretera.",
+  "New window": "Nowe okno",
+  "New…": "Nowy…",
+  "Next Bookmark": "Następna zakładka",
+  "Next Change": "Następna zmiana",
+  "Next Conflict Marker": "Następny znacznik konfliktu",
+  "Next Difference": "Następna różnica",
+  "Next Edit Location": "Następna lokalizacja edycji",
+  "Next Occurrence": "Następne wystąpienie",
+  "Next Page": "Następna strona",
+  "Next error action goes to high priority problems only": "Akcja 'Następny błąd' przechodzi tylko do problemów o wysokim priorytecie",
+  "No coverage data for '{name}'": "Brak danych o pokryciu kodu dla '{name}'",
+  "No Environment": "Brak środowiska",
+  "No GitHub repository": "Brak repozytorium GitHub",
+  "No Gradle projects": "Brak projektów Gradle",
+  "No HTTP request at the caret": "Brak żądania HTTP przy kursorze",
+  "No Spring controller at the caret": "Brak kontrolera Spring przy kursorze",
+  "No Spring request mapping at the caret": "Brak mapowania żądania Spring przy kursorze",
+  "No Maven projects": "Brak projektów Maven",
+  "No profile for '{name}'": "Brak profilu dla '{name}'",
+  "No Python found": "Nie znaleziono środowiska Python",
+  "No recent repository URLs": "Brak niedawnych adresów URL repozytoriów",
+  "No recent searches": "Brak niedawnych wyszukiwań",
+  "No TODO items found": "Nie znaleziono elementów TODO",
+  "No TODO items in this file": "Brak elementów TODO w tym pliku",
+  "No active editor": "Brak aktywnego edytora",
+  "No antialiasing": "Bez wygładzania",
+  "No backend caches to clear": "Brak pamięci podręcznej backendu do wyczyszczenia",
+  "No breakpoints. Click a line number to add one.": "Brak punktów przerwania. Kliknij numer wiersza, aby go dodać.",
+  "No build output": "Brak danych wyjściowych kompilacji",
+  "No changes": "Brak zmian",
+  "No changes selected for commit": "Nie wybrano żadnych zmian do zatwierdzenia",
+  "No changes to create a patch from": "Brak zmian, z których można utworzyć łatkę",
+  "No changes to roll back": "Brak zmian do cofnięcia",
+  "No changes to shelve": "Brak zmian do odłożenia na półkę (shelve)",
+  "No commits": "Brak zatwierdzeń (commits)",
+  "No conflicts": "Brak konfliktów",
+  "No coverage data": "Brak danych o pokryciu kodu",
+  "No data sources": "Brak źródeł danych",
+  "No debug session can reload classes": "Żadna sesja debugowania nie może przeładować klas",
+  "No differences": "Brak różnic",
+  "No document": "Brak dokumentu",
+  "No duplicates found": "Nie znaleziono duplikatów",
+  "No editor available": "Brak dostępnego edytora",
+  "No external tools. Click + to add one.": "Brak narzędzi zewnętrznych. Kliknij +, aby dodać jedno.",
+  "No failed tests to rerun": "Brak nieudanych testów do ponownego uruchomienia",
+  "No field declaration on this line": "Brak deklaracji pola w tym wierszu",
+  "No file is open": "Brak otwartego pliku",
+  "No interpreter selected. Choose one above or add a new one.": "Nie wybrano interpretera. Wybierz jeden powyżej lub dodaj nowy.",
+  "No language server available": "Brak dostępnego serwera językowego",
+  "No languages": "Brak języków",
+  "No local changes": "Brak zmian lokalnych",
+  "No matches": "Brak dopasowań",
+  "No matching branches": "Brak pasujących gałęzi",
+  "No matching languages": "Brak pasujących języków",
+  "No matching projects": "Brak pasujących projektów",
+  "No matching templates": "Brak pasujących szablonów",
+  "No merge conflicts": "Brak konfliktów scalania",
+  "No merge, rebase, cherry-pick or revert in progress": "Brak trwającego scalania, zmiany bazy, cherry-pick lub cofania",
+  "No method declaration on this line": "Brak deklaracji metody w tym wierszu",
+  "No notifications": "Brak powiadomień",
+  "No occurrences found": "Nie znaleziono wystąpień",
+  "No patterns": "Brak wzorców",
+  "No plugin selected": "Nie wybrano wtyczki",
+  "No popup": "Brak okna wyskakującego",
+  "No problems found": "Nie znaleziono problemów",
+  "No problems in this file": "Brak problemów w tym pliku",
+  "No profiler snapshots": "Brak migawek profilera",
+  "No project is open": "Brak otwartego projektu",
+  "No requests yet": "Brak żądań do tej pory",
+  "No response selected": "Nie wybrano odpowiedzi",
+  "No results": "Brak wyników",
+  "No reviews": "Brak recenzji",
+  "No run configuration in this project has a debug adapter.": "Żadna konfiguracja uruchamiania w tym projekcie nie posiada adaptera debugowania.",
+  "No run or test configuration of the project matches this file.": "Żadna konfiguracja uruchamiania ani testów w projekcie nie pasuje do tego pliku.",
+  "No search results": "Brak wyników wyszukiwania",
+  "No special permissions.": "Brak specjalnych uprawnień.",
+  "No stashes": "Brak schowków (stashes)",
+  "No structure to show": "Brak struktury do wyświetlenia",
+  "No tools match.": "Brak pasujących narzędzi.",
+  "No usages found": "Nie znaleziono użyć",
+  "No usages of '{name}' found": "Nie znaleziono użyć dla '{name}'",
+  "Node interpreter": "Interpreter Node",
+  "None": "Brak",
+  "None configured": "Brak skonfigurowanych elementów",
+  "Not debugging": "Brak aktywnego debugowania",
+  "Not logged in to GitHub": "Nie zalogowano do GitHub",
+  "Not null": "Nie pusty (Not null)",
+  "Nothing found": "Nic nie znaleziono",
+  "Nothing found in project files": "Nic nie znaleziono w plikach projektu",
+  "Nothing here": "Nic tu nie ma",
+  "Nothing matches": "Nic nie pasuje",
+  "Nothing recorded before this label": "Nic nie zarejestrowano przed tą etykietą",
+  "Nothing to add: the files are already under version control": "Nic do dodania: pliki są już objęte kontrolą wersji",
+  "Nothing to debug": "Brak elementów do debugowania",
+  "Nothing to run here": "Brak elementów do uruchomienia tutaj",
+  "Nothing to show": "Brak elementów do wyświetlenia",
+  "Nothing to undo": "Nic do cofnięcia",
+  "Notification groups": "Grupy powiadomień",
+  "Notifications": "Powiadomienia",
+  "OK": "OK",
+  "Object": "Obiekt",
+  "Object Actions": "Akcje obiektu",
+  "Occurrences": "Wystąpienia",
+  "Occurrences of selected text": "Wystąpienia zaznaczonego tekstu",
+  "Older output is discarded": "Starsze dane wyjściowe są odrzucane",
+  "Only in comments": "Tylko w komentarzach",
+  "Only one usage in Project Files": "Tylko jedno użycie w plikach projektu",
+  "Open": "Otwórz",
+  "Open Diff": "Otwórz okno porównywania (Diff)",
+  "Open File": "Otwórz plik",
+  "Open Files": "Otwarte pliki",
+  "Open Folder": "Otwórz folder",
+  "Open In": "Otwórz w",
+  "Open In Right Split": "Otwórz w podziale po prawej",
+  "Open Paths": "Otwarte ścieżki",
+  "Open Project Path": "Otwórz ścieżkę projektu",
+  "Open Projects": "Otwarte projekty",
+  "Open Recent…": "Otwórz niedawne…",
+  "Open a Git repository to commit changes.": "Otwórz repozytorium Git, aby zatwierdzić zmiany.",
+  "Open a file to annotate it": "Otwórz plik, aby dodać adnotacje",
+  "Open a file to show its local history": "Otwórz plik, aby pokazać jego historię lokalną",
+  "Open a folder": "Otwórz folder",
+  "Open a project first": "Najpierw otwórz projekt",
+  "Open a project to configure its folders.": "Otwórz projekt, aby skonfigurować jego foldery.",
+  "Open as Text": "Otwórz jako tekst",
+  "Open console for tool output": "Otwórz konsolę dla danych wyjściowych narzędzia",
+  "Open documents": "Otwarte dokumenty",
+  "Open in Browser": "Otwórz w przeglądarce",
+  "Open in Find Tool Window": "Otwórz w oknie narzędziowym Znajdź",
+  "Open in Find Window": "Otwórz w oknie Znajdź",
+  "Open in Opposite Group": "Otwórz w przeciwnej grupie",
+  "Open in New Window": "Otwórz w nowym oknie",
+  "Open in Terminal": "Otwórz w terminalu",
+  "Open in editor": "Otwórz w edytorze",
+  "Open moved files in editor": "Otwieraj przeniesione pliki w edytorze",
+  "Open new tabs at the end": "Otwieraj nowe karty na końcu",
+  "Open on GitHub": "Otwórz w serwisie GitHub",
+  "Open or select a file to compare": "Otwórz lub wybierz plik do porównania",
+  "Open pom.xml": "Otwórz pom.xml",
+  "Open project in": "Otwórz projekt w",
+  "Open to the Side": "Otwórz z boku",
+  "OpenSSH config and authentication agent": "Konfiguracja OpenSSH i agent uwierzytelniania",
+  "Opening Policy": "Zasady otwierania",
+  "Opening folders requires the desktop app": "Otwieranie folderów wymaga aplikacji stacjonarnej",
+  "Opening projects requires the desktop app": "Otwieranie projektów wymaga aplikacji stacjonarnej",
+  "Open…": "Otwórz…",
+  "Optimize Imports": "Optymalizuj importy",
+  "Optimize Imports in File": "Optymalizuj importy w pliku",
+  "Optimize imports": "Optymalizuj importy",
+  "Optimize imports on the fly": "Optymalizuj importy na bieżąco",
+  "Optional": "Opcjonalnie",
+  "Optional:": "Opcjonalnie:",
+  "Options": "Opcje",
+  "Orange": "Pomarańczowy",
+  "Original": "Oryginał",
+  "Other": "Inne",
+  "Other File Types": "Inne typy plików",
+  "Other hints (chaining, closing labels…)": "Inne wskazówki (łańcuchy, etykiety zamykające…)",
+  "Other names or emails (comma-separated):": "Inne nazwy lub adresy e-mail (rozdzielone przecinkami):",
+  "Otherwise line breakpoints can only be set in files of languages that have a debugger.": "W przeciwnym razie punkty przerwania wiersza można ustawiać tylko w plikach języków posiadających debugger.",
+  "Outgoing commits": "Wychodzące zatwierdzenia",
+  "Output": "Wyjście (Output)",
+  "Override IDE shortcuts": "Przesłoń skróty IDE",
+  "Override Members": "Przesłoń składowe",
+  "Override console cycle buffer size": "Przesłoń rozmiar cyklicznego bufora konsoli",
+  "Override system date and time format": "Przesłoń systemowy format daty i godziny",
+  "Overview": "Przegląd",
+  "Package": "Pakiet",
+  "Package manager": "Menedżer pakietów",
+  "Package to install": "Pakiet do zainstalowania",
+  "Packages": "Pakiety",
+  "Packages the project (mvn package, gradle assemble, cargo build --release, npm run build)": "Pakuje projekt (mvn package, gradle assemble, cargo build --release, npm run build)",
+  "Page size": "Rozmiar strony",
+  "Parameter Info": "Informacje o parametrach",
+  "Parameter names": "Nazwy parametrów",
+  "Parameters": "Parametry",
+  "Parses (hit / incr. / full)": "Analizy (trafienie / przyrostowa / pełna)",
+  "Partially staged: only staged hunks are committed": "Częściowo w poczekalni: zatwierdzane są tylko przygotowane fragmenty",
+  "Passed": "Zaliczono",
+  "Passed as -Dmaven.repo.local.": "Przekazano jako -Dmaven.repo.local.",
+  "Passed as -s (mirrors, servers, proxies).": "Przekazano jako -s (serwery lustrzane, serwery, serwery proxy).",
+  "Passed to rustfmt when reformatting, e.g. --edition 2024": "Przekazywane do rustfmt podczas ponownego formatowania, np. --edition 2024",
+  "Passed to the JVM running jdtls (java.jdt.ls.vmargs), e.g. -Xmx4g. jdtls runs with -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=30 -Xmx2G -Xms100m by default; an option set here replaces the default for the same setting, and another collector (e.g. -XX:+UseZGC) replaces the default collector options. A Lombok agent is added automatically: the one installed in Language Servers, else, when the project uses Lombok (its build, an inherited parent POM or Gradle build, or its sources' imports), the newest from the Maven / Gradle caches.": "Przekazywane do maszyny wirtualnej Java uruchamiającej jdtls (java.jdt.ls.vmargs), np. -Xmx4g. jdtls domyślnie działa z opcjami -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=30 -Xmx2G -Xms100m; ustawiona tutaj opcja zastępuje wartość domyślną dla danego ustawienia, a inny odśmiecacz (np. -XX:+UseZGC) zastępuje domyślne opcje odśmiecacza. Agent Lombok jest dodawany automatycznie: zainstalowany w Serwerach językowych lub, gdy projekt używa Lomboka (jego kompilacji, dziedziczonego nadrzędnego POM lub kompilacji Gradle, bądź importów źródeł), najnowszy z pamięci podręcznej Maven / Gradle.",
+  "Pop stash": "Pobierz ze schowka (Pop stash)",
+  "Preview Source": "Podgląd źródła",
+  "Reinstate index": "Przywróć indeks",
+  "Rerun Search": "Uruchom wyszukiwanie ponownie",
+  "Right Bottom": "Prawo dół",
+  "Right Top": "Prawo góra",
+  "Language server JDK": "JDK serwera językowego",
+  "Password": "Hasło",
+  "Password:": "Hasło:",
+  "Password already stored": "Hasło jest już zapisane",
+  "Paste": "Wklej",
+  "Paste on middle mouse button click": "Wklejaj po kliknięciu środkowym przyciskiem myszy",
+  "Patch copied to the clipboard": "Łatka została skopiowana do schowka",
+  "Patch destination": "Docelowa lokalizacja łatki",
+  "Patch file": "Plik łatki",
+  "Patch files": "Pliki łatek",
+  "Path From Content Root": "Ścieżka od katalogu głównego zawartości",
+  "Path of the current file relative to the project": "Ścieżka bieżącego pliku względnie do projektu",
+  "Path to Git executable": "Ścieżka do pliku wykonywalnego Git",
+  "Paths": "Ścieżki",
+  "Pattern": "Wzorzec",
+  "Patterns": "Wzorce",
+  "Pause": "Pauza",
+  "Pause Program": "Wstrzymaj program",
+  "Pause the program to evaluate": "Wstrzymuje program w celu obliczenia wartości",
+  "Pending": "Oczekujące",
+  "Performance (dev diagnostics)": "Wydajność (diagnostyka deweloperska)",
+  "Performance overlay (dev diagnostics)": "Nakładka wydajności (diagnostyka deweloperska)",
+  "Permissions": "Uprawnienia",
+  "Physical memory": "Pamięć fizyczna",
+  "Pick": "Wybierz (Pick)",
+  "Pick one in the toolbar above the editor.": "Wybierz jeden na pasku narzędzi nad edytorem.",
+  "Pin / Unpin Tab": "Przypnij / odepnij kartę",
+  "Pin Tab": "Przypnij kartę",
+  "Pinned": "Przypięte",
+  "Placeholders:": "Symbole zastępcze:",
+  "Placeholders: yyyy, yy, MMMM, MMM, MM, M, dd, d": "Symbole zastępcze: yyyy, yy, MMMM, MMM, MM, M, dd, d",
+  "Play sound": "Otwórz dźwięk",
+  "Plugin": "Wtyczka",
+  "Plugin details": "Szczegóły wtyczki",
+  "Plugin sources": "Źródła wtyczek",
+  "Plugins": "Wtyczki",
+  "Plugins are folders with a": "Wtyczki to foldery z",
+  "Plugins…": "Wtyczki…",
+  "Pop Stash": "Zdejmij ze schowka (Pop Stash)",
+  "Pop Stash (Apply and Drop)": "Zdejmij ze schowka (Zastosuj i usuń)",
+  "Popup type": "Typ okna wyskakującego",
+  "Port:": "Port:",
+  "Postfix Completion": "Uzupełnianie postfiksowe",
+  "Postfix templates": "Szablony postfiksowe",
+  "Prefer": "Preferuj",
+  "Prefer moving caret line to minimize editor scrolling": "Preferuj przesuwanie wiersza kursora, aby zminimalizować przewijanie edytora",
+  "Prefer scrolling editor canvas to keep caret line centered": "Preferuj przewijanie obszaru edytora, aby utrzymać wiersz kursora na środku",
+  "Preferred dark theme": "Preferowany ciemny motyw",
+  "Preferred light theme": "Preferowany jasny motyw",
+  "Preferred theme for dark OS mode": "Preferowany motyw dla ciemnego trybu systemu operacyjnego",
+  "Preferred theme for light OS mode": "Preferowany motyw dla jasnego trybu systemu operacyjnego",
+  "Preferred themes": "Preferowane motywy",
+  "Preferred themes for light and dark OS mode": "Preferowane motywy dla jasnego i ciemnego trybu systemu operacyjnego",
+  "Prepares a fixup! commit of the local changes for the selected commit.": "Przygotowuje zatwierdzenie poprawkowe (fixup!) zmian lokalnych dla wybranego zatwierdzenia.",
+  "Prepares a squash! commit of the local changes for the selected commit.": "Przygotowuje zatwierdzenie spłaszczające (squash!) zmian lokalnych dla wybranego zatwierdzenia.",
+  "Preserve Case": "Zachowaj wielkość liter",
+  "Press a shortcut": "Naciśnij skrót",
+  "Press a shortcut to find actions": "Naciśnij skrót, aby znaleźć akcje",
+  "Preview": "Podgląd",
+  "Preview Replacement": "Podgląd zastąpienia",
+  "Preview failed": "Podgląd nie powiódł się",
+  "Previous Bookmark": "Poprzednia zakładka",
+  "Previous Change": "Poprzednia zmiana",
+  "Previous Conflict Marker": "Poprzedni znacznik konfliktu",
+  "Previous Difference": "Poprzednia różnica",
+  "Previous Occurrence": "Poprzednie wystąpienie",
+  "Previous Page": "Poprzednia strona",
+  "Primary key": "Klucz główny",
+  "Print class and method name": "Drukuj nazwę klasy i metody",
+  "Private Key File": "Plik klucza prywatnego",
+  "Private key:": "Klucz prywatny:",
+  "Problems": "Problemy",
+  "Problems scope": "Zakres problemów",
+  "Process → backend ready": "Proces → backend gotowy",
+  "Process → first IPC": "Proces → pierwsze IPC",
+  "Process → main": "Proces → główny",
+  "Processes": "Procesy",
+  "Profile": "Profiluj",
+  "Profile Context Configuration": "Profiluj konfigurację kontekstu",
+  "Profile a run configuration to see where it spends its time.": "Sprofiluj konfigurację uruchamiania, aby zobaczyć, gdzie spędza najwięcej czasu.",
+  "Profile the program or test in the active file": "Profiluje program lub test w aktywnym pliku",
+  "Profiler": "Profiler",
+  "Profiler snapshots": "Migawki profilera",
+  "Profiler views": "Widoki profilera",
+  "Profiling needs the desktop app": "Profilowanie wymaga aplikacji stacjonarnej",
+  "Program": "Program",
+  "Project": "Projekt",
+  "Project (.openidea/plugins)": "Projekt (.openidea/plugins)",
+  "Project Encoding": "Kodowanie projektu",
+  "Project Errors": "Błędy projektu",
+  "Project Files": "Pliki projektu",
+  "Project GOPATH": "GOPATH projektu",
+  "Project JDK": "JDK projektu",
+  "Project Production Files": "Pliki produkcyjne projektu",
+  "Project Settings": "Ustawienia projektu",
+  "Project Structure": "Struktura projektu",
+  "Project Test Files": "Pliki testowe projektu",
+  "Project View": "Widok projektu",
+  "Project actions": "Akcje projektu",
+  "Project name": "Nazwa projektu",
+  "Project root": "Katalog główny projektu",
+  "Project root directory": "Katalog główny projektu",
+  "Project to run in": "Projekt do uruchomienia w",
+  "Project:": "Projekt:",
+  "Projects": "Projekty",
+  "Properties": "Właściwości",
+  "Properties Files (*.properties)": "Pliki właściwości (*.properties)",
+  "Property": "Właściwość",
+  "Protected branches": "Chronione gałęzie",
+  "Prune": "Przytnij (Prune)",
+  "Prune Docker…": "Przytnij obiekty Dockera…",
+  "Public function": "Funkcja publiczna",
+  "Pull Again": "Pobierz ponownie (Pull)",
+  "Pull Docker Image…": "Pobierz obraz Dockera…",
+  "Pull Image…": "Pobierz obraz…",
+  "Pull Requests": "Zgłoszenia Pull Request",
+  "Pull request number": "Numer pull request",
+  "Pull request number:": "Numer pull request:",
+  "Pull requests": "Zgłoszenia Pull Request",
+  "Pull requests use the": "Zgłoszenia Pull Request używają",
+  "Pull…": "Pobierz (Pull)…",
+  "Purple": "Fioletowy",
+  "Push": "Wyślij (Push)",
+  "Push All up to Here…": "Wyślij wszystko do tego miejsca…",
+  "Push Commits": "Wyślij zatwierdzenia",
+  "Push rejected": "Wysyłanie zostało odrzucone",
+  "Push tags:": "Wyślij tagi:",
+  "Push…": "Wyślij (Push)…",
+  "Put Label": "Umieść etykietę",
+  "Put Label…": "Umieść etykietę…",
+  "Put a stack trace or a complete thread dump here:": "Umieść tutaj ślad stosu lub pełny zrzut wątków:",
+  "Put the caret on a method declaration, or add a method breakpoint by name in View Breakpoints.": "Umieść kursor na deklaracji metody lub dodaj punkt przerwania metody według nazwy w Wyświetl punkty przerwania.",
+  "Python Debugger": "Debugger Pythona",
+  "Python Interpreter": "Interpreter Pythona",
+  "Python Package": "Pakiet Pythona",
+  "Python interpreter": "Interpreter Pythona",
+  "Python: only your code (justMyCode). JavaScript: skips node_modules and Node.js internals.": "Python: tylko Twój kod (justMyCode). JavaScript: pomija node_modules oraz elementy wewnętrzne Node.js.",
+  "Query Console": "Konsola zapytań",
+  "Quick Documentation": "Szybka dokumentacja",
+  "Re-check installed tools": "Sprawdź ponownie zainstalowane narzędzia",
+  "Re-reads the effective POMs and dependency trees with Maven": "Odczytuje ponownie efektywne pliki POM i drzewa zależności za pomocą Mavena",
+  "Re-reads the task list with Gradle": "Odczytuje ponownie listę zadań za pomocą Gradle",
+  "React useEffect hook": "Hook useEffect biblioteki React",
+  "React useState hook": "Hook useState biblioteki React",
+  "Read-only": "Tylko do odczytu",
+  "Read-only Attribute": "Atrybut tylko do odczytu",
+  "Rebase": "Zmień bazę (Rebase)",
+  "Rebase Current Branch onto Selected Commit": "Zmień bazę bieżącej gałęzi na wybrane zatwierdzenie",
+  "Rebase and Push": "Zmień bazę i wyślij (Rebase and Push)",
+  "Rebase the current branch on top of incoming changes": "Zmień bazę bieżącej gałęzi na wierzch przychodzących zmian",
+  "Rebuild Last": "Przebuduj ostatnie",
+  "Rebuild Project": "Przebuduj projekt",
+  "Recent Actions": "Niedawne akcje",
+  "Recent Files": "Niedawne pliki",
+  "Recent Locations": "Niedawne lokalizacje",
+  "Recent Projects": "Niedawne projekty",
+  "Recent Projects…": "Niedawne projekty…",
+  "Recent commit messages": "Niedawne wiadomości zatwierdzenia",
+  "Recent file masks": "Niedawne maski plików",
+  "Recent files": "Niedawne pliki",
+  "Recent locations": "Niedawne lokalizacje",
+  "Recent projects": "Niedawne projekty",
+  "Recent repository URLs": "Niedawne adresy URL repozytoriów",
+  "Recent Searches": "Niedawne wyszukiwania",
+  "Recently Viewed Files": "Ostatnio przeglądane pliki",
+  "Record": "Nagraj",
+  "Red": "Czerwony",
+  "Refactor": "Refaktoryzuj",
+  "Refactor This": "Refaktoryzuj to",
+  "Refactor This…": "Refaktoryzuj to…",
+  "Refactoring undone": "Cofnięto refaktoryzację",
+  "Refactoring applied": "Zastosowano refaktoryzację",
+  "Reformat Code": "Przeformatuj kod",
+  "Reformat with Prettier": "Przeformatuj za pomocą Prettier",
+  "Reformat with oxfmt": "Przeformatuj za pomocą oxfmt",
+  "Prettier path": "Ścieżka Prettier",
+  "oxfmt path": "Ścieżka oxfmt",
+  "Auto: nearest project node_modules, managed installation, then PATH. An explicit path overrides auto detection.": "Auto: najbliższy folder node_modules projektu, zarządzana instalacja, a następnie PATH. Jawna ścieżka zastępuje automatyczne wykrywanie.",
+  "Formatting provider": "Dostawca formatowania",
+  "Automatic (language server first)": "Automatycznie (najpierw serwer językowy)",
+  "Run on save": "Uruchamiaj przy zapisie",
+  "Run Prettier on save for enabled languages when it is the selected formatting provider.": "Uruchamia Prettier przy zapisie dla włączonych języków, gdy jest wybrany jako dostawca formatowania.",
+  "Run oxfmt on save for enabled languages when it is the selected formatting provider.": "Uruchamia oxfmt przy zapisie dla włączonych języków, gdy jest wybrany jako dostawca formatowania.",
+  "oxfmt formats an enabled language instead of Prettier below an oxfmt configuration file (.oxfmtrc.json, oxfmt.config.ts) or when it is the selected provider.": "oxfmt formatuje włączony język zamiast Prettiera na podstawie pliku konfiguracyjnego oxfmt (.oxfmtrc.json, oxfmt.config.ts) lub gdy jest wybranym dostawcą.",
+  "Enabled languages": "Włączone języki",
+  "Reformat Code needs {name}. Install it via {method}?": "Przeformatowanie kodu wymaga {name}. Zainstalować za pomocą {method}?",
+  "Install Missing Tool": "Zainstaluj brakujące narzędzie",
+  "Prettier formatting failed": "Formatowanie Prettier nie powiodło się",
+  "Prettier formatting timed out": "Przekroczono czas oczekiwania na formatowanie Prettier",
+  "oxfmt formatting failed": "Formatowanie oxfmt nie powiodło się",
+  "oxfmt formatting timed out": "Przekroczono czas oczekiwania na formatowanie oxfmt",
+  "{name} does not support selection formatting for this language; formatted the whole file": "{name} nie obsługuje formatowania zaznaczenia dla tego języka; przeformatowano cały plik",
+  "Formatting timed out": "Przekroczono czas oczekiwania na formatowanie",
+  "{name} executable": "Plik wykonywalny {name}",
+  "{name}: Node.js is required": "{name}: wymagane jest środowisko Node.js",
+  "Formatter": "Formatowanie",
+  "JSON with Comments": "JSON z komentarzami",
+  "Unknown external formatter: {tool}": "Nieznany zewnętrzny moduł formatujący: {tool}",
+  "{name}: package has no CLI entry point": "{name}: pakiet nie posiada punktu wejścia CLI",
+  "{name}: CLI does not exist: {path}": "{name}: interfejs CLI nie istnieje: {path}",
+  "{name}: file has no directory": "{name}: plik nie posiada katalogu",
+  "{name}: {error}": "{name}: {error}",
+  "Reformat File": "Przeformatuj plik",
+  "Reformat code": "Przeformatuj kod",
+  "Reformat code on save": "Przeformatuj kod przy zapisie",
+  "Reformat on paste": "Przeformatuj przy wklejaniu",
+  "Refresh": "Odśwież",
+  "Refresh Docker": "Odśwież Docker",
+  "Refresh TODO Items": "Odśwież elementy TODO",
+  "Refresh VCS Status": "Odśwież stan VCS",
+  "Regex": "Wyrażenie regularne (Regex)",
+  "Regular expression": "Wyrażenie regularne",
+  "Relative paths resolve against the project root. “Open in Terminal” still opens the chosen folder.": "Względne ścieżki są rozwiązywane względem katalogu głównego projektu. Opcja „Otwórz w terminalu” nadal otwiera wybrany folder.",
+  "Reload": "Przeładuj",
+  "Reload All Gradle Projects": "Przeładuj wszystkie projekty Gradle",
+  "Reload All Maven Projects": "Przeładuj wszystkie projekty Maven",
+  "Reload Changed Classes": "Przeładuj zmienione klasy",
+  "Reload Environments": "Przeładuj środowiska",
+  "Reload History": "Przeładuj historię",
+  "Reload List of Packages": "Przeładuj listę pakietów",
+  "Reload Page": "Przeładuj stronę",
+  "Reload Plugins": "Przeładuj wtyczki",
+  "Reload Project Tree from Disk": "Przeładuj drzewo projektu z dysku",
+  "Reload Run Configurations": "Przeładuj konfiguracje uruchamiania",
+  "Reload from Disk": "Przeładuj z dysku",
+  "Reload from disk": "Przeładuj z dysku",
+  "Reload the changed classes into the running debug session?": "Przeładować zmienione klasy do uruchomionej sesji debugowania?",
+  "Reload with Encoding": "Przeładuj z kodowaniem",
+  "Remote": "Zdalne",
+  "Remove": "Usuń",
+  "Remove All Bookmarks": "Usuń wszystkie zakładki",
+  "Remove All Breakpoints": "Usuń wszystkie punkty przerwania",
+  "Remove Configuration": "Usuń konfigurację",
+  "Remove Data Source": "Usuń źródło danych",
+  "Remove Data Source…": "Usuń źródło danych…",
+  "Remove File from Git": "Usuń plik z Git",
+  "Remove Kind": "Usuń rodzaj",
+  "Remove Override (restore detected)": "Usuń nadpisanie (przywróć WYKRYTE)",
+  "Remove Pattern": "Usuń wzorzec",
+  "Remove Template": "Usuń szablon",
+  "Remove Watch": "Usuń z obserwowanych",
+  "Remove coverage highlighting from editors and the project view": "Usuń podświetlanie pokrycia kodu z edytorów i widoku projektu",
+  "Remove from Favorites": "Usuń z ulubionych",
+  "Remove from Recent Projects": "Usuń z niedawnych projektów",
+  "Remove from Recent Projects…": "Usuń z niedawnych projektów…",
+  "Remove once hit": "Usuń po osiągnięciu",
+  "Remove silently": "Usuń po cichu",
+  "Remove successfully applied files from the shelf": "Usuń pomyślnie zastosowane pliki z półki (shelf)",
+  "Remove trailing blank lines at the end of saved files": "Usuwaj końcowe puste wiersze na końcu zapisywanych plików",
+  "Remove trailing spaces on:": "Usuwaj końcowe spacje w:",
+  "Rename": "Zmień nazwę",
+  "Rename File Inline": "Zmień nazwę pliku w miejscu",
+  "Rename File…": "Zmień nazwę pliku…",
+  "Rename Keymap": "Zmień nazwę mapy skrótów",
+  "Rename Session…": "Zmień nazwę sesji…",
+  "Rename Shelved Changes": "Zmień nazwę odłożonych zmian (shelf)",
+  "Rename Shelved Changes…": "Zmień nazwę odłożonych zmian…",
+  "Rename tab": "Zmień nazwę karty",
+  "Rename…": "Zmień nazwę…",
+  "Reopen Closed Tab": "Otwórz ponownie zamkniętą kartę",
+  "Reopen last project on startup": "Otwórz ponownie ostatni projekt przy uruchomieniu",
+  "Reopen projects on startup": "Otwórz ponownie projekty przy uruchomieniu",
+  "Replace": "Zastąp",
+  "Replace All": "Zastąp wszystko",
+  "Replace Preview": "Podgląd zastępowania",
+  "Replace Selected": "Zastąp zaznaczone",
+  "Replace Structurally": "Zastąp strukturalnie",
+  "Replace Structurally: Preview": "Zastąp strukturalnie: Podgląd",
+  "Replace Structurally…": "Zastąp strukturalnie…",
+  "Replace failed": "Zastępowanie nie powiodło się",
+  "Replace in Files": "Zastąp w plikach",
+  "Replace in Files…": "Zastąp w plikach…",
+  "Replace in file": "Zastąp w pliku",
+  "Replace preview": "Podgląd zastępowania",
+  "Replace template": "Szablon zastępowania",
+  "Replace this occurrence only": "Zastąp tylko to wystąpienie",
+  "Replace with": "Zastąp przez",
+  "Replacements": "Zastąpienia",
+  "Reports errors and warnings from language servers.": "Zgłasza błędy i ostrzeżenia z serwerów językowych.",
+  "Repository": "Repozytorium",
+  "Repository URL": "Adres URL repozytorium",
+  "Request": "Żądanie",
+  "Require": "Wymagaj",
+  "Rerun": "Uruchom ponownie",
+  "Rerun Failed Tests": "Uruchom ponownie nieudane testy",
+  "Rerun Find Usages": "Uruchom ponownie 'Znajdź użycia'",
+  "Rerun Inspection": "Uruchom ponownie inspekcję",
+  "Rerun Query": "Uruchom ponownie zapytanie",
+  "Rescan Plugins": "Przeskanuj ponownie wtyczki",
+  "Reset": "Zresetuj",
+  "Reset Current Branch to Here…": "Zresetuj bieżącą gałąź do tego miejsca…",
+  "Reset Frame": "Zresetuj ramkę",
+  "Reset HEAD…": "Zresetuj HEAD…",
+  "Reset IDE Zoom": "Zresetuj powiększenie IDE",
+  "Reset Shortcuts": "Zresetuj skróty",
+  "Reset Zoom": "Zresetuj powiększenie",
+  "Reset to Language Defaults": "Przywróć domyślne ustawienia języka",
+  "Comment Code": "Zakomentuj kod",
+  "Line comment at first column": "Komentarz wierszowy w pierwszej kolumnie",
+  "Add a space at line comment start": "Dodaj spację na początku komentarza wierszowego",
+  "Reset type": "Typ resetowania",
+  "Resize": "Zmień rozmiar",
+  "Resize right tool window bar": "Zmień rozmiar paska prawego okna narzędziowego",
+  "Resize tool window bar": "Zmień rozmiar paska okna narzędziowego",
+  "Resolve Conflicts…": "Rozwiąż konflikty…",
+  "Resolve all conflicts before continuing": "Rozwiąż wszystkie konflikty przed kontynuowaniem",
+  "Resolve merge conflicts before committing": "Rozwiąż konflikty scalania przed zatwierdzeniem",
+  "Resolve…": "Rozwiąż…",
+  "Resource Folders": "Foldery zasobów",
+  "Resources": "Zasoby",
+  "Response": "Odpowiedź",
+  "Response body": "Treść odpowiedzi",
+  "Response history": "Historia odpowiedzi",
+  "Restart": "Zrestartuj",
+  "Restart Container": "Zrestartuj kontener",
+  "Restart IDE": "Zrestartuj IDE",
+  "Restart Session": "Zrestartuj sesję",
+  "Restart identity": "Zrestartuj tożsamość",
+  "Restart is only available in the desktop app": "Restart jest dostępny tylko w aplikacji stacjonarnej",
+  "Restore Default": "Przywróć domyślne",
+  "Restore Default Layout": "Przywróć domyślny układ",
+  "Restore Defaults": "Przywróć domyślne",
+  "Restore Rows": "Przywróć wiersze",
+  "Restore Size": "Przywróć rozmiar",
+  "Maximize Editor": "Maksymalizuj edytor",
+  "Restore detected roots": "Przywróć wykryte katalogi główne",
+  "Result": "Wynik",
+  "Select a file to preview its changes": "Wybierz plik, aby wyświetlić podgląd jego zmian",
+  "Select a problem to see its details": "Wybierz problem, aby zobaczyć jego szczegóły",
+  "Select an item to preview": "Wybierz element do podglądu",
+  "Severity": "Ważność",
+  "Selecting a changed file shows its diff in the editor's preview tab": "Wybranie zmienionego pliku pokazuje jego różnice w karcie podglądu edytora",
+  "Show Diff Preview": "Pokaż podgląd różnic (Diff)",
+  "Show Quick Fixes": "Pokaż szybkie poprawki",
+  "Snappy": "Snappy",
+  "Sort By": "Sortuj według",
+  "Tags": "Tagi",
+  "The start date is after the end date": "Data początkowa jest późniejsza niż data końcowa",
+  "To:": "Do:",
+  "Unstash Changes": "Przywróć zmiany ze schowka (Unstash)",
+  "Unstash…": "Przywróć ze schowka…",
+  "result": "wynik",
+  "results": "wyniki",
+  "Results": "Wyniki",
+  "Resume Program": "Wznów program",
+  "Retry": "Ponów próbę",
+  "Return to the start of the selected frame's method": "Powróć do początku metody wybranej ramki",
+  "Reveal in Project View": "Odsłoń w widoku projektu",
+  "Reverse patch": "Odwróć łatkę",
+  "Revert": "Cofnij (Revert)",
+  "Revert Change": "Cofnij zmianę",
+  "Revert Commit": "Cofnij zatwierdzenie (Revert Commit)",
+  "Revert Commits": "Cofnij zatwierdzenia",
+  "Reverts the last file move or rename and its reference updates": "Cofa ostatnie przeniesienie lub zmianę nazwy pliku i aktualizacje jego referencji",
+  "Review comment": "Komentarz do recenzji",
+  "Reviewers": "Recenzenci",
+  "Revision": "Rewizja",
+  "Revisions": "Rewizje",
+  "Reword": "Sformułuj ponownie (Reword)",
+  "Rich-Text Copy": "Kopiuj jako tekst sformatowany (Rich Text)",
+  "Right tool windows": "Prawostronne okna narzędziowe",
+  "Roll Back": "Wycofiaj",
+  "Rollback": "Wycofanie",
+  "Rollback Changes": "Wycofiaj zmiany",
+  "Rollback…": "Wycofiaj…",
+  "Row limit": "Limit wierszy",
+  "Run": "Uruchom",
+  "Run All HTTP Requests in File": "Uruchom wszystkie żądania HTTP w pliku",
+  "Run All Requests in File": "Uruchom wszystkie żądania w pliku",
+  "Run Code › Analyze Code › Locate Duplicates… to find copied code": "Uruchom Kod › Analizuj kod › Lokalizuj duplikaty…, aby znaleźć skopiowany kod",
+  "Run Code › Inspect Code… to analyse files": "Uruchom Kod › Inspekcjonuj kod…, aby przeanalizować pliki",
+  "Run Command in Terminal": "Uruchom polecenie w terminalu",
+  "Run `pnpm tauri dev` to use the file system.": "Uruchom `pnpm tauri dev`, aby użyć systemu plików.",
+  "Run Configuration": "Konfiguracja uruchamiania",
+  "Run Context Configuration": "Uruchom konfigurację kontekstu",
+  "Run Context Configuration with Coverage": "Uruchom konfigurację kontekstu z pokryciem kodu",
+  "Run Gradle Task": "Uruchom zadanie Gradle",
+  "Run HTTP Request at Caret": "Uruchom żądanie HTTP przy kursorze",
+  "Run Maven Build": "Uruchom budowanie Maven",
+  "Run SQL Script": "Uruchom skrypt SQL",
+  "Run SQL Script…": "Uruchom skrypt SQL…",
+  "Run a configuration with coverage to see which lines its tests execute.": "Uruchom konfigurację z pokryciem kodu, aby zobaczyć, które wiersze są wykonywane przez jej testy.",
+  "Run a request from an .http file with the gutter ▶ or ⌘↩.": "Uruchom żądanie z pliku .http za pomocą ikony ▶ na marginesie lub ⌘↩.",
+  "Run actions": "Akcje uruchamiania",
+  "Run and Debug": "Uruchom i debuguj",
+  "Run code cleanup": "Uruchom czyszczenie kodu",
+  "Run configurations": "Konfiguracje uruchamiania",
+  "Run configurations and tests": "Konfiguracje uruchamiania i testy",
+  "Run external linter on save": "Uruchamiaj zewnętrzny linter przy zapisie",
+  "Run gh auth login": "Uruchom gh auth login",
+  "Run sessions": "Sesje uruchamiania",
+  "Run the selected configuration under a sampling profiler": "Uruchom wybraną konfigurację w profilerze próbkowym",
+  "Run the selected configuration with coverage": "Uruchom wybraną konfigurację z pokryciem kodu",
+  "Run the test or program in the active file": "Uruchom test lub program w aktywnym pliku",
+  "Run the test or program in the active file with coverage": "Uruchom test lub program w aktywnym pliku z pokryciem kodu",
+  "Run to Cursor": "Uruchom do kursora",
+  "Run to the caret, ignoring breakpoints on the way": "Uruchamia program do pozycji kursora, ignorując punkty przerwania po drodze",
+  "Run with Coverage": "Uruchom z pokryciem kodu",
+  "Run with Executor": "Uruchom z wykonawcą",
+  "Run with:": "Uruchom za pomocą:",
+  "Run/Debug": "Uruchom/Debuguj",
+  "Run/Debug Configurations": "Konfiguracje Uruchom/Debuguj",
+  "Running": "Uruchomiono",
+  "Running processes requires the desktop app.": "Uruchamianie procesów wymaga aplikacji stacjonarnej.",
+  "Runs Gradle with --offline": "Uruchamia Gradle z opcją --offline",
+  "Runs Maven with -DskipTests": "Uruchamia Maven z opcją -DskipTests",
+  "Runs Maven with -o": "Uruchamia Maven z opcją -o",
+  "Runs Optimize Imports when the file has no errors, unless it would change the caret line.": "Uruchamia Optymalizację importów, gdy plik nie zawiera błędów, chyba że zmieniłoby to wiersz kursora.",
+  "Runs npm scripts and Node-based language servers (vtsls, eslint, pyright…).": "Uruchamia skrypty npm oraz serwery językowe oparte na środowisku Node (vtsls, eslint, pyright…).",
+  "Runs the language server's Organize Imports action.": "Uruchamia akcję Organizuj importy serwera językowego.",
+  "Runs the language server's formatter before an explicit save (Actions on Save).": "Uruchamia formatowanie serwera językowego przed jawnym zapisem (Akcje podczas zapisywania).",
+  "Search history": "Historia wyszukiwania",
+  "Searching for usages of '{symbol}'": "Wyszukiwanie użyć '{symbol}'",
+  "SQL completion": "Uzupełnianie SQL",
+  "SQL Inserts": "Instrukcje SQL Insert",
+  "SQL Script Template": "Szablon skryptu SQL",
+  "SQL Scripts": "Skrypty SQL",
+  "SQLite Database File": "Plik bazy danych SQLite",
+  "SQLite can rename or drop an existing column, not change its type, NOT NULL or default.": "SQLite może zmienić nazwę lub usunąć istniejącą kolumnę, ale nie może zmienić jej typu, klauzuli NOT NULL ani wartości domyślnej.",
+  "SSH authentication type": "Typ uwierzytelniania SSH",
+  "SSL mode": "Tryb SSL",
+  "Safe Delete…": "Bezpieczne usuwanie…",
+  "Sample plugin: inserts today's date and counts words in the active file.": "Przykładowa wtyczka: wstawia dzisiejszą datę i zlicza słowa w aktywnym pliku.",
+  "Save": "Zapisz",
+  "Save All": "Zapisz wszystko",
+  "Save Files": "Zapisz pliki",
+  "Save files if the IDE is idle for": "Zapisuj pliki, jeśli środowisko IDE jest bezczynne przez",
+  "Save files when switching to a different application or a built-in terminal": "Zapisuj pliki podczas przełączania do innej aplikacji lub wbudowanego terminala",
+  "Synchronize external changes when switching to the IDE window": "Synchronizuj zewnętrzne zmiany podczas przełączania do okna IDE",
+  "Save or roll back the changes before reloading it from disk.": "Zapisz lub wycofaj zmiany przed ponownym wczytaniem z dysku.",
+  "Save password": "Zapisz hasło",
+  "Save to file:": "Zapisz do pliku:",
+  "Scanning for TODO items…": "Skanowanie w poszukiwaniu elementów TODO…",
+  "Scheme": "Schemat",
+  "Scope": "Zakres",
+  "Scratches": "Pliki robocze (Scratches)",
+  "Script": "Skrypt",
+  "Scroll to End": "Przewiń do końca",
+  "Scrolling": "Przewijanie",
+  "Search Everywhere": "Szukaj wszędzie",
+  "Search Structurally": "Wyszukiwanie strukturalne",
+  "Search Structurally…": "Wyszukiwanie strukturalne…",
+  "Search Text Everywhere": "Szukaj tekstu wszędzie",
+  "Search actions": "Szukaj akcji",
+  "Search branches": "Szukaj gałęzi",
+  "Search branches and actions": "Szukaj gałęzi i akcji",
+  "Search configurations": "Szukaj konfiguracji",
+  "Search for references": "Szukaj referencji",
+  "Search frames": "Szukaj ramek",
+  "Search in comments and strings": "Szukaj w komentarzach i ciągach znaków",
+  "Search installed plugins": "Szukaj zainstalowanych wtyczek",
+  "Search packages": "Szukaj pakietów",
+  "Search projects": "Szukaj projektów",
+  "Search pull requests": "Szukaj pull requestów",
+  "Search query": "Zapytanie wyszukiwania",
+  "Search recent projects": "Szukaj niedawnych projektów",
+  "Search scope": "Zakres wyszukiwania",
+  "Search settings": "Ustawienia wyszukiwania",
+  "Search template": "Szablon wyszukiwania",
+  "Searches": "Wyszukiwania",
+  "Searching": "Wyszukiwanie",
+  "Searching for usages": "Wyszukiwanie użyć",
+  "Second stroke": "Naciśnięcie drugie",
+  "Second stroke:": "Naciśnięcie drugie:",
+  "Select All": "Zaznacz wszystko",
+  "Select Base Interpreter": "Wybierz interpreter bazowy",
+  "Select Folders…": "Wybierz foldery…",
+  "Select GOPATH": "Wybierz GOPATH",
+  "Select JDK Home Directory": "Wybierz katalog główny JDK",
+  "Select Local Repository": "Wybierz lokalne repozytorium",
+  "Select Maven Home Directory": "Wybierz katalog główny Maven",
+  "Select Search Directory": "Wybierz katalog wyszukiwania",
+  "Select Maven settings.xml": "Wybierz plik settings.xml programu Maven",
+  "Select Next Tab": "Wybierz następną kartę",
+  "Select Opened File": "Wybierz otwarty plik",
+  "Select Previous Tab": "Wybierz poprzednią kartę",
+  "Select Python Interpreter": "Wybierz interpreter Pythona",
+  "Select Run/Debug Configuration…": "Wybierz konfigurację Uruchom/Debuguj…",
+  "Select Standard Library Sources": "Wybierz źródła biblioteki standardowej",
+  "Select TypeScript lib Directory": "Wybierz katalog biblioteki TypeScript (lib)",
+  "Select a changed file to show its diff": "Wybierz zmieniony plik, aby pokazać jego różnice (diff)",
+  "Select a column": "Wybierz kolumnę",
+  "Select a commit in the Git log": "Wybierz zatwierdzenie w dzienniku Git",
+  "Select a commit to view changes": "Wybierz zatwierdzenie, aby wyświetlić zmiany",
+  "Select a container, image, volume or network.": "Wybierz kontener, obraz, wolumen lub sieć.",
+  "Select a group": "Wybierz grupę",
+  "Select a result to preview": "Wybierz wynik do podglądu",
+  "Select a revision": "Wybierz rewizję",
+  "Select a template to edit it": "Wybierz szablon, aby go edytować",
+  "Select an interpreter": "Wybierz interpreter",
+  "Select changes to move": "Wybierz zmiany do przeniesienia",
+  "Select in Project View": "Wybierz w widoku projektu",
+  "Selection": "Zaznaczenie",
+  "Select…": "Wybierz…",
+  "Services": "Usługi",
+  "Services actions": "Akcje usług",
+  "Session finished": "Sesja została zakończona",
+  "Set Active Changelist": "Ustaw aktywną listę zmian",
+  "Set NULL": "Ustaw jako NULL",
+  "Set Value…": "Ustaw wartość…",
+  "Set active": "Ustaw jako aktywne",
+  "Set upstream": "Ustaw repozytorium nadrzędne (upstream)",
+  "Settings": "Ustawienia",
+  "Settings pages": "Strony ustawień",
+  "Settings scope": "Zakres ustawień",
+  "Settings…": "Ustawienia…",
+  "Settings for New Projects": "Ustawienia dla nowych projektów",
+  "Settings for New Projects…": "Ustawienia dla nowych projektów…",
+  "Saved to the global settings: used by new projects and by projects without their own value.": "Zapisano w ustawieniach globalnych: używane przez nowe projekty oraz projekty bez własnej wartości.",
+  "Shelf": "Półka (Shelf)",
+  "Shell integration": "Integracja powłoki",
+  "Shell path": "Ścieżka powłoki",
+  "Shallow clone with a history truncated to": "Płytkie klonowanie z historią obciętą do",
+  "Shelve Changes": "Odłóż zmiany na półkę (Shelve)",
+  "Shelve Changes…": "Odłóż zmiany na półkę…",
+  "Shelved changes": "Odłożone zmiany (shelved)",
+  "Show": "Pokaż",
+  "Show \"Today\", \"Yesterday\" and \"N min ago\" for recent dates": "Pokaż \"Dzisiaj\", \"Wczoraj\" oraz \"N min temu\" dla niedawnych dat",
+  "Show All": "Pokaż wszystko",
+  "Show All Frames": "Pokaż wszystkie ramki",
+  "Show Bookmarks": "Pokaż zakładki",
+  "Show Inherited": "Pokaż dziedziczone",
+  "Show inherited members": "Pokaż dziedziczone składowe",
+  "Show Build": "Pokaż budowanie",
+  "Show Commit in Git Log": "Pokaż zatwierdzenie w dzienniku Git",
+  "Show Container Log": "Pokaż dziennik kontenera",
+  "Show Context Actions": "Pokaż akcje kontekstowe",
+  "Show changes": "Pokaż zmiany",
+  "Show Coverage": "Pokaż pokrycie kodu",
+  "Show Debug Tool Window": "Pokaż okno narzędziowe debugowania",
+  "Show Diff": "Pokaż różnice (Diff)",
+  "Show Diff with Working Tree": "Pokaż różnice w porównaniu z drzewem roboczym",
+  "Show Editor Hint": "Pokaż podpowiedź edytora",
+  "Show Errors": "Pokaż błędy",
+  "Show Execution Point": "Pokaż punkt wykonania",
+  "Show Formatted": "Pokaż sformatowane",
+  "Show Git Log": "Pokaż dziennik Git",
+  "Show Hidden Tabs": "Pokaż ukryte karty",
+  "Show History": "Pokaż historię",
+  "Show History for File": "Pokaż historię dla pliku",
+  "Show Ignored": "Pokaż zignorowane",
+  "Show Infos and Hints": "Pokaż informacje i wskazówki",
+  "Show Local History": "Pokaż historię lokalną",
+  "Show Log": "Pokaż dziennik",
+  "Show Memory Indicator Details": "Pokaż szczegóły wskaźnika pamięci",
+  "Show Passed": "Pokaż zaliczone",
+  "Show Preview": "Pokaż podgląd",
+  "Show Raw": "Pokaż w postaci surowej",
+  "Show Replace": "Pokaż zastępowanie",
+  "Show Run/Debug window when a process is started": "Pokaż okno Uruchom/Debuguj po uruchomieniu procesu",
+  "Show Scheme Actions": "Pokaż akcje schematu",
+  "Show Shelf": "Pokaż półkę (Shelf)",
+  "Show TODO Items in Current File": "Pokaż elementy TODO w bieżącym pliku",
+  "Show Tool Window Names": "Pokaż nazwy okien narzędziowych",
+  "Show Usage Results": "Pokaż wyniki użycia",
+  "Select Configuration": "Wybierz konfigurację",
+  "Show Usages": "Pokaż użycia",
+  "Show Warnings": "Pokaż ostrzeżenia",
+  "Show all output": "Pokaż całe wyjście",
+  "Show breadcrumbs for:": "Pokaż ścieżkę nawigacyjną dla:",
+  "Show breadcrumbs:": "Pokaż ścieżkę nawigacyjną:",
+  "Show changed only": "Pokaż tylko zmienione",
+  "Show code folding outline": "Pokaż kontur zwijania kodu",
+  "Show debug window on breakpoint hit": "Pokaż okno debugowania po trafieniu na punkt przerwania",
+  "Show details": "Pokaż szczegóły",
+  "Show edited only": "Pokaż tylko edytowane",
+  "Show file extension": "Pokaż rozszerzenie pliku",
+  "Show gutter icons": "Pokaż ikony na marginesie",
+  "Show hard wrap and visual guides (configured in Code Style options)": "Pokaż twarde zawijanie i linie pomocnicze (skonfigurowane w opcjach Stylu Kodu)",
+  "Show in Finder": "Pokaż w Finderze",
+  "Show in tool window": "Pokaż w oknie narzędziowym",
+  "Show inlay Run to Cursor popup": "Pokaż wewnątrzlinijkowe okno wyskakujące 'Uruchom do kursora'",
+  "Show indent guides": "Pokaż linie wcięć",
+  "Show inlay hints": "Pokaż wskazówki wewnątrzlinijkowe",
+  "Show inlay hints for:": "Pokaż wskazówki wewnątrzlinijkowe dla:",
+  "Show install log": "Pokaż dziennik instalacji",
+  "Show intention bulb": "Pokaż żarówkę intencji",
+  "Show line numbers": "Pokaż numery wierszy",
+  "Show live templates in code completion": "Pokaż aktywne szablony w podpowiedziach kodu",
+  "Show method separators": "Pokaż separatory metod",
+  "Show only monospaced fonts": "Pokaż tylko czcionki o stałej szerokości",
+  "Show or hide the memory indicator in the status bar": "Pokaż lub ukryj wskaźnik pamięci na pasku stanu",
+  "Show postfix templates in code completion": "Pokaż szablony postfiksowe w podpowiedziach kodu",
+  "Show quick documentation on hover": "Pokaż szybką dokumentację po najechaniu kursorem",
+  "Show results in the test runner": "Pokaż wyniki w narzędziu uruchamiającym testy",
+  "Show right margin": "Pokaż prawy margines",
+  "Show sticky lines while scrolling": "Pokaż przyklejone wiersze podczas przewijania",
+  "Show suggestions as you type": "Pokaż sugestie podczas pisania",
+  "Show table data": "Pokaż dane tabeli",
+  "Show the documentation popup in": "Pokaż okno wyskakujące dokumentacji po",
+  "Show the parameter info popup in": "Pokaż okno wyskakujące informacji o parametrach po",
+  "Show the selected coverage suite in editors and the project view": "Pokaż wybrany zestaw pokrycia kodu w edytorach i widoku projektu",
+  "Show tool window bars": "Pokaż paski okien narzędziowych",
+  "Show tool window badges": "Pokaż plakietki okien narzędziowych",
+  "Counts on the stripe icons, e.g. changed files or agent tasks needing input": "Liczby na ikonach paska, np. zmienione pliki lub zadania agenta wymagające danych wyjściowych",
+  "Show tool window names": "Pokaż nazwy okien narzędziowych",
+  "Show value tooltip on code selection": "Pokaż dymek wartości przy zaznaczeniu kodu",
+  "Show value tooltip on mouse hover": "Pokaż dymek wartości po najechaniu myszą",
+  "Show values inline": "Pokaż wartości wewnątrz wiersza (inline)",
+  "Show virtual space at file bottom": "Pokaż wirtualną przestrzeń na dole pliku",
+  "Show whitespaces": "Pokaż białe znaki",
+  "Shown as the right margin guide in the editor.": "Wyświetlane jako linia pomocnicza prawego marginesu w edytorze.",
+  "Side-by-side Viewer": "Przeglądarka obok siebie",
+  "Sign-off commit": "Podpisz zatwierdzenie (sign-off)",
+  "Size": "Rozmiar",
+  "Size:": "Rozmiar:",
+  "Skip": "Pomiń",
+  "Skip Commit": "Pomiń zatwierdzenie",
+  "Skip if defined": "Pomiń, jeśli zdefiniowano",
+  "Smart Keys": "Inteligentne klawisze",
+  "Smart Step Into": "Inteligentny krok do środka",
+  "Smart Step Into failed": "Inteligentny krok do środka nie powiódł się",
+  "Smart indent": "Inteligentne wcięcie",
+  "Soft": "Miękkie",
+  "Soft Wraps": "Miękkie zawijanie wierszy",
+  "Soft-Wrap": "Miękkie zawijanie",
+  "Soft-wrap": "Miękkie zawijanie",
+  "Soft-wrap files": "Miękko zawijaj wiersze w plikach",
+  "Some items could not be copied": "Niektórych elementów nie udało się skopiować",
+  "Some items could not be deleted": "Niektórych elementów nie udało się usunąć",
+  "Some items could not be moved": "Niektórych elementów nie udało się przenieść",
+  "Some references may not have been updated": "Niektóre referencje mogły nie zostać zaktualizowane",
+  "Sort Alphabetically": "Sortuj alfabetycznie",
+  "Source": "Źródło",
+  "Source Folders": "Foldery źródłowe",
+  "Sources": "Źródła",
+  "Sources of std for navigation and completion (RUST_SRC_PATH).": "Źródła biblioteki standardowej do nawigacji i podpowiedzi (RUST_SRC_PATH).",
+  "Specify Inspection Scope": "Określ zakres inspekcji",
+  "Split Down": "Podziel w dół",
+  "Split Right": "Podziel w prawo",
+  "Split and Move Down": "Podziel i przenieś w dół",
+  "Split and Move Right": "Podziel i przenieś w prawo",
+  "Squash": "Spłaszcz (Squash)",
+  "Squash Commits…": "Spłaszcz zatwierdzenia…",
+  "Squash Into…": "Spłaszcz do…",
+  "Stage": "Dołącz do poczekalni (Stage)",
+  "Stage Change (git add hunk)": "Przenieś zmianę do poczekalni (git add hunk)",
+  "Standard library": "Biblioteka standardowa",
+  "Start": "Uruchom",
+  "Start Container": "Uruchom kontener",
+  "Start Rebasing": "Rozpocznij zmianę bazy",
+  "Start a debug configuration with": "Uruchom konfigurację debugowania za pomocą",
+  "Start a debug session to see the exception filters of its adapter.": "Uruchom sesję debugowania, aby zobaczyć filtry wyjątków jej adaptera.",
+  "Start debugging a run configuration": "Rozpocznij debugowanie konfiguracji uruchamiania",
+  "Start directory": "Katalog początkowy",
+  "Startup": "Uruchamianie",
+  "Stash Changes…": "Odłóż zmiany do schowka (Stash)…",
+  "Stashes": "Schowki (Stashes)",
+  "State": "Stan",
+  "Status": "Stan/Status",
+  "Status bar": "Pasek stanu",
+  "Step Into": "Krok do środka",
+  "Step over, ignoring breakpoints in the called code": "Wykonaj krok nad, ignorując punkty przerwania w wywoływanym kodzie",
+  "Stepping": "Przechodzenie krokowe",
+  "Sticky Lines": "Przyklejone wiersze",
+  "Sticky balloon": "Przypięta chmurka",
+  "Stop": "Zatrzymaj",
+  "Stop All": "Zatrzymaj wszystko",
+  "Stop Build": "Zatrzymaj budowanie",
+  "Stop Container": "Zatrzymaj kontener",
+  "Stop Process": "Zatrzymaj proces",
+  "Stop Reloading Gradle Projects": "Zatrzymaj przeładowywanie projektów Gradle",
+  "Stop Reloading Maven Projects": "Zatrzymaj przeładowywanie projektów Maven",
+  "Stop Request": "Zatrzymaj żądanie",
+  "Stop and Rerun": "Zatrzymaj i uruchom ponownie",
+  "Stop to Edit": "Zatrzymaj, aby edytować",
+  "Stopped after {count} matches": "Zatrzymano po trafieniach: {count}",
+  "Strikeout": "Przekreślenie",
+  "Struct": "Struktura (Struct)",
+  "Struct type": "Typ struktury",
+  "Structural Replace": "Zastępowanie strukturalne",
+  "Structural Search": "Wyszukiwanie strukturalne",
+  "Structure": "Struktura",
+  "Structure actions": "Akcje struktury",
+  "Structure unavailable": "Struktura niedostępna",
+  "Subject line length": "Długość wiersza tematu",
+  "Submit": "Wyślij",
+  "Submodule changes cannot be rolled back here": "Zmiany w podmodułach nie mogą być tutaj wycofane",
+  "Subpixel": "Subpikselowe",
+  "Suggested names": "Sugerowane nazwy",
+  "Super Method": "Metoda nadklasy",
+  "Surround With": "Otocz przez",
+  "Surround With…": "Otocz przez…",
+  "Surround selection on typing quote or brace": "Otaczaj zaznaczenie po wpisaniu cudzysłowu lub nawiasu klamrowego",
+  "Suspend on": "Wstrzymaj na",
+  "Switch to Auto-Commit": "Przełącz na automatyczne zatwierdzanie",
+  "Switcher": "Przełącznik",
+  "Switcher (Backward)": "Przełącznik (W wstecz)",
+  "Symbols": "Symbole",
+  "Sync with OS": "Synchronizuj z systemem operacyjnym",
+  "Synchronize Scrolling": "Synchronizuj przewijanie",
+  "Synchronize files after execution": "Synchronizuj pliki po wykonaniu",
+  "Syntax trees": "Drzewa składniowe",
+  "System Messages": "Komunikaty systemowe",
+  "System Settings": "Ustawienia systemowe",
+  "System default": "Domyślne systemowe",
+  "System-Dependent": "Zależne od systemu",
+  "Tests failed: {detail}": "Testy nie powiodły się: {detail}",
+  "TODO comment": "Komentarz TODO",
+  "TODO filters": "Filtry TODO",
+  "TODO items": "Elementy TODO",
+  "TODO items unavailable": "Elementy TODO niedostępne",
+  "TODO patterns": "Wzorce TODO",
+  "TODO scope": "Zakres TODO",
+  "Tab Actions": "Akcje kart",
+  "Tab actions": "Akcje kart",
+  "Tab limit": "Limit kart",
+  "Tab name": "Nazwa karty",
+  "Tab placement": "Rozmieszczenie kart",
+  "Tab size": "Rozmiar tabulacji",
+  "Tab to complete, Enter to run": "Tab, aby uzupełnić; Enter, aby uruchomić",
+  "Table": "Tabela",
+  "Table:": "Tabela:",
+  "Tabs": "Karty",
+  "Tabs and Indents": "Karty i wcięcia",
+  "Tag": "Tag",
+  "Tag name:": "Nazwa tagu:",
+  "Tags to push": "Tagi do wysłania",
+  "Target changelist": "Docelowa lista zmian",
+  "Target directory": "Katalog docelowy",
+  "Teal": "Ciemnoturkusowy",
+  "Template body": "Treść szablonu",
+  "Template name": "Nazwa szablonu",
+  "Template text": "Tekst szablonu",
+  "Terminal": "Terminal",
+  "Terminal fallback font": "Zastępcza czcionka terminala",
+  "Terminal font": "Czcionka terminala",
+  "Terminal font size": "Rozmiar czcionki terminala",
+  "Terminal line height": "Wysokość wiersza terminala",
+  "Terminal sessions": "Sesje terminala",
+  "Test": "Test",
+  "Test (pytest)": "Test (pytest)",
+  "Test Connection": "Testuj połączenie",
+  "Test Resource Folders": "Foldery zasobów testowych",
+  "Test Resources": "Zasoby testowe",
+  "Test Source Folders": "Foldery kodów źródłowych testów",
+  "Test case": "Przypadek testowy",
+  "Test case (test)": "Przypadek testowy (test)",
+  "Test file": "Plik testowy",
+  "Test function": "Funkcja testowa",
+  "Test module": "Moduł testowy",
+  "Test results": "Wyniki testów",
+  "Test suite": "Zestaw testów",
+  "Tests": "Testy",
+  "Text": "Tekst",
+  "Text occurrences (language server not ready)": "Wystąpienia tekstowe (serwer językowy niegotowy)",
+  "Text or hash": "Tekst lub hasz",
+  "Text selected in the editor": "Tekst zaznaczony w edytorze",
+  "Text to find": "Tekst do znalezienia",
+  "The Kotlin debugger is not installed": "Debugger języka Kotlin nie jest zainstalowany",
+  "The Java debugger is not installed": "Debugger języka Java nie jest zainstalowany",
+  "The action already has this shortcut": "Akcja posiada już ten skrót",
+  "The active changelist cannot be deleted": "Aktywna lista zmian nie może zostać usunięta",
+  "The active file has no runnable element, test or run configuration.": "Aktywny plik nie zawiera elementu wykonalnego, testu ani konfiguracji uruchamiania.",
+  "The caches will be invalidated and rebuilt on the next startup: the symbol index of every project and the syntax caches.": "Pamięci podręczne zostaną unieważnione i przebudowane przy następnym uruchomieniu: indeks symboli każdego projektu oraz pamięci podręczne składni.",
+  "The caret is not inside a conflict": "Kursor nie znajduje się wewnątrz konfliktu",
+  "The clipboard does not contain a patch": "Schowek nie zawiera łatki",
+  "The patch file is empty": "Plik łatki jest pusty",
+  "The project is not a Git repository.": "Projekt nie jest repozytorium Git.",
+  "The project path is always shown in the status bar navigation bar.": "Ścieżka projektu jest zawsze wyświetlana na pasku nawigacyjnym paska stanu.",
+  "The remote contains commits that are not in your branch. Update the branch, then push again.": "Repozytorium zdalne zawiera zatwierdzenia, których nie ma w Twojej gałęzi. Zaktualizuj gałąź, a następnie wyślij ponowne.",
+  "The report covers no files": "Raport nie obejmuje żadnych plików",
+  "The shortcut is already assigned to other actions. Do you want to remove other assignments?": "Skrót jest już przypisany do innych akcji. Czy chcesz usunąć pozostałe przypisania?",
+  "The tab on the left": "Karta po lewej stronie",
+  "The tab on the right": "Karta po prawej stronie",
+  "The template content could not be inserted.": "Nie można wstawić zawartości szablonu.",
+  "Their version": "Ich wersja",
+  "Theirs (incoming)": "Ich (przychodzące)",
+  "Theme": "Motyw",
+  "Theme default": "Domyślny dla motywu",
+  "Themes": "Motywy",
+  "There is no online plugin repository": "Brak internetowego repozytorium wtyczek",
+  "This directory is preselected in \"Open…\" and \"New Window\" dialogs.": "Ten katalog jest domyślnie zaznaczony w oknach dialogowych \"Otwórz…\" i \"Nowe okno\".",
+  "This element can't be renamed": "Nie można zmienić nazwy tego elementu",
+  "This page could not be displayed": "Nie można wyświetlić tej strony",
+  "This project has no remote on GitHub.": "Ten projekt nie posiada repozytorium zdalnego w usłudze GitHub.",
+  "This version has no release notes.": "Ta wersja nie posiada informacji o wydaniu.",
+  "This will reset the current branch head to the selected commit, and update the working tree and the index according to the selected mode:": "Spowoduje to zresetowanie wskaźnika bieżącej gałęzi do wybranego zatwierdzenia oraz zaktualizowanie drzewa roboczego i indeksu zgodnie z wybranym trybem:",
+  "Thread": "Wątek",
+  "Time limit for Run/Debug process termination": "Limit czasu dla zakończenia procesu Uruchom/Debuguj",
+  "Timestamps": "Znaczniki czasu",
+  "Title": "Tytuł",
+  "To commit:": "Do zatwierdzenia:",
+  "To directory:": "Do katalogu:",
+  "To nearest indent position": "Do najbliższej pozycji wcięcia",
+  "To proper indent position": "Do odpowiedniej pozycji wcięcia",
+  "Toggle 'Skip Tests' Mode": "Przełącz tryb 'Pomiń testy'",
+  "Toggle Bookmark": "Przełącz zakładkę",
+  "Toggle Field Watchpoint": "Przełącz punkt obserwacji pola",
+  "Toggle Light/Dark Theme": "Przełącz jasny/ciemny motyw",
+  "Toggle Line Breakpoint": "Przełącz punkt przerwania wiersza",
+  "Toggle Method Breakpoint": "Przełącz punkt przerwania metody",
+  "Toggle Offline Mode": "Przełącz tryb offline",
+  "Toggle Performance Overlay (Dev)": "Przełącz nakładkę wydajności (Dev)",
+  "Toggle Read-only Attribute": "Przełącz atrybut 'Tylko do odczytu'",
+  "Toggle Temporary Line Breakpoint": "Przełącz tymczasowy punkt przerwania wiersza",
+  "Tool Settings": "Ustawienia narzędzia",
+  "Tool Windows": "Okna narzędziowe",
+  "Tool windows": "Okna narzędziowe",
+  "Toolchain": "Łańcuch narzędzi (Toolchain)",
+  "Toolchain location": "Lokalizacja łańcucha narzędzi",
+  "Tools": "Narzędzia",
+  "Tooltip delay": "Opóźnienie podpowiedzi (tooltip)",
+  "Top": "Góra",
+  "Total": "Łącznie",
+  "Trailing": "Końcowe",
+  "Trait implementation": "Implementacja cechy (Trait)",
+  "Transaction mode": "Tryb transakcji",
+  "Trim whitespaces": "Usuwaj białe znaki",
+  "Truncate": "Obetnij",
+  "Truncate…": "Obetnij…",
+  "Trust Host and Retry": "Zaufaj hostowi i ponów próbę",
+  "Trust and Connect": "Zaufaj i połącz",
+  "Tx: Auto": "Transakcje: Auto",
+  "Tx: Manual": "Transakcje: Ręcznie",
+  "Type / to see commands": "Wpisz /, aby zobaczyć polecenia",
+  "Type Declaration": "Deklaracja typu",
+  "Type Hierarchy": "Hierarchia typów",
+  "Type an expression followed by": "Wpisz wyrażenie, a następnie",
+  "Type hierarchy": "Hierarchia typów",
+  "Type to filter by file name or code": "Wpisz, aby filtrować według nazwy pliku lub kodu",
+  "Type to filter symbols": "Wpisz, aby filtrować symbole",
+  "Type to search": "Wpisz, aby wyszukać",
+  "TypeScript version": "Wersja TypeScript",
+  "Types": "Typy",
+  "Typography Settings": "Ustawienia typografii",
+  "Main menu": "Menu główne",
+  "Hamburger button": "Przycisk menu (hamburger)",
+  "Merged with main toolbar": "Scalone z głównym paskiem narzędzi",
+  "UI Options": "Opcje interfejsu użytkownika",
+  "UI elements take up less screen space": "Elementy interfejsu zajmują mniej miejsca na ekranie",
+  "UI fallback font": "Zastępcza czcionka interfejsu użytkownika",
+  "UI font": "Czcionka interfejsu użytkownika",
+  "UI font size": "Rozmiar czcionki interfejsu użytkownika",
+  "Uninstalled {name}": "Odinstalowano {name}",
+  "URL:": "Adres URL:",
+  "Unchecked values are inherited from the scheme.": "Niezaznaczone wartości są dziedziczone ze schematu.",
+  "Uncommitted changes are stashed before the update and restored afterwards.": "Niezatwierdzone zmiany są odkładane do schowka przed aktualizacją i przywracane po jej zakończeniu.",
+  "Underline": "Podkreślenie",
+  "Underscored": "Podkreślony równo",
+  "Underwaved": "Podkreślony falisto",
+  "Undo": "Cofnij",
+  "Unread": "Nieprzeczytane",
+  "Undo Commit": "Cofnij zatwierdzenie (Undo Commit)",
+  "Undo Commit…": "Cofnij zatwierdzenie…",
+  "Undo Move / Rename": "Cofnij przeniesienie / zmianę nazwy",
+  "Unified Viewer": "Jednolity podgląd",
+  "Unindent": "Zmniejsz wcięcie",
+  "Uninstall": "Odinstaluj",
+  "Uninstall…": "Odinstaluj…",
+  "Unknown SSH Host": "Nieznany host SSH",
+  "Unmute Breakpoints": "Włącz punkty przerwania",
+  "Unpause": "Wznów",
+  "Unpin Tab": "Odepnij kartę",
+  "Unshelve": "Przywróć z półki (Unshelve)",
+  "Unshelve Changes": "Przywróć zmiany z półki",
+  "Unshelve…": "Przywróć z półki…",
+  "Unsplit": "Cofnij podział",
+  "Unsplit All": "Cofnij wszystkie podziały",
+  "Unstage": "Usuń z poczekalni (Unstage)",
+  "Unstash Changes…": "Przywróć zmiany ze schowka (Unstash)…",
+  "Update": "Aktualizuj",
+  "Update Project": "Aktualizuj projekt",
+  "Update Project…": "Aktualizuj projekt…",
+  "Update method": "Metoda aktualizacji",
+  "Update type": "Typ aktualizacji",
+  "Update type:": "Typ aktualizacji:",
+  "Upgrade": "Uaktualnij",
+  "Uptime": "Czas pracy",
+  "Usage searches": "Wyszukiwania użyć",
+  "Usage search did not finish; nothing was deleted": "Wyszukiwanie użyć nie zostało zakończone; nic nie usunięto",
+  "usage": "użycie",
+  "usages": "użycia",
+  "more": "więcej",
+  "Usages": "Użycia",
+  "Code author": "Autor kodu",
+  "Usages Detected": "Wykryto użycia",
+  "Usages actions": "Akcje użyć",
+  "Usages of '{symbol}'": "Użycia symbolu '{symbol}'",
+  "Usages of element at caret": "Użycia elementu przy kursorze",
+  "Use \"CamelHumps\" words": "Używaj słów w formacie \"CamelHumps\"",
+  "Use 24-hour time format": "Używaj 24-godzinnego formatu czasu",
+  "Use Call Hierarchy (⌃⌥H) or Type Hierarchy (⌃H) on a symbol to see its hierarchy here": "Użyj Hierarchii Wywołań (⌃⌥H) lub Hierarchii Typów (⌃H) na symbolu, aby zobaczyć jego hierarchię tutaj",
+  "Use DROP CASCADE syntax": "Używaj składni DROP CASCADE",
+  "Use Default Theme": "Używaj domyślnego motywu",
+  "Use Find Usages (⌥F7) on a symbol to see its usages here": "Użyj Znajdź Użycia (⌥F7) na symbolu, aby zobaczyć jego użycia tutaj",
+  "Use IF EXISTS syntax": "Używaj składni IF EXISTS",
+  "Use Option as Meta key": "Używaj klawisza Option jako Meta",
+  "Use SSH tunnel": "Używaj tunelu SSH",
+  "Use block caret": "Używaj kursorów blokowych",
+  "Use contrast scrollbars": "Używaj kontrastowych pasków przewijania",
+  "Use custom font": "Używaj własnej czcionki",
+  "Use custom font:": "Używaj własnej czcionki:",
+  "Use editor font": "Używaj czcionki edytora",
+  "Use lighter color in the dark theme and darker color in the light theme as a background": "Używaj jaśniejszego koloru w ciemnym motywie i ciemniejszego w jasnym motywie jako tła",
+  "Use original line's indent for wrapped parts": "Używaj wcięcia oryginalnego wiersza dla zawiniętych części",
+  "Use pretty formatting": "Używaj czytelnego formatowania (pretty printing)",
+  "Use project colors in main toolbar": "Używaj kolorów projektu na głównym pasku narzędzi",
+  "Use smooth caret blinking": "Używaj płynnego migania kursora",
+  "Use smooth caret movement": "Używaj płynnego ruchu kursora",
+  "Use soft wraps in console": "Używaj miękkiego zawijania wierszy w konsoli",
+  "Use tab character": "Używaj znaku tabulacji",
+  "Used by the npm run configurations detected from package.json scripts.": "Używane przez konfiguracje uruchamiania npm wykryte ze skryptów pliku package.json.",
+  "Used for new files.": "Używane dla nowych plików.",
+  "User": "Użytkownik",
+  "User settings file": "Plik ustawień użytkownika",
+  "User:": "Użytkownik:",
+  "Uses HostName, User, Port, IdentityFile and ProxyJump from ~/.ssh/config, and keys of the SSH agent.": "Używa parametrów HostName, User, Port, IdentityFile oraz ProxyJump z ~/.ssh/config oraz kluczy agenta SSH.",
+  "VCS Operations": "Operacje systemu kontroli wersji (VCS)",
+  "VCS Operations…": "Operacje VCS…",
+  "Value": "Wartość",
+  "Value tooltip delay (ms)": "Opóźnienie podpowiedzi wartości (ms)",
+  "Value tooltips are off": "Dymki wartości są wyłączone",
+  "Values are inserted as SQL: quote strings, e.g. 'abc'.": "Wartości są wstawiane jako SQL: używaj cudzysłowów dla ciągów znaków, np. 'abc'.",
+  "Values of local variables are shown after the lines that use them while suspended.": "Wartości zmiennych lokalnych są wyświetlane po wierszach, które ich używają, podczas wstrzymania.",
+  "Variable": "Zmienna",
+  "Variables": "Zmienne",
+  "Variables:": "Zmienne:",
+  "Version": "Wersja",
+  "Version Control": "Kontrola wersji",
+  "Version control": "Kontrola wersji",
+  "Version control:": "Kontrola wersji:",
+  "Version control is not configured": "Kontrola wersji nie jest skonfigurowana",
+  "Version used by vtsls / typescript-language-server (typescript.tsdk, tsserver.path).": "Wersja używana przez vtsls / typescript-language-server (typescript.tsdk, tsserver.path).",
+  "Vertical": "Pionowo",
+  "View": "Widok",
+  "View Breakpoints…": "Wyświetl punkty przerwania…",
+  "View Pull Requests": "Wyświetl zgłoszenia pull request",
+  "View Usages": "Wyświetl użycia",
+  "View in Browser": "Wyświetl w przeglądarce",
+  "Violet": "Fioletowy",
+  "Virtual Space": "Przestrzeń wirtualna",
+  "Virtualenv Environment": "Środowisko Virtualenv",
+  "Virtualenv Location": "Lokalizacja Virtualenv",
+  "Visual guides": "Prowadnice wizualne",
+  "WHERE filter": "Filtr WHERE",
+  "Warn if CRLF line separators are about to be committed": "Ostrzegaj, jeśli separatory wierszy CRLF mają zostać zatwierdzone",
+  "Warn when committing in detached HEAD or during rebase": "Ostrzegaj podczas zatwierdzania w stanie odłączonej HEAD lub w trakcie zmiany bazy",
+  "Warning": "Ostrzeżenie",
+  "Welcome": "Witamy",
+  "Welcome to OpenIDEA": "Witamy w OpenIDEA",
+  "What's New": "Co nowego",
+  "When caret is moved": "Gdy kursor zostanie przesunięty",
+  "When files are created": "Gdy pliki są tworzone",
+  "When files are deleted": "Gdy pliki są usuwane",
+  "When the current tab is closed, activate": "Po zamknięciu bieżącej karty aktywuj",
+  "When the tab limit is reached": "Po osiągnięciu limitu kart",
+  "Widescreen tool window layout": "Układ okien narzędziowych dla panoramicznych ekranów",
+  "Window": "Okno",
+  "Words": "Słowa",
+  "Working": "Przetwarzanie",
+  "Working directory": "Katalog roboczy",
+  "Wrap when typing reaches right margin": "Zawijaj wiersze, gdy wpisywany tekst osiągnie prawy margines",
+  "Wrapping": "Zawijanie",
+  "Yellow": "Żółty",
+  "You can also drop a folder onto this window.": "Możesz także przeciągnąć i upuścić folder na to okno.",
+  "Your version": "Twoja wersja",
+  "Zoom": "Powiększenie",
+  "Zoom In IDE": "Powiększ interfejs IDE",
+  "Zoom Out IDE": "Pomniejsz interfejs IDE",
+  "a dollar sign. Leading tabs are indent units.": "znak dolara. Początkowe tabulacje stanowią jednostki wcięcia.",
+  "any number of nodes (arguments, statements). A placeholder used twice must match equal code.": "dowolna liczba węzłów (argumentów, instrukcji). Symbol zastępczy użyty dwukrotnie musi odpowiadać takiemu samemu kodowi.",
+  "any, rust, typescript…": "any, rust, typescript…",
+  "cargo run configurations and rust-analyzer use this toolchain (PATH, RUSTUP_TOOLCHAIN).": "Konfiguracje uruchamiania cargo i analyzer Rust używają tego łańcucha narzędzi (PATH, RUSTUP_TOOLCHAIN).",
+  "chord prefix": "prefiks kombinacji klawiszy",
+  "command line tool. Install it, then run": "narzędzie wiersza poleceń. Zainstaluj je, a następnie uruchom",
+  "compact the conversation": "kompresuj rozmowę",
+  "configured in": "skonfigurowano w",
+  "const declaration": "deklaracja const",
+  "current branch": "bieżąca gałąź",
+  "debugpy is not installed": "Pakiet debugpy nie jest zainstalowany",
+  "delete specific rows from a table": "usuń określone wiersze z tabeli",
+  "failed to load": "nie udało się wczytać",
+  "for loop": "pętla for",
+  "for range loop": "pętla for range",
+  "for…in loop": "pętla for…in",
+  "for…of loop": "pętla for…of",
+  "from packageManager / lock file": "z packageManager / pliku blokady (lock file)",
+  "from ~/.ssh/config": "z ~/.ssh/config",
+  "host or ~/.ssh/config alias": "host lub alias z ~/.ssh/config",
+  "if statement": "instrukcja if",
+  "impl block": "blok impl",
+  "import default": "import domyślny",
+  "in a terminal, then retry.": "w terminalu, a następnie ponów próbę.",
+  "insert rows into a table": "wstaw wiersze do tabeli",
+  "inside your project.": "wewnątrz Twojego projektu.",
+  "is already assigned to:": "jest już przypisany do:",
+  "is omitted (with one following blank line) when there is no package.": "jest pomijany (z jedną następującą pustą linią), gdy brak pakietu.",
+  "is on PATH.": "znajduje się w ścieżce PATH.",
+  "last · p50 · p95 · max": "ostatnie · p50 · p95 · maks",
+  "let binding": "powiązanie let",
+  "let mut binding": "powiązanie let mut",
+  "main function": "funkcja main",
+  "main function with __main__ guard": "funkcja main z blokadą __main__",
+  "main() function": "funkcja main()",
+  "main() method": "metoda main()",
+  "main(args) function": "funkcja main(args)",
+  "match expression": "wyrażenie match",
+  "match one node,": "dopasuj jeden węzeł,",
+  "new column definition": "definicja nowej kolumny",
+  "new remote branch": "nowa gałąź zdalna",
+  "new table definition": "definicja nowej tabeli",
+  "new view definition": "definicja nowego widoku",
+  "no file is open in the editor": "brak otwartego pliku w edytorze",
+  "no symbols": "brak symboli",
+  "not found": "nie znaleziono",
+  "not installed in this project": "nie zainstalowano w tym projekcie",
+  "or click a line number to set a breakpoint.": "lub kliknij numer wiersza, aby ustawić punkt przerwania.",
+  "per module, the JDK of its Java version": "na moduł, JDK dla odpowiedniej wersji Java",
+  "pip output": "dane wyjściowe pip",
+  "places the caret. A line with": "ustawia kursor. Wiersz z",
+  "println! with Debug": "println! z Debug",
+  "pytest test function": "funkcja testowa pytest",
+  "replaced ·": "zastąpione ·",
+  "rust-analyzer runs the tool after each save and reports its diagnostics.": "rust-analyzer uruchamia narzędzie po każdym zapisie i zgłasza jego diagnostykę.",
+  "select a limited number of rows from a table": "wybierz ograniczoną liczbę wierszy z tabeli",
+  "select all rows from a table": "wybierz wszystkie wiersze z tabeli",
+  "select specific rows from a table": "wybierz określone wiersze z tabeli",
+  "select the number of specific rows in a table": "wybierz liczbę określonych wierszy w tabeli",
+  "surrounded text,": "otoczony tekst,",
+  "the language server's own TypeScript": "własna wersja TypeScript serwera językowego",
+  "update values in a table": "aktualizuj wartości w tabeli",
+  "val declaration": "deklaracja val",
+  "var declaration": "deklaracja var",
+  "variables (repeated ones are linked),": "zmienne (powtarzające się są połączone),",
+  "via the gear menu › Install Plugin from Disk….": "za pomocą menu z ikony zębatki › Zainstaluj wtyczkę z dysku….",
+  "with BOM": "z nagłówkiem BOM",
+  "with BOM under Windows, with no BOM otherwise": "z BOM w systemie Windows, bez BOM w pozostałych przypadkach",
+  "with NO BOM": "BEZ nagłówka BOM",
+  "with statement": "instrukcja with",
+  "{count} rows exported": "Wyeksportowano wierszy: {count}",
+  "{index} of {total}": "{index} z {total}",
+  "{name} failed": "{name} nie powiodło się",
+  "{name} has unsaved changes": "{name} ma niezapisane zmiany",
+  "{name} installed": "Zainstalowano {name}",
+  "{name} is not installed": "Pakiet {name} nie jest zainstalowany",
+  "⌥← / ⌥→ and ⌥⌫ stop at humps of camelCase names.": "⌥← / ⌥→ oraz ⌥⌫ zatrzymują się na słowach składowych nazw typu camelCase.",
+  "Specify commit message": "Podaj wiadomość zatwierdzenia",
+  "Author:": "Autor:",
+  "Run Git hooks": "Uruchamiaj skrypty Git hook",
+  "Advanced Commit Checks": "Zaawansowane kontrole przed zatwierdzeniem",
+  "Configure": "Konfiguruj",
+  "View Options": "Opcje widoku",
+  "Stash": "Schowek (Stash)",
+  "Remove Recent Project": "Usuń niedawny projekt",
+  "Group By": "Grupuj według",
+  "The search hit its limit; only usages found so far are replaced.": "Wyszukiwanie osiągnęło swój limit; zastąpiono tylko znalezione do tej pory użycia.",
+  "Review": "Recenzja",
+  "Commit and Push…": "Zatwierdź i wyślij…",
+  "Language server": "Serwer językowy",
+  "Path": "Ścieżka",
+  "Missing": "Brakujące",
+  "Installs into the IDE's own tools folder via {installMethod}": "Instaluje się w folderze własnych narzędzi IDE za pomocą {installMethod}",
+  "No tool selected": "Nie wybrano narzędzia",
+  "Custom": "Własne",
+  "On PATH": "W ścieżce PATH",
+  "Reinstall": "Zainstaluj ponownie",
+  "Move focus to the Editor with Escape": "Przenieś fokus do Edytora za pomocą klawisza Escape",
+  "Otherwise Escape goes to the shell.": "W przeciwnym razie klawisz Escape przechodzi do powłoki.",
+  "Configure terminal keybindings": "Konfiguruj skróty klawiszowe terminala",
+  "Used for characters the main font lacks.": "Używane dla znaków, których brakuje w czcionce głównej.",
+  "Column width": "Szerokość kolumny",
+  "Installed Shells": "Zainstalowane powłoki",
+  "Installed shells": "Zainstalowane powłoki",
+  "Shell Path": "Ścieżka do powłoki",
+  "New Predefined Session": "Nowa zdefiniowana sesja",
+  "Suspend": "Wstrzymaj",
+  "\"Breakpoint hit\" message": "Komunikat \"Osiągnięto punkt przerwania\"",
+  "Evaluate and log": "Oblicz i zapisz w dzienniku",
+  "History": "Historia",
+  "Expand value": "Rozwiń wartość",
+  "Expression history": "Historia wyrażeń",
+  "Allow multiple instances": "Zezwalaj na wiele instancji",
+  "Hold Shift to Debug, F4 to edit, Delete to remove": "Przytrzymaj Shift, aby debugować, F4, aby edytować, Delete, aby usunąć",
+  "Hold Shift to Run, F4 to edit, Delete to remove": "Przytrzymaj Shift, aby uruchomić, F4, aby edytować, Delete, aby usunąć",
+  "Send EOF": "Wyślij EOF (Koniec pliku)",
+  "Collapse folded lines": "Zwiń zwinięte wiersze",
+  "Close Tool Window Tab": "Zamknij kartę okna narzędziowego",
+  "No open files": "Brak otwartych plików",
+  "Open files": "Otwarte pliki",
+  "New name:": "Nowa nazwa:",
+  "Open copy in editor": "Otwórz kopię w edytorze",
+  "Safe delete (with usage search)": "Bezpieczne usuwanie (z wyszukiwaniem użycia)",
+  "Looking for usages…": "Wyszukiwanie użyć…",
+  "Delete Without Search": "Usuń bez wyszukiwania",
+  "Rebasing {commit} from {branch}": "Zmienianie bazy {commit} z gałęzi {branch}",
+  "Already rebased commits and commits from {branch}": "Już przekształcone zatwierdzenia oraz zatwierdzenia z {branch}",
+  "Already rebased commits": "Zatwierdzenia o już zmienionej bazie",
+  "Changes from {name}": "Zmiany z {name}",
+  "Your changes": "Twoje zmiany",
+  "Changes from diverging branches": "Zmiany z rozbieżnych gałęzi",
+  "Local Changes": "Zmiany lokalne",
+  "Changes from cherry-pick {commit}": "Zmiany z wybranej operacji cherry-pick {commit}",
+  "Changes from cherry-pick": "Zmiany z operacji cherry-pick",
+  "Your version, branch {branch}": "Twoja wersja, gałąź {branch}",
+  "Git Checkout Problem": "Problem z pobraniem z Git (Checkout)",
+  "Smart Checkout": "Inteligentne pobieranie (Smart Checkout)",
+  "Force Checkout": "Wymuś pobranie (Force Checkout)",
+  "Don't Checkout": "Nie pobieraj",
+  "Rebase onto Remote": "Zmień bazę na repozytorium zdalne",
+  "Drop Local Commits": "Odrzuć lokalne zatwierdzenia",
+  "Checkout {name}": "Pobierz {name}",
+  "Restore": "Przywróć",
+  "View Commits": "Wyświetl zatwierdzenia",
+  "Delete Tracked Branch": "Usuń śledzoną gałąź",
+  "Deleted branch {name}": "Usunięto gałąź {name}",
+  "Unmerged commits were discarded": "Niescalone zatwierdzenia zostały odrzucone",
+  "Restored branch {name}": "Przywrócono gałąź {name}",
+  "Commits of {name}": "Zatwierdzenia dla {name}",
+  "All files are up-to-date": "Wszystkie pliki są aktualne",
+  "Update Info": "Informacje o aktualizacji",
+  "Press again to go to the next file": "Naciśnij ponownie, aby przejść do następnego pliku",
+  "Press again to go to the previous file": "Naciśnij ponownie, aby przejść do poprzedniego pliku",
+  "Include in commit": "Dołącz do zatwierdzenia",
+  "Code analysis": "Analiza kodu",
+  "Line separators": "Separatory wierszy",
+  "Commit during rebase": "Zatwierdź podczas zmiany bazy",
+  "Commit in detached HEAD": "Zatwierdź w stanie odłączonej HEAD",
+  "Amend Commit": "Popraw zatwierdzenie (Amend)",
+  "Show Commit Message History": "Pokaż historię wiadomości zatwierdzeń",
+  "Don't warn about this target": "Nie ostrzegaj o tym celu",
+  "Target branch": "Gałąź docelowa",
+  "Checked out {name}": "Pobrano gałąź {name}",
+  "Pin Window": "Przypnij okno",
+  "Search Context": "Kontekst wyszukiwania",
+  "Anywhere": "Wszędzie",
+  "In Comments": "W komentarzach",
+  "In String Literals": "W literałach łańcuchowych",
+  "Except Comments": "Poza komentarzami",
+  "Except String Literals": "Poza literałami łańcuchowymi",
+  "Except Comments and String Literals": "Poza komentarzami i literałami łańcuchowymi",
+  "Recent Replacements": "Niedawne zastąpienia",
+  "No recent replacements": "Brak niedawnych zastąpień",
+  "Replace {count} Occurrences": "Zastąp wystąpienia: {count}",
+  "Add Mnemonic Bookmark": "Dodaj zakładkę mnemoniczną",
+  "Change Mnemonic": "Zmień mnemonik",
+  "Assign Mnemonic": "Przypisz mnemonik",
+  "Assigned bookmark": "Przypisana zakładka",
+  "Current bookmark": "Bieżąca zakładka",
+  "No bookmarks": "Brak zakładek",
+  "Edit Bookmark Description": "Edytuj opis zakładki",
+  "Toggle Bookmark with Mnemonic": "Przełącz zakładkę z mnemonikiem",
+  "Toggle Bookmark {n}": "Przełącz zakładkę {n}",
+  "Go to Bookmark {n}": "Przejdź do zakładki {n}",
+  "Select In": "Zaznacz w",
+  "Select In…": "Zaznacz w…",
+  "Next Result": "Następny wynik",
+  "Previous Result": "Poprzedni wynik",
+  "Open Result": "Otwórz wynik",
+  "Graph Options": "Opcje wykresu",
+  "Go to Hash/Branch/Tag": "Przejdź do Hasza/Gałęzi/Tagu",
+  "Enter hash or branch/tag name": "Wprowadź hasz lub nazwę gałęzi/tagu",
+  "Sort": "Sortuj",
+  "By Commit Date": "Według daty zatwierdzenia",
+  "Topologically": "Topologicznie",
+  "First Parent": "Pierwszy rodzic",
+  "No Merges": "Bez scalania",
+  "Branch Actions": "Akcje gałęzi",
+  "Collapse Linear Branches": "Zwiń gałęzie liniowe",
+  "Expand Linear Branches": "Rozwiń gałęzie liniowe",
+  "Compact References View": "Kompaktowy widok referencji",
+  "Tag Names": "Nazwy tagów",
+  "Long Edges": "Długie krawędzie",
+  "Commit Timestamp": "Znacznik czasu zatwierdzenia",
+  "References on the Left": "Referencje po lewej stronie",
+  "Hash": "Hasz",
+  "Highlight": "Podświetlenie",
+  "My Commits": "Moje zatwierdzenia",
+  "Merge Commits": "Zatwierdzenia scalające",
+  "Rebase…": "Zmień bazę…",
+  "Manage Remotes…": "Zarządzaj repozytoriami zdalnymi…",
+  "Clone…": "Klonuj…",
+  "New Worktree…": "Nowy obszar roboczy (worktree)…",
+  "Worktrees…": "Obszary robocze (worktrees)…",
+  "Worktrees": "Obszary robocze (worktrees)",
+  "New Worktree": "Nowy obszar roboczy (worktree)",
+  "Git Remotes": "Repozytoria zdalne Git",
+  "Define Remote": "Zdefiniuj repozytorium zdalne",
+  "Edit Remote": "Edytuj repozytorium zdalne",
+  "Add Remote…": "Dodaj repozytorium zdalne…",
+  "Remove Remote": "Usuń repozytorium zdalne",
+  "Edit Remote…": "Edytuj repozytorium zdalne…",
+  "Remove Worktree": "Usuń obszar roboczy (worktree)",
+  "Branch to merge:": "Gałąź do scalenia:",
+  "Check out:": "Pobierz:",
+  "Create a new branch": "Utwórz nową gałąź",
+  "Folder:": "Folder:",
+  "Options:": "Opcje:",
+  "No remotes": "Brak repozytoriów zdalnych",
+  "Include disabled actions": "Dołącz wyłączone akcje",
+  "Symbol Kinds": "Rodzaje symboli",
+  "Open Settings Page": "Otwórz stronę ustawień",
+  "Assign Shortcut…": "Przypisz skrót…",
+  "New List…": "Nowa lista…",
+  "Rename List…": "Zmień nazwę listy…",
+  "Make Default": "Ustaw jako domyślne",
+  "Delete List": "Usuń listę",
+  "Move to Another List": "Przenieś do innej listy",
+  "New Bookmark List…": "Nowa lista zakładek…",
+  "Toggle File Bookmark": "Przełącz zakładkę pliku",
+  "New Bookmark List": "Nowa lista zakładek",
+  "Rename Bookmark List": "Zmień nazwę listy zakładek",
+  "Delete Bookmark List": "Usuń listę zakładek",
+  "Add Bookmark": "Dodaj zakładkę",
+  "Remove Bookmark": "Usuń zakładkę",
+  "Interfaces": "Interfejsy",
+  "Structs": "Struktury",
+  "Enums": "Typy wyliczeniowe",
+  "Traits": "Cechy (Traits)",
+  "Type Aliases": "Aliasy typów",
+  "Functions": "Funkcje",
+  "Methods": "Metody",
+  "Constructors": "Konstruktory",
+  "Fields": "Pola",
+  "Constants": "Stałe",
+  "Enum Members": "Elementy typu wyliczeniowego",
+  "Modules": "Moduły",
+  "Namespaces": "Przestrzenie nazw",
+  "List name": "Nazwa listy",
+  "Add Service": "Dodaj usługę",
+  "Add service": "Dodaj usługę",
+  "No services configured.": "Brak skonfigurowanych usług.",
+  "Select service to view details": "Wybierz usługę, aby wyświetlić szczegóły",
+  "Run Configuration Type": "Typ konfiguracji uruchamiania",
+  "Docker Registry…": "Rejestr Dockera…",
+  "Docker Connection…": "Połączenie Dockera…",
+  "Address:": "Adres:",
+  "Username:": "Nazwa użytkownika:",
+  "Scope Based": "Na podstawie zakresu",
+  "Scope:": "Zakres:",
+  "Edit Scopes…": "Edytuj zakresy…",
+  "Import a report collected in CI from disk": "Zaimportuj raport zgromadzony w CI z dysku",
+  "Manage Coverage Reports…": "Zarządzaj raportami pokrycia kodu…",
+  "Coverage Reports": "Raporty pokrycia kodu",
+  "Show Selected": "Pokaż zaznaczone",
+  "Import…": "Importuj…",
+  "Reload All from Disk": "Przeładuj wszystko z dysku",
+  "Reset Font Size in All Editors": "Zresetuj rozmiar czcionki we wszystkich edytorach",
+  "Library source (read-only).": "Kod źródłowy biblioteki (tylko do odczytu).",
+  "Search In Selection": "Szukaj w zaznaczeniu",
+  "Search Scope": "Zakres wyszukiwania",
+  "Filter Search Results": "Filtruj wyniki wyszukiwania",
+  "Filter search results": "Filtruj wyniki wyszukiwania",
+  "Recent searches": "Niedawne wyszukiwania",
+  "New Line": "Nowy wiersz",
+  "New Line in Search Field": "Nowy wiersz w polu wyszukiwania",
+  "Quick Type Definition": "Szybka definicja typu",
+  "Code Cleanup in File": "Czyszczenie kodu w pliku",
+  "Nothing to generate here": "Brak elementów do wygenerowania w tym miejscu",
+  "Sort by name": "Sortuj według nazwy",
+  "Sort suggestions by relevance": "Sortuj sugestie według trafności",
+  "Sort suggestions alphabetically": "Sortuj sugestie alfabetycznie",
+  "Press ↵ to insert, ⇥ to replace": "Naciśnij ↵, aby wstawić, ⇥, aby zastąpić",
+  "Formatting is turned off for this file (Code Style › Formatter › Do not format)": "Formatowanie jest wyłączone dla tego pliku (Styl kodu › Formatowanie › Nie formatuj)",
+  "No type definition found": "Nie znaleziono definicji typu",
+  "No definition found": "Nie znaleziono definicji",
+  "Typo: Change to…": "Błąd literowy: Zmień na…",
+  "Spelling": "Pisownia",
+  "No refactoring applies here": "Brak refaktoryzacji możliwej do zastosowania w tym miejscu",
+  "Inline Completion": "Uzupełnianie wewnątrzlinijkowe",
+  "Call Inline Completion": "Wywołaj uzupełnianie wewnątrzlinijkowe",
+  "Inline completion is off for this language": "Uzupełnianie wewnątrzlinijkowe jest wyłączone dla tego języka",
+  "No inline suggestions": "Brak sugestii wewnątrzlinijkowych",
+  "{servers} doesn't support {feature}": "{servers} nie obsługuje {feature}",
+  "completion": "uzupełnianie",
+  "inline completion": "uzupełnianie wewnątrzlinijkowe",
+  "hover": "najechanie",
+  "signature help": "pomoc dotycząca sygnatury",
+  "go to definition": "przejdź do definicji",
+  "go to declaration": "przejdź do deklaracji",
+  "go to type definition": "przejdź do definicji typu",
+  "go to implementation": "przejdź do implementacji",
+  "find references": "znajdź referencje",
+  "document highlights": "podświetlenia w dokumencie",
+  "code actions": "akcje kodu",
+  "rename": "zmień nazwę",
+  "formatting": "formatowanie",
+  "range formatting": "formatowanie zakresu",
+  "inlay hints": "wskazówki wewnątrzlinijkowe",
+  "code lens": "funkcja CodeLens",
+  "document links": "linki w dokumencie",
+  "call hierarchy": "hierarchia wywołań",
+  "type hierarchy": "hierarchia typów",
+  "workspace symbols": "symbole obszaru roboczego",
+  "Insert Inline Proposal": "Wstaw propozycję wewnątrzlinijkową",
+  "Insert Inline Proposal: Next Word": "Wstaw propozycję wewnątrzlinijkową: Następne słowo",
+  "Hide Inline Proposal": "Ukryj propozycję wewnątrzlinijkową",
+  "Show Next Inline Proposal": "Pokaż następną propozycję wewnątrzlinijkową",
+  "Show Previous Inline Proposal": "Pokaż poprzednią propozycję wewnątrzlinijkową",
+  "Inspection profile:": "Profil inspekcji:",
+  "Inspection profile": "Profil inspekcji",
+  "Configure inspections": "Konfiguruj inspekcje",
+  "Run Code Cleanup": "Uruchom czyszczenie kodu",
+  "Apply the language servers' automatic fixes": "Zastosuj automatyczne poprawki serwerów językowych",
+  "No files with a language server in this scope": "Brak plików z serwerem językowym w tym zakresie",
+  "Code Cleanup": "Czyszczenie kodu",
+  "Code Cleanup…": "Czyszczenie kodu…",
+  "Clean Up": "Wyczyść",
+  "No custom scopes": "Brak własnych zakresów",
+  "Custom scope": "Własny zakres",
+  "Custom Scopes": "Własne zakresy",
+  "Choose a scope": "Wybierz zakres",
+  "Enter a project name": "Wprowadź nazwę projektu",
+  "The name contains characters a folder name cannot have": "Nazwa zawiera znaki, których nie może zawierać nazwa folderu",
+  "Project Location": "Lokalizacja projektu",
+  "New Project": "Nowy projekt",
+  "New Project…": "Nowy projekt…",
+  "Create Git repository": "Utwórz repozytorium Git",
+  "Export Settings": "Eksportuj ustawienia",
+  "Export Settings…": "Eksportuj ustawienia…",
+  "OpenIDEA settings": "Ustawienia OpenIDEA",
+  "Settings exported": "Wyeksportowano ustawienia",
+  "Cannot export settings": "Nie można wyeksportować ustawień",
+  "Import Settings": "Importuj ustawienia",
+  "Import Settings…": "Importuj ustawienia…",
+  "Settings imported": "Zaimportowano ustawienia",
+  "Restart to apply imported templates, macros, layouts and view options.": "Uruchom ponownie, aby zastosować zaimportowane szablony, makra, układy i opcje widoku.",
+  "Cannot import settings": "Nie można zaimportować ustawień",
+  "Rename Project": "Zmień nazwę projektu",
+  "Rename Project…": "Zmień nazwę projektu…",
+  "New project name:": "Nowa nazwa projektu:",
+  "Cannot rename project": "Nie można zmienić nazwy projektu",
+  "Power Save Mode": "Tryb oszczędzania energii",
+  "Cannot change Power Save Mode": "Nie można zmienić trybu oszczędzania energii",
+  "Power save mode is on: completion and documentation popups and usage highlighting are off.": "Tryb oszczędzania energii jest włączony: podpowiedzi, okna wyskakujące z dokumentacją oraz podświetlanie użycia są wyłączone.",
+  "This needs the desktop app": "To wymaga aplikacji stacjonarnej",
+  "Turn Off": "Wyłącz",
+  "Build Tools": "Narzędzia budowania",
+  "Import a Coverage Report…": "Zaimportuj raport pokrycia kodu…",
+  "Choose the shown coverage suite, delete suites and imported reports": "Wybierz wyświetlany zestaw pokrycia kodu, usuń zestawy i zaimportowane raporty",
+  "Import Coverage Report": "Zaimportuj raport pokrycia kodu",
+  "Coverage reports (lcov, JaCoCo XML, Go cover profile)": "Raporty pokrycia kodu (lcov, JaCoCo XML, profil pokrycia Go)",
+  "All files": "Wszystkie pliki",
+  "Importing coverage needs the desktop app": "Importowanie pokrycia kodu wymaga aplikacji stacjonarnej",
+  "Coverage reports": "Raporty pokrycia kodu",
+  "not loaded": "niewczytane",
+  "No coverage reports. Run with coverage or import a report.": "Brak raportów pokrycia kodu. Uruchom z pokryciem kodu lub zaimportuj raport.",
+  "No color": "Brak koloru",
+  "Verify CA": "Weryfikuj CA",
+  "Verify Full": "Weryfikacja pełna",
+  "Manual": "Ręcznie",
+  "Name or pattern, e.g. app_*": "Nazwa lub wzorzec, np. app_*",
+  "Schemas": "Schematy",
+  "Advanced": "Zaawansowane",
+  "Data source type": "Typ źródła danych",
+  "path/to/database.db (absolute or project-relative)": "sciezka/do/bazy.db (bezwzględna lub względna wobec projektu)",
+  "Connection type:": "Typ połączenia:",
+  "Connection type": "Typ połączenia",
+  "URL only": "Tylko URL",
+  "from the URL": "z adresu URL",
+  "Connects with the URL alone: host, port, database, SSL and parameters come from it.": "Łączy się wyłącznie za pomocą adresu URL: host, port, baza danych, SSL i parametry pochodzą z niego.",
+  "Editing the URL fills in the settings above.": "Edycja adresu URL wypełnia powyższe ustawienia.",
+  "Connection": "Połączenie",
+  "Transaction control:": "Kontrola transakcji:",
+  "Transaction control": "Kontrola transakcji",
+  "Default schema:": "Domyślny schemat:",
+  "public (search_path, e.g. app, public)": "publiczny (search_path, np. app, public)",
+  "Time zone:": "Strefa czasowa:",
+  "Server default, e.g. UTC or Europe/Berlin": "Domyślna serwera, np. UTC lub Europe/Berlin",
+  "UTC (+00:00), e.g. Europe/Berlin or +08:00": "UTC (+00:00), np. Europe/Berlin lub +08:00",
+  "Run keep-alive query each": "Uruchamiaj zapytanie podtrzymujące połączenie co",
+  "Auto-disconnect after": "Rozłącz automatycznie po",
+  "Startup script:": "Skrypt startowy:",
+  "Runs on every new connection, before any other statement.": "Uruchamia się przy każdym nowym połączeniu, przed jakimkolwiek innym poleceniem.",
+  "Passphrase:": "Hasło dostępowe (passphrase):",
+  "Passphrase": "Hasło dostępowe (passphrase)",
+  "Mode:": "Tryb:",
+  "CA file:": "Plik CA:",
+  "System roots when empty": "Główne certyfikaty systemowe, gdy puste",
+  "CA Certificate File": "Plik certyfikatu CA",
+  "Client certificate file:": "Plik certyfikatu klienta:",
+  "Client Certificate File": "Plik certyfikatu klienta",
+  "Client key file:": "Plik klucza klienta:",
+  "Client Key File": "Plik klucza klienta",
+  "Load Names from Server": "Wczytaj nazwy z serwera",
+  "Driver properties": "Właściwości sterownika",
+  "Property name": "Nazwa właściwości",
+  "Property value": "Wartość właściwości",
+  "Remove property": "Usuń właściwość",
+  "Add Property": "Dodaj właściwość",
+  "Color:": "Kolor:",
+  "Color": "Kolor",
+  "Add comment": "Dodaj komentarz",
+  "Connecting…": "Łączenie…",
+  "OceanBase (MySQL mode)": "OceanBase (tryb MySQL)",
+  "HTTP Request": "Żądanie HTTP",
+  "External Libraries": "Biblioteki zewnętrzne",
+  "library root": "katalog główny biblioteki",
+  "Scratch File": "Plik roboczy (Scratch File)",
+  "Stop Macro Recording": "Zatrzymaj nagrywanie makra",
+  "Start Macro Recording": "Rozpocznij nagrywanie makra",
+  "Recording macro…": "Nagrywanie makra…",
+  "Rename Macro": "Zmień nazwę makra",
+  "Enter a macro name": "Wprowadź nazwę makra",
+  "A macro with this name exists": "Makro o tej nazwie już istnieje",
+  "Delete Macro": "Usuń makro",
+  "Edit Macros": "Edytuj makra",
+  "Edit Macros…": "Edytuj makra…",
+  "No saved macros": "Brak zapisanych makr",
+  "Recorded steps": "Nagrane kroki",
+  "Macro playback stopped": "Odtwarzanie makra zostało zatrzymane",
+  "A recorded step could not run here.": "Nagrany krok nie mógł zostać tutaj uruchomiony.",
+  "Nothing was recorded": "Nic nie zostało nagrane",
+  "Enter Macro Name": "Wprowadź nazwę makra",
+  "Name (leave empty to keep it only as the last macro):": "Nazwa (pozostaw puste, aby zachować tylko jako ostatnie makro):",
+  "Play Back Last Macro": "Odtwórz ostatnie makro",
+  "Play Saved Macros…": "Odtwórz zapisane makra…",
+  "Play Saved Macro": "Odtwórz zapisane makro",
+  "Search for file type": "Szukaj typu pliku",
+  "File types": "Typy plików",
+  "this view": "ten widok",
+  "New in This Directory…": "Nowy w tym katalogu…",
+  "All Changed Files": "Wszystkie zmienione pliki",
+  "Scratches and Consoles": "Pliki robocze i konsole",
+  "Run Anything": "Uruchom cokolwiek",
+  "Run Anything…": "Uruchom cokolwiek…",
+  "Run a command, configuration or goal": "Uruchom polecenie, konfigurację lub cel",
+  "Run Anything entries": "Wpisy funkcji 'Uruchom cokolwiek'",
+  "Press Enter to run the command in the project directory": "Naciśnij Enter, aby uruchomić polecenie w katalogu projektu",
+  "Type a command": "Wpisz polecenie",
+  "Enter to run, Tab to complete. Other commands run in the project directory.": "Enter, aby uruchomić, Tab, aby uzupełnić. Inne polecenia uruchamiają się w katalogu projektu.",
+  "Recent": "Niedawne",
+  "Search types": "Szukaj typów",
+  "Search configuration types": "Szukaj typów konfiguracji",
+  "Configuration types": "Typy konfiguracji",
+  "Redirect input": "Przekieruj wejście",
+  "Paths to \".env\" files": "Ścieżki do plików \".env\"",
+  "Save console output to file": "Zapisz wyjście konsoli do pliku",
+  "Show console when a message is printed to stdout": "Pokaż konsolę, gdy komunikat zostanie wypisany na stdout",
+  "Show console when a message is printed to stderr": "Pokaż konsolę, gdy komunikat zostanie wypisany na stderr",
+  "Add before launch task": "Dodaj zadanie przed uruchomieniem",
+  "Open run/debug tool window when started": "Otwórz okno narzędziowe uruchamiania/debugowania po uruchomieniu",
+  "Focus run/debug tool window when started": "Przenieś fokus na okno narzędziowe uruchamiania/debugowania po uruchomieniu",
+  "Emulate terminal in output console": "Emuluj terminal w konsoli wyjściowej",
+  "Operating System": "System operacyjny",
+  "Logs": "Dzienniki (Logs)",
+  "Before Launch": "Przed uruchomieniem",
+  "Before launch": "Przed uruchomieniem",
+  "Before launch tasks": "Zadania przed uruchomieniem",
+  "Store as project file": "Zapisz jako plik projektu",
+  "Modify options": "Modyfikuj opcje",
+  "e.g. ./gradlew or cargo": "np. ./gradlew lub cargo",
+  "Edit Environment Variables": "Edytuj zmienne środowiskowe",
+  "Browse for .env Files": "Przeglądaj w poszukiwaniu plików .env",
+  "System environment variables are not passed": "Systemowe zmienne środowiskowe nie są przekazywane",
+  "Redirect input from": "Przekieruj wejście z",
+  "File relative to the project root": "Plik względny wobec katalogu głównego projektu",
+  "Shell command, e.g. make generate": "Polecenie powłoki, np. make generate",
+  "Remove Task": "Usuń zadanie",
+  "Add task": "Dodaj zadanie",
+  "Add configuration…": "Dodaj konfigurację…",
+  "Add configuration": "Dodaj konfigurację",
+  "New Folder": "Nowy folder",
+  "Remove Folder": "Usuń folder",
+  "Create New Folder": "Utwórz nowy folder",
+  "Unnamed": "Bez nazwy",
+  "No run configurations added.": "Nie dodano konfiguracji uruchamiania.",
+  "Add new…": "Dodaj nowy…",
+  "Edit configuration templates…": "Edytuj szablony konfiguracji…",
+  "Import from .vscode/launch.json": "Zaimportuj z .vscode/launch.json",
+  "Import Run Configurations from .vscode/launch.json": "Zaimportuj konfiguracje uruchamiania z .vscode/launch.json",
+  "Cannot import run configurations": "Nie można zaimportować konfiguracji uruchamiania",
+  "No run configurations imported from {file}": "Nie zaimportowano żadnych konfiguracji uruchamiania z pliku {file}",
+  "Imported {n} run configuration from {file}": "Zaimportowano {n} konfigurację uruchamiania z pliku {file}",
+  "Imported {n} run configurations from {file}": "Zaimportowano konfiguracji uruchamiania: {n} z pliku {file}",
+  "Skipped '{name}': {reason}": "Pominięto '{name}': {reason}",
+  "Left out of '{name}': {keys}": "Pominięto w '{name}': {keys}",
+  "Click OK or Apply to save them.": "Kliknij OK lub Zastosuj, aby je zapisać.",
+  "A configuration with this name already exists": "Konfiguracja o tej nazwie już istnieje",
+  "Type '{type}' has no equivalent here": "Typ '{type}' nie ma tutaj odpowiednika",
+  "Request '{request}' isn't supported": "Żądanie '{request}' nie jest obsługiwane",
+  "Only attaching to a host and port is supported": "Obsługiwane jest tylko dołączanie do hosta i portu",
+  "Uses {variable}, which is known only when VS Code starts it": "Używa {variable}, która jest znana tylko wtedy, gdy uruchamia ją VS Code",
+  "No program, module or command to run": "Brak programu, modułu lub polecenia do uruchomienia",
+  "Its configuration '{member}' isn't imported": "Jej konfiguracja '{member}' nie została zaimportowana",
+  "Not a configuration with a name": "To nie jest nazwana konfiguracja",
+  "'{name}' is saved in run.local.toml because it uses values from this machine": "Nazwa '{name}' została zapisana w pliku run.local.toml, ponieważ używa wartości z tej maszyny",
+  "This project has no .vscode/launch.json": "Ten projekt nie posiada pliku .vscode/launch.json",
+  "Import from JetBrains run configurations": "Zaimportuj z konfiguracji uruchamiania JetBrains",
+  "Import Run Configurations from JetBrains (.run, .idea)": "Zaimportuj konfiguracje uruchamiania JetBrains (.run, .idea)",
+  "This project has no JetBrains run configurations (.run, .idea)": "Ten projekt nie posiada konfiguracji uruchamiania JetBrains (.run, .idea)",
+  "{file} isn't in the project": "Plik {file} nie znajduje się w projekcie",
+  "Uses {variable}, a path variable with no value here": "Używa {variable}, zmiennej ścieżki bez wartości w tym miejscu",
+  "Uses {variable}, and the project has several modules": "Używa {variable}, a projekt posiada kilka modułów",
+  "The file can't be read: {detail}": "Plik nie może zostać odczytany: {detail}",
+  "Templates": "Szablony",
+  "Configuration templates": "Szablony konfiguracji",
+  "Back to configurations": "Powrót do konfiguracji",
+  "Select a configuration type": "Wybierz typ konfiguracji",
+  "Add new run configuration…": "Dodaj nową konfigurację uruchamiania…",
+  "or select run configuration to edit": "lub wybierz konfigurację uruchamiania do edycji",
+  "Folder name": "Nazwa folderu",
+  "Name is required": "Nazwa jest wymagana",
+  "Environment variable names can't be empty": "Nazwy zmiennych środowiskowych nie mogą być puste",
+  "Environment Variables": "Zmienne środowiskowe",
+  "User environment variables:": "Zmienne środowiskowe użytkownika:",
+  "User environment variables": "Zmienne środowiskowe użytkownika",
+  "Include system environment variables": "Dołącz systemowe zmienne środowiskowe",
+  "System environment variables": "Systemowe zmienne środowiskowe",
+  "Click the Run icon in the editor gutter": "Kliknij ikonę Uruchom na marginesie edytora",
+  "Select \"Run…\" in the editor context menu": "Wybierz \"Uruchom…\" w menu kontekstowym edytora",
+  "Launch a": "Uruchom",
+  "run configuration": "konfigurację uruchamiania",
+  "Run Current File": "Uruchom bieżący plik",
+  "Debug Current File": "Debuguj bieżący plik",
+  "Run Another Configuration": "Uruchom inną konfigurację",
+  "Run External Tool": "Uruchom narzędzie zewnętrzne",
+  "Run Shell Command": "Uruchom polecenie powłoki",
+  "Run shell command": "Uruchom polecenie powłoki",
+  "Activate Tool Window": "Aktywuj okno narzędziowe",
+  "Building is not available": "Budowanie jest niedostępne",
+  "A build is already running": "Budowanie jest już w toku",
+  "The before launch tasks run in a cycle": "Zadania przed uruchomieniem wykonują się w pętli",
+  "No command": "Brak polecenia",
+  "Compound": "Złożona",
+  "Add at least one configuration": "Dodaj co najmniej jedną konfigurację",
+  "A compound configuration can't include itself": "Złożona konfiguracja nie może zawierać samej siebie",
+  "Some configurations no longer exist": "Niektóre konfiguracje już nie istnieją",
+  "Command is required": "Polecenie jest wymagane",
+  "A before launch task runs a missing configuration or this one": "Zadanie przed uruchomieniem uruchamia brakującą konfigurację lub tę samą",
+  "A before launch task is incomplete": "Zadanie przed uruchomieniem jest niekompletne",
+  "Run Widget": "Widżet uruchamiania",
+  "Run Configurations": "Konfiguracje uruchamiania",
+  "Starting": "Uruchamianie",
+  "Stopped": "Zatrzymano",
+  "Finished": "Zakończono",
+  "Remove from Services": "Usuń z usług",
+  "Show in Run Tool Window": "Pokaż w oknie narzędziowym Uruchom",
+  "Configuration": "Konfiguracja",
+  "Type": "Typ",
+  "Not started": "Nieuruchomiony",
+  "Shell Script": "Skrypt powłoki",
+  "Run a script file, script text or command line": "Uruchom plik skryptu, tekst skryptu lub wiersz poleceń",
+  "Script file": "Plik skryptu",
+  "Script text": "Tekst skryptu",
+  "Script path": "Ścieżka do skryptu",
+  "Script options": "Opcje skryptu",
+  "Interpreter path": "Ścieżka do interpretera",
+  "Run the script directly": "Uruchom skrypt bezpośrednio",
+  "Interpreter options": "Opcje interpretera",
+  "Run an executable with arguments": "Uruchom plik wykonywalny z argumentami",
+  "Executable": "Plik wykonywalny",
+  "Path or command on PATH": "Ścieżka lub polecenie w ścieżce PATH",
+  "Program arguments": "Argumenty programu",
+  "VM options": "Opcje maszyny wirtualnej (VM)",
+  "e.g. -Xmx1g -Dkey=value --add-opens java.base/java.lang=ALL-UNNAMED": "np. -Xmx1g -Dkey=value --add-opens java.base/java.lang=ALL-UNNAMED",
+  "Main class": "Klasa główna",
+  "e.g. com.example.Application": "np. com.example.Application",
+  "Active profiles": "Aktywne profile",
+  "e.g. dev,local": "np. dev,local",
+  "Comma separated; passed as --spring.profiles.active": "Rozdzielone przecinkami; przekazywane jako --spring.profiles.active",
+  "Comma separated; passed as -Dspring-boot.run.profiles": "Rozdzielone przecinkami; przekazywane jako -Dspring-boot.run.profiles",
+  "Comma separated; passed as -Dspring.profiles.active": "Rozdzielone przecinkami; przekazywane jako -Dspring.profiles.active",
+  "Classpath": "Ścieżka klas (Classpath)",
+  "Runtime classpath of the module": "Wykonawcza ścieżka klas modułu",
+  "Test classpath of the module": "Testowa ścieżka klas modułu",
+  "Run a Java main class": "Uruchom główną klasę Java",
+  "Run a Spring Boot application": "Uruchom aplikację Spring Boot",
+  "Passed to the JVM that spring-boot:run or the tests start, not to Maven": "Przekazywane do maszyny JVM uruchamianej przez spring-boot:run lub testy, a nie do programu Maven",
+  "Passed to the JVMs the tasks start (bootRun, run, test), not to Gradle": "Przekazywane do maszyn JVM uruchamianych przez zadania (bootRun, run, test), a nie do programu Gradle",
+  "Run a package.json script": "Uruchom skrypt z package.json",
+  "package.json directory": "Katalog pliku package.json",
+  "Tasks": "Zadania",
+  "Use the Gradle wrapper": "Użyj wrappera Gradle",
+  "Goals": "Cele (Goals)",
+  "Use the Maven wrapper": "Użyj wrappera Maven",
+  "Run or debug several configurations together": "Uruchamiaj lub debuguj kilka konfiguracji jednocześnie",
+  " · default": " · domyślnie",
+  "Bookmarked file": "Plik z zakładką",
+  "(empty line)": "(pusty wiersz)",
+  "Name cannot be empty": "Nazwa nie może być pusta",
+  "Every scope needs a name": "Każdy zakres wymaga nazwy",
+  "Scopes": "Zakresy",
+  "Add Scope": "Dodaj zakres",
+  "Remove Scope": "Usuń zakres",
+  "Pattern:": "Wzorzec:",
+  "files by name, anywhere": "pliki według nazwy, w dowolnym miejscu",
+  "files directly in a folder": "pliki bezpośrednio w folderze",
+  "at any depth": "na dowolnej głębokości",
+  "Add a scope to define it by a file pattern.": "Dodaj zakres, aby zdefiniować go za pomocą wzorca plików.",
+  "Just now": "Przed chwilą",
+  "Show Fields": "Pokaż pola",
+  "Show Non-Public": "Pokaż niepubliczne",
+  "Sort by Visibility": "Sortuj według widoczności",
+  "Show fields": "Pokaż pola",
+  "Show non-public": "Pokaż niepubliczne",
+  "Docker CLI default (DOCKER_HOST / current context)": "Domyślne dla CLI Dockera (DOCKER_HOST / bieżący kontekst)",
+  "Docker CLI default": "Domyślne dla CLI Dockera",
+  "Unix socket": "Gniazdo typu Unix socket",
+  "TCP / SSH host": "Host TCP / SSH",
+  "Docker context": "Kontekst Dockera",
+  "Edit Docker Connection": "Edytuj połączenie z Dockerem",
+  "New Docker Connection": "Nowe połączenie z Dockerem",
+  "Connect to Docker daemon with:": "Połącz z demonem Dockera za pomocą:",
+  "Socket path or Engine API URL:": "Ścieżka gniazda lub adres URL API silnika:",
+  "Engine API URL:": "Adres URL API silnika:",
+  "tcp://build-host:2376 or ssh://me@build-host": "tcp://build-host:2376 lub ssh://me@build-host",
+  "Certificates folder (TLS, optional):": "Folder certyfikatów (TLS, opcjonalnie):",
+  "contains ca.pem, cert.pem and key.pem": "zawiera ca.pem, cert.pem oraz key.pem",
+  "Certificates Folder": "Folder certyfikatów",
+  "Context name:": "Nazwa kontekstu:",
+  "e.g. desktop-linux, orbstack, colima": "np. desktop-linux, orbstack, colima",
+  "Docker Registry": "Rejestr Dockera",
+  "Edit Docker Registry": "Edytuj rejestr Dockera",
+  "New Docker Registry": "Nowy rejestr Dockera",
+  "docker.io, ghcr.io, registry.example.com:5000": "docker.io, ghcr.io, registry.example.com:5000",
+  "Unchanged": "Niezmieniono",
+  "Password or access token": "Hasło lub token dostępu",
+  "Images from this registry are pulled with these credentials.": "Obrazy z tego rejestru są pobierane przy użyciu tych poświadczeń.",
+  "not running": "nieuruchomiony",
+  "Remove Docker Connection": "Usuń połączenie z Dockerem",
+  "Remove Docker Registry": "Usuń rejestr Dockera",
+  "Edit Registry…": "Edytuj rejestr…",
+  "Test Login": "Testuj logowanie",
+  "Remove Registry": "Usuń rejestr",
+  "Edit Connection…": "Edytuj połączenie…",
+  "Remove Connection": "Usuń połączenie",
+  "Waiting for output…": "Oczekiwanie na dane wyjściowe…",
+  "No output": "Brak danych wyjściowych",
+  "Address": "Adres",
+  "Username": "Nazwa użytkownika",
+  "Edit…": "Edytuj…",
+  "Add a run configuration type, Docker connection or registry to the Services tool window": "Dodaj typ konfiguracji uruchamiania, połączenie Dockera lub rejestr do okna narzędziowego Usługi",
+  "Dangling Images": "Obrazy porzucone (dangling)",
+  "Compose Down": "Compose Down (zatrzymaj i usuń)",
+  "Cannot read Docker settings": "Nie można odczytać ustawień Dockera",
+  "Cannot save Docker settings": "Nie można zapisać ustawień Dockera",
+  "Cannot save the registry password": "Nie można zapisać hasła rejestru",
+  "Server": "Serwer",
+  "Container name": "Nazwa kontenera",
+  "Derived from the image": "Pochodzi z obrazu",
+  "Bind ports": "Powiąż porty",
+  "Bind mounts": "Powiąż punkty montowania",
+  "Container environment": "Środowisko kontenera",
+  "Run options": "Opcje uruchamiania",
+  "e.g. --rm --network host": "np. --rm --network host",
+  "Build an image from a Dockerfile and run a container from it": "Zbuduj obraz z pliku Dockerfile i uruchom z niego kontener",
+  "Relative to the project root": "Względem katalogu głównego projektu",
+  "Context folder": "Folder kontekstu",
+  "The Dockerfile's folder": "Folder pliku Dockerfile",
+  "Image tag": "Tag obrazu",
+  "Derived from the context folder": "Pochodzi z folderu kontekstu",
+  "Build stage": "Etap budowania",
+  "The last stage": "Ostatni etap",
+  "Build args": "Argumenty budowania",
+  "Build options": "Opcje budowania",
+  "e.g. --no-cache --platform linux/amd64": "np. --no-cache --platform linux/amd64",
+  "Run built image": "Uruchom zbudowany obraz",
+  "The image's default": "Wartość domyślna obrazu",
+  "Docker Image": "Obraz Dockera",
+  "Run a container from an image": "Uruchom kontener z obrazu",
+  "Image ID or name": "ID lub nazwa obrazu",
+  "e.g. postgres:16": "np. postgres:16",
+  "Pull the image before running": "Pobierz obraz przed uruchomieniem",
+  "Compose files": "Pliki Compose",
+  "All services": "Wszystkie usługi",
+  "The folder name": "Nazwa folderu",
+  "Run in the background (-d)": "Uruchom w tle (-d)",
+  "Build images before starting (--build)": "Zbuduj obrazy przed uruchomieniem (--build)",
+  "Up options": "Opcje polecenia Up",
+  "e.g. --force-recreate --remove-orphans": "np. --force-recreate --remove-orphans",
+  "Compact Mode": "Tryb kompaktowy",
+  "Override File Type": "Przesłoń typ pliku",
+  "Revert File Type Override": "Cofnij przesłonięcie typu pliku",
+  "Add Content Root": "Dodaj katalog główny zawartości",
+  "Exclude files:": "Wyklucz pliki:",
+  "Filter file types": "Filtruj typy plików",
+  "Recognized file types": "Rozpoznane typy plików",
+  "Recognized File Types": "Rozpoznane typy plików",
+  "File name patterns": "Wzorce nazw plików",
+  "* matches any characters, ? one (e.g. *.foo, Jenkinsfile).": "* dopasowuje dowolne znaki, ? jeden (np. *.foo, Jenkinsfile).",
+  "Hashbang patterns": "Wzorce hashbang",
+  "Interpreters run by a #! first line, e.g. node for #!/usr/bin/env node.": "Interpretery uruchamiane przez pierwszą linię #!, np. node dla #!/usr/bin/env node.",
+  "Also recognized by its first line:": "Rozpoznawany również po pierwszej linii:",
+  "Default (IDE)": "Domyślny (IDE)",
+  "Stored in the project.": "Przechowywane w projekcie.",
+  "Copy to Project": "Kopiuj do projektu",
+  "Copy to IDE": "Kopiuj do IDE",
+  "Copy to Project…": "Kopiuj do projektu…",
+  "Copy to IDE…": "Kopiuj do IDE…",
+  "Do not format": "Nie formatuj",
+  "File name patterns and folders (glob), e.g. *.min.js, generated/**.": "Wzorce nazw plików i folderów (glob), np. *.min.js, generated/**.",
+  "Turn formatter on/off with markers in code comments": "Włączaj/wyłączaj formatowanie za pomocą znaczników w komentarzach kodu",
+  "Off": "Wyłączone",
+  "On": "Włączone",
+  "Enable regular expressions in formatter markers": "Włącz wyrażenia regularne w znacznikach formatowania",
+  "Show inline completion for:": "Pokaż uzupełnianie wewnątrzlinijkowe dla:",
+  "Automatically insert single suggestions": "Automatycznie wstawiaj pojedyncze sugestie",
+  "When Basic Completion (⌃Space) finds only one suggestion.": "Gdy Podstawowe uzupełnianie (⌃Space) znajdzie tylko jedną sugestię.",
+  "Also toggled by Sort by name in the completion popup.": "Przełączane również przez 'Sortuj według nazwy' w oknie uzupełniania.",
+  "Insert parentheses automatically when applicable": "Automatycznie wstawiaj nawiasy, gdy ma to zastosowanie",
+  "Left": "Po lewej",
+  "Right": "Po prawej",
+  "Show tabs in:": "Pokaż karty w:",
+  "Show tabs in": "Pokaż karty w",
+  "Show pinned tabs in a separate row": "Pokaż przypięte karty w osobnym wierszu",
+  "Show file icon": "Pokaż ikonę pliku",
+  "Show directory for non-unique file names": "Pokaż katalog dla nieunikalnych nazw plików",
+  "Show full path on mouse hover": "Pokaż pełną ścieżkę po najechaniu myszą",
+  "Close button position:": "Pozycja przycisku zamykania:",
+  "Close button position": "Pozycja przycisku zamykania",
+  "Tab Order": "Kolejność kart",
+  "Sort values alphabetically": "Sortuj wartości alfabetycznie",
+  "Sort tabs alphabetically": "Sortuj karty alfabetycznie",
+  "One row, and if tabs don't fit:": "Jeden wiersz, a jeśli karty się nie mieszczą:",
+  "If tabs don't fit": "Jeśli karty się nie mieszczą",
+  "Scroll the tabs panel": "Przewijaj panel kart",
+  "Squeeze tabs": "Ściskaj karty",
+  "Multiple rows": "Wiele wierszy",
+  "Gray suggestions at the caret from language servers that support inline completion. Tab accepts a suggestion, Escape dismisses it.": "Szare sugestie przy kursorze z serwerów językowych obsługujących uzupełnianie wewnątrzlinijkowe. Klawisz Tab akceptuje sugestię, Escape ją odrzuca.",
+  "Enable inline completion": "Włącz uzupełnianie wewnątrzlinijkowe",
+  "Show only when typing pauses for": "Pokaż tylko, gdy pisanie zostanie wstrzymane na",
+  "Inspections": "Inspekcje",
+  "Delete Profile": "Usuń profil",
+  "Rename Profile": "Zmień nazwę profilu",
+  "Copy Profile": "Kopiuj profil",
+  "Profile:": "Profil:",
+  "Profile Actions": "Akcje profilu",
+  "Stored in Project": "Zapisane w projekcie",
+  "Stored in IDE": "Zapisane w IDE",
+  "Search inspections": "Szukaj inspekcji",
+  "Reset to Default": "Przywróć domyślne",
+  "Select an inspection to see its description and change its severity.": "Wybierz inspekcję, aby zobaczyć jej opis i zmienić jej poziom ważności.",
+  "Severity:": "Poziom ważności:",
+  "As reported": "Zgodnie z raportem",
+  "Error": "Błąd",
+  "Weak Warning": "Słabe ostrzeżenie",
+  "Server Problem": "Problem z serwerem",
+  "Typo": "Błąd literowy",
+  "No highlighting": "Brak podświetlania",
+  "Project Default": "Domyślne projektu",
+  "Profile name cannot be empty": "Nazwa profilu nie może być pusta",
+  "Unresolved file references": "Nierozwiązane odwołania do plików",
+  "Reports paths in HTML attributes, CSS url() and @import that do not name an existing file, resolved relative to the file, the project root and its resource roots.": "Zgłasza ścieżki w atrybutach HTML, funkcjach CSS url() i dyrektywach @import, które nie wskazują istniejącego pliku, rozwiązywane względem pliku, katalogu głównego projektu i jego katalogów zasobów.",
+  "Build problems": "Problemy z budowaniem",
+  "Unresolved database references": "Nierozwiązane odwołania do bazy danych",
+  "Reports tables, columns and aliases in query consoles that the data source's schema does not contain.": "Zgłasza tabele, kolumny i aliasy w konsolach zapytań, których nie zawiera schemat źródła danych.",
+  "Proofreading": "Korekta tekstu",
+  "Reports misspelt words in comments, string literals and the names declarations introduce (camelCase and snake_case parts checked separately), and in plain text and Markdown. Agent nouns of known words (checkpointer) and, in names, two known words run together (filepath) are accepted. Words can be saved to the project or application dictionary (Editor › Natural Languages › Spelling). Correcting a name renames the symbol and its references.": "Zgłasza błędnie napisane słowa w komentarzach, literałach napisowych oraz nazwach wprowadzanych przez deklaracje (części camelCase i snake_case sprawdzane są osobno), a także w zwykłym tekście i Markdown. Nazwy wykonawców znanych słów (np. checkpointer) i połączone znane słowa w nazwach (np. filepath) są akceptowane. Słowa można zapisywać w słowniku projektu lub aplikacji (Edytor › Języki naturalne › Pisownia). Poprawienie nazwy zmienia nazwę symbolu i jego odwołań.",
+  "English (USA, UK)": "Angielski (USA, UK)",
+  "Bundled Hunspell dictionaries (SCOWL en_US and en_GB) and common programming terms.": "Dołączone słowniki Hunspell (SCOWL en_US i en_GB) oraz typowe terminy programistyczne.",
+  "Used by Proofreading › Typo": "Używane przez Korekta tekstu › Błąd literowy",
+  "Accepted words": "Zaakceptowane słowa",
+  "Project dictionary": "Słownik projektu",
+  "Stored with the project.": "Zapisane z projektem.",
+  "No words": "Brak słów",
+  "Word": "Słowo",
+  "Application dictionary": "Słownik aplikacji",
+  "Accepted in every project.": "Akceptowane we wszystkich projektach.",
+  "Custom dictionaries": "Własne słowniki",
+  "Dictionary files": "Pliki słowników",
+  "Plain-text word lists (one word per line) or Hunspell .dic files. Relative paths resolve against the project root, ~/ against the home folder.": "Listy słów w zwykłym tekście (jednosłowne w wierszu) lub pliki .dic Hunspell. Ścieżki względne są rozwiązywane względem katalogu głównego projektu, a ~/ względem folderu domowego.",
+  "No custom dictionaries": "Brak własnych słowników",
+  "Dictionary path": "Ścieżka słownika",
+  "Natural Languages": "Języki naturalne",
+  "Java Class › JUnit 5 Test": "Klasa Java › Test JUnit 5",
+  "Kotlin Class/File › JUnit 5 Test": "Klasa/Plik Kotlin › Test JUnit 5",
+  "Go File › Test file": "Plik Go › Plik testowy",
+  "Rust File › Test module": "Plik Rust › Moduł testowy",
+  "TypeScript File › Test": "Plik TypeScript › Test",
+  "Python File › Test (pytest)": "Plik Python › Test (pytest)",
+  "CSS File": "Plik CSS",
+  "SCSS File": "Plik SCSS",
+  "Sass File": "Plik Sass",
+  "Less File": "Plik Less",
+  "JSON file": "Plik JSON",
+  "YAML file": "Plik YAML",
+  "TOML file": "Plik TOML",
+  "Bash script": "Skrypt Bash",
+  "POSIX sh script": "Skrypt POSIX sh",
+  "Zsh script": "Skrypt Zsh",
+  "Default properties": "Właściwości domyślne",
+  "Root only": "Tylko katalog główny",
+  ".gitignore file": "Plik .gitignore",
+  "Includes": "Dołączane elementy (Includes)",
+  "Template kinds": "Rodzaje szablonów",
+  "Reformat according to style": "Przeformatuj zgodnie ze stylem",
+  "New Include": "Nowy dołączany element",
+  "Add Include": "Dodaj dołączany element",
+  "Remove Include": "Usuń dołączany element",
+  "Include name": "Nazwa dołączanego elementu",
+  "Include body": "Treść dołączanego elementu",
+  "Code templates": "Szablony kodu",
+  "Used by": "Używane przez",
+  "Code template body": "Treść szablonu kodu",
+  "Changelist": "Lista zmian",
+  "No TODO items found in this scope": "Nie znaleziono elementów TODO w tym zakresie",
+  "No TODO items in changed files": "Brak elementów TODO w zmienionych plikach",
+  "Author": "Autor",
+  "Merge options": "Opcje scalania",
+  "Pull": "Pobierz i scal (Pull)",
+  "No remotes are configured. Add one with Git › Manage Remotes….": "Brak skonfigurowanych repozytoriów zdalnych. Dodaj jedno za pomocą Git › Zarządzaj repozytoriami zdalnymi….",
+  "Remote branch": "Gałąź zdalna",
+  "Uncommitted changes are stashed before the pull and restored afterwards.": "Niezatwierdzone zmiany są odkładane do schowka przed wykonaniem pobierania (pull) i przywracane po jego zakończeniu.",
+  "Branch to merge": "Gałąź do scalenia",
+  "Select branch": "Wybierz gałąź",
+  "-m (commit message)": "-m (wiadomość zatwierdzenia)",
+  "Upstream": "Repozytorium nadrzędne (Upstream)",
+  "New base": "Nowa baza",
+  "Uncommitted changes are stashed before the rebase and restored afterwards.": "Niezatwierdzone zmiany są odkładane do schowka przed zmianą bazy i przywracane po jej zakończeniu.",
+  "Enter a remote name": "Wprowadź nazwę repozytorium zdalnego",
+  "Invalid remote name": "Nieprawidłowa nazwa repozytorium zdalnego",
+  "Remotes": "Repozytoria zdalne",
+  "Enter the remote URL": "Wprowadź adres URL repozytorium zdalnego",
+  "Force Remove": "Wymuś usunięcie",
+  "(bare)": "(gołe/bare)",
+  "Choose what to check out": "Wybierz element do pobrania (checkout)",
+  "Enter a folder": "Wprowadź folder",
+  "Check out": "Pobierz (Checkout)",
+  "New branch name": "Nazwa nowej gałęzi",
+  "Folder": "Folder",
+  "VCS Widget": "Widżet systemu kontroli wersji (VCS)",
+  "Recent Changes": "Niedawne zmiany",
+  "Cannot read Local History": "Nie można odczytać historii lokalnej",
+  "No recent changes": "Brak niedawnych zmian",
+  "Local History has no entries yet": "Historia lokalna nie ma jeszcze żadnych wpisów",
+  "Customize Main Toolbar": "Dostosuj główny pasek narzędzi",
+  "Customize Main Toolbar…": "Dostosuj główny pasek narzędzi…",
+  "Left group": "Lewa grupa",
+  "Right group": "Prawa grupa",
+  "Add…": "Dodaj…",
+  "Move to Right": "Przesuń w prawo",
+  "Move to Left": "Przesuń w lewo",
+  "Widget": "Widżet",
+  "Actions and widgets to add": "Akcje i widżety do dodania",
+  "Don't Show Again": "Nie pokazuj ponownie",
+  "Customize Toolbar…": "Dostosuj pasek narzędzi…",
+  "Restore Default Toolbar": "Przywróć domyślny pasek narzędzi",
+  "View Mode": "Tryb widoku",
+  "Value must not be empty": "Wartość nie może być pusta",
+  "Nothing to choose from": "Brak elementów do wyboru",
+  "Project Widget": "Widżet projektu",
+  "Editor Color Scheme": "Schemat kolorów edytora",
+  "Quick Switch Scheme…": "Szybka zmiana schematu…",
+  "No saved layouts. Use Save Current Layout as… first.": "Brak zapisanych układów. Najpierw użyj opcji Zapisz bieżący układ jako….",
+  "Enter a layout name": "Wprowadź nazwę układu",
+  "A layout with this name exists": "Układ o tej nazwie już istnieje",
+  "Save Current Layout as…": "Zapisz bieżący układ jako…",
+  "Save Current Layout as": "Zapisz bieżący układ jako",
+  "Layout name:": "Nazwa układu:",
+  "Restore Tool Window Layout": "Przywróć układ okien narzędziowych",
+  "Restores the saved layout named `arg`, or asks which one.": "Przywraca zapisany układ o nazwie `arg` lub pyta, który przywrócić.",
+  "Restore Layout": "Przywróć układ",
+  "Rename Tool Window Layout…": "Zmień nazwę układu okien narzędziowych…",
+  "Rename Layout": "Zmień nazwę układu",
+  "Delete Tool Window Layout…": "Usuń układ okien narzędziowych…",
+  "Delete Layout": "Usuń układ",
+  "Formatted {count} lines": "Przeformatowano wierszy: {count}",
+  "Formatted {count} line": "Przeformatowano wiersz: {count}",
+  " the Reformat dialog": " okno dialogowe Formatowanie",
+  "The file changed while formatting; try again": "Plik zmienił się podczas formatowania; spróbuj ponownie",
+  "No lines changed: content is already properly formatted": "Brak zmienionych wierszy: zawartość jest już prawidłowo sformatowana",
+  "The file is read-only": "Plik jest tylko do odczytu",
+  "No documentation found": "Nie znaleziono dokumentacji",
+  "Cannot read the definition's file": "Nie można odczytać pliku definicji",
+  "Cannot find declaration to go to": "Nie można znaleźć deklaracji, do której można przejść",
+  "No structure information for this file": "Brak informacji o strukturze dla tego pliku",
+  "No super method found": "Nie znaleziono metody nadrzędnej (super)",
+  "No super class found": "Nie znaleziono nadklasy",
+  "No parameters": "Brak parametrów",
+  "No usages found in file": "Nie znaleziono użyć w pliku",
+  "No type information found": "Nie znaleziono informacji o typie",
+  "Nothing to rename": "Brak elementów do zmiany nazwy",
+  "Rename Anyway": "Zmień nazwę mimo to",
+  "May be incomplete: the language server is still indexing": "Wyniki mogą być niepełne: serwer językowy nadal indeksuje",
+  "May be incomplete: too many files mention '{word}' to search them all": "Wyniki mogą być niepełne: zbyt wiele plików zawiera słowo '{word}', aby przeszukać je wszystkie",
+  "May be incomplete: too many files mention the name to search them all": "Wyniki mogą być niepełne: zbyt wiele plików zawiera tę nazwę, aby przeszukać je wszystkie",
+  "May be incomplete: some files that mention '{word}' are too large or unreadable": "Wyniki mogą być niepełne: niektóre pliki zawierające słowo '{word}' są zbyt duże lub nieczytelne",
+  "May be incomplete: some files that mention the name are too large or unreadable": "Wyniki mogą być niepełne: niektóre pliki zawierające tę nazwę są zbyt duże lub nieczytelne",
+  "The file changed; rename cancelled": "Plik został zmieniony; zmiana nazwy została anulowana",
+  "No suggestions": "Brak sugestii",
+  "No intentions available": "Brak dostępnych intencji",
+  "No quick fixes available": "Brak dostępnych szybkich poprawek",
+  "No abstract methods to implement": "Brak abstrakcyjnych metod do zaimplementowania",
+  "Implement abstract methods": "Zaimplementuj metody abstrakcyjne",
+  "Apply Quick Fix": "Zastosuj szybką poprawkę",
+  "The document changed; invoke the refactoring again": "Dokument uległ zmianie; wywołaj refaktoryzację ponownie",
+  "The document changed; the name was not applied": "Dokument uległ zmianie; nazwa nie została zastosowana",
+  "The file changed; Safe Delete cancelled": "Plik uległ zmianie; bezpieczne usuwanie zostało anulowane",
+  "No language server is available": "Brak dostępnego serwera językowego",
+  "Separate variables with semicolon: VAR=value; VAR1=value1": "Rozdziel zmienne średnikami: VAR=wartość; VAR1=wartość1",
+  "Relative to the project root; separate with semicolon": "Względem katalogu głównego projektu; rozdzielaj średnikami",
+  "Configurations of the compound": "Konfiguracje elementu złożonego",
+  "Another configuration has this name": "Inna konfiguracja ma już tę nazwę",
+  "Invalid directory": "Nieprawidłowy katalog",
+  "Application": "Aplikacja",
+  "Java Single File": "Pojedynczy plik Java",
+  "Rust Single File": "Pojedynczy plik Rust",
+  "Kotlin Single File": "Pojedynczy plik Kotlin",
+  "C/C++ Single File": "Pojedynczy plik C/C++",
+  "Native Executable": "Natywny plik wykonywalny",
+  "Kotlin Script": "Skrypt Kotlin",
+  "{name} is required": "{name} jest wymagane",
+  "{name} project": "Projekt {name}",
+  "{adapter} (no launch template)": "{adapter} (brak szablonu uruchamiania)",
+  "Before launch command {n}": "Polecenie przed uruchomieniem {n}",
+  "Invalid environment variable name: {key}": "Nieprawidłowa nazwa zmiennej środowiskowej: {key}",
+  "Run '{name}'": "Uruchom '{name}'",
+  "'{name}' failed": "Operacja '{name}' nie powiodła się",
+  "'{name}' was not started": "Nie uruchomiono '{name}'",
+  "External tool '{name}'": "Narzędzie zewnętrzne '{name}'",
+  "Activate '{name}' tool window": "Aktywuj okno narzędziowe '{name}'",
+  "Configuration '{name}' no longer exists": "Konfiguracja '{name}' już nie istnieje",
+  "External tool '{name}' no longer exists": "Narzędzie zewnętrzne '{name}' już nie istnieje",
+  "'{name}' was not run": "Nie wykonano '{name}'",
+  "Tool window '{name}' is not available": "Okno narzędziowe '{name}' nie jest dostępne",
+  "Unknown before launch task '{name}'": "Nieznane zadanie przed uruchomieniem '{name}'",
+  "Variable {n} name": "Nazwa zmiennej {n}",
+  "Variable {n} value": "Wartość zmiennej {n}",
+  "Duplicate environment variable: {key}": "Zdublowana zmienna środowiskowa: {key}",
+  "Nothing to show in {view}": "Brak elementów do wyświetlenia w {view}",
+  "Stopped Containers": "Zatrzymane kontenery",
+  "Unused Images": "Nieużywane obrazy",
+  "Unused Volumes": "Nieużywane wolumeny",
+  "Unused Networks": "Nieużywane sieci",
+  "Everything Unused (System Prune)": "Wszystkie nieużywane elementy (System Prune)",
+  "Remove all stopped containers?": "Usunąć wszystkie zatrzymane kontenery?",
+  "Remove all dangling (untagged) images?": "Usunąć wszystkie osierocone obrazy (bez tagu)?",
+  "Remove all images not used by a container?": "Usunąć wszystkie obrazy nieużywane przez żaden kontener?",
+  "Remove all anonymous volumes not used by a container? Their data is lost.": "Usunąć wszystkie anonimowe wolumeny nieużywane przez żaden kontener? Ich dane zostaną utracone.",
+  "Remove all networks not used by a container?": "Usunąć wszystkie sieci nieużywane przez żaden kontener?",
+  "Remove stopped containers, unused networks, dangling images and the build cache?": "Usunąć zatrzymane kontenery, nieużywane sieci, osierocone obrazy i pamięć podręczną kompilacji?",
+  "Prune {target}": "Wyczyść {target}",
+  "Pulling {name}…": "Pobieranie (pull) {name}…",
+  "containers": "kontenery",
+  "images": "obrazy",
+  "volumes": "wolumeny",
+  "networks": "sieci",
+  "Compose project '{name}'": "Projekt Compose '{name}'",
+  "Engine {server} · CLI {client}": "Silnik {server} · CLI {client}",
+  " · context {name}": " · kontekst {name}",
+  "Failed (exit {code})": "Nie powiodło się (kod wyjścia {code})",
+  "No configurations of this type": "Brak konfiguracji tego typu",
+  "system": "system",
+  "{name} cancelled": "Anulowano {name}",
+  "Image to pull:": "Obraz do pobrania (pull):",
+  "Pull Image": "Pobierz obraz (pull)",
+  "Not a {name} URL": "To nie jest adres URL {name}",
+  "Duplicate scope name '{name}'": "Zdublowana nazwa zakresu '{name}'",
+  "Scope '{name}' has no pattern": "Zakres '{name}' nie ma wzorca",
+  "Unnamed ({n})": "Bez nazwy ({n})",
+  "Project will be created in: {path}": "Projekt zostanie utworzony w: {path}",
+  "(or": "(lub",
+  "inserts a template from the Includes or Code tab.": "wstawia szablon z zakładki Dołączenia lub Kod.",
+  "File templates insert this with {code}, indented like the directive; a directive line whose include is empty is dropped. The file template variables apply.": "Szablony plików wstawiają ten element za pomocą {code}, z wcięciem odpowiadającym dyrektywie; linia dyrektywy z pustym dołączeniem jest pomijana. Stosują się zmienne szablonów plików.",
+  "Inserted where a file template says {code}.": "Wstawiane w miejscu wskazanym przez {code} w szablonie pliku.",
+  "Agents": "Agenci",
+  "New Agent Task": "Nowe zadanie agenta",
+  "No agent tasks yet": "Brak zadań agenta",
+  "New Task…": "Nowe zadanie…",
+  "Needs Input": "Wymaga danych wejściowych",
+  "Ready to Review": "Gotowe do przeglądu",
+  "Archived": "Zarchiwizowane",
+  "Archive": "Zarchiwizuj",
+  "Copy Agent Task to a New Task": "Kopiuj zadanie agenta do nowego zadania",
+  "Delete Agent Task": "Usuń zadanie agenta",
+  "Also remove its worktree folder": "Usuń również jego folder worktree",
+  "needs input": "wymaga danych wejściowych",
+  "running": "w trakcie wykonywania",
+  "unread": "nieprzeczytane",
+  "This agent task no longer exists": "To zadanie agenta już nie istnieje",
+  "Local checkout": "Kopia lokalna (checkout)",
+  "Needs input": "Wymaga danych wejściowych",
+  "Ready": "Gotowe",
+  "Starting the agent…": "Uruchamianie agenta…",
+  "Working…": "Przetwarzanie…",
+  "Thinking": "Analizowanie",
+  "Plan": "Plan",
+  "Message": "Wiadomość",
+  "Reply to the agent": "Odpowiedz agentowi",
+  "Send": "Wyślij",
+  "vs": "vs",
+  "file": "plik",
+  "files": "pliki",
+  "No changes yet": "Brak zmian",
+  "What should the agent do?": "Co agent powinien zrobić?",
+  "New worktree": "Nowe worktree",
+  "Building and resolving the classpath of {name}…": "Kompilowanie i ustalanie ścieżki klas (classpath) dla {name}…",
+  "Build completed with errors; launching with the last compiled classes.": "Kompilacja zakończona z błędami; uruchamianie z ostatnio skompilowanymi klasami.",
+  "Build failed; launching with the last compiled classes.": "Kompilacja nie powiodła się; uruchamianie z ostatnio skompilowanymi klasami.",
+  "The classpath is empty: is the module imported by the Java language server?": "Ścieżka klas jest pusta: czy moduł został zaimportowany przez serwer językowy Java?",
+  "Launch cancelled.": "Uruchomienie anulowane.",
+  "Starting debugger for {name}…": "Uruchamianie debugera dla {name}…",
+  "Starting…": "Uruchamianie…",
+  "Waiting for your answer": "Oczekiwanie na Twoją odpowiedź",
+  "Waiting for your answer…": "Oczekiwanie na Twoją odpowiedź…",
+  "Subagent": "Subagent",
+  "Subagents at work": "Subagenci pracują",
+  "Stop Subagent": "Zatrzymaj subagenta",
+  "Open the subagent's conversation": "Otwórz rozmowę subagenta",
+  "Subagents take their instructions from the agent that started them.": "Subagenci pobierają instrukcje od agenta, który ich uruchomił.",
+  "Task from the parent agent": "Zadanie od agenta nadrzędnego",
+  "Report to the parent agent": "Raport dla agenta nadrzędnego",
+  "Task": "Zadanie",
+  "tool call": "wywołanie narzędzia",
+  "tool calls": "wywołania narzędzi",
+  "The agent stopped": "Agent zatrzymał się",
+  "Not installed": "Niezainstalowany",
+  "{command} was not found on PATH": "Nie znaleziono polecenia {command} w zmiennej PATH",
+  "Agent tasks": "Zadania agenta",
+  "away from your changes": "odizolowane od Twoich zmian",
+  "edits your files directly": "edytuje Twoje pliki bezpośrednio",
+  "from": "z",
+  "on": "w",
+  "Models and modes appear after this agent's first task.": "Modele i tryby pojawią się po wykonaniu pierwszego zadania przez tego agenta.",
+  "Queue a message for when the agent is done (⌘↵ sends it now)": "Dodaj wiadomość do kolejki na czas po zakończeniu pracy agenta (⌘↵ wysyła natychmiast)",
+  "Couldn't send the message": "Nie udało się wysłać wiadomości",
+  "Couldn't change the setting": "Nie udało się zmienić ustawienia",
+  "Couldn't update the queue": "Nie udało się zaktualizować kolejki",
+  "Queued messages": "Wiadomości w kolejce",
+  "Send now": "Wyślij teraz",
+  "Queue": "Kolejka",
+  "Reference a File (@)": "Dołącz odnośnik do pliku (@)",
+  "Attach Image…": "Załącz obraz…",
+  "Remove Image": "Usuń obraz",
+  "Image too large": "Obraz jest zbyt duży",
+  "Send to Agent": "Wyślij do agenta",
+  "Enable Vim emulation": "Włącz emulację Vim",
+  "Configuration file": "Plik konfiguracyjny",
+  "mappings": "mapowania",
+  "No ~/.openideavimrc or ~/.ideavimrc found.": "Nie znaleziono pliku ~/.openideavimrc ani ~/.ideavimrc.",
+  "Shortcut conflicts": "Konflikty skrótów",
+  "Keys Vim also handles. With Vim as the handler the key goes to the editor while Vim mode is on and an editor has focus; with IDE, an enabled IDE action runs first.": "Klawisze obsługiwane również przez Vima. Gdy obsługa należy do Vima, klawisz trafia do edytora, gdy tryb Vim jest aktywny i edytor posiada fokus; w przypadku wyboru IDE najpierw wykonywana jest aktywna akcja IDE.",
+  "Shortcut": "Skrót",
+  "IDE action": "Akcja IDE",
+  "Handler": "Procesor obsługi",
+  "Reset to Defaults": "Przywróć wartości domyślne",
+  "Exit to Normal mode": "Przejdź do trybu normalnego",
+  "Increment number": "Zwiększ liczbę",
+  "Decrement number": "Zmniejsz liczbę",
+  "Page up": "Strona w górę",
+  "Page down": "Strona w dół",
+  "Scroll half page down / unindent": "Przewiń pół strony w dół / zmniejsz wcięcie",
+  "Scroll half page up / delete to line start": "Przewiń pół strony w górę / usuń do początku linii",
+  "Scroll line down": "Przewiń linię w dół",
+  "Scroll line up": "Przewiń linię w górę",
+  "Jump forward": "Przejdź do przodu",
+  "Jump back / one Normal command": "Przejdź w tył / jedno polecenie trybu normalnego",
+  "Next line": "Następna linia",
+  "Previous line": "Poprzednia linia",
+  "Visual block": "Blok wizualny",
+  "Redo / insert register": "Ponów / wstaw rejestr",
+  "Delete word before caret": "Usuń słowo przed kursorem",
+  "Reload .ideavimrc": "Przeładuj .ideavimrc",
+  "Vim Settings…": "Ustawienia Vim…",
+  "Vim mode": "Tryb Vim",
+  "Vim (disabled)": "Vim (wyłączony)",
+  "Turn Vim emulation on or off in all editors": "Włącz lub wyłącz emulację Vim we wszystkich edytorach",
+  "Remote JVM Debug": "Zdalne debugowanie JVM",
+  "Attach the debugger to a JVM started with a JDWP agent, here or on another machine": "Podłącz debuger do procesu JVM uruchomionego z agentem JDWP na tym komputerze lub innej maszynie",
+  "Debugger mode": "Tryb debugera",
+  "Attach to remote JVM": "Podłącz do zdalnej JVM",
+  "Listen to remote JVM": "Nasłuchuj zdalnej JVM",
+  "Host": "Host",
+  "Port": "Port",
+  "Port must be a number from 1 to 65535": "Port musi być liczbą z zakresu od 1 do 65535",
+  "JDK version of the remote JVM": "Wersja JDK zdalnej JVM",
+  "JDK 9 or later": "JDK 9 lub nowszy",
+  "Command line arguments for remote JVM": "Argumenty wiersza poleceń dla zdalnej JVM",
+  "Add to the remote JVM's command line (or JAVA_TOOL_OPTIONS)": "Dodaj do wiersza poleceń zdalnej JVM (lub JAVA_TOOL_OPTIONS)",
+  "Use module classpath": "Użyj ścieżki klas modułu",
+  "Module directory whose sources the debugger shows": "Katalog modułu, którego kod źródłowy wyświetla debuger",
+  "Go Remote": "Go Remote",
+  "Attach to a Delve server (dlv --headless) here or on another machine": "Podłącz do serwera Delve (dlv --headless) na tym komputerze lub innej maszynie",
+  "Start the remote side with": "Uruchom stronę zdalną za pomocą polecenia",
+  "Local root": "Lokalny katalog główny",
+  "Remote root": "Zdalny katalog główny",
+  "Where the project's sources are on the remote machine, when the paths differ": "Ścieżka do źródeł projektu na zdalnej maszynie, jeśli ścieżki się różnią",
+  "Python Remote Debug (debugpy)": "Zdalne debugowanie Python (debugpy)",
+  "Attach to a Python process listening with debugpy here or on another machine": "Podłącz do procesu Python nasłuchującego z debugpy na tym komputerze lub innej maszynie",
+  "pip install debugpy on the remote machine": "Wykonaj 'pip install debugpy' na zdalnej maszynie",
+  "Attach to Node.js": "Podłącz do Node.js",
+  "Attach to a Node.js process started with --inspect here or on another machine": "Podłącz do procesu Node.js uruchomionego z opcją --inspect na tym komputerze lub innej maszynie",
+  "Copied": "Skopiowano",
+  "'{name}' can only be debugged": "'{name}' można wyłącznie debugować",
+  "It attaches the debugger to a process started elsewhere.": "Podłącza debuger do procesu uruchomionego w innym miejscu.",
+  "Not found, press again to search from the top": "Nie znaleziono, naciśnij ponownie, aby szukać od góry",
+  "Cannot change the setting": "Nie można zmienić ustawienia",
+  "Increase Font Size": "Zwiększ rozmiar czcionki",
+  "Decrease Font Size": "Zmniejsz rozmiar czcionki",
+  "Cannot make {path} writable": "Nie można zmienić statusu {path} na zbiór zapisywalny",
+  "Cannot make {path} read-only": "Nie można zmienić statusu {path} na tylko do odczytu",
+  "Configure Soft Wraps…": "Konfiguruj miękkie zawijanie wierszy…",
+  "Configure Gutter Icons…": "Konfiguruj ikony na marginesie…",
+  "line[:column]": "linia[:kolumna]",
+  "Edit Source": "Edytuj kod źródłowy",
+  "Show in Documentation Tool Window": "Pokaż w oknie dokumentacji",
+  "No documentation": "Brak dokumentacji",
+  "Whole file": "Cały plik",
+  "Selected text": "Zaznaczony tekst",
+  "Code Cleanup on `{ path, fixAll?, optimizeImports?, reformat? }` (all steps by default), opened first.": "Czyszczenie kodu w `{ path, fixAll?, optimizeImports?, reformat? }` (domyślnie wszystkie kroki), otwarte jako pierwsze.",
+  "Shows `{ text, tone? }` as a transient hint at the caret of the active editor.": "Wyświetla `{ text, tone? }` jako tymczasową podpowiedź przy kursorze w aktywnym edytorze.",
+  "Inlay Hints Settings…": "Ustawienia podpowiedzi wbudowanych (inlay)…",
+  "Preview isn't available for this action": "Podgląd nie jest dostępny dla tej akcji",
+  "No changes in this file": "Brak zmian w tym pliku",
+  "{kind}: no language server is running for this file": "{kind}: żaden serwer językowy nie jest uruchomiony dla tego pliku",
+  "Cannot find declaration of '{label}'": "Nie można znaleźć deklaracji '{label}'",
+  "Rename in place: ↵ to finish, Esc to cancel": "Zmień nazwę w miejscu: ↵ aby zakończyć, Esc aby anulować",
+  "Cannot rename safely: {why}. '{word}' was left unchanged": "Nie można bezpiecznie zmienić nazwy: {why}. Słowo '{word}' pozostało niezmienione",
+  "'{newName}' is not a valid identifier": "'{newName}' nie jest prawidłowym identyfikatorem",
+  "{note}: renamed {length} occurrence": "{note}: zmieniono nazwę {length} wystąpienia",
+  "{note}: renamed {length} occurrences": "{note}: zmieniono nazwę {length} wystąpień",
+  "No suggestions for '{word}'": "Brak sugestii dla '{word}'",
+  "Typo: Rename to…": "Literówka: Zmień nazwę na…",
+  "Cannot perform refactoring: {why}": "Nie można przeprowadzić refaktoryzacji: {why}",
+  "'{chosen}' is not a valid name; kept '{current}'": "'{chosen}' nie jest prawidłową nazwą; zachowano '{current}'",
+  "'{name}' is also used elsewhere in this file": "'{name}' jest również używane w innym miejscu w tym pliku",
+  "Safe Delete": "Bezpieczne usuwanie",
+  "Replace all occurrences": "Zastąp wszystkie wystąpienia",
+  "↵ to finish, Esc to keep the name": "↵ aby zakończyć, Esc aby zachować nazwę",
+  "Agent": "Agent",
+  "Isolation": "Izolacja",
+  "Opens the New Task page; a string `arg` pre-fills the task description.": "Otwiera stronę Nowe zadanie; ciąg znaków `arg` wstępnie wypełnia opis zadania.",
+  "Adds the editor selection (or the file) as an @ reference to the agent message typed last; a string[] `arg` sends those paths.": "Dodaje zaznaczony tekst (lub plik) jako odnośnik @ do ostatnio wpisanej wiadomości agenta; tablica string[] `arg` przesyła te ścieżki.",
+  "Files are checked by their language servers; files without one are skipped.": "Pliki są weryfikowane przez odpowiednie serwery językowe; pliki bez serwera są pomijane.",
+  "Files are cleaned up by their language servers and saved; files without one are skipped.": "Pliki są czyszczone przez odpowiednie serwery językowe i zapisywane; pliki bez serwera są pomijane.",
+  "Code Cleanup cancelled after {done} of {length} files": "Czyszczenie kodu anulowane po przetworzeniu {done} z {length} plików",
+  "Code Cleanup processed {done} files": "Czyszczenie kodu przetworzyło {done} plików",
+  "Load Maven Changes": "Wczytaj zmiany Maven",
+  "Load Gradle Changes": "Wczytaj zmiany Gradle",
+  "recent": "ostatnie",
+  "Shows `{ symbol, locations }` (found elsewhere, e.g. by Safe Delete) in the Find Usages tool window.": "Wyświetla `{ symbol, locations }` (znalezione w innym miejscu, np. przez Bezpieczne usuwanie) w oknie narzędziowym Znajdź użycia.",
+  "Code insight features are unavailable for these files until it is installed.": "Funkcje analizy kodu (code insight) są niedostępne dla tych plików do momentu jego zainstalowania.",
+  "Coverage of '{name}': {totals} lines": "Pokrycie '{name}': {totals} wierszy",
+  "Show a report collected elsewhere (CI): lcov, JaCoCo XML or a Go cover profile; argument: the file path": "Pokaż raport wygenerowany w innym miejscu (CI): lcov, JaCoCo XML lub profil pokrycia Go; argument: ścieżka do pliku",
+  "Imported coverage '{name}': {total} lines": "Zaimportowane pokrycie '{name}': {total} wierszy",
+  "The report covers no files of this project.": "Raport nie obejmuje żadnych plików tego projektu.",
+  "Cannot import {file}": "Nie można zaimportować {file}",
+  "shown": "wyświetlono",
+  "No aggregation": "Brak agregacji",
+  "Sum": "Suma",
+  "Mean": "Średnia",
+  "Count": "Licznik",
+  "Min": "Minimum",
+  "Max": "Maksimum",
+  "X axis": "Oś X",
+  "Y axis": "Oś Y",
+  "Aggregation": "Agregacja",
+  "Chart type": "Typ wykresu",
+  "Bar": "Słupkowy",
+  "Line": "Liniowy",
+  "Chart Settings": "Ustawienia wykresu",
+  "No numeric values to plot": "Brak wartości numerycznych do sporządzenia wykresu",
+  "Search": "Szukaj",
+  "Search…": "Szukaj…",
+  "Statements": "Instrukcje",
+  "No statements": "Brak instrukcji",
+  "Statement": "Instrukcja",
+  "Comma": "Przecinek",
+  "Tab": "Tabulacja",
+  "Semicolon": "Średnik",
+  "Pipe": "Kreska pionowa (pipe)",
+  "Import Data from File": "Importuj dane z pliku",
+  "Cannot read the file": "Nie można odczytać pliku",
+  "{table}: {n} row(s) imported": "{table}: zaimportowano {n} wiersz(y)",
+  "Nothing was imported": "Nic nie zaimportowano",
+  "Choose a CSV or TSV file": "Wybierz plik CSV lub TSV",
+  "Choose File…": "Wybierz plik…",
+  "Separator:": "Separator:",
+  "Separator": "Separator",
+  "First row is header (columns matched by name)": "Pierwszy wiersz to nagłówek (kolumny dopasowywane po nazwie)",
+  "Treat empty values as NULL": "Traktuj puste wartości jako NULL",
+  "Columns:": "Kolumny:",
+  "Export Data…": "Eksportuj dane…",
+  "Data extractor": "Ekstraktor danych",
+  "Hide Record / Value / Aggregates": "Ukryj rekord / wartość / agregaty",
+  "Show Record / Value / Aggregates": "Pokaż rekord / wartość / agregaty",
+  "Clear local filter": "Wyczyść filtr lokalny",
+  "Search values": "Szukaj wartości",
+  "No matching values": "Brak pasujących wartości",
+  "Clear Filter": "Wyczyść filtr",
+  "Clear Local Filter For All Columns": "Wyczyść filtr lokalny dla wszystkich kolumn",
+  "Value panel": "Panel wartości",
+  "Aggregates": "Agregaty",
+  "Select a cell": "Wybierz komórkę",
+  "Copy to Clipboard": "Kopiuj do schowka",
+  "Export to File": "Eksportuj do pliku",
+  "Source:": "Źródło:",
+  "Extractor:": "Ekstraktor:",
+  "Extractor": "Ekstraktor",
+  "Transpose": "Transponuj",
+  "Add column header": "Dodaj nagłówek kolumny",
+  "Add row header": "Dodaj nagłówek wiersza",
+  "Output file:": "Plik wyjściowy:",
+  "Output file": "Plik wyjściowy",
+  "Export preview:": "Podgląd eksportu:",
+  "Export preview": "Podgląd eksportu",
+  "expression": "wyrażenie",
+  "Chart": "Wykres",
+  "Explain Again": "Wyjaśnij ponownie",
+  "Operation": "Operacja",
+  "Params": "Parametry",
+  "Query plan": "Plan zapytania",
+  "Empty plan": "Pusty plan",
+  "Sent as run-time parameters when connecting (any server setting, e.g. statement_timeout). application_name names the session; connect_timeout is in seconds.": "Wysyłane jako parametry uruchomieniowe podczas łączenia (dowolne ustawienie serwera, np. statement_timeout). application_name nadaje nazwę sesji; connect_timeout podawany jest w sekundach.",
+  "Set as session variables after connecting (SET SESSION name = value). charset and collation pick the connection character set; connect_timeout is in seconds.": "Ustawiane jako zmienne sesyjne po połączeniu (SET SESSION name = value). charset i collation wybierają zestaw znaków połączenia; connect_timeout podawany jest w sekundach.",
+  "Applied as pragmas when opening the file (PRAGMA name = value).": "Stosowane jako pragmy podczas otwierania pliku (PRAGMA name = value).",
+  "sec.": "s",
+  "default": "domyślny",
+  "<unchanged>": "<unchanged>",
+  "Single database mode (show only the configured database)": "Tryb pojedynczej bazy danych (pokaż tylko skonfigurowaną bazę danych)",
+  "schemas": "schematy",
+  "Object filter:": "Filtr obiektów:",
+  "e.g. order*, customers (tables, views, routines, sequences)": "np. order*, customers (tabele, widoki, procedury, sekwencje)",
+  "Show internal system schemas": "Pokaż wewnętrzne schematy systemowe",
+  "Show template databases": "Pokaż wzorcowe bazy danych",
+  "<user defined>": "<zdefiniowane przez użytkownika>",
+  "<value>": "<wartość>",
+  "{table}: {n} row(s) changed": "{table}: zmieniono {n} wiersz(y)",
+  "Import Data from File…": "Importuj dane z pliku…",
+  "Explain Plan": "Plan zapytania (Explain)",
+  "Browse Query History": "Przeglądaj historię zapytań",
+  "<data source>": "<źródło danych>",
+  "Cannot explain the statement": "Nie można wygenerować planu zapytania dla tej instrukcji",
+  "Cannot get the definition of {name}": "Nie można pobrać definicji {name}",
+  "Script finished: {length} statement": "Skrypt zakończony: {length} instrukcja",
+  "Script finished: {length} statements": "Skrypt zakończony: {length} instrukcji",
+  "Import from Clipboard": "Importuj ze schowka",
+  "No data source on the clipboard": "Brak źródła danych w schowku",
+  "Import/Export": "Import/Eksport",
+  "{what} is not supported by {debugger}": "{what} nie jest obsługiwane przez {debugger}",
+  "'{name}': listening for the remote JVM on port {port}": "'{name}': nasłuchiwanie zdalnej JVM na porcie {port}",
+  "“{name}” can't be debugged": "Nie można debugować “{name}”",
+  "It has no debug adapter.": "Brak adaptera debugowania.",
+  "The Java debugger can't start this command itself. Debug an Application, Spring Boot, Maven or Gradle configuration, or start the JVM with a JDWP agent and attach with a Remote JVM Debug configuration.": "Debuger Java nie może samodzielnie uruchomić tego polecenia. Uruchom debugowanie konfiguracji Application, Spring Boot, Maven lub Gradle albo uruchom JVM z agentem JDWP i podłącz się za pomocą konfiguracji Zdalne debugowanie JVM.",
+  "Attach the Java debugger to a JVM listening for JDWP (arg: { name, module, hostName, port, process })": "Podłącz debuger Java do JVM nasłuchującej połączeń JDWP (arg: { name, module, hostName, port, process })",
+  "'{name}' has compile errors; debugging the last compiled classes": "'{name}' zawiera błędy kompilacji; debugowanie ostatnio skompilowanych klas",
+  "Attach to Godot": "Podłącz do Godot",
+  "Debug the game the Godot editor is running, through the editor's debug adapter": "Debuguj grę uruchomioną w edytorze Godot za pośrednictwem jego adaptera debugowania",
+  "Before attaching": "Przed podłączeniem",
+  "Cannot start debugger for {name}": "Nie można uruchomić debugera dla {name}",
+  "suspended": "wstrzymany",
+  "e.g. order.total > 100": "np. order.total > 100",
+  "e.g. 5 or >= 3": "np. 5 lub >= 3",
+  "Value: {expression}": "Wartość: {expression}",
+  "Cannot attach to {name} ({pid})": "Nie można podłączyć do {name} ({pid})",
+  "“{name}” can't be watched": "Nie można dodawać obserwacji dla “{name}”",
+  "(deleted)": "(usunięto)",
+  "Macro '{name}' stopped": "Makro '{name}' zatrzymane",
+  "Id": "ID",
+  "Enable": "Włącz",
+  "The plugin failed to start.": "Uruchomienie wtyczki nie powiodło się.",
+  "Move Directory…": "Przenieś katalog…",
+  "Cannot move {name}": "Nie można przenieść {name}",
+  "Cannot rename {name}": "Nie można zmienić nazwy {name}",
+  "Store as project file (.openidea/run.toml); otherwise in the workspace (.openidea/run.local.toml)": "Zapisz jako plik projektu (.openidea/run.toml); w przeciwnym razie w przestrzeni roboczej (.openidea/run.local.toml)",
+  "This command line doesn't fit the type's form; it is edited as a command.": "Ten wiersz poleceń nie pasuje do formularza danego typu; jest edytowany jako polecenie.",
+  "Space separated; quote with ' or \"": "Wartości rozdzielone spacjami; użyj cudzysłowów ' lub \"",
+  "New configurations of this type start with these values.": "Nowe konfiguracje tego typu rozpoczynają pracę z tymi wartościami.",
+  "To run your code, do one of the following:": "Aby uruchomić kod, wykonaj jedną z następujących czynności:",
+  "The terminal is not available; turn off \"Emulate terminal in output console\" to see the output.": "Terminal jest niedostępny; wyłącz opcję \"Emuluj terminal w konsoli wyjściowej\", aby zobaczyć dane wyjściowe.",
+  "Expected": "Oczekiwane",
+  "Actual": "Aktualne",
+  "Terminate": "Zakończ",
+  "Cannot run '{name}'": "Nie można uruchomić '{name}'",
+  "External tool '{name}' has no program": "Narzędzie zewnętrzne '{name}' nie ma określonego programu",
+  "'{name}' needs an open file": "'{name}' wymaga otwartego pliku",
+  "Run a configuration (hold Shift to debug); the title bar widget passes \"select\" to only select one": "Uruchom konfigurację (przytrzymaj Shift, aby debugować); widżet na pasku tytułu przekazuje wartość \"select\", aby zaznaczyć tylko jeden element",
+  "Runs with a contributed executor (`{ executor, config? }` or `{ executor, context }`): the given or selected configuration, or the context.": "Uruchamia z użyciem wskazanego wykonawcy (`{ executor, config? }` lub `{ executor, context }`): podaną/wybraną konfigurację lub kontekst.",
+  "Saves the given `RunConfig` as a user configuration and opens it in Edit Configurations.": "Zapisuje podaną konfigurację `RunConfig` jako konfigurację użytkownika i otwiera ją w Edycji konfiguracji.",
+  "No sources for this class": "Brak kodu źródłowego dla tej klasy",
+  "Error running '{name}'": "Błąd podczas uruchamiania '{name}'",
+  "No JDK can run '{name}'": "Żaden zestaw JDK nie może uruchomić '{name}'",
+  "'{name}' exited with code {code}": "Proces '{name}' zakończył działanie z kodem {code}",
+  "Run a Godot project's main scene or a chosen scene": "Uruchom główną lub wybraną scenę projektu Godot",
+  "Project directory": "Katalog projektu",
+  "Project root (holds project.godot)": "Katalog główny projektu (zawiera project.godot)",
+  "Scene": "Scena",
+  "Main scene": "Główna scena",
+  "Godot command line options, e.g. --debug-collisions": "Opcje wiersza poleceń Godot, np. --debug-collisions",
+  "Bookmark description": "Opis zakładki",
+  "Cannot open {path}": "Nie można otworzyć {path}",
+  "Search context": "Kontekst wyszukiwania",
+  "not": "nie",
+  "and": "i",
+  "or": "lub",
+  "grouping": "grupowanie",
+  "Cannot log in to {name}": "Nie można zalogować się do {name}",
+  "Argument: `containers`, `images`, `allImages`, `volumes`, `networks` or `system` (default).": "Argument: `containers`, `images`, `allImages`, `volumes`, `networks` lub `system` (domyślnie).",
+  "Force (also untag / remove when used by stopped containers)": "Wymuś (usuń również tag / usuń, gdy jest używane przez zatrzymane kontenery)",
+  "Start the services of Compose files": "Uruchom usługi z plików Compose",
+  "Saved to .openidea/settings.toml in this project; overrides the global value.": "Zapisano w .openidea/settings.toml w tym projekcie; nadpisuje wartość globalną.",
+  "custom": "własny",
+  "Resolving the latest build…": "Ustalanie najnowszej wersji kompilacji…",
+  "Download JDK": "Pobierz JDK",
+  "Download": "Pobierz",
+  "Vendor:": "Dostawca:",
+  "Vendor": "Dostawca",
+  "Version:": "Wersja:",
+  "Select a version": "Wybierz wersję",
+  "JDK Location": "Lokalizacja JDK",
+  "Downloading JDK": "Pobieranie JDK",
+  "Use ; to separate name patterns, * for any number of symbols, ? for one.": "Użyj ; do rozdzielania wzorców nazw, * dla dowolnej liczby znaków, ? dla jednego znaku.",
+  "Folders are detected from build files (pom.xml, build.gradle, Cargo.toml, go.mod, pyproject.toml, package.json); marking or unmarking a folder overrides detection. Excluded folders are skipped by the Project view, Find in Files and the index (reopen the project to re-index).": "Foldery są wykrywane z plików budowania (pom.xml, build.gradle, Cargo.toml, go.mod, pyproject.toml, package.json); ręczne zaznaczenie lub odznaczenie foldera zastępuje automatyczne wykrywanie. Wykluczone foldery są pomijane w widoku Projektu, wyszukiwaniu w plikach oraz przez indeks (otwórz projekt ponownie, aby reindeksować).",
+  "Project virtualenv (auto-detect)": "Środowisko wirtualne projektu (automatyczne wykrywanie)",
+  "<No interpreter>": "<No interpreter>",
+  "Download JDK…": "Pobierz JDK…",
+  "interpreter": "interpretator",
+  "Side tool windows take the full height; the bottom ones fit between them": "Boczne okna narzędziowe zajmują pełną wysokość; dolne dopasowują się między nimi",
+  "Days on which files changed; older revisions are removed when a project opens.": "Dni, w których zmieniano pliki; starsze rewizje są usuwane podczas otwierania projektu.",
+  "Language of menus and dialogs; untranslated text stays in English.": "Język menu i okien dialogowych; nietłumaczony tekst pozostaje w języku angielskim.",
+  "Unix and macOS (\\n)": "Unix i macOS (\\n)",
+  "Classic Mac OS (\\r)": "Klasyczny Mac OS (\\r)",
+  "Encoding of new files; decodes project files that are not valid UTF-8 and have no BOM.": "Kodowanie nowych plików; dekoduje pliki projektu, które nie są poprawnym kodowaniem UTF-8 i nie posiadają nagłówka BOM.",
+  "Stored in the IDE; used by projects without their own scheme.": "Przechowywane w IDE; używane w projektach bez własnego schematu.",
+  "Semantic highlighting": "Wyróżnianie semantyczne",
+  "Local variables and parameters get a colour derived from their name (needs a language server).": "Zmienne lokalne i parametry otrzymują kolor pochodny od ich nazwy (wymaga serwera językowego).",
+  "Rainbow brackets": "Kolorowe nawiasy (Rainbow brackets)",
+  "Color (), [] and {} by nesting depth; unmatched brackets use the error color.": "Koloruje (), [] i {} według poziomu zagnieżdżenia; niedopasowane nawiasy używają koloru błędu.",
+  "Main font weight": "Grubość czcionki głównej",
+  "Bold font weight": "Grubość czcionki pogrubionej",
+  "Used wherever the color scheme shows text in bold": "Używane wszędzie tam, gdzie schemat kolorów wyświetla pogrubiony tekst",
+  "Use ; to separate patterns. * matches every file.": "Użyj ; do rozdzielenia wzorców. * dopasowuje każdy plik.",
+  "Function and method suggestions get (); the caret goes inside unless there are no parameters.": "Sugestie funkcji i metod otrzymują (); kursor umieszczany jest wewnątrz, chyba że brak parametrów.",
+  "Insert paired brackets (), [], {}": "Wstawiaj parzyste nawiasy (), [], {}",
+  "word": "słowo",
+  "Confirm closing a tab with a running process": "Potwierdzaj zamknięcie karty z uruchomionym procesem",
+  "value": "wartość",
+  "Login shell": "Powłoka logowania",
+  "Terminal column width": "Szerokość kolumny terminala",
+  "e.g. /usr/bin/env": "np. /usr/bin/env",
+  "Force push is not allowed to these branches. Separate patterns with ; (wildcards * and ? are supported).": "Wymuszone wysyłanie (force push) nie jest dozwolone dla tych gałęzi. Rozdziel wzorce za pomocą ; (obsługiwane są znaki wieloznaczne * i ?).",
+  "Adds a Signed-off-by trailer by default; it can still be switched per commit in Commit Options.": "Domyślnie dodaje podpis Signed-off-by; opcję tę można zmienić dla każdego zatwierdzenia w opcjach zatwierdzania (Commit).",
+  "Configure Live Templates…": "Konfiguruj szablony na żywo…",
+  "Update Tag with Emmet": "Zaktualizuj znacznik za pomocą Emmet",
+  "Created {fileName}": "Utworzono {fileName}",
+  "No tag at the caret": "Brak znacznika w miejscu kursora",
+  "Cannot update the tag": "Nie można zaktualizować znacznika",
+  "Templates of this project only": "Szablony tylko dla tego projektu",
+  "none": "brak",
+  "Opens a terminal tab running the shell at `arg` (a path from `termAvailableShells`).": "Otwiera kartę terminala wykonującą powłokę wskazaną w `arg` (ścieżka z `termAvailableShells`).",
+  "Opens a terminal tab running `{ program, args, name?, cwd? }` instead of the shell.": "Otwiera kartę terminala uruchamiającą `{ program, args, name?, cwd? }` zamiast domyślnej powłoki.",
+  "TODO items in files of a changelist": "Elementy TODO w plikach na liście zmian",
+  "Too many matches; showing the first 10 000.": "Zbyt wiele wyników; wyświetlanie pierwszych 10 000.",
+  "{name} downloaded": "Pobrano {name}",
+  "The Java language server restarts on it.": "Serwer językowy Java uruchomi się na nim ponownie.",
+  "Failed to download JDK {version}": "Nie udało się pobrać JDK {version}",
+  "Java Settings…": "Ustawienia Java…",
+  "{name} needs JDK {version} to run": "{name} wymaga JDK {version} do uruchomienia",
+  "Search for branches, actions, repositories": "Szukaj gałęzi, akcji, repozytoriów",
+  "Repositories and branches": "Repozytoria i gałęzie",
+  "Amend and Push…": "Popraw (amend) i wyślij…",
+  "Select revisions of one file to compare them": "Wybierz wersje jednego pliku, aby je porównać",
+  "local": "lokalny",
+  "remote": "zdalny",
+  "tag": "tag",
+  "revision": "wersja",
+  "{success}, with conflicts": "{success}, z konfliktami",
+  "As new branch": "Jako nowa gałąź",
+  "A rebase is in progress. The commit will become part of the rebased history; usually you continue the rebase instead.": "Trwa zmiana bazy (rebase). Zatwierdzenie stanie się częścią przebudowanej historii; zazwyczaj zaleca się kontynuowanie rebase.",
+  "HEAD is detached: the commit won't belong to any branch and may be lost after checking out another branch. Create a branch first to keep it.": "Wskaźnik HEAD jest odłączony: zatwierdzenie nie będzie należeć do żadnej gałęzi i może zostać utracone po przełączeniu na inną gałąź. Utwórz najpierw gałąź, aby je zachować.",
+  "Opens the diff viewer for a `DiffData` argument (e.g. a pull request file).": "Otwiera podgląd różnic dla argumentu `DiffData` (np. pliku z pull requesta).",
+  "From": "Od",
+  "To": "Do",
+  "Created worktree at {trim}": "Utworzono worktree w {trim}",
+  "No web URL for remote '{remote}'": "Brak adresu URL dla zdalnego repozytorium '{remote}'",
+  "'{rev}' was not found in the log": "Nie znaleziono '{rev}' w dzienniku",
+  "Compare Versions": "Porównaj wersje",
+  "Select two commits to compare": "Wybierz dwa zatwierdzenia do porównania",
+  "Label '{value}' added to Local History": "Etykietę '{value}' dodano do historii lokalnej",
+  "{doneTitle} successful": "{doneTitle} zakończono pomyślnie",
+  "{file} updated in {commit}": "Zaktualizowano {file} w {commit}",
+  "Shelved {length} file": "Odłożono do półki (shelf) {length} plik",
+  "Shelved {length} files": "Odłożono do półki (shelf) {length} plików",
+  "{what}: {length} file with conflicts": "{what}: {length} plik z konfliktami",
+  "{what}: {length} files with conflicts": "{what}: {length} plików z konfliktami",
+  "{what}: {n} file changed": "{what}: zmieniono {n} plik",
+  "{what}: {n} files changed": "{what}: zmieniono {n} plików",
+  "Built-in Preview": "Wbudowany podgląd",
+  "Cannot open the browser": "Nie można otworzyć przeglądarki",
+  "Browser": "Przeglądarka",
+  "Default Browser": "Domyślna przeglądarka",
+  "Open the HTML or SVG file in the default browser through the built-in server": "Otwórz plik HTML lub SVG w domyślnej przeglądarce za pośrednictwem wbudowanego serwera",
+  "Show the HTML file rendered beside the editor": "Wyświetl wyrenderowany plik HTML obok edytora",
+  "Project folder not found: {name}": "Nie znaleziono folderu projektu: {name}",
+  "Cannot reopen {name}": "Nie można ponownie otworzyć {name}",
+  "Edit inspection profile setting": "Edytuj ustawienia profilu inspekcji",
+  "Disable inspection": "Wyłącz inspekcję",
+  "Change Severity": "Zmień poziom ważności",
+  "Edit Inspection Profile Setting…": "Edytuj ustawienia profilu inspekcji…",
+  "Compiler errors and warnings of the last Build Project, shown at their source positions.": "Błędy i ostrzeżenia kompilatora z ostatniego budowania projektu, wyświetlane w miejscach w kodzie.",
+  "Process code": "Przetwarzaj kod",
+  "Process literals": "Przetwarzaj literały",
+  "Process comments": "Przetwarzaj komentarze",
+  "Distraction Free Mode": "Tryb bez rozpraszania uwagi",
+  "Exit Distraction Free Mode": "Wyjdź z trybu bez rozpraszania uwagi",
+  "Show Hidden Files": "Pokaż ukryte pliki",
+  "Show Members": "Pokaż składowe",
+  "Show Excluded Files": "Pokaż wykluczone pliki",
+  "Compact Middle Packages": "Kompaktuj pakiety pośrednie",
+  "Sort Folders First": "Sortuj najpierw foldery",
+  "Open Files with Single Click": "Otwieraj pliki pojedynczym kliknięciem",
+  "Expand Directories with Single Click": "Rozwijaj katalogi pojedynczym kliknięciem",
+  "Enable Preview Tab": "Włącz kartę podglądu",
+  "Analyze Dependencies…": "Analizuj zależności…",
+  "Shows a Maven module's dependency tree, version conflicts and where each library comes from": "Wyświetla drzewo zależności modułu Maven, konflikty wersji oraz źródło pochodzenia każdej biblioteki",
+  "Dependency Analyzer": "Analizator zależności",
+  "Search dependencies": "Szukaj zależności",
+  "Show conflicts only": "Pokaż tylko konflikty",
+  "All scopes": "Wszystkie zakresy",
+  "Show as List": "Pokaż jako listę",
+  "Show as Tree": "Pokaż jako drzewo",
+  "Dependency trees may be out of date": "Drzewa zależności mogą być nieaktualne",
+  "Dependency trees are read when Maven projects are reloaded": "Drzewa zależności są odczytywane podczas ponownego wczytywania projektów Maven",
+  "No Maven modules": "Brak modułów Maven",
+  "Dependencies": "Zależności",
+  "No dependencies match the filter": "Brak zależności pasujących do filtra",
+  "No dependencies": "Brak zależności",
+  "Select a dependency to see its usages": "Wybierz zależność, aby zobaczyć jej użycia",
+  "Versions requested": "Żądane wersje",
+  "omitted": "pominięto",
+  "resolved": "rozstrzygnięto",
+  "omitted for conflict with {version}": "pominięto z powodu konfliktu z wersją {version}",
+  "omitted for conflict": "pominięto z powodu konfliktu",
+  "omitted for duplicate": "pominięto z powodu duplikatu",
+  "omitted for cycle": "pominięto z powodu cyklu",
+  "version managed from {version}": "wersja zarządzana z poziomu {version}",
+  "Cannot find the declaration": "Nie można znaleźć deklaracji",
+  "Cannot exclude {name}": "Nie można wykluczyć {name}",
+  "Solarized Light": "Solarized Jasny",
+  "Solarized Dark": "Solarized Ciemny",
+  "One Light": "One Light",
+  "One Dark": "One Dark",
+  "Copied reference: {reference}": "Skopiowano odnośnik: {reference}",
+  "{count} lines": "Liczba wierszy: {count}",
+  "Preview of {path}": "Podgląd {path}",
+  "Editor for {path}": "Edytor dla {path}",
+  "Unwrap '{label}'": "Odpakuj '{label}'",
+  "'{name}' is read-only. Make it writable?": "'{name}' jest tylko do odczytu. Zmienić na zapisywalny?",
+  "Make '{name}' read-only?": "Zmienić '{name}' na tylko do odczytu?",
+  "Some unsaved edits to {path} could not be applied and were replaced by the file's current content.": "Niektóre niezapisane zmiany w {path} nie mogły zostać zastosowane i zostały zastąpione aktualną zawartością pliku.",
+  "No editor for “{kind}”": "Brak edytora dla “{kind}”",
+  "Show usages of {name}": "Pokaż użycia {name}",
+  "Cannot resolve file '{value}'": "Nie można odnaleźć pliku '{value}'",
+  "Reformat File: {name}": "Sformatuj ponownie plik: {name}",
+  "Inspection '{name}' options": "Opcje inspekcji '{name}'",
+  "Choose Declaration of '{label}' ({count} found)": "Wybierz deklarację '{label}' (znaleziono: {count})",
+  "Press {keys} to show dialog with more options": "Naciśnij {keys}, aby wyświetlić okno dialogowe z większą liczbą opcji",
+  "Rename '{oldName}' to '{newName}'": "Zmień nazwę z '{oldName}' na '{newName}'",
+  "Rename '{name}'": "Zmień nazwę '{name}'",
+  "Change '{word}' to": "Zmień '{word}' na",
+  "Rename '{word}' to": "Zmień nazwę '{word}' na",
+  "Save '{word}' to project-level dictionary": "Zapisz '{word}' w słowniku poziomu projektu",
+  "Save '{word}' to application-level dictionary": "Zapisz '{word}' w słowniku poziomu aplikacji",
+  "Typo: In word '{word}'": "Literówka: w słowie '{word}'",
+  "Choose Super Class or Interface ({count} found)": "Wybierz nadklasę lub interfejs (znaleziono: {count})",
+  "Choose Super Method of {name} ({count} found)": "Wybierz nadrzędną metodę dla {name} (znaleziono: {count})",
+  "Choose Implementation of {name} ({count} found)": "Wybierz implementację dla {name} (znaleziono: {count})",
+  "Choose Subclass of {name} ({count} found)": "Wybierz podklasę dla {name} (znaleziono: {count})",
+  "Choose Overriding Method of {name} ({count} found)": "Wybierz metodę nadpisującą dla {name} (znaleziono: {count})",
+  "Is implemented by {names}": "Jest implementowane przez {names}",
+  "Is subclassed by {names}": "Ma podklasy {names}",
+  "Is implemented in {names}": "Jest zaimplementowane w {names}",
+  "Is overridden in {names}": "Jest nadpisane w {names}",
+  "Implements method in {names}": "Implementuje metodę w {names}",
+  "Overrides method in {names}": "Nadpisuje metodę w {names}",
+  "{names} and {count} more": "{names} i jeszcze {count}",
+  "Implemented and overridden": "Zaimplementowane i nadpisane",
+  "Implementing and overriding": "Implementowanie i nadpisywanie",
+  "Implemented and overridden declarations": "Zaimplementowane i nadpisane deklaracje",
+  "Implementing and overriding methods": "Metody implementujące i nadpisujące",
+  "Replace all {count} occurrences": "Zastąp wszystkie wystąpienia ({count})",
+  "↵ Apply · Esc Keep '{name}'": "↵ Zastosuj · Esc Zachowaj '{name}'",
+  " (in {files} files)": " (w plikach: {files})",
+  "{subject} have {n} usage that is not safe to delete{where}.": "Obiekt {subject} posiada {n} użycie, którego bezpieczne usunięcie nie jest możliwe{where}.",
+  "{subject} have {n} usages that are not safe to delete{where}.": "Obiekt {subject} posiada {n} użycia/użyć, których bezpieczne usunięcie nie jest możliwe{where}.",
+  "{subject} has {n} usage that is not safe to delete{where}.": "Obiekt {subject} posiada {n} użycie, którego bezpieczne usunięcie nie jest możliwe{where}.",
+  "{subject} has {n} usages that are not safe to delete{where}.": "Obiekt {subject} posiada {n} użycia/użyć, których bezpieczne usunięcie nie jest możliwe{where}.",
+  "{n} usage found": "Znaleziono {n} użycie",
+  "{n} usages found": "Znaleziono {n} użycia/użyć",
+  "Safe Delete {kind} '{name}'": "Bezpieczne usuwanie {kind} '{name}'",
+  "Delete {kind} '{name}'?": "Usunąć {kind} '{name}'?",
+  "File '{name}'": "Plik '{name}'",
+  "The {count} files": "Pliki ({count})",
+  "Delete “{title}”? Its branch {branch} is kept.": "Usunąć “{title}”? Jej gałąź {branch} zostanie zachowana.",
+  "Delete “{title}”? Files it changed are kept.": "Usunąć “{title}”? Zmienione przez nią pliki zostaną zachowane.",
+  "{name} is over 5 MB.": "{name} ma rozmiar ponad 5 MB.",
+  "{used} / {size} tokens": "Wykorzystano tokenów: {used} / {size}",
+  "Replace in {path}:{line}": "Zastąp w {path}:{line}",
+  "Clean up {count} files?": "Oczyścić pliki w liczbie: {count}?",
+  "Leave empty to use the folder name ({folder}).": "Pozostaw puste, aby użyć nazwy folderu ({folder}).",
+  "Debug '{name}'": "Debuguj '{name}'",
+  "Open {file}": "Otwórz {file}",
+  "{direction} Hierarchy": "Hierarchia {direction}",
+  "Language servers: {text}": "Serwery językowe: {text}",
+  "Install {name}": "Zainstaluj {name}",
+  "Restart {name}": "Uruchom ponownie {name}",
+  "{count} error": "{count} błąd",
+  "{count} errors": "Liczba błędów: {count}",
+  "{count} warning": "{count} ostrzeżenie",
+  "{count} warnings": "Liczba ostrzeżeń: {count}",
+  "{errors} and {warnings}": "{errors} i {warnings}",
+  "{found} found in {n} file": "{found} znaleziono w {n} pliku",
+  "{found} found in {n} files": "{found} znaleziono w {n} plikach",
+  "{message} Install it with: {command}": "{message} Zainstaluj za pomocą: {command}",
+  "Import Data into {schema}.{table}": "Importuj dane do {schema}.{table}",
+  "Import {count} Rows": "Importuj {count} wierszy",
+  "{source} Query History": "Historia zapytań {source}",
+  "Local filter of {column}": "Lokalny filtr dla kolumny {column}",
+  "Values of {column}": "Wartości kolumny {column}",
+  "Copy as {format}": "Kopiuj jako {format}",
+  "Connect to {name}": "Połącz z {name}",
+  "SSH: {name}": "SSH: {name}",
+  "Modify Table {table}": "Modyfikuj tabelę {table}",
+  "{label} (seconds)": "{label} (sekundy)",
+  "Succeeded: {version}": "Zakończono pomyślnie: {version}",
+  "All databases": "Wszystkie bazy danych",
+  "Add databases pattern": "Dodaj wzorzec baz danych",
+  "All schemas (databases)": "Wszystkie schematy (bazy danych)",
+  "All schemas": "Wszystkie schematy",
+  "Add schemas (databases) pattern": "Dodaj wzorzec schematów (baz danych)",
+  "Add schemas pattern": "Dodaj wzorzec schematów",
+  "Data Source: {name}": "Źródło danych: {name}",
+  "{table} data": "Dane tabeli {table}",
+  "{count} rows": "Liczba wierszy: {count}",
+  "Remove data source '{name}'? Its query console file stays on disk.": "Usunąć źródło danych '{name}'? Jego plik konsoli zapytań pozostanie na dysku.",
+  "Result {n}": "Wynik {n}",
+  "{name} has uncommitted changes. Commit or roll them back before switching to auto-commit?": "{name} zawiera niezatwierdzone zmiany. Zatwierdzić je lub wycofać przed przełączeniem na automatyczne zatwierdzanie (auto-commit)?",
+  "Cannot copy the name": "Nie można skopiować nazwy",
+  "Cannot copy the reference": "Nie można skopiować odnośnika",
+  "Cannot copy the DDL": "Nie można skopiować kodu DDL",
+  "Start the remote JVM with -agentlib:jdwp=transport=dt_socket,server=n,address={host}:{port},suspend=y": "Uruchom zdalną maszynę JVM z parametrem -agentlib:jdwp=transport=dt_socket,server=n,address={host}:{port},suspend=y",
+  "{class} reloaded": "Przeładowano klasę {class}",
+  "{count} class": "{count} klasa",
+  "{count} classes": "Liczba klas: {count}",
+  "The JavaScript debugger (vscode-js-debug) is not installed": "Debuger JavaScript (vscode-js-debug) nie jest zainstalowany",
+  "Delve is not installed": "Delve nie jest zainstalowane",
+  "CodeLLDB is not installed": "CodeLLDB nie jest zainstalowane",
+  "{name} (child)": "{name} (potomny)",
+  "Enable breakpoint at {path}:{line}": "Włącz punkt przerwania w {path}:{line}",
+  "Headers ({count})": "Nagłówki ({count})",
+  "Headers": "Nagłówki",
+  "Delete the macro '{name}'?": "Usunąć makro '{name}'?",
+  "{count} processes": "Liczba procesów: {count}",
+  "Memory: {usage}": "Pamięć: {usage}",
+  " Memory {before} → {after}.": " Pamięć {before} → {after}.",
+  "{count} syntax tree dropped, index compacted.{memory}": "Odrzucono drzewo składniowe ({count}), indeks skompresowany.{memory}",
+  "{count} syntax trees dropped, index compacted.{memory}": "Odrzucono drzewa składniowe ({count}), indeks skompresowany.{memory}",
+  "Disable {name}": "Wyłącz {name}",
+  "Enable {name}": "Włącz {name}",
+  "Run {name}": "Uruchom {name}",
+  "Apply theme {name}": "Zastosuj motyw {name}",
+  "Confirm uninstall {name}": "Potwierdź odinstalowanie {name}",
+  "From plugin {name}": "Z wtyczki {name}",
+  "{count} items": "Elementy: {count}",
+  "Refactoring Preview: {title}": "Podgląd refaktoryzacji: {title}",
+  "Include {path}": "Dołącz {path}",
+  "Project View: {option}": "Widok projektu: {option}",
+  "Project View: Show {view}": "Widok projektu: Pokaż {view}",
+  "Reveal in {fileManager}": "Pokaż w programie {fileManager}",
+  "Unmark as {role}": "Odznacz jako {role}",
+  "Updated references in {count} file": "Zaktualizowano odnośniki w {count} pliku",
+  "Updated references in {count} files": "Zaktualizowano odnośniki w {count} plikach",
+  "Changed since the refactoring, not reverted: {files}": "Zmieniono od czasu refaktoryzacji, nie wycofano: {files}",
+  "Remove '{name}'": "Usuń '{name}'",
+  "{name} output": "Dane wyjściowe {name}",
+  "Finished in {duration}, exit code {code}": "Zakończono w {duration}, kod wyjścia {code}",
+  "{name} terminal": "Terminal {name}",
+  "Stop ({count} running)": "Zatrzymaj (uruchomione: {count})",
+  "Rerun '{name}'": "Uruchom ponownie '{name}'",
+  "Stop '{name}'": "Zatrzymaj '{name}'",
+  "Comparison Failure: {name}": "Błąd porównania: {name}",
+  "Process '{name}' Is Running": "Proces '{name}' jest uruchomiony",
+  "Do you want to terminate the process '{name}'?": "Czy chcesz zakończyć proces '{name}'?",
+  "Running '{name}' without the debugger.": "Uruchamianie '{name}' bez debugera.",
+  "{className} is not part of the project, and no library sources are available for it.": "Klasa {className} nie należy do projektu i brak dla niej kodów źródłowych biblioteki.",
+  "{count} running": "Uruchomione: {count}",
+  "Stack trace {title}": "Ślad stosu {title}",
+  "Run Gradle tasks": "Uruchom zadania Gradle",
+  "Run Maven goals": "Uruchom cele (goals) Maven",
+  "Delete the list '{name}' with its {count} bookmark?": "Usunąć listę '{name}' wraz z zawartą w niej zakładką ({count})?",
+  "Delete the list '{name}' with its {count} bookmarks?": "Usunąć listę '{name}' wraz z zawartymi w niej zakładkami ({count})?",
+  "Delete {count} Bookmarks": "Usuń zakładki ({count})",
+  "Remove the connection '{name}' from Services?": "Usunąć połączenie '{name}' z sekcji Usługi?",
+  "Remove the registry '{name}' and its saved password?": "Usunąć rejestr '{name}' oraz zapamiętane dla niego hasło?",
+  "Prune Unused Containers…": "Wyczyść nieużywane kontenery…",
+  "Prune Dangling Images…": "Wyczyść osierocone obrazy…",
+  "Prune Unused Images…": "Wyczyść nieużywane obrazy…",
+  "Prune Unused Volumes…": "Wyczyść nieużywane wolumeny…",
+  "Prune Unused Networks…": "Wyczyść nieużywane sieci…",
+  "Prune Everything Unused…": "Wyczyść wszystkie nieużywane elementy…",
+  "Delete Container": "Usuń kontener",
+  "Delete container '{name}'? It is running and will be stopped.": "Usunąć kontener '{name}'? Jest on uruchomiony i zostanie zatrzymany.",
+  "Delete container '{name}'?": "Usunąć kontener '{name}'?",
+  "Delete Image": "Usuń obraz",
+  "Delete image '{name}'?": "Usunąć obraz '{name}'?",
+  "Delete Volume": "Usuń wolumen",
+  "Delete volume '{name}'?": "Usunąć wolumen '{name}'?",
+  "Delete Network": "Usuń sieć",
+  "Delete network '{name}'?": "Usunąć sieć '{name}'?",
+  "Stop and remove the containers and networks of '{name}'?": "Zatrzymać i usunąć kontenery oraz sieci dla '{name}'?",
+  "Build Image '{tag}'": "Zbuduj obraz '{tag}'",
+  "Enter a value between {min} and {max}": "Wprowadź wartość z zakresu od {min} do {max}",
+  "based on {parent}": "na podstawie {parent}",
+  "Delete keymap '{name}'?": "Usunąć mapę klawiszy '{name}'?",
+  "Remove {shortcut}": "Usuń {shortcut}",
+  "Keyboard Shortcut: {action}": "Skrót klawiszowy: {action}",
+  "Remove content root {path}": "Usuń katalog główny zawartości {path}",
+  "Unmark {folder}": "Odznacz {folder}",
+  "File name patterns of {name}": "Wzorce nazw plików dla {name}",
+  "Hashbang patterns of {name}": "Wzorce nagłówków hashbang dla {name}",
+  "{group} popup type": "Typ okna wyskakującego {group}",
+  "Show {group} in tool window": "Pokaż {group} w oknie narzędziowym",
+  "{label} hex": "Wartość szesnastkowa (hex) {label}",
+  "{label} custom value": "Własna wartość {label}",
+  "Delete inspection profile '{name}'?": "Usunąć profil inspekcji '{name}'?",
+  "{server} problems with code {code} ({source}).": "Problemy {server} z kodem {code} ({source}).",
+  "{server} problems with code {code}.": "Problemy {server} z kodem {code}.",
+  "Problems the {server} language server reports in {languages} files. Severity \"As reported\" keeps the level the server assigns; a code below can override it.": "Problemy zgłaszane przez serwer językowy {server} w plikach typu {languages}. Poziom ważności \"Zgodnie ze zgłoszeniem\" zachowuje poziom przypisany przez serwer; kod poniżej może go przesłonić.",
+  "Problems the {server} language server reports. Severity \"As reported\" keeps the level the server assigns; a code below can override it.": "Problemy zgłaszane przez serwer językowy {server}. Poziom ważności \"Zgodnie ze zgłoszeniem\" zachowuje poziom przypisany przez serwer; kod poniżej może go przesłonić.",
+  "Auto-detected: {path}": "Wykryto automatycznie: {path}",
+  "New {name}": "Nowy {name}",
+  "Name (.{extension})": "Nazwa (.{extension})",
+  "'{abbreviation}' does not describe a single element.": "'{abbreviation}' nie opisuje pojedynczego elementu.",
+  "New {name}…": "Nowy {name}…",
+  "{name} expression": "Wyrażenie {name}",
+  "{name} default value": "Wartość domyślna {name}",
+  "Skip {name} if defined": "Pomiń {name}, jeśli zdefiniowano",
+  "Enable .{key}": "Włącz .{key}",
+  "{keyword} colour": "Kolor {keyword}",
+  "{count} file": "{count} plik",
+  "{count} files": "Liczba plików: {count}",
+  "Reinstall {name}": "Zainstaluj ponownie {name}",
+  "Installed in {path}; it is used for projects targeting Java {version}.": "Zainstalowano w {path}; jest używane dla projektów docelowo korzystających z Java {version}.",
+  "Code insight for {languages} needs {command}. Install it via {method}?": "Analiza kodu dla języka {languages} wymaga polecenia {command}. Zainstalować za pomocą {method}?",
+  "Version {version}": "Wersja {version}",
+  "Branch {name}": "Gałąź {name}",
+  "Tag {name}": "Tag {name}",
+  "Branch {branch} of {repository}": "Gałąź {branch} w {repository}",
+  "Branches of {root}": "Gałęzie w {root}",
+  "Include {name} in commit": "Dołącz {name} do zatwierdzenia (commit)",
+  "Compare {current} with {branch}": "Porównaj {current} z {branch}",
+  "Rebase '{head}' onto Selected Commit": "Wykonaj rebase '{head}' na wybrane zatwierdzenie",
+  "Revert {file} to the revision from {time} ({label})?": "Przywrócić plik {file} do wersji z dnia {time} ({label})?",
+  "Revert {count} files under {folder} to label '{label}'?": "Przywrócić pliki w liczbie {count} w folderze {folder} do etykiety '{label}'?",
+  "Revert {file} to label '{label}'?": "Przywrócić plik {file} do etykiety '{label}'?",
+  "Revert from Local History": "Przywróć z historii lokalnej",
+  "{submodule} points to another commit. Check out the recorded commit in the submodule (git submodule update) to revert it.": "Submoduł {submodule} wskazuje na inne zatwierdzenie. Pobierz zapisane zatwierdzenie w podmodule (git submodule update), aby je cofnąć.",
+  "New Branch from '{name}'…": "Nowa gałąź z '{name}'…",
+  "Rebase Current onto '{name}'": "Wykonaj rebase bieżącej gałęzi na '{name}'",
+  "Merge '{name}' into Current": "Scal '{name}' z bieżącą gałęzią",
+  "Checkout and Rebase onto '{current}'": "Pobierz (checkout) i wykonaj rebase na '{current}'",
+  "Compare with '{current}'": "Porównaj z '{current}'",
+  "Rebase '{current}' onto '{name}'": "Wykonaj rebase '{current}' na '{name}'",
+  "Merge '{name}' into '{current}'": "Scal '{name}' z '{current}'",
+  "Create New Branch from {from}": "Utwórz nową gałąź z {from}",
+  "Rename Branch {name}": "Zmień nazwę gałęzi {name}",
+  "Delete branch '{name}' on the remote? The remote-tracking branch '{tracking}' is removed as well.": "Usunąć gałąź '{name}' w zdalnym repozytorium? Śledzona gałąź zdalna '{tracking}' również zostanie usunięta.",
+  "New branch name (in {count} repositories):": "Nowa nazwa gałęzi (w {count} repozytoriach):",
+  "Delete branch '{name}' in {count} repositories? Unmerged commits are discarded.": "Usunąć gałąź '{name}' w {count} repozytoriach? Niescalone zatwierdzenia zostaną odrzucone.",
+  "Unstash {ref} as branch {branch}": "Przywróć {ref} ze schowka (stash) jako gałąź {branch}",
+  "Pop {ref}": "Wyciągnij ze schowka (pop) {ref}",
+  "Apply {ref}": "Zastosuj {ref}",
+  "Drop {ref} “{message}”? This cannot be undone.": "Odrzucić {ref} “{message}”? Tej operacji nie można cofnąć.",
+  "Drop {ref}? This cannot be undone.": "Odrzucić {ref}? Tej operacji nie można cofnąć.",
+  "Changelist '{name}' contains {count} change. It will be moved to '{target}'. Delete the changelist?": "Lista zmian '{name}' zawiera {count} zmianę. Zostanie ona przeniesiona do '{target}'. Usunąć listę zmian?",
+  "Changelist '{name}' contains {count} changes. They will be moved to '{target}'. Delete the changelist?": "Lista zmian '{name}' zawiera zmiany w liczbie: {count}. Zostaną one przeniesione do '{target}'. Usunąć listę zmian?",
+  "{name} (active)": "{name} (aktywne)",
+  "from {path}": "z {path}",
+  "{dir} · from {path}": "{dir} · z {path}",
+  "Clipboard ↔ {file} (selection)": "Schowek ↔ {file} (zaznaczenie)",
+  "Clipboard ↔ {file}": "Schowek ↔ {file}",
+  "Pull to {head}": "Pobierz (pull) do {head}",
+  "Merge into {head}": "Scal z {head}",
+  "Merge branch '{branch}' into {head}": "Scal gałąź '{branch}' z {head}",
+  "Remove remote '{name}'? Its remote-tracking branches are deleted.": "Usunąć zdalne repozytorium '{name}'? Jego śledzone gałęzie zdalne zostaną usunięte.",
+  "Remove the worktree at {path}? Its folder is deleted.": "Usunąć worktree w ścieżce {path}? Jego folder zostanie usunięty.",
+  "{count} file has conflicts: {files}": "{count} plik zawiera konflikty: {files}",
+  "{count} files have conflicts: {files}": "Pliki w liczbie {count} zawierają konflikty: {files}",
+  "{status} (from {path})": "{status} (z {path})",
+  "Create New Tag On {commit}": "Utwórz nowy tag w zatwierdzeniu {commit}",
+  "Changes between {from} and Local Working Tree": "Zmiany między {from} a lokalnym drzewem roboczym",
+  "Changes between {from} and {to}": "Zmiany między {from} a {to}",
+  "No rebase in progress": "Brak trwającej operacji rebase",
+  "No merge in progress": "Brak trwającej operacji scalania",
+  "No cherry-pick in progress": "Brak trwającej operacji cherry-pick",
+  "No revert in progress": "Brak trwającej operacji cofania (revert)",
+  "No patch application in progress": "Brak trwającej operacji nakładania łatki (patch)",
+  "Apply Patch: {source}": "Zastosuj łatkę: {source}",
+  "Drop {count} commits from the current branch? Their changes are removed.": "Odrzucić zatwierdzenia w liczbie {count} z bieżącej gałęzi? Wprowadzone w nich zmiany zostaną usunięte.",
+  "Drop commit {id} “{summary}” from the current branch? Its changes are removed.": "Odrzucić zatwierdzenie {id} “{summary}” z bieżącej gałęzi? Zmiany zostaną usunięte.",
+  "Action for {id}": "Akcja dla {id}",
+  "Rebasing {n} commit onto {onto}": "Wykonywanie rebase {n} zatwierdzenia na {onto}",
+  "Rebasing {n} commits onto {onto}": "Wykonywanie rebase {n} zatwierdzeń na {onto}",
+  "Rebasing {n} commit from the root": "Wykonywanie rebase {n} zatwierdzenia od korzenia",
+  "Rebasing {n} commits from the root": "Wykonywanie rebase {n} zatwierdzeń od korzenia",
+  "Push Commits to {remote}": "Wyślij zatwierdzenia (push) do {remote}",
+  "Pushed {n} commit to {remote}": "Wysłano {n} zatwierdzenie do {remote}",
+  "Pushed {n} commits to {remote}": "Wysłano {n} zatwierdzenia/zatwierdzeń do {remote}",
+  "You're going to force push to '{target}'. It may overwrite commits at the remote. Are you sure you want to proceed?": "Zamierzasz wykonać wymuszone wysłanie (force push) do '{target}'. Może to nadpisać zatwierdzenia na serwerze zdalnym. Czy na pewno chcesz kontynuować?",
+  "Delete “{name}” from the shelf? This cannot be undone.": "Usunąć “{name}” z półki (shelf)? Tej operacji nie można cofnąć.",
+  "Handler for {keystroke}": "Procesor obsługi dla {keystroke}",
+  "Open '{path}' in Browser": "Otwórz '{path}' w przeglądarce",
+  "Open ({shortcut})": "Otwórz ({shortcut})",
+  "Remove '{name}' from the list of recent projects?": "Usunąć '{name}' z listy ostatnich projektów?",
+  "Disable Inspection '{name}'": "Wyłącz inspekcję '{name}'",
+  "Download JDK {version}": "Pobierz JDK {version}",
+  "Cancel {title}": "Anuluj {title}",
+  "Background tasks: {title}": "Zadania w tle: {title}",
+  "{files} files · {symbols} symbols": "Pliki: {files} · symbole: {symbols}",
+  "{title} view options": "Opcje widoku {title}",
+  "{title} views": "Widoki {title}",
+  "{title} options": "Opcje {title}",
+  "Delete the layout '{name}'?": "Usunąć układ '{name}'?",
+  "In {left}, not in {right}": "W {left}, brak w {right}",
+  "Local branch '{local}' has commits that do not exist in '{remote}'. Rebase '{local}' onto '{remote}', or drop local commits?": "Lokalna gałąź '{local}' zawiera zatwierdzenia, które nie istnieją w '{remote}'. Wykonać rebase '{local}' na '{remote}', czy odrzucić lokalne zatwierdzenia?",
+  "Add Language Server…": "Dodaj serwer językowy…",
+  "Use {displayName}": "Użyj {displayName}",
+  "Select {name}": "Wybierz {name}",
+  "Root markers": "Znaczniki katalogu głównego",
+  "Initialization options": "Opcje inicjalizacji",
+  "Global": "Globalne",
+  "This project": "Ten projekt",
+  "Executable name or path": "Nazwa pliku wykonywalnego lub ścieżka",
+  "Select the server executable": "Wybierz plik wykonywalny serwera",
+  "Remove Language Server": "Usuń serwer językowy",
+  "Missing ({missingCount})": "Brakujące ({missingCount})",
+  "Choose languages…": "Wybierz języki…",
+  "Filter languages": "Filtruj języki",
+  "No languages match.": "Brak pasujących języków.",
+  "Checked when the settings are applied.": "Weryfikowane w momencie zastosowania ustawień.",
+  "Using": "Używanie",
+  "Not found on PATH.": "Nie znaleziono w zmiennej środowiskowej PATH.",
+  "Use {displayName} for {join} files": "Użyj {displayName} dla plików {join}",
+  "Files marking the workspace root.": "Pliki wyznaczające katalog główny przestrzeni roboczej.",
+  "Merged over the defaults shown when empty.": "Scalone z domyślnymi wartościami wyświetlanymi, gdy pole jest puste.",
+  "Workspace Configuration": "Konfiguracja przestrzeni roboczej",
+  "Enter the command that starts the server.": "Wprowadź polecenie uruchamiające serwer.",
+  "Name: letters, digits, - _ + only.": "Nazwa: dozwolone tylko litery, cyfry oraz znaki -, _, +.",
+  "{effectiveName} already exists.": "{effectiveName} już istnieje.",
+  "Choose the languages it serves.": "Wybierz języki obsługiwane przez serwer.",
+  "New Language Server": "Nowy serwer językowy",
+  "Any language server that talks LSP over stdio, with its arguments.": "Dowolny serwer językowy komunikujący się protokołem LSP przez standardowe wejście/wyjście (stdio) wraz z argumentami.",
+  "Changing these restarts the server.": "Zmiana tych ustawień powoduje ponowne uruchomienie serwera.",
+  "Sent to the running server; no restart needed.": "Wysyłane do uruchomionego serwera; ponowne uruchomienie nie jest wymagane.",
+  "SSH Configurations": "Konfiguracje SSH",
+  "User name": "Nazwa użytkownika",
+  "Authentication type": "Typ uwierzytelniania",
+  "Key pair (OpenSSH or PuTTY)": "Para kluczy (OpenSSH lub PuTTY)",
+  "Private key file": "Plik klucza prywatnego",
+  "Save passphrase": "Zapisz hasło klucza prywatnego",
+  "SSH Password": "Hasło SSH",
+  "Yes": "Tak",
+  "No": "Nie",
+  "Configuration:": "Konfiguracja:",
+  "SSH configuration": "Konfiguracja SSH",
+  "The authenticity of the host cannot be established. Trust it and add the key to ~/.ssh/known_hosts?": "Nie można zweryfikować autentyczności hosta. Czy zaufać mu i dodać klucz do ~/.ssh/known_hosts?",
+  "No SSH configurations. Click + to add one.": "Brak konfiguracji SSH. Kliknij +, aby dodać nową.",
+  "SSH configurations are shared by all projects: data source tunnels, deployment servers, run targets and Tools › Start SSH Session connect with them.": "Konfiguracje SSH są współdzielone przez wszystkie projekty: tunele źródeł danych, serwery wdrażania, cele uruchomienia i Narzędzia › Uruchom sesję SSH łączą się za ich pomocą.",
+  "SSH configurations actions": "Akcje konfiguracji SSH",
+  "SSH configurations": "Konfiguracje SSH",
+  "No host": "Brak hosta",
+  "Edit SSH Configurations…": "Edytuj konfiguracje SSH…",
+  "No SSH configurations. Add one…": "Brak konfiguracji SSH. Dodaj konfigurację…",
+  "Cannot start SSH session": "Nie można uruchomić sesji SSH",
+  "Start SSH Session": "Uruchom sesję SSH",
+  "Start SSH Session…": "Uruchom sesję SSH…",
+  "SSH Configurations…": "Konfiguracje SSH…",
+  "SSH Session…": "Sesja SSH…",
+  "Custom (fields below)": "Niestandardowy (pola poniżej)",
+  "Connects to {target}.": "Łączy z {target}.",
+  "SSH configuration {id} no longer exists.": "Konfiguracja SSH {id} już nie istnieje.",
+  "Run Targets": "Cele uruchomienia",
+  "Target Settings": "Ustawienia celu",
+  "Project folder on target": "Folder projektu w środowisku docelowym",
+  "Files are uploaded here and the working directory is mapped into it.": "Pliki są tu przesyłane, a katalog roboczy jest mapowany na ten folder.",
+  "Upload changed project files before each run": "Prześlij zmienione pliki projektu przed każdym uruchomieniem",
+  "Node.js interpreter": "Interpretator Node.js",
+  "Java executable": "Plik wykonywalny Java",
+  "No run targets. Click + to add one.": "Brak celów uruchomienia. Kliknij +, aby dodać.",
+  "Run targets actions": "Akcje celów uruchomienia",
+  "Run targets": "Cele uruchomienia",
+  "Choose a target under “Run on” in a run configuration. Interpreters left empty are looked up on the target's PATH. SSH configurations are managed in Tools › SSH Configurations.": "Wybierz cel w polu „Uruchom na” w konfiguracji uruchomienia. Puste pola interpretatorów zostaną wyszukane w zmiennej PATH celu. Konfiguracjami SSH zarządza się w Narzędzia › Konfiguracje SSH.",
+  "Select Folder on Target": "Wybierz folder w środowisku docelowym",
+  "Parent Folder": "Folder nadrzędny",
+  "Remote path": "Ścieżka zdalna",
+  "Remote folders": "Foldery zdalne",
+  "Trust Host": "Zaufaj hostowi",
+  "Password or passphrase": "Hasło lub fraza dostępu",
+  "No subfolders": "Brak podfolderów",
+  "{name} (missing)": "{name} (brakujące)",
+  "Run on": "Uruchom na",
+  "Local machine": "Maszyna lokalna",
+  "Debugging is not available on run targets.": "Debugowanie nie jest dostępne w celach uruchomienia.",
+  "Add SSH hosts in Settings › Build, Execution, Deployment › Run Targets.": "Dodaj hosty SSH w Ustawienia › Budowanie, wykonanie, wdrożenie › Cele uruchomienia.",
+  "Debugging on run targets is not supported": "Debugowanie w celach uruchomienia nie jest obsługiwane",
+  "'{name}' runs on {target}. Run it, or choose “Local machine” under “Run on” to debug it.": "'{name}' działa w {target}. Uruchom plik lub wybierz „Maszyna lokalna” w polu „Uruchom na”, aby go debugować.",
+  "SSH Authentication": "Uwierzytelnianie SSH",
+  "Deployment": "Wdrażanie",
+  "Deployment servers": "Serwery wdrażania",
+  "Mappings": "Mapowania",
+  "Excluded Paths": "Wykluczone ścieżki",
+  "Root path": "Ścieżka główna",
+  "Mappings' deployment paths are relative to this folder.": "Ścieżki wdrażania w mapowaniach są względne w stosunku do tego folderu.",
+  "Login folder": "Folder logowania",
+  "Web server URL": "Adres URL serwera WWW",
+  "Choose Folder": "Wybierz folder",
+  "Home folder is unavailable": "Folder domowy jest niedostępny",
+  "Folder does not exist: {path}": "Folder nie istnieje: {path}",
+  "Not a folder: {path}": "Ścieżka nie wskazuje folderu: {path}",
+  "Folder is not writable: {path}: {error}": "Brak praw zapisu do folderu: {path}: {error}",
+  "Source and destination are the same file: {path}": "Źródło i cel to ten sam plik: {path}",
+  "Local or mounted folder": "Folder lokalny lub zamontowany",
+  "Folder path": "Ścieżka folderu",
+  "SFTP": "SFTP",
+  "Connected successfully": "Połączono pomyślnie",
+  "Trust Host Key and Retry": "Zaufaj kluczowi hosta i spróbuj ponownie",
+  "Choose Remote Folder": "Wybierz folder zdalny",
+  "Local path": "Ścieżka lokalna",
+  "Deployment path": "Ścieżka wdrażania",
+  "Web path": "Ścieżka sieciowa (web)",
+  "Use as Default": "Użyj jako domyślne",
+  "Mappings actions": "Akcje mapowań",
+  "No mappings: nothing is deployed": "Brak mapowań: nic nie zostało wdrożone",
+  "Local paths are relative to the project root or absolute inside it (empty: the whole project); deployment paths are relative to the server's root path.": "Ścieżki lokalne są względne wobec katalogu głównego projektu lub bezwzględne w nim (puste pole: cały projekt); ścieżki wdrażania są względne wobec ścieżki głównej serwera.",
+  "No excluded paths": "Brak wykluczonych ścieżek",
+  "Excluded remote paths": "Wykluczone ścieżki zdalne",
+  "Remote paths that are never uploaded to, downloaded from or deleted.": "Ścieżki zdalne, z których dane nigdy nie są przesyłane na serwer, pobierane ani usuwane.",
+  "Deployment servers actions": "Akcje serwerów wdrażania",
+  "No servers. Click + to add one.": "Brak serwerów. Kliknij +, aby dodać serwer.",
+  "Server settings": "Ustawienia serwera",
+  "Add an SFTP server to upload, download and synchronize project files.": "Dodaj serwer SFTP, aby przesyłać, pobierać i synchronizować pliki projektu.",
+  "Exclude items by name": "Wyklucz elementy według nazwy",
+  "Names or wildcards separated by “;”, e.g. .git;*.pyc. Matching files and folders are never transferred.": "Nazwy lub znaki wieloznaczne rozdzielone znakiem „;”, np. .git;*.pyc. Pasujące pliki i foldery nigdy nie zostaną przesłane.",
+  "Upload changed files automatically to the default server": "Automatycznie przesyłaj zmienione pliki na domyślny serwer",
+  "On explicit save action": "Przy jawnym wykonaniu akcji zapisu",
+  "Delete remote files when local are deleted": "Usuwaj pliki zdalne po usunięciu plików lokalnych",
+  "Preserve files timestamps": "Zachowaj znaczniki czasu plików",
+  "Upload to Default Server": "Prześlij na domyślny serwer",
+  "Upload to {server}": "Prześlij do {server}",
+  "Download from {server}": "Pobierz z {server}",
+  "Sync with Deployed to {server}…": "Synchronizuj z wdrożeniem na {server}…",
+  "Sync with Deployed to Default Server": "Synchronizuj z wdrożeniem na serwerze domyślnym",
+  "Compare local files with the default deployment server and synchronize them": "Porównaj pliki lokalne z domyślnym serwerem wdrażania i zsynchronizuj je",
+  "Upload the selected files and folders to the default deployment server": "Prześlij wybrane pliki i foldery na domyślny serwer wdrażania",
+  "Upload to…": "Prześlij do…",
+  "Upload the selected files and folders to a deployment server": "Prześlij wybrane pliki i foldery na serwer wdrażania",
+  "Download from Default Server": "Pobierz z domyślnego serwera",
+  "Replace the selected files and folders with their copies on the default deployment server": "Zastąp wybrane pliki i foldery ich kopiami z domyślnego serwera wdrażania",
+  "Download from…": "Pobierz z…",
+  "Replace the selected files and folders with their copies on a deployment server": "Zastąp wybrane pliki i foldery ich kopiami z serwera wdrażania",
+  "Sync with Deployed to…": "Synchronizuj z wdrożeniem na…",
+  "Compare local files with a deployment server and synchronize them": "Porównaj pliki lokalne z serwerem wdrażania i zsynchronizuj je",
+  "Delete from Server": "Usuń z serwera",
+  "Delete the remote copies of the selected files and folders on the default server": "Usuń zdalne kopie wybranych plików i folderów z domyślnego serwera",
+  "Automatic Upload": "Automatyczne przesyłanie",
+  "Upload changed files to the default server automatically": "Automatycznie przesyłaj zmienione pliki na domyślny serwer",
+  "Browse Remote Host": "Przeglądaj zdalny host",
+  "Show the files of a deployment server in the Remote Host tool window": "Pokaż pliki serwera wdrażania w oknie narzędziowym Zdalny host",
+  "Open in Browser (Deployed)": "Otwórz w przeglądarce (wdrożone)",
+  "Open the deployed URL of the file on the default server's web server": "Otwórz adres URL wdrożonego pliku na serwerze WWW serwera domyślnego",
+  "Deployment Configuration…": "Konfiguracja wdrażania…",
+  "Edit the deployment servers and options": "Edytuj serwery wdrażania i opcje",
+  "Configuration…": "Konfiguracja…",
+  "No deployment server configured": "Brak skonfigurowanego serwera wdrażania",
+  "Select files in the Project view or open a file in the editor": "Wybierz pliki w widoku Projektu lub otwórz plik w edytorze",
+  "Upload to": "Prześlij do",
+  "Download from": "Pobierz z",
+  "Sync with Deployed to": "Synchronizuj z wdrożeniem na",
+  "Skipped: {n}": "Pominięte: {n}",
+  "and {n} more": "i jeszcze {n}",
+  "Uploaded {n} files to {server}": "Przesłano {n} plików do {server}",
+  "Upload to {server} finished with errors": "Przesyłanie do {server} zakończyło się błędami",
+  "Downloaded {n} files from {server}": "Pobrano {n} plików z {server}",
+  "Download from {server} finished with errors": "Pobieranie z {server} zakończyło się błędami",
+  "Deleted {n} files from {server}": "Usunięto {n} plików z {server}",
+  "Delete from {server} finished with errors": "Usuwanie z {server} zakończyło się błędami",
+  "Synchronized {n} files with {server}": "Zsynchronizowano {n} plików z {server}",
+  "Sync with {server} finished with errors": "Synchronizacja z {server} zakończyła się błędami",
+  "Cannot upload to {server}": "Nie można przesłać danych do {server}",
+  "Cannot download from {server}": "Nie można pobrać danych z {server}",
+  "Cannot delete from {server}": "Nie można usunąć danych z {server}",
+  "Delete the remote copy of {name} from {server}?": "Usunąć zdalną kopię {name} z {server}?",
+  "Delete the remote copies of {n} items from {server}?": "Usunąć zdalne kopie {n} elementów z {server}?",
+  "No web server URL for this file": "Brak adresu URL serwera WWW dla tego pliku",
+  "This file is not mapped to the default server": "Ten plik nie jest zmapowany na domyślny serwer",
+  "Cannot open in browser": "Nie można otworzyć w przeglądarce",
+  "Cannot change automatic upload": "Nie można zmienić ustawienia automatycznego przesyłania",
+  "Remote Host": "Zdalny host",
+  "No deployment servers": "Brak serwerów wdrażania",
+  "Download to Project": "Pobierz do projektu",
+  "New Folder…": "Nowy folder…",
+  "Remote files": "Pliki zdalne",
+  "Empty folder": "Pusty folder",
+  "Deployment server": "Serwer wdrażania",
+  "Remote host actions": "Akcje zdalnego hosta",
+  "Enter a name": "Wprowadź nazwę",
+  "A name cannot contain “/”": "Nazwa nie może zawierać znaku „/”",
+  "Cannot create folder": "Nie można utworzyć folderu",
+  "Cannot delete {name}": "Nie można usunąć {name}",
+  "Delete folder “{path}” from the server?": "Usunąć folder “{path}” z serwera?",
+  "Delete file “{path}” from the server?": "Usunąć plik “{path}” z serwera?",
+  "Delete {n} items from the server?": "Usunąć {n} elementów z serwera?",
+  "Not mapped to a project path": "Brak mapowania na ścieżkę projektu",
+  "Unknown Host Key": "Nieznany klucz hosta",
+  "{n} of {total} files will change": "{n} z {total} plików ulegnie zmianie",
+  "Comparing local and remote files…": "Porównywanie plików lokalnych i zdalnych…",
+  "Files to synchronize": "Pliki do zsynchronizowania",
+  "Action": "Akcja",
+  "Synchronizing…": "Synchronizowanie…",
+  "Local only": "Tylko lokalnie",
+  "Remote only": "Tylko zdalnie",
+  "Local is newer": "Wersja lokalna jest nowsza",
+  "Remote is newer": "Wersja zdalna jest nowsza",
+  "Identical": "Identyczne",
+  "Upload": "Prześlij",
+  "Delete remote": "Usuń wersję zdalną",
+  "Delete local": "Usuń wersję lokalną",
+  "Remote Development": "Zdalne programowanie",
+  "The project runs on the remote host; the IDE backend is installed there on first use.": "Projekt jest uruchamiany na zdalnym hoście; zaplecze (backend) IDE instaluje się tam przy pierwszym użyciu.",
+  "SSH configuration:": "Konfiguracja SSH:",
+  "No SSH configurations": "Brak konfiguracji SSH",
+  "Project directory:": "Katalog projektu:",
+  "Remote Development…": "Zdalne programowanie…",
+  "Opens a project folder on an SSH host; the IDE backend runs on that host.": "Otwiera folder projektu na hoście SSH; zaplecze IDE działa na tym hoście.",
+  "Disconnect from Remote Host": "Rozłącz ze zdalnym hostem",
+  "Reload Environment": "Przeładuj środowisko",
+  "Reads the login shell's environment (and devcontainer.json remoteEnv on a remote host) again for new terminals and processes.": "Odczytuje ponownie środowisko powłoki logowania (oraz zmienną remoteEnv z devcontainer.json na zdalnym hoście) dla nowych terminali i procesów.",
+  "No variables changed.": "Żadna zmienna nie uległa zmianie.",
+  "Changed: {names} and {more} more.": "Zmieniono: {names} oraz {more} innych.",
+  "Changed: {names}.": "Zmieniono: {names}.",
+  "Terminals and processes already running keep their old environment; new ones get the new one.": "Już uruchomione terminale i procesy zachowują dotychczasowe środowisko; nowe otrzymają zaktualizowane.",
+  "Restart Language Servers": "Uruchom ponownie serwery językowe",
+  "Could not reload the environment": "Nie udało się przeładować środowiska",
+  "Environment reloaded": "Środowisko przeładowane",
+  "devcontainer.json was not applied": "Nie zastosowano pliku devcontainer.json",
+  "postStartCommand failed": "Polecenie postStartCommand nie powiodło się",
+  "Opens a terminal tab connected to an SSH configuration (`arg`: its id; otherwise a chooser).": "Otwiera kartę terminala połączoną z konfiguracją SSH (`arg`: jej identyfikator; w przeciwnym razie okno wyboru).",
+  "Connecting to the host…": "Łączenie z hostem…",
+  "Checking the IDE backend on the host…": "Sprawdzanie zaplecza IDE na hoście…",
+  "Downloading the IDE backend…": "Pobieranie zaplecza IDE…",
+  "Installing the IDE backend on the host…": "Instalowanie zaplecza IDE na hoście…",
+  "Starting the IDE backend…": "Uruchamianie zaplecza IDE…",
+  "Opening the project…": "Otwieranie projektu…",
+  "Cannot load agent tasks": "Nie można wczytać zadań agenta",
+  "Opening {name}…": "Otwieranie {name}…",
+  "Copy Code": "Kopiuj kod",
+  "Quote": "Cytuj",
+  "Find in Conversation": "Znajdź w rozmowie",
+  "Find in conversation": "Znajdź w rozmowie",
+  "0 results": "0 wyników",
+  "Time the agent took to answer": "Czas odpowiedzi agenta",
+  "Time the agent spent on this task": "Czas spędzony przez agenta nad tym zadaniem",
+  "Send Again": "Wyślij ponownie",
+  "Customize IDE appearance and behavior: change themes and font size, configure system settings and notifications.": "Dostosuj wygląd i zachowanie IDE: zmieniaj motywy i rozmiary czcionek, konfiguruj ustawienia systemowe i powiadomienia.",
+  "Configure code editing: completion, folding, tabs, fonts, colors, code style and inspections.": "Konfiguruj edycję kodu: automatyczne uzupełnianie, zwijanie kodu, karty, czcionki, kolory, styl kodu oraz inspekcje.",
+  "Configure build tools, run configurations, debugger and deployment.": "Konfiguruj narzędzia budowania, konfiguracje uruchamiania, debuger i wdrażanie.",
+  "Configure language servers, interpreters, SDKs and framework support.": "Konfiguruj serwery językowe, interpretatory, zestawy SDK oraz obsługę frameworków.",
+  "Configure external tools, terminal, database and other integrations.": "Konfiguruj narzędzia zewnętrzne, terminal, bazę danych i inne integracje.",
+  "Unversioned Files": "Pliki nieobjęte kontrolą wersji",
+  "Merge Conflicts": "Konflikty scalania",
+  "current": "aktualny",
+  "No matching repositories or branches": "Brak pasujących repozytoriów lub gałęzi",
+  "partial": "częściowy",
+  "editable": "edytowalny",
+  "on {date}": "dnia {date}",
+  "renamed from {name}": "zmieniono nazwę z {name}",
+  "Label '{label}'": "Etykieta '{label}'",
+  "{n} file recorded before it": "{n} plik zarejestrowany przed nim",
+  "{n} files recorded before it": "{n} plików zarejestrowanych przed nim",
+  "No local history for this folder yet": "Brak jeszcze historii lokalnej dla tego folderu",
+  "No local history for this path yet": "Brak jeszcze historii lokalnej dla tej ścieżki",
+  "{name} has been resolved and staged.": "Konflikt w {name} został rozwiązany i plik został dodany do poczekalni (staged).",
+  "{selected} of {total} file will be reverted to their last committed state. Uncommitted changes are lost.": "{selected} z {total} pliku zostanie przywrócony do ostatnio zatwierdzonego stanu. Niezatwierdzone zmiany zostaną utracone.",
+  "{selected} of {total} files will be reverted to their last committed state. Uncommitted changes are lost.": "{selected} z {total} plików zostanie przywróconych do ostatnio zatwierdzonego stanu. Niezatwierdzone zmiany zostaną utracone.",
+  "Current branch: {branch}": "Bieżąca gałąź: {branch}",
+  "{count} TODO item found in the changed lines:": "Znaleziono element TODO ({count}) w zmienionych wierszach:",
+  "{count} TODO items found in the changed lines:": "Znaleziono elementy TODO ({count}) w zmienionych wierszach:",
+  "{count} file ({names}) contain CRLF line separators and core.autocrlf is not set, so they would be committed with CRLF. Convert them with the line separator widget in the status bar, or set": "{count} plik ({names}) zawiera znaki końca linii CRLF, a parametr core.autocrlf nie jest ustawiony, więc zostanie zatwierdzony ze znakami CRLF. Skonwertuj go za pomocą widżetu znaku końca linii na pasku stanu lub ustaw opcję",
+  "{count} files ({names}) contain CRLF line separators and core.autocrlf is not set, so they would be committed with CRLF. Convert them with the line separator widget in the status bar, or set": "Pliki w liczbie {count} ({names}) zawierają znaki końca linii CRLF, a parametr core.autocrlf nie jest ustawiony, więc zostaną zatwierdzone ze znakami CRLF. Skonwertuj je za pomocą widżetu znaku końca linii na pasku stanu lub ustaw opcję",
+  "Optional; creates an annotated tag": "Opcjonalnie; tworzy tag opisowy (annotated)",
+  "{count} file will be merged; conflicts open in the merge tool": "{count} plik zostanie scalony; konflikty zostaną otwarte w narzędziu do scalania",
+  "{count} files will be merged; conflicts open in the merge tool": "Pliki w liczbie {count} zostaną scalone; konflikty zostaną otwarte w narzędziu do scalania",
+  "{selected} of {total} file will be shelved and reverted in the working tree.": "{selected} z {total} pliku zostanie odłożony na półkę (shelved) i cofnięty w drzewie roboczym.",
+  "{selected} of {total} files will be shelved and reverted in the working tree.": "{selected} z {total} plików zostanie odłożonych na półkę (shelved) i cofniętych w drzewie roboczym.",
+  "tokens": "tokeny",
+  "{count} occurrences · {lines} lines": "Liczba wystąpień: {count} · wiersze: {lines}",
+  "{tokens} tokens": "Tokeny: {tokens}",
+  "— no callers found": "— nie znaleziono elementów wywołujących",
+  "— no callees found": "— nie znaleziono elementów wywoływanych",
+  "— no supertypes found": "— nie znaleziono nadtypów",
+  "— no subtypes found": "— nie znaleziono podtypów",
+  "({calls} calls)": "(wywołania: {calls})",
+  "Usages of {symbol}": "Użycia elementu {symbol}",
+  "{shown} of {total} found": "Wyświetlono {shown} z {total} znalezionych",
+  "{total} found": "Znaleziono: {total}",
+  "Nothing matches '{filter}'": "Brak elementów pasujących do '{filter}'",
+  "{shown} of {rowCount} rows": "Wyświetlono {shown} z {rowCount} wierszy",
+  "Local filter": "Filtr lokalny",
+  "Rename {what} '{initial}' to:": "Zmień nazwę {what} '{initial}' na:",
+  "Drop {kind}": "Odrzuć {kind}",
+  "{count} row": "{count} wiersz",
+  "(limit reached)": "(osiągnięto limit)",
+  "Reached from the SSH host {label}.": "Uzyskano dostęp ze zdalnego hosta SSH {label}.",
+  "table": "tabela",
+  "view": "widok",
+  "materialized view": "widok zmaterializowany",
+  "column": "kolumna",
+  "index": "indeks",
+  "schema": "schemat",
+  "function": "funkcja",
+  "procedure": "procedura",
+  "trigger": "wyzwalacz",
+  "sequence": "sekwencja",
+  "data source": "źródło danych",
+  "{count} library frames hidden": "Ukryto klatki biblioteki w liczbie: {count}",
+  "unverified": "niezweryfikowany",
+  "temp": "tymczasowy",
+  "Watching {dataId}": "Obserwowanie {dataId}",
+  "No attachable processes match the filter.": "Brak procesów z możliwością podłączenia pasujących do filtra.",
+  "No attachable processes.": "Brak procesów z możliwością podłączenia.",
+  "{failed} failing": "Z błędami: {failed}",
+  "Sending request #{n}…": "Wysyłanie żądania #{n}…",
+  "Memory & Diagnostics": "Pamięć i diagnostyka",
+  "Over budget ({budget})": "Przekroczono limit ({budget})",
+  "dev": "deweloperski",
+  "Zoomed into {name}": "Powiększono obszar {name}",
+  "Rename directory '{current}' and its usages to:": "Zmień nazwę katalogu '{current}' i jego użyć na:",
+  "Rename file '{current}' and its usages to:": "Zmień nazwę pliku '{current}' i jego użyć na:",
+  "{count} occurrence": "{count} wystąpienie",
+  "{count} occurrences": "Liczba wystąpień: {count}",
+  "References to update: {a} in {b}": "Odnośniki do aktualizacji: {a} w {b}",
+  "Save '{name}' Configuration": "Zapisz konfigurację '{name}'",
+  "test": "test",
+  "user": "użytkownik",
+  "temporary": "tymczasowy",
+  "<{count} internal line>": "<{count} linia wewnętrzna>",
+  "<{count} internal lines>": "<Liczba linii wewnętrznych: {count}>",
+  "{count} earlier lines were discarded": "Odrzucono wcześniejsze linie w liczbie: {count}",
+  "{count} passed": "Zaliczone: {count}",
+  "{count} ignored": "Pominięte: {count}",
+  "Running…": "Wykonywanie…",
+  "No tests": "Brak testów",
+  "Replacing… {done}/{total} files": "Zastępowanie… pliki: {done}/{total}",
+  "changed": "zmieniono",
+  "Start Docker (context '{context}'); this view connects automatically.": "Uruchom Docker (kontekst '{context}'); ten widok połączy się automatycznie.",
+  "Start Docker; this view connects automatically.": "Uruchom Docker; ten widok połączy się automatycznie.",
+  "Could not save: {error}": "Nie udało się zapisać: {error}",
+  "{count} modified action": "{count} zmodyfikowana akcja",
+  "{count} modified actions": "Zmodyfikowane akcje: {count}",
+  "{vendor} {version} is unpacked into a folder of its own in {location}, where JDK detection finds it.": "Wersja {vendor} {version} zostaje rozpakowana do własnego folderu w {location}, gdzie zostanie wykryta przez mechanizm wykrywania JDK.",
+  "detected from {source}": "wykryto na podstawie {source}",
+  "modified": "zmodyfikowano",
+  "seconds": "sekund",
+  "columns": "kolumny",
+  "Defaults from the {lang} language definition: tab.": "Wartości domyślne z definicji języka {lang}: tabulacja.",
+  "Defaults from the {lang} language definition: {size} spaces.": "Wartości domyślne z definicji języka {lang}: spacje w liczbie {size}.",
+  "Follows the IDE theme: currently {name}.": "Podąża za motywem IDE: obecnie {name}.",
+  "<Project>": "<Projekt>",
+  "<none>": "<none>",
+  "Invalid pattern: {patterns}": "Nieprawidłowy wzorzec: {patterns}",
+  "Matches of an Issue ID regular expression in commit messages (Git log, commit details) become links; $0 is the whole match, $1… the groups.": "Dopasowania wyrażenia regularnego identyfikatora zgłoszenia (Issue ID) w opisach zatwierdzeń (dziennik Git, szczegóły zatwierdzenia) stają się odnośnikami; $0 oznacza całe dopasowanie, $1… grupy.",
+  "Abbreviation for <{tag}>, e.g.": "Skrót dla <{tag}>, np.",
+  "caret,": "kursor,",
+  "{count} item": "{count} element",
+  "Language servers and debug adapters used by the IDE. Missing tools can be installed into the IDE's own tools folder; nothing is downloaded until you click Install.": "Serwery językowe i adaptery debugowania używane przez IDE. Brakujące narzędzia można zainstalować w wewnętrznym folderze narzędzi IDE; nic nie zostanie pobrane do momentu kliknięcia Zainstaluj.",
+  "Large file": "Duży plik",
+  "Binary file": "Plik binarny",
+  "read-only": "tylko do odczytu",
+  "Offset 0x{hex} ({offset})": "Przesunięcie 0x{hex} ({offset})",
+  "Cannot read the file: {error}": "Nie można odczytać pliku: {error}",
+  "Cannot show the image: {error}": "Nie można wyświetlić obrazu: {error}",
+  "HTML preview": "Podgląd HTML",
+  "Open a folder from disk or clone a repository from version control.": "Otwórz folder z dysku lub sklonuj repozytorium z systemu kontroli wersji.",
+  "Open a folder from disk.": "Otwórz folder z dysku.",
+  "No bookmarks yet. Toggle a line bookmark with {key}": "Brak zakładek. Przełącz zakładkę linii za pomocą {key}",
+  "Use Find in Files ({key}) and choose “Open in Find Window”.": "Użyj opcji Szukaj w plikach ({key}) i wybierz „Otwórz w oknie wyszukiwania”.",
+  "Build message": "Komunikat budowania",
+  "Ignored lines": "Ignorowane wiersze",
+  "Open in browser": "Otwórz w przeglądarce",
+  "Plan node properties": "Właściwości węzła planu",
+  "Values": "Wartości",
+  "Vim rc file": "Plik konfiguracji Vim rc",
+  "Breakpoints are not supported in output classes without source code.": "Punkty przerwania nie są obsługiwane w klasach wyjściowych bez kodu źródłowego.",
+  "Decompiled .class file: sources are not available.": "Zdekompilowany plik .class: kody źródłowe są niedostępne.",
+  "No column of the file matches the table": "Żadna kolumna pliku nie odpowiada tabeli",
+  "Not a URL of PostgreSQL, MySQL, SQLite or a compatible database": "To nie jest prawidłowy adres URL bazy danych PostgreSQL, MySQL, SQLite ani kompatybilnej",
+  "The Database tree shows only the checked names and patterns (* and ?); the connected database always shows.": "Drzewo bazy danych wyświetla tylko zaznaczone nazwy i wzorce (* oraz ?); połączona baza danych jest zawsze widoczna.",
+  "Save the data source to pick from the server's names; patterns (* and ?) work any time.": "Zapisz źródło danych, aby wybrać z nazw serwera; wzorce (* oraz ?) działają w dowolnym momencie.",
+  "Read-only data source.": "Źródło danych tylko do odczytu.",
+  "Use the query console to change ClickHouse data.": "Użyj konsoli zapytań, aby modyfikować dane ClickHouse.",
+  "Read-only: the table has no primary key to identify rows.": "Tylko do odczytu: tabela nie posiada klucza głównego do identyfikacji wierszy.",
+  "The session has finished.": "Sesja została zakończona.",
+  "Variables are available while suspended.": "Zmienne są dostępne w stanie wstrzymania.",
+  "Verified": "Zweryfikowano",
+  "Press Enter to evaluate": "Naciśnij Enter, aby obliczyć wartość",
+  "Evaluation is available while the program is suspended": "Obliczanie wartości jest dostępne, gdy program jest wstrzymany",
+  "unknown type": "nieznany typ",
+  "Dev plugin loaded": "Wtyczka deweloperska została załadowana",
+  "WebAssembly component (sandboxed)": "Komponent WebAssembly (w piaskownicy)",
+  "None — contributions only": "Brak — tylko wkład (contributions)",
+  "Dark": "Ciemny",
+  "Light": "Jasny",
+  "No plugins installed.": "Brak zainstalowanych wtyczek.",
+  "No plugins match.": "Brak pasujących wtyczek.",
+  "No local plugin packages.": "Brak lokalnych pakietów wtyczek.",
+  "Waiting for test results…": "Oczekiwanie na wyniki testów…",
+  "No test results": "Brak wyników testów",
+  "Passed tests are hidden": "Zaliczone testy zostały ukryte",
+  "Search failed": "Wyszukiwanie nie powiodło się",
+  "No edited files": "Brak edytowanych plików",
+  "No matching files": "Brak pasujących plików",
+  "No recent files": "Brak ostatnich plików",
+  "Recently Changed Locations": "Ostatnio zmienione lokalizacje",
+  "No changed locations": "Brak zmienionych lokalizacji",
+  "No recent locations": "Brak ostatnich lokalizacji",
+  "Open a file first": "Najpierw otwórz plik",
+  "1 detected folder is unmarked.": "1 Wykryty folder nie jest zaznaczony.",
+  "No packages match": "Brak pasujących pakietów",
+  "No packages installed": "Brak zainstalowanych pakietów",
+  "Installing": "Instalowanie",
+  "Upgrading": "Aktualizowanie",
+  "Uninstalling": "Odinstalowywanie",
+  "Contents are identical": "Zawartość jest identyczna",
+  "working copy": "kopia robocza",
+  "No commits match the filters": "Brak zatwierdzeń pasujących do filtrów",
+  "No commits yet": "Brak zatwierdzeń",
+  " · commit to conclude": " · zatwierdź (commit), aby zakończyć",
+  "Abort": "Przerwij",
+  "The current branch has no tracked branch; git pull may fail.": "Bieżąca gałąź nie ma gałęzi śledzonej; polecenie git pull może zakończyć się niepowodzeniem.",
+  "HEAD is detached; check out a branch to push.": "Wskaźnik HEAD jest odłączony; przełącz się na gałąź, aby wykonać push.",
+  "No shelved changes": "Brak odłożonych zmian (shelved)",
+  "No recent projects": "Brak ostatnich projektów",
+  "Current position {line}:{col}": "Bieżąca pozycja: {line}:{col}",
+  "{count} detected folders are unmarked.": "Wykryte foldery w liczbie {count} nie zostały zaznaczone.",
+  "Rebase commits of {head} not on:": "Wykonaj rebase zatwierdzeń {head} nieobecnych w:",
+  "{head} has no upstream: commits up to {revision} will be pushed as a new branch:": "Gałąź {head} nie ma ustawionego repozytorium nadrzędnego (upstream): zatwierdzenia do wersji {revision} zostaną wysłane jako nowa gałąź:",
+  "{head} has no upstream: it will be pushed as a new branch and tracked:": "Gałąź {head} nie ma ustawionego repozytorium nadrzędnego (upstream): zostanie wysłana jako nowa gałąź i ustawiona jako śledzona:",
+  "{count} excluded": "Wykluczone: {count}",
+  "{count} file with conflicts": "{count} plik z konfliktami",
+  "{count} files with conflicts": "Pliki w liczbie {count} zawierają konflikty",
+  "Clear {label} filter": "Wyczyść filtr {label}",
+  "in {count} commits": "w zatwierdzeniach ({count})",
+  "Callers": "Elementy wywołujące",
+  "Callees": "Elementy wywoływane",
+  "Supertypes": "Nadtypy",
+  "Subtypes": "Podtypy",
+  "Callers of {name}": "Elementy wywołujące {name}",
+  "Callees of {name}": "Elementy wywoływane przez {name}",
+  "Supertypes of {name}": "Nadtypy dla {name}",
+  "Subtypes of {name}": "Podtypy dla {name}",
+  "Changes requested": "Zażądano zmian",
+  "Review required": "Wymagany przegląd (review)",
+  "requested changes": "zażądał(a) zmian",
+  "{n} minute ago": "{n} minutę temu",
+  "{n} minutes ago": "{n} minut temu",
+  "just now": "przed chwilą",
+  "No symbols": "Brak symboli",
+  "{behind} incoming, {ahead} outgoing commits": "Zatwierdzenia: przychodzące {behind}, wychodzące {ahead}",
+  "{behind} incoming commits": "Zatwierdzenia przychodzące: {behind}",
+  "{ahead} outgoing commits": "Zatwierdzenia wychodzące: {ahead}",
+  "Repository: {repo}": "Repozytorium: {repo}",
+  "Git branch: {head}": "Gałąź Git: {head}",
+  "Tracking {upstream}": "Śledzenie {upstream}",
+  "In all {count} repositories": "We wszystkich repozytoriach ({count})",
+  "{current} of {count} differences": "Różnica {current} z {count}",
+  "{count} difference": "{count} różnica",
+  "{count} differences": "Liczba różnic: {count}",
+  "Cloning…": "Klonowanie…",
+  "locked": "zablokowany",
+  "prunable": "do usunięcia (prunable)",
+  "Rebasing": "Wykonywanie rebase",
+  "Merging": "Scalanie",
+  "Cherry-picking": "Wykonywanie cherry-pick",
+  "Reverting": "Cofanie (revert)",
+  "Applying patches": "Stosowanie łatek",
+  "Rebasing {head}": "Wykonywanie rebase {head}",
+  "Merging {head}": "Scalanie {head}",
+  "Cherry-picking {head}": "Wykonywanie cherry-pick {head}",
+  "Reverting {head}": "Cofanie {head}",
+  "Applying patches to {head}": "Stosowanie łatek do {head}",
+  "Rebase in progress": "Rebase w trakcie wykonywania",
+  "Merge in progress": "Scalanie w trakcie wykonywania",
+  "Cherry-pick in progress": "Cherry-pick w trakcie wykonywania",
+  "Revert in progress": "Cofanie (revert) w trakcie wykonywania",
+  "Patch application in progress": "Stosowanie łatek w trakcie wykonywania",
+  "{conflicts} conflict": "{conflicts} konflikt",
+  "{conflicts} conflicts": "Liczba konfliktów: {conflicts}",
+  "Continuing rebase": "Kontynuowanie rebase",
+  "Continuing merge": "Kontynuowanie scalania",
+  "Continuing cherry-pick": "Kontynuowanie cherry-pick",
+  "Continuing revert": "Kontynuowanie cofania (revert)",
+  "Continuing patch application": "Kontynuowanie stosowania łatek",
+  "Skipping commit": "Pomijanie zatwierdzenia",
+  "Aborting rebase": "Przerwanie rebase",
+  "Aborting merge": "Przerwanie scalania",
+  "Aborting cherry-pick": "Przerwanie cherry-pick",
+  "Aborting revert": "Przerwanie cofania (revert)",
+  "Aborting patch application": "Przerwanie stosowania łatek",
+  "Rebase continued": "Wznowiono rebase",
+  "Merge continued": "Wznowiono scalanie",
+  "Cherry-pick continued": "Wznowiono cherry-pick",
+  "Revert continued": "Wznowiono cofanie (revert)",
+  "Patch application continued": "Wznowiono stosowanie łatek",
+  "Commit skipped": "Pominięto zatwierdzenie",
+  "Rebase aborted": "Przerwano rebase",
+  "Merge aborted": "Przerwano scalanie",
+  "Cherry-pick aborted": "Przerwano cherry-pick",
+  "Revert aborted": "Przerwano cofanie (revert)",
+  "Patch application aborted": "Przerwano stosowanie łatek",
+  "Rebase failed": "Rebase nie powiódł się",
+  "Cherry-pick failed": "Cherry-pick nie powiódł się",
+  "Revert failed": "Cofanie (revert) nie powiodło się",
+  "Reset failed": "Resetowanie nie powiodło się",
+  "Rebase stopped for editing; continue the rebase when done": "Operację rebase zatrzymano w celu edycji; kontynuuj rebase po zakończeniu",
+  "Cherry-picked {label}": "Wykonano cherry-pick dla {label}",
+  "Reverted {label}": "Wykonano revert dla {label}",
+  "Reset {head} to {rev} ({mode})": "Zresetuj {head} do {rev} ({mode})",
+  "Resetting": "Resetowanie",
+  "Fetching": "Pobieranie (fetch)",
+  "Updating project": "Aktualizacja projektu",
+  "Pulling": "Pobieranie (pull)",
+  "Pushing": "Wysyłanie (push)",
+  "Deleting remote branch": "Usuwanie zdalnej gałęzi",
+  "Updating branch": "Aktualizowanie gałęzi",
+  "Delete remote branch": "Usuń zdalną gałąź",
+  "binary": "binarny",
+  "Common Local Branches": "Wspólne gałęzie lokalne",
+  "Common Remote Branches": "Wspólne gałęzie zdalne",
+  "Recent Branches in {name}": "Ostatnie gałęzie w {name}",
+  "Local Branches in {name}": "Gałęzie lokalne w {name}",
+  "Remote Branches in {name}": "Gałęzie zdalne w {name}",
+  "Tags in {name}": "Tagi w {name}",
+  "Moments ago": "Przed chwilą",
+  "{min} min ago": "{min} min temu",
+  "Today {time}": "Dzisiaj o {time}",
+  "Yesterday {time}": "Wczoraj o {time}",
+  "Added lines": "Dodane wiersze",
+  "Deleted lines": "Usunięte wiersze",
+  "Added": "Dodano",
+  "Renamed": "Zmieniono nazwę",
+  "Unversioned": "Nieobjęte kontrolą wersji",
+  "Merge conflict": "Konflikt scalania",
+  "Automatic": "Automatycznie",
+  "Custom combination": "Kombinacja niestandardowa",
+  "Language server for {languages}": "Serwer językowy dla {languages}",
+  "Only one of these runs at a time. Automatic uses the first one available: {order}.": "Tylko jeden z nich działa w danym momencie. Tryb automatyczny korzysta z pierwszego dostępnego: {order}.",
+  "Configure the settings related to version control used in your project": "Konfiguruj ustawienia związane z systemem kontroli wersji używanym w projekcie",
+  "Use non-modal commit interface": "Użyj niemodalnego interfejsu zatwierdzania (commit)",
+  "When off, Local Changes and Stash are tabs of the Git tool window and Commit opens a dialog.": "Gdy wyłączone, Zmiany lokalne i Schowek (Stash) są kartami w oknie narzędziowym Git, a Zatwierdzenie (Commit) otwiera okno dialogowe.",
+  "Clear initial commit message": "Wyczyść wstępną wiadomość zatwierdzenia",
+  "Show options before Update": "Pokaż opcje przed aktualizacją",
+  "Ask for confirmation to drop commits": "Pytaj o potwierdzenie przed odrzuceniem zatwierdzeń",
+  "Applicable to Git": "Dotyczy systemu Git",
+  "Highlight directories that contain modified files in the Project tree": "Wyróżniaj katalogi zawierające zmodyfikowane pliki w drzewie projektu",
+  "When patch is created": "Po utworzeniu łatki",
+  "Warn when committing files larger than": "Ostrzegaj przy zatwierdzaniu plików większych niż",
+  "Warn when committing files with names that might cause issues on other systems": "Ostrzegaj przy zatwierdzaniu plików z nazwami, które mogą powodować problemy w innych systemach",
+  "Show Push dialog for Commit and Push": "Pokaż okno dialogowe Wysyłania (Push) podczas zatwierdzania i wysyłania (Commit and Push)",
+  "Show Push dialog only when committing to protected branches": "Pokaż okno dialogowe Wysyłania tylko przy zatwierdzaniu do chronionych gałęzi",
+  "Combine stashes and shelves in one tab": "Połącz schowki (stashes) i półki (shelves) na jednej karcie",
+  "Patch file created successfully. Show it in Finder?": "Plik łatki utworzono pomyślnie. Wyświetlić w programie Finder?",
+  "File names": "Nazwy plików",
+  "Large files": "Duże pliki",
+  "Some files use reserved names that are not allowed on Windows: '{name}'. If you commit, it will not be possible to check out the Git repository on Windows.": "Niektóre pliki używają nazw zastrzeżonych, niedozwolonych w systemie Windows: '{name}'. Jeśli je zatwierdzisz, pobranie (checkout) repozytorium Git na systemie Windows nie będzie możliwe.",
+  "Some of the file names contain characters that are not allowed on Windows: '{name}'. If you commit, it might not be possible to check out the Git repository on Windows.": "Niektóre nazwy plików zawierają znaki niedozwolone w systemie Windows: '{name}'. Jeśli je zatwierdzisz, pobranie (checkout) repozytorium Git na systemie Windows może okazać się niemożliwe.",
+  "You are about to commit a large file into the repository: {name} ({size} MB). It is not recommended to store large files in a Git repository. Consider using Git LFS.": "Zamierzasz zatwierdzić duży plik w repozytorium: {name} ({size} MB). Przechowywanie dużych plików w repozytorium Git nie jest zalecane. Rozważ użycie Git LFS.",
+  "You are about to commit {count} large files into the repository with the total size of {size} MB. It is not recommended to store large files in a Git repository. Consider using Git LFS.": "Zamierzasz zatwierdzić duże pliki ({count}) w repozytorium o łącznym rozmiarze {size} MB. Przechowywanie dużych plików w repozytorium Git nie jest zalecane. Rozważ użycie Git LFS.",
+  "Hide Branches": "Ukryj gałęzie",
+  "Show Branches": "Pokaż gałęzie",
+  "Update Selected": "Zaktualizuj zaznaczone",
+  "Navigate Log to Selected Branch": "Przejdź w dzienniku do wybranej gałęzi",
+  "Branch or tag": "Gałąź lub tag",
+  "Filter branches and tags": "Filtruj gałęzie i tagi",
+  "Revert Selected Changes": "Cofnij wybrane zmiany",
+  "Show only the first reference": "Pokaż tylko pierwszy odnośnik",
+  "Show tag names": "Pokaż nazwy tagów",
+  "Show commit time rather than author time": "Pokaż czas zatwierdzenia zamiast czasu autora",
+  "Show references on the left": "Pokaż odnośniki po lewej stronie",
+  "Visible columns": "Widoczne kolumny",
+  "Visible columns:": "Widoczne kolumny:",
+  "Get from Revision": "Pobierz z wersji",
+  "Replace '{path}' with its content from the revision? Local changes to it are lost.": "Zastąpić '{path}' zawartością z tej wersji? Lokalne zmiany w tym pliku zostaną utracone.",
+  "Replace {length} files with their content from the revision? Local changes to them are lost.": "Zastąpić pliki w liczbie {length} ich zawartością z tej wersji? Lokalne zmiany w nich zostaną utracone.",
+  "Get": "Pobierz",
+  "Got 1 file from revision": "Pobrano 1 plik z wersji",
+  "Got {n} files from revision": "Pobrano {n} plików z wersji",
+  "Nothing to revert": "Brak zmian do cofnięcia",
+  "Mark/Unmark As Favorite": "Oznacz/Odznacz jako ulubione",
+  "Compare Before with Local": "Porównaj poprzednią z wersją lokalną",
+  "Group by Directory": "Grupuj według katalogów",
+  "Stashes and Shelves": "Schowki (stashes) i półki (shelves)",
+  "History: {name}": "Historia: {name}",
+  "Log: {name}": "Dziennik: {name}",
+  "Commit Changes": "Zatwierdź zmiany (commit)",
+  "Group by Prefix": "Grupuj według przedrostka",
+  "Show Recent Branches": "Pokaż ostatnie gałęzie",
+  "Show Tags": "Pokaż tagi",
+  "Branches Popup Options": "Opcje menu gałęzi",
+  "Pull into '{cur}' Using Rebase": "Pobierz (pull) do '{cur}' używając rebase",
+  "Pull into '{cur}' Using Merge": "Pobierz (pull) do '{cur}' używając scalania (merge)",
+  "No problems at the caret": "Brak problemów w miejscu kursora",
+  "Error Description": "Opis błędu",
+  "Next Highlighted Usage": "Następne wyróżnione użycie",
+  "Previous Highlighted Usage": "Poprzednie wyróżnione użycie",
+  "Move Caret to Code Block Start with Selection": "Przesuń kursor na początek bloku kodu z zaznaczeniem",
+  "Move Caret to Code Block End with Selection": "Przesuń kursor na koniec bloku kodu z zaznaczeniem",
+  "Auto-Indent Lines": "Automatycznie stosuj wcięcia w wierszach",
+  "Stretch to Left": "Rozciągnij w lewo",
+  "Stretch to Right": "Rozciągnij w prawo",
+  "Stretch to Top": "Rozciągnij w górę",
+  "Stretch to Bottom": "Rozciągnij w dół",
+  "Copy File…": "Kopiuj plik…",
+  "Copy Directory…": "Kopiuj katalog…",
+  "Copy…": "Kopiuj…",
+  "Fold Code Block": "Zwiń blok kodu",
+  "Go to Next Splitter": "Przejdź do następnego podziału",
+  "Go to Previous Splitter": "Przejdź do poprzedniego podziału",
+  "File Path": "Ścieżka do pliku",
+  "Cannot reveal in {fileManager}": "Nie można pokazać w programie {fileManager}",
+  "Surround with Live Template": "Otocz szablonem na żywo",
+  "Surround with Live Template…": "Otocz szablonem na żywo…",
+  "Quick Evaluate Expression": "Szybkie obliczenie wartości wyrażenia",
+  "Nothing to evaluate at the caret": "Brak elementów do obliczenia wartości w miejscu kursora",
+  "Choose a run/debug configuration and debug it": "Wybierz konfigurację uruchamiania/debugowania i rozpocznij debugowanie",
+  "Inspect Current File": "Sprawdź bieżący plik",
+  "No custom folding regions in this file": "Brak niestandardowych obszarów zwijania w tym pliku",
+  "Custom Folding Regions": "Niestandardowe obszary zwijania",
+  "(no description)": "(brak opisu)",
+  "Custom Folding…": "Niestandardowe zwijanie…",
+  "Move Element Left": "Przesuń element w lewo",
+  "Move Element Right": "Przesuń element w prawo",
+  "Stop Background Processes…": "Zatrzymaj procesy w tle…",
+  "No background processes to stop": "Brak procesów w tle do zatrzymania",
+  "Expand to Level 1": "Rozwiń do poziomu 1",
+  "Expand All to Level 1": "Rozwiń wszystko do poziomu 1",
+  "Expand to Level 2": "Rozwiń do poziomu 2",
+  "Expand All to Level 2": "Rozwiń wszystko do poziomu 2",
+  "Expand to Level 3": "Rozwiń do poziomu 3",
+  "Expand All to Level 3": "Rozwiń wszystko do poziomu 3",
+  "Expand to Level 4": "Rozwiń do poziomu 4",
+  "Expand All to Level 4": "Rozwiń wszystko do poziomu 4",
+  "Expand to Level 5": "Rozwiń do poziomu 5",
+  "Expand All to Level 5": "Rozwiń wszystko do poziomu 5",
+  "Surround with Callable": "Otocz strukturą Callable",
+  "Surround with ReadWriteLock.readLock": "Otocz blakiem ReadWriteLock.readLock",
+  "Surround with ReadWriteLock.writeLock": "Otocz blakiem ReadWriteLock.writeLock",
+  "Iterate Iterable or array": "Iteruj po interfejsie Iterable lub tablicy",
+  "No live templates to surround with": "Brak szablonów na żywo do otoczenia kodu",
+  "Sort by Name": "Sortuj według nazwy",
+  "Sort by Type": "Sortuj według typu",
+  "Sort by Modification Time": "Sortuj według czasu modyfikacji",
+  "Add Mouse Shortcut": "Dodaj skrót myszy",
+  "Click here with Ctrl, Alt or Command held, or use a mouse side button": "Kliknij tutaj przytrzymując Ctrl, Alt lub Command albo użyj bocznego przycisku myszy",
+  "Mouse shortcut": "Skrót myszy",
+  "Mouse Shortcut: {action}": "Skrót myszy: {action}",
+  "Accept Left Side": "Zaakceptuj lewą stronę",
+  "Accept Right Side": "Zaakceptuj prawą stronę",
+  "Copies the change at the caret from the left side to the right one": "Kopiuje zmianę przy kursorze z lewej strony na prawą",
+  "Copies the change at the caret from the right side to the left one": "Kopiuje zmianę przy kursorze z prawej strony na lewą",
+  "Compare Next File": "Porównaj następny plik",
+  "Compare Previous File": "Porównaj poprzedni plik",
+  "Context Info": "Informacje o kontekście",
+  "No context information here": "Brak informacji o kontekście w tym miejscu",
+  "Diff Settings": "Ustawienia porównywania (diff)",
+  "Viewer": "Przeglądarka",
+  "Ignore Whitespace": "Ignoruj białe znaki",
+  "Browse Console History": "Przeglądaj historię konsoli",
+  "Focus the debug console input first": "Najpierw ustaw fokus na polu wprowadzania konsoli debugowania",
+  "No history": "Brak historii",
+  "More Agents…": "Więcej agentów…",
+  "More agents…": "Więcej agentów…",
+  "Opens Settings › Build, Execution, Deployment › Maven": "Otwiera Ustawienia › Budowanie, wykonanie, wdrożenie › Maven",
+  "Opens Settings › Tools › Agents: installs, updates or removes agents from the ACP Registry.": "Otwiera Ustawienia › Narzędzia › Agenci: instaluje, aktualizuje lub usuwa agentów z rejestru ACP Registry.",
+  "Search the ACP Registry": "Przeszukaj rejestr ACP Registry",
+  "Search agents": "Szukaj agentów",
+  "Agents in the ACP Registry are third-party software. They run on this computer with your permissions and can read and change your files. Install only agents you trust.": "Agenci w rejestrze ACP Registry są oprogramowaniem firm trzecich. Działają na tym komputerze z Twoimi uprawnieniami i mogą odczytywać oraz modyfikować Twoje pliki. Instaluj wyłącznie zaufanych agentów.",
+  "Cannot load the ACP Registry: {error}": "Nie można wczytać rejestru ACP Registry: {error}",
+  "Loading the ACP Registry…": "Wczytywanie rejestru ACP Registry…",
+  "No agents match": "Brak pasujących agentów",
+  "The registry has no agents for this system": "Rejestr nie zawiera agentów dla tego systemu",
+  "{version} available": "Dostępna wersja {version}",
+  "Installing {name} {version}…": "Instalowanie {name} {version}…",
+  "Website": "Strona internetowa",
+  "Removing…": "Usuwanie…",
+  "Registry agents": "Agenci z rejestru",
+  "No checksum provided": "Brak sumy kontrolnej",
+  "{name} provides no checksum for its download, so the downloaded file cannot be verified. Install it anyway?": "{name} nie dostarcza sumy kontrolnej pobieranego pliku, więc pobrany plik nie może zostać skontrolowany. Zainstalować mimo to?",
+  "Usage limit": "Limit użycia",
+  "{provider} didn't start: {error}": "Dostawca {provider} nie uruchomił się: {error}",
+  "resets {resetsMs}": "resetuje się za {resetsMs}",
+  "Copy to a New Task": "Kopiuj do nowego zadania",
+  "Couldn't copy the task": "Nie udało się skopiować zadania",
+  "Copy to a New Task From Here": "Kopiuj do nowego zadania od tego miejsca",
+  "Run Again From Here": "Uruchom ponownie od tego miejsca",
+  "The messages after this one are replaced. Files the agent changed stay as they are.": "Wiadomości po tej zostaną zastąpione. Pliki zmienione przez agenta pozostają bez zmian.",
+  "Cancelling…": "Anulowanie…",
+  "Code insight needs the index; it can't be stopped": "Analiza kodu wymaga indeksu; proces ten nie może zostać zatrzymany",
+  "Waiting for other tasks": "Oczekiwanie na inne zadania",
+  "This task can't be cancelled": "To zadanie nie może zostać anulowane",
+  "Cancelled": "Anulowano",
+  "No proxy": "Brak serwera proxy",
+  "Auto-detect proxy settings": "Automatycznie wykrywaj ustawienia proxy",
+  "Uses the system proxy: the HTTP_PROXY, HTTPS_PROXY and NO_PROXY environment variables.": "Korzysta z systemowego serwera proxy: zmienne środowiskowe HTTP_PROXY, HTTPS_PROXY i NO_PROXY.",
+  "Manual proxy configuration": "Ręczna konfiguracja serwera proxy",
+  "Proxy": "Proxy",
+  "Proxy type": "Typ serwera proxy",
+  "Host name": "Nazwa hosta",
+  "Port number": "Numer portu",
+  "No proxy for": "Brak proxy dla",
+  "Comma-separated host names; * matches any characters, e.g. *.example.com, 192.168.*": "Nazwy hostów rozdzielone przecinkami; * dopasowuje dowolny ciąg znaków, np. *.example.com, 192.168.*",
+  "Proxy authentication": "Uwierzytelnienie serwera proxy",
+  "Login": "Login",
+  "Connection successful: {status}": "Połączenie pomyślne: {status}",
+  "Problem with connection: {message}": "Problem z połączeniem: {message}",
+  "Check connection…": "Sprawdź połączenie…",
+  "Check connection": "Sprawdź połączenie",
+  "Enter any URL to check connection to:": "Wprowadź dowolny adres URL, aby sprawdzić połączenie:",
+  "Check": "Sprawdź",
+  "HTTP Proxy": "Serwer proxy HTTP",
+  "Proxy host is empty": "Pole hosta proxy jest puste",
+  "Invalid proxy host": "Nieprawidłowy host proxy",
+  "Proxy port must be between 1 and 65535": "Port proxy musi znajdować się w zakresie od 1 do 65535",
+  "Proxy login is empty": "Pole loginu proxy jest puste",
+  "No interpreter": "Brak interpretatora",
+  "Add New Interpreter…": "Dodaj nowy interpretator…",
+  "Interpreter Settings…": "Ustawienia interpretatora…",
+  "Connection settings for SQL Server.": "Ustawienia połączenia dla programu SQL Server.",
+  "ClickHouse settings sent with each HTTP request. connect_timeout is in seconds.": "Ustawienia ClickHouse wysyłane z każdym żądaniem HTTP. connect_timeout podawany jest w sekundach.",
+  "Microsoft SQL Server": "Microsoft SQL Server",
+  "Add to .gitignore": "Dodaj do pliku .gitignore",
+  "Add to .git/info/exclude": "Dodaj do pliku .git/info/exclude",
+  "Delete Agent Tasks": "Usuń zadania agenta",
+  "Open Agent Task": "Otwórz zadanie agenta",
+  "Open Agent Task in Editor": "Otwórz zadanie agenta w edytorze",
+  "Open Agent Task in Tool Window": "Otwórz zadanie agenta w oknie narzędziowym",
+  "Archive Agent Tasks": "Zarchiwizuj zadania agenta",
+  "Delete {count} agent tasks? Their branches and files outside worktrees are kept.": "Usunąć zadania agenta ({count})? Ich gałęzie i pliki poza obszarami worktrees zostaną zachowane.",
+  "Also remove their worktree folders": "Usuń również ich foldery worktree",
+  "Cannot delete agent tasks": "Nie można usunąć zadań agenta",
+  "Cannot archive agent tasks": "Nie można zarchiwizować zadań agenta",
+  "Archive ({count})": "Zarchiwizuj ({count})",
+  "Delete ({count})…": "Usuń ({count})…",
+  "Run pytest tests": "Uruchom testy pytest",
+  "e.g. pytest, uv, poetry, .venv/bin/pytest, python": "np. pytest, uv, poetry, .venv/bin/pytest, python",
+  "Runner arguments": "Argumenty wykonawcy",
+  "e.g. `run pytest` for uv/poetry, `-m pytest` for python; empty calls the command itself": "np. `run pytest` dla narzędzi uv/poetry, `-m pytest` dla środowiska python; puste pole wywoła samo polecenie",
+  "Target": "Cel",
+  "Directory, file or test id; empty runs the whole suite": "Katalog, plik lub identyfikator testu; puste pole uruchomi cały zestaw",
+  "pytest options": "Opcje pytest",
+  "e.g. -x -q --tb=short": "np. -x -q --tb=short",
+  "Ruby": "Ruby",
+  "Run a Ruby script": "Uruchom skrypt Ruby",
+  "Ruby script": "Skrypt Ruby",
+  "e.g. bin/rails or lib/app.rb": "np. bin/rails lub lib/app.rb",
+  "Script arguments": "Argumenty skryptu",
+  "e.g. server -p 3000": "np. server -p 3000",
+  "Ruby arguments": "Argumenty środowiska Ruby",
+  "e.g. -Ilib -w": "np. -Ilib -w",
+  "Run with Bundler (bundle exec)": "Uruchom z użyciem Bundlera (bundle exec)",
+  "Launcher": "Program uruchamiający",
+  "Path of the tool (bundle when run with Bundler); empty uses the interpreter from Settings › Ruby": "Ścieżka do narzędzia (bundle w przypadku uruchamiania z Bundlerem); puste pole używa interpretatora z Ustawienia › Ruby",
+  "Rake": "Rake",
+  "Run a Rake task": "Uruchom zadanie Rake",
+  "Task name with arguments, e.g. db:migrate or test TEST=test/a_test.rb; empty runs the default task": "Nazwa zadania z argumentami, np. db:migrate lub test TEST=test/a_test.rb; puste pole uruchomi zadanie domyślne",
+  "Rake options": "Opcje Rake",
+  "e.g. --trace": "np. --trace",
+  "RSpec": "RSpec",
+  "Run RSpec examples": "Uruchom przykłady RSpec",
+  "e.g. spec": "np. spec",
+  "Directory, file or file:line; empty runs the whole suite": "Katalog, plik lub plik:linia; puste pole uruchomi cały zestaw",
+  "RSpec options": "Opcje RSpec",
+  "e.g. --format documentation --fail-fast": "np. --format documentation --fail-fast",
+  "Ruby interpreter": "Interpretator Ruby",
+  "Runs the ruby, rake and rspec configurations and lists the standard library and gems under External Libraries. Installs from rbenv, rvm, chruby, mise and asdf are detected.": "Uruchamia konfiguracje ruby, rake i rspec oraz wyświetla bibliotekę standardową i gemy w sekcji Zewnętrzne biblioteki. Wykrywa instalacje z narzędzi rbenv, rvm, chruby, mise oraz asdf.",
+  "Monospaced": "Stała szerokość (Monospaced)",
+  "Proportional": "Proporcjonalna",
+  "Loading system fonts…": "Wczytywanie czcionek systemowych…",
+  "Refresh system fonts": "Odśwież czcionki systemowe",
+  "No matching fonts. Enter a family name manually.": "Brak pasujących czcionek. Wprowadź nazwę rodziny ręcznie.",
+  "This name was not found on this desktop. The saved preference is kept.": "Tej nazwy nie znaleziono w tym systemie. Zapisana preferencja została zachowana.",
+  "No system fonts were returned. Bundled fonts and manual input are available.": "System nie zwrócił żadnych czcionek. Dostępne są czcionki dołączone i ręczne wprowadzanie.",
+  "Type a family name or search installed fonts.": "Wpisz nazwę rodziny lub przeszukaj zainstalowane czcionki.",
+  "Add Code Cell": "Dodaj komórkę kodu",
+  "Add Markdown Cell": "Dodaj komórkę Markdown",
+  "Cell": "Komórka",
+  "Cell outputs": "Wyniki komórki",
+  "Cell type": "Typ komórki",
+  "Delete Cell": "Usuń komórkę",
+  "Discard Changes and Reload": "Odrzuć zmiany i przeładuj",
+  "Discard all unsaved notebook changes and stop execution? This cannot be undone.": "Odrzucić wszystkie niezapisane zmiany w notatniku i zatrzymać wykonywanie? Tej operacji nie można cofnąć.",
+  "Edit Markdown": "Edytuj Markdown",
+  "Inert JavaScript source": "Nieaktywny kod źródłowy JavaScript",
+  "Insert Code Cell Below": "Wstaw komórkę kodu poniżej",
+  "Install ipykernel in the selected Python environment, then restart the kernel. No packages are installed automatically.": "Zainstaluj pakiet ipykernel w wybranym środowisku Python, a następnie uruchom ponownie jądro (kernel). Żadne pakiety nie są instalowane automatycznie.",
+  "Interrupt Kernel": "Przerwij działanie jądra (kernel)",
+  "JavaScript output is inert. Interactive widgets are not supported.": "Wyjście JavaScript jest nieaktywne. Interaktywne widżety nie są obsługiwane.",
+  "Loading notebook…": "Wczytywanie notatnika…",
+  "Markdown cell source": "Kod źródłowy komórki Markdown",
+  "Move Cell Down": "Przesuń komórkę w dół",
+  "Move Cell Up": "Przesuń komórkę w górę",
+  "Notebook Python interpreter": "Interpretator Python dla notatnika",
+  "Notebook editing and execution require the desktop app.": "Edycja i uruchamianie notatnika wymagają aplikacji stacjonarnej (desktop).",
+  "Notebook image output": "Wyjście obrazu z notatnika",
+  "Notebook path is missing": "Brak ścieżki do notatnika",
+  "Notebook toolbar": "Pasek narzędzi notatnika",
+  "Notebook unavailable": "Notatnik niedostępny",
+  "Output preview truncated; full output is retained in the notebook.": "Podgląd wyników został skrócony; pełny wynik jest zachowany w notatniku.",
+  "Preview Markdown": "Podgląd Markdown",
+  "Python cell source": "Kod źródłowy komórki Python",
+  "Raw": "Surowy (Raw)",
+  "Raw or unknown cell; original content is preserved read-only.": "Surowa lub nieznana komórka; oryginalna zawartość została zachowana tylko do odczytu.",
+  "Redo": "Ponów",
+  "Refresh Python interpreters": "Odśwież interpretatory Python",
+  "Reload Notebook from Disk": "Przeładuj notatnik z dysku",
+  "Restart Kernel": "Uruchom ponownie jądro (kernel)",
+  "Retry Pending Edits": "Ponów oczekujące edycje",
+  "Run All": "Uruchom wszystko",
+  "Run Cell": "Uruchom komórkę",
+  "Select Python interpreter": "Wybierz interpretator Python",
+  "Static notebook HTML output": "Statyczne wyjście HTML z notatnika",
+  "This notebook has no cells": "Ten notatnik nie zawiera komórek",
+  "Uncommitted source edits": "Niezatwierdzone edycje kodu źródłowego",
+  "Unsupported output MIME type; original data is preserved.": "Nieobsługiwany typ MIME danych wyjściowych; oryginalne dane zostały zachowane.",
+  "Unsupported output type; original data is preserved.": "Nieobsługiwany typ danych wyjściowych; oryginalne dane zostały zachowane.",
+  "busy": "zajęty",
+  "dead": "zakończony",
+  "idle": "bezczynny",
+  "starting": "uruchamianie",
+  "Gradle JVM": "Maszyna JVM narzędzia Gradle",
+  "Distribution": "Dystrybucja",
+  "Gradle wrapper": "Gradle wrapper",
+  "Local installation": "Instalacja lokalna",
+  "Gradle home": "Katalog główny Gradle (Gradle home)",
+  "Gradle user home": "Katalog użytkownika Gradle",
+  "Gradle installation directory": "Katalog instalacyjny Gradle",
+  "Select Gradle Home Directory": "Wybierz katalog główny Gradle",
+  "Select Gradle User Home Directory": "Wybierz katalog użytkownika Gradle",
+  "JDK used for Gradle sync, tasks, run configurations and tests. An explicit JAVA_HOME in a run configuration takes precedence.": "Zestaw JDK używany do synchronizacji, zadań, konfiguracji uruchamiania i testów Gradle. Jawne wskazanie JAVA_HOME w konfiguracji uruchamiania ma priorytet.",
+  "Uses the Gradle wrapper when present, otherwise the project-pinned mise/asdf Gradle, then Gradle on PATH.": "Używa skryptu Gradle wrapper, jeśli istnieje, w przeciwnym razie wersji Gradle przypisanej do projektu przez mise/asdf, a następnie wersji ze zmiennej PATH.",
+  "Uses bin/gradle (bin/gradle.bat on Windows) instead of the wrapper or pinned toolchain.": "Używa pliku bin/gradle (bin/gradle.bat w Windows) zamiast skryptu wrapper lub przypisanego zestawu narzędzi.",
+  "Sets GRADLE_USER_HOME. Empty uses Gradle's default.": "Ustawia zmienną GRADLE_USER_HOME. Puste pole oznacza użycie domyślnej wartości Gradle.",
+  "Passwords": "Hasła",
+  "Credentials the IDE answers git's HTTPS prompts with. Saved after a successful fetch / pull / push when \"Remember for this host\" was checked.": "Poświadczenia, którymi IDE odpowiada na zapytania HTTPS Git. Zapisywane po pomyślnym wykonaniu fetch / pull / push, jeśli zaznaczono opcję „Zapamiętaj dla tego hosta”.",
+  "No saved credentials": "Brak zapisanych poświadczeń",
+  "Credentials the IDE answers git's HTTPS prompts with, stored in the app's own secret file (not git's credential.helper). A rejected credential is forgotten automatically.": "Poświadczenia, którymi IDE odpowiada na zapytania HTTPS Git, przechowywane we własnym pliku sekretów aplikacji (a nie w credential.helper systemu Git). Odrzucone poświadczenia są automatycznie usuwane z pamięci.",
+  "Saved git credentials": "Zapisane poświadczenia Git",
+  "Forget": "Zapomnij",
+  "Remember for this host": "Zapamiętaj dla tego hosta",
+  "Unarchive Task": "Przywróć zadanie z archiwum",
+  "This task is archived. Unarchive it to continue the conversation.": "To zadanie zostało zarchiwizowane. Przywróć je z archiwum, aby kontynuować rozmowę.",
+  "Unarchive": "Przywróć z archiwum",
+  "Unarchive Agent Tasks": "Przywróć zadania agenta z archiwum",
+  "Cannot unarchive agent tasks": "Nie można przywrócić zadań agenta z archiwum",
+  "Unarchive ({archived})": "Przywróć z archiwum ({archived})",
+  "New Workspace…": "Nowa przestrzeń robocza…",
+  "New Workspace": "Nowa przestrzeń robocza",
+  "Open Workspace…": "Otwórz przestrzeń roboczą…",
+  "Open Workspace": "Otwórz przestrzeń roboczą",
+  "Manage Workspace…": "Zarządzaj przestrzenią roboczą…",
+  "Manage Workspace": "Zarządzaj przestrzenią roboczą",
+  "Merge All Project Windows": "Połącz wszystkie okna projektów",
+  "Move Tab to New Window": "Przenieś kartę do nowego okna",
+  "Next Project Tab": "Następna karta projektu",
+  "Previous Project Tab": "Poprzednia karta projektu",
+  "Project windows": "Okna projektu",
+  "Linked projects": "Połączone projekty",
+  "Workspace name": "Nazwa przestrzeni roboczej",
+  "Workspace location": "Lokalizacja przestrzeni roboczej",
+  "Workspace Location": "Lokalizacja przestrzeni roboczej",
+  "Choose workspace location": "Wybierz lokalizację przestrzeni roboczej",
+  "Add Projects": "Dodaj projekty",
+  "Add Projects…": "Dodaj projekty…",
+  "Project folder path": "Ścieżka do folderu projektu",
+  "Add the projects you want to work on together.": "Dodaj projekty, nad którymi chcesz pracować jednocześnie.",
+  "Project folders stay in place. Removing a project here keeps its files.": "Foldery projektów pozostają bez zmian. Usunięcie projektu w tym miejscu zachowuje jego pliki.",
+  "Window group": "Grupa okien",
+  "Select Project Tab": "Wybierz kartę projektu",
+  "Close Project Tab": "Zamknij kartę projektu",
+  "Close Other Project Tabs": "Zamknij inne karty projektu",
+  "Close Project Tabs to the Left": "Zamknij karty projektu po lewej stronie",
+  "Close Project Tabs to the Right": "Zamknij karty projektu po prawej stronie",
+  "Reorder Project Tabs": "Zmień kolejność kart projektu",
+  "Close {name}": "Zamknij {name}",
+  "Tomcat Server": "Serwer Tomcat",
+  "Run a WAR application in a local Tomcat server": "Uruchom aplikację WAR na lokalnym serwerze Tomcat",
+  "Tomcat installation directory": "Katalog instalacyjny serwera Tomcat",
+  "Project WAR artifact (exploded)": "Artefakt WAR projektu (rozpakowany/exploded)",
+  "WAR file": "Plik WAR",
+  "Exploded directory": "Katalog rozpakowany (exploded)",
+  "Context path": "Ścieżka kontekstu (Context path)",
+  "Enter / or a context path such as /app": "Wprowadź / lub ścieżkę kontekstu, np. /app",
+  "HTTP port": "Port HTTP",
+  "JRE": "Środowisko JRE",
+  "Java installation directory; empty uses the project JDK": "Katalog instalacyjny Java; puste pole spowoduje użycie JDK projektu",
+  "Open browser after launch": "Otwórz przeglądarkę po uruchomieniu",
+  "Browser URL": "Adres URL przeglądarki",
+  "Server URL from the HTTP port and context path": "Adres URL serwera wyznaczony z portu HTTP i ścieżki kontekstu",
+  "Enter an HTTP or HTTPS URL": "Wprowadź adres URL typu HTTP lub HTTPS",
+  "Before launch: build the artifact": "Przed uruchomieniem: zbuduj artefakt",
+  "WAR artifact": "Artefakt WAR",
+  "Choose a WAR module": "Wybierz moduł WAR",
+  "No WAR modules found. Choose a WAR file or an exploded directory.": "Nie znaleziono modułów WAR. Wybierz plik WAR lub katalog rozpakowany (exploded).",
+  "Invalid Tomcat installation: check bin/catalina and lib/catalina.jar": "Nieprawidłowa instalacja Tomcat: sprawdź pliki bin/catalina i lib/catalina.jar",
+  "Update Application": "Zaktualizuj aplikację",
+  "Update resources": "Zaktualizuj zasoby",
+  "Update classes and resources": "Zaktualizuj klasy i zasoby",
+  "Redeploy": "Wdrożyj ponownie (redeploy)",
+  "Restart server": "Zrestartuj serwer",
+  "Application updated": "Aplikacja została zaktualizowana",
+  "Application update failed": "Aktualizacja aplikacji nie powiodła się",
+  "Tomcat Local requires the local machine": "Tomcat w wersji lokalnej wymaga maszyny lokalnej",
+  "/artifact-name": "/nazwa-artefaktu",
+  "Choose a WAR artifact": "Wybierz artefakt WAR",
+  "Choose a Maven WAR module": "Wybierz moduł WAR Maven",
+  "Choose a Gradle WAR module": "Wybierz moduł WAR Gradle",
+  "Build the selected WAR artifact before launching Tomcat": "Zbuduj wybrany artefakt WAR przed uruchomieniem serwera Tomcat",
+  "Build the WAR artifact before launching Tomcat": "Zbuduj artefakt WAR przed uruchomieniem serwera Tomcat",
+  "The built WAR artifact does not exist: {path}": "Zbudowany artefakt WAR nie istnieje: {path}",
+  "Cannot resolve Maven WAR artifact: {details}": "Nie można odnaleźć artefaktu WAR Maven: {details}",
+  "Choose a WAR file or exploded directory": "Wybierz plik WAR lub rozpakowany katalog (exploded)",
+  "Invalid Tomcat deployment: {path}": "Nieprawidłowe wdrożenie Tomcat: {path}",
+  "Unknown Tomcat deployment type": "Nieznany typ wdrożenia Tomcat",
+  "Choose a Tomcat installation directory": "Wybierz katalog instalacyjny Tomcat",
+  "HTTP port must be between 1 and 65535": "Port HTTP musi zawierać się w przedziale od 1 do 65535",
+  "Unknown Tomcat update operation": "Nieznana operacja aktualizacji serwera Tomcat",
+  "Start this Tomcat configuration before updating it": "Uruchom tę konfigurację serwera Tomcat przed jej aktualizacją",
+  "This Tomcat configuration is already running": "Ta konfiguracja serwera Tomcat jest już uruchomiona",
+  "Tomcat server.xml has no HTTP connector": "Plik server.xml serwera Tomcat nie posiada złącza HTTP",
+  "WAR contains an invalid path": "Plik WAR zawiera nieprawidłową ścieżkę",
+  "Context path must start with / and contain only letters, digits, /, - or _": "Ścieżka kontekstu musi rozpoczynać się od / i zawierać wyłącznie litery, cyfry, /, - lub _",
+  "Tomcat home must contain bin/catalina.sh or bin/catalina.bat and lib/catalina.jar": "Katalog główny Tomcat musi zawierać plik bin/catalina.sh lub bin/catalina.bat oraz lib/catalina.jar",
+  "Can't rename '{name}' based on syntax: only local variables can be renamed this way": "Nie można zmienić nazwy '{name}' na podstawie składni: tylko zmienne lokalne mogą być zmieniane w ten sposób",
+  "Returns true when the value is falsey or the variable does not exist. Checking an undefined variable does not emit a warning.": "Zwraca wartość true, gdy wartość jest fałszywa (falsey) lub zmienna nie istnieje. Sprawdzanie niezdefiniowanej zmiennej nie powoduje zgłoszenia ostrzeżenia.",
+  "Returns true only when every supplied variable exists and is not null. Checks stop at the first unset or null variable.": "Zwraca wartość true tylko wtedy, gdy każda dostarczona zmienna istnieje i nie ma wartości null. Sprawdzanie kończy się na pierwszej niezdefiniowanej lub pustej (null) zmiennej.",
+  "Cannot save service order": "Nie można zapisać kolejności usług",
+  "The order will be kept for this session only.": "Kolejność zostanie zachowana tylko dla tej sesji.",
+  "View Timeline": "Wyświetl oś czasu",
+  "View in browser": "Wyświetl w przeglądarce",
+  "Refresh Pull Requests List": "Odśwież listę zgłoszeń Pull Request",
+  "Change Repository or Account…": "Zmień repozytorium lub konto…",
+  "Select Opened Pull Request": "Wybierz otwarte zgłoszenie Pull Request",
+  "View Pull Request": "Wyświetl Pull Request",
+  "View pull request information and timeline": "Wyświetl informacje oraz oś czasu zgłoszenia Pull Request",
+  "View pull request timeline": "Wyświetl oś czasu zgłoszenia Pull Request",
+  "Refresh Pull Request": "Odśwież zgłoszenie Pull Request",
+  "Refresh Timeline": "Odśwież oś czasu",
+  "Check for new timeline events": "Sprawdź nowe zdarzenia na osi czasu",
+  "View Pull Request in Browser": "Wyświetl zgłoszenie Pull Request w przeglądarce",
+  "Copy Pull Request URL": "Kopiuj adres URL zgłoszenia Pull Request",
+  "Checkout Branch": "Pobierz gałąź (checkout)",
+  "Fetch and checkout the pull request branch": "Pobierz (fetch) i przełącz się na gałąź zgłoszenia Pull Request",
+  "Open in Worktree": "Otwórz w drzewie roboczym (worktree)",
+  "Fetch and open the pull request branch in a Git worktree": "Pobierz (fetch) i otwórz gałąź zgłoszenia Pull Request w drzewie roboczym (worktree) Git",
+  "Delete the merged branch on GitHub": "Usuń scaloną gałąź w serwisie GitHub",
+  "Submit Review…": "Prześlij recenzję…",
+  "Toggle viewed/not viewed state": "Przełącz stan obejrzane/nieobejrzane",
+  "Toggle viewed/not viewed state for the selection or file": "Przełącz stan obejrzane/nieobejrzane dla zaznaczenia lub pliku",
+  "Show Pull Request in the Tool Window": "Pokaż zgłoszenie Pull Request w oknie narzędziowym",
+  "Update to Enable Review Mode…": "Zaktualizuj, aby włączyć tryb recenzji…",
+  "Review Mode": "Tryb recenzji",
+  "Can't load pull requests": "Nie można wczytać zgłoszeń Pull Request",
+  "Connect the Pull Requests tool window to this repository to see the timeline": "Połącz okno narzędziowe Pull Requests z tym repozytorium, aby zobaczyć oś czasu",
+  "Pull request tabs": "Karty zgłoszeń Pull Request",
+  "New Pull Request at {repo}": "Nowe zgłoszenie Pull Request w {repo}",
+  "Something went wrong": "Coś poszło nie tak",
+  "Merge commit message:": "Wiadomość zatwierdzenia scalenia (merge commit):",
+  "Merge commit message": "Wiadomość zatwierdzenia scalenia",
+  "1 minute ago": "1 minutę temu",
+  "1 hour ago": "1 godzinę temu",
+  "{n} hours ago": "{n} godz. temu",
+  "{n} days ago": "{n} dni temu",
+  "yesterday": "wczoraj",
+  "Today": "Dzisiaj",
+  "Yesterday": "Wczoraj",
+  "Select pull request base and head to view changes": "Wybierz bazę (base) i nagłówek (head) zgłoszenia Pull Request, aby zobaczyć zmiany",
+  "Failed to load commits": "Nie udało się wczytać zatwierdzeń",
+  "Pull request does not contain any commits": "Zgłoszenie Pull Request nie zawiera żadnych zatwierdzeń",
+  "Changes from": "Zmiany z",
+  "Next Commit": "Następne zatwierdzenie",
+  "Previous Commit": "Poprzednie zatwierdzenie",
+  "Search commits": "Szukaj zatwierdzeń",
+  "Hide details": "Ukryj szczegóły",
+  "Failed to load changes": "Nie udało się wczytać zmian",
+  "Commit does not contain any changes": "Zatwierdzenie nie zawiera żadnych zmian",
+  "Checking pull request branches": "Sprawdzanie gałęzi zgłoszenia Pull Request",
+  "Failed to check pull request branches": "Sprawdzanie gałęzi zgłoszenia Pull Request nie powiodło się",
+  "Pull request already exists": "Zgłoszenie Pull Request już istnieje",
+  "No changes between '{base}' and '{head}'": "Brak zmian pomiędzy '{base}' a '{head}'",
+  "Pushing a pull request branch": "Wysyłanie (push) gałęzi zgłoszenia Pull Request",
+  "Creating a pull request": "Tworzenie zgłoszenia Pull Request",
+  "Updating pull request fields": "Aktualizowanie pól zgłoszenia Pull Request",
+  "Failed to create a pull request": "Tworzenie zgłoszenia Pull Request nie powiodło się",
+  "Create Draft Pull Request": "Utwórz szkic zgłoszenia Pull Request (Draft)",
+  "More create options": "Więcej opcji tworzenia",
+  "Create options": "Opcje tworzenia",
+  "Head branch": "Gałąź docelowa (head)",
+  "Repository:": "Repozytorium:",
+  "Head repository": "Repozytorium docelowe (head)",
+  "Reviewers:": "Recenzenci:",
+  "No reviewers": "Brak recenzentów",
+  "Assignees:": "Osoby przypisane:",
+  "Unassigned": "Nieprzypisane",
+  "Assignees": "Osoby przypisane",
+  "Labels:": "Etykiety:",
+  "No labels": "Brak etykiet",
+  "Labels": "Etykiety",
+  "New Remote Branch for Pull Request": "Nowa gałąź zdalna dla zgłoszenia Pull Request",
+  "Remote branch name:": "Nazwa gałęzi zdalnej:",
+  "Remote branch name": "Nazwa gałęzi zdalnej",
+  "Your changes will be pushed to the remote repository to create the pull request": "Twoje zmiany zostaną wysłane do zdalnego repozytorium w celu utworzenia zgłoszenia Pull Request",
+  "Unrelated branches {baseName} {headBranch}": "Niezwiązane gałęzie {baseName} {headBranch}",
+  "Push failed: {error}": "Wysyłanie (push) nie powiodło się: {error}",
+  "Checkout as detached HEAD": "Przełącz (checkout) w tryb odłączonej HEAD",
+  "Show in Git Log": "Pokaż w dzienniku Git Log",
+  "Copy Branch Name": "Kopiuj nazwę gałęzi",
+  "Remote branches are not available for private forks": "Gałęzie zdalne są niedostępne dla prywatnych rozwidleń (forks)",
+  "Show Diff in a New Tab or Window": "Pokaż różnice (diff) w nowej karcie lub oknie",
+  "Pull request does not contain any changes": "Zgłoszenie Pull Request nie zawiera żadnych zmian",
+  "Mark as Viewed": "Oznacz jako obejrzane",
+  "Mark as Not Viewed": "Oznacz jako nieobejrzane",
+  "Mark All as Viewed": "Oznacz wszystko jako obejrzane",
+  "Mark All as Not Viewed": "Oznacz wszystko jako nieobejrzane",
+  "{count} commit": "{count} zatwierdzenie",
+  "{count} commits": "Zatwierdzenia: {count}",
+  "1 commit": "1 zatwierdzenie",
+  "All commits ({count})": "Wszystkie zatwierdzenia ({count})",
+  "Can't load changes": "Nie można wczytać zmian",
+  "Reopen Pull Request": "Otwórz ponownie zgłoszenie Pull Request",
+  "Post Pull Request": "Opublikuj zgłoszenie Pull Request",
+  "Request Review…": "Zażądaj recenzji…",
+  "Re-request Review…": "Zażądaj ponownej recenzji…",
+  "Merge Review…": "Scal recenzję…",
+  "Squash and Merge…": "Wykonaj squash i scal…",
+  "Close Pull Request": "Zamknij zgłoszenie Pull Request",
+  "Submit Review ({count})…": "Prześlij recenzję ({count})…",
+  "Set Myself as Reviewer": "Ustaw siebie jako recenzenta",
+  "More merge options": "Więcej opcji scalania",
+  "Loading pull request status": "Wczytywanie statusu zgłoszenia Pull Request",
+  "At least {count} approving review is required by reviewers with write access": "Wymagana jest co najmniej zatwierdzająca recenzja ({count}) od recenzentów z prawem zapisu",
+  "You are not authorized to merge request into this branch": "Nie posiadasz uprawnień do scalenia zgłoszenia z tą gałęzią",
+  "Missing reviewer": "Brakujący recenzent",
+  "Details…": "Szczegóły…",
+  "Checking branch for conflicts": "Sprawdzanie gałęzi pod kątem konfliktów",
+  "Branch has conflicts that must be resolved": "Gałąź zawiera konflikty, które należy rozwiązać",
+  "Resolve": "Rozwiąż",
+  "Re-request Review from {name}": "Zażądaj ponownej recenzji od {name}",
+  "Remove {name} from reviewers": "Usuń {name} z listy recenzentów",
+  "Discard Pending Review": "Odrzuć oczekującą recenzję",
+  "Are you sure you want to delete all pending comments?": "Czy na pewno chcesz usunąć wszystkie oczekujące komentarze?",
+  "Submit Review": "Prześlij recenzję",
+  "{count} pending comment": "{count} oczekujący komentarz",
+  "{count} pending comments": "Oczekujące komentarze: {count}",
+  "Discard pending comments": "Odrzuć oczekujące komentarze",
+  "Failed to submit review": "Przesłanie recenzji nie powiodło się",
+  "Approve": "Zatwierdź",
+  "Request Changes": "Zażądaj poprawek",
+  "Submit general feedback without explicit approval": "Prześlij ogólne uwagi bez jednoznacznego zatwierdzenia",
+  "Pull request action failed": "Akcja zgłoszenia Pull Request nie powiodła się",
+  "Adjusting reviewers…": "Dostosowywanie listy recenzentów…",
+  "Merge Review": "Scal recenzję",
+  "Squash and Merge Review": "Spłaszcz (squash) i scal recenzję",
+  "All required checks have passed": "Wszystkie wymagane weryfikacje zakończyły się sukcesem",
+  "Checks in progress, and some already failed…": "Sprawdzanie w toku, część weryfikacji już zakończyła się błędem…",
+  "Checks in progress…": "Sprawdzanie w toku…",
+  "Checks failed": "Weryfikacja nie powiodła się",
+  "{name} approved review": "{name} zatwierdził(a) recenzję",
+  "{name} is waiting for updates": "{name} czeka na aktualizacje",
+  "Waiting for review from {name}": "Oczekiwanie na recenzję od {name}",
+  "Re-requested review from {name}": "Ponownie zażądano recenzji od {name}",
+  "{name} left comments": "{name} pozostawił(a) komentarze",
+  "{side} repository not found": "Nie znaleziono repozytorium: {side}",
+  "{side} remote not found: {url}": "Nie znaleziono repozytorium zdalnego {side}: {url}",
+  "Merge is already in progress": "Scalanie jest już w trakcie wykonywania",
+  "Details have not finished loading": "Wczytywanie szczegółów nie zostało jeszcze zakończone",
+  "Already resolved locally, push your changes to resolve": "Rozwiązano lokalnie, wyślij zmiany (push), aby zakończyć",
+  "Repository access required to manage pull requests": "Dostęp do repozytorium jest wymagany do zarządzania zgłoszeniami Pull Request",
+  "Repository write access required to merge pull requests": "Wymagany jest dostęp z prawem zapisu do repozytorium, aby scalać zgłoszenia Pull Request",
+  "Merging is disabled for this project": "Scalanie jest wyłączone dla tego projektu",
+  "Refresh List": "Odśwież listę",
+  "No pull requests in {name}": "Brak zgłoszeń Pull Request w {name}",
+  "No pull requests matching filters": "Brak zgłoszeń Pull Request pasujących do filtrów",
+  "Clear filters": "Wyczyść filtry",
+  "Pull request cannot be merged": "Zgłoszenie Pull Request nie może zostać scalone",
+  "Quick Filters": "Szybkie filtry",
+  "Clear {count} Filters": "Wyczyść filtry ({count})",
+  "Reset {name}": "Zresetuj {name}",
+  "Assignee": "Osoba przypisana",
+  "Label": "Etykieta",
+  "Reviewer": "Recenzent",
+  "Your pull requests": "Twoje zgłoszenia Pull Request",
+  "Assigned to you": "Przypisane do Ciebie",
+  "Review requests": "Prośby o recenzję",
+  "Closed": "Zamknięte",
+  "Merged": "Scalone",
+  "Approved review": "Recenzja zatwierdzona",
+  "Reviewed": "Zrecenzowane",
+  "Reviewed by you": "Zrecenzowane przez Ciebie",
+  "Not reviewed": "Niezrecenzowane",
+  "Not reviewed by you": "Niezrecenzowane przez Ciebie",
+  "Awaiting review": "Oczekuje na recenzję",
+  "Awaiting review from you": "Oczekuje na Twoją recenzję",
+  "Newest": "Najnowsze",
+  "Oldest": "Najstarsze",
+  "Most commented": "Najczęściej komentowane",
+  "Least commented": "Najrzadziej komentowane",
+  "Recently updated": "Ostatnio zaktualizowane",
+  "Least recently updated": "Najdawniej zaktualizowane",
+  "No unresolved comments": "Brak nierozwiązanych komentarzy",
+  "{count} unresolved comment": "{count} nierozwiązany komentarz",
+  "{count} unresolved comments": "Nierozwiązane komentarze: {count}",
+  "{id} · created {date}, by {author}": "{id} · utworzono {date} przez {author}",
+  "{id} · created {date}": "{id} · utworzono {date}",
+  "Can't load pull request details": "Nie można wczytać szczegółów zgłoszenia Pull Request",
+  "Can't load timeline items": "Nie można wczytać elementów osi czasu",
+  "{submitShortcut} to comment": "{submitShortcut}, aby skomentować",
+  "Pull Request Successfully Merged": "Zgłoszenie Pull Request scalono pomyślnie",
+  "You can now {delete} {branch}.": "Możesz teraz wykonać operację {delete} na gałęzi {branch}.",
+  "delete": "usuń",
+  "{branch} has been deleted. {restore}": "Gałąź {branch} została usunięta. {restore}",
+  "Restore…": "Przywróć…",
+  "{newLineShortcut} to add new line": "{newLineShortcut}, aby dodać nowy wiersz",
+  "Mentions": "Wzmianki",
+  "Delete Comment": "Usuń komentarz",
+  "Are you sure you want to delete this comment?": "Czy na pewno chcesz usunąć ten komentarz?",
+  "{submitShortcut} to save changes": "{submitShortcut}, aby zapisać zmiany",
+  "Add reaction": "Dodaj reakcję",
+  "{users} reacted with '{name}' emoji": "Użytkownik {users} zareagował(a) reakcją '{name}'",
+  "Suggested change": "Sugerowana zmiana",
+  "Apply Locally": "Zastosuj lokalnie",
+  "{submitShortcut} to reply": "{submitShortcut}, aby odpowiedzieć",
+  "Could not load diff hunk for thread": "Nie udało się wczytać fragmentu różnic (diff hunk) dla tej dyskusji",
+  "Reply": "Odpowiedz",
+  "{n} reply": "{n} odpowiedź",
+  "{n} replies": "{n} odpowiedzi",
+  "{hidden} more replies": "jeszcze {hidden} odpowiedzi",
+  "Committing suggested change": "Zatwierdzanie sugerowanej zmiany",
+  "Applying suggested change": "Stosowanie sugerowanej zmiany",
+  "Conflicts in {files}": "Konflikty w plikach {files}",
+  "{path}: nothing to commit": "{path}: brak zmian do zatwierdzenia",
+  "Resolving thread": "Rozwiązywanie w wątku",
+  "added labels {added} and removed labels {removed}": "dodano etykiety {added} i usunięto etykiety {removed}",
+  "added labels {labels}": "dodano etykiety {labels}",
+  "removed labels {labels}": "usunięto etykiety {labels}",
+  "assigned {assigned} and unassigned {unassigned}": "przypisano do {assigned} i usunięto przypisanie {unassigned}",
+  "assigned {users}": "przypisano do {users}",
+  "unassigned {users}": "usunięto przypisanie {users}",
+  "requested a review from {added} and removed review request from {removed}": "poproszono o recenzję użytkownika {added} i anulowano prośbę dla {removed}",
+  "requested a review from {reviewers}": "poproszono o recenzję użytkowników {reviewers}",
+  "removed review request from {reviewers}": "anulowano prośbę o recenzję dla {reviewers}",
+  "renamed this pull request from '{from}' to '{to}'": "zmieniono nazwę tego zgłoszenia z '{from}' na '{to}'",
+  "closed this": "zamknięto to zgłoszenie",
+  "reopened this": "ponownie otwarto to zgłoszenie",
+  "merged commit {commit} into {branch}": "scalono zatwierdzenie {commit} z gałęzią {branch}",
+  "merged this": "scalono to zgłoszenie",
+  "changed the base branch": "zmieniono gałąź bazową (base)",
+  "force-pushed the {branch} branch": "wykonano wymuszone wysłanie (force push) w gałęzi {branch}",
+  "deleted the {branch} branch": "usunięto gałąź {branch}",
+  "restored head branch": "przywrócono gałąź nagłówkową (head)",
+  "dismissed {login}'s stale review": "odrzucono nieaktualną recenzję użytkownika {login}",
+  "marked this pull request as ready for review": "oznaczono to zgłoszenie jako gotowe do recenzji",
+  "marked this pull request as draft": "oznaczono to zgłoszenie jako szkic (draft)",
+  "mentioned this pull request": "wspomniano o tym zgłoszeniu Pull Request",
+  "linked an issue that may be closed by this": "powiązano zgłoszenie (issue), które może zostać przez to zamknięte",
+  "removed a link to an issue": "usunięto powiązanie ze zgłoszeniem (issue)",
+  "added a commit to this pull request": "dodano zatwierdzenie do tego zgłoszenia Pull Request",
+  "added {n} commits to this pull request": "dodano zatwierdzenia ({n}) do tego zgłoszenia Pull Request",
+  "Cannot display item - {type}": "Nie można wyświetlić elementu - {type}",
+  "approved the changes": "zatwierdził(a) zmiany",
+  "started a review": "rozpoczął/rozpoczęła recenzję",
+  "reviewed the changes": "zrecenzował(a) zmiany",
+  "No description provided": "Brak opisu",
+  "Save Changes": "Zapisz zmiany",
+  "Unresolve": "Oznacz jako nierozwiązane",
+  "Outdated suggestions cannot be applied": "Nieaktualne sugestie nie mogą zostać zastosowane",
+  "This suggestion has been resolved": "Ta sugestia została rozwiązana",
+  "Unable to apply the suggested change from a pull request in a different branch": "Nie można zastosować sugerowanej zmiany ze zgłoszenia Pull Request w innej gałęzi",
+  "Add Review Comment": "Dodaj komentarz do recenzji",
+  "Add Multiline Review Comment": "Dodaj wielowierszowy komentarz do recenzji",
+  "Previous Comment": "Poprzedni komentarz",
+  "Next Comment": "Następny komentarz",
+  "Refresh Review Data": "Odśwież dane recenzji",
+  "Automatically mark opened files as viewed": "Automatycznie oznaczaj otwarte pliki jako obejrzane",
+  "Discard Comment": "Odrzuć komentarz",
+  "Are you sure you want to discard the unsaved comment?": "Czy na pewno chcesz odrzucić niezapisany komentarz?",
+  "Create a new code review comment on the line under the caret": "Utwórz nowy komentarz recenzji kodu w wierszu pod kursorem",
+  "Create a new code review comment on the selected lines": "Utwórz nowy komentarz recenzji kodu w zaznaczonych wierszach",
+  "Go to previous visible comment": "Przejdź do poprzedniego widocznego komentarza",
+  "Go to next visible comment": "Przejdź do następnego widocznego komentarza",
+  "Unresolved Only": "Tylko nierozwiązane",
+  "Do Not Show": "Nie pokazuj",
+  "Show Review Threads": "Pokaż wątki recenzji",
+  "Mark File as Viewed": "Oznacz plik jako obejrzany",
+  "Mark File as Not Viewed": "Oznacz plik jako nieobejrzany",
+  "Leave a comment": "Zostaw komentarz",
+  "Discard a comment": "Odrzuć komentarz",
+  "Start Review": "Rozpocznij recenzję",
+  "Add Single Comment": "Dodaj pojedynczy komentarz",
+  "Drag to select several lines for commenting": "Przeciągnij, aby zaznaczyć kilka wierszy do skomentowania",
+  "The range of this comment is not adjustable as it contains suggestion": "Zakres tego komentarza nie podlega modyfikacji, ponieważ zawiera sugestię",
+  "Comment range cannot be adjusted while reviewing a single commit": "Zakres komentarza nie może być modyfikowany podczas recenzowania pojedynczego zatwierdzenia",
+  "Update Branch to Enable Review Mode…": "Zaktualizuj gałąź, aby włączyć tryb recenzji…",
+  "Disable Review Mode": "Wyłącz tryb recenzji",
+  "Show Unresolved Comments Only": "Pokaż tylko nierozwiązane komentarze",
+  "Show All Comments": "Pokaż wszystkie komentarze",
+  "Configure review mode": "Konfiguruj tryb recenzji",
+  "In Review Mode, you can see review comments and proposed changes right in the editor": "W trybie recenzji komentarze i proponowane zmiany można przeglądać bezpośrednio w edytorze",
+  "Pull request #{n} exists for current branch {branch}, but local branch is out of sync with remote": "Zgłoszenie Pull Request #{n} istnieje dla bieżącej gałęzi {branch}, ale gałąź lokalna nie jest zsynchronizowana z repozytorium zdalnym",
+  "Loading changes for pull request #{n}": "Wczytywanie zmian dla zgłoszenia Pull Request #{n}",
+  "Pull request #{n} exists for current branch {branch}, but pull request details loading failed": "Zgłoszenie Pull Request #{n} istnieje dla bieżącej gałęzi {branch}, ale wczytywanie szczegółów nie powiodło się",
+  "Pull request #{n} exists for current branch {branch}": "Zgłoszenie Pull Request #{n} istnieje dla bieżącej gałęzi {branch}",
+  "Show Review Diff": "Pokaż różnice (diff) recenzji",
+  "Pull Request branch update failed": "Aktualizacja gałęzi zgłoszenia Pull Request nie powiodła się",
+  "#{n} on {branch}": "#{n} w {branch}",
+  "Markdown Images": "Obrazy Markdown",
+  "Preview font size": "Rozmiar czcionki podglądu",
+  "Also used by Markdown cells in Jupyter notebooks. Defaults to the editor font size, independent of the UI font size.": "Stosowane również przez komórki Markdown w notatnikach Jupyter. Domyślnie pobierany jest rozmiar czcionki edytora, niezależnie od czcionki interfejsu.",
+  "Image folder": "Folder obrazów",
+  "Relative to the Markdown file.": "Ścieżka względna do pliku Markdown.",
+  "Image name pattern": "Wzorzec nazwy obrazu",
+  "For clipboard images: {timestamp} becomes YYYYMMDD-HHmmss. Source file names are preserved.": "Dla obrazów ze schowka: {timestamp} przyjmuje format YYYYMMDD-HHmmss. Nazwy plików źródłowych są zachowywane.",
+  "Image folder must be relative.": "Folder obrazów musi posiadać ścieżkę względną.",
+  "Image exceeds 16 MB.": "Obraz przekracza rozmiar 16 MB.",
+  "Cannot insert image": "Nie można wstawić obrazu",
+  "Import Scheme": "Importuj schemat",
+  "Export Scheme": "Eksportuj schemat",
+  "Delete Scheme": "Usuń schemat",
+  "Keep Both": "Zachowaj oba",
+  "Scheme exported.": "Wyeksportowano schemat.",
+  "Invalid .icls color scheme": "Nieprawidłowy schemat kolorów .icls",
+  "IntelliJ Color Scheme": "Schemat kolorów IntelliJ",
+  "A scheme named '{name}' already exists.": "Schemat o nazwie '{name}' już istnieje.",
+  "Applied {applied} values; skipped {skipped} unsupported or invalid values.": "Zastosowano {applied} wartości; pominięto {skipped} nieobsługiwanych lub nieprawidłowych wartości.",
+  "Delete color scheme '{name}'?": "Usunąć schemat kolorów '{name}'?",
+  "Overwrite": "Nadpisz",
+  "Open Results in Find Window": "Otwórz wyniki w oknie wyszukiwania",
+  "Multiple Cursors": "Wiele kursorów",
+  "Scroll to Results During Typing": "Przewijaj do wyników w trakcie pisania",
+  "Find options": "Opcje wyszukiwania",
+  "Occurrences of '{0}'": "Wystąpienia elementu '{0}'",
+  "Shelved base": "Wersja bazowa na półce (shelf)",
+  "Shelved version": "Wersja na półce (shelf)",
+  "Local version": "Wersja lokalna",
+  "Show Diff in a New Tab": "Pokaż różnice (diff) w nowej karcie",
+  "Copy as Patch to Clipboard": "Kopiuj jako łatkę (patch) do schowka",
+  "Import Patches…": "Importuj łatki…",
+  "Import patches": "Importuj łatki",
+  "Refresh Shelf": "Odśwież półkę (shelf)",
+  "Show Shelved Diff": "Pokaż różnice (diff) odłożone na półkę",
+  "Compare Shelved Changes with Local": "Porównaj odłożone zmiany z wersją lokalną",
+  "Create Patch from Shelved Changes…": "Utwórz łatkę z odłożonych zmian…",
+  "Build Tags": "Tagi budowania",
+  "Go Version": "Wersja Go",
+  "Custom Tags": "Niestandardowe tagi",
+  "Experiments": "Eksperymenty",
+  "Open a project to configure Go build tags.": "Otwórz projekt, aby skonfigurować tagi budowania Go.",
+  "This Go file is excluded by the current build constraints.": "Ten plik Go jest wykluczony przez bieżące reguły budowania (build constraints).",
+  "Select one Go test file": "Wybierz jeden plik testowy Go",
+  "Go configuration": "Konfiguracja Go",
+  "Go Build": "Go Build",
+  "Go Test": "Go Test",
+  "Run kind": "Rodzaj uruchomienia",
+  "Output directory": "Katalog wyjściowy",
+  "Run after build": "Uruchom po zbudowaniu",
+  "Go tool arguments": "Argumenty narzędzia Go",
+  "Use all custom build tags": "Użyj wszystkich niestandardowych tagów budowania",
+  "Build and run a Go application": "Zbuduj i uruchom aplikację Go",
+  "Run Go tests": "Uruchom testy Go",
+  "Go test file has no directory": "Plik testowy Go nie posiada katalogu",
+  "Go package discovery timed out": "Wyszukiwanie pakietów Go przekroczyło limit czasu",
+  "Go package discovery failed: {value}": "Wyszukiwanie pakietów Go nie powiodło się: {value}",
+  "Go test file target is missing": "Brak celu dla pliku testowego Go",
+  "Go build and run requires the output console": "Budowanie i uruchamianie Go wymaga konsoli wyjściowej",
+  "run stopped after build": "uruchomienie zatrzymano po wygenerowaniu kompilacji",
+  "Go Modules": "Moduły Go",
+  "Enable vendoring support automatically": "Włącz automatycznie obsługę katalogu vendor",
+  "Inherit from environment": "Dziedzicz ze środowiska",
+  "Open a project to configure Go modules.": "Otwórz projekt, aby skonfigurować moduły Go.",
+  "Go Mod Tidy": "Go Mod Tidy",
+  "Download Go Modules": "Pobierz moduły Go",
+  "Sync Go Workspace": "Synchronizuj przestrzeń roboczą Go",
+  "Add Directory to Go Workspace…": "Dodaj katalog do przestrzeni roboczej Go…",
+  "Add Directory to Go Workspace": "Dodaj katalog do przestrzeni roboczej Go",
+  "Module directory": "Katalog modułu",
+  "Path relative to go.work, or an absolute directory containing go.mod": "Ścieżka względna do pliku go.work lub katalog bezwzględny zawierający go.mod",
+  "Reload External Libraries": "Przeładuj biblioteki zewnętrzne",
+  "Run Go Generate": "Uruchom polecenie Go Generate",
+  "Go Generate File": "Polecenie Go Generate dla pliku",
+  "Go Generate Package": "Polecenie Go Generate dla pakietu",
+  "Architecture": "Architektura",
+  "Compiler": "Kompilator",
+  "No CMake executable target for this file": "Brak wykonywalnego celu CMake dla tego pliku",
+  "Run CMake Configure from the Run selector, then choose the executable target. Files in a CMake project are built with their target.": "Uruchom konfigurowanie CMake z menu wyboru uruchamiania, a następnie wybierz wykonywalny cel. Pliki w projekcie CMake są budowane wraz z ich celem.",
+  "Cannot check deployment mappings": "Nie można sprawdzić mapowań wdrażania",
+  "No selected paths can be deployed to {server}": "Żadna z wybranych ścieżek nie może zostać wdrożona w {server}",
+  "No deployment server covers the selected paths": "Żaden serwer wdrażania nie obejmuje wybranych ścieżek",
+  "Not covered by this server's mappings": "Nieobjęte mapowaniami tego serwera",
+  "Excluded from deployment": "Wykluczone z wdrażania",
+  "No debug output available": "Brak dostępnych danych wyjściowych debugowania",
+  "The attached process may not provide standard output to the debugger.": "Podłączony proces może nie przekazywać standardowego strumienia wyjściowego do debugera.",
+  "Show in Debug Tool Window": "Pokaż w oknie narzędziowym Debugowanie",
+  "Suspended": "Wstrzymano",
+  "Usage access filters": "Filtry dostępu użycia",
+  "Show read accesses": "Pokaż odczyty",
+  "Show write accesses": "Pokaż zapisy",
+  "No usages match the access filters": "Brak użyć pasujących do filtrów dostępu",
+  "On 'Update' action": "Przy akcji 'Aktualizuj'",
+  "Show chooser": "Pokaż okno wyboru",
+  "On frame deactivation": "Przy utracie fokusu przez okno",
+  "When all project windows lose focus to another application": "Gdy wszystkie okna projektu stracą fokus na rzecz innej aplikacji",
+  "Resources updated": "Zasoby zaktualizowane",
+  "Classes were compiled. Restart the application to load them, or launch with the debugger to use HotSwap.": "Klasy zostały skompilowane. Zrestartuj aplikację, aby je załadować, lub uruchom z debugerem, aby skorzystać z funkcji HotSwap.",
+  "Application update build failed": "Kompilacja aktualizacyjna aplikacji nie powiodła się",
+  "The Spring Boot configuration has no main class": "Konfiguracja Spring Boot nie posiada klasy głównej",
+  "Do nothing": "Nie rób nic",
+  "Cannot compare {root} against {label}: {error}": "Nie można porównać {root} z {label}: {error}",
+  "Compare with Branch or Revision": "Porównaj z gałęzią lub wersją",
+  "No changes against {revision} in 1 repository": "Brak zmian w porównaniu z wersją {revision} w 1 repozytorium",
+  "No changes against {revision} in {repositories} repositories": "Brak zmian w porównaniu z wersją {revision} w repozytoriach ({repositories})",
+  "Open or select a file or folder to compare": "Otwórz lub wybierz plik bądź folder do porównania",
+  "Selection is outside Git repositories": "Zaznaczony element znajduje się poza repozytoriami Git",
+  "Skipped content outside Git repositories: {skippedLabel}": "Pominięto zawartość znajdującą się poza repozytoriami Git: {skippedLabel}",
+  "in {length} repositories": "w repozytoriach ({length})",
+  "No repository in the selection has revision {label}": "Żadne z wypróbowanych repozytoriów nie posiada wersji {label}",
+  "{repoName} has no revision {label}": "Repozytorium {repoName} nie posiada wersji {label}",
+  "Waiting for language server…": "Oczekiwanie na serwer językowy…",
+  "Compare Directories": "Porównaj katalogi",
+  "Select two directories to compare": "Wybierz dwa katalogi do porównania",
+  "Select a directory to compare": "Wybierz katalog do porównania",
+  "Directory path": "Ścieżka katalogu",
+  "Only on left": "Tylko po lewej stronie",
+  "Only on right": "Tylko po prawej stronie",
+  "Contents differ": "Zawartości różnią się",
+  "Comparing directories": "Porównywanie katalogów",
+  "Filter by name": "Filtruj według nazwy",
+  "Show identical files": "Pokaż identyczne pliki",
+  "Copy to Left": "Kopiuj w lewo",
+  "Copy to Right": "Kopiuj w prawo",
+  "Compared files": "Porównywane pliki",
+  "Comparison cancelled": "Porównywanie anulowane",
+  "No matching differences": "Brak pasujących różnic",
+  "Overwrite files?": "Nadpisać pliki?",
+  "Copy to {to} and overwrite existing files?": "Skopiować do {to} i nadpisać istniejące pliki?",
+  "Left: {left}": "Lewa strona: {left}",
+  "Right: {right}": "Prawa strona: {right}",
+  "Compared {compared} of {total} entries": "Porównano {compared} z {total} wpisów",
+  "Scanned {scanned} entries": "Przeskanowano wpisy ({scanned})",
+  "Binary content": "Zawartość binarna",
+  "Binary files cannot be shown as text": "Pliki binarne nie mogą być wyświetlane jako tekst",
+  "Delete {path}?": "Usunąć {path}?",
+  "copy requires an absolute path": "kopiowanie wymaga ścieżki bezwzględnej",
+  "missing file name": "brakująca nazwa pliku",
+  "copy requires absolute paths": "kopiowanie wymaga ścieżek bezwzględnych",
+  "copy paths must belong to the comparison roots": "ścieżki kopiowania muszą należeć do ścieżek głównych porównania",
+  "cannot copy overlapping paths": "nie można kopiować nakładających się ścieżek",
+  "cannot copy through a destination symlink": "nie można kopiować przez dowiązanie symboliczne celu",
+  "expected a relative comparison entry path": "oczekiwano względnej ścieżki wpisu porównania",
+  "Agent sessions": "Sesje agenta",
+  "Back to conversation": "Powrót do rozmowy",
+  "Conversation location": "Lokalizacja rozmowy",
+  "Chat in Tool Window": "Czat w oknie narzędziowym",
+  "Chat in Editor": "Czat w edytorze",
+  "Agent settings": "Ustawienia agenta",
+  "Describe a task…": "Opisz zadanie…",
+  "Formatting profile": "Profil formatowania",
+  "Custom Eclipse formatter XML": "Własny plik XML formatowania Eclipse",
+  "Eclipse formatter XML": "Plik XML formatowania Eclipse",
+  "Changes take effect after Apply without restarting the Java language server.": "Zmiany wchodzą w życie po zatwierdzeniu bez konieczności ponownego uruchamiania serwera językowego Java.",
+  "Absolute or project-relative path. To reload an edited XML file, switch to Default, apply, then select Custom again.": "Ścieżka bezwzględna lub względna wobec projektu. Aby przeładować edytowany plik XML, przełącz na Domyślny, zastosuj, a następnie ponownie wybierz Niestandardowy.",
+  "Cannot read Java formatter XML {path}: {error}": "Nie można odczytać pliku XML formatowania Java {path}: {error}",
+  "Java formatter configuration unavailable": "Konfiguracja formatowania Java jest niedostępna",
+  "Choose an Eclipse formatter XML file.": "Wybierz plik XML formatowania Eclipse.",
+  "Not a formatter XML file: {path}": "To nie jest plik XML formatowania: {path}",
+  "CMake profiles": "Profile CMake",
+  "CMake profile actions": "Akcje profili CMake",
+  "No CMake profiles. Click + to add one.": "Brak profili CMake. Kliknij +, aby dodać.",
+  "Profile settings": "Ustawienia profilu",
+  "Build type": "Typ kompilacji",
+  "Generator": "Generator",
+  "CMake arguments": "Argumenty CMake",
+  "Build directory": "Katalog kompilacji",
+  "Build arguments": "Argumenty budowania",
+  "CMake default": "Domyślne dla CMake",
+  "Quote arguments containing spaces. Build arguments go to cmake --build; use -- before native build tool options.": "Argumenty zawierające spacje umieszczaj w cudzysłowach. Argumenty budowania przekazywane są do 'cmake --build'; użyj '--' przed opcjami natywnego narzędzia budowania.",
+  "CMake profile {0}": "Profil CMake {0}",
+  ".NET Project": "Projekt .NET",
+  ".NET project": "Projekt .NET",
+  "Run a .NET project with a launch profile": "Uruchom projekt .NET z profilem uruchamiania",
+  "Target framework": "Platforma docelowa (Target framework)",
+  "Launch profile": "Profil uruchamiania",
+  "Empty disables launch profiles": "Puste pole wyłącza profile uruchamiania",
+  "Empty uses the launch profile's arguments": "Puste pole stosuje argumenty profilu uruchamiania",
+  "Application URL": "Adres URL aplikacji",
+  "Profile environment variables": "Zmienne środowiskowe profilu",
+  "Environment variables below override the profile": "Zmienne środowiskowe poniżej zastępują wartości z profilu",
+  "Build .NET project": "Zbuduj projekt .NET",
+  "Run .NET tests": "Uruchom testy .NET",
+  "Test arguments": "Argumenty testów",
+  "netcoredbg is not installed": "Narzędzie netcoredbg nie jest zainstalowane",
+  ".NET Project requires the local machine": "Projekt .NET wymaga maszyny lokalnej",
+  "Select a .NET project": "Wybierz projekt .NET",
+  "Invalid .NET project path": "Nieprawidłowa ścieżka projektu .NET",
+  ".NET launch profile '{profile_name}' is missing or is not a Project profile": "Profil uruchamiania .NET '{profile_name}' nie istnieje lub nie jest profilem typu Projekt",
+  ".NET output resolution timed out": "Ustalanie wyników wyjściowych .NET przekroczyło limit czasu",
+  ".NET build output is missing; run dotnet build before debugging": "Brak plików wynikowych kompilacji .NET; uruchom 'dotnet build' przed debugowaniem",
+  "Cannot paste clipboard media": "Nie można wkleić mediów ze schowka",
+  "Cannot paste this path safely in cmd.exe. Use PowerShell or a POSIX shell.": "Nie można bezpiecznie wkleić tej ścieżki w wierszu poleceń cmd.exe. Użyj programu PowerShell lub powłoki zgodnej z POSIX.",
+  "Remote server does not support image paste.": "Serwer zdalny nie obsługuje wklejania obrazów.",
+  "Clipboard image reading is unavailable.": "Odczyt obrazu ze schowka jest niedostępny.",
+  "Clipboard media is too large to paste (limit {limit} MB).": "Plik ze schowka jest zbyt duży do wklejenia (limit wynosi {limit} MB).",
+  "unsupported clipboard media type": "nieobsługiwany typ danych ze schowka",
+  "Show inline blame for the current line": "Pokaż informacje o autorze zmian (blame) dla bieżącej linii w treści edytora",
+  "You, now · Uncommitted changes": "Ty, teraz · Niezatwierdzone zmiany",
+  "now": "teraz",
+  "Django tests": "Testy Django",
+  "Run Django tests with manage.py test": "Uruchom testy Django za pomocą manage.py test",
+  "e.g. python3, .venv/bin/python, uv, poetry": "np. python3, .venv/bin/python, uv, poetry",
+  "e.g. `run python` for uv/poetry; empty calls the interpreter itself": "np. `run python` dla uv/poetry; puste pole wywoła sam interpretator",
+  "App labels, modules or dotted test paths; empty runs every test": "Etykiety aplikacji, moduły lub ścieżki testów rozdzielone kropkami; puste pole uruchomi wszystkie testy",
+  "Settings module": "Moduł ustawień",
+  "Passed as --settings; empty keeps DJANGO_SETTINGS_MODULE or the default in manage.py": "Przekazywane jako --settings; puste pole zachowuje DJANGO_SETTINGS_MODULE lub domyślne ustawienie w manage.py",
+  "e.g. --keepdb --parallel": "np. --keepdb --parallel",
+  "Run PHPUnit tests": "Uruchom testy PHPUnit",
+  "e.g. vendor/bin/phpunit, phpunit, vendor/bin/pest": "np. vendor/bin/phpunit, phpunit, vendor/bin/pest",
+  "Test file or directory; empty runs the suites of the configuration file": "Plik lub katalog z testami; puste pole uruchomi zestawy z pliku konfiguracyjnego",
+  "Passed as --configuration; empty lets PHPUnit find phpunit.xml(.dist)": "Przekazywane jako --configuration; puste pole pozwala narzędziu PHPUnit odnaleźć plik phpunit.xml(.dist)",
+  "Test filter": "Filtr testów",
+  "Passed as --filter: a test name or a regular expression": "Przekazywane jako --filter: nazwa testu lub wyrażenie regularne",
+  "PHPUnit options": "Opcje PHPUnit",
+  "e.g. --stop-on-failure --testsuite unit": "np. --stop-on-failure --testsuite unit",
+  "CLI Interpreter": "Interpretator interfejsu wiersza poleceń (CLI)",
+  "PHP interpreter": "Interpretator PHP",
+  "Runs PHP scripts, PHPUnit, Composer and artisan, and the PHP-based language servers (phpactor). Its folder is put first on PATH, so vendor/bin/phpunit and other #!/usr/bin/env php scripts use it too.": "Uruchamia skrypty PHP, PHPUnit, Composer, artisan oraz serwery językowe oparte na PHP (phpactor). Jego folder umieszczany jest na początku zmiennej PATH, dzięki czemu skrypty vendor/bin/phpunit i inne #!/usr/bin/env php również z niego korzystają.",
+  "Select PHP Interpreter": "Wybierz interpretator PHP",
+  "select files in a git repository to shelve": "wybierz pliki w repozytorium Git do odłożenia na półkę (shelve)",
+  "select files from a single git repository to shelve": "wybierz pliki z pojedynczego repozytorium Git do odłożenia na półkę (shelve)",
+  "External file changes sync may be slow": "Synchronizacja zewnętrznych zmian w plikach może działać wolno",
+  "Cannot select Python interpreter": "Nie można wybrać interpretatora Python",
+  "Python Interpreter: {label}": "Interpretator Python: {label}",
+  "recursive": "rekurencyjnie",
+  "Java project import failed": "Import projektu Java nie powiódł się",
+  "The Java project cannot be imported because these files use a name Windows reserves for devices: {paths}. Delete or rename them, then restart the Java language server.": "Projekt Java nie może zostać zaimportowany, ponieważ te pliki używają nazw zastrzeżonych w systemie Windows dla urządzeń: {paths}. Usuń je lub zmień ich nazwy, a następnie uruchom ponownie serwer językowy Java.",
+  "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.": "Ten plik znajduje się poza folderami źródłowymi swojego modułu Java: zgłaszane są tylko błędy składniowe, a nawigacja i podpowiadanie kodu nie działają.",
+  "This Go file belongs to no package of the workspace: code insight is limited.": "Ten plik Go nie należy do żadnego pakietu w przestrzeni roboczej: funkcja analizy kodu jest ograniczona.",
+  "This Rust file is not included in any crate: rust-analyzer can't offer code insight for it.": "Ten plik Rust nie jest zawarty w żadnej paczce (crate): analyzer rust nie oferuje dla niego analizy kodu.",
+  "Reload Maven Projects": "Przeładuj projekty Maven",
+  "Reload Gradle Project": "Przeładuj projekt Gradle",
+  "Binary files cannot be resolved in the merge editor.": "Nie można rozwiązywać konfliktów w plikach binarnych za pomocą edytora scalania.",
+  "Accept (hold the modifier key to resolve using this side)": "Zaakceptuj (przytrzymaj klawisz modyfikujący, aby rozwiązać konflikt z użyciem tej strony)",
+  "Ignore (hold the modifier key to ignore both sides)": "Ignoruj (przytrzymaj klawisz modyfikujący, aby zignorować obie strony)",
+  "Unresolved Changes": "Nierozwiązane zmiany",
+  "{remaining} change is unresolved and keeps the base text. Save and mark the file as resolved anyway?": "{remaining} zmiana nie została rozwiązana i zachowuje tekst bazowy. Zapisać i oznaczyć plik jako rozwiązany mimo to?",
+  "{remaining} changes are unresolved and keep the base text. Save and mark the file as resolved anyway?": "Zmiany w liczbie {remaining} nie zostały rozwiązane i zachowują tekst bazowy. Zapisać i oznaczyć plik jako rozwiązany mimo to?",
+  "Apply Non-Conflicting Changes from the Left Side": "Zastosuj bezkonfliktowe zmiany z lewej strony",
+  "Apply All Non-Conflicting Changes": "Zastosuj wszystkie bezkonfliktowe zmiany",
+  "Apply Non-Conflicting Changes from the Right Side": "Zastosuj bezkonfliktowe zmiany z prawej strony",
+  "Automatically Apply Non-Conflicting Changes": "Automatycznie zastosuj bezkonfliktowe zmiany",
+  "Resolve Automatically": "Rozwiąż automatycznie",
+  "Resolve Simple Conflicts": "Rozwiąż proste konflikty",
+  "Revert Conflict Resolution": "Cofnij rozwiązanie konfliktu",
+  "Ignore": "Ignoruj",
+  "Accept": "Zaakceptuj",
+  "Resolve Using Yours": "Rozwiąż używając Twoich zmian",
+  "Resolve Using Theirs": "Rozwiąż używając Ich zmian",
+  "All changes processed": "Wszystkie zmiany zostały przetworzone",
+  "{pending} change left": "Pozostała {pending} zmiana",
+  "{pending} changes left": "Pozostało zmian: {pending}",
+  "Compare Contents": "Porównaj zawartość",
+  "Yours and Result": "Twoje zmiany i wynik",
+  "Result and Theirs": "Wynik i Ich zmiany",
+  "Yours and Theirs": "Twoje zmiany i Ich zmiany",
+  "Base and Yours": "Wersja bazowa i Twoje zmiany",
+  "Base and Result": "Wersja bazowa i wynik",
+  "Base and Theirs": "Wersja bazowa i Ich zmiany",
+  "Base": "Baza",
+  "Discard Changes": "Odrzuć zmiany",
+  "The result was changed. Discard the changes and take this version as it is?": "Wynik uległ zmianie. Odrzucić zmiany i przyjąć tę wersję w obecnej postaci?",
+  "Cancel Merge": "Anuluj scalanie",
+  "Exit without applying the changes made in the result?": "Wyjść bez stosowania zmian wprowadzonych w wyniku?",
+  "Apply Merge Result": "Zastosuj wynik scalania",
+  "Merge Settings": "Ustawienia scalania",
+  "Resolve Merge Change": "Rozwiąż zmianę scalania",
+  "File has unresolved merge conflicts": "Plik zawiera nierozwiązane konflikty scalania",
+  "Resolve conflicts…": "Rozwiąż konflikty…",
+  "Unresolved merge conflict marker": "Nierozwiązany znacznik konfliktu scalania",
+  "Unresolved merge conflicts": "Nierozwiązane konflikty scalania",
+  "Reports the <<<<<<<, ======= and >>>>>>> lines a merge leaves in a file, whatever its language and whether or not a language server is installed.": "Zgłasza linie <<<<<<<, ======= oraz >>>>>>> pozostawione przez scalanie w pliku, niezależnie od jego języka i od tego, czy zainstalowano serwer językowy.",
+  "Merge/Rebase Widget": "Widżet scalania/zmiany bazy (rebase)",
+  "Unresolved merge conflict markers": "Nierozwiązane znaczniki konfliktów scalania",
+  "What the session has cost so far, as the agent reports it": "Dotychczasowy koszt sesji zgłoszony przez agenta",
+  "{name}: {percent}% used": "{name}: wykorzystano {percent}%",
+  "{used}, resets in {reset}": "{used}, resetuje się za {reset}",
+  "5-hour limit": "Limit 5-godzinny",
+  "Weekly limit": "Limit tygodniowy",
+  "Weekly Opus limit": "Tygodniowy limit Opus",
+  "Weekly Sonnet limit": "Tygodniowy limit Sonnet",
+  "Chat": "Czat",
+  "Shown in the Task Header": "Pokazywane w nagłówku zadania",
+  "Context window usage": "Wykorzystanie okna kontekstu",
+  "Time spent on the task": "Czas poświęcony na zadanie",
+  "Usage limits": "Limity użycia",
+  "The account's 5-hour and weekly limits, when the agent reports them (Claude Code)": "Limity 5-godzinne oraz tygodniowe konta zgłaszane przez agenta (Claude Code)",
+  "Session cost": "Koszt sesji",
+  "What the session has cost so far, as the agent reports it (API pricing, also shown on subscriptions)": "Dotychczasowy koszt sesji zgłoszony przez agenta (cennik API, widoczny również w subskrypcjach)",
+  "Local: {path}": "Lokalnie: {path}",
+  "Local: (does not exist)": "Lokalnie: (nie istnieje)",
+  "Synchronize All": "Synchronizuj wszystko",
+  "Deployment comparison options": "Opcje porównywania wdrożenia",
+  "Refresh comparison": "Odśwież porównanie",
+  "Show local-only files": "Pokaż pliki występujące tylko lokalnie",
+  "Show different files": "Pokaż różniące się pliki",
+  "Show remote-only files": "Pokaż pliki występujące tylko zdalnie",
+  "Compare by:": "Porównuj według:",
+  "Compare by": "Porównuj według",
+  "Size and Timestamp": "Rozmiar i znacznik czasu",
+  "Binary Content": "Zawartość binarna",
+  "Synchronize Selected": "Synchronizuj zaznaczone",
+  "Stop content comparison": "Zatrzymaj porównywanie zawartości",
+  "Filter:": "Filtr:",
+  "Local files": "Pliki lokalne",
+  "Local name": "Nazwa lokalna",
+  "Remote name": "Nazwa zdalna",
+  "Space changes the selected operation. Enter synchronizes the selected file. Synchronize All applies all chosen operations.": "Klawisz spacji zmienia wybraną operację. Enter synchronizuje wybrany plik. Synchronizuj wszystko stosuje wszystkie wybrane operacje.",
+  "Resize file list and diff preview": "Zmień rozmiar listy plików i podglądu różnic (diff)",
+  "The deployment server or project is no longer available": "Serwer wdrażania lub projekt jest niedostępny",
+  "Select a file to compare its contents": "Wybierz plik, aby porównać jego zawartość",
+  "Loading file contents…": "Wczytywanie zawartości pliku…",
+  "This file is too large for the text preview. Use Binary Content to compare it.": "Ten plik jest zbyt duży dla podglądu tekstowego. Użyj opcji Zawartość binarna, aby go porównać.",
+  "Deployment comparison": "Porównanie wdrożenia",
+  "Wait for synchronization to finish before opening another comparison.": "Poczekaj na zakończenie synchronizacji przed otwarciem kolejnego porównania.",
+  "Save local changes?": "Zapisać zmiany lokalne?",
+  "Save the local files edited in this comparison before closing.": "Zapisz pliki lokalne edytowane w tym porównaniu przed zamknięciem.",
+  "Save and Close": "Zapisz i zamknij",
+  "Cannot close deployment comparison": "Nie można zamknąć porównania wdrożenia",
+  "Deployment Comparison": "Porównanie wdrożenia",
+  "Opening deployment comparison…": "Otwieranie porównania wdrożenia…",
+  "Diff Between 'local files' and 'files on {server}'": "Różnice pomiędzy 'plikami lokalnymi' a 'plikami w {server}'",
+  "Comparing contents: {done} of {total}": "Porównywanie zawartości: {done} z {total}",
+  "A file changed during comparison. Refresh and compare again.": "Plik uległ zmianie podczas porównywania. Odśwież i porównaj ponownie.",
+  "The project is no longer open.": "Projekt nie jest już otwarty.",
+  "The deployment server is no longer available.": "Serwer wdrażania jest już niedostępny.",
+  "No selected files are mapped to this deployment server.": "Żaden z wybranych plików nie jest zmapowany na ten serwer wdrażania.",
+  "Cannot open comparison for {server}": "Nie można otworzyć porównania dla {server}",
+  "Could not refresh comparison: {error}": "Nie udało się odświeżyć porównania: {error}",
+  "Build and run using": "Zbuduj i uruchom używając",
+  "Gradle runs a main class as a JavaExec task on its source set's runtime classpath (Gradle's resource processing included). OpenIDEA launches it on the Java language server's classpath.": "Gradle uruchamia klasę główną jako zadanie JavaExec w ścieżce klas wykonawczych swojego zestawu źródeł (włączając przetwarzanie zasobów Gradle). OpenIDEA uruchamia ją w ścieżce klas serwera językowego Java.",
+  "Set an absolute root path on the Connection tab first": "Najpierw ustaw bezwzględną ścieżkę główną w karcie Połączenie",
+  "Needs permission": "Wymaga uprawnienia",
+  "linked": "połączony",
+  "Revoke {id}": "Odwołaj {id}",
+  "Allow {id}": "Zezwól {id}",
+  "This version asks for new permissions. It stays off until you allow them.": "Ta wersja żąda nowych uprawnień. Pozostanie wyłączona do czasu ich udzielenia.",
+  "Plugins from a project folder run only after you allow them.": "Wtyczki z folderu projektu zostaną uruchomione dopiero po wyrażeniu na to zgody.",
+  "Review Permissions…": "Przejrzyj uprawnienia…",
+  "Statistics": "Statystyki",
+  "Activated {activations}× (last in {toFixed} ms), {calls} calls, {errors} errors, slowest {toFixed} ms": "Aktywowano razy: {activations} (ostatnio w {toFixed} ms), wywołania: {calls}, błędy: {errors}, najwolniejsze: {toFixed} ms",
+  "Recent calls p95 {toFixed} ms; {crashes} crashes, {slowCalls} editor results too late, reclaimed {reclaims}× when idle": "Niedawne wywołania p95 {toFixed} ms; awarie: {crashes}, spóźnione wyniki edytora: {slowCalls}, odzyskano razy: {reclaims} w stanie bezczynności",
+  "Linked plugin": "Połączona wtyczka",
+  "Project plugin": "Wtyczka projektu",
+  "Signed by {publisher}": "Podpisano przez {publisher}",
+  "Unsigned": "Brak podpisu",
+  "Roll Back to {previousVersion}": "Przywróć wersję {previousVersion}",
+  "Install Plugin from Package File…": "Zainstaluj wtyczkę z pliku pakietu…",
+  "Marketplace": "Rynek wtyczek (Marketplace)",
+  "Could not download plugin": "Nie udało się pobrać wtyczki",
+  "Rolled back {name} to {version}": "Przywrócono wtyczkę {name} do wersji {version}",
+  "Could not roll back": "Nie udało się cofnąć wersji",
+  "Could not open the package": "Nie udało się otworzyć pakietu",
+  "Settings of the plugin; projects can override them.": "Ustawienia wtyczki; projekty mogą je nadpisywać.",
+  "Menus": "Menu",
+  "Shortcuts": "Skróty",
+  "Status Bar Items": "Elementy paska stanu",
+  "Editors": "Edytory",
+  "Open With": "Otwórz za pomocą",
+  "The plugin could not show this view": "Wtyczka nie mogła wyświetlić tego widoku",
+  "Loading": "Wczytywanie",
+  "Insert Row Above": "Wstaw wiersz powyżej",
+  "Insert Row Below": "Wstaw wiersz poniżej",
+  "Delete {length} Rows": "Usuń wiersze ({length})",
+  "Delete Row": "Usuń wiersz",
+  "No rows": "Brak wierszy",
+  "Cell value": "Wartość komórki",
+  "Secrets": "Sekrety",
+  "Stored": "Zapisano",
+  "Not set": "Niewybrane",
+  "Replace…": "Zastąp…",
+  "Value of {label}": "Wartość {label}",
+  "The plugin can only send these with its network requests; it cannot read them.": "Wtyczka może jedynie przesyłać te wartości w swoich żądaniach sieciowych; nie może ich odczytywać.",
+  "Editor Providers": "Dostawcy edytora",
+  "Linked for development": "Połączone do celów programistycznych",
+  "Low": "Niski",
+  "Medium": "Średni",
+  "High": "Wysoki",
+  "Install {name} {version}?": "Zainstalować {name} {version}?",
+  "Allow {name} to run?": "Zezwolić na uruchomienie {name}?",
+  "Allow": "Zezwól",
+  "This package is not signed. Only continue if you trust where it came from.": "Ten pakiet nie jest podpisany. Kontynuuj tylko wtedy, gdy ufasz jego źródłu pochodzenia.",
+  "This plugin needs no special permissions.": "Ta wtyczka nie wymaga żadnych specjalnych uprawnień.",
+  "Requested permissions": "Wymagane uprawnienia",
+  "Required": "Wymagane",
+  "High-risk permissions are equivalent to running arbitrary code on this machine.": "Uprawnienia wysokiego ryzyka są równoważne z uruchamianiem dowolnego kodu na tym komputerze.",
+  "{icons} icons": "Ikony: {icons}",
+  "Use Default Icons": "Użyj ikon domyślnych",
+  "Apply icon theme {label}": "Zastosuj motyw ikon {label}",
+  "File Icon Themes": "Motywy ikon plików",
+  "File Icons": "Ikony plików",
+  "File Templates": "Szablony plików",
+  "Cannot show {label}": "Nie można wyświetlić {label}",
+  "{title} layout": "Układ {title}",
+  "Editor and {title}": "Edytor i {title}",
+  "{title} Only": "Tylko {title}",
+  "File icon theme": "Motyw ikon plików",
+  "Plugin not enabled": "Wtyczka nie jest włączona",
+  "Problems the {plugin} plugin reports. Severity \"As reported\" keeps the level the plugin assigns; a code below can override it.": "Problemy zgłaszane przez wtyczkę {plugin}. Poziom ważności \"Zgodnie ze zgłoszeniem\" zachowuje poziom przypisany przez wtyczkę; kod poniżej może go nadpisać.",
+  "The plugin system is a preview: its API and the plugins may still change.": "System wtyczek działa w wersji zapoznawczej: jego interfejs API oraz wtyczki mogą ulec zmianie.",
+  "'{expected}' expected": "Oczekiwano '{expected}'",
+  "Unexpected token": "Niekontrolowany token",
+  "Syntax": "Składnia",
+  "Syntax errors": "Błędy składni",
+  "Reports code the built-in parser cannot read, in files no language server checks (none is configured for the language, or it is not installed, stopped or crashed). A running language server reports syntax errors itself.": "Zgłasza kod, którego wbudowany parser nie jest w stanie odczytać, w plikach niekontrolowanych przez żaden serwer językowy (brak skonfigurowanego serwera, serwer niezainstalowany, zatrzymany lub uległ awarii). Uruchomiony serwer językowy sam zgłasza błędy składniowe.",
+  "Some items could not be restored": "Niektórych elementów nie udało się przywrócić",
+  "Not in Local History: {names}. They are in the Trash.": "Brak w historii lokalnej: {names}. Znajdują się w Koszu.",
+  "Show All Commits": "Pokaż wszystkie zatwierdzenia",
+  "Pin": "Przypnij",
+  "Unpin": "Odepnij",
+  "Project default": "Wartość domyślna projektu",
+  "The node executable this script runs on; empty uses Settings › Languages & Frameworks › Node.js.": "Plik wykonywalny Node, na którym uruchamiany jest ten skrypt; puste pole spowoduje użycie Ustawienia › Języki i frameworki › Node.js.",
+  "Loading repositories…": "Wczytywanie repozytoriów…",
+  "GitHub repositories are listed with the": "Repozytoria serwisu GitHub są wyświetlane z",
+  "Search repositories": "Przeszukaj repozytoria",
+  "Repositories": "Repozytoria",
+  "No matching repositories": "Brak pasujących repozytoriów",
+  "No repositories": "Brak repozytoriów",
+  "fork": "rozwidlenie (fork)",
+  "archived": "zarchiwizowane",
+  "Could not forward port {port}": "Nie udało się przekierować portu {port}",
+  "Remote port": "Port zdalny",
+  "Remote port, e.g. 3000": "Port zdalny, np. 3000",
+  "Forward Port": "Przekieruj port",
+  "No forwarded ports": "Brak przekierowanych portów",
+  "Forward a port of the remote host to reach it from this machine, e.g. a web server in a browser.": "Przekieruj port zdalnego hosta, aby uzyskać do niego dostęp z tego komputera, np. do serwera WWW w przeglądarce.",
+  "Forwarded ports": "Przekierowane porty",
+  "Open {addr} in Browser": "Otwórz {addr} w przeglądarce",
+  "Copy {addr}": "Kopiuj {addr}",
+  "Stop Forwarding Port {remotePort}": "Zatrzymaj przekierowanie portu {remotePort}",
+  "Ports": "Porty",
+  "GraphQL views": "Widoki GraphQL",
+  "Schemas and Project Structure": "Schematy i struktura projektu",
+  "Query Result": "Wynik zapytania",
+  "Default project-wide schema": "Domyślny schemat w całym projekcie",
+  "the configuration is code and is not evaluated": "konfiguracja jest kodem i nie podlega ewaluacji",
+  "schema is empty": "schemat jest pusty",
+  "Schema discovery summary": "Podsumowanie odnajdywania schematów",
+  "Schema errors": "Błędy schematu",
+  "No errors found": "Nie znaleziono błędów",
+  "Endpoints": "Punkt końcowy (Endpoints)",
+  "No endpoints available in this schema": "Brak dostępnych punktów końcowych w tym schemacie",
+  "No endpoints available in the default schema": "Brak dostępnych punktów końcowych w domyślnym schemacie",
+  "GraphQL actions": "Akcje GraphQL",
+  "Discovering GraphQL schemas": "Odnajdywanie schematów GraphQL",
+  "GraphQL schemas": "Schematy GraphQL",
+  "Running GraphQL query": "Wykonywanie zapytania GraphQL",
+  "No query results": "Brak wyników zapytania",
+  "Add Schema Configuration": "Dodaj konfigurację schematu",
+  "Open the project's graphql-config, creating graphql.config.yml when there is none": "Otwiera plik graphql-config projektu, tworząc plik graphql.config.yml, jeśli nie istnieje",
+  "Restart Schema Discovery": "Uruchom ponownie odnajdywanie schematów",
+  "Find the project's GraphQL schemas and configurations again": "Znajdź ponownie schematy i konfiguracje GraphQL projektu",
+  "GraphQL schema discovery failed": "Odnajdywanie schematów GraphQL nie powiodło się",
+  "Cannot create the GraphQL configuration": "Nie można utworzyć konfiguracji GraphQL",
+  "No GraphQL endpoint": "Brak punktu końcowego GraphQL",
+  "Declare one under extensions.endpoints in graphql.config.yml.": "Zadeklaruj punkt końcowy w sekcji extensions.endpoints w pliku graphql.config.yml.",
+  "The field type '{name}' is not present when resolving type '{owner}'": "Typ pola '{name}' nie występuje podczas ustalania typu '{owner}'",
+  "GraphQL editor actions": "Akcje edytora GraphQL",
+  "Open Configuration File": "Otwórz plik konfiguracyjny",
+  "Toggle Variables Editor": "Przełącz edytor zmiennych",
+  "GraphQL endpoint": "Punkt końcowy GraphQL",
+  "No endpoints": "Brak punktów końcowych",
+  "Execute GraphQL": "Wykonaj GraphQL",
+  "Rerun Introspection Query": "Uruchom ponownie zapytanie introspekcji",
+  "Open Introspection Schema": "Otwórz schemat introspekcji",
+  "GraphQL variables": "Zmienne GraphQL",
+  "{types} types, {inputs} inputs, {enums} enums, {directives} directives": "Typy: {types}, dane wejściowe: {inputs}, enumy: {enums}, dyrektywy: {directives}",
+  "Run a query with Execute GraphQL in the toolbar of a GraphQL file.": "Uruchom zapytanie przyciskiem Wykonaj GraphQL na pasku narzędzi pliku GraphQL.",
+  "Query result": "Wynik zapytania",
+  "Opens the GraphQL config file for the current file's schema": "Otwiera plik konfiguracyjny GraphQL dla schematu bieżącego pliku",
+  "Reruns the latest introspection query to update the local schema file": "Uruchamia ponownie najnowsze zapytanie introspekcji, aby zaktualizować lokalny plik schematu",
+  "Executes the current GraphQL file against the specified GraphQL endpoint": "Wykonuje bieżący plik GraphQL na określonym punkcie końcowym GraphQL",
+  "Invalid GraphQL variables": "Nieprawidłowe zmienne GraphQL",
+  "Get GraphQL Schema from Endpoint": "Pobierz schemat GraphQL z punktu końcowego",
+  "Replace the contents of {target} with the schema of {name}?": "Zastąpić zawartość pliku {target} schematem z {name}?",
+  "Cannot write the GraphQL schema": "Nie można zapisać schematu GraphQL",
+  "{target} did not open in an editor": "Plik {target} nie został otwarty w edytorze",
+  "GraphQL schema updated": "Zaktualizowano schemat GraphQL",
+  "No introspection schema yet": "Brak schematu introspekcji",
+  "Run Introspection Query on an endpoint to generate it.": "Uruchom zapytanie introspekcji w punkcie końcowym, aby go wygenerować.",
+  ", 1 error": ", 1 błąd",
+  ", {count} errors": ", błędy: {count}",
+  "GraphQL Environment Variables": "Zmienne środowiskowe GraphQL",
+  "Environment variables actions": "Akcje zmiennych środowiskowych",
+  "{file}: {ms} ms execution time, {size} response": "{file}: czas wykonania {ms} ms, rozmiar odpowiedzi {size}",
+  "GraphQL error": "Błąd GraphQL",
+  "GraphQL request to {url} failed.": "Żądanie GraphQL do {url} nie powiodło się.",
+  "Show error": "Pokaż błąd",
+  "Run to Cursor failed": "Uruchomienie do kursora nie powiodło się",
+  "Cannot start debugging": "Nie można rozpocząć debugowania",
+  "Cannot attach the debugger": "Nie można podłączyć debugera",
+  "Resume failed": "Wznowienie nie powiodło się",
+  "Pause failed": "Wstrzymanie nie powiodło się",
+  "Force Step Over failed": "Wymuszenie wykonania kroku nad (Step Over) nie powiodło się",
+  "Force Step Into failed": "Wymuszenie wykonania kroku do wnętrza (Step Into) nie powiodło się",
+  "Reset Frame failed": "Zresetowanie klatki (frame) nie powiodło się",
+  "Force Run to Cursor failed": "Wymuszenie uruchomienia do kursora nie powiodło się",
+  "Cannot create file": "Nie można utworzyć pliku",
+  "Cannot access the clipboard": "Nie można uzyskać dostępu do schowka",
+  "Could not start container": "Nie udało się uruchomić kontenera",
+  "Could not stop container": "Nie udało się zatrzymać kontenera",
+  "Could not restart container": "Nie udało się zrestartować kontenera",
+  "Could not pause container": "Nie udało się wstrzymać kontenera",
+  "Could not unpause container": "Nie udało się wznowić kontenera",
+  "Could not kill container": "Nie udało się wymusić zatrzymania kontenera",
+  "Could not remove container": "Nie udało się usunąć kontenera",
+  "Could not remove image": "Nie udało się usunąć obrazu",
+  "Could not remove volume": "Nie udało się usunąć wolumenu",
+  "Could not remove network": "Nie udało się usunąć sieci",
+  "Could not pull {reference}": "Nie udało się pobrać (pull) {reference}",
+  "Could not prune": "Nie udało się przeprowadzić czyszczenia (prune)",
+  "Pruning stopped containers…": "Czyszczenie zatrzymanych kontenerów…",
+  "Pruning dangling images…": "Czyszczenie osieroconych obrazów…",
+  "Pruning unused images…": "Czyszczenie nieużywanych obrazów…",
+  "Pruning unused volumes…": "Czyszczenie nieużywanych wolumenów…",
+  "Pruning unused networks…": "Czyszczenie nieużywanych sieci…",
+  "Pruning the system…": "Czyszczenie systemu…",
+  "Starting Compose project {project}…": "Uruchamianie projektu Compose {project}…",
+  "Stopping Compose project {project}…": "Zatrzymywanie projektu Compose {project}…",
+  "Restarting Compose project {project}…": "Restartowanie projektu Compose {project}…",
+  "Taking down Compose project {project}…": "Zamykanie i usuwanie projektu Compose {project}…",
+  "Could not start Compose project {project}": "Nie udało się uruchomić projektu Compose {project}",
+  "Could not stop Compose project {project}": "Nie udało się zatrzymać projektu Compose {project}",
+  "Could not restart Compose project {project}": "Nie udało się zrestartować projektu Compose {project}",
+  "Could not take down Compose project {project}": "Nie udało się zamknąć i usunąć projektu Compose {project}",
+  "Stage hunk of {path}": "Dodaj fragment pliku {path} do poczekalni (stage)",
+  "{path} reverted": "Cofnięto zmiany w {path}",
+  "{length} files reverted": "Cofnięto zmiany w plikach: {length}",
+  "Resolve {path}": "Rozwiąż {path}",
+  "{path}: conflicts resolved": "{path}: konflikty zostały rozwiązane",
+  "Create branch {value}": "Utwórz gałąź {value}",
+  "Merge {branch} into {current}": "Scal {branch} z {current}",
+  "Merged {branch} into {current}": "Scalono {branch} z {current}",
+  "Rebase {current} onto {branch}": "Wykonaj rebase {current} na {branch}",
+  "Rebased {current} onto {branch}": "Wykonano rebase {current} na {branch}",
+  "Rename branch {name}": "Zmień nazwę gałęzi {name}",
+  "Renamed branch {name} to {to}": "Zmieniono nazwę gałęzi {name} na {to}",
+  "Delete branch {name}": "Usuń gałąź {name}",
+  "Restore branch {name}": "Przywróć gałąź {name}",
+  "Merge {branch} ({root})": "Scal {branch} ({root})",
+  "Rebase onto {branch} ({root})": "Wykonaj rebase na {branch} ({root})",
+  "Delete branch {name} ({root})": "Usuń gałąź {name} ({root})",
+  "1 file amended in {several} repositories": "Zatwierdzenie z poprawką (amend) 1 pliku w repozytoriach ({several})",
+  "{n} files amended in {several} repositories": "Zatwierdzenie z poprawką (amend) {n} plików w repozytoriach ({several})",
+  "1 file amended": "Zatwierdzenie z poprawką (amend) 1 pliku",
+  "{n} files amended": "Zatwierdzenie z poprawką (amend) {n} plików",
+  "1 file committed in {several} repositories": "Zatwierdzono 1 plik w repozytoriach ({several})",
+  "{n} files committed in {several} repositories": "Zatwierdzono {n} plików w repozytoriach ({several})",
+  "1 file committed": "Zatwierdzono 1 plik",
+  "{n} files committed": "Zatwierdzono {n} plików",
+  "Rolled back 1 file": "Wycofano 1 plik",
+  "Rolled back {length} files": "Wycofano pliki w liczbie: {length}",
+  "Add 1 file to Git": "Dodaj 1 plik do Git",
+  "Add {length} files to Git": "Dodaj pliki ({length}) do Git",
+  "Stash changes": "Odłóż zmiany do schowka (stash)",
+  "Changes stashed": "Zmiany zostały odłożone do schowka (stash)",
+  "Unstashed {ref} on branch {branch}": "Przywrócono {ref} ze schowka (stash) w gałęzi {branch}",
+  "Unstashed {ref}": "Przywrócono {ref} ze schowka (stash)",
+  "Applied {ref}": "Zastosowano {ref}",
+  "Dropped {ref}": "Odrzucono {ref}",
+  "Remove 1 file from Git": "Usuń 1 plik z Git",
+  "Remove {n} files from Git": "Usuń pliki ({n}) z Git",
+  "Accept yours for {path}": "Zaakceptuj Twoje zmiany dla {path}",
+  "Accept theirs for {path}": "Zaakceptuj Ich zmiany dla {path}",
+  "{path} resolved": "{path}: rozwiązano",
+  "Revert selected changes": "Cofnij wybrane zmiany",
+  "Create tag {value}": "Utwórz tag {value}",
+  "Created tag {value} on {id}": "Utworzono tag {value} w zatwierdzeniu {id}",
+  "Created tag {tag}": "Utworzono tag {tag}",
+  "Create patch": "Utwórz łatkę (patch)",
+  "Apply patch ({source})": "Zastosuj łatkę ({source})",
+  "Undo commit {id}": "Cofnij zatwierdzenie {id}",
+  "Undid commit {id} “{summary}”; its changes are staged": "Cofnięto zatwierdzenie {id} “{summary}”; zmiany znajdują się w poczekalni (staged)",
+  "Shelve changes “{trim}”": "Odłóż zmiany na półkę (shelve) “{trim}”",
+  "Unshelve “{name}”": "Przywróć “{name}” z półki (unshelve)",
+  "Delete shelved changes “{name}”": "Usuń odłożone zmiany z półki “{name}”",
+  "Rename shelved changes": "Zmień nazwę zmian na półce",
+  "Passed to the agent process, replacing variables of the same name. Changes apply to new sessions.": "Przekazywane do procesu agenta, zastępujące zmienne o tej samej nazwie. Zmiany dotyczą nowych sesji.",
+  "Expected NAME=value: {pair}": "Oczekiwano formatu NAZWA=wartość: {pair}",
+  "Checking out #{number}…": "Pobieranie (checkout) #{number}…",
+  "Couldn't check out #{number}": "Nie udało się wykonać checkout #{number}",
+  "Fetching #{number}…": "Pobieranie (fetch) #{number}…",
+  "Couldn't fetch #{number}": "Nie udało się wykonać fetch #{number}",
+  "Creating worktree for #{number}…": "Tworzenie drzewa roboczego (worktree) dla #{number}…",
+  "Couldn't create the worktree for #{number}": "Nie udało się utworzyć drzewa roboczego (worktree) dla #{number}",
+  "Couldn't commit the suggested change": "Nie udało się zatwierdzić sugerowanej zmiany",
+  "Couldn't apply the suggested change": "Nie udało się zastosować sugerowanej zmiany",
+  "Couldn't resolve the thread": "Nie udało się rozwiązać wątku",
+  "Could not close comparison": "Nie udało się zamknąć porównania",
+  "Could not open comparison": "Nie udało się otworzyć porównania",
+  "Could not show diff": "Nie udało się wyświetlić różnic (diff)",
+  "Back to Changed Files": "Powrót do zmienionych plików",
+  "Default (the module's JDK)": "Domyślnie (zestaw JDK modułu)",
+  "Use classpath of module": "Użyj ścieżki klas modułu",
+  "Find by main class": "Znajdź według klasy głównej"
+}
diff --git a/src/platform/locales/text/pt.json b/src/platform/locales/text/pt.json
new file mode 100644
index 00000000..ff82111d
--- /dev/null
+++ b/src/platform/locales/text/pt.json
@@ -0,0 +1,6000 @@
+{
+  "Edit {name}": "Editar {name}",
+  "Whitespace-only changes": "Alterações apenas de espaços em branco",
+  " · Whitespace-only changes": " · Alterações apenas de espaços em branco",
+  " · 1 moved block": " · 1 bloco movido",
+  " · {moves} moved blocks": " · {moves} blocos movidos",
+  "Moved to line {line} with internal edits": "Movido para a linha {line} com edições internas",
+  "Moved from line {line} with internal edits": "Movido da linha {line} com edições internas",
+  "To L{line} (edited)": "Para L{line} (editado)",
+  "From L{line} (edited)": "De L{line} (editado)",
+  "Moved to line {line}": "Movido para a linha {line}",
+  "Moved from line {line}": "Movido da linha {line}",
+  "Go to moved code at line {line}": "Ir para o código movido na linha {line}",
+  "Go to original code at line {line}": "Ir para o código original na linha {line}",
+  "Edited within moved code": "Editado dentro do código movido",
+  "The language server JDK ({path}) must be a full JDK with jdk.compiler, jdk.jdi and jdk.unsupported for Java language support and debugging. jdtls needs JDK {version} or newer. Download JDK {version}, choose a full JDK in {setting}, or set it to Auto.": "O JDK do servidor de linguagem ({path}) deve ser um JDK completo com jdk.compiler, jdk.jdi e jdk.unsupported para suporte à linguagem Java e depuração. O jdtls requer JDK {version} ou mais recente. Baixe o JDK {version}, escolha um JDK completo em {setting} ou defina como Automático.",
+  "ACP Registry": "Registro ACP",
+  "Apple's clangd does not run clang-tidy, so checks from .clang-tidy are not shown. Install clangd (LLVM) to get them.": "O clangd da Apple não executa o clang-tidy, portanto as verificações do .clang-tidy não são exibidas. Instale o clangd (LLVM) para obtê-las.",
+  "Auto-detect ({defaultProgram})": "Detectar automaticamente ({defaultProgram})",
+  "Built-in": "Integrado",
+  "Built-in agents": "Agentes integrados",
+  "Custom executable": "Executável personalizado",
+  "Found on PATH": "Encontrado no PATH",
+  "Launch command": "Comando de inicialização",
+  "Sign in": "Entrar",
+  "Leave empty to find the executable on PATH. Changes apply to new sessions.": "Deixe em branco para encontrar o executável no PATH. As alterações se aplicam a novas sessões.",
+  "Newer dependency version available": "Versão mais recente da dependência disponível",
+  "Not found": "Não encontrado",
+  "Not found on PATH": "Não encontrado no PATH",
+  "Reports newer crate versions that Cargo.toml requirements do not already allow.": "Informa versões mais recentes de crates que os requisitos do Cargo.toml ainda não permitem.",
+  "Run `auggie login` in a terminal.": "Execute `auggie login` em um terminal.",
+  "Run `claude` in a terminal and sign in.": "Execute `claude` em um terminal e entre.",
+  "Run `codex login` in a terminal.": "Execute `codex login` em um terminal.",
+  "Run `copilot` in a terminal and sign in.": "Execute `copilot` em um terminal e entre.",
+  "Run `cursor-agent login` in a terminal.": "Execute `cursor-agent login` em um terminal.",
+  "Run `gemini` in a terminal and sign in.": "Execute `gemini` em um terminal e entre.",
+  "Run `goose configure` in a terminal.": "Execute `goose configure` em um terminal.",
+  "Run `kimi` in a terminal and sign in.": "Execute `kimi` em um terminal e entre.",
+  "Run `kiro-cli login` in a terminal.": "Execute `kiro-cli login` em um terminal.",
+  "Run `opencode auth login` in a terminal.": "Execute `opencode auth login` em um terminal.",
+  "Run `qwen` in a terminal and sign in.": "Execute `qwen` em um terminal e entre.",
+  "Run `vibe` in a terminal and sign in.": "Execute `vibe` em um terminal e entre.",
+  "Sign in with the agent's own command line first.": "Primeiro entre usando a linha de comando do próprio agente.",
+  "This agent is configured in its agent file.": "Este agente é configurado em seu arquivo de agente.",
+  "This agent is installed from the ACP Registry. Manage its installation in the ACP Registry tab.": "Este agente foi instalado a partir do Registro ACP. Gerencie sua instalação na guia Registro ACP.",
+  "This agent runs through a package runner (npm or uv) and has no executable to choose.": "Este agente é executado por meio de um executor de pacotes (npm ou uv) e não possui um executável para selecionar.",
+  "Update to {latest}": "Atualizar para {latest}",
+  "A newer version is available: {latest}": "Uma versão mais recente está disponível: {latest}",
+  "Kotlin bridge requires a Maven build root": "A ponte do Kotlin requer uma raiz de build do Maven",
+  "Kotlin bridge bundle is unavailable": "O pacote da ponte do Kotlin está indisponível",
+  "Kotlin bridge command did not acknowledge its library snapshot": "O comando da ponte do Kotlin não confirmou o instantâneo da sua biblioteca",
+  "Kotlin editor compilation failed": "Falha na compilação do editor Kotlin",
+  "Updating results…": "Atualizando resultados…",
+  "Uploading files": "Enviando arquivos",
+  "No files on the clipboard": "Nenhum arquivo na área de transferência",
+  "File name is not valid UTF-8": "O nome do arquivo não é um UTF-8 válido",
+  "Project opening cancelled": "Abertura do projeto cancelada",
+  "Project is in Restricted Mode": "O projeto está no Modo Restrito",
+  "Project is in Restricted Mode. Trust the project to enable execution.": "O projeto está no Modo Restrito. Confie no projeto para habilitar a execução.",
+  "Trust and Open Project?": "Confiar e abrir o projeto?",
+  "Preview in Restricted Mode": "Visualizar no Modo Restrito",
+  "Don't Open": "Não abrir",
+  "If you don't trust the source, preview the project in Restricted Mode, where project commands and tools can't run.": "Se você não confia na origem, visualize o projeto no Modo Restrito, onde comandos e ferramentas do projeto não podem ser executados.",
+  "Loading, running or building a project may execute potentially malicious code from its build scripts.": "Carregar, executar ou compilar um projeto pode executar código potencialmente malicioso de seus scripts de build.",
+  "Trust projects in": "Confiar em projetos em",
+  "Restricted Mode: project commands and tools are disabled.": "Modo Restrito: comandos e ferramentas do projeto estão desativados.",
+  "Trust Project": "Confiar no projeto",
+  "Trust decisions are saved in your user data and take effect immediately.": "As decisões de confiança são salvas nos seus dados de usuário e entram em vigor imediatamente.",
+  "Trusted projects": "Projetos confiáveis",
+  "Trusted locations": "Locais confiáveis",
+  "Revoke Trust": "Revogar confiança",
+  "Project Trust": "Confiança do projeto",
+  "Security": "Segurança",
+  "Remove Trusted Location": "Remover local confiável",
+  "Cannot determine the module for main class '{value}'": "Não é possível determinar o módulo para a classe principal '{value}'",
+  "Java module '{value}' is not imported. Wait for Java project import to finish. If it still fails, check the run configuration's module and whether it is included in the parent Maven or Gradle build, or open its folder as a project.": "O módulo Java '{value}' não foi importado. Aguarde a conclusão da importação do projeto Java. Se a falha persistir, verifique o módulo da configuração de execução e se ele está incluído no build pai do Maven ou Gradle, ou abra sua pasta como um projeto.",
+  "Attach": "Anexar",
+  "Remove from Workspace": "Remover do espaço de trabalho",
+  "Downloading Java {0} language server runtime": "Baixando o runtime do servidor de linguagem Java {0}",
+  "auto-managed; uses an installed JDK or downloads a runtime when needed": "gerenciado automaticamente; usa um JDK instalado ou baixa um runtime quando necessário",
+  "Runs jdtls only; the project keeps its Project JDK. When empty, a suitable installed JDK is used first, otherwise Eclipse Temurin is downloaded automatically into a separate language-server folder. The jdtls executable itself is set in Language Servers.": "Executa apenas o jdtls; o projeto mantém seu JDK do Projeto. Quando vazio, um JDK instalado adequado é usado primeiro; caso contrário, o Eclipse Temurin é baixado automaticamente em uma pasta separada do servidor de linguagem. O executável do jdtls é configurado em Servidores de linguagem.",
+  "Semantic Highlighting": "Destaque semântico",
+  "Rainbow Brackets": "Rainbow Brackets",
+  "Comment with Line Comment": "Comentar com comentário de linha",
+  "Comment with Block Comment": "Comentar com comentário em bloco",
+  "Duplicate Line or Selection": "Duplicar linha ou seleção",
+  "Delete Line": "Excluir linha",
+  "Move Line Up": "Mover linha para cima",
+  "Move Line Down": "Mover linha para baixo",
+  "Move Statement Up": "Mover instrução para cima",
+  "Move Statement Down": "Mover instrução para baixo",
+  "Extend Selection": "Estender seleção",
+  "Shrink Selection": "Reduzir seleção",
+  "Toggle Fold": "Alternar dobra",
+  "Cyclic Expand Word": "Expandir palavra ciclicamente",
+  "Cyclic Expand Word (Backward)": "Expandir palavra ciclicamente (para trás)",
+  "Paste as Plain Text": "Colar como texto sem formatação",
+  "Add Selection for Next Occurrence": "Adicionar seleção para a próxima ocorrência",
+  "Select All Occurrences": "Selecionar todas as ocorrências",
+  "Complete Current Statement": "Completar instrução atual",
+  "Start New Line": "Iniciar nova linha",
+  "Start New Line Before Current": "Iniciar nova linha antes da atual",
+  "Split Line": "Dividir linha",
+  "Scroll to Center": "Rolar para o centro",
+  "Move Caret to Code Block Start": "Mover cursor para o início do bloco de código",
+  "Move Caret to Code Block End": "Mover cursor para o fim do bloco de código",
+  "Clone Caret Above": "Clonar cursor acima",
+  "Clone Caret Below": "Clonar cursor abaixo",
+  "Join Lines": "Juntar linhas",
+  "Toggle Case": "Alternar maiúsculas/minúsculas",
+  "Add Carets to Ends of Selected Lines": "Adicionar cursores ao final das linhas selecionadas",
+  "Unselect Occurrence": "Desmarcar ocorrência",
+  "Paste from History…": "Colar do histórico…",
+  "Sort Lines": "Ordenar linhas",
+  "Reverse Lines": "Inverter linhas",
+  "Unwrap/Remove…": "Desenvolver/remover…",
+  "Basic": "Básico",
+  "Quick Definition": "Definição rápida",
+  "Reformat File…": "Reformatar arquivo…",
+  "Go to Declaration or Usages": "Ir para declaração ou usos",
+  "Go to Implementation(s)": "Ir para implementação(ões)",
+  "Go to Type Declaration": "Ir para declaração de tipo",
+  "Next Highlighted Error": "Próximo erro destacado",
+  "Previous Highlighted Error": "Erro destacado anterior",
+  "Highlight Usages in File": "Destacar usos no arquivo",
+  "Implement Methods…": "Implementar métodos…",
+  "Override Methods…": "Sobrescrever métodos…",
+  "Expression Type Info": "Informações de tipo da expressão",
+  "Next Method": "Próximo método",
+  "Previous Method": "Método anterior",
+  "Copy Absolute Path": "Copiar caminho absoluto",
+  "Copy Path From Content Root": "Copiar caminho a partir da raiz do conteúdo",
+  "Copy File Name": "Copiar nome do arquivo",
+  "Fixup…": "Fixup…",
+  "Step Over": "Passar por cima",
+  "Step Out": "Passar para fora",
+  "Zoom In": "Mais zoom",
+  "Zoom Out": "Menos zoom",
+  "Actual Size": "Tamanho real",
+  "Fit Zoom to Window": "Ajustar zoom à janela",
+  "Show Chessboard": "Mostrar padrão xadrez",
+  "Editor Only": "Somente editor",
+  "Editor and Preview": "Editor e visualização",
+  "Preview Only": "Somente visualização",
+  "Add Maven Projects": "Adicionar projetos Maven",
+  "Unlink Maven Projects": "Desvincular projetos Maven",
+  "Unlink Maven projects?": "Desvincular projetos Maven?",
+  "Remove this project and its modules from Maven? Files will remain in the Project view.": "Remover este projeto e seus módulos do Maven? Os arquivos permanecerão na exibição do Projeto.",
+  "Remove this module and its submodules from Maven? The Java language server stops importing them, so they no longer use memory. Files will remain in the Project view; add the pom.xml again to restore them.": "Remover este módulo e seus submódulos do Maven? O servidor de linguagem Java deixará de importá-los, liberando memória. Os arquivos permanecerão na exibição do Projeto; adicione o pom.xml novamente para restaurá-los.",
+  "Unlink": "Desvincular",
+  "(does not exist)": "(não existe)",
+  ", e.g.": ", por exemplo",
+  ", then press Tab.": ", depois pressione Tab.",
+  "? This cannot be undone.": "? Esta ação não pode ser desfeita.",
+  "API request failed, retrying (attempt {attempt})": "Falha na solicitação de API, tentando novamente (tentativa {attempt})",
+  "API request failed, retrying in {wait}s (attempt {attempt})": "Falha na solicitação de API, tentando novamente em {wait}s (tentativa {attempt})",
+  "A charset in .editorconfig takes precedence. Change one file's encoding from the status bar.": "A codificação definida em .editorconfig tem precedência. Altere a codificação de um arquivo na barra de status.",
+  "A command line, e.g. /bin/zsh --login. Leave empty to use the login shell.": "Uma linha de comando, por exemplo: /bin/zsh --login. Deixe em branco para usar o shell de login.",
+  "A line breakpoint that is removed after it is hit": "Um ponto de interrupção de linha que é removido após ser atingido",
+  "Abbreviation": "Abreviação",
+  "Abort Cherry-Pick": "Abortar cherry-pick",
+  "Abort Merge": "Abortar mesclagem",
+  "Abort Rebase": "Abortar rebase",
+  "Abort Revert": "Abortar reversão",
+  "Absolute Path": "Caminho absoluto",
+  "Absolute path of the current file": "Caminho absoluto do arquivo atual",
+  "Accent color": "Cor de destaque",
+  "Accent colour": "Cor de destaque",
+  "Accept Both (Conflict at Caret)": "Aceitar ambos (conflito no cursor)",
+  "Accept Theirs": "Aceitar deles",
+  "Accept Theirs (Conflict at Caret)": "Aceitar deles (conflito no cursor)",
+  "Accept Yours": "Aceitar seus",
+  "Accept Yours (Conflict at Caret)": "Aceitar seus (conflito no cursor)",
+  "Accessibility": "Acessibilidade",
+  "Action id (bind it in Keymap)": "ID da ação (vincule-a no Mapa de teclas)",
+  "Actions": "Ações",
+  "Actions on Save": "Ações ao salvar",
+  "Actions run when a file is saved with Save (⌘S) or Save All. Trailing spaces and the final line break are configured in": "Ações executadas quando um arquivo é salvo com Salvar (⌘S) ou Salvar tudo. Espaços finais e quebra de linha final são configurados em",
+  "Activate on Save": "Ativar ao salvar",
+  "Activate virtualenv": "Ativar virtualenv",
+  "Add": "Adicionar",
+  "Add Column": "Adicionar coluna",
+  "Add Field Watchpoint": "Adicionar ponto de inspeção de campo",
+  "Add File to Git": "Adicionar arquivo ao Git",
+  "Add GitHub Pattern": "Adicionar padrão do GitHub",
+  "Add Interpreter…": "Adicionar interpretador…",
+  "Add JIRA Pattern": "Adicionar padrão do JIRA",
+  "Add Keyboard Shortcut": "Adicionar atalho de teclado",
+  "Add Kind": "Adicionar tipo",
+  "Add Method Breakpoint": "Adicionar ponto de interrupção de método",
+  "Add New Configuration": "Adicionar nova configuração",
+  "Add Pattern": "Adicionar padrão",
+  "Add Python Interpreter": "Adicionar interpretador Python",
+  "Add Row": "Adicionar linha",
+  "Add Template": "Adicionar modelo",
+  "Add YouTrack Pattern": "Adicionar padrão do YouTrack",
+  "Add one in the Database tool window.": "Adicione uma na janela de ferramentas Banco de dados.",
+  "Add pattern": "Adicionar padrão",
+  "Add silently": "Adicionar silenciosamente",
+  "Add to Favorites": "Adicionar aos favoritos",
+  "Add to VCS": "Adicionar ao VCS",
+  "Add to Watches": "Adicionar às expressões de inspeção",
+  "Add unambiguous imports on the fly": "Adicionar importações não ambíguas em tempo real",
+  "Added to the environment of new terminal sessions.": "Adicionado ao ambiente de novas sessões de terminal.",
+  "Additional arguments": "Argumentos adicionais",
+  "Adjust colors for red-green vision deficiency": "Ajustar cores para daltonismo vermelho-verde",
+  "After Replace": "Após substituição",
+  "After Stop, the process gets this long to exit after the interrupt before it is killed.": "Após a parada, o processo tem esse tempo para sair após a interrupção antes de ser encerrado à força.",
+  "Align Changes": "Alinhar alterações",
+  "All": "Tudo",
+  "All Places": "Todos os locais",
+  "All breakpoints": "Todos os pontos de interrupção",
+  "All conflicts resolved": "Todos os conflitos foram resolvidos",
+  "All letters": "Todas as letras",
+  "All lines": "Todas as linhas",
+  "All settings…": "Todas as configurações…",
+  "Allow placing breakpoints in any file": "Permitir colocar pontos de interrupção em qualquer arquivo",
+  "Also expand in comments and strings": "Também expandir em comentários e strings",
+  "Always": "Sempre",
+  "Always show full path in window header": "Sempre mostrar o caminho completo no cabeçalho da janela",
+  "Amend": "Amend",
+  "Analysing…": "Analisando…",
+  "Analyze": "Analisar",
+  "Analyze Stack Trace": "Analisar rastreamento de pilha",
+  "Analyze Stack Trace or Thread Dump…": "Analisar rastreamento de pilha ou dump de threads…",
+  "Analyze code": "Analisar código",
+  "Annotate with Git Blame": "Anotar com Git Blame",
+  "Annotation": "Anotação",
+  "Anonymize literals": "Anonimizar literais",
+  "Anonymize variables, fields, methods and types": "Anonimizar variáveis, campos, métodos e tipos",
+  "Another Docker operation is still running": "Outra operação do Docker ainda está em execução",
+  "Another Git operation is in progress": "Outra operação do Git está em andamento",
+  "Another GitHub operation is still running": "Outra operação do GitHub ainda está em execução",
+  "Another remote operation is in progress": "Outra operação remota está em andamento",
+  "Antialiasing": "Antisserrilhamento",
+  "Appearance": "Aparência",
+  "Appearance & Behavior": "Aparência e comportamento",
+  "Appearance…": "Aparência…",
+  "Application Settings": "Configurações do aplicativo",
+  "Applies cleanly": "Aplica-se sem conflitos",
+  "Applies fix-all code actions.": "Aplica ações de código de correção total.",
+  "Applies the import quick fix of an unresolved reference when the language server offers exactly one.": "Aplica a correção rápida de importação de uma referência não resolvida quando o servidor de linguagem oferecer exatamente uma.",
+  "Applies the language server's fix-all action (source.fixAll).": "Aplica a ação de correção total do servidor de linguagem (source.fixAll).",
+  "Applies to editor tabs and tool window buttons": "Aplica-se às guias do editor e botões de janelas de ferramentas",
+  "Apply": "Aplicar",
+  "Apply Patch from Clipboard…": "Aplicar patch da área de transferência…",
+  "Apply Patch…": "Aplicar patch…",
+  "Apply Stash": "Aplicar stash",
+  "Arguments": "Argumentos",
+  "Arrow function": "Arrow function",
+  "As new branch:": "Como nova branch:",
+  "As typed": "Como digitado",
+  "Ask": "Perguntar",
+  "Asks for a value when the tool runs": "Solicita um valor quando a ferramenta é executada",
+  "Async function": "Função assíncrona",
+  "Async test case": "Caso de teste assíncrono",
+  "Attach Debugger": "Anexar depurador",
+  "Attach the debugger to a running Java, Node.js, Python, Go or native process": "Anexar o depurador a um processo em execução Java, Node.js, Python, Go ou nativo",
+  "Attach to Process": "Anexar ao processo",
+  "Attach to Process…": "Anexar ao processo…",
+  "Attach to process": "Anexar ao processo",
+  "Attach to subprocess automatically while debugging": "Anexar automaticamente a subprocessos durante a depuração",
+  "Attaching needs the desktop app": "A anexação requer o aplicativo desktop",
+  "Audible bell": "Alerta sonoro",
+  "Authentication:": "Autenticação:",
+  "Auto": "Automático",
+  "Auto Import": "Importação automática",
+  "Auto-detected": "Detectado automaticamente",
+  "Auto-update if push of the current branch was rejected": "Atualizar automaticamente se o push da branch atual for rejeitado",
+  "Autosave": "Salvamento automático",
+  "Autoscroll from Source": "Rolagem automática a partir da origem",
+  "Autoscroll to Source": "Rolagem automática para a origem",
+  "Available": "Disponíveis",
+  "Available plugins": "Plugins disponíveis",
+  "Back": "Voltar",
+  "Backend malloc in use": "malloc do backend em uso",
+  "Backend set-up": "Configuração do backend",
+  "Background": "Segundo plano",
+  "Background Tasks": "Tarefas em segundo plano",
+  "Background tasks": "Tarefas em segundo plano",
+  "Balloon": "Balão",
+  "Base branch": "Branch base",
+  "Base interpreter": "Interpretador base",
+  "Base interpreter:": "Interpretador base:",
+  "Based on syntax (language server not ready)": "Baseado na sintaxe (servidor de linguagem não pronto)",
+  "Behavior": "Comportamento",
+  "Benchmark function": "Função de benchmark",
+  "Binary response": "Resposta binária",
+  "Blank line between subject and body": "Linha em branco entre o assunto e o corpo",
+  "Blinking cursor": "Cursor piscante",
+  "Block": "Bloco",
+  "Blue": "Azul",
+  "Bold": "Negrito",
+  "Bookmarks": "Marcadores",
+  "Bottom": "Inferior",
+  "Bottom Left": "Inferior esquerdo",
+  "Bottom Right": "Inferior direito",
+  "Branch": "Branch",
+  "Branch '{name}' has no tracked branch": "A branch '{name}' não tem nenhuma branch rastreada",
+  "Branch, %": "Branch, %",
+  "Branch, tag or commit hash": "Branch, tag ou hash de commit",
+  "Branches": "Branches",
+  "Branches…": "Branches…",
+  "Breadcrumb": "Breadcrumb",
+  "Breadcrumbs": "Breadcrumbs",
+  "Breakpoint properties": "Propriedades do ponto de interrupção",
+  "Breakpoints": "Pontos de interrupção",
+  "Breakpoints can't be placed in this file": "Pontos de interrupção não podem ser colocados neste arquivo",
+  "Browse": "Procurar",
+  "Browse…": "Procurar…",
+  "Build": "Build",
+  "Build Artifacts": "Compilar artefatos",
+  "Build Module": "Compilar módulo",
+  "Build Project": "Compilar projeto",
+  "Build failed": "Falha no build",
+  "Build files changed since the last reload": "Arquivos de build alterados desde a última recarga",
+  "Build output": "Saída do build",
+  "Build the project to see compiler messages here": "Compile o projeto para ver as mensagens do compilador aqui",
+  "Build, Execution, Deployment": "Build, Execução, Implantação",
+  "Building": "Compilando",
+  "Bundled": "Integrado",
+  "Caches cleared": "Caches limpos",
+  "Call Hierarchy": "Hierarquia de chamadas",
+  "Call Tree": "Árvore de chamadas",
+  "Call hierarchy": "Hierarquia de chamadas",
+  "Call tree": "Árvore de chamadas",
+  "Calls on the current line": "Chamadas na linha atual",
+  "Cancel": "Cancelar",
+  "Cancel Exclusion": "Cancelar exclusão",
+  "Cancel Running Statement": "Cancelar instrução em execução",
+  "Cannot add a field watchpoint": "Não é possível adicionar um ponto de inspeção de campo",
+  "Cannot annotate": "Não é possível anotar",
+  "Cannot change line separators": "Não é possível alterar separadores de linha",
+  "Cannot commit": "Não é possível fazer commit",
+  "Cannot connect to {target}": "Não é possível conectar a {target}",
+  "Cannot convert encoding": "Não é possível converter a codificação",
+  "Cannot create scratch file": "Não é possível criar arquivo de rascunho",
+  "Cannot create the HTTP request file": "Não é possível criar o arquivo de solicitação HTTP",
+  "Cannot generate the HTTP request": "Não é possível gerar a solicitação HTTP",
+  "Cannot duplicate the data source": "Não é possível duplicar a fonte de dados",
+  "Cannot execute": "Não é possível executar",
+  "Cannot execute on {target}": "Não é possível executar em {target}",
+  "Cannot export data": "Não é possível exportar dados",
+  "Cannot find usages of '{name}'": "Não é possível localizar usos de '{name}'",
+  "Cannot generate the DDL": "Não é possível gerar o DDL",
+  "Cannot generate the SQL script": "Não é possível gerar o script SQL",
+  "Cannot get the DDL of {name}": "Não é possível obter o DDL de {name}",
+  "Cannot open file": "Não é possível abrir o arquivo",
+  "Cannot open library class": "Não é possível abrir a classe da biblioteca",
+  "Cannot open link": "Não é possível abrir o link",
+  "Cannot open the query console": "Não é possível abrir o console de consultas",
+  "Cannot open the response": "Não é possível abrir a resposta",
+  "Cannot profile '{name}'": "Não é possível analisar o perfil de '{name}'",
+  "Cannot put label": "Não é possível colocar rótulo",
+  "Cannot read data sources": "Não é possível ler as fontes de dados",
+  "Cannot read the patch": "Não é possível ler o patch",
+  "Cannot reload Gradle projects": "Não é possível recarregar projetos Gradle",
+  "Cannot reload Maven projects": "Não é possível recarregar projetos Maven",
+  "Cannot reload from disk": "Não é possível recarregar do disco",
+  "Cannot reload with encoding": "Não é possível recarregar com a codificação",
+  "Cannot remove recent project": "Não é possível remover projeto recente",
+  "Cannot roll back": "Não é possível reverter",
+  "Cannot run '{name}' with coverage": "Não é possível executar '{name}' com cobertura",
+  "Cannot run the script": "Não é possível executar o script",
+  "Cannot save run configurations": "Não é possível salvar as configurações de execução",
+  "Cannot save setting": "Não é possível salvar a configuração",
+  "Cannot send the request": "Não é possível enviar a solicitação",
+  "Cannot stop process": "Não é possível parar o processo",
+  "Cannot undo": "Não é possível desfazer",
+  "Cannot undo refactoring": "Não é possível desfazer a refatoração",
+  "Cannot preview replacements": "Não é possível pré-visualizar substituições",
+  "Caret blinking (ms):": "Piscar do cursor (ms):",
+  "Caret column number (1-based)": "Número da coluna do cursor (base 1)",
+  "Caret line number (1-based)": "Número da linha do cursor (base 1)",
+  "Caret should be positioned at the name of the element to be refactored": "O cursor deve estar posicionado no nome do elemento a ser refatorado",
+  "Cascade": "Em cascata",
+  "Case sensitive": "Diferenciar maiúsculas/minúsculas",
+  "Change Splitter Orientation": "Alterar orientação do divisor",
+  "Change Signature…": "Alterar assinatura…",
+  "Change actions": "Alterar ações",
+  "Change font size with Command+Mouse Wheel": "Alterar tamanho da fonte com Command+Roda do mouse",
+  "Changed files": "Arquivos alterados",
+  "Changelist:": "Lista de alterações:",
+  "Changes": "Alterações",
+  "Changes to include:": "Alterações a serem incluídas:",
+  "Changes were not submitted": "As alterações não foram enviadas",
+  "Check TODO": "Verificar TODO",
+  "Checked out pull request #{number}": "Pull request #{number} extraída",
+  "Checking installed tools…": "Verificando ferramentas instaladas…",
+  "Checking tools": "Verificando ferramentas",
+  "Checkout": "Fazer checkout",
+  "Checkout Pull Request…": "Fazer checkout de pull request…",
+  "Checkout Revision": "Fazer checkout de revisão",
+  "Checkout Tag or Revision": "Fazer checkout de tag ou revisão",
+  "Checkout Tag or Revision…": "Fazer checkout de tag ou revisão…",
+  "Checkout branch": "Fazer checkout da branch",
+  "Checks out the selected pull request, a number given as argument, or asks for one.": "Faz o checkout da pull request selecionada, de um número fornecido como argumento ou solicita um.",
+  "Cherry-Pick": "Cherry-pick",
+  "Children": "Filhos",
+  "Choose Content to Paste": "Escolher conteúdo para colar",
+  "Choose a data source for this console": "Escolha uma fonte de dados para este console",
+  "Choose a start or end date": "Escolha uma data de início ou término",
+  "Choose configuration to debug": "Escolha a configuração para depurar",
+  "Choose configuration to run": "Escolha a configuração para executar",
+  "Choose the Statement to Unwrap/Remove": "Escolha a instrução para desenvolver/remover",
+  "Choose which call on the current line to step into": "Escolha em qual chamada na linha atual entrar",
+  "Class": "Classe",
+  "Classes": "Classes",
+  "Classes changed": "Classes alteradas",
+  "Cleans the build outputs, then builds the project": "Limpa as saídas de build e compila o projeto",
+  "Cleanup": "Limpeza",
+  "Clear": "Limpar",
+  "Clear All": "Limpar tudo",
+  "Clear Buffer": "Limpar buffer",
+  "Clear Caches": "Limpar caches",
+  "Clear Console": "Limpar console",
+  "Clear Filtering": "Limpar filtragem",
+  "Clear History": "Limpar histórico",
+  "Clear Terminal Buffer": "Limpar buffer do terminal",
+  "Clear build tool caches (Maven / Gradle sync results)": "Limpar caches de ferramentas de build (resultados de sincronização Maven / Gradle)",
+  "Clear caches": "Limpar caches",
+  "Clear file system cache and Local History": "Limpar cache do sistema de arquivos e histórico local",
+  "Clear language server workspaces (Java import data and indexes)": "Limpar espaços de trabalho do servidor de linguagem (dados de importação Java e índices)",
+  "Clipboard": "Área de transferência",
+  "Clone": "Clonar",
+  "Clone depth": "Profundidade do clone",
+  "Clone Repository": "Clonar repositório",
+  "Clone Repository…": "Clonar repositório…",
+  "Clone progress": "Progresso do clone",
+  "Clone source": "Origem do clone",
+  "Cloned, but the project could not be opened": "Clonado, mas o projeto não pôde ser aberto",
+  "Cloning requires the desktop app": "A clonagem requer o aplicativo desktop",
+  "Close": "Fechar",
+  "Close All Read-Only Tabs": "Fechar todas as guias somente leitura",
+  "Close All Tabs": "Fechar todas as guias",
+  "Close All but Pinned": "Fechar todas exceto fixadas",
+  "Close Annotations": "Fechar anotações",
+  "Close Other Tabs": "Fechar outras guias",
+  "Close Project": "Fechar projeto",
+  "Close Session": "Fechar sessão",
+  "Close Tab": "Fechar guia",
+  "Close Tabs to the Left": "Fechar guias à esquerda",
+  "Close Tabs to the Right": "Fechar guias à direita",
+  "Close Terminal Session": "Fechar sessão do terminal",
+  "Close Unmodified Tabs": "Fechar guias não modificadas",
+  "Close least recently used files": "Fechar arquivos usados menos recentemente",
+  "Close non-modified files first": "Fechar arquivos não modificados primeiro",
+  "Close performance overlay": "Fechar sobreposição de desempenho",
+  "Close session when it ends": "Fechar sessão ao encerrar",
+  "Closing Policy": "Política de fechamento",
+  "Code": "Código",
+  "Code Completion": "Preenchimento de código",
+  "Code Editing": "Edição de código",
+  "Code Folding": "Dobragem de código",
+  "Code Style": "Estilo de código",
+  "Code breadcrumbs": "Breadcrumbs de código",
+  "Collapse": "Recolher",
+  "Collapse All": "Recolher tudo",
+  "Collapse Unchanged Fragments": "Recolher fragmentos inalterados",
+  "Color Scheme": "Esquema de cores",
+  "Color scheme attributes": "Atributos do esquema de cores",
+  "Color scheme preview": "Visualização do esquema de cores",
+  "Color theme": "Tema de cores",
+  "Column": "Coluna",
+  "Column Selection Mode": "Modo de seleção de coluna",
+  "Columns": "Colunas",
+  "Comma-separated column numbers, e.g. 80, 100.": "Números de coluna separados por vírgula, por exemplo: 80, 100.",
+  "Command": "Comando",
+  "Command line": "Linha de comando",
+  "Commands": "Comandos",
+  "Comment": "Comentário",
+  "Comment:": "Comentário:",
+  "Commit": "Commit",
+  "Commit Anyway": "Fazer commit mesmo assim",
+  "Commit Changelist…": "Fazer commit da lista de alterações…",
+  "Commit Checks": "Verificações de commit",
+  "Commit File…": "Fazer commit do arquivo…",
+  "Commit Message": "Mensagem de commit",
+  "Commit Message History": "Histórico de mensagens de commit",
+  "Commit Message Inspections": "Inspeções de mensagens de commit",
+  "Commit Options": "Opções de commit",
+  "Commit message": "Mensagem de commit",
+  "Commit message is empty": "A mensagem de commit está vazia",
+  "Commit:": "Commit:",
+  "Commits": "Commits",
+  "Commits are applied from top to bottom.": "Os commits são aplicados de cima para baixo.",
+  "Commits to rebase": "Commits para rebase",
+  "commits": "commits",
+  "Commit…": "Commit…",
+  "Compact mode": "Modo compacto",
+  "Companion object": "Objeto companion",
+  "Compare Files": "Comparar arquivos",
+  "Compare Texts": "Comparar textos",
+  "Compare With": "Comparar com",
+  "Compare With…": "Comparar com…",
+  "Compare with Branch or Revision…": "Comparar com branch ou revisão…",
+  "Compare with Branch…": "Comparar com branch…",
+  "Compare with Clipboard": "Comparar com a área de transferência",
+  "Compare with Current": "Comparar com a versão atual",
+  "Compare with Local": "Comparar com a versão local",
+  "Compilation failed: fix the errors and reload again.": "A compilação falhou: corrija os erros e recarregue novamente.",
+  "Compiles and runs the project: the default jdtls runtime, Run/Debug, and JAVA_HOME for Maven and Gradle.": "Compila e executa o projeto: o runtime jdtls padrão, Executar/Depurar e JAVA_HOME para Maven e Gradle.",
+  "Compiles the module of the current file": "Compila o módulo do arquivo atual",
+  "Compiles the project's sources and tests with its build system": "Compila os fontes e testes do projeto com seu sistema de compilação",
+  "Completions": "Preenchimentos de código",
+  "Component with CSS module": "Componente com módulo CSS",
+  "Condition": "Condição",
+  "Configurations": "Configurações",
+  "Configure Editor Tabs…": "Configurar abas do editor…",
+  "Configure Indents…": "Configurar recuos…",
+  "Configure Keymap…": "Configurar mapa de teclas…",
+  "Configure…": "Configurar…",
+  "Confirm Drop": "Confirmar descarte",
+  "Confirm before exiting the IDE": "Confirmar antes de sair do IDE",
+  "Confirm rerun with process termination": "Confirmar reexecução com encerramento do processo",
+  "Confirmation": "Confirmação",
+  "Conflicted files": "Arquivos em conflito",
+  "Conflicts": "Conflitos",
+  "Conflicts:": "Conflitos:",
+  "Connect": "Conectar",
+  "Connected": "Conectado",
+  "Connecting to Docker…": "Conectando ao Docker…",
+  "Connecting to GitHub…": "Conectando ao GitHub…",
+  "Console": "Console",
+  "Container log": "Log do contêiner",
+  "Content root": "Raiz de conteúdo",
+  "Context menu": "Menu de contexto",
+  "Contexts": "Contextos",
+  "Continue": "Continuar",
+  "Continue Cherry-Pick": "Continuar cherry-pick",
+  "Continue Rebase": "Continuar rebase",
+  "Continue Revert": "Continuar reversão",
+  "Contributes": "Contribuições",
+  "Convert to Encoding": "Converter para codificação",
+  "Copied code keeps the editor's syntax colors and font when pasted into documents and mail.": "O código copiado mantém as cores de sintaxe e a fonte do editor quando colado em documentos e e-mails.",
+  "Copy": "Copiar",
+  "Copy / Paste Special": "Copiar / Colar especial",
+  "Copy All": "Copiar tudo",
+  "Copy Commit Message": "Copiar mensagem de commit",
+  "Copy Configuration": "Copiar configuração",
+  "Copy Container ID": "Copiar ID do contêiner",
+  "Copy Coordinates": "Copiar coordenadas",
+  "Copy Image ID": "Copiar ID da imagem",
+  "Copy Image Name": "Copiar nome da imagem",
+  "Copy Name": "Copiar nome",
+  "Copy Original Text": "Copiar texto original",
+  "Copy Path": "Copiar caminho",
+  "Copy Path from Project Root": "Copiar caminho a partir da raiz do projeto",
+  "Copy Path/Reference…": "Copiar caminho/referência…",
+  "Copy Problem Description": "Copiar descrição do problema",
+  "Copy Reference": "Copiar referência",
+  "Copy Revision Number": "Copiar número da revisão",
+  "Copy Revision Numbers": "Copiar números de revisão",
+  "Copy Rows as CSV": "Copiar linhas como CSV",
+  "Copy Rows as TSV": "Copiar linhas como TSV",
+  "Copy Stack": "Copiar pilha",
+  "Copy Value": "Copiar valor",
+  "Copy as rich text by default": "Copiar como rich text por padrão",
+  "Copy revision number": "Copiar número de revisão",
+  "Copy to clipboard": "Copiar para a área de transferência",
+  "Copy to clipboard on selection": "Copiar para a área de transferência ao selecionar",
+  "Copy with Header": "Copiar com cabeçalho",
+  "Copy/Paste": "Copiar/Colar",
+  "Could not apply theme": "Não foi possível aplicar o tema",
+  "Could not clear caches": "Não foi possível limpar os caches",
+  "Could not fill the new file": "Não foi possível preencher o novo arquivo",
+  "Could not install plugin": "Não foi possível instalar o plugin",
+  "Could not invalidate caches": "Não foi possível invalidar os caches",
+  "Could not open project": "Não foi possível abrir o projeto",
+  "Could not open the file picker": "Não foi possível abrir o seletor de arquivos",
+  "Plugin package": "Pacote de plugin",
+  "Could not reach GitHub": "Não foi possível conectar ao GitHub",
+  "Could not save": "Não foi possível salvar",
+  "Coverage": "Cobertura",
+  "Coverage is hidden in editors and the project view.": "A cobertura está oculta nos editores e na visualização do projeto.",
+  "Coverage needs the desktop app": "A cobertura requer o aplicativo desktop",
+  "Coverage suites": "Suítes de cobertura",
+  "Create": "Criar",
+  "Create Branch": "Criar branch",
+  "Create New Branch": "Criar nova branch",
+  "Create New Test…": "Criar novo teste…",
+  "Create Patch": "Criar patch",
+  "Create Patch…": "Criar patch…",
+  "Create Pull Request": "Criar pull request",
+  "Create Pull Request…": "Criar pull request…",
+  "Create Run Configuration": "Criar configuração de execução",
+  "Create Run Configuration…": "Criar configuração de execução…",
+  "Create Stash": "Criar stash",
+  "Create Tag": "Criar tag",
+  "Create Terminal": "Criar terminal",
+  "Create Terminal in Container": "Criar terminal no contêiner",
+  "Create UTF-8 files": "Criar arquivos UTF-8",
+  "Creating virtual environment": "Criando ambiente virtual",
+  "Current": "Atual",
+  "Current Branch": "Branch atual",
+  "Current File": "Arquivo atual",
+  "Current date": "Data atual",
+  "Current window": "Janela atual",
+  "Cursor shape": "Formato do cursor",
+  "Custom colour": "Cor personalizada",
+  "Custom colour hex": "Hex da cor personalizada",
+  "Customize": "Personalizar",
+  "Cut": "Recortar",
+  "Data Source": "Fonte de dados",
+  "Data Source Properties…": "Propriedades da fonte de dados…",
+  "Data Source from File…": "Fonte de dados a partir de arquivo…",
+  "Data Source from URL": "Fonte de dados a partir de URL",
+  "Data Source from URL…": "Fonte de dados a partir de URL…",
+  "Data Views": "Visualizações de dados",
+  "Data class": "Classe de dados",
+  "Data source": "Fonte de dados",
+  "Data source settings": "Configurações da fonte de dados",
+  "Data sources": "Fontes de dados",
+  "Data type": "Tipo de dados",
+  "Database": "Banco de dados",
+  "Database actions": "Ações de banco de dados",
+  "Database output": "Saída do banco de dados",
+  "Database:": "Banco de dados:",
+  "Date": "Data",
+  "Date Formats": "Formatos de data",
+  "Date format": "Formato de data",
+  "Deactivate": "Desativar",
+  "Debug": "Depurar",
+  "Debug Configuration": "Configuração de depuração",
+  "Debug Context Configuration": "Depurar configuração de contexto",
+  "Debug adapter": "Adaptador de depuração",
+  "Debug adapters & processes": "Adaptadores de depuração e processos",
+  "Debug console": "Console de depuração",
+  "Debug console input": "Entrada do console de depuração",
+  "Debug sessions": "Sessões de depuração",
+  "Debug views": "Visualizações de depuração",
+  "Debuggable configurations": "Configurações depuráveis",
+  "Debugger": "Depurador",
+  "Debugger actions": "Ações do depurador",
+  "Debugger is not available": "O depurador não está disponível",
+  "Debugging": "Depuração",
+  "Debugging Java needs Microsoft java-debug, loaded into the Java language server. Install it and debug again once jdtls has restarted.": "A depuração de Java requer o Microsoft java-debug carregado no servidor de linguagem Java. Instale-o e depure novamente assim que o jdtls for reiniciado.",
+  "Debugging needs the desktop app": "A depuração requer o aplicativo desktop",
+  "Debug…": "Depurar…",
+  "Declaration or Usages": "Declaração ou usos",
+  "Decoded text": "Texto decodificado",
+  "Decodes files outside the project that are not valid UTF-8.": "Decodifica arquivos fora do projeto que não são UTF-8 válidos.",
+  "Default": "Padrão",
+  "Default Directory": "Diretório padrão",
+  "Default Tab name": "Nome de aba padrão",
+  "Default directory": "Diretório padrão",
+  "Default encoding": "Codificação padrão",
+  "Transparent native-to-ascii conversion": "Conversão native-to-ascii transparente",
+  "Default encoding for properties files": "Codificação padrão para arquivos properties",
+  "Default value": "Valor padrão",
+  "Definition": "Definição",
+  "Delete": "Excluir",
+  "Delete '{name}'?": "Excluir '{name}'?",
+  "Delete '{name}' and its contents?": "Excluir '{name}' e seu conteúdo?",
+  "Delete {count} items?": "Excluir {count} itens?",
+  "Delete {count} items (including folder contents)?": "Excluir {count} itens (incluindo conteúdo da pasta)?",
+  "Items are moved to the Trash.": "Os itens são movidos para a Lixeira.",
+  "Delete Anyway": "Excluir mesmo assim",
+  "Delete Bookmark": "Excluir marcador",
+  "Delete Branch": "Excluir branch",
+  "Delete Changelist": "Excluir lista de alterações",
+  "Delete Docker Object…": "Excluir objeto do Docker…",
+  "Delete Keymap": "Excluir mapa de teclas",
+  "Delete Remote Branch": "Excluir branch remota",
+  "Delete Rows": "Excluir linhas",
+  "Delete Shelved Changes": "Excluir alterações no shelf",
+  "Delete all rows of": "Excluir todas as linhas de",
+  "Delete local copies of added files": "Excluir cópias locais dos arquivos adicionados",
+  "Deleted": "Excluído",
+  "Delete…": "Excluir…",
+  "Description": "Descrição",
+  "Details": "Detalhes",
+  "Detect again": "Detectar novamente",
+  "Detect and use existing file indents for editing": "Detectar e usar recuos existentes no arquivo para edição",
+  "Detected from the project. Changes are saved as a user configuration that overrides it.": "Detectado a partir do projeto. As alterações são salvas como uma configuração de usuário que a substitui.",
+  "Detected from the toolchain": "Detectado a partir da toolchain",
+  "Detecting installations": "Detectando instalações",
+  "Detecting…": "Detectando…",
+  "Diff": "Diff",
+  "Different tool window background": "Plano de fundo diferente para janelas de ferramentas",
+  "Direction": "Direção",
+  "Directory": "Diretório",
+  "Staging State": "Estado de staging",
+  "Staged Changes": "Alterações no stage",
+  "Unstaged Changes": "Alterações fora do stage",
+  "Directory (relative to project root)": "Diretório (relativo à raiz do projeto)",
+  "Directory Mappings": "Mapeamentos de diretório",
+  "Directory mappings": "Mapeamentos de diretório",
+  "Directory of the current file": "Diretório do arquivo atual",
+  "Directory of the current file relative to the project": "Diretório do arquivo atual relativo ao projeto",
+  "Directory to Clone Into": "Diretório de destino do clone",
+  "Directory:": "Diretório:",
+  "Disable": "Desativar",
+  "Disable All Downloaded Plugins": "Desativar todos os plugins baixados",
+  "Disabled": "Desativado",
+  "Dismiss": "Dispensar",
+  "Display balloon notifications": "Exibir notificações em balão",
+  "Display icons in menu items": "Exibir ícones nos itens de menu",
+  "Distinguish projects with different colors in the main toolbar": "Distinguir projetos com cores diferentes na barra de ferramentas principal",
+  "Distraction free mode text width:": "Largura do texto no modo sem distrações:",
+  "Do Refactor": "Refatorar",
+  "Do not add": "Não adicionar",
+  "Do not ask again": "Não perguntar novamente",
+  "Do not highlight": "Não destacar",
+  "Do not ignore": "Não ignorar",
+  "Do not remove": "Não remover",
+  "Do not step into library scripts": "Não entrar em scripts de biblioteca",
+  "Docker is not installed": "O Docker não está instalado",
+  "Docker is not running": "O Docker não está em execução",
+  "Documentation": "Documentação",
+  "Documentation comments": "Comentários de documentação",
+  "Does not apply cleanly": "Não se aplica de forma limpa",
+  "Does not apply cleanly: a 3-way merge will be attempted": "Não se aplica de forma limpa: uma mesclagem de 3 vias será tentada",
+  "Don't ask again": "Não perguntar novamente",
+  "Done": "Concluído",
+  "Down": "Abaixo",
+  "Downloaded": "Baixados",
+  "Download…": "Baixar…",
+  "Drag-and-drop with Alt pressed only": "Arrastar e soltar apenas com Alt pressionado",
+  "Driver": "Driver",
+  "Driver:": "Driver:",
+  "Drop": "Descartar",
+  "Drop Column": "Excluir coluna",
+  "Drop Commit": "Descartar commit",
+  "Drop Commits": "Descartar commits",
+  "Drop Stash": "Descartar stash",
+  "Drop a folder to open it as a project, or files to edit them": "Solte uma pasta para abri-la como projeto, ou arquivos para editá-los",
+  "Drop files here to open them": "Solte arquivos aqui para abri-los",
+  "Drop syntax trees and EditorConfig caches, compact the index": "Descartar árvores sintáticas e caches do EditorConfig, compactar o índice",
+  "Drop…": "Descartar…",
+  "Duplicate": "Duplicar",
+  "Duplicate Keymap": "Duplicar mapa de teclas",
+  "Duplicate groups": "Grupos duplicados",
+  "Duplicates": "Duplicatas",
+  "Duplicate…": "Duplicar…",
+  "Edit": "Editar",
+  "Edit Cell": "Editar célula",
+  "Edit Changelist": "Editar lista de alterações",
+  "Edit Changelist…": "Editar lista de alterações…",
+  "Edit Commit Message…": "Editar mensagem de commit…",
+  "Edit Configurations…": "Editar configurações…",
+  "Edit Configuration…": "Editar configuração…",
+  "Edit Data": "Editar dados",
+  "Edit the configuration that would run the context before saving it": "Editar a configuração que executaria o contexto antes de salvá-la",
+  "Editor": "Editor",
+  "Editor Actions": "Ações do editor",
+  "Editor Tabs": "Abas do editor",
+  "Editor color scheme": "Esquema de cores do editor",
+  "Editor resynchronised": "Editor ressincronizado",
+  "Editor tabs": "Abas do editor",
+  "Editor › Font": "Editor › Fonte",
+  "Editor › General": "Editor › Geral",
+  "Effect": "Efeito",
+  "Effect color": "Cor do efeito",
+  "Effects": "Efeitos",
+  "Element": "Elemento",
+  "Empty": "Vazio",
+  "Empty file": "Arquivo vazio",
+  "Enable All Downloaded Plugins": "Ativar todos os plugins baixados",
+  "Enable EditorConfig support": "Ativar suporte ao EditorConfig",
+  "Enable Settings › Build, Execution, Deployment › Debugger › Allow placing breakpoints in any file.": "Ative Configurações › Build, Execução, Implantação › Depurador › Permitir a inserção de pontos de interrupção em qualquer arquivo.",
+  "Enable drag-and-drop functionality in editor": "Ativar funcionalidade de arrastar e soltar no editor",
+  "Enable ligatures": "Ativar ligaduras",
+  "Enable postfix completion": "Ativar preenchimento pós-fixado",
+  "Enable preview tab": "Ativar aba de pré-visualização",
+  "Enable when debugging code that uses gevent monkey-patching.": "Ative ao depurar código que usa monkey-patching do gevent.",
+  "Enabled": "Ativado",
+  "Enabled tools appear in Find Action (⇧⌘A) under “External Tools” and can get shortcuts in Keymap. Output is shown in the Run tool window.": "Ferramentas ativadas aparecem em Localizar ação (⇧⌘A) em “Ferramentas externas” e podem receber atalhos no Mapa de teclas. A saída é exibida na janela de ferramentas Executar.",
+  "Encoding of the output of processes started from Run configurations.": "Codificação da saída dos processos iniciados a partir das configurações de execução.",
+  "Enhanced for loop": "Loop for aprimorado",
+  "Ensure every saved file ends with a line break": "Garantir que todo arquivo salvo termine com uma quebra de linha",
+  "Enter a positive number of commits": "Insira um número positivo de commits",
+  "Enter a tag, branch or commit hash:": "Insira uma tag, branch ou hash de commit:",
+  "Enter the name of new tag:": "Insira o nome da nova tag:",
+  "Enum": "Enum",
+  "Enum class": "Classe enum",
+  "Environment": "Ambiente",
+  "Environment variables": "Variáveis de ambiente",
+  "Error Highlighting": "Destaque de erros",
+  "Evaluate": "Avaliar",
+  "Evaluate Expression…": "Avaliar expressão…",
+  "Evaluate expression": "Avaliar expressão",
+  "Evaluate expression (↩) or add a watch (⇧⌘↩)": "Avaliar expressão (↩) ou adicionar inspeção (⇧⌘↩)",
+  "Evaluate in the debug console": "Avaliar no console de depuração",
+  "Evaluation result": "Resultado da avaliação",
+  "Everything is up to date": "Tudo está atualizado",
+  "Exception Breakpoints": "Pontos de interrupção de exceção",
+  "Exception breakpoints": "Pontos de interrupção de exceção",
+  "Exclude": "Excluir",
+  "Exclude / include (⌫)": "Excluir / incluir (⌫)",
+  "Exclude patterns": "Padrões de exclusão",
+  "Excluded": "Excluído",
+  "Excluded Folders": "Pastas excluídas",
+  "Excluded usages are skipped.": "Usos excluídos são ignorados.",
+  "Execute": "Executar",
+  "Execute Gradle Task…": "Executar tarefa do Gradle…",
+  "Execute Maven Goal…": "Executar goal do Maven…",
+  "Execute SQL Statement": "Executar instrução SQL",
+  "Execute a statement in a query console with ⌘↩.": "Execute uma instrução em um console de consulta com ⌘↩.",
+  "Existing changelist": "Lista de alterações existente",
+  "Existing changelist:": "Lista de alterações existente:",
+  "Existing environment": "Ambiente existente",
+  "Exit": "Sair",
+  "Expand": "Expandir",
+  "Expand All": "Expandir tudo",
+  "Expand abbreviations with Tab": "Expandir abreviações com Tab",
+  "Expand folded lines": "Expandir linhas recolhidas",
+  "Expand templates with Tab": "Expandir modelos com Tab",
+  "Explicitly check for incoming commits on remotes": "Verificar explicitamente se há commits de entrada nos remotos",
+  "Export Data": "Exportar dados",
+  "Expression": "Expressão",
+  "Expression to evaluate in the selected frame": "Expressão a ser avaliada no quadro selecionado",
+  "Expressions": "Expressões",
+  "Extension": "Extensão",
+  "Extension of the current file": "Extensão do arquivo atual",
+  "External Linters": "Linters externos",
+  "External Tools": "Ferramentas externas",
+  "External tool": "Ferramenta externa",
+  "External tools": "Ferramentas externas",
+  "External tools actions": "Ações de ferramentas externas",
+  "Extract Method…": "Extrair método…",
+  "Failed to install {name}": "Falha ao instalar {name}",
+  "Failed to uninstall {name}": "Falha ao desinstalar {name}",
+  "FIXME comment": "Comentário FIXME",
+  "Failed": "Falhou",
+  "Failed to restart language server": "Falha ao reiniciar o servidor de linguagem",
+  "Fallback font": "Fonte reserva",
+  "Fallback font:": "Fonte reserva:",
+  "Fetch": "Fetch",
+  "Fetches remotes in the background so incoming commits show in the Branches popup. Auto stops after an authentication failure.": "Executa fetch dos remotos em segundo plano para que commits de entrada apareçam no pop-up Branches. O modo Auto para após uma falha de autenticação.",
+  "Field access": "Acesso a campo",
+  "Field modification": "Modificação de campo",
+  "Field watchpoints can be set on Java field declarations, or from the Variables view while suspended.": "Pontos de inspeção de campo podem ser definidos em declarações de campos Java ou a partir da visualização Variáveis quando suspenso.",
+  "File": "Arquivo",
+  "File Encoding": "Codificação de arquivo",
+  "File Encodings": "Codificações de arquivo",
+  "File Encodings Settings…": "Configurações de codificações de arquivo…",
+  "File Name": "Nome do arquivo",
+  "File Structure": "Estrutura do arquivo",
+  "File Types": "Tipos de arquivo",
+  "File and Code Templates": "Modelos de arquivos e código",
+  "File encoding": "Codificação de arquivo",
+  "File header": "Cabeçalho do arquivo",
+  "File mask": "Máscara de arquivo",
+  "File mask:": "Máscara de arquivo:",
+  "File name": "Nome do arquivo",
+  "File name style": "Estilo de nome de arquivo",
+  "File name with extension": "Nome do arquivo com extensão",
+  "File name without extension": "Nome do arquivo sem extensão",
+  "File not found": "Arquivo não encontrado",
+  "File patterns": "Padrões de arquivo",
+  "File templates": "Modelos de arquivo",
+  "File:": "Arquivo:",
+  "Files": "Arquivos",
+  "Files to include": "Arquivos a incluir",
+  "Files to roll back": "Arquivos para reverter",
+  "Files to shelve": "Arquivos para colocar no shelf",
+  "Files will be reverted to the state of the selected commit, but local changes will be kept intact.": "Os arquivos serão revertidos para o estado do commit selecionado, mas as alterações locais serão mantidas intactas.",
+  "Files will be reverted to the state of the selected commit. Warning: any local changes will be lost.": "Os arquivos serão revertidos para o estado do commit selecionado. Aviso: todas as alterações locais serão perdidas.",
+  "Files won't change, differences will be staged for commit.": "Os arquivos não mudarão, as diferenças serão adicionadas ao stage para commit.",
+  "Files won't change, differences won't be staged.": "Os arquivos não mudarão, as diferenças não serão adicionadas ao stage.",
+  "Filter": "Filtrar",
+  "Filter TODO Items": "Filtrar itens de TODO",
+  "Filter by Branch": "Filtrar por branch",
+  "Filter by Date": "Filtrar por data",
+  "Filter by User": "Filtrar por usuário",
+  "Filter by message": "Filtrar por mensagem",
+  "Filter by name, PID or command line": "Filtrar por nome, PID ou linha de comando",
+  "Filter by tool or language": "Filtrar por ferramenta ou linguagem",
+  "Filter language servers": "Filtrar servidores de linguagem",
+  "Filter plugins": "Filtrar plugins",
+  "Filter processes": "Filtrar processos",
+  "Filter recent files": "Filtrar arquivos recentes",
+  "Filter recent locations": "Filtrar locais recentes",
+  "Filter symbols": "Filtrar símbolos",
+  "Filter templates": "Filtrar modelos",
+  "Find": "Localizar",
+  "Find Actions by Shortcut": "Localizar ações por atalho",
+  "Find Action…": "Localizar ação…",
+  "Find Next Occurrence": "Localizar próxima ocorrência",
+  "Find Previous Occurrence": "Localizar ocorrência anterior",
+  "Find Usages": "Localizar usos",
+  "Find Usages of File": "Localizar usos do arquivo",
+  "Find actions by shortcut": "Localizar ações por atalho",
+  "Find in Directory…": "Localizar no diretório…",
+  "Find in Files": "Localizar nos arquivos",
+  "Find in Files…": "Localizar nos arquivos…",
+  "Find in Folder…": "Localizar na pasta…",
+  "Find in Terminal": "Localizar no terminal",
+  "Find in console": "Localizar no console",
+  "Find in file": "Localizar no arquivo",
+  "Find in terminal": "Localizar no terminal",
+  "Find results": "Resultados da localização",
+  "Find…": "Localizar…",
+  "First letter only": "Apenas primeira letra",
+  "First stroke": "Primeiro toque",
+  "First stroke:": "Primeiro toque:",
+  "Fix the highlighted fields": "Corrija os campos destacados",
+  "Flame Graph": "Flame Graph",
+  "Flame graph": "Flame graph",
+  "Focus Editor": "Focar no editor",
+  "Focus application on breakpoint": "Focar aplicativo no ponto de interrupção",
+  "Fold Selection / Remove Region": "Recolher seleção / Remover região",
+  "Fold by default:": "Recolher por padrão:",
+  "Fold console lines that contain": "Recolher linhas do console que contenham",
+  "Folding": "Recolhimento de código",
+  "Font": "Fonte",
+  "Font preview": "Pré-visualização da fonte",
+  "For protanopia and deuteranopia.": "Para protanopia e deuteranopia.",
+  "For symbols not supported by the main font": "Para símbolos não suportados pela fonte principal",
+  "Force": "Forçar",
+  "Force (with lease)": "Forçar (com lease)",
+  "Force Push": "Push forçado",
+  "Force Run to Cursor": "Forçar execução até o cursor",
+  "Force Step Into": "Forçar entrar (Step Into)",
+  "Force Step Over": "Forçar passar por cima (Step Over)",
+  "Foreground": "Primeiro plano",
+  "Formats the whole file with the language server's formatter.": "Formata todo o arquivo com o formatador do servidor de linguagem.",
+  "Forward": "Avançar",
+  "Found usages": "Usos encontrados",
+  "Fragment": "Fragmento",
+  "Frames": "Quadros",
+  "From Template…": "A partir de modelo…",
+  "From settings.xml, else ~/.m2/repository": "Do settings.xml, caso contrário ~/.m2/repository",
+  "From:": "De:",
+  "Function": "Função",
+  "Function component": "Componente de função",
+  "Function with return type": "Função com tipo de retorno",
+  "Functions:": "Funções:",
+  "General": "Geral",
+  "Generate": "Gerar",
+  "Generate DDL to Clipboard": "Gerar DDL para a área de transferência",
+  "Generate DDL to Query Console": "Gerar DDL para o console de consulta",
+  "Generate Request in HTTP Client": "Gerar requisição no cliente HTTP",
+  "Generate Requests for Controller": "Gerar requisições para o controller",
+  "Generate…": "Gerar…",
+  "Get from Version Control…": "Obter do controle de versão…",
+  "Gevent compatible": "Compatível com gevent",
+  "Git Branches": "Branches do Git",
+  "Git Log": "Log do Git",
+  "Git Reset": "Git Reset",
+  "Git commands run by the IDE appear here.": "Os comandos Git executados pelo IDE aparecem aqui.",
+  "Git console": "Console do Git",
+  "GitHub CLI is not installed": "A CLI do GitHub não está instalada",
+  "Gliding": "Deslizante",
+  "Glob patterns (e.g. **/dist, *.log) hidden from the project tree and skipped by search and indexing.": "Padrões glob (ex.: **/dist, *.log) ocultos na árvore do projeto e ignorados por busca e indexação.",
+  "Global Encoding": "Codificação global",
+  "Go SDK used by gopls and the go run / test configurations.": "Go SDK usado pelo gopls e pelas configurações de go run / test.",
+  "Go To": "Ir para",
+  "Go to Child Commit": "Ir para commit filho",
+  "Go to Class…": "Ir para classe…",
+  "Go to DDL": "Ir para DDL",
+  "Go to File": "Ir para arquivo",
+  "Go to File…": "Ir para arquivo…",
+  "Go to Line:Column": "Ir para linha:coluna",
+  "Go to Line:Column…": "Ir para linha:coluna…",
+  "Go to Parent Commit": "Ir para commit pai",
+  "Go to Referenced Table": "Ir para tabela referenciada",
+  "Go to Source": "Ir para o código-fonte",
+  "Go to Symbol…": "Ir para símbolo…",
+  "Gradle actions": "Ações do Gradle",
+  "Gradle command line": "Linha de comando do Gradle",
+  "Gradle projects": "Projetos Gradle",
+  "Gradle sync failed": "Falha na sincronização do Gradle",
+  "Green": "Verde",
+  "Grey": "Cinza",
+  "Greyscale": "Escala de cinza",
+  "Group": "Grupo",
+  "Group by Severity": "Agrupar por severidade",
+  "Groups": "Grupos",
+  "Gutter Icons": "Ícones da margem",
+  "HACK comment": "Comentário HACK",
+  "HEAD (Current Branch)": "HEAD (branch atual)",
+  "HTML 5 file": "Arquivo HTML 5",
+  "HTTP Client": "Cliente HTTP",
+  "HTTP Client environments": "Ambientes do cliente HTTP",
+  "Hard": "Rígido",
+  "Hard wrap at": "Quebra de linha rígida em",
+  "Hello: Insert Date": "Hello: Inserir data",
+  "Hello: Word Count of Active File": "Hello: Contagem de palavras do arquivo ativo",
+  "Help": "Ajuda",
+  "Hex view": "Visualização hexadecimal",
+  "Hide": "Ocultar",
+  "Hide Active Tool Window": "Ocultar janela de ferramentas ativa",
+  "Hide All Tool Windows": "Ocultar todas as janelas de ferramentas",
+  "Hide changes": "Ocultar alterações",
+  "Hide Coverage": "Ocultar cobertura",
+  "Hide Library Frames": "Ocultar frames de biblioteca",
+  "Hide Replace": "Ocultar substituir",
+  "Hide debug window on process termination": "Ocultar janela de depuração ao encerrar o processo",
+  "Auto-detect": "Detectar automaticamente",
+  "Hide install log": "Ocultar log de instalação",
+  "Hierarchies": "Hierarquias",
+  "Hierarchy": "Hierarquia",
+  "Hierarchy actions": "Ações de hierarquia",
+  "High Contrast": "Alto contraste",
+  "Highlight hyperlinks": "Destacar hiperlinks",
+  "Highlight lines": "Destacar linhas",
+  "Highlight on Caret Movement": "Destacar ao mover o cursor",
+  "Highlight words": "Destacar palavras",
+  "Highlighting": "Destaque",
+  "Hit count": "Contagem de ocorrências",
+  "Hit count condition": "Condição de contagem de ocorrências",
+  "Home moves caret to first non-whitespace character": "Home move o cursor para o primeiro caractere que não seja espaço em branco",
+  "Homepage": "Página inicial",
+  "Host:": "Host:",
+  "Hot Swap": "Hot Swap",
+  "Hot Swap failed": "Falha no Hot Swap",
+  "HotSwap: compile and reload the changed classes into the running Java debug session": "HotSwap: compilar e recarregar as classes alteradas na sessão de depuração Java em execução",
+  "Hovering a variable while suspended evaluates it in the selected frame.": "Passar o cursor sobre uma variável enquanto suspenso a avalia no frame selecionado.",
+  "IDE Updates": "Atualizações do IDE",
+  "IDE and Project Settings": "Configurações do IDE e do projeto",
+  "IDE font": "Fonte do IDE",
+  "IDE font size": "Tamanho da fonte do IDE",
+  "Installed {name} {version}": "{name} {version} instalado",
+  "Installing {name}": "Instalando {name}",
+  "IPC round trip": "Ida e volta de IPC",
+  "Already ignored": "Já ignorado",
+  "Idle seconds": "Segundos de inatividade",
+  "Ignore files and folders": "Ignorar arquivos e pastas",
+  "Ignore whitespace": "Ignorar espaços em branco",
+  "Ignore whitespaces": "Ignorar espaços em branco",
+  "Ignore whitespaces and empty lines": "Ignorar espaços em branco e linhas vazias",
+  "Ignored": "Ignorado",
+  "Ignored Files and Folders": "Arquivos e pastas ignorados",
+  "Ignored names": "Nomes ignorados",
+  "Image": "Imagem",
+  "Image viewer": "Visualizador de imagens",
+  "Implement Members": "Implementar membros",
+  "Implementation(s)": "Implementação(ões)",
+  "Imports": "Importações",
+  "In Project": "No projeto",
+  "Include": "Incluir",
+  "Include non-project items": "Incluir itens fora do projeto",
+  "Include untracked files": "Incluir arquivos não rastreados",
+  "Incoming commits": "Commits recebidos",
+  "Indent": "Indentar",
+  "Indent Block": "Indentar bloco",
+  "Indent Each Line": "Indentar cada linha",
+  "Collapse Recursively": "Recolher recursivamente",
+  "Expand Recursively": "Expandir recursivamente",
+  "Move Caret to Matching Brace": "Mover cursor para a chave correspondente",
+  "Toggle Insert/Overwrite": "Alternar Inserir/Sobrescrever",
+  "Indentation": "Indentação",
+  "Indents Detection": "Detecção de indentação",
+  "Index": "Índice",
+  "Index (indexing…)": "Índice (indexando…)",
+  "Indexed for loop": "Loop for indexado",
+  "Indexing": "Indexação",
+  "Inlay Hints": "Dicas embutidas",
+  "Inline…": "Incorporar…",
+  "Inner": "Interno",
+  "Insert Live Template…": "Inserir modelo dinâmico…",
+  "Insert Macro…": "Inserir macro…",
+  "Insert pair quote": "Inserir aspas correspondentes",
+  "Insert selected suggestion by pressing space, dot, or other context-dependent keys": "Inserir a sugestão selecionada pressionando espaço, ponto ou outras teclas dependentes de contexto",
+  "Inspect": "Inspecionar",
+  "Inspect Code": "Inspecionar código",
+  "Inspect Code…": "Inspecionar código…",
+  "Inspect Docker Object": "Inspecionar objeto Docker",
+  "Inspecting…": "Inspecionando…",
+  "Inspection Results": "Resultados da inspeção",
+  "Inspection progress": "Progresso da inspeção",
+  "Inspection results": "Resultados da inspeção",
+  "Install": "Instalar",
+  "Install Docker Desktop, OrbStack, Colima or the Docker Engine and make sure": "Instale o Docker Desktop, OrbStack, Colima ou o Docker Engine e certifique-se de que",
+  "Install Language Server / Debugger": "Instalar servidor de linguagem / depurador",
+  "Install Package": "Instalar pacote",
+  "Install Plugin from Disk": "Instalar plugin do disco",
+  "Install Plugin from Disk…": "Instalar plugin do disco…",
+  "Install a plugin folder with": "Instalar uma pasta de plugin com",
+  "Install and Debug": "Instalar e depurar",
+  "Install gh…": "Instalar gh…",
+  "Installed": "Instalados",
+  "Installed packages": "Pacotes instalados",
+  "Installed plugins": "Plugins instalados",
+  "Installing plugin": "Instalando plugin",
+  "Intentions": "Intenções",
+  "Interactively Rebase from Here…": "Fazer rebase interativo a partir daqui…",
+  "Interface": "Interface",
+  "Interface type": "Tipo de interface",
+  "Interpreter": "Interpretador",
+  "Interpreter type": "Tipo de interpretador",
+  "Interpreter:": "Interpretador:",
+  "Introduce Constant…": "Introduzir constante…",
+  "Introduce Field…": "Introduzir campo…",
+  "Introduce Parameter…": "Introduzir parâmetro…",
+  "Introduce Variable…": "Introduzir variável…",
+  "Invalid": "Inválido",
+  "Invalidate Caches": "Invalidar caches",
+  "Invalidate Caches…": "Invalidar caches…",
+  "Invalidate and Restart": "Invalidar e reiniciar",
+  "Islands Dark": "Islands Dark",
+  "Islands Light": "Islands Light",
+  "Issue ID": "ID da issue",
+  "Issue Link": "Link da issue",
+  "Issue Navigation": "Navegação de issues",
+  "Issue navigation": "Navegação de issues",
+  "Issue navigation links": "Links de navegação de issues",
+  "Italic": "Itálico",
+  "JUnit 5 Test": "Teste JUnit 5",
+  "JUnit test": "Teste JUnit",
+  "JVM options": "Opções da JVM",
+  "Jump outside closing bracket/quote with Tab": "Pular para fora de colchetes/aspas de fechamento com Tab",
+  "Jump to Last Tool Window": "Ir para a última janela de ferramentas",
+  "Jump to Navigation Bar": "Ir para a barra de navegação",
+  "Jump to Query Console…": "Ir para o console de consultas…",
+  "Jump to Source": "Ir para o código-fonte",
+  "Just Restart": "Apenas reiniciar",
+  "Keep": "Manter",
+  "Keep Tab Open": "Manter aba aberta",
+  "Keep Column": "Manter coluna",
+  "Keep index": "Manter índice",
+  "Keep local history for": "Manter histórico local por",
+  "Keep trailing spaces on caret line": "Manter espaços à direita na linha do cursor",
+  "Key pair": "Par de chaves",
+  "Keymap": "Mapa de teclas",
+  "Keymap:": "Mapa de teclas:",
+  "Keymap…": "Mapa de teclas…",
+  "Keys are recorded as pressed, including Tab and Esc. Use the buttons to finish.": "As teclas são gravadas conforme pressionadas, incluindo Tab e Esc. Use os botões para concluir.",
+  "Keystroke → paint": "Digitação → renderização",
+  "Keystroke-to-paint latency, IPC round trips and long tasks": "Latência de digitação para renderização, idas e voltas de IPC e tarefas longas",
+  "Keyword": "Palavra-chave",
+  "Kind": "Tipo",
+  "Kind label": "Rótulo do tipo",
+  "Kinds": "Tipos",
+  "Label name:": "Nome do rótulo:",
+  "Language": "Idioma",
+  "Language Defaults": "Padrões de linguagem",
+  "Language Server": "Servidor de linguagem",
+  "Language server '{name}' is not installed": "O servidor de linguagem '{name}' não está instalado",
+  "Language Servers": "Servidores de linguagem",
+  "Language Servers…": "Servidores de linguagem…",
+  "Language Services": "Serviços de linguagem",
+  "Language and Region": "Idioma e região",
+  "Language servers": "Servidores de linguagem",
+  "Language servers and debug adapters": "Servidores de linguagem e adaptadores de depuração",
+  "Language support for .toy files: detection, comments and indentation.": "Suporte de linguagem para arquivos .toy: detecção, comentários e indentação.",
+  "Languages": "Linguagens",
+  "Languages & Frameworks": "Linguagens e frameworks",
+  "Last 24 Hours": "Últimas 24 horas",
+  "Last 30 Days": "Últimos 30 dias",
+  "Last 7 Days": "Últimos 7 dias",
+  "Last Edit Location": "Último local de edição",
+  "Last Year": "Último ano",
+  "Last commit": "Último commit",
+  "Leading": "Entrelinha",
+  "Leave": "Sair",
+  "Left Bottom": "Inferior esquerdo",
+  "Left Top": "Superior esquerdo",
+  "LightEdit": "LightEdit",
+  "Limit body line": "Limitar linha do corpo",
+  "Limit history to": "Limitar histórico a",
+  "Limit subject line": "Limitar linha de assunto",
+  "Line Separator": "Separador de linha",
+  "Line and column": "Linha e coluna",
+  "Line height": "Altura da linha",
+  "Line separator": "Separador de linha",
+  "Line, %": "Linha, %",
+  "Line:Column Number": "Número de linha:coluna",
+  "Live Templates": "Modelos dinâmicos",
+  "Live templates": "Modelos dinâmicos",
+  "Loaded classes are up to date. Nothing to reload.": "As classes carregadas estão atualizadas. Nada a recarregar.",
+  "Loading packages": "Carregando pacotes",
+  "Loading packages…": "Carregando pacotes…",
+  "Loading plugins": "Carregando plugins",
+  "Loading processes…": "Carregando processos…",
+  "Loading…": "Carregando…",
+  "Local": "Local",
+  "Local History": "Histórico local",
+  "Local History of all projects will be deleted.": "O histórico local de todos os projetos será excluído.",
+  "Local History: Put Label…": "Histórico local: Inserir rótulo…",
+  "Local History: Show History": "Histórico local: Exibir histórico",
+  "Local repository": "Repositório local",
+  "Locate Duplicates": "Localizar duplicatas",
+  "Locate Duplicates…": "Localizar duplicatas…",
+  "Location": "Localização",
+  "Location:": "Localização:",
+  "Log": "Log",
+  "Log filters": "Filtros de log",
+  "Long tasks": "Tarefas longas",
+  "Looking for references…": "Procurando referências…",
+  "Finding navigation target…": "Localizando destino de navegação…",
+  "Looks for TODO and FIXME in added lines.": "Procura por TODO e FIXME nas linhas adicionadas.",
+  "Macros": "Macros",
+  "Main Menu": "Menu principal",
+  "Make File Read-only": "Tornar arquivo somente leitura",
+  "Make File Writable": "Tornar arquivo gravável",
+  "Make Read-only": "Tornar somente leitura",
+  "Make Writable": "Tornar gravável",
+  "Make another changelist active first.": "Ative outra lista de alterações primeiro.",
+  "Manage": "Gerenciar",
+  "Manage Plugins": "Gerenciar plugins",
+  "Mark Directory as": "Marcar diretório como",
+  "Mark Resolved": "Marcar como resolvido",
+  "Mark as": "Marcar como",
+  "Mark as:": "Marcar como:",
+  "Mark modified (*)": "Marcar modificados (*)",
+  "Markdown editor layout": "Layout do editor Markdown",
+  "Markdown file": "Arquivo Markdown",
+  "Markdown preview": "Visualização de Markdown",
+  "Marked folders": "Pastas marcadas",
+  "Match Case": "Diferenciar maiúsculas/minúsculas",
+  "Match case:": "Diferenciar maiúsculas/minúsculas:",
+  "Matched brace": "Chave correspondente",
+  "Matches": "Correspondências",
+  "Maven actions": "Ações do Maven",
+  "Maven command line": "Linha de comando do Maven",
+  "Maven home path": "Caminho do Maven home",
+  "Maven projects": "Projetos Maven",
+  "Maven Settings…": "Configurações do Maven…",
+  "Maven sync finished with errors": "Sincronização do Maven concluída com erros",
+  "Maven wrapper, else mvn on PATH": "Wrapper do Maven, senão mvn no PATH",
+  "Maximize": "Maximizar",
+  "Maximize Tool Window": "Maximizar janela de ferramentas",
+  "Maximum local history size per project": "Tamanho máximo do histórico local por projeto",
+  "Maximum number of lines": "Número máximo de linhas",
+  "Memory Indicator": "Indicador de memória",
+  "Memory and diagnostics": "Memória e diagnósticos",
+  "Merge": "Mesclar",
+  "Merge and Push": "Mesclar e fazer push",
+  "Merge conflicts": "Conflitos de mesclagem",
+  "Merge incoming changes into the current branch": "Mesclar alterações recebidas na branch atual",
+  "Merge…": "Mesclar…",
+  "Message:": "Mensagem:",
+  "Method": "Método",
+  "Method List": "Lista de métodos",
+  "Method name": "Nome do método",
+  "Mine": "Meus",
+  "Minimize": "Minimizar",
+  "Minimum duplicate size in tokens": "Tamanho mínimo de duplicatas em tokens",
+  "Minimum size": "Tamanho mínimo",
+  "Mixed": "Misto",
+  "Modified": "Modificado",
+  "Modified lines": "Linhas modificadas",
+  "Modify Column…": "Modificar coluna…",
+  "Modify Run Configuration…": "Modificar configuração de execução…",
+  "Modify Table…": "Modificar tabela…",
+  "Module": "Módulo",
+  "More": "Mais",
+  "More Filters": "Mais filtros",
+  "More Actions": "Mais ações",
+  "More Run/Debug": "Mais opções de Executar/Depurar",
+  "More Terminal Options": "Mais opções do terminal",
+  "More Tool Windows": "Mais janelas de ferramentas",
+  "Most recently opened tab": "Aba aberta mais recentemente",
+  "Mouse Control": "Controle do mouse",
+  "Mouse reporting": "Relatório do mouse",
+  "Move": "Mover",
+  "Move Changes to Another Changelist": "Mover alterações para outra lista de alterações",
+  "Move Down": "Mover para baixo",
+  "Move File…": "Mover arquivo…",
+  "Move To": "Mover para",
+  "Move Up": "Mover para cima",
+  "Move to Another Changelist…": "Mover para outra lista de alterações…",
+  "Move to Opposite Group": "Mover para o grupo oposto",
+  "Move…": "Mover…",
+  "Multiple occurrences found": "Várias ocorrências encontradas",
+  "Mute Breakpoints": "Silenciar pontos de interrupção",
+  "Mute breakpoints": "Silenciar pontos de interrupção",
+  "Name": "Nome",
+  "Name for the new constant": "Nome para a nova constante",
+  "Name for the new variable": "Nome para a nova variável",
+  "Name of the current file": "Nome do arquivo atual",
+  "Name:": "Nome:",
+  "Named scope": "Escopo nomeado",
+  "Names (e.g. .DS_Store, *.pyc) hidden from the project tree, navigation bar, search, indexing and Git changes.": "Nomes (ex.: .DS_Store, *.pyc) ocultados da árvore do projeto, barra de navegação, pesquisa, indexação e alterações do Git.",
+  "Narrow down on typing": "Refinar ao digitar",
+  "Navigate": "Navegar",
+  "Navigation": "Navegação",
+  "Navigation Bar": "Barra de navegação",
+  "Navigation bar": "Barra de navegação",
+  "Never": "Nunca",
+  "New": "Novo",
+  "New Branch…": "Nova branch…",
+  "New Changelist": "Nova lista de alterações",
+  "New Changelist…": "Nova lista de alterações…",
+  "New Data Source": "Nova fonte de dados",
+  "New Data Source…": "Nova fonte de dados…",
+  "New Directory": "Novo diretório",
+  "New Empty File…": "Novo arquivo vazio…",
+  "New File": "Novo arquivo",
+  "New HTTP Request": "Nova requisição HTTP",
+  "New Scratch File": "Novo arquivo de rascunho",
+  "New Scratch File…": "Novo arquivo de rascunho…",
+  "New Tab": "Nova aba",
+  "New Tag…": "Nova tag…",
+  "New Terminal Tab": "Nova aba do terminal",
+  "New branch name:": "Nome da nova branch:",
+  "New changelist:": "Nova lista de alterações:",
+  "New environment": "Novo ambiente",
+  "New file from template": "Novo arquivo a partir de modelo",
+  "New from Template…": "Novo a partir de modelo…",
+  "New kind": "Novo tipo",
+  "New name": "Novo nome",
+  "New terminal sessions run the interpreter's virtualenv activate script.": "Novas sessões de terminal executam o script de ativação do virtualenv do interpretador.",
+  "New window": "Nova janela",
+  "New…": "Novo…",
+  "Next Bookmark": "Próximo marcador",
+  "Next Change": "Próxima alteração",
+  "Next Conflict Marker": "Próximo marcador de conflito",
+  "Next Difference": "Próxima diferença",
+  "Next Edit Location": "Próximo local de edição",
+  "Next Occurrence": "Próxima ocorrência",
+  "Next Page": "Próxima página",
+  "Next error action goes to high priority problems only": "A ação Próximo erro vai apenas para problemas de alta prioridade",
+  "No coverage data for '{name}'": "Nenhum dado de cobertura para '{name}'",
+  "No Environment": "Nenhum ambiente",
+  "No GitHub repository": "Nenhum repositório GitHub",
+  "No Gradle projects": "Nenhum projeto Gradle",
+  "No HTTP request at the caret": "Nenhuma requisição HTTP na posição do cursor",
+  "No Spring controller at the caret": "Nenhum controlador Spring na posição do cursor",
+  "No Spring request mapping at the caret": "Nenhum mapeamento de requisição Spring na posição do cursor",
+  "No Maven projects": "Nenhum projeto Maven",
+  "No profile for '{name}'": "Nenhum perfil para '{name}'",
+  "No Python found": "Nenhum Python encontrado",
+  "No recent repository URLs": "Nenhuma URL recente de repositório",
+  "No recent searches": "Nenhuma pesquisa recente",
+  "No TODO items found": "Nenhum item TODO encontrado",
+  "No TODO items in this file": "Nenhum item TODO neste arquivo",
+  "No active editor": "Nenhum editor ativo",
+  "No antialiasing": "Sem suavização",
+  "No backend caches to clear": "Nenhum cache do backend para limpar",
+  "No breakpoints. Click a line number to add one.": "Nenhum ponto de interrupção. Clique no número de uma linha para adicionar um.",
+  "No build output": "Nenhuma saída de compilação",
+  "No changes": "Nenhuma alteração",
+  "No changes selected for commit": "Nenhuma alteração selecionada para commit",
+  "No changes to create a patch from": "Nenhuma alteração para criar um patch",
+  "No changes to roll back": "Nenhuma alteração para reverter",
+  "No changes to shelve": "Nenhuma alteração para arquivar no shelve",
+  "No commits": "Nenhum commit",
+  "No conflicts": "Nenhum conflito",
+  "No coverage data": "Nenhum dado de cobertura",
+  "No data sources": "Nenhuma fonte de dados",
+  "No debug session can reload classes": "Nenhuma sessão de depuração pode recarregar classes",
+  "No differences": "Nenhuma diferença",
+  "No document": "Nenhum documento",
+  "No duplicates found": "Nenhuma duplicata encontrada",
+  "No editor available": "Nenhum editor disponível",
+  "No external tools. Click + to add one.": "Nenhuma ferramenta externa. Clique em + para adicionar uma.",
+  "No failed tests to rerun": "Nenhum teste com falha para executar novamente",
+  "No field declaration on this line": "Nenhuma declaração de campo nesta linha",
+  "No file is open": "Nenhum arquivo aberto",
+  "No interpreter selected. Choose one above or add a new one.": "Nenhum interpretador selecionado. Escolha um acima ou adicione um novo.",
+  "No language server available": "Nenhum servidor de linguagem disponível",
+  "No languages": "Nenhuma linguagem",
+  "No local changes": "Nenhuma alteração local",
+  "No matches": "Nenhuma correspondência",
+  "No matching branches": "Nenhuma branch correspondente",
+  "No matching languages": "Nenhuma linguagem correspondente",
+  "No matching projects": "Nenhum projeto correspondente",
+  "No matching templates": "Nenhum modelo correspondente",
+  "No merge conflicts": "Nenhum conflito de mesclagem",
+  "No merge, rebase, cherry-pick or revert in progress": "Nenhuma mesclagem, rebase, cherry-pick ou revert em andamento",
+  "No method declaration on this line": "Nenhuma declaração de método nesta linha",
+  "No notifications": "Nenhuma notificação",
+  "No occurrences found": "Nenhuma ocorrência encontrada",
+  "No patterns": "Nenhum padrão",
+  "No plugin selected": "Nenhum plugin selecionado",
+  "No popup": "Nenhum popup",
+  "No problems found": "Nenhum problema encontrado",
+  "No problems in this file": "Nenhum problema neste arquivo",
+  "No profiler snapshots": "Nenhum snapshot do profiler",
+  "No project is open": "Nenhum projeto aberto",
+  "No requests yet": "Nenhuma requisição ainda",
+  "No response selected": "Nenhuma resposta selecionada",
+  "No results": "Nenhum resultado",
+  "No reviews": "Nenhuma revisão",
+  "No run configuration in this project has a debug adapter.": "Nenhuma configuração de execução neste projeto tem um adaptador de depuração.",
+  "No run or test configuration of the project matches this file.": "Nenhuma configuração de execução ou teste do projeto corresponde a este arquivo.",
+  "No search results": "Nenhum resultado de pesquisa",
+  "No special permissions.": "Nenhuma permissão especial.",
+  "No stashes": "Nenhum stash",
+  "No structure to show": "Nenhuma estrutura para exibir",
+  "No tools match.": "Nenhuma ferramenta correspondente.",
+  "No usages found": "Nenhum uso encontrado",
+  "No usages of '{name}' found": "Nenhum uso de '{name}' encontrado",
+  "Node interpreter": "Interpretador Node",
+  "None": "Nenhum",
+  "None configured": "Nenhum configurado",
+  "Not debugging": "Não está depurando",
+  "Not logged in to GitHub": "Não conectado ao GitHub",
+  "Not null": "Não nulo",
+  "Nothing found": "Nada encontrado",
+  "Nothing found in project files": "Nada encontrado nos arquivos do projeto",
+  "Nothing here": "Nada aqui",
+  "Nothing matches": "Nada corresponde",
+  "Nothing recorded before this label": "Nada gravado antes deste rótulo",
+  "Nothing to add: the files are already under version control": "Nada a adicionar: os arquivos já estão sob controle de versão",
+  "Nothing to debug": "Nada a depurar",
+  "Nothing to run here": "Nada a executar aqui",
+  "Nothing to show": "Nada para exibir",
+  "Nothing to undo": "Nada para desfazer",
+  "Notification groups": "Grupos de notificação",
+  "Notifications": "Notificações",
+  "OK": "OK",
+  "Object": "Objeto",
+  "Object Actions": "Ações de objeto",
+  "Occurrences": "Ocorrências",
+  "Occurrences of selected text": "Ocorrências do texto selecionado",
+  "Older output is discarded": "A saída mais antiga é descartada",
+  "Only in comments": "Apenas em comentários",
+  "Only one usage in Project Files": "Apenas um uso nos arquivos do projeto",
+  "Open": "Abrir",
+  "Open Diff": "Abrir diff",
+  "Open File": "Abrir arquivo",
+  "Open Files": "Arquivos abertos",
+  "Open Folder": "Abrir pasta",
+  "Open In": "Abrir em",
+  "Open In Right Split": "Abrir na divisão à direita",
+  "Open Paths": "Caminhos abertos",
+  "Open Project Path": "Abrir caminho do projeto",
+  "Open Projects": "Projetos abertos",
+  "Open Recent…": "Abrir recente…",
+  "Open a Git repository to commit changes.": "Abra um repositório Git para fazer commit das alterações.",
+  "Open a file to annotate it": "Abra um arquivo para anotá-lo",
+  "Open a file to show its local history": "Abra um arquivo para exibir seu histórico local",
+  "Open a folder": "Abrir uma pasta",
+  "Open a project first": "Abra um projeto primeiro",
+  "Open a project to configure its folders.": "Abra um projeto para configurar suas pastas.",
+  "Open as Text": "Abrir como texto",
+  "Open console for tool output": "Abrir console para saída da ferramenta",
+  "Open documents": "Documentos abertos",
+  "Open in Browser": "Abrir no navegador",
+  "Open in Find Tool Window": "Abrir na janela de ferramentas Localizar",
+  "Open in Find Window": "Abrir na janela Localizar",
+  "Open in Opposite Group": "Abrir no grupo oposto",
+  "Open in New Window": "Abrir em nova janela",
+  "Open in Terminal": "Abrir no terminal",
+  "Open in editor": "Abrir no editor",
+  "Open moved files in editor": "Abrir arquivos movidos no editor",
+  "Open new tabs at the end": "Abrir novas abas no final",
+  "Open on GitHub": "Abrir no GitHub",
+  "Open or select a file to compare": "Abra ou selecione um arquivo para comparar",
+  "Open pom.xml": "Abrir pom.xml",
+  "Open project in": "Abrir projeto em",
+  "Open to the Side": "Abrir ao lado",
+  "OpenSSH config and authentication agent": "Configuração do OpenSSH e agente de autenticação",
+  "Opening Policy": "Política de abertura",
+  "Opening folders requires the desktop app": "Abrir pastas requer o aplicativo desktop",
+  "Opening projects requires the desktop app": "Abrir projetos requer o aplicativo desktop",
+  "Open…": "Abrir…",
+  "Optimize Imports": "Otimizar importações",
+  "Optimize Imports in File": "Otimizar importações no arquivo",
+  "Optimize imports": "Otimizar importações",
+  "Optimize imports on the fly": "Otimizar importações dinamicamente",
+  "Optional": "Opcional",
+  "Optional:": "Opcional:",
+  "Options": "Opções",
+  "Orange": "Laranja",
+  "Original": "Original",
+  "Other": "Outro",
+  "Other File Types": "Outros tipos de arquivo",
+  "Other hints (chaining, closing labels…)": "Outras dicas (encadeamento, rótulos de fechamento…)",
+  "Other names or emails (comma-separated):": "Outros nomes ou e-mails (separados por vírgula):",
+  "Otherwise line breakpoints can only be set in files of languages that have a debugger.": "Caso contrário, pontos de interrupção de linha só podem ser definidos em arquivos de linguagens que possuem um depurador.",
+  "Outgoing commits": "Commits enviados",
+  "Output": "Saída",
+  "Override IDE shortcuts": "Substituir atalhos do IDE",
+  "Override Members": "Sobrescrever membros",
+  "Override console cycle buffer size": "Substituir tamanho do buffer cíclico do console",
+  "Override system date and time format": "Substituir formato de data e hora do sistema",
+  "Overview": "Visão geral",
+  "Package": "Pacote",
+  "Package manager": "Gerenciador de pacotes",
+  "Package to install": "Pacote a instalar",
+  "Packages": "Pacotes",
+  "Packages the project (mvn package, gradle assemble, cargo build --release, npm run build)": "Empacota o projeto (mvn package, gradle assemble, cargo build --release, npm run build)",
+  "Page size": "Tamanho da página",
+  "Parameter Info": "Informações de parâmetros",
+  "Parameter names": "Nomes dos parâmetros",
+  "Parameters": "Parâmetros",
+  "Parses (hit / incr. / full)": "Análises (hit / incr. / completa)",
+  "Partially staged: only staged hunks are committed": "Parcialmente preparado: apenas blocos preparados são incluídos no commit",
+  "Passed": "Passou",
+  "Passed as -Dmaven.repo.local.": "Passado como -Dmaven.repo.local.",
+  "Passed as -s (mirrors, servers, proxies).": "Passado como -s (espelhos, servidores, proxies).",
+  "Passed to rustfmt when reformatting, e.g. --edition 2024": "Passado para o rustfmt ao reformatar, ex.: --edition 2024",
+  "Passed to the JVM running jdtls (java.jdt.ls.vmargs), e.g. -Xmx4g. jdtls runs with -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=30 -Xmx2G -Xms100m by default; an option set here replaces the default for the same setting, and another collector (e.g. -XX:+UseZGC) replaces the default collector options. A Lombok agent is added automatically: the one installed in Language Servers, else, when the project uses Lombok (its build, an inherited parent POM or Gradle build, or its sources' imports), the newest from the Maven / Gradle caches.": "Passado para a JVM que executa o jdtls (java.jdt.ls.vmargs), ex.: -Xmx4g. O jdtls é executado com -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=30 -Xmx2G -Xms100m por padrão; uma opção definida aqui substitui o padrão para a mesma configuração, e outro coletor (ex.: -XX:+UseZGC) substitui as opções padrão do coletor. Um agente Lombok é adicionado automaticamente: o instalado em Servidores de linguagem; caso contrário, quando o projeto usa Lombok (seu build, um POM pai herdado ou build Gradle, ou as importações do código-fonte), o mais recente dos caches do Maven / Gradle.",
+  "Pop stash": "Fazer pop do stash",
+  "Preview Source": "Pré-visualizar código-fonte",
+  "Reinstate index": "Restabelecer índice",
+  "Rerun Search": "Executar pesquisa novamente",
+  "Right Bottom": "Inferior direito",
+  "Right Top": "Superior direito",
+  "Language server JDK": "JDK do servidor de linguagem",
+  "Password": "Senha",
+  "Password:": "Senha:",
+  "Password already stored": "Senha já armazenada",
+  "Paste": "Colar",
+  "Paste on middle mouse button click": "Colar ao clicar com o botão do meio do mouse",
+  "Patch copied to the clipboard": "Patch copiado para a área de transferência",
+  "Patch destination": "Destino do patch",
+  "Patch file": "Arquivo de patch",
+  "Patch files": "Arquivos de patch",
+  "Path From Content Root": "Caminho a partir da raiz do conteúdo",
+  "Path of the current file relative to the project": "Caminho do arquivo atual relativo ao projeto",
+  "Path to Git executable": "Caminho para o executável do Git",
+  "Paths": "Caminhos",
+  "Pattern": "Padrão",
+  "Patterns": "Padrões",
+  "Pause": "Pausar",
+  "Pause Program": "Pausar programa",
+  "Pause the program to evaluate": "Pausa o programa para avaliar",
+  "Pending": "Pendente",
+  "Performance (dev diagnostics)": "Desempenho (diagnósticos de dev)",
+  "Performance overlay (dev diagnostics)": "Sobreposição de desempenho (diagnósticos de dev)",
+  "Permissions": "Permissões",
+  "Physical memory": "Memória física",
+  "Pick": "Pick",
+  "Pick one in the toolbar above the editor.": "Escolha um na barra de ferramentas acima do editor.",
+  "Pin / Unpin Tab": "Fixar / desafixar aba",
+  "Pin Tab": "Fixar aba",
+  "Pinned": "Fixado",
+  "Placeholders:": "Placeholders:",
+  "Placeholders: yyyy, yy, MMMM, MMM, MM, M, dd, d": "Placeholders: yyyy, yy, MMMM, MMM, MM, M, dd, d",
+  "Play sound": "Reproduzir som",
+  "Plugin": "Plugin",
+  "Plugin details": "Detalhes do plugin",
+  "Plugin sources": "Fontes de plugins",
+  "Plugins": "Plugins",
+  "Plugins are folders with a": "Plugins são pastas com um",
+  "Plugins…": "Plugins…",
+  "Pop Stash": "Pop no Stash",
+  "Pop Stash (Apply and Drop)": "Pop no Stash (Aplicar e descartar)",
+  "Popup type": "Tipo de pop-up",
+  "Port:": "Porta:",
+  "Postfix Completion": "Conclusão pós-fixada",
+  "Postfix templates": "Modelos pós-fixados",
+  "Prefer": "Preferir",
+  "Prefer moving caret line to minimize editor scrolling": "Preferir mover a linha do cursor para minimizar a rolagem do editor",
+  "Prefer scrolling editor canvas to keep caret line centered": "Preferir rolar a tela do editor para manter a linha do cursor centralizada",
+  "Preferred dark theme": "Tema escuro preferido",
+  "Preferred light theme": "Tema claro preferido",
+  "Preferred theme for dark OS mode": "Tema preferido para o modo escuro do SO",
+  "Preferred theme for light OS mode": "Tema preferido para o modo claro do SO",
+  "Preferred themes": "Temas preferidos",
+  "Preferred themes for light and dark OS mode": "Temas preferidos para os modos claro e escuro do SO",
+  "Prepares a fixup! commit of the local changes for the selected commit.": "Prepara um commit fixup! das alterações locais para o commit selecionado.",
+  "Prepares a squash! commit of the local changes for the selected commit.": "Prepara um commit squash! das alterações locais para o commit selecionado.",
+  "Preserve Case": "Preservar maiúsculas/minúsculas",
+  "Press a shortcut": "Pressione um atalho",
+  "Press a shortcut to find actions": "Pressione um atalho para localizar ações",
+  "Preview": "Pré-visualizar",
+  "Preview Replacement": "Pré-visualizar substituição",
+  "Preview failed": "Falha na pré-visualização",
+  "Previous Bookmark": "Marcador anterior",
+  "Previous Change": "Alteração anterior",
+  "Previous Conflict Marker": "Marcador de conflito anterior",
+  "Previous Difference": "Diferença anterior",
+  "Previous Occurrence": "Ocorrência anterior",
+  "Previous Page": "Página anterior",
+  "Primary key": "Chave primária",
+  "Print class and method name": "Imprimir nome da classe e do método",
+  "Private Key File": "Arquivo de chave privada",
+  "Private key:": "Chave privada:",
+  "Problems": "Problemas",
+  "Problems scope": "Escopo dos problemas",
+  "Process → backend ready": "Processo → backend pronto",
+  "Process → first IPC": "Processo → primeiro IPC",
+  "Process → main": "Processo → main",
+  "Processes": "Processos",
+  "Profile": "Criar perfil",
+  "Profile Context Configuration": "Criar perfil da configuração de contexto",
+  "Profile a run configuration to see where it spends its time.": "Crie um perfil de uma configuração de execução para ver onde ela gasta tempo.",
+  "Profile the program or test in the active file": "Cria o perfil do programa ou teste no arquivo ativo",
+  "Profiler": "Profiler",
+  "Profiler snapshots": "Snapshots do profiler",
+  "Profiler views": "Exibições do profiler",
+  "Profiling needs the desktop app": "A criação de perfil precisa do aplicativo desktop",
+  "Program": "Programa",
+  "Project": "Projeto",
+  "Project (.openidea/plugins)": "Projeto (.openidea/plugins)",
+  "Project Encoding": "Codificação do projeto",
+  "Project Errors": "Erros do projeto",
+  "Project Files": "Arquivos do projeto",
+  "Project GOPATH": "GOPATH do projeto",
+  "Project JDK": "JDK do projeto",
+  "Project Production Files": "Arquivos de produção do projeto",
+  "Project Settings": "Configurações do projeto",
+  "Project Structure": "Estrutura do projeto",
+  "Project Test Files": "Arquivos de teste do projeto",
+  "Project View": "Exibição do projeto",
+  "Project actions": "Ações do projeto",
+  "Project name": "Nome do projeto",
+  "Project root": "Raiz do projeto",
+  "Project root directory": "Diretório raiz do projeto",
+  "Project to run in": "Projeto no qual executar",
+  "Project:": "Projeto:",
+  "Projects": "Projetos",
+  "Properties": "Propriedades",
+  "Properties Files (*.properties)": "Arquivos de propriedades (*.properties)",
+  "Property": "Propriedade",
+  "Protected branches": "Branches protegidas",
+  "Prune": "Prune",
+  "Prune Docker…": "Fazer prune no Docker…",
+  "Public function": "Função pública",
+  "Pull Again": "Fazer pull novamente",
+  "Pull Docker Image…": "Fazer pull de imagem Docker…",
+  "Pull Image…": "Fazer pull de imagem…",
+  "Pull Requests": "Pull requests",
+  "Pull request number": "Número do pull request",
+  "Pull request number:": "Número do pull request:",
+  "Pull requests": "Pull requests",
+  "Pull requests use the": "Pull requests usam o",
+  "Pull…": "Pull…",
+  "Purple": "Roxo",
+  "Push": "Push",
+  "Push All up to Here…": "Fazer push de tudo até aqui…",
+  "Push Commits": "Fazer push dos commits",
+  "Push rejected": "Push rejeitado",
+  "Push tags:": "Fazer push de tags:",
+  "Push…": "Push…",
+  "Put Label": "Colocar rótulo",
+  "Put Label…": "Colocar rótulo…",
+  "Put a stack trace or a complete thread dump here:": "Cole um stack trace ou um dump de threads completo aqui:",
+  "Put the caret on a method declaration, or add a method breakpoint by name in View Breakpoints.": "Posicione o cursor na declaração de um método ou adicione um ponto de interrupção de método por nome em Exibir pontos de interrupção.",
+  "Python Debugger": "Depurador Python",
+  "Python Interpreter": "Interpretador Python",
+  "Python Package": "Pacote Python",
+  "Python interpreter": "Interpretador Python",
+  "Python: only your code (justMyCode). JavaScript: skips node_modules and Node.js internals.": "Python: apenas seu código (justMyCode). JavaScript: ignora node_modules e componentes internos do Node.js.",
+  "Query Console": "Console de consulta",
+  "Quick Documentation": "Documentação rápida",
+  "Re-check installed tools": "Verificar novamente ferramentas instaladas",
+  "Re-reads the effective POMs and dependency trees with Maven": "Lê novamente os POMs efetivos e as árvores de dependências com o Maven",
+  "Re-reads the task list with Gradle": "Lê novamente a lista de tarefas com o Gradle",
+  "React useEffect hook": "Hook useEffect do React",
+  "React useState hook": "Hook useState do React",
+  "Read-only": "Somente leitura",
+  "Read-only Attribute": "Atributo somente leitura",
+  "Rebase": "Rebase",
+  "Rebase Current Branch onto Selected Commit": "Fazer rebase da branch atual no commit selecionado",
+  "Rebase and Push": "Fazer rebase e push",
+  "Rebase the current branch on top of incoming changes": "Fazer rebase da branch atual sobre as alterações recebidas",
+  "Rebuild Last": "Recompilar último",
+  "Rebuild Project": "Recompilar projeto",
+  "Recent Actions": "Ações recentes",
+  "Recent Files": "Arquivos recentes",
+  "Recent Locations": "Locais recentes",
+  "Recent Projects": "Projetos recentes",
+  "Recent Projects…": "Projetos recentes…",
+  "Recent commit messages": "Mensagens de commit recentes",
+  "Recent file masks": "Máscaras de arquivo recentes",
+  "Recent files": "Arquivos recentes",
+  "Recent locations": "Locais recentes",
+  "Recent projects": "Projetos recentes",
+  "Recent repository URLs": "URLs de repositório recentes",
+  "Recent Searches": "Pesquisas recentes",
+  "Recently Viewed Files": "Arquivos visualizados recentemente",
+  "Record": "Gravar",
+  "Red": "Vermelho",
+  "Refactor": "Refatorar",
+  "Refactor This": "Refatorar isto",
+  "Refactor This…": "Refatorar isto…",
+  "Refactoring undone": "Refatoração desfeita",
+  "Refactoring applied": "Refatoração aplicada",
+  "Reformat Code": "Reformatar código",
+  "Reformat with Prettier": "Reformatar com Prettier",
+  "Reformat with oxfmt": "Reformatar com oxfmt",
+  "Prettier path": "Caminho do Prettier",
+  "oxfmt path": "Caminho do oxfmt",
+  "Auto: nearest project node_modules, managed installation, then PATH. An explicit path overrides auto detection.": "Automático: node_modules mais próximo no projeto, instalação gerenciada e depois PATH. Um caminho explícito substitui a detecção automática.",
+  "Formatting provider": "Provedor de formatação",
+  "Automatic (language server first)": "Automático (servidor de linguagem primeiro)",
+  "Run on save": "Executar ao salvar",
+  "Run Prettier on save for enabled languages when it is the selected formatting provider.": "Executa o Prettier ao salvar para as linguagens habilitadas quando ele for o provedor de formatação selecionado.",
+  "Run oxfmt on save for enabled languages when it is the selected formatting provider.": "Executa o oxfmt ao salvar para as linguagens habilitadas quando ele for o provedor de formatação selecionado.",
+  "oxfmt formats an enabled language instead of Prettier below an oxfmt configuration file (.oxfmtrc.json, oxfmt.config.ts) or when it is the selected provider.": "O oxfmt formata uma linguagem habilitada em vez do Prettier sob um arquivo de configuração do oxfmt (.oxfmtrc.json, oxfmt.config.ts) ou quando for o provedor selecionado.",
+  "Enabled languages": "Linguagens habilitadas",
+  "Reformat Code needs {name}. Install it via {method}?": "Reformatar código precisa do {name}. Deseja instalá-lo via {method}?",
+  "Install Missing Tool": "Instalar ferramenta ausente",
+  "Prettier formatting failed": "Falha na formatação com Prettier",
+  "Prettier formatting timed out": "Tempo limite de formatação com Prettier esgotado",
+  "oxfmt formatting failed": "Falha na formatação com oxfmt",
+  "oxfmt formatting timed out": "Tempo limite de formatação com oxfmt esgotado",
+  "{name} does not support selection formatting for this language; formatted the whole file": "{name} não oferece suporte à formatação de seleção para esta linguagem; o arquivo inteiro foi formatado",
+  "Formatting timed out": "Tempo limite de formatação esgotado",
+  "{name} executable": "Executável do {name}",
+  "{name}: Node.js is required": "{name}: o Node.js é necessário",
+  "Formatter": "Formatador",
+  "JSON with Comments": "JSON com comentários",
+  "Unknown external formatter: {tool}": "Formatador externo desconhecido: {tool}",
+  "{name}: package has no CLI entry point": "{name}: o pacote não tem ponto de entrada de CLI",
+  "{name}: CLI does not exist: {path}": "{name}: a CLI não existe: {path}",
+  "{name}: file has no directory": "{name}: o arquivo não possui diretório",
+  "{name}: {error}": "{name}: {error}",
+  "Reformat File": "Reformatar arquivo",
+  "Reformat code": "Reformatar código",
+  "Reformat code on save": "Reformatar código ao salvar",
+  "Reformat on paste": "Reformatar ao colar",
+  "Refresh": "Atualizar",
+  "Refresh Docker": "Atualizar Docker",
+  "Refresh TODO Items": "Atualizar itens TODO",
+  "Refresh VCS Status": "Atualizar status do VCS",
+  "Regex": "Regex",
+  "Regular expression": "Expressão regular",
+  "Relative paths resolve against the project root. “Open in Terminal” still opens the chosen folder.": "Caminhos relativos são resolvidos a partir da raiz do projeto. “Abrir no Terminal” ainda abre a pasta escolhida.",
+  "Reload": "Recarregar",
+  "Reload All Gradle Projects": "Recarregar todos os projetos Gradle",
+  "Reload All Maven Projects": "Recarregar todos os projetos Maven",
+  "Reload Changed Classes": "Recarregar classes alteradas",
+  "Reload Environments": "Recarregar ambientes",
+  "Reload History": "Recarregar histórico",
+  "Reload List of Packages": "Recarregar lista de pacotes",
+  "Reload Page": "Recarregar página",
+  "Reload Plugins": "Recarregar plugins",
+  "Reload Project Tree from Disk": "Recarregar árvore do projeto do disco",
+  "Reload Run Configurations": "Recarregar configurações de execução",
+  "Reload from Disk": "Recarregar do disco",
+  "Reload from disk": "Recarregar do disco",
+  "Reload the changed classes into the running debug session?": "Recarregar as classes alteradas na sessão de depuração em execução?",
+  "Reload with Encoding": "Recarregar com codificação",
+  "Remote": "Remoto",
+  "Remove": "Remover",
+  "Remove All Bookmarks": "Remover todos os marcadores",
+  "Remove All Breakpoints": "Remover todos os pontos de interrupção",
+  "Remove Configuration": "Remover configuração",
+  "Remove Data Source": "Remover fonte de dados",
+  "Remove Data Source…": "Remover fonte de dados…",
+  "Remove File from Git": "Remover arquivo do Git",
+  "Remove Kind": "Remover tipo",
+  "Remove Override (restore detected)": "Remover substituição (restaurar detectado)",
+  "Remove Pattern": "Remover padrão",
+  "Remove Template": "Remover modelo",
+  "Remove Watch": "Remover inspeção",
+  "Remove coverage highlighting from editors and the project view": "Remover destaque de cobertura dos editores e da exibição do projeto",
+  "Remove from Favorites": "Remover dos favoritos",
+  "Remove from Recent Projects": "Remover dos projetos recentes",
+  "Remove from Recent Projects…": "Remover dos projetos recentes…",
+  "Remove once hit": "Remover ao ser atingido",
+  "Remove silently": "Remover silenciosamente",
+  "Remove successfully applied files from the shelf": "Remover do shelf os arquivos aplicados com sucesso",
+  "Remove trailing blank lines at the end of saved files": "Remover linhas em branco ao final dos arquivos salvos",
+  "Remove trailing spaces on:": "Remover espaços à direita em:",
+  "Rename": "Renomear",
+  "Rename File Inline": "Renomear arquivo em linha",
+  "Rename File…": "Renomear arquivo…",
+  "Rename Keymap": "Renomear mapa de teclas",
+  "Rename Session…": "Renomear sessão…",
+  "Rename Shelved Changes": "Renomear alterações no shelf",
+  "Rename Shelved Changes…": "Renomear alterações no shelf…",
+  "Rename tab": "Renomear aba",
+  "Rename…": "Renomear…",
+  "Reopen Closed Tab": "Reabrir aba fechada",
+  "Reopen last project on startup": "Reabrir último projeto ao iniciar",
+  "Reopen projects on startup": "Reabrir projetos ao iniciar",
+  "Replace": "Substituir",
+  "Replace All": "Substituir tudo",
+  "Replace Preview": "Pré-visualização da substituição",
+  "Replace Selected": "Substituir selecionados",
+  "Replace Structurally": "Substituição estrutural",
+  "Replace Structurally: Preview": "Substituição estrutural: pré-visualização",
+  "Replace Structurally…": "Substituição estrutural…",
+  "Replace failed": "Falha na substituição",
+  "Replace in Files": "Substituir nos arquivos",
+  "Replace in Files…": "Substituir nos arquivos…",
+  "Replace in file": "Substituir no arquivo",
+  "Replace preview": "Pré-visualização da substituição",
+  "Replace template": "Modelo de substituição",
+  "Replace this occurrence only": "Substituir apenas esta ocorrência",
+  "Replace with": "Substituir por",
+  "Replacements": "Substituições",
+  "Reports errors and warnings from language servers.": "Relata erros e avisos de servidores de linguagem.",
+  "Repository": "Repositório",
+  "Repository URL": "URL do repositório",
+  "Request": "Requisição",
+  "Require": "Exigir",
+  "Rerun": "Executar novamente",
+  "Rerun Failed Tests": "Executar novamente testes com falha",
+  "Rerun Find Usages": "Executar Localizar usos novamente",
+  "Rerun Inspection": "Executar inspeção novamente",
+  "Rerun Query": "Executar consulta novamente",
+  "Rescan Plugins": "Examinar plugins novamente",
+  "Reset": "Redefinir",
+  "Reset Current Branch to Here…": "Redefinir branch atual para cá…",
+  "Reset Frame": "Redefinir quadro",
+  "Reset HEAD…": "Redefinir HEAD…",
+  "Reset IDE Zoom": "Redefinir zoom da IDE",
+  "Reset Shortcuts": "Redefinir atalhos",
+  "Reset Zoom": "Redefinir zoom",
+  "Reset to Language Defaults": "Redefinir para os padrões da linguagem",
+  "Comment Code": "Comentar código",
+  "Line comment at first column": "Comentário de linha na primeira coluna",
+  "Add a space at line comment start": "Adicionar um espaço no início do comentário de linha",
+  "Reset type": "Tipo de redefinição",
+  "Resize": "Redimensionar",
+  "Resize right tool window bar": "Redimensionar barra de janelas de ferramentas direita",
+  "Resize tool window bar": "Redimensionar barra de janelas de ferramentas",
+  "Resolve Conflicts…": "Resolver conflitos…",
+  "Resolve all conflicts before continuing": "Resolva todos os conflitos antes de continuar",
+  "Resolve merge conflicts before committing": "Resolva os conflitos de mesclagem antes de fazer o commit",
+  "Resolve…": "Resolver…",
+  "Resource Folders": "Pastas de recursos",
+  "Resources": "Recursos",
+  "Response": "Resposta",
+  "Response body": "Corpo da resposta",
+  "Response history": "Histórico de respostas",
+  "Restart": "Reiniciar",
+  "Restart Container": "Reiniciar contêiner",
+  "Restart IDE": "Reiniciar IDE",
+  "Restart Session": "Reiniciar sessão",
+  "Restart identity": "Reiniciar identidade",
+  "Restart is only available in the desktop app": "A reinicialização só está disponível no aplicativo desktop",
+  "Restore Default": "Restaurar padrão",
+  "Restore Default Layout": "Restaurar layout padrão",
+  "Restore Defaults": "Restaurar padrões",
+  "Restore Rows": "Restaurar linhas",
+  "Restore Size": "Restaurar tamanho",
+  "Maximize Editor": "Maximizar editor",
+  "Restore detected roots": "Restaurar raízes detectadas",
+  "Result": "Resultado",
+  "Select a file to preview its changes": "Selecione um arquivo para pré-visualizar suas alterações",
+  "Select a problem to see its details": "Selecione um problema para ver seus detalhes",
+  "Select an item to preview": "Selecione um item para pré-visualizar",
+  "Severity": "Gravidade",
+  "Selecting a changed file shows its diff in the editor's preview tab": "A seleção de um arquivo alterado mostra sua diferença na aba de pré-visualização do editor",
+  "Show Diff Preview": "Exibir pré-visualização do diff",
+  "Show Quick Fixes": "Exibir correções rápidas",
+  "Snappy": "Snappy",
+  "Sort By": "Ordenar por",
+  "Tags": "Tags",
+  "The start date is after the end date": "A data de início é posterior à data de término",
+  "To:": "Para:",
+  "Unstash Changes": "Restaurar alterações do Stash",
+  "Unstash…": "Restaurar do Stash…",
+  "result": "resultado",
+  "results": "resultados",
+  "Results": "Resultados",
+  "Resume Program": "Retomar programa",
+  "Retry": "Tentar novamente",
+  "Return to the start of the selected frame's method": "Retornar ao início do método do quadro selecionado",
+  "Reveal in Project View": "Revelar na exibição do projeto",
+  "Reverse patch": "Inverter patch",
+  "Revert": "Reverter",
+  "Revert Change": "Reverter alteração",
+  "Revert Commit": "Reverter commit",
+  "Revert Commits": "Reverter commits",
+  "Reverts the last file move or rename and its reference updates": "Reverte a última movimentação ou renomeação de arquivo e as atualizações de suas referências",
+  "Review comment": "Comentário de revisão",
+  "Reviewers": "Revisores",
+  "Revision": "Revisão",
+  "Revisions": "Revisões",
+  "Reword": "Reescrever",
+  "Rich-Text Copy": "Copiar como Rich Text",
+  "Right tool windows": "Janelas de ferramentas à direita",
+  "Roll Back": "Reverter",
+  "Rollback": "Reversão",
+  "Rollback Changes": "Reverter alterações",
+  "Rollback…": "Reverter…",
+  "Row limit": "Limite de linhas",
+  "Run": "Executar",
+  "Run All HTTP Requests in File": "Executar todas as requisições HTTP no arquivo",
+  "Run All Requests in File": "Executar todas as requisições no arquivo",
+  "Run Code › Analyze Code › Locate Duplicates… to find copied code": "Execute Código › Analisar código › Localizar duplicatas… para encontrar código copiado",
+  "Run Code › Inspect Code… to analyse files": "Execute Código › Inspecionar código… para analisar arquivos",
+  "Run Command in Terminal": "Executar comando no terminal",
+  "Run `pnpm tauri dev` to use the file system.": "Execute `pnpm tauri dev` para usar o sistema de arquivos.",
+  "Run Configuration": "Configuração de execução",
+  "Run Context Configuration": "Executar configuração de contexto",
+  "Run Context Configuration with Coverage": "Executar configuração de contexto com cobertura",
+  "Run Gradle Task": "Executar tarefa do Gradle",
+  "Run HTTP Request at Caret": "Executar requisição HTTP no cursor",
+  "Run Maven Build": "Executar compilação do Maven",
+  "Run SQL Script": "Executar script SQL",
+  "Run SQL Script…": "Executar script SQL…",
+  "Run a configuration with coverage to see which lines its tests execute.": "Execute uma configuração com cobertura para ver quais linhas seus testes executam.",
+  "Run a request from an .http file with the gutter ▶ or ⌘↩.": "Execute uma requisição de um arquivo .http com o ▶ na margem ou ⌘↩.",
+  "Run actions": "Ações de execução",
+  "Run and Debug": "Executar e depurar",
+  "Run code cleanup": "Executar limpeza de código",
+  "Run configurations": "Configurações de execução",
+  "Run configurations and tests": "Configurações de execução e testes",
+  "Run external linter on save": "Executar linter externo ao salvar",
+  "Run gh auth login": "Executar gh auth login",
+  "Run sessions": "Sessões de execução",
+  "Run the selected configuration under a sampling profiler": "Executar a configuração selecionada em um profiler por amostragem",
+  "Run the selected configuration with coverage": "Executar a configuração selecionada com cobertura",
+  "Run the test or program in the active file": "Executar o teste ou programa no arquivo ativo",
+  "Run the test or program in the active file with coverage": "Executar o teste ou programa no arquivo ativo com cobertura",
+  "Run to Cursor": "Executar até o cursor",
+  "Run to the caret, ignoring breakpoints on the way": "Executa até o cursor, ignorando pontos de interrupção no caminho",
+  "Run with Coverage": "Executar com cobertura",
+  "Run with Executor": "Executar com executor",
+  "Run with:": "Executar com:",
+  "Run/Debug": "Executar/Depurar",
+  "Run/Debug Configurations": "Configurações de Execução/Depuração",
+  "Running": "Em execução",
+  "Running processes requires the desktop app.": "A execução de processos requer o aplicativo desktop.",
+  "Runs Gradle with --offline": "Executa o Gradle com --offline",
+  "Runs Maven with -DskipTests": "Executa o Maven com -DskipTests",
+  "Runs Maven with -o": "Executa o Maven com -o",
+  "Runs Optimize Imports when the file has no errors, unless it would change the caret line.": "Executa Otimizar importações quando o arquivo não tiver erros, a menos que isso altere a linha do cursor.",
+  "Runs npm scripts and Node-based language servers (vtsls, eslint, pyright…).": "Executa scripts npm e servidores de linguagem baseados em Node (vtsls, eslint, pyright…).",
+  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw. Bypassed while the Maven daemon is enabled.": "Executa sincronização, compilações e configurações de execução do Maven. O diretório escolhido é usado em vez do mvnw do projeto. Ignorado quando o daemon do Maven está ativado.",
+  "Runs the language server's Organize Imports action.": "Executa a ação Organizar importações do servidor de linguagem.",
+  "Runs the language server's formatter before an explicit save (Actions on Save).": "Executa o formatador do servidor de linguagem antes de um salvamento explícito (Ações ao salvar).",
+  "Search history": "Histórico de pesquisa",
+  "Searching for usages of '{symbol}'": "Pesquisando usos de '{symbol}'",
+  "SQL completion": "Preenchimento SQL",
+  "SQL Inserts": "Inserções SQL",
+  "SQL Script Template": "Modelo de script SQL",
+  "SQL Scripts": "Scripts SQL",
+  "SQLite Database File": "Arquivo de banco de dados SQLite",
+  "SQLite can rename or drop an existing column, not change its type, NOT NULL or default.": "O SQLite pode renomear ou remover uma coluna existente, mas não alterar seu tipo, NOT NULL ou valor padrão.",
+  "SSH authentication type": "Tipo de autenticação SSH",
+  "SSL mode": "Modo SSL",
+  "Safe Delete…": "Exclusão segura…",
+  "Sample plugin: inserts today's date and counts words in the active file.": "Plugin de exemplo: insere a data de hoje e conta palavras no arquivo ativo.",
+  "Save": "Salvar",
+  "Save All": "Salvar tudo",
+  "Save Files": "Salvar arquivos",
+  "Save files if the IDE is idle for": "Salvar arquivos se a IDE estiver ociosa por",
+  "Save files when switching to a different application or a built-in terminal": "Salvar arquivos ao alternar para outro aplicativo ou terminal integrado",
+  "Synchronize external changes when switching to the IDE window": "Sincronizar alterações externas ao alternar para a janela da IDE",
+  "Save or roll back the changes before reloading it from disk.": "Salve ou reverta as alterações antes de recarregá-lo do disco.",
+  "Save password": "Salvar senha",
+  "Save to file:": "Salvar no arquivo:",
+  "Scanning for TODO items…": "Procurando por itens TODO…",
+  "Scheme": "Esquema",
+  "Scope": "Escopo",
+  "Scratches": "Rascunhos",
+  "Script": "Script",
+  "Scroll to End": "Rolar até o final",
+  "Scrolling": "Rolagem",
+  "Search Everywhere": "Pesquisar em qualquer lugar",
+  "Search Structurally": "Pesquisa estrutural",
+  "Search Structurally…": "Pesquisa estrutural…",
+  "Search Text Everywhere": "Pesquisar texto em qualquer lugar",
+  "Search actions": "Pesquisar ações",
+  "Search branches": "Pesquisar branches",
+  "Search branches and actions": "Pesquisar branches e ações",
+  "Search configurations": "Pesquisar configurações",
+  "Search for references": "Pesquisar referências",
+  "Search frames": "Pesquisar quadros",
+  "Search in comments and strings": "Pesquisar em comentários e strings",
+  "Search installed plugins": "Pesquisar plugins instalados",
+  "Search packages": "Pesquisar pacotes",
+  "Search projects": "Pesquisar projetos",
+  "Search pull requests": "Pesquisar pull requests",
+  "Search query": "Consulta de pesquisa",
+  "Search recent projects": "Pesquisar projetos recentes",
+  "Search scope": "Escopo de pesquisa",
+  "Search settings": "Pesquisar configurações",
+  "Search template": "Modelo de pesquisa",
+  "Searches": "Pesquisas",
+  "Searching": "Pesquisando",
+  "Searching for usages": "Pesquisando usos",
+  "Second stroke": "Segunda tecla",
+  "Second stroke:": "Segunda tecla:",
+  "Select All": "Selecionar tudo",
+  "Select Base Interpreter": "Selecionar interpretador base",
+  "Select Folders…": "Selecionar pastas…",
+  "Select GOPATH": "Selecionar GOPATH",
+  "Select JDK Home Directory": "Selecionar diretório raiz do JDK",
+  "Select Local Repository": "Selecionar repositório local",
+  "Select Maven Home Directory": "Selecionar diretório raiz do Maven",
+  "Select Search Directory": "Selecionar diretório de pesquisa",
+  "Select Maven settings.xml": "Selecionar settings.xml do Maven",
+  "Select Next Tab": "Selecionar próxima aba",
+  "Select Opened File": "Selecionar arquivo aberto",
+  "Select Previous Tab": "Selecionar aba anterior",
+  "Select Python Interpreter": "Selecionar interpretador Python",
+  "Select Run/Debug Configuration…": "Selecionar configuração de execução/depuração…",
+  "Select Standard Library Sources": "Selecionar fontes da biblioteca padrão",
+  "Select TypeScript lib Directory": "Selecionar diretório lib do TypeScript",
+  "Select a changed file to show its diff": "Selecione um arquivo alterado para mostrar seu diff",
+  "Select a column": "Selecionar uma coluna",
+  "Select a commit in the Git log": "Selecione um commit no log do Git",
+  "Select a commit to view changes": "Selecione um commit para ver as alterações",
+  "Select a container, image, volume or network.": "Selecione um contêiner, imagem, volume ou rede.",
+  "Select a group": "Selecione um grupo",
+  "Select a result to preview": "Selecione um resultado para pré-visualizar",
+  "Select a revision": "Selecione uma revisão",
+  "Select a template to edit it": "Selecione um modelo para editá-lo",
+  "Select an interpreter": "Selecione um interpretador",
+  "Select changes to move": "Selecione as alterações a serem movidas",
+  "Select in Project View": "Selecionar na exibição do projeto",
+  "Selection": "Seleção",
+  "Select…": "Selecionar…",
+  "Services": "Serviços",
+  "Services actions": "Ações de serviços",
+  "Session finished": "Sessão finalizada",
+  "Set Active Changelist": "Definir changelist ativa",
+  "Set NULL": "Definir como NULL",
+  "Set Value…": "Definir valor…",
+  "Set active": "Definir como ativo",
+  "Set upstream": "Definir upstream",
+  "Settings": "Configurações",
+  "Settings pages": "Páginas de configurações",
+  "Settings scope": "Escopo das configurações",
+  "Settings…": "Configurações…",
+  "Settings for New Projects": "Configurações para novos projetos",
+  "Settings for New Projects…": "Configurações para novos projetos…",
+  "Saved to the global settings: used by new projects and by projects without their own value.": "Salvo nas configurações globais: usado por novos projetos e por projetos sem um valor próprio.",
+  "Shelf": "Shelf",
+  "Shell integration": "Integração do shell",
+  "Shell path": "Caminho do shell",
+  "Shallow clone with a history truncated to": "Clone superficial com histórico truncado para",
+  "Shelve Changes": "Guardar alterações no Shelf",
+  "Shelve Changes…": "Guardar alterações no Shelf…",
+  "Shelved changes": "Alterações no Shelf",
+  "Show": "Mostrar",
+  "Show \"Today\", \"Yesterday\" and \"N min ago\" for recent dates": "Mostrar \"Hoje\", \"Ontem\" e \"há N min\" para datas recentes",
+  "Show All": "Mostrar tudo",
+  "Show All Frames": "Mostrar todos os frames",
+  "Show Bookmarks": "Mostrar marcadores",
+  "Show Inherited": "Mostrar herdados",
+  "Show inherited members": "Mostrar membros herdados",
+  "Show Build": "Exibir compilação",
+  "Show Commit in Git Log": "Mostrar commit no log do Git",
+  "Show Container Log": "Mostrar log do contêiner",
+  "Show Context Actions": "Mostrar ações de contexto",
+  "Show changes": "Mostrar alterações",
+  "Show Coverage": "Mostrar cobertura",
+  "Show Debug Tool Window": "Mostrar janela de ferramentas de depuração",
+  "Show Diff": "Mostrar diff",
+  "Show Diff with Working Tree": "Mostrar diff com a árvore de trabalho",
+  "Show Editor Hint": "Mostrar dica do editor",
+  "Show Errors": "Mostrar erros",
+  "Show Execution Point": "Mostrar ponto de execução",
+  "Show Formatted": "Mostrar formatado",
+  "Show Git Log": "Mostrar log do Git",
+  "Show Hidden Tabs": "Mostrar abas ocultas",
+  "Show History": "Mostrar histórico",
+  "Show History for File": "Mostrar histórico do arquivo",
+  "Show Ignored": "Mostrar ignorados",
+  "Show Infos and Hints": "Mostrar informações e dicas",
+  "Show Local History": "Mostrar histórico local",
+  "Show Log": "Mostrar log",
+  "Show Memory Indicator Details": "Mostrar detalhes do indicador de memória",
+  "Show Passed": "Mostrar aprovados",
+  "Show Preview": "Mostrar pré-visualização",
+  "Show Raw": "Mostrar bruto",
+  "Show Replace": "Mostrar substituir",
+  "Show Run/Debug window when a process is started": "Mostrar janela de Executar/Depurar quando um processo for iniciado",
+  "Show Scheme Actions": "Mostrar ações do esquema",
+  "Show Shelf": "Mostrar Shelf",
+  "Show TODO Items in Current File": "Mostrar itens TODO no arquivo atual",
+  "Show Tool Window Names": "Mostrar nomes das janelas de ferramentas",
+  "Show Usage Results": "Mostrar resultados de usos",
+  "Select Configuration": "Selecionar configuração",
+  "Show Usages": "Mostrar usos",
+  "Show Warnings": "Mostrar avisos",
+  "Show all output": "Mostrar toda a saída",
+  "Show breadcrumbs for:": "Mostrar breadcrumbs para:",
+  "Show breadcrumbs:": "Mostrar breadcrumbs:",
+  "Show changed only": "Mostrar apenas alterados",
+  "Show code folding outline": "Mostrar contorno de dobramento de código",
+  "Show debug window on breakpoint hit": "Mostrar janela de depuração ao atingir ponto de interrupção",
+  "Show details": "Mostrar detalhes",
+  "Show edited only": "Mostrar apenas editados",
+  "Show file extension": "Mostrar extensão do arquivo",
+  "Show gutter icons": "Mostrar ícones na margem",
+  "Show hard wrap and visual guides (configured in Code Style options)": "Mostrar quebra forçada e guias visuais (configurado nas opções de Estilo de Código)",
+  "Show in Finder": "Mostrar no Finder",
+  "Show in tool window": "Mostrar na janela de ferramentas",
+  "Show inlay Run to Cursor popup": "Mostrar popup inline de Executar até o Cursor",
+  "Show indent guides": "Mostrar guias de indentação",
+  "Show inlay hints": "Mostrar dicas inline",
+  "Show inlay hints for:": "Mostrar dicas inline para:",
+  "Show install log": "Mostrar log de instalação",
+  "Show intention bulb": "Mostrar lâmpada de intenção",
+  "Show line numbers": "Mostrar números de linha",
+  "Show live templates in code completion": "Mostrar modelos dinâmicos no autocompletar de código",
+  "Show method separators": "Mostrar separadores de método",
+  "Show only monospaced fonts": "Mostrar apenas fontes monoespaçadas",
+  "Show or hide the memory indicator in the status bar": "Mostrar ou ocultar o indicador de memória na barra de status",
+  "Show postfix templates in code completion": "Mostrar modelos pós-fixados no autocompletar de código",
+  "Show quick documentation on hover": "Mostrar documentação rápida ao passar o mouse",
+  "Show results in the test runner": "Mostrar resultados no executor de testes",
+  "Show right margin": "Mostrar margem direita",
+  "Show sticky lines while scrolling": "Mostrar linhas fixas ao rolar",
+  "Show suggestions as you type": "Mostrar sugestões ao digitar",
+  "Show table data": "Mostrar dados da tabela",
+  "Show the documentation popup in": "Mostrar o popup de documentação em",
+  "Show the parameter info popup in": "Mostrar o popup de informações do parâmetro em",
+  "Show the selected coverage suite in editors and the project view": "Mostrar o conjunto de cobertura selecionado nos editores e na visualização do projeto",
+  "Show tool window bars": "Mostrar barras de janelas de ferramentas",
+  "Show tool window badges": "Mostrar emblemas de janelas de ferramentas",
+  "Counts on the stripe icons, e.g. changed files or agent tasks needing input": "Contagens nos ícones da barra, ex.: arquivos alterados ou tarefas do agente que precisam de entrada",
+  "Show tool window names": "Mostrar nomes das janelas de ferramentas",
+  "Show value tooltip on code selection": "Mostrar tooltip de valor na seleção de código",
+  "Show value tooltip on mouse hover": "Mostrar tooltip de valor ao passar o mouse",
+  "Show values inline": "Mostrar valores inline",
+  "Show virtual space at file bottom": "Mostrar espaço virtual no final do arquivo",
+  "Show whitespaces": "Mostrar espaços em branco",
+  "Shown as the right margin guide in the editor.": "Mostrado como o guia de margem direita no editor.",
+  "Side-by-side Viewer": "Visualizador lado a lado",
+  "Sign-off commit": "Assinar commit (sign-off)",
+  "Size": "Tamanho",
+  "Size:": "Tamanho:",
+  "Skip": "Ignorar",
+  "Skip Commit": "Pular commit",
+  "Skip if defined": "Ignorar se definido",
+  "Smart Keys": "Teclas inteligentes",
+  "Smart Step Into": "Smart Step Into",
+  "Smart Step Into failed": "Falha no Smart Step Into",
+  "Smart indent": "Indentação inteligente",
+  "Soft": "Suave",
+  "Soft Wraps": "Quebras de linha suaves",
+  "Soft-Wrap": "Quebra de linha suave",
+  "Soft-wrap": "Quebra de linha suave",
+  "Soft-wrap files": "Arquivos com quebra de linha suave",
+  "Some items could not be copied": "Alguns itens não puderam ser copiados",
+  "Some items could not be deleted": "Alguns itens não puderam ser excluídos",
+  "Some items could not be moved": "Alguns itens não puderam ser movidos",
+  "Some references may not have been updated": "Algumas referências podem não ter sido atualizadas",
+  "Sort Alphabetically": "Classificar em ordem alfabética",
+  "Source": "Origem",
+  "Source Folders": "Pastas de código-fonte",
+  "Sources": "Fontes",
+  "Sources of std for navigation and completion (RUST_SRC_PATH).": "Fontes da std para navegação e autocompletar (RUST_SRC_PATH).",
+  "Specify Inspection Scope": "Especificar escopo de inspeção",
+  "Split Down": "Dividir para baixo",
+  "Split Right": "Dividir à direita",
+  "Split and Move Down": "Dividir e mover para baixo",
+  "Split and Move Right": "Dividir e mover à direita",
+  "Squash": "Squash",
+  "Squash Commits…": "Fazer squash de commits…",
+  "Squash Into…": "Fazer squash em…",
+  "Stage": "Stage",
+  "Stage Change (git add hunk)": "Preparar alteração (git add hunk)",
+  "Standard library": "Biblioteca padrão",
+  "Start": "Iniciar",
+  "Start Container": "Iniciar contêiner",
+  "Start Rebasing": "Iniciar rebase",
+  "Start a debug configuration with": "Inicie uma configuração de depuração com",
+  "Start a debug session to see the exception filters of its adapter.": "Inicie uma sessão de depuração para ver os filtros de exceção do adaptador correspondente.",
+  "Start debugging a run configuration": "Iniciar a depuração de uma configuração de execução",
+  "Start directory": "Diretório inicial",
+  "Startup": "Inicialização",
+  "Stash Changes…": "Guardar alterações (Stash)…",
+  "Stashes": "Stashes",
+  "State": "Estado",
+  "Status": "Status",
+  "Status bar": "Barra de status",
+  "Step Into": "Step Into",
+  "Step over, ignoring breakpoints in the called code": "Executar passo a passo ignorando pontos de interrupção no código chamado",
+  "Stepping": "Passo a passo",
+  "Sticky Lines": "Linhas fixas",
+  "Sticky balloon": "Balão fixo",
+  "Stop": "Parar",
+  "Stop All": "Parar tudo",
+  "Stop Build": "Parar compilação",
+  "Stop Container": "Parar contêiner",
+  "Stop Process": "Parar processo",
+  "Stop Reloading Gradle Projects": "Parar recarregamento de projetos Gradle",
+  "Stop Reloading Maven Projects": "Parar recarregamento de projetos Maven",
+  "Stop Request": "Parar requisição",
+  "Stop and Rerun": "Parar e reexecutar",
+  "Stop to Edit": "Parar para editar",
+  "Stopped after {count} matches": "Interrompido após {count} correspondências",
+  "Strikeout": "Tachado",
+  "Struct": "Struct",
+  "Struct type": "Tipo struct",
+  "Structural Replace": "Substituição estrutural",
+  "Structural Search": "Pesquisa estrutural",
+  "Structure": "Estrutura",
+  "Structure actions": "Ações de estrutura",
+  "Structure unavailable": "Estrutura indisponível",
+  "Subject line length": "Comprimento da linha de assunto",
+  "Submit": "Enviar",
+  "Submodule changes cannot be rolled back here": "As alterações de submódulo não podem ser revertidas aqui",
+  "Subpixel": "Subpixel",
+  "Suggested names": "Nomes sugeridos",
+  "Super Method": "Método da superclasse",
+  "Surround With": "Envolver com",
+  "Surround With…": "Envolver com…",
+  "Surround selection on typing quote or brace": "Envolver a seleção ao digitar aspas ou chaves",
+  "Suspend on": "Suspender em",
+  "Switch to Auto-Commit": "Alternar para commit automático",
+  "Switcher": "Alternador",
+  "Switcher (Backward)": "Alternador (para trás)",
+  "Symbols": "Símbolos",
+  "Sync with OS": "Sincronizar com o SO",
+  "Synchronize Scrolling": "Sincronizar rolagem",
+  "Synchronize files after execution": "Sincronizar arquivos após a execução",
+  "Syntax trees": "Árvores sintáticas",
+  "System Messages": "Mensagens do sistema",
+  "System Settings": "Configurações do sistema",
+  "System default": "Padrão do sistema",
+  "System-Dependent": "Dependente do sistema",
+  "Tests failed: {detail}": "Falha nos testes: {detail}",
+  "TODO comment": "Comentário TODO",
+  "TODO filters": "Filtros TODO",
+  "TODO items": "Itens TODO",
+  "TODO items unavailable": "Itens TODO indisponíveis",
+  "TODO patterns": "Padrões TODO",
+  "TODO scope": "Escopo TODO",
+  "Tab Actions": "Ações da aba",
+  "Tab actions": "Ações da aba",
+  "Tab limit": "Limite de abas",
+  "Tab name": "Nome da aba",
+  "Tab placement": "Posicionamento das abas",
+  "Tab size": "Tamanho da tabulação",
+  "Tab to complete, Enter to run": "Tab para autocompletar, Enter para executar",
+  "Table": "Tabela",
+  "Table:": "Tabela:",
+  "Tabs": "Abas",
+  "Tabs and Indents": "Tabulações e indentações",
+  "Tag": "Tag",
+  "Tag name:": "Nome da tag:",
+  "Tags to push": "Tags para fazer push",
+  "Target changelist": "Changelist de destino",
+  "Target directory": "Diretório de destino",
+  "Teal": "Azul-petróleo",
+  "Template body": "Corpo do modelo",
+  "Template name": "Nome do modelo",
+  "Template text": "Texto do modelo",
+  "Terminal": "Terminal",
+  "Terminal fallback font": "Fonte de fallback do terminal",
+  "Terminal font": "Fonte do terminal",
+  "Terminal font size": "Tamanho da fonte do terminal",
+  "Terminal line height": "Altura da linha do terminal",
+  "Terminal sessions": "Sessões do terminal",
+  "Test": "Teste",
+  "Test (pytest)": "Teste (pytest)",
+  "Test Connection": "Testar conexão",
+  "Test Resource Folders": "Pastas de recursos de teste",
+  "Test Resources": "Recursos de teste",
+  "Test Source Folders": "Pastas de código-fonte de teste",
+  "Test case": "Caso de teste",
+  "Test case (test)": "Caso de teste (test)",
+  "Test file": "Arquivo de teste",
+  "Test function": "Função de teste",
+  "Test module": "Módulo de teste",
+  "Test results": "Resultados dos testes",
+  "Test suite": "Suíte de testes",
+  "Tests": "Testes",
+  "Text": "Texto",
+  "Text occurrences (language server not ready)": "Ocorrências de texto (servidor de linguagem não inicializado)",
+  "Text or hash": "Texto ou hash",
+  "Text selected in the editor": "Texto selecionado no editor",
+  "Text to find": "Texto a localizar",
+  "The Kotlin debugger is not installed": "O depurador do Kotlin não está instalado",
+  "The Java debugger is not installed": "O depurador do Java não está instalado",
+  "The action already has this shortcut": "A ação já possui este atalho",
+  "The active changelist cannot be deleted": "A changelist ativa não pode ser excluída",
+  "The active file has no runnable element, test or run configuration.": "O arquivo ativo não possui elemento executável, teste ou configuração de execução.",
+  "The caches will be invalidated and rebuilt on the next startup: the symbol index of every project and the syntax caches.": "Os caches serão invalidados e reconstruídos na próxima inicialização: o índice de símbolos de cada projeto e os caches de sintaxe.",
+  "The caret is not inside a conflict": "O cursor não está dentro de um conflito",
+  "The clipboard does not contain a patch": "A área de transferência não contém um patch",
+  "The patch file is empty": "O arquivo de patch está vazio",
+  "The project is not a Git repository.": "O projeto não é um repositório Git.",
+  "The project path is always shown in the status bar navigation bar.": "O caminho do projeto é sempre exibido na barra de navegação da barra de status.",
+  "The remote contains commits that are not in your branch. Update the branch, then push again.": "O repositório remoto contém commits que não estão na sua ramificação. Atualize a ramificação e faça push novamente.",
+  "The report covers no files": "O relatório não cobre nenhum arquivo",
+  "The shortcut is already assigned to other actions. Do you want to remove other assignments?": "O atalho já está atribuído a outras ações. Deseja remover as outras atribuições?",
+  "The tab on the left": "A aba à esquerda",
+  "The tab on the right": "A aba à direita",
+  "The template content could not be inserted.": "Não foi possível inserir o conteúdo do modelo.",
+  "Their version": "A versão deles",
+  "Theirs (incoming)": "Deles (recebida)",
+  "Theme": "Tema",
+  "Theme default": "Padrão do tema",
+  "Themes": "Temas",
+  "There is no online plugin repository": "Não há repositório de plugins online",
+  "This directory is preselected in \"Open…\" and \"New Window\" dialogs.": "Este diretório fica pré-selecionado nas caixas de diálogo \"Abrir…\" e \"Nova janela\".",
+  "This element can't be renamed": "Este elemento não pode ser renomeado",
+  "This page could not be displayed": "Esta página não pôde ser exibida",
+  "This project has no remote on GitHub.": "Este projeto não possui repositório remoto no GitHub.",
+  "This version has no release notes.": "Esta versão não possui notas de lançamento.",
+  "This will reset the current branch head to the selected commit, and update the working tree and the index according to the selected mode:": "Isso redefinirá o HEAD da ramificação atual para o commit selecionado e atualizará a árvore de trabalho e o índice de acordo com o modo selecionado:",
+  "Thread": "Thread",
+  "Time limit for Run/Debug process termination": "Limite de tempo para encerramento de processos de Execução/Depuração",
+  "Timestamps": "Carimbos de data/hora",
+  "Title": "Título",
+  "To commit:": "Para o commit:",
+  "To directory:": "Para o diretório:",
+  "To nearest indent position": "Para a posição de indentação mais próxima",
+  "To proper indent position": "Para a posição correta de indentação",
+  "Toggle 'Skip Tests' Mode": "Alternar modo 'Pular testes'",
+  "Toggle Bookmark": "Alternar marcador",
+  "Toggle Field Watchpoint": "Alternar ponto de monitoramento de campo",
+  "Toggle Light/Dark Theme": "Alternar tema claro/escuro",
+  "Toggle Line Breakpoint": "Alternar ponto de interrupção de linha",
+  "Toggle Method Breakpoint": "Alternar ponto de interrupção de método",
+  "Toggle Offline Mode": "Alternar modo offline",
+  "Toggle Performance Overlay (Dev)": "Alternar sobreposição de desempenho (Dev)",
+  "Toggle Read-only Attribute": "Alternar atributo somente leitura",
+  "Toggle Temporary Line Breakpoint": "Alternar ponto de interrupção temporário de linha",
+  "Tool Settings": "Configurações da ferramenta",
+  "Tool Windows": "Janelas de ferramentas",
+  "Tool windows": "Janelas de ferramentas",
+  "Toolchain": "Toolchain",
+  "Toolchain location": "Local da toolchain",
+  "Tools": "Ferramentas",
+  "Tooltip delay": "Atraso do tooltip",
+  "Top": "Superior",
+  "Total": "Total",
+  "Trailing": "Final",
+  "Trait implementation": "Implementação de trait",
+  "Transaction mode": "Modo de transação",
+  "Trim whitespaces": "Remover espaços em branco",
+  "Truncate": "Truncar",
+  "Truncate…": "Truncar…",
+  "Trust Host and Retry": "Confiar no host e tentar novamente",
+  "Trust and Connect": "Confiar e conectar",
+  "Tx: Auto": "Tx: Automático",
+  "Tx: Manual": "Tx: Manual",
+  "Type / to see commands": "Digite / para ver os comandos",
+  "Type Declaration": "Declaração do tipo",
+  "Type Hierarchy": "Hierarquia de tipos",
+  "Type an expression followed by": "Digite uma expressão seguida de",
+  "Type hierarchy": "Hierarquia de tipos",
+  "Type to filter by file name or code": "Digite para filtrar por nome de arquivo ou código",
+  "Type to filter symbols": "Digite para filtrar símbolos",
+  "Type to search": "Digite para pesquisar",
+  "TypeScript version": "Versão do TypeScript",
+  "Types": "Tipos",
+  "Typography Settings": "Configurações de tipografia",
+  "Main menu": "Menu principal",
+  "Hamburger button": "Botão hambúrguer",
+  "Merged with main toolbar": "Mesclado à barra de ferramentas principal",
+  "UI Options": "Opções da interface de usuário",
+  "UI elements take up less screen space": "Os elementos da interface ocupam menos espaço na tela",
+  "UI fallback font": "Fonte de fallback da interface",
+  "UI font": "Fonte da interface",
+  "UI font size": "Tamanho da fonte da interface",
+  "Uninstalled {name}": "{name} desinstalado",
+  "URL:": "URL:",
+  "Unchecked values are inherited from the scheme.": "Os valores desmarcados são herdados do esquema.",
+  "Uncommitted changes are stashed before the update and restored afterwards.": "As alterações não commitadas são guardadas em stash antes da atualização e restauradas depois.",
+  "Underline": "Sublinhado",
+  "Underscored": "Sublinhado simples",
+  "Underwaved": "Sublinhado ondulado",
+  "Undo": "Desfazer",
+  "Unread": "Não lido",
+  "Undo Commit": "Desfazer commit",
+  "Undo Commit…": "Desfazer commit…",
+  "Undo Move / Rename": "Desfazer mover / renomear",
+  "Unified Viewer": "Visualizador unificado",
+  "Unindent": "Diminuir indentação",
+  "Uninstall": "Desinstalar",
+  "Uninstall…": "Desinstalar…",
+  "Unknown SSH Host": "Host SSH desconhecido",
+  "Unmute Breakpoints": "Reativar pontos de interrupção",
+  "Unpause": "Retomar",
+  "Unpin Tab": "Desafixar aba",
+  "Unshelve": "Restaurar do Shelf",
+  "Unshelve Changes": "Restaurar alterações do Shelf",
+  "Unshelve…": "Restaurar do Shelf…",
+  "Unsplit": "Remover divisão",
+  "Unsplit All": "Remover todas as divisões",
+  "Unstage": "Desfazer stage",
+  "Unstash Changes…": "Restaurar alterações (Unstash)…",
+  "Update": "Atualizar",
+  "Update Project": "Atualizar projeto",
+  "Update Project…": "Atualizar projeto…",
+  "Update method": "Método de atualização",
+  "Update type": "Tipo de atualização",
+  "Update type:": "Tipo de atualização:",
+  "Upgrade": "Atualizar",
+  "Uptime": "Tempo de atividade",
+  "Usage searches": "Pesquisas de usos",
+  "Usage search did not finish; nothing was deleted": "A pesquisa de usos não foi concluída; nada foi excluído",
+  "usage": "uso",
+  "usages": "usos",
+  "more": "mais",
+  "Usages": "Usos",
+  "Code author": "Autor do código",
+  "Usages Detected": "Usos detectados",
+  "Usages actions": "Ações de usos",
+  "Usages of '{symbol}'": "Usos de '{symbol}'",
+  "Usages of element at caret": "Usos do elemento no cursor",
+  "Use \"CamelHumps\" words": "Usar palavras \"CamelHumps\"",
+  "Use 24-hour time format": "Usar formato de 24 horas",
+  "Use Call Hierarchy (⌃⌥H) or Type Hierarchy (⌃H) on a symbol to see its hierarchy here": "Use Hierarquia de Chamadas (⌃⌥H) ou Hierarquia de Tipos (⌃H) em um símbolo para ver sua hierarquia aqui",
+  "Use DROP CASCADE syntax": "Usar sintaxe DROP CASCADE",
+  "Use Default Theme": "Usar tema padrão",
+  "Use Find Usages (⌥F7) on a symbol to see its usages here": "Use Localizar Usos (⌥F7) em um símbolo para ver seus usos aqui",
+  "Use IF EXISTS syntax": "Usar sintaxe IF EXISTS",
+  "Use Option as Meta key": "Usar Option como tecla Meta",
+  "Use SSH tunnel": "Usar túnel SSH",
+  "Use block caret": "Usar cursor em bloco",
+  "Use contrast scrollbars": "Usar barras de rolagem contrastantes",
+  "Use custom font": "Usar fonte personalizada",
+  "Use custom font:": "Usar fonte personalizada:",
+  "Use editor font": "Usar fonte do editor",
+  "Use lighter color in the dark theme and darker color in the light theme as a background": "Usar cor mais clara no tema escuro e mais escura no tema claro como plano de fundo",
+  "Use original line's indent for wrapped parts": "Usar indentação da linha original para partes com quebra de linha",
+  "Use pretty formatting": "Usar formatação legível",
+  "Use project colors in main toolbar": "Usar cores do projeto na barra de ferramentas principal",
+  "Use smooth caret blinking": "Usar piscar suave do cursor",
+  "Use smooth caret movement": "Usar movimento suave do cursor",
+  "Use soft wraps in console": "Usar quebra de linha automática no console",
+  "Use tab character": "Usar caractere de tabulação",
+  "Used by the npm run configurations detected from package.json scripts.": "Usado pelas configurações de execução do npm detectadas a partir dos scripts do package.json.",
+  "Used for new files.": "Usado para novos arquivos.",
+  "User": "Usuário",
+  "User settings file": "Arquivo de configurações do usuário",
+  "User:": "Usuário:",
+  "Uses HostName, User, Port, IdentityFile and ProxyJump from ~/.ssh/config, and keys of the SSH agent.": "Usa HostName, User, Port, IdentityFile e ProxyJump de ~/.ssh/config, e chaves do agente SSH.",
+  "VCS Operations": "Operações de VCS",
+  "VCS Operations…": "Operações de VCS…",
+  "Value": "Valor",
+  "Value tooltip delay (ms)": "Atraso do tooltip de valor (ms)",
+  "Value tooltips are off": "Os tooltips de valor estão desativados",
+  "Values are inserted as SQL: quote strings, e.g. 'abc'.": "Os valores são inseridos como SQL: use aspas em strings, ex.: 'abc'.",
+  "Values of local variables are shown after the lines that use them while suspended.": "Os valores das variáveis locais são exibidos após as linhas que os usam enquanto suspenso.",
+  "Variable": "Variável",
+  "Variables": "Variáveis",
+  "Variables:": "Variáveis:",
+  "Version": "Versão",
+  "Version Control": "Controle de versão",
+  "Version control": "Controle de versão",
+  "Version control:": "Controle de versão:",
+  "Version control is not configured": "O controle de versão não está configurado",
+  "Version used by vtsls / typescript-language-server (typescript.tsdk, tsserver.path).": "Versão usada por vtsls / typescript-language-server (typescript.tsdk, tsserver.path).",
+  "Vertical": "Vertical",
+  "View": "Exibir",
+  "View Breakpoints…": "Ver pontos de interrupção…",
+  "View Pull Requests": "Ver pull requests",
+  "View Usages": "Ver usos",
+  "View in Browser": "Visualizar no navegador",
+  "Violet": "Violeta",
+  "Virtual Space": "Espaço virtual",
+  "Virtualenv Environment": "Ambiente Virtualenv",
+  "Virtualenv Location": "Localização do Virtualenv",
+  "Visual guides": "Guias visuais",
+  "WHERE filter": "Filtro WHERE",
+  "Warn if CRLF line separators are about to be committed": "Avisar se separadores de linha CRLF estiverem prestes a ser commitados",
+  "Warn when committing in detached HEAD or during rebase": "Avisar ao commitar com HEAD desanexado ou durante rebase",
+  "Warning": "Aviso",
+  "Welcome": "Bem-vindo",
+  "Welcome to OpenIDEA": "Bem-vindo ao OpenIDEA",
+  "What's New": "Novidades",
+  "When caret is moved": "Quando o cursor for movido",
+  "When files are created": "Quando arquivos forem criados",
+  "When files are deleted": "Quando arquivos forem excluídos",
+  "When the current tab is closed, activate": "Quando a aba atual for fechada, ativar",
+  "When the tab limit is reached": "Quando o limite de abas for atingido",
+  "Widescreen tool window layout": "Layout de janelas de ferramentas para tela ampla",
+  "Window": "Janela",
+  "Words": "Palavras",
+  "Working": "Em andamento",
+  "Working directory": "Diretório de trabalho",
+  "Wrap when typing reaches right margin": "Quebrar linha quando a digitação atingir a margem direita",
+  "Wrapping": "Quebra de linha",
+  "Yellow": "Amarelo",
+  "You can also drop a folder onto this window.": "Você também pode soltar uma pasta nesta janela.",
+  "Your version": "Sua versão",
+  "Zoom": "Zoom",
+  "Zoom In IDE": "Aumentar zoom da IDE",
+  "Zoom Out IDE": "Diminuir zoom da IDE",
+  "a dollar sign. Leading tabs are indent units.": "um cifrão. Tabulações no início são unidades de recuo.",
+  "any number of nodes (arguments, statements). A placeholder used twice must match equal code.": "qualquer número de nós (argumentos, instruções). Um placeholder usado duas vezes deve corresponder ao mesmo código.",
+  "any, rust, typescript…": "any, rust, typescript…",
+  "cargo run configurations and rust-analyzer use this toolchain (PATH, RUSTUP_TOOLCHAIN).": "As configurações de execução do cargo e o rust-analyzer usam esta toolchain (PATH, RUSTUP_TOOLCHAIN).",
+  "chord prefix": "prefixo de acorde",
+  "command line tool. Install it, then run": "ferramenta de linha de comando. Instale-a e execute",
+  "compact the conversation": "compactar a conversa",
+  "configured in": "configurado em",
+  "const declaration": "declaração const",
+  "current branch": "branch atual",
+  "debugpy is not installed": "debugpy não está instalado",
+  "delete specific rows from a table": "excluir linhas específicas de uma tabela",
+  "failed to load": "falha ao carregar",
+  "for loop": "laço for",
+  "for range loop": "laço for range",
+  "for…in loop": "laço for…in",
+  "for…of loop": "laço for…of",
+  "from packageManager / lock file": "do packageManager / arquivo de lock",
+  "from ~/.ssh/config": "de ~/.ssh/config",
+  "host or ~/.ssh/config alias": "host ou alias de ~/.ssh/config",
+  "if statement": "instrução if",
+  "impl block": "bloco impl",
+  "import default": "import padrão",
+  "in a terminal, then retry.": "em um terminal e tente novamente.",
+  "insert rows into a table": "inserir linhas em uma tabela",
+  "inside your project.": "dentro do seu projeto.",
+  "is already assigned to:": "já está atribuído a:",
+  "is omitted (with one following blank line) when there is no package.": "é omitido (com uma linha em branco seguinte) quando não há pacote.",
+  "is on PATH.": "está no PATH.",
+  "last · p50 · p95 · max": "último · p50 · p95 · máx",
+  "let binding": "vinculação let",
+  "let mut binding": "vinculação let mut",
+  "main function": "função main",
+  "main function with __main__ guard": "função main com proteção __main__",
+  "main() function": "função main()",
+  "main() method": "método main()",
+  "main(args) function": "função main(args)",
+  "match expression": "expressão match",
+  "match one node,": "corresponde a um nó,",
+  "new column definition": "definição de nova coluna",
+  "new remote branch": "nova branch remota",
+  "new table definition": "definição de nova tabela",
+  "new view definition": "definição de nova view",
+  "no file is open in the editor": "nenhum arquivo aberto no editor",
+  "no symbols": "nenhum símbolo",
+  "not found": "não encontrado",
+  "not installed in this project": "não instalado neste projeto",
+  "or click a line number to set a breakpoint.": "ou clique no número de uma linha para definir um ponto de interrupção.",
+  "per module, the JDK of its Java version": "por módulo, o JDK de sua versão do Java",
+  "pip output": "saída do pip",
+  "places the caret. A line with": "posiciona o cursor. Uma linha com",
+  "println! with Debug": "println! com Debug",
+  "pytest test function": "função de teste do pytest",
+  "replaced ·": "substituídos ·",
+  "rust-analyzer runs the tool after each save and reports its diagnostics.": "o rust-analyzer executa a ferramenta após cada salvamento e relata seus diagnósticos.",
+  "select a limited number of rows from a table": "selecionar um número limitado de linhas de uma tabela",
+  "select all rows from a table": "selecionar todas as linhas de uma tabela",
+  "select specific rows from a table": "selecionar linhas específicas de uma tabela",
+  "select the number of specific rows in a table": "selecionar o número de linhas específicas em uma tabela",
+  "surrounded text,": "texto circundado,",
+  "the language server's own TypeScript": "o próprio TypeScript do servidor de linguagem",
+  "update values in a table": "atualizar valores em uma tabela",
+  "val declaration": "declaração val",
+  "var declaration": "declaração var",
+  "variables (repeated ones are linked),": "variáveis (as repetidas são vinculadas),",
+  "via the gear menu › Install Plugin from Disk….": "via menu de engrenagem › Instalar plugin do disco….",
+  "with BOM": "com BOM",
+  "with BOM under Windows, with no BOM otherwise": "com BOM no Windows, sem BOM nos outros casos",
+  "with NO BOM": "SEM BOM",
+  "with statement": "instrução with",
+  "{count} rows exported": "{count} linhas exportadas",
+  "{index} of {total}": "{index} de {total}",
+  "{name} failed": "{name} falhou",
+  "{name} has unsaved changes": "{name} tem alterações não salvas",
+  "{name} installed": "{name} instalado",
+  "{name} is not installed": "{name} não está instalado",
+  "⌥← / ⌥→ and ⌥⌫ stop at humps of camelCase names.": "⌥← / ⌥→ e ⌥⌫ param nas maiúsculas de nomes em camelCase.",
+  "Specify commit message": "Especificar mensagem de commit",
+  "Author:": "Autor:",
+  "Run Git hooks": "Executar hooks do Git",
+  "Advanced Commit Checks": "Verificações avançadas de commit",
+  "Configure": "Configurar",
+  "View Options": "Opções de exibição",
+  "Stash": "Stash",
+  "Remove Recent Project": "Remover projeto recente",
+  "Group By": "Agrupar por",
+  "The search hit its limit; only usages found so far are replaced.": "A pesquisa atingiu seu limite; apenas os usos encontrados até agora foram substituídos.",
+  "Review": "Revisar",
+  "Commit and Push…": "Fazer commit e push…",
+  "Language server": "Servidor de linguagem",
+  "Path": "Caminho",
+  "Missing": "Ausente",
+  "Installs into the IDE's own tools folder via {installMethod}": "Instala na pasta de ferramentas da própria IDE via {installMethod}",
+  "No tool selected": "Nenhuma ferramenta selecionada",
+  "Custom": "Personalizado",
+  "On PATH": "No PATH",
+  "Reinstall": "Reinstalar",
+  "Move focus to the Editor with Escape": "Mover foco para o Editor com Escape",
+  "Otherwise Escape goes to the shell.": "Caso contrário, Escape vai para o shell.",
+  "Configure terminal keybindings": "Configurar atalhos de teclado do terminal",
+  "Used for characters the main font lacks.": "Usada para caracteres ausentes na fonte principal.",
+  "Column width": "Largura da coluna",
+  "Installed Shells": "Shells instalados",
+  "Installed shells": "Shells instalados",
+  "Shell Path": "Caminho do shell",
+  "New Predefined Session": "Nova sessão predefinida",
+  "Suspend": "Suspender",
+  "\"Breakpoint hit\" message": "Mensagem \"Ponto de interrupção atingido\"",
+  "Evaluate and log": "Avaliar e registrar",
+  "History": "Histórico",
+  "Expand value": "Expandir valor",
+  "Expression history": "Histórico de expressões",
+  "Allow multiple instances": "Permitir múltiplas instâncias",
+  "Hold Shift to Debug, F4 to edit, Delete to remove": "Segure Shift para depurar, F4 para editar, Delete para remover",
+  "Hold Shift to Run, F4 to edit, Delete to remove": "Segure Shift para executar, F4 para editar, Delete para remover",
+  "Send EOF": "Enviar EOF",
+  "Collapse folded lines": "Recolher linhas dobradas",
+  "Close Tool Window Tab": "Fechar aba da janela de ferramentas",
+  "No open files": "Nenhum arquivo aberto",
+  "Open files": "Arquivos abertos",
+  "New name:": "Novo nome:",
+  "Open copy in editor": "Abrir cópia no editor",
+  "Safe delete (with usage search)": "Exclusão segura (com pesquisa de uso)",
+  "Looking for usages…": "Procurando usos…",
+  "Delete Without Search": "Excluir sem pesquisar",
+  "Rebasing {commit} from {branch}": "Fazendo rebase de {commit} a partir de {branch}",
+  "Already rebased commits and commits from {branch}": "Commits já rebaseados e commits de {branch}",
+  "Already rebased commits": "Commits já rebaseados",
+  "Changes from {name}": "Alterações de {name}",
+  "Your changes": "Suas alterações",
+  "Changes from diverging branches": "Alterações de branches divergentes",
+  "Local Changes": "Alterações locais",
+  "Changes from cherry-pick {commit}": "Alterações do cherry-pick {commit}",
+  "Changes from cherry-pick": "Alterações do cherry-pick",
+  "Your version, branch {branch}": "Sua versão, branch {branch}",
+  "Git Checkout Problem": "Problema no checkout do Git",
+  "Smart Checkout": "Checkout inteligente",
+  "Force Checkout": "Forçar checkout",
+  "Don't Checkout": "Não fazer checkout",
+  "Rebase onto Remote": "Fazer rebase no remoto",
+  "Drop Local Commits": "Descartar commits locais",
+  "Checkout {name}": "Fazer checkout de {name}",
+  "Restore": "Restaurar",
+  "View Commits": "Exibir commits",
+  "Delete Tracked Branch": "Excluir branch rastreada",
+  "Deleted branch {name}": "Branch {name} excluída",
+  "Unmerged commits were discarded": "Commits não mesclados foram descartados",
+  "Restored branch {name}": "Branch {name} restaurada",
+  "Commits of {name}": "Commits de {name}",
+  "All files are up-to-date": "Todos os arquivos estão atualizados",
+  "Update Info": "Informações de atualização",
+  "Press again to go to the next file": "Pressione novamente para ir para o próximo arquivo",
+  "Press again to go to the previous file": "Pressione novamente para ir para o arquivo anterior",
+  "Include in commit": "Incluir no commit",
+  "Code analysis": "Análise de código",
+  "Line separators": "Separadores de linha",
+  "Commit during rebase": "Fazer commit durante o rebase",
+  "Commit in detached HEAD": "Fazer commit em HEAD desanexada",
+  "Amend Commit": "Emendar commit",
+  "Show Commit Message History": "Mostrar histórico de mensagens de commit",
+  "Don't warn about this target": "Não alertar sobre este destino",
+  "Target branch": "Branch de destino",
+  "Checked out {name}": "Checkout de {name} realizado",
+  "Pin Window": "Fixar janela",
+  "Search Context": "Contexto de pesquisa",
+  "Anywhere": "Em qualquer lugar",
+  "In Comments": "Em comentários",
+  "In String Literals": "Em literais de string",
+  "Except Comments": "Exceto comentários",
+  "Except String Literals": "Exceto literais de string",
+  "Except Comments and String Literals": "Exceto comentários e literais de string",
+  "Recent Replacements": "Substituições recentes",
+  "No recent replacements": "Nenhuma substituição recente",
+  "Replace {count} Occurrences": "Substituir {count} ocorrências",
+  "Add Mnemonic Bookmark": "Adicionar marcador mnemônico",
+  "Change Mnemonic": "Alterar mnemônico",
+  "Assign Mnemonic": "Atribuir mnemônico",
+  "Assigned bookmark": "Marcador atribuído",
+  "Current bookmark": "Marcador atual",
+  "No bookmarks": "Nenhum marcador",
+  "Edit Bookmark Description": "Editar descrição do marcador",
+  "Toggle Bookmark with Mnemonic": "Alternar marcador com mnemônico",
+  "Toggle Bookmark {n}": "Alternar marcador {n}",
+  "Go to Bookmark {n}": "Ir para o marcador {n}",
+  "Select In": "Selecionar em",
+  "Select In…": "Selecionar em…",
+  "Next Result": "Próximo resultado",
+  "Previous Result": "Resultado anterior",
+  "Open Result": "Abrir resultado",
+  "Graph Options": "Opções do grafo",
+  "Go to Hash/Branch/Tag": "Ir para Hash/Branch/Tag",
+  "Enter hash or branch/tag name": "Digite o hash ou o nome da branch/tag",
+  "Sort": "Ordenar",
+  "By Commit Date": "Por data de commit",
+  "Topologically": "Topologicamente",
+  "First Parent": "Primeiro pai",
+  "No Merges": "Sem merges",
+  "Branch Actions": "Ações de branch",
+  "Collapse Linear Branches": "Recolher branches lineares",
+  "Expand Linear Branches": "Expandir branches lineares",
+  "Compact References View": "Visualização compacta de referências",
+  "Tag Names": "Nomes das tags",
+  "Long Edges": "Arestas longas",
+  "Commit Timestamp": "Carimbo de data/hora do commit",
+  "References on the Left": "Referências à esquerda",
+  "Hash": "Hash",
+  "Highlight": "Destacar",
+  "My Commits": "Meus commits",
+  "Merge Commits": "Commits de merge",
+  "Rebase…": "Fazer rebase…",
+  "Manage Remotes…": "Gerenciar remotos…",
+  "Clone…": "Clonar…",
+  "New Worktree…": "Novo worktree…",
+  "Worktrees…": "Worktrees…",
+  "Worktrees": "Worktrees",
+  "New Worktree": "Novo worktree",
+  "Git Remotes": "Remotos do Git",
+  "Define Remote": "Definir remoto",
+  "Edit Remote": "Editar remoto",
+  "Add Remote…": "Adicionar remoto…",
+  "Remove Remote": "Remover remoto",
+  "Edit Remote…": "Editar remoto…",
+  "Remove Worktree": "Remover worktree",
+  "Branch to merge:": "Branch a mesclar:",
+  "Check out:": "Fazer checkout:",
+  "Create a new branch": "Criar uma nova branch",
+  "Folder:": "Pasta:",
+  "Options:": "Opções:",
+  "No remotes": "Nenhum remoto",
+  "Include disabled actions": "Incluir ações desativadas",
+  "Symbol Kinds": "Tipos de símbolo",
+  "Open Settings Page": "Abrir página de configurações",
+  "Assign Shortcut…": "Atribuir atalho…",
+  "New List…": "Nova lista…",
+  "Rename List…": "Renomear lista…",
+  "Make Default": "Definir como padrão",
+  "Delete List": "Excluir lista",
+  "Move to Another List": "Mover para outra lista",
+  "New Bookmark List…": "Nova lista de marcadores…",
+  "Toggle File Bookmark": "Alternar marcador de arquivo",
+  "New Bookmark List": "Nova lista de marcadores",
+  "Rename Bookmark List": "Renomear lista de marcadores",
+  "Delete Bookmark List": "Excluir lista de marcadores",
+  "Add Bookmark": "Adicionar marcador",
+  "Remove Bookmark": "Remover marcador",
+  "Interfaces": "Interfaces",
+  "Structs": "Structs",
+  "Enums": "Enums",
+  "Traits": "Traits",
+  "Type Aliases": "Aliases de tipo",
+  "Functions": "Funções",
+  "Methods": "Métodos",
+  "Constructors": "Construtores",
+  "Fields": "Campos",
+  "Constants": "Constantes",
+  "Enum Members": "Membros de enum",
+  "Modules": "Módulos",
+  "Namespaces": "Namespaces",
+  "List name": "Nome da lista",
+  "Add Service": "Adicionar serviço",
+  "Add service": "Adicionar serviço",
+  "No services configured.": "Nenhum serviço configurado.",
+  "Select service to view details": "Selecione o serviço para ver detalhes",
+  "Run Configuration Type": "Tipo de configuração de execução",
+  "Docker Registry…": "Registro do Docker…",
+  "Docker Connection…": "Conexão Docker…",
+  "Address:": "Endereço:",
+  "Username:": "Nome de usuário:",
+  "Scope Based": "Com base no escopo",
+  "Scope:": "Escopo:",
+  "Edit Scopes…": "Editar escopos…",
+  "Import a report collected in CI from disk": "Importar do disco um relatório coletado no CI",
+  "Manage Coverage Reports…": "Gerenciar relatórios de cobertura…",
+  "Coverage Reports": "Relatórios de cobertura",
+  "Show Selected": "Mostrar selecionados",
+  "Import…": "Importar…",
+  "Reload All from Disk": "Recarregar tudo do disco",
+  "Reset Font Size in All Editors": "Redefinir tamanho da fonte em todos os editores",
+  "Library source (read-only).": "Código-fonte da biblioteca (somente leitura).",
+  "Search In Selection": "Pesquisar na seleção",
+  "Search Scope": "Escopo de pesquisa",
+  "Filter Search Results": "Filtrar resultados da pesquisa",
+  "Filter search results": "Filtrar resultados da pesquisa",
+  "Recent searches": "Pesquisas recentes",
+  "New Line": "Nova linha",
+  "New Line in Search Field": "Nova linha no campo de pesquisa",
+  "Quick Type Definition": "Definição rápida de tipo",
+  "Code Cleanup in File": "Limpeza de código no arquivo",
+  "Nothing to generate here": "Nada a gerar aqui",
+  "Sort by name": "Ordenar por nome",
+  "Sort suggestions by relevance": "Ordenar sugestões por relevância",
+  "Sort suggestions alphabetically": "Ordenar sugestões em ordem alfabética",
+  "Press ↵ to insert, ⇥ to replace": "Pressione ↵ para inserir, ⇥ para substituir",
+  "Formatting is turned off for this file (Code Style › Formatter › Do not format)": "A formatação está desativada para este arquivo (Estilo de Código › Formatador › Não formatar)",
+  "No type definition found": "Nenhuma definição de tipo encontrada",
+  "No definition found": "Nenhuma definição encontrada",
+  "Typo: Change to…": "Erro de digitação: Alterar para…",
+  "Spelling": "Ortografia",
+  "No refactoring applies here": "Nenhuma refatoração aplicável aqui",
+  "Inline Completion": "Preenchimento em linha",
+  "Call Inline Completion": "Chamar preenchimento em linha",
+  "Inline completion is off for this language": "O preenchimento em linha está desativado para esta linguagem",
+  "No inline suggestions": "Nenhuma sugestão em linha",
+  "{servers} doesn't support {feature}": "{servers} não suporta {feature}",
+  "completion": "autocompletar",
+  "inline completion": "preenchimento em linha",
+  "hover": "hover",
+  "signature help": "ajuda de assinatura",
+  "go to definition": "ir para a definição",
+  "go to declaration": "ir para a declaração",
+  "go to type definition": "ir para a definição de tipo",
+  "go to implementation": "ir para a implementação",
+  "find references": "localizar referências",
+  "document highlights": "destaques no documento",
+  "code actions": "ações de código",
+  "rename": "renomear",
+  "formatting": "formatação",
+  "range formatting": "formatação de intervalo",
+  "inlay hints": "dicas inline",
+  "code lens": "CodeLens",
+  "document links": "links no documento",
+  "call hierarchy": "hierarquia de chamadas",
+  "type hierarchy": "hierarquia de tipos",
+  "workspace symbols": "símbolos do espaço de trabalho",
+  "Insert Inline Proposal": "Inserir proposta em linha",
+  "Insert Inline Proposal: Next Word": "Inserir proposta em linha: Próxima palavra",
+  "Hide Inline Proposal": "Ocultar proposta em linha",
+  "Show Next Inline Proposal": "Mostrar próxima proposta em linha",
+  "Show Previous Inline Proposal": "Mostrar proposta em linha anterior",
+  "Inspection profile:": "Perfil de inspeção:",
+  "Inspection profile": "Perfil de inspeção",
+  "Configure inspections": "Configurar inspeções",
+  "Run Code Cleanup": "Executar limpeza de código",
+  "Apply the language servers' automatic fixes": "Aplicar correções automáticas dos servidores de linguagem",
+  "No files with a language server in this scope": "Nenhum arquivo com servidor de linguagem neste escopo",
+  "Code Cleanup": "Limpeza de código",
+  "Code Cleanup…": "Limpeza de código…",
+  "Clean Up": "Limpar",
+  "No custom scopes": "Nenhum escopo personalizado",
+  "Custom scope": "Escopo personalizado",
+  "Custom Scopes": "Escopos personalizados",
+  "Choose a scope": "Escolher um escopo",
+  "Enter a project name": "Digite um nome de projeto",
+  "The name contains characters a folder name cannot have": "O nome contém caracteres que o nome de uma pasta não pode ter",
+  "Project Location": "Localização do projeto",
+  "New Project": "Novo projeto",
+  "New Project…": "Novo projeto…",
+  "Create Git repository": "Criar repositório Git",
+  "Export Settings": "Exportar configurações",
+  "Export Settings…": "Exportar configurações…",
+  "OpenIDEA settings": "Configurações do OpenIDEA",
+  "Settings exported": "Configurações exportadas",
+  "Cannot export settings": "Não foi possível exportar as configurações",
+  "Import Settings": "Importar configurações",
+  "Import Settings…": "Importar configurações…",
+  "Settings imported": "Configurações importadas",
+  "Restart to apply imported templates, macros, layouts and view options.": "Reinicie para aplicar modelos, macros, layouts e opções de visualização importados.",
+  "Cannot import settings": "Não foi possível importar as configurações",
+  "Rename Project": "Renomear projeto",
+  "Rename Project…": "Renomear projeto…",
+  "New project name:": "Novo nome do projeto:",
+  "Cannot rename project": "Não foi possível renomear o projeto",
+  "Power Save Mode": "Modo de economia de energia",
+  "Cannot change Power Save Mode": "Não foi possível alterar o Modo de economia de energia",
+  "Power save mode is on: completion and documentation popups and usage highlighting are off.": "O modo de economia de energia está ativado: pop-ups de autocompletar e de documentação e o destaque de uso estão desativados.",
+  "This needs the desktop app": "Isto requer o aplicativo para desktop",
+  "Turn Off": "Desativar",
+  "Build Tools": "Ferramentas de build",
+  "Import a Coverage Report…": "Importar um relatório de cobertura…",
+  "Choose the shown coverage suite, delete suites and imported reports": "Escolha a suíte de cobertura exibida, exclua suítes e relatórios importados",
+  "Import Coverage Report": "Importar relatório de cobertura",
+  "Coverage reports (lcov, JaCoCo XML, Go cover profile)": "Relatórios de cobertura (lcov, JaCoCo XML, perfil Go cover)",
+  "All files": "Todos os arquivos",
+  "Importing coverage needs the desktop app": "A importação de cobertura requer o aplicativo para desktop",
+  "Coverage reports": "Relatórios de cobertura",
+  "not loaded": "não carregado",
+  "No coverage reports. Run with coverage or import a report.": "Nenhum relatório de cobertura. Execute com cobertura ou importe um relatório.",
+  "No color": "Sem cor",
+  "Verify CA": "Verificar CA",
+  "Verify Full": "Verificação completa",
+  "Manual": "Manual",
+  "Name or pattern, e.g. app_*": "Nome ou padrão, ex.: app_*",
+  "Schemas": "Esquemas",
+  "Advanced": "Avançado",
+  "Data source type": "Tipo de fonte de dados",
+  "path/to/database.db (absolute or project-relative)": "caminho/para/banco.db (absoluto ou relativo ao projeto)",
+  "Connection type:": "Tipo de conexão:",
+  "Connection type": "Tipo de conexão",
+  "URL only": "Apenas URL",
+  "from the URL": "da URL",
+  "Connects with the URL alone: host, port, database, SSL and parameters come from it.": "Conecta somente com a URL: host, porta, banco de dados, SSL e parâmetros são obtidos dela.",
+  "Editing the URL fills in the settings above.": "Editar a URL preenche as configurações acima.",
+  "Connection": "Conexão",
+  "Transaction control:": "Controle de transação:",
+  "Transaction control": "Controle de transação",
+  "Default schema:": "Esquema padrão:",
+  "public (search_path, e.g. app, public)": "public (search_path, ex.: app, public)",
+  "Time zone:": "Fuso horário:",
+  "Server default, e.g. UTC or Europe/Berlin": "Padrão do servidor, ex.: UTC ou Europe/Berlin",
+  "UTC (+00:00), e.g. Europe/Berlin or +08:00": "UTC (+00:00), ex.: Europe/Berlin ou +08:00",
+  "Run keep-alive query each": "Executar consulta keep-alive a cada",
+  "Auto-disconnect after": "Desconectar automaticamente após",
+  "Startup script:": "Script de inicialização:",
+  "Runs on every new connection, before any other statement.": "Executa a cada nova conexão, antes de qualquer outra instrução.",
+  "Passphrase:": "Frase secreta:",
+  "Passphrase": "Frase secreta",
+  "Mode:": "Modo:",
+  "CA file:": "Arquivo CA:",
+  "System roots when empty": "Raízes do sistema quando vazio",
+  "CA Certificate File": "Arquivo de certificado da CA",
+  "Client certificate file:": "Arquivo de certificado do cliente:",
+  "Client Certificate File": "Arquivo de certificado do cliente",
+  "Client key file:": "Arquivo de chave do cliente:",
+  "Client Key File": "Arquivo de chave do cliente",
+  "Load Names from Server": "Carregar nomes do servidor",
+  "Driver properties": "Propriedades do driver",
+  "Property name": "Nome da propriedade",
+  "Property value": "Valor da propriedade",
+  "Remove property": "Remover propriedade",
+  "Add Property": "Adicionar propriedade",
+  "Color:": "Cor:",
+  "Color": "Cor",
+  "Add comment": "Adicionar comentário",
+  "Connecting…": "Conectando…",
+  "OceanBase (MySQL mode)": "OceanBase (modo MySQL)",
+  "HTTP Request": "Requisição HTTP",
+  "External Libraries": "Bibliotecas externas",
+  "library root": "raiz da biblioteca",
+  "Scratch File": "Arquivo de rascunho",
+  "Stop Macro Recording": "Parar gravação de macro",
+  "Start Macro Recording": "Iniciar gravação de macro",
+  "Recording macro…": "Gravando macro…",
+  "Rename Macro": "Renomear macro",
+  "Enter a macro name": "Digite um nome de macro",
+  "A macro with this name exists": "Já existe uma macro com este nome",
+  "Delete Macro": "Excluir macro",
+  "Edit Macros": "Editar macros",
+  "Edit Macros…": "Editar macros…",
+  "No saved macros": "Nenhuma macro salva",
+  "Recorded steps": "Etapas gravadas",
+  "Macro playback stopped": "Reprodução de macro interrompida",
+  "A recorded step could not run here.": "Uma etapa gravada não pôde ser executada aqui.",
+  "Nothing was recorded": "Nada foi gravado",
+  "Enter Macro Name": "Digite o nome da macro",
+  "Name (leave empty to keep it only as the last macro):": "Nome (deixe em branco para manter apenas como última macro):",
+  "Play Back Last Macro": "Reproduzir última macro",
+  "Play Saved Macros…": "Reproduzir macros salvas…",
+  "Play Saved Macro": "Reproduzir macro salva",
+  "Search for file type": "Pesquisar por tipo de arquivo",
+  "File types": "Tipos de arquivo",
+  "this view": "esta visualização",
+  "New in This Directory…": "Novo neste diretório…",
+  "All Changed Files": "Todos os arquivos alterados",
+  "Scratches and Consoles": "Rascunhos e consoles",
+  "Run Anything": "Executar qualquer coisa",
+  "Run Anything…": "Executar qualquer coisa…",
+  "Run a command, configuration or goal": "Executar um comando, configuração ou meta",
+  "Run Anything entries": "Entradas de Executar qualquer coisa",
+  "Press Enter to run the command in the project directory": "Pressione Enter para executar o comando no diretório do projeto",
+  "Type a command": "Digite um comando",
+  "Enter to run, Tab to complete. Other commands run in the project directory.": "Enter para executar, Tab para completar. Outros comandos são executados no diretório do projeto.",
+  "Recent": "Recentes",
+  "Search types": "Pesquisar tipos",
+  "Search configuration types": "Pesquisar tipos de configuração",
+  "Configuration types": "Tipos de configuração",
+  "Redirect input": "Redirecionar entrada",
+  "Paths to \".env\" files": "Caminhos para arquivos \".env\"",
+  "Save console output to file": "Salvar saída do console em arquivo",
+  "Show console when a message is printed to stdout": "Mostrar console quando uma mensagem for impressa em stdout",
+  "Show console when a message is printed to stderr": "Mostrar console quando uma mensagem for impressa em stderr",
+  "Add before launch task": "Adicionar tarefa antes da inicialização",
+  "Open run/debug tool window when started": "Abrir janela de ferramentas de execução/depuração ao iniciar",
+  "Focus run/debug tool window when started": "Focar janela de ferramentas de execução/depuração ao iniciar",
+  "Emulate terminal in output console": "Emular terminal no console de saída",
+  "Operating System": "Sistema operacional",
+  "Logs": "Logs",
+  "Before Launch": "Antes de iniciar",
+  "Before launch": "Antes de iniciar",
+  "Before launch tasks": "Tarefas antes de iniciar",
+  "Store as project file": "Armazenar como arquivo de projeto",
+  "Modify options": "Modificar opções",
+  "e.g. ./gradlew or cargo": "ex.: ./gradlew ou cargo",
+  "Edit Environment Variables": "Editar variáveis de ambiente",
+  "Browse for .env Files": "Procurar arquivos .env",
+  "System environment variables are not passed": "Variáveis de ambiente do sistema não são passadas",
+  "Redirect input from": "Redirecionar entrada de",
+  "File relative to the project root": "Arquivo relativo à raiz do projeto",
+  "Shell command, e.g. make generate": "Comando do shell, ex.: make generate",
+  "Remove Task": "Remover tarefa",
+  "Add task": "Adicionar tarefa",
+  "Add configuration…": "Adicionar configuração…",
+  "Add configuration": "Adicionar configuração",
+  "New Folder": "Nova pasta",
+  "Remove Folder": "Remover pasta",
+  "Create New Folder": "Criar nova pasta",
+  "Unnamed": "Sem nome",
+  "No run configurations added.": "Nenhuma configuração de execução adicionada.",
+  "Add new…": "Adicionar novo…",
+  "Edit configuration templates…": "Editar modelos de configuração…",
+  "Import from .vscode/launch.json": "Importar de .vscode/launch.json",
+  "Import Run Configurations from .vscode/launch.json": "Importar configurações de execução de .vscode/launch.json",
+  "Cannot import run configurations": "Não é possível importar as configurações de execução",
+  "No run configurations imported from {file}": "Nenhuma configuração de execução importada de {file}",
+  "Imported {n} run configuration from {file}": "{n} configuração de execução importada de {file}",
+  "Imported {n} run configurations from {file}": "{n} configurações de execução importadas de {file}",
+  "Skipped '{name}': {reason}": "'{name}' ignorada: {reason}",
+  "Left out of '{name}': {keys}": "Omitido de '{name}': {keys}",
+  "Click OK or Apply to save them.": "Clique em OK ou Aplicar para salvá-las.",
+  "A configuration with this name already exists": "Já existe uma configuração com este nome",
+  "Type '{type}' has no equivalent here": "O tipo '{type}' não tem equivalente aqui",
+  "Request '{request}' isn't supported": "A requisição '{request}' não é suportada",
+  "Only attaching to a host and port is supported": "Apenas anexar a um host e porta é suportado",
+  "Uses {variable}, which is known only when VS Code starts it": "Usa {variable}, que só é conhecida quando o VS Code o inicia",
+  "No program, module or command to run": "Nenhum programa, módulo ou comando para executar",
+  "Its configuration '{member}' isn't imported": "Sua configuração '{member}' não foi importada",
+  "Not a configuration with a name": "Não é uma configuração com um nome",
+  "'{name}' is saved in run.local.toml because it uses values from this machine": "'{name}' está salva em run.local.toml porque usa valores desta máquina",
+  "This project has no .vscode/launch.json": "Este projeto não possui .vscode/launch.json",
+  "Import from JetBrains run configurations": "Importar de configurações de execução do JetBrains",
+  "Import Run Configurations from JetBrains (.run, .idea)": "Importar configurações de execução do JetBrains (.run, .idea)",
+  "This project has no JetBrains run configurations (.run, .idea)": "Este projeto não possui configurações de execução do JetBrains (.run, .idea)",
+  "{file} isn't in the project": "{file} não está no projeto",
+  "Uses {variable}, a path variable with no value here": "Usa {variable}, uma variável de caminho sem valor aqui",
+  "Uses {variable}, and the project has several modules": "Usa {variable}, e o projeto possui vários módulos",
+  "The file can't be read: {detail}": "O arquivo não pôde ser lido: {detail}",
+  "Templates": "Modelos",
+  "Configuration templates": "Modelos de configuração",
+  "Back to configurations": "Voltar para as configurações",
+  "Select a configuration type": "Selecione um tipo de configuração",
+  "Add new run configuration…": "Adicionar nova configuração de execução…",
+  "or select run configuration to edit": "ou selecione uma configuração de execução para editar",
+  "Folder name": "Nome da pasta",
+  "Name is required": "O nome é obrigatório",
+  "Environment variable names can't be empty": "Os nomes das variáveis de ambiente não podem ficar vazios",
+  "Environment Variables": "Variáveis de ambiente",
+  "User environment variables:": "Variáveis de ambiente do usuário:",
+  "User environment variables": "Variáveis de ambiente do usuário",
+  "Include system environment variables": "Incluir variáveis de ambiente do sistema",
+  "System environment variables": "Variáveis de ambiente do sistema",
+  "Click the Run icon in the editor gutter": "Clique no ícone Executar na margem do editor",
+  "Select \"Run…\" in the editor context menu": "Selecione \"Executar…\" no menu de contexto do editor",
+  "Launch a": "Iniciar uma",
+  "run configuration": "configuração de execução",
+  "Run Current File": "Executar arquivo atual",
+  "Debug Current File": "Depurar arquivo atual",
+  "Run Another Configuration": "Executar outra configuração",
+  "Run External Tool": "Executar ferramenta externa",
+  "Run Shell Command": "Executar comando do shell",
+  "Run shell command": "Executar comando do shell",
+  "Activate Tool Window": "Ativar janela de ferramentas",
+  "Building is not available": "A compilação não está disponível",
+  "A build is already running": "Uma compilação já está em execução",
+  "The before launch tasks run in a cycle": "As tarefas antes de iniciar são executadas em ciclo",
+  "No command": "Nenhum comando",
+  "Compound": "Composta",
+  "Add at least one configuration": "Adicione pelo menos uma configuração",
+  "A compound configuration can't include itself": "Uma configuração composta não pode incluir a si mesma",
+  "Some configurations no longer exist": "Algumas configurações não existem mais",
+  "Command is required": "O comando é obrigatório",
+  "A before launch task runs a missing configuration or this one": "Uma tarefa antes de iniciar executa uma configuração ausente ou esta mesma",
+  "A before launch task is incomplete": "Uma tarefa antes de iniciar está incompleta",
+  "Run Widget": "Widget de execução",
+  "Run Configurations": "Configurações de execução",
+  "Starting": "Iniciando",
+  "Stopped": "Parado",
+  "Finished": "Concluído",
+  "Remove from Services": "Remover dos serviços",
+  "Show in Run Tool Window": "Exibir na janela de ferramentas de Execução",
+  "Configuration": "Configuração",
+  "Type": "Tipo",
+  "Not started": "Não iniciado",
+  "Shell Script": "Script de shell",
+  "Run a script file, script text or command line": "Executar um arquivo de script, texto de script ou linha de comando",
+  "Script file": "Arquivo de script",
+  "Script text": "Texto do script",
+  "Script path": "Caminho do script",
+  "Script options": "Opções do script",
+  "Interpreter path": "Caminho do interpretador",
+  "Run the script directly": "Executar o script diretamente",
+  "Interpreter options": "Opções do interpretador",
+  "Run an executable with arguments": "Executar um executável com argumentos",
+  "Executable": "Executável",
+  "Path or command on PATH": "Caminho ou comando no PATH",
+  "Program arguments": "Argumentos do programa",
+  "VM options": "Opções da VM",
+  "e.g. -Xmx1g -Dkey=value --add-opens java.base/java.lang=ALL-UNNAMED": "ex.: -Xmx1g -Dkey=value --add-opens java.base/java.lang=ALL-UNNAMED",
+  "Main class": "Classe principal",
+  "e.g. com.example.Application": "ex.: com.example.Application",
+  "Active profiles": "Perfis ativos",
+  "e.g. dev,local": "ex.: dev,local",
+  "Comma separated; passed as --spring.profiles.active": "Separados por vírgula; passados como --spring.profiles.active",
+  "Comma separated; passed as -Dspring-boot.run.profiles": "Separados por vírgula; passados como -Dspring-boot.run.profiles",
+  "Comma separated; passed as -Dspring.profiles.active": "Separados por vírgula; passados como -Dspring.profiles.active",
+  "Classpath": "Classpath",
+  "Runtime classpath of the module": "Classpath de tempo de execução do módulo",
+  "Test classpath of the module": "Classpath de teste do módulo",
+  "Run a Java main class": "Executar uma classe principal Java",
+  "Run a Spring Boot application": "Executar uma aplicação Spring Boot",
+  "Passed to the JVM that spring-boot:run or the tests start, not to Maven": "Passado para a JVM iniciada por spring-boot:run ou pelos testes, não para o Maven",
+  "Passed to the JVMs the tasks start (bootRun, run, test), not to Gradle": "Passado para as JVMs iniciadas pelas tarefas (bootRun, run, test), não para o Gradle",
+  "Run a package.json script": "Executar um script do package.json",
+  "package.json directory": "Diretório do package.json",
+  "Tasks": "Tarefas",
+  "Use the Gradle wrapper": "Usar o wrapper do Gradle",
+  "Goals": "Goals",
+  "Use the Maven wrapper": "Usar o wrapper do Maven",
+  "Run or debug several configurations together": "Executar ou depurar várias configurações juntas",
+  " · default": " · padrão",
+  "Bookmarked file": "Arquivo com marcador",
+  "(empty line)": "(linha vazia)",
+  "Name cannot be empty": "O nome não pode ficar vazio",
+  "Every scope needs a name": "Cada escopo precisa de um nome",
+  "Scopes": "Escopos",
+  "Add Scope": "Adicionar escopo",
+  "Remove Scope": "Remover escopo",
+  "Pattern:": "Padrão:",
+  "files by name, anywhere": "arquivos por nome, em qualquer lugar",
+  "files directly in a folder": "arquivos diretamente em uma pasta",
+  "at any depth": "em qualquer profundidade",
+  "Add a scope to define it by a file pattern.": "Adicione um escopo para defini-lo por um padrão de arquivo.",
+  "Just now": "Agora mesmo",
+  "Show Fields": "Exibir campos",
+  "Show Non-Public": "Exibir não públicos",
+  "Sort by Visibility": "Classificar por visibilidade",
+  "Show fields": "Exibir campos",
+  "Show non-public": "Exibir não públicos",
+  "Docker CLI default (DOCKER_HOST / current context)": "Padrão da CLI do Docker (DOCKER_HOST / contexto atual)",
+  "Docker CLI default": "Padrão da CLI do Docker",
+  "Unix socket": "Socket Unix",
+  "TCP / SSH host": "Host TCP / SSH",
+  "Docker context": "Contexto do Docker",
+  "Edit Docker Connection": "Editar conexão com o Docker",
+  "New Docker Connection": "Nova conexão com o Docker",
+  "Connect to Docker daemon with:": "Conectar ao daemon do Docker com:",
+  "Socket path or Engine API URL:": "Caminho do socket ou URL da API do Engine:",
+  "Engine API URL:": "URL da API do Engine:",
+  "tcp://build-host:2376 or ssh://me@build-host": "tcp://build-host:2376 ou ssh://me@build-host",
+  "Certificates folder (TLS, optional):": "Pasta de certificados (TLS, opcional):",
+  "contains ca.pem, cert.pem and key.pem": "contém ca.pem, cert.pem e key.pem",
+  "Certificates Folder": "Pasta de certificados",
+  "Context name:": "Nome do contexto:",
+  "e.g. desktop-linux, orbstack, colima": "ex.: desktop-linux, orbstack, colima",
+  "Docker Registry": "Registro do Docker",
+  "Edit Docker Registry": "Editar registro do Docker",
+  "New Docker Registry": "Novo registro do Docker",
+  "docker.io, ghcr.io, registry.example.com:5000": "docker.io, ghcr.io, registry.example.com:5000",
+  "Unchanged": "Inalterado",
+  "Password or access token": "Senha ou token de acesso",
+  "Images from this registry are pulled with these credentials.": "As imagens deste registro são obtidas com estas credenciais.",
+  "not running": "não está em execução",
+  "Remove Docker Connection": "Remover conexão com o Docker",
+  "Remove Docker Registry": "Remover registro do Docker",
+  "Edit Registry…": "Editar registro…",
+  "Test Login": "Testar login",
+  "Remove Registry": "Remover registro",
+  "Edit Connection…": "Editar conexão…",
+  "Remove Connection": "Remover conexão",
+  "Waiting for output…": "Aguardando saída…",
+  "No output": "Nenhuma saída",
+  "Address": "Endereço",
+  "Username": "Nome de usuário",
+  "Edit…": "Editar…",
+  "Add a run configuration type, Docker connection or registry to the Services tool window": "Adicionar um tipo de configuração de execução, conexão ou registro do Docker à janela de ferramentas Serviços",
+  "Dangling Images": "Imagens órfãs",
+  "Compose Down": "Compose Down",
+  "Cannot read Docker settings": "Não é possível ler as configurações do Docker",
+  "Cannot save Docker settings": "Não é possível salvar as configurações do Docker",
+  "Cannot save the registry password": "Não é possível salvar a senha do registro",
+  "Server": "Servidor",
+  "Container name": "Nome do contêiner",
+  "Derived from the image": "Derivado da imagem",
+  "Bind ports": "Vincular portas",
+  "Bind mounts": "Montagens de vinculação",
+  "Container environment": "Ambiente do contêiner",
+  "Run options": "Opções de execução",
+  "e.g. --rm --network host": "ex.: --rm --network host",
+  "Build an image from a Dockerfile and run a container from it": "Criar uma imagem a partir de um Dockerfile e executar um contêiner a partir dela",
+  "Relative to the project root": "Relativo à raiz do projeto",
+  "Context folder": "Pasta de contexto",
+  "The Dockerfile's folder": "A pasta do Dockerfile",
+  "Image tag": "Tag da imagem",
+  "Derived from the context folder": "Derivado da pasta de contexto",
+  "Build stage": "Estágio de build",
+  "The last stage": "O último estágio",
+  "Build args": "Argumentos de build",
+  "Build options": "Opções de build",
+  "e.g. --no-cache --platform linux/amd64": "ex.: --no-cache --platform linux/amd64",
+  "Run built image": "Executar imagem compilada",
+  "The image's default": "O padrão da imagem",
+  "Docker Image": "Imagem Docker",
+  "Run a container from an image": "Executar um contêiner a partir de uma imagem",
+  "Image ID or name": "ID ou nome da imagem",
+  "e.g. postgres:16": "ex.: postgres:16",
+  "Pull the image before running": "Fazer pull da imagem antes de executar",
+  "Compose files": "Arquivos Compose",
+  "All services": "Todos os serviços",
+  "The folder name": "O nome da pasta",
+  "Run in the background (-d)": "Executar em segundo plano (-d)",
+  "Build images before starting (--build)": "Criar imagens antes de iniciar (--build)",
+  "Up options": "Opções de up",
+  "e.g. --force-recreate --remove-orphans": "ex.: --force-recreate --remove-orphans",
+  "Compact Mode": "Modo compacto",
+  "Override File Type": "Substituir tipo de arquivo",
+  "Revert File Type Override": "Reverter substituição de tipo de arquivo",
+  "Add Content Root": "Adicionar raiz de conteúdo",
+  "Exclude files:": "Excluir arquivos:",
+  "Filter file types": "Filtrar tipos de arquivo",
+  "Recognized file types": "Tipos de arquivo reconhecidos",
+  "Recognized File Types": "Tipos de arquivo reconhecidos",
+  "File name patterns": "Padrões de nome de arquivo",
+  "* matches any characters, ? one (e.g. *.foo, Jenkinsfile).": "* corresponde a quaisquer caracteres, ? a um (ex.: *.foo, Jenkinsfile).",
+  "Hashbang patterns": "Padrões de hashbang",
+  "Interpreters run by a #! first line, e.g. node for #!/usr/bin/env node.": "Interpretadores executados por uma primeira linha #!, ex.: node para #!/usr/bin/env node.",
+  "Also recognized by its first line:": "Também reconhecido pela primeira linha:",
+  "Default (IDE)": "Padrão (IDE)",
+  "Stored in the project.": "Armazenado no projeto.",
+  "Copy to Project": "Copiar para o projeto",
+  "Copy to IDE": "Copiar para o IDE",
+  "Copy to Project…": "Copiar para o projeto…",
+  "Copy to IDE…": "Copiar para o IDE…",
+  "Do not format": "Não formatar",
+  "File name patterns and folders (glob), e.g. *.min.js, generated/**.": "Padrões de nome de arquivo e pastas (glob), ex.: *.min.js, generated/**.",
+  "Turn formatter on/off with markers in code comments": "Ativar/desativar o formatador com marcadores nos comentários do código",
+  "Off": "Desativado",
+  "On": "Ativado",
+  "Enable regular expressions in formatter markers": "Habilitar expressões regulares nos marcadores do formatador",
+  "Show inline completion for:": "Exibir preenchimento em linha para:",
+  "Automatically insert single suggestions": "Inserir sugestões únicas automaticamente",
+  "When Basic Completion (⌃Space) finds only one suggestion.": "Quando o preenchimento básico (⌃Espaço) encontrar apenas uma sugestão.",
+  "Also toggled by Sort by name in the completion popup.": "Também alternado por Classificar por nome na janela de preenchimento.",
+  "Insert parentheses automatically when applicable": "Inserir parênteses automaticamente quando aplicável",
+  "Left": "Esquerda",
+  "Right": "Direita",
+  "Show tabs in:": "Exibir abas em:",
+  "Show tabs in": "Exibir abas em",
+  "Show pinned tabs in a separate row": "Exibir abas fixadas em uma linha separada",
+  "Show file icon": "Exibir ícone do arquivo",
+  "Show directory for non-unique file names": "Exibir diretório para nomes de arquivo não exclusivos",
+  "Show full path on mouse hover": "Exibir caminho completo ao passar o mouse",
+  "Close button position:": "Posição do botão fechar:",
+  "Close button position": "Posição do botão fechar",
+  "Tab Order": "Ordem das abas",
+  "Sort values alphabetically": "Classificar valores em ordem alfabética",
+  "Sort tabs alphabetically": "Classificar abas em ordem alfabética",
+  "One row, and if tabs don't fit:": "Uma linha e, se as abas não couberem:",
+  "If tabs don't fit": "Se as abas não couberem",
+  "Scroll the tabs panel": "Rolar o painel de abas",
+  "Squeeze tabs": "Comprimir abas",
+  "Multiple rows": "Várias linhas",
+  "Gray suggestions at the caret from language servers that support inline completion. Tab accepts a suggestion, Escape dismisses it.": "Sugestões em cinza no cursor a partir de servidores de linguagem com suporte a preenchimento em linha. Tab aceita uma sugestão, Escape a descarta.",
+  "Enable inline completion": "Habilitar preenchimento em linha",
+  "Show only when typing pauses for": "Exibir apenas quando a digitação pausar por",
+  "Inspections": "Inspeções",
+  "Delete Profile": "Excluir perfil",
+  "Rename Profile": "Renomear perfil",
+  "Copy Profile": "Copiar perfil",
+  "Profile:": "Perfil:",
+  "Profile Actions": "Ações de perfil",
+  "Stored in Project": "Armazenado no projeto",
+  "Stored in IDE": "Armazenado no IDE",
+  "Search inspections": "Pesquisar inspeções",
+  "Reset to Default": "Redefinir para o padrão",
+  "Select an inspection to see its description and change its severity.": "Selecione uma inspeção para ver sua descrição e alterar sua severidade.",
+  "Severity:": "Severidade:",
+  "As reported": "Como relatado",
+  "Error": "Erro",
+  "Weak Warning": "Aviso fraco",
+  "Server Problem": "Problema no servidor",
+  "Typo": "Erro de digitação",
+  "No highlighting": "Sem destaque",
+  "Project Default": "Padrão do projeto",
+  "Profile name cannot be empty": "O nome do perfil não pode ficar vazio",
+  "Unresolved file references": "Referências de arquivo não resolvidas",
+  "Reports paths in HTML attributes, CSS url() and @import that do not name an existing file, resolved relative to the file, the project root and its resource roots.": "Relata caminhos em atributos HTML, CSS url() e @import que não apontam para um arquivo existente, resolvidos em relação ao arquivo, à raiz do projeto e às suas raízes de recursos.",
+  "Build problems": "Problemas de compilação",
+  "Unresolved database references": "Referências de banco de dados não resolvidas",
+  "Reports tables, columns and aliases in query consoles that the data source's schema does not contain.": "Relata tabelas, colunas e aliases em consoles de consulta que não constam no esquema da fonte de dados.",
+  "Proofreading": "Revisão de texto",
+  "Reports misspelt words in comments, string literals and the names declarations introduce (camelCase and snake_case parts checked separately), and in plain text and Markdown. Agent nouns of known words (checkpointer) and, in names, two known words run together (filepath) are accepted. Words can be saved to the project or application dictionary (Editor › Natural Languages › Spelling). Correcting a name renames the symbol and its references.": "Relata palavras com erros de ortografia em comentários, literais de string e nomes introduzidos por declarações (partes em camelCase e snake_case verificadas separadamente), além de texto simples e Markdown. Substantivos de agente de palavras conhecidas (checkpointer) e, em nomes, duas palavras conhecidas juntas (filepath) são aceitos. As palavras podem ser salvas no dicionário do projeto ou do aplicativo (Editor › Idiomas naturais › Ortografia). Corrigir um nome renomeia o símbolo e suas referências.",
+  "English (USA, UK)": "Inglês (EUA, Reino Unido)",
+  "Bundled Hunspell dictionaries (SCOWL en_US and en_GB) and common programming terms.": "Dicionários Hunspell incluídos (SCOWL en_US e en_GB) e termos de programação comuns.",
+  "Used by Proofreading › Typo": "Usado por Revisão de texto › Erro de digitação",
+  "Accepted words": "Palavras aceitas",
+  "Project dictionary": "Dicionário do projeto",
+  "Stored with the project.": "Armazenado com o projeto.",
+  "No words": "Nenhuma palavra",
+  "Word": "Palavra",
+  "Application dictionary": "Dicionário do aplicativo",
+  "Accepted in every project.": "Aceitas em todos os projetos.",
+  "Custom dictionaries": "Dicionários personalizados",
+  "Dictionary files": "Arquivos de dicionário",
+  "Plain-text word lists (one word per line) or Hunspell .dic files. Relative paths resolve against the project root, ~/ against the home folder.": "Listas de palavras em texto simples (uma palavra por linha) ou arquivos .dic do Hunspell. Caminhos relativos são resolvidos em relação à raiz do projeto, ~/ em relação à pasta pessoal.",
+  "No custom dictionaries": "Nenhum dicionário personalizado",
+  "Dictionary path": "Caminho do dicionário",
+  "Natural Languages": "Idiomas naturais",
+  "Java Class › JUnit 5 Test": "Classe Java › Teste JUnit 5",
+  "Kotlin Class/File › JUnit 5 Test": "Classe/Arquivo Kotlin › Teste JUnit 5",
+  "Go File › Test file": "Arquivo Go › Arquivo de teste",
+  "Rust File › Test module": "Arquivo Rust › Módulo de teste",
+  "TypeScript File › Test": "Arquivo TypeScript › Teste",
+  "Python File › Test (pytest)": "Arquivo Python › Teste (pytest)",
+  "CSS File": "Arquivo CSS",
+  "SCSS File": "Arquivo SCSS",
+  "Sass File": "Arquivo Sass",
+  "Less File": "Arquivo Less",
+  "JSON file": "Arquivo JSON",
+  "YAML file": "Arquivo YAML",
+  "TOML file": "Arquivo TOML",
+  "Bash script": "Script Bash",
+  "POSIX sh script": "Script POSIX sh",
+  "Zsh script": "Script Zsh",
+  "Default properties": "Propriedades padrão",
+  "Root only": "Apenas raiz",
+  ".gitignore file": "Arquivo .gitignore",
+  "Includes": "Includes",
+  "Template kinds": "Tipos de modelo",
+  "Reformat according to style": "Reformatar de acordo com o estilo",
+  "New Include": "Novo include",
+  "Add Include": "Adicionar include",
+  "Remove Include": "Remover include",
+  "Include name": "Nome do include",
+  "Include body": "Corpo do include",
+  "Code templates": "Modelos de código",
+  "Used by": "Usado por",
+  "Code template body": "Corpo do modelo de código",
+  "Changelist": "Lista de alterações",
+  "No TODO items found in this scope": "Nenhum item TODO encontrado neste escopo",
+  "No TODO items in changed files": "Nenhum item TODO em arquivos alterados",
+  "Author": "Autor",
+  "Merge options": "Opções de merge",
+  "Pull": "Pull",
+  "No remotes are configured. Add one with Git › Manage Remotes….": "Nenhum repositório remoto configurado. Adicione um em Git › Gerenciar remotos….",
+  "Remote branch": "Branch remota",
+  "Uncommitted changes are stashed before the pull and restored afterwards.": "Alterações não commitadas entram em stash antes do pull e são restauradas depois.",
+  "Branch to merge": "Branch a mesclar",
+  "Select branch": "Selecionar branch",
+  "-m (commit message)": "-m (mensagem de commit)",
+  "Upstream": "Upstream",
+  "New base": "Nova base",
+  "Uncommitted changes are stashed before the rebase and restored afterwards.": "Alterações não commitadas entram em stash antes do rebase e são restauradas depois.",
+  "Enter a remote name": "Insira o nome do repositório remoto",
+  "Invalid remote name": "Nome de repositório remoto inválido",
+  "Remotes": "Repositórios remotos",
+  "Enter the remote URL": "Insira a URL do repositório remoto",
+  "Force Remove": "Forçar remoção",
+  "(bare)": "(bare)",
+  "Choose what to check out": "Escolha o que fazer checkout",
+  "Enter a folder": "Insira uma pasta",
+  "Check out": "Fazer checkout",
+  "New branch name": "Nome da nova branch",
+  "Folder": "Pasta",
+  "VCS Widget": "Widget de VCS",
+  "Recent Changes": "Alterações recentes",
+  "Cannot read Local History": "Não é possível ler o histórico local",
+  "No recent changes": "Nenhuma alteração recente",
+  "Local History has no entries yet": "O histórico local ainda não tem entradas",
+  "Customize Main Toolbar": "Personalizar barra de ferramentas principal",
+  "Customize Main Toolbar…": "Personalizar barra de ferramentas principal…",
+  "Left group": "Grupo da esquerda",
+  "Right group": "Grupo da direita",
+  "Add…": "Adicionar…",
+  "Move to Right": "Mover para a direita",
+  "Move to Left": "Mover para a esquerda",
+  "Widget": "Widget",
+  "Actions and widgets to add": "Ações e widgets a adicionar",
+  "Don't Show Again": "Não mostrar novamente",
+  "Customize Toolbar…": "Personalizar barra de ferramentas…",
+  "Restore Default Toolbar": "Restaurar barra de ferramentas padrão",
+  "View Mode": "Modo de exibição",
+  "Value must not be empty": "O valor não pode ficar vazio",
+  "Nothing to choose from": "Nada para escolher",
+  "Project Widget": "Widget de projeto",
+  "Editor Color Scheme": "Esquema de cores do editor",
+  "Quick Switch Scheme…": "Alternância rápida de esquema…",
+  "No saved layouts. Use Save Current Layout as… first.": "Nenhum layout salvo. Use 'Salvar layout atual como…' primeiro.",
+  "Enter a layout name": "Insira um nome de layout",
+  "A layout with this name exists": "Já existe um layout com este nome",
+  "Save Current Layout as…": "Salvar layout atual como…",
+  "Save Current Layout as": "Salvar layout atual como",
+  "Layout name:": "Nome do layout:",
+  "Restore Tool Window Layout": "Restaurar layout das janelas de ferramentas",
+  "Restores the saved layout named `arg`, or asks which one.": "Restaura o layout salvo chamado `arg` ou pergunta qual deles.",
+  "Restore Layout": "Restaurar layout",
+  "Rename Tool Window Layout…": "Renomear layout das janelas de ferramentas…",
+  "Rename Layout": "Renomear layout",
+  "Delete Tool Window Layout…": "Excluir layout das janelas de ferramentas…",
+  "Delete Layout": "Excluir layout",
+  "Formatted {count} lines": "{count} linhas formatadas",
+  "Formatted {count} line": "{count} linha formatada",
+  " the Reformat dialog": " a caixa de diálogo Reformatar",
+  "The file changed while formatting; try again": "O arquivo foi alterado durante a formatação; tente novamente",
+  "No lines changed: content is already properly formatted": "Nenhuma linha alterada: o conteúdo já está formatado corretamente",
+  "The file is read-only": "O arquivo é somente leitura",
+  "No documentation found": "Nenhuma documentação encontrada",
+  "Cannot read the definition's file": "Não é possível ler o arquivo da definição",
+  "Cannot find declaration to go to": "Não foi possível encontrar a declaração para navegar",
+  "No structure information for this file": "Nenhuma informação de estrutura para este arquivo",
+  "No super method found": "Nenhum método super encontrado",
+  "No super class found": "Nenhuma superclasse encontrada",
+  "No parameters": "Nenhum parâmetro",
+  "No usages found in file": "Nenhum uso encontrado no arquivo",
+  "No type information found": "Nenhuma informação de tipo encontrada",
+  "Nothing to rename": "Nada a renomear",
+  "Rename Anyway": "Renomear mesmo assim",
+  "May be incomplete: the language server is still indexing": "Pode estar incompleto: o servidor de linguagem ainda está indexando",
+  "May be incomplete: too many files mention '{word}' to search them all": "Pode estar incompleto: muitos arquivos mencionam '{word}' para pesquisar todos",
+  "May be incomplete: too many files mention the name to search them all": "Pode estar incompleto: muitos arquivos mencionam o nome para pesquisar todos",
+  "May be incomplete: some files that mention '{word}' are too large or unreadable": "Pode estar incompleto: alguns arquivos que mencionam '{word}' são muito grandes ou ilegíveis",
+  "May be incomplete: some files that mention the name are too large or unreadable": "Pode estar incompleto: alguns arquivos que mencionam o nome são muito grandes ou ilegíveis",
+  "The file changed; rename cancelled": "O arquivo foi alterado; renomeação cancelada",
+  "No suggestions": "Nenhuma sugestão",
+  "No intentions available": "Nenhuma intenção disponível",
+  "No quick fixes available": "Nenhuma correção rápida disponível",
+  "No abstract methods to implement": "Nenhum método abstrato a implementar",
+  "Implement abstract methods": "Implementar métodos abstratos",
+  "Apply Quick Fix": "Aplicar correção rápida",
+  "The document changed; invoke the refactoring again": "O documento foi alterado; invoque a refatoração novamente",
+  "The document changed; the name was not applied": "O documento foi alterado; o nome não foi aplicado",
+  "The file changed; Safe Delete cancelled": "O arquivo foi alterado; Safe Delete cancelado",
+  "No language server is available": "Nenhum servidor de linguagem disponível",
+  "Separate variables with semicolon: VAR=value; VAR1=value1": "Separe as variáveis com ponto e vírgula: VAR=valor; VAR1=valor1",
+  "Relative to the project root; separate with semicolon": "Relativo à raiz do projeto; separe com ponto e vírgula",
+  "Configurations of the compound": "Configurações da composta",
+  "Another configuration has this name": "Outra configuração já tem este nome",
+  "Invalid directory": "Diretório inválido",
+  "Application": "Aplicação",
+  "Java Single File": "Arquivo Java único",
+  "Rust Single File": "Arquivo Rust único",
+  "Kotlin Single File": "Arquivo Kotlin único",
+  "C/C++ Single File": "Arquivo C/C++ único",
+  "Native Executable": "Executável nativo",
+  "Kotlin Script": "Script Kotlin",
+  "{name} is required": "{name} é obrigatório",
+  "{name} project": "Projeto {name}",
+  "{adapter} (no launch template)": "{adapter} (sem modelo de inicialização)",
+  "Before launch command {n}": "Comando antes de iniciar {n}",
+  "Invalid environment variable name: {key}": "Nome de variável de ambiente inválido: {key}",
+  "Run '{name}'": "Executar '{name}'",
+  "'{name}' failed": "'{name}' falhou",
+  "'{name}' was not started": "'{name}' não foi iniciado",
+  "External tool '{name}'": "Ferramenta externa '{name}'",
+  "Activate '{name}' tool window": "Ativar janela de ferramentas '{name}'",
+  "Configuration '{name}' no longer exists": "A configuração '{name}' não existe mais",
+  "External tool '{name}' no longer exists": "A ferramenta externa '{name}' não existe mais",
+  "'{name}' was not run": "'{name}' não foi executado",
+  "Tool window '{name}' is not available": "A janela de ferramentas '{name}' não está disponível",
+  "Unknown before launch task '{name}'": "Tarefa antes de iniciar desconhecida '{name}'",
+  "Variable {n} name": "Nome da variável {n}",
+  "Variable {n} value": "Valor da variável {n}",
+  "Duplicate environment variable: {key}": "Variável de ambiente duplicada: {key}",
+  "Nothing to show in {view}": "Nada a exibir em {view}",
+  "Stopped Containers": "Contêineres parados",
+  "Unused Images": "Imagens não utilizadas",
+  "Unused Volumes": "Volumes não utilizados",
+  "Unused Networks": "Redes não utilizadas",
+  "Everything Unused (System Prune)": "Tudo não utilizado (System Prune)",
+  "Remove all stopped containers?": "Remover todos os contêineres parados?",
+  "Remove all dangling (untagged) images?": "Remover todas as imagens órfãs (sem tag)?",
+  "Remove all images not used by a container?": "Remover todas as imagens não utilizadas por um contêiner?",
+  "Remove all anonymous volumes not used by a container? Their data is lost.": "Remover todos os volumes anônimos não utilizados por um contêiner? Seus dados serão perdidos.",
+  "Remove all networks not used by a container?": "Remover todas as redes não utilizadas por um contêiner?",
+  "Remove stopped containers, unused networks, dangling images and the build cache?": "Remover contêineres parados, redes não utilizadas, imagens órfãs e o cache de compilação?",
+  "Prune {target}": "Limpar {target}",
+  "Pulling {name}…": "Fazendo pull de {name}…",
+  "containers": "contêineres",
+  "images": "imagens",
+  "volumes": "volumes",
+  "networks": "redes",
+  "Compose project '{name}'": "Projeto Compose '{name}'",
+  "Engine {server} · CLI {client}": "Engine {server} · CLI {client}",
+  " · context {name}": " · contexto {name}",
+  "Failed (exit {code})": "Falhou (código de saída {code})",
+  "No configurations of this type": "Nenhuma configuração deste tipo",
+  "system": "sistema",
+  "{name} cancelled": "{name} cancelado",
+  "Image to pull:": "Imagem para fazer pull:",
+  "Pull Image": "Fazer pull da imagem",
+  "Not a {name} URL": "Não é uma URL {name}",
+  "Duplicate scope name '{name}'": "Nome de escopo duplicado '{name}'",
+  "Scope '{name}' has no pattern": "O escopo '{name}' não tem padrão",
+  "Unnamed ({n})": "Sem nome ({n})",
+  "Project will be created in: {path}": "O projeto será criado em: {path}",
+  "(or": "(ou",
+  "inserts a template from the Includes or Code tab.": "insere um modelo da aba Inclusões ou Código.",
+  "File templates insert this with {code}, indented like the directive; a directive line whose include is empty is dropped. The file template variables apply.": "Os modelos de arquivo inserem isso com {code}, indentado como a diretiva; uma linha de diretiva cuja inclusão estiver vazia é descartada. As variáveis de modelo de arquivo se aplicam.",
+  "Inserted where a file template says {code}.": "Inserido onde um modelo de arquivo indicar {code}.",
+  "Agents": "Agentes",
+  "New Agent Task": "Nova tarefa do agente",
+  "No agent tasks yet": "Nenhuma tarefa de agente ainda",
+  "New Task…": "Nova tarefa…",
+  "Needs Input": "Requer entrada",
+  "Ready to Review": "Pronto para revisão",
+  "Archived": "Arquivadas",
+  "Archive": "Arquivar",
+  "Copy Agent Task to a New Task": "Copiar tarefa do agente para uma nova tarefa",
+  "Delete Agent Task": "Excluir tarefa do agente",
+  "Also remove its worktree folder": "Também remover sua pasta de worktree",
+  "needs input": "requer entrada",
+  "running": "em execução",
+  "unread": "não lido",
+  "This agent task no longer exists": "Esta tarefa do agente não existe mais",
+  "Local checkout": "Checkout local",
+  "Needs input": "Requer entrada",
+  "Ready": "Pronto",
+  "Starting the agent…": "Iniciando o agente…",
+  "Working…": "Trabalhando…",
+  "Thinking": "Pensando",
+  "Plan": "Plano",
+  "Message": "Mensagem",
+  "Reply to the agent": "Responder ao agente",
+  "Send": "Enviar",
+  "vs": "vs",
+  "file": "arquivo",
+  "files": "arquivos",
+  "No changes yet": "Nenhuma alteração ainda",
+  "What should the agent do?": "O que o agente deve fazer?",
+  "New worktree": "Novo worktree",
+  "Building and resolving the classpath of {name}…": "Compilando e resolvendo o classpath de {name}…",
+  "Build completed with errors; launching with the last compiled classes.": "Build concluído com erros; iniciando com as últimas classes compiladas.",
+  "Build failed; launching with the last compiled classes.": "Falha no build; iniciando com as últimas classes compiladas.",
+  "The classpath is empty: is the module imported by the Java language server?": "O classpath está vazio: o módulo foi importado pelo servidor de linguagem Java?",
+  "Launch cancelled.": "Inicialização cancelada.",
+  "Starting debugger for {name}…": "Iniciando o depurador para {name}…",
+  "Starting…": "Iniciando…",
+  "Waiting for your answer": "Aguardando sua resposta",
+  "Waiting for your answer…": "Aguardando sua resposta…",
+  "Subagent": "Subagente",
+  "Subagents at work": "Subagentes trabalhando",
+  "Stop Subagent": "Parar subagente",
+  "Open the subagent's conversation": "Abrir conversa do subagente",
+  "Subagents take their instructions from the agent that started them.": "Os subagentes recebem suas instruções do agente que os iniciou.",
+  "Task from the parent agent": "Tarefa do agente pai",
+  "Report to the parent agent": "Relatório para o agente pai",
+  "Task": "Tarefa",
+  "tool call": "chamada de ferramenta",
+  "tool calls": "chamadas de ferramenta",
+  "The agent stopped": "O agente parou",
+  "Not installed": "Não instalado",
+  "{command} was not found on PATH": "{command} não foi encontrado no PATH",
+  "Agent tasks": "Tarefas do agente",
+  "away from your changes": "separado das suas alterações",
+  "edits your files directly": "edita seus arquivos diretamente",
+  "from": "de",
+  "on": "em",
+  "Models and modes appear after this agent's first task.": "Modelos e modos aparecem após a primeira tarefa deste agente.",
+  "Queue a message for when the agent is done (⌘↵ sends it now)": "Coloque uma mensagem na fila para quando o agente terminar (⌘↵ envia agora)",
+  "Couldn't send the message": "Não foi possível enviar a mensagem",
+  "Couldn't change the setting": "Não foi possível alterar a configuração",
+  "Couldn't update the queue": "Não foi possível atualizar a fila",
+  "Queued messages": "Mensagens na fila",
+  "Send now": "Enviar agora",
+  "Queue": "Fila",
+  "Reference a File (@)": "Referenciar um arquivo (@)",
+  "Attach Image…": "Anexar imagem…",
+  "Remove Image": "Remover imagem",
+  "Image too large": "Imagem muito grande",
+  "Send to Agent": "Enviar para o agente",
+  "Enable Vim emulation": "Ativar emulação do Vim",
+  "Configuration file": "Arquivo de configuração",
+  "mappings": "mapeamentos",
+  "No ~/.openideavimrc or ~/.ideavimrc found.": "Nenhum ~/.openideavimrc ou ~/.ideavimrc encontrado.",
+  "Supported: set options, map / nmap / imap / vmap / noremap variants, let mapleader, source, and :action / <Action>() mappings that run IDE actions. :w saves, :q closes the editor tab.": "Suportado: opções set, variantes de map / nmap / imap / vmap / noremap, let mapleader, source e mapeamentos :action / <Action>() que executam ações da IDE. :w salva, :q fecha a aba do editor.",
+  "Shortcut conflicts": "Conflitos de atalhos",
+  "Keys Vim also handles. With Vim as the handler the key goes to the editor while Vim mode is on and an editor has focus; with IDE, an enabled IDE action runs first.": "Teclas que o Vim também manipula. Com o Vim como manipulador, a tecla vai para o editor enquanto o modo Vim estiver ativo e um editor tiver o foco; com a IDE, uma ação ativada da IDE é executada primeiro.",
+  "Shortcut": "Atalho",
+  "IDE action": "Ação da IDE",
+  "Handler": "Manipulador",
+  "Reset to Defaults": "Restaurar padrões",
+  "Exit to Normal mode": "Sair para o modo Normal",
+  "Increment number": "Incrementar número",
+  "Decrement number": "Decrementar número",
+  "Page up": "Page up",
+  "Page down": "Page down",
+  "Scroll half page down / unindent": "Rolar meia página para baixo / diminuir recuo",
+  "Scroll half page up / delete to line start": "Rolar meia página para cima / excluir até o início da linha",
+  "Scroll line down": "Rolar linha para baixo",
+  "Scroll line up": "Rolar linha para cima",
+  "Jump forward": "Avançar salto",
+  "Jump back / one Normal command": "Voltar salto / um comando Normal",
+  "Next line": "Próxima linha",
+  "Previous line": "Linha anterior",
+  "Visual block": "Bloco visual",
+  "Redo / insert register": "Refazer / inserir registrador",
+  "Delete word before caret": "Excluir palavra antes do cursor",
+  "Reload .ideavimrc": "Recarregar .ideavimrc",
+  "Vim Settings…": "Configurações do Vim…",
+  "Vim mode": "Modo Vim",
+  "Vim (disabled)": "Vim (desativado)",
+  "Turn Vim emulation on or off in all editors": "Ativar ou desativar a emulação do Vim em todos os editores",
+  "Remote JVM Debug": "Depuração remota de JVM",
+  "Attach the debugger to a JVM started with a JDWP agent, here or on another machine": "Anexar o depurador a uma JVM iniciada com um agente JDWP, aqui ou em outra máquina",
+  "Debugger mode": "Modo do depurador",
+  "Attach to remote JVM": "Anexar à JVM remota",
+  "Listen to remote JVM": "Escutar JVM remota",
+  "Host": "Host",
+  "Port": "Porta",
+  "Port must be a number from 1 to 65535": "A porta deve ser um número de 1 a 65535",
+  "JDK version of the remote JVM": "Versão do JDK da JVM remota",
+  "JDK 9 or later": "JDK 9 ou posterior",
+  "Command line arguments for remote JVM": "Argumentos de linha de comando para a JVM remota",
+  "Add to the remote JVM's command line (or JAVA_TOOL_OPTIONS)": "Adicionar à linha de comando da JVM remota (ou JAVA_TOOL_OPTIONS)",
+  "Use module classpath": "Usar classpath do módulo",
+  "Module directory whose sources the debugger shows": "Diretório do módulo cujos fontes o depurador exibe",
+  "Go Remote": "Go Remote",
+  "Attach to a Delve server (dlv --headless) here or on another machine": "Anexar a um servidor Delve (dlv --headless) aqui ou em outra máquina",
+  "Start the remote side with": "Inicie o lado remoto com",
+  "Delve 1.7.3 or later; dlv exec ./app or dlv attach <pid> take the same flags": "Delve 1.7.3 ou posterior; dlv exec ./app ou dlv attach <pid> aceitam as mesmas flags",
+  "Local root": "Raiz local",
+  "Remote root": "Raiz remota",
+  "Where the project's sources are on the remote machine, when the paths differ": "Onde os fontes do projeto estão na máquina remota, quando os caminhos diferem",
+  "Python Remote Debug (debugpy)": "Depuração remota do Python (debugpy)",
+  "Attach to a Python process listening with debugpy here or on another machine": "Anexar a um processo Python em escuta com debugpy aqui ou em outra máquina",
+  "pip install debugpy on the remote machine": "pip install debugpy na máquina remota",
+  "Attach to Node.js": "Anexar ao Node.js",
+  "Attach to a Node.js process started with --inspect here or on another machine": "Anexar a um processo Node.js iniciado com --inspect aqui ou em outra máquina",
+  "Copied": "Copiado",
+  "'{name}' can only be debugged": "'{name}' só pode ser depurado",
+  "It attaches the debugger to a process started elsewhere.": "Ele anexa o depurador a um processo iniciado em outro lugar.",
+  "Not found, press again to search from the top": "Não encontrado, pressione novamente para pesquisar do início",
+  "Cannot change the setting": "Não é possível alterar a configuração",
+  "Increase Font Size": "Aumentar tamanho da fonte",
+  "Decrease Font Size": "Diminuir tamanho da fonte",
+  "Cannot make {path} writable": "Não é possível tornar {path} gravável",
+  "Cannot make {path} read-only": "Não é possível tornar {path} somente leitura",
+  "Configure Soft Wraps…": "Configurar quebras de linha suaves…",
+  "Configure Gutter Icons…": "Configurar ícones da margem…",
+  "line[:column]": "linha[:coluna]",
+  "Edit Source": "Editar código-fonte",
+  "Show in Documentation Tool Window": "Exibir na janela de ferramentas de documentação",
+  "No documentation": "Nenhuma documentação",
+  "Whole file": "Arquivo inteiro",
+  "Selected text": "Texto selecionado",
+  "Code Cleanup on `{ path, fixAll?, optimizeImports?, reformat? }` (all steps by default), opened first.": "Limpeza de código em `{ path, fixAll?, optimizeImports?, reformat? }` (todas as etapas por padrão), aberto primeiro.",
+  "Shows `{ text, tone? }` as a transient hint at the caret of the active editor.": "Exibe `{ text, tone? }` como uma dica transitória no cursor do editor ativo.",
+  "Inlay Hints Settings…": "Configurações de dicas inline…",
+  "Preview isn't available for this action": "A pré-visualização não está disponível para esta ação",
+  "No changes in this file": "Nenhuma alteração neste arquivo",
+  "{kind}: no language server is running for this file": "{kind}: nenhum servidor de linguagem está em execução para este arquivo",
+  "Cannot find declaration of '{label}'": "Não é possível encontrar a declaração de '{label}'",
+  "Rename in place: ↵ to finish, Esc to cancel": "Renomear no local: ↵ para concluir, Esc para cancelar",
+  "Cannot rename safely: {why}. '{word}' was left unchanged": "Não é possível renomear com segurança: {why}. '{word}' foi mantido inalterado",
+  "'{newName}' is not a valid identifier": "'{newName}' não é um identificador válido",
+  "{note}: renamed {length} occurrence": "{note}: {length} ocorrência renomeada",
+  "{note}: renamed {length} occurrences": "{note}: {length} ocorrências renomeadas",
+  "No suggestions for '{word}'": "Nenhuma sugestão para '{word}'",
+  "Typo: Rename to…": "Erro de digitação: Renomear para…",
+  "Cannot perform refactoring: {why}": "Não é possível realizar a refatoração: {why}",
+  "'{chosen}' is not a valid name; kept '{current}'": "'{chosen}' não é um nome válido; '{current}' foi mantido",
+  "'{name}' is also used elsewhere in this file": "'{name}' também é usado em outro lugar neste arquivo",
+  "Safe Delete": "Exclusão segura",
+  "Replace all occurrences": "Substituir todas as ocorrências",
+  "↵ to finish, Esc to keep the name": "↵ para concluir, Esc para manter o nome",
+  "Agent": "Agente",
+  "Isolation": "Isolamento",
+  "Opens the New Task page; a string `arg` pre-fills the task description.": "Abre a página Nova tarefa; um `arg` de string preenche previamente a descrição da tarefa.",
+  "Adds the editor selection (or the file) as an @ reference to the agent message typed last; a string[] `arg` sends those paths.": "Adiciona a seleção do editor (ou o arquivo) como referência @ à última mensagem digitada para o agente; um `arg` string[] envia esses caminhos.",
+  "Files are checked by their language servers; files without one are skipped.": "Os arquivos são verificados por seus servidores de linguagem; arquivos sem um são ignorados.",
+  "Files are cleaned up by their language servers and saved; files without one are skipped.": "Os arquivos são limpos por seus servidores de linguagem e salvos; arquivos sem um são ignorados.",
+  "Code Cleanup cancelled after {done} of {length} files": "Limpeza de código cancelada após {done} de {length} arquivos",
+  "Code Cleanup processed {done} files": "A limpeza de código processou {done} arquivos",
+  "Load Maven Changes": "Carregar alterações do Maven",
+  "Load Gradle Changes": "Carregar alterações do Gradle",
+  "recent": "recente",
+  "Shows `{ symbol, locations }` (found elsewhere, e.g. by Safe Delete) in the Find Usages tool window.": "Exibe `{ symbol, locations }` (encontrados em outro lugar, por exemplo, por Exclusão segura) na janela de ferramentas Localizar usos.",
+  "Code insight features are unavailable for these files until it is installed.": "Os recursos de code insight estão indisponíveis para estes arquivos até que ele seja instalado.",
+  "Coverage of '{name}': {totals} lines": "Cobertura de '{name}': {totals} linhas",
+  "Show a report collected elsewhere (CI): lcov, JaCoCo XML or a Go cover profile; argument: the file path": "Exibir um relatório coletado em outro lugar (CI): lcov, JaCoCo XML ou perfil Go cover; argumento: o caminho do arquivo",
+  "Imported coverage '{name}': {total} lines": "Cobertura importada '{name}': {total} linhas",
+  "The report covers no files of this project.": "O relatório não cobre nenhum arquivo deste projeto.",
+  "Cannot import {file}": "Não é possível importar {file}",
+  "shown": "exibido",
+  "No aggregation": "Sem agregação",
+  "Sum": "Soma",
+  "Mean": "Média",
+  "Count": "Contagem",
+  "Min": "Mínimo",
+  "Max": "Máximo",
+  "X axis": "Eixo X",
+  "Y axis": "Eixo Y",
+  "Aggregation": "Agregação",
+  "Chart type": "Tipo de gráfico",
+  "Bar": "Barras",
+  "Line": "Linha",
+  "Chart Settings": "Configurações do gráfico",
+  "No numeric values to plot": "Nenhum valor numérico para plotar",
+  "Search": "Pesquisar",
+  "Search…": "Pesquisar…",
+  "Statements": "Instruções",
+  "No statements": "Nenhuma instrução",
+  "Statement": "Instrução",
+  "Comma": "Vírgula",
+  "Tab": "Tabulação",
+  "Semicolon": "Ponto e vírgula",
+  "Pipe": "Barra vertical",
+  "Import Data from File": "Importar dados do arquivo",
+  "Cannot read the file": "Não é possível ler o arquivo",
+  "{table}: {n} row(s) imported": "{table}: {n} linha(s) importada(s)",
+  "Nothing was imported": "Nada foi importado",
+  "Choose a CSV or TSV file": "Escolha um arquivo CSV ou TSV",
+  "Choose File…": "Escolher arquivo…",
+  "Separator:": "Separador:",
+  "Separator": "Separador",
+  "First row is header (columns matched by name)": "A primeira linha é o cabeçalho (colunas associadas por nome)",
+  "Treat empty values as NULL": "Tratar valores vazios como NULL",
+  "Columns:": "Colunas:",
+  "Export Data…": "Exportar dados…",
+  "Data extractor": "Extrator de dados",
+  "Hide Record / Value / Aggregates": "Ocultar registro / valor / agregados",
+  "Show Record / Value / Aggregates": "Exibir registro / valor / agregados",
+  "Clear local filter": "Limpar filtro local",
+  "Search values": "Pesquisar valores",
+  "No matching values": "Nenhum valor correspondente",
+  "Clear Filter": "Limpar filtro",
+  "Clear Local Filter For All Columns": "Limpar filtro local de todas as colunas",
+  "Value panel": "Painel de valores",
+  "Aggregates": "Agregados",
+  "Select a cell": "Selecione uma célula",
+  "Copy to Clipboard": "Copiar para a área de transferência",
+  "Export to File": "Exportar para arquivo",
+  "Source:": "Origem:",
+  "Extractor:": "Extrator:",
+  "Extractor": "Extrator",
+  "Transpose": "Transpor",
+  "Add column header": "Adicionar cabeçalho de coluna",
+  "Add row header": "Adicionar cabeçalho de linha",
+  "Output file:": "Arquivo de saída:",
+  "Output file": "Arquivo de saída",
+  "Export preview:": "Pré-visualização da exportação:",
+  "Export preview": "Pré-visualização da exportação",
+  "expression": "expressão",
+  "Chart": "Gráfico",
+  "Explain Again": "Explicar novamente",
+  "Operation": "Operação",
+  "Params": "Parâmetros",
+  "Query plan": "Plano de consulta",
+  "Empty plan": "Plano vazio",
+  "Sent as run-time parameters when connecting (any server setting, e.g. statement_timeout). application_name names the session; connect_timeout is in seconds.": "Enviados como parâmetros de tempo de execução ao conectar (qualquer configuração do servidor, por exemplo, statement_timeout). application_name nomeia a sessão; connect_timeout é em segundos.",
+  "Set as session variables after connecting (SET SESSION name = value). charset and collation pick the connection character set; connect_timeout is in seconds.": "Definidos como variáveis de sessão após conectar (SET SESSION name = value). charset e collation escolhem o conjunto de caracteres da conexão; connect_timeout é em segundos.",
+  "Applied as pragmas when opening the file (PRAGMA name = value).": "Aplicados como pragmas ao abrir o arquivo (PRAGMA name = value).",
+  "sec.": "s",
+  "default": "padrão",
+  "<unchanged>": "<inalterado>",
+  "Single database mode (show only the configured database)": "Modo de banco de dados único (exibir apenas o banco de dados configurado)",
+  "schemas": "esquemas",
+  "Object filter:": "Filtro de objetos:",
+  "e.g. order*, customers (tables, views, routines, sequences)": "p. ex. order*, customers (tabelas, visualizações, rotinas, sequências)",
+  "Show internal system schemas": "Exibir esquemas internos do sistema",
+  "Show template databases": "Exibir bancos de dados modelo",
+  "<user defined>": "<definido pelo usuário>",
+  "<value>": "<valor>",
+  "{table}: {n} row(s) changed": "{table}: {n} linha(s) alterada(s)",
+  "Import Data from File…": "Importar dados do arquivo…",
+  "Explain Plan": "Plano de execução",
+  "Browse Query History": "Navegar pelo histórico de consultas",
+  "<data source>": "<fonte de dados>",
+  "Cannot explain the statement": "Não é possível explicar a instrução",
+  "Cannot get the definition of {name}": "Não é possível obter a definição de {name}",
+  "Script finished: {length} statement": "Script concluído: {length} instrução",
+  "Script finished: {length} statements": "Script concluído: {length} instruções",
+  "Import from Clipboard": "Importar da área de transferência",
+  "No data source on the clipboard": "Nenhuma fonte de dados na área de transferência",
+  "Import/Export": "Importar/Exportar",
+  "{what} is not supported by {debugger}": "{what} não é suportado por {debugger}",
+  "'{name}': listening for the remote JVM on port {port}": "'{name}': escutando a JVM remota na porta {port}",
+  "“{name}” can't be debugged": "“{name}” não pode ser depurado",
+  "It has no debug adapter.": "Não possui adaptador de depuração.",
+  "The Java debugger can't start this command itself. Debug an Application, Spring Boot, Maven or Gradle configuration, or start the JVM with a JDWP agent and attach with a Remote JVM Debug configuration.": "O depurador Java não pode iniciar este comando diretamente. Depure uma configuração Application, Spring Boot, Maven ou Gradle, ou inicie a JVM com um agente JDWP e anexe com uma configuração de Depuração remota de JVM.",
+  "Attach the Java debugger to a JVM listening for JDWP (arg: { name, module, hostName, port, process })": "Anexar o depurador Java a uma JVM em escuta para JDWP (arg: { name, module, hostName, port, process })",
+  "'{name}' has compile errors; debugging the last compiled classes": "'{name}' tem erros de compilação; depurando as últimas classes compiladas",
+  "Attach to Godot": "Anexar ao Godot",
+  "Debug the game the Godot editor is running, through the editor's debug adapter": "Depurar o jogo executado pelo editor Godot, por meio do adaptador de depuração do editor",
+  "Before attaching": "Antes de anexar",
+  "Cannot start debugger for {name}": "Não é possível iniciar o depurador para {name}",
+  "suspended": "suspenso",
+  "e.g. order.total > 100": "p. ex. order.total > 100",
+  "e.g. 5 or >= 3": "p. ex. 5 ou >= 3",
+  "Value: {expression}": "Valor: {expression}",
+  "Cannot attach to {name} ({pid})": "Não é possível anexar a {name} ({pid})",
+  "“{name}” can't be watched": "“{name}” não pode ser inspecionado",
+  "(deleted)": "(excluído)",
+  "Macro '{name}' stopped": "Macro '{name}' parada",
+  "Id": "ID",
+  "Enable": "Ativar",
+  "The plugin failed to start.": "O plugin falhou ao iniciar.",
+  "Move Directory…": "Mover diretório…",
+  "Cannot move {name}": "Não é possível mover {name}",
+  "Cannot rename {name}": "Não é possível renomear {name}",
+  "Store as project file (.openidea/run.toml); otherwise in the workspace (.openidea/run.local.toml)": "Armazenar como arquivo de projeto (.openidea/run.toml); caso contrário, no espaço de trabalho (.openidea/run.local.toml)",
+  "This command line doesn't fit the type's form; it is edited as a command.": "Esta linha de comando não se ajusta ao formulário do tipo; ela é editada como um comando.",
+  "Space separated; quote with ' or \"": "Separados por espaços; use aspas com ' ou \"",
+  "New configurations of this type start with these values.": "Novas configurações deste tipo começam com estes valores.",
+  "To run your code, do one of the following:": "Para executar seu código, faça uma das seguintes ações:",
+  "The terminal is not available; turn off \"Emulate terminal in output console\" to see the output.": "O terminal não está disponível; desative \"Emular terminal no console de saída\" para ver a saída.",
+  "Expected": "Esperado",
+  "Actual": "Obtido",
+  "Terminate": "Finalizar",
+  "Cannot run '{name}'": "Não é possível executar '{name}'",
+  "External tool '{name}' has no program": "A ferramenta externa '{name}' não tem programa",
+  "'{name}' needs an open file": "'{name}' precisa de um arquivo aberto",
+  "Run a configuration (hold Shift to debug); the title bar widget passes \"select\" to only select one": "Executar uma configuração (mantenha Shift para depurar); o widget da barra de título passa \"select\" apenas para selecionar uma",
+  "Runs with a contributed executor (`{ executor, config? }` or `{ executor, context }`): the given or selected configuration, or the context.": "Executa com um executor contribuído (`{ executor, config? }` ou `{ executor, context }`): a configuração fornecida ou selecionada, ou o contexto.",
+  "Saves the given `RunConfig` as a user configuration and opens it in Edit Configurations.": "Salva a `RunConfig` fornecida como configuração de usuário e a abre em Editar configurações.",
+  "No sources for this class": "Nenhum código-fonte para esta classe",
+  "Error running '{name}'": "Erro ao executar '{name}'",
+  "No JDK can run '{name}'": "Nenhum JDK pode executar '{name}'",
+  "'{name}' exited with code {code}": "'{name}' saiu com o código {code}",
+  "Run a Godot project's main scene or a chosen scene": "Executar a cena principal de um projeto Godot ou uma cena escolhida",
+  "Project directory": "Diretório do projeto",
+  "Project root (holds project.godot)": "Raiz do projeto (contém project.godot)",
+  "Scene": "Cena",
+  "Main scene": "Cena principal",
+  "Godot command line options, e.g. --debug-collisions": "Opções de linha de comando do Godot, p. ex. --debug-collisions",
+  "Bookmark description": "Descrição do favorito",
+  "Cannot open {path}": "Não é possível abrir {path}",
+  "Search context": "Contexto de pesquisa",
+  "not": "não",
+  "and": "e",
+  "or": "ou",
+  "grouping": "agrupamento",
+  "Cannot log in to {name}": "Não é possível fazer login em {name}",
+  "Argument: `containers`, `images`, `allImages`, `volumes`, `networks` or `system` (default).": "Argumento: `containers`, `images`, `allImages`, `volumes`, `networks` ou `system` (padrão).",
+  "Force (also untag / remove when used by stopped containers)": "Forçar (também remover tag / remover quando usado por contêineres parados)",
+  "Start the services of Compose files": "Iniciar os serviços dos arquivos Compose",
+  "Saved to .openidea/settings.toml in this project; overrides the global value.": "Salvo em .openidea/settings.toml neste projeto; substitui o valor global.",
+  "custom": "personalizado",
+  "Resolving the latest build…": "Resolvendo a versão mais recente…",
+  "Download JDK": "Baixar JDK",
+  "Download": "Baixar",
+  "Vendor:": "Fornecedor:",
+  "Vendor": "Fornecedor",
+  "Version:": "Versão:",
+  "Select a version": "Selecione uma versão",
+  "JDK Location": "Local do JDK",
+  "Downloading JDK": "Baixando JDK",
+  "Use ; to separate name patterns, * for any number of symbols, ? for one.": "Use ; para separar padrões de nomes, * para qualquer quantidade de caracteres, ? para um.",
+  "Folders are detected from build files (pom.xml, build.gradle, Cargo.toml, go.mod, pyproject.toml, package.json); marking or unmarking a folder overrides detection. Excluded folders are skipped by the Project view, Find in Files and the index (reopen the project to re-index).": "As pastas são detectadas a partir de arquivos de build (pom.xml, build.gradle, Cargo.toml, go.mod, pyproject.toml, package.json); marcar ou desmarcar uma pasta substitui a detecção. Pastas excluídas são ignoradas pela visualização do Projeto, Localizar em arquivos e pelo índice (reabra o projeto para reindexar).",
+  "Project virtualenv (auto-detect)": "Virtualenv do projeto (detecção automática)",
+  "<No interpreter>": "<Nenhum interpretador>",
+  "Package name or requirement, e.g. requests or django==5.1": "Nome do pacote ou requisito, p. ex. requests ou django==5.1",
+  "Download JDK…": "Baixar JDK…",
+  "interpreter": "interpretador",
+  "Side tool windows take the full height; the bottom ones fit between them": "As janelas de ferramentas laterais ocupam a altura total; as inferiores se ajustam entre elas",
+  "Days on which files changed; older revisions are removed when a project opens.": "Dias em que os arquivos foram alterados; revisões mais antigas são removidas quando um projeto é aberto.",
+  "Language of menus and dialogs; untranslated text stays in English.": "Idioma dos menus e caixas de diálogo; o texto não traduzido permanece em inglês.",
+  "Unix and macOS (\\n)": "Unix e macOS (\\n)",
+  "Classic Mac OS (\\r)": "Mac OS clássico (\\r)",
+  "Encoding of new files; decodes project files that are not valid UTF-8 and have no BOM.": "Codificação de novos arquivos; decodifica arquivos de projeto que não são UTF-8 válido e não têm BOM.",
+  "Stored in the IDE; used by projects without their own scheme.": "Armazenado na IDE; usado por projetos sem esquema próprio.",
+  "Semantic highlighting": "Coloração semântica",
+  "Local variables and parameters get a colour derived from their name (needs a language server).": "Variáveis locais e parâmetros recebem uma cor derivada de seu nome (necessita de um servidor de linguagem).",
+  "Rainbow brackets": "Parênteses coloridos (Rainbow brackets)",
+  "Color (), [] and {} by nesting depth; unmatched brackets use the error color.": "Colorir (), [] e {} por profundidade de aninhamento; parênteses sem correspondência usam a cor de erro.",
+  "Main font weight": "Espessura da fonte principal",
+  "Bold font weight": "Espessura da fonte em negrito",
+  "Used wherever the color scheme shows text in bold": "Usado onde quer que o esquema de cores exiba texto em negrito",
+  "Use ; to separate patterns. * matches every file.": "Use ; para separar padrões. * corresponde a todos os arquivos.",
+  "Function and method suggestions get (); the caret goes inside unless there are no parameters.": "Sugestões de funções e métodos recebem (); o cursor fica no interior a menos que não haja parâmetros.",
+  "Insert paired brackets (), [], {}": "Inserir parênteses emparelhados (), [], {}",
+  "word": "palavra",
+  "Runs of consecutive matching lines collapse into one expandable “<N internal lines>” row.": "Sequências de linhas correspondentes consecutivas são recolhidas em uma linha expansível “<N linhas internas>”.",
+  "Confirm closing a tab with a running process": "Confirmar o fechamento de uma aba com um processo em execução",
+  "value": "valor",
+  "Login shell": "Shell de login",
+  "Terminal column width": "Largura da coluna do terminal",
+  "e.g. /usr/bin/env": "p. ex. /usr/bin/env",
+  "Force push is not allowed to these branches. Separate patterns with ; (wildcards * and ? are supported).": "O push forçado não é permitido para estas branches. Separe os padrões com ; (caracteres curinga * e ? são suportados).",
+  "Adds a Signed-off-by trailer by default; it can still be switched per commit in Commit Options.": "Adiciona uma linha Signed-off-by por padrão; ainda pode ser alternada por commit em Opções de commit.",
+  "Configure Live Templates…": "Configurar modelos dinâmicos…",
+  "Update Tag with Emmet": "Atualizar tag com Emmet",
+  "Created {fileName}": "{fileName} criado",
+  "No tag at the caret": "Nenhuma tag no cursor",
+  "Cannot update the tag": "Não é possível atualizar a tag",
+  "Templates of this project only": "Modelos apenas deste projeto",
+  "none": "nenhum",
+  "Opens a terminal tab running the shell at `arg` (a path from `termAvailableShells`).": "Abre uma aba do terminal executando o shell em `arg` (um caminho de `termAvailableShells`).",
+  "Opens a terminal tab running `{ program, args, name?, cwd? }` instead of the shell.": "Abre uma aba do terminal executando `{ program, args, name?, cwd? }` em vez do shell.",
+  "TODO items in files of a changelist": "Itens TODO em arquivos de uma lista de alterações",
+  "Too many matches; showing the first 10 000.": "Muitas correspondências; mostrando as primeiras 10.000.",
+  "{name} downloaded": "{name} baixado",
+  "The Java language server restarts on it.": "O servidor de linguagem Java é reiniciado com ele.",
+  "Failed to download JDK {version}": "Falha ao baixar o JDK {version}",
+  "Java Settings…": "Configurações do Java…",
+  "{name} needs JDK {version} to run": "{name} precisa do JDK {version} para ser executado",
+  "Search for branches, actions, repositories": "Pesquisar por branches, ações, repositórios",
+  "Repositories and branches": "Repositórios e branches",
+  "Name <email>; empty uses the configured Git user": "Nome <e-mail>; vazio usa o usuário Git configurado",
+  "Amend and Push…": "Fazer amend e push…",
+  "Select revisions of one file to compare them": "Selecione revisões de um arquivo para compará-las",
+  "local": "local",
+  "remote": "remoto",
+  "tag": "tag",
+  "revision": "revisão",
+  "{success}, with conflicts": "{success}, com conflitos",
+  "As new branch": "Como nova branch",
+  "A rebase is in progress. The commit will become part of the rebased history; usually you continue the rebase instead.": "Um rebase está em andamento. O commit fará parte do histórico rebaseado; geralmente é recomendável continuar o rebase.",
+  "HEAD is detached: the commit won't belong to any branch and may be lost after checking out another branch. Create a branch first to keep it.": "HEAD está desanexada: o commit não pertencerá a nenhuma branch e poderá ser perdido após o checkout de outra branch. Crie uma branch primeiro para mantê-lo.",
+  "Opens the diff viewer for a `DiffData` argument (e.g. a pull request file).": "Abre o visualizador de diff para um argumento `DiffData` (p. ex. um arquivo de pull request).",
+  "From": "De",
+  "To": "Para",
+  "Created worktree at {trim}": "Worktree criado em {trim}",
+  "No web URL for remote '{remote}'": "Nenhuma URL web para o remoto '{remote}'",
+  "'{rev}' was not found in the log": "'{rev}' não foi encontrado no log",
+  "Compare Versions": "Comparar versões",
+  "Select two commits to compare": "Selecione dois commits para comparar",
+  "Label '{value}' added to Local History": "Rótulo '{value}' adicionado ao histórico local",
+  "{doneTitle} successful": "{doneTitle} bem-sucedido",
+  "{file} updated in {commit}": "{file} atualizado em {commit}",
+  "Shelved {length} file": "{length} arquivo guardado no shelf",
+  "Shelved {length} files": "{length} arquivos guardados no shelf",
+  "{what}: {length} file with conflicts": "{what}: {length} arquivo com conflitos",
+  "{what}: {length} files with conflicts": "{what}: {length} arquivos com conflitos",
+  "{what}: {n} file changed": "{what}: {n} arquivo alterado",
+  "{what}: {n} files changed": "{what}: {n} arquivos alterados",
+  "Built-in Preview": "Pré-visualização integrada",
+  "Cannot open the browser": "Não é possível abrir o navegador",
+  "Browser": "Navegador",
+  "Default Browser": "Navegador padrão",
+  "Open the HTML or SVG file in the default browser through the built-in server": "Abrir o arquivo HTML ou SVG no navegador padrão por meio do servidor integrado",
+  "Show the HTML file rendered beside the editor": "Exibir o arquivo HTML renderizado ao lado do editor",
+  "Project folder not found: {name}": "Pasta do projeto não encontrada: {name}",
+  "Cannot reopen {name}": "Não é possível reabrir {name}",
+  "Edit inspection profile setting": "Editar configuração do perfil de inspeção",
+  "Disable inspection": "Desativar inspeção",
+  "Change Severity": "Alterar gravidade",
+  "Edit Inspection Profile Setting…": "Editar configuração do perfil de inspeção…",
+  "Compiler errors and warnings of the last Build Project, shown at their source positions.": "Erros e avisos do compilador do último build do projeto, exibidos em suas posições no código-fonte.",
+  "Process code": "Processar código",
+  "Process literals": "Processar literais",
+  "Process comments": "Processar comentários",
+  "Distraction Free Mode": "Modo sem distrações",
+  "Exit Distraction Free Mode": "Sair do modo sem distrações",
+  "Show Hidden Files": "Exibir arquivos ocultos",
+  "Show Members": "Exibir membros",
+  "Show Excluded Files": "Exibir arquivos excluídos",
+  "Compact Middle Packages": "Compactar pacotes intermediários",
+  "Sort Folders First": "Ordenar pastas primeiro",
+  "Open Files with Single Click": "Abrir arquivos com um único clique",
+  "Expand Directories with Single Click": "Expandir diretórios com um único clique",
+  "Enable Preview Tab": "Ativar aba de pré-visualização",
+  "Analyze Dependencies…": "Analisar dependências…",
+  "Shows a Maven module's dependency tree, version conflicts and where each library comes from": "Exibe a árvore de dependências de um módulo Maven, conflitos de versão e a procedência de cada biblioteca",
+  "Dependency Analyzer": "Analisador de dependências",
+  "Search dependencies": "Pesquisar dependências",
+  "Show conflicts only": "Exibir apenas conflitos",
+  "All scopes": "Todos os escopos",
+  "Show as List": "Exibir como lista",
+  "Show as Tree": "Exibir como árvore",
+  "Dependency trees may be out of date": "As árvores de dependência podem estar desatualizadas",
+  "Dependency trees are read when Maven projects are reloaded": "As árvores de dependência são lidas quando os projetos Maven são recarregados",
+  "No Maven modules": "Nenhum módulo Maven",
+  "Dependencies": "Dependências",
+  "No dependencies match the filter": "Nenhuma dependência corresponde ao filtro",
+  "No dependencies": "Nenhuma dependência",
+  "Select a dependency to see its usages": "Selecione uma dependência para ver seus usos",
+  "Versions requested": "Versões solicitadas",
+  "omitted": "omitida",
+  "resolved": "resolvida",
+  "omitted for conflict with {version}": "omitida por conflito com {version}",
+  "omitted for conflict": "omitida por conflito",
+  "omitted for duplicate": "omitida por duplicata",
+  "omitted for cycle": "omitida por ciclo",
+  "version managed from {version}": "versão gerenciada a partir de {version}",
+  "Cannot find the declaration": "Não é possível encontrar a declaração",
+  "Cannot exclude {name}": "Não é possível excluir {name}",
+  "Solarized Light": "Solarized Claro",
+  "Solarized Dark": "Solarized Escuro",
+  "One Light": "One Light",
+  "One Dark": "One Dark",
+  "Copied reference: {reference}": "Referência copiada: {reference}",
+  "{count} lines": "{count} linhas",
+  "Preview of {path}": "Pré-visualização de {path}",
+  "Editor for {path}": "Editor de {path}",
+  "Unwrap '{label}'": "Desempacotar '{label}'",
+  "'{name}' is read-only. Make it writable?": "'{name}' é somente leitura. Torná-lo gravável?",
+  "Make '{name}' read-only?": "Tornar '{name}' somente leitura?",
+  "Some unsaved edits to {path} could not be applied and were replaced by the file's current content.": "Algumas alterações não salvas em {path} não puderam ser aplicadas e foram substituídas pelo conteúdo atual do arquivo.",
+  "No editor for “{kind}”": "Nenhum editor para “{kind}”",
+  "Show usages of {name}": "Mostrar usos de {name}",
+  "Cannot resolve file '{value}'": "Não é possível resolver o arquivo '{value}'",
+  "Reformat File: {name}": "Reformatar arquivo: {name}",
+  "Inspection '{name}' options": "Opções da inspeção '{name}'",
+  "Choose Declaration of '{label}' ({count} found)": "Escolher declaração de '{label}' ({count} encontradas)",
+  "Press {keys} to show dialog with more options": "Pressione {keys} para exibir a caixa de diálogo com mais opções",
+  "Rename '{oldName}' to '{newName}'": "Renomear '{oldName}' para '{newName}'",
+  "Rename '{name}'": "Renomear '{name}'",
+  "Change '{word}' to": "Alterar '{word}' para",
+  "Rename '{word}' to": "Renomear '{word}' para",
+  "Save '{word}' to project-level dictionary": "Salvar '{word}' no dicionário do projeto",
+  "Save '{word}' to application-level dictionary": "Salvar '{word}' no dicionário do aplicativo",
+  "Typo: In word '{word}'": "Erro de digitação: na palavra '{word}'",
+  "Choose Super Class or Interface ({count} found)": "Escolher superclasse ou interface ({count} encontradas)",
+  "Choose Super Method of {name} ({count} found)": "Escolher supermétodo de {name} ({count} encontrados)",
+  "Choose Implementation of {name} ({count} found)": "Escolher implementação de {name} ({count} encontradas)",
+  "Choose Subclass of {name} ({count} found)": "Escolher subclasse de {name} ({count} encontradas)",
+  "Choose Overriding Method of {name} ({count} found)": "Escolher método sobrescrito de {name} ({count} encontrados)",
+  "Is implemented by {names}": "É implementado por {names}",
+  "Is subclassed by {names}": "É estendido por {names}",
+  "Is implemented in {names}": "É implementado em {names}",
+  "Is overridden in {names}": "É sobrescrito em {names}",
+  "Implements method in {names}": "Implementa o método em {names}",
+  "Overrides method in {names}": "Sobrescreve o método em {names}",
+  "{names} and {count} more": "{names} e mais {count}",
+  "Implemented and overridden": "Implementado e sobrescrito",
+  "Implementing and overriding": "Implementando e sobrescrevendo",
+  "Implemented and overridden declarations": "Declarações implementadas e sobrescritas",
+  "Implementing and overriding methods": "Métodos que implementam e sobrescrevem",
+  "Replace all {count} occurrences": "Substituir todas as {count} ocorrências",
+  "↵ Apply · Esc Keep '{name}'": "↵ Aplicar · Esc Manter '{name}'",
+  " (in {files} files)": " (em {files} arquivos)",
+  "{subject} have {n} usage that is not safe to delete{where}.": "{subject} têm {n} uso que não é seguro excluir{where}.",
+  "{subject} have {n} usages that are not safe to delete{where}.": "{subject} têm {n} usos que não são seguros excluir{where}.",
+  "{subject} has {n} usage that is not safe to delete{where}.": "{subject} tem {n} uso que não é seguro excluir{where}.",
+  "{subject} has {n} usages that are not safe to delete{where}.": "{subject} tem {n} usos que não são seguros excluir{where}.",
+  "{n} usage found": "{n} uso encontrado",
+  "{n} usages found": "{n} usos encontrados",
+  "Safe Delete {kind} '{name}'": "Exclusão segura de {kind} '{name}'",
+  "Delete {kind} '{name}'?": "Excluir {kind} '{name}'?",
+  "File '{name}'": "Arquivo '{name}'",
+  "The {count} files": "Os {count} arquivos",
+  "Delete “{title}”? Its branch {branch} is kept.": "Excluir “{title}”? Seu branch {branch} será mantido.",
+  "Delete “{title}”? Files it changed are kept.": "Excluir “{title}”? Os arquivos alterados serão mantidos.",
+  "{name} is over 5 MB.": "{name} tem mais de 5 MB.",
+  "{used} / {size} tokens": "{used} / {size} tokens",
+  "Replace in {path}:{line}": "Substituir em {path}:{line}",
+  "Clean up {count} files?": "Limpar {count} arquivos?",
+  "Leave empty to use the folder name ({folder}).": "Deixe em branco para usar o nome da pasta ({folder}).",
+  "Debug '{name}'": "Depurar '{name}'",
+  "Open {file}": "Abrir {file}",
+  "{direction} Hierarchy": "Hierarquia {direction}",
+  "Language servers: {text}": "Servidores de linguagem: {text}",
+  "Install {name}": "Instalar {name}",
+  "Restart {name}": "Reiniciar {name}",
+  "{count} error": "{count} erro",
+  "{count} errors": "{count} erros",
+  "{count} warning": "{count} aviso",
+  "{count} warnings": "{count} avisos",
+  "{errors} and {warnings}": "{errors} e {warnings}",
+  "{found} found in {n} file": "{found} encontrado em {n} arquivo",
+  "{found} found in {n} files": "{found} encontrados em {n} arquivos",
+  "{message} Install it with: {command}": "{message} Instale com: {command}",
+  "Import Data into {schema}.{table}": "Importar dados para {schema}.{table}",
+  "Import {count} Rows": "Importar {count} linhas",
+  "{source} Query History": "Histórico de consultas de {source}",
+  "Local filter of {column}": "Filtro local de {column}",
+  "Values of {column}": "Valores de {column}",
+  "Copy as {format}": "Copiar como {format}",
+  "Connect to {name}": "Conectar a {name}",
+  "SSH: {name}": "SSH: {name}",
+  "Modify Table {table}": "Modificar tabela {table}",
+  "{label} (seconds)": "{label} (segundos)",
+  "Succeeded: {version}": "Sucesso: {version}",
+  "All databases": "Todos os bancos de dados",
+  "Add databases pattern": "Adicionar padrão de bancos de dados",
+  "All schemas (databases)": "Todos os esquemas (bancos de dados)",
+  "All schemas": "Todos os esquemas",
+  "Add schemas (databases) pattern": "Adicionar padrão de esquemas (bancos de dados)",
+  "Add schemas pattern": "Adicionar padrão de esquemas",
+  "Data Source: {name}": "Fonte de dados: {name}",
+  "{table} data": "Dados de {table}",
+  "{count} rows": "{count} linhas",
+  "Remove data source '{name}'? Its query console file stays on disk.": "Remover a fonte de dados '{name}'? O arquivo do console de consultas permanecerá no disco.",
+  "Result {n}": "Resultado {n}",
+  "{name} has uncommitted changes. Commit or roll them back before switching to auto-commit?": "{name} tem alterações não commitadas. Deseja fazer commit ou revertê-las antes de alternar para commit automático?",
+  "Cannot copy the name": "Não é possível copiar o nome",
+  "Cannot copy the reference": "Não é possível copiar a referência",
+  "Cannot copy the DDL": "Não é possível copiar o DDL",
+  "Start the remote JVM with -agentlib:jdwp=transport=dt_socket,server=n,address={host}:{port},suspend=y": "Inicie a JVM remota com -agentlib:jdwp=transport=dt_socket,server=n,address={host}:{port},suspend=y",
+  "{class} reloaded": "{class} recarregada",
+  "{count} class": "{count} classe",
+  "{count} classes": "{count} classes",
+  "The JavaScript debugger (vscode-js-debug) is not installed": "O depurador JavaScript (vscode-js-debug) não está instalado",
+  "Delve is not installed": "O Delve não está instalado",
+  "CodeLLDB is not installed": "O CodeLLDB não está instalado",
+  "{name} (child)": "{name} (filho)",
+  "Enable breakpoint at {path}:{line}": "Ativar ponto de interrupção em {path}:{line}",
+  "Headers ({count})": "Cabeçalhos ({count})",
+  "Headers": "Cabeçalhos",
+  "Delete the macro '{name}'?": "Excluir a macro '{name}'?",
+  "{count} processes": "{count} processos",
+  "Memory: {usage}": "Memória: {usage}",
+  " Memory {before} → {after}.": " Memória {before} → {after}.",
+  "{count} syntax tree dropped, index compacted.{memory}": "{count} árvore sintática descartada, índice compactado.{memory}",
+  "{count} syntax trees dropped, index compacted.{memory}": "{count} árvores sintáticas descartadas, índice compactado.{memory}",
+  "Disable {name}": "Desativar {name}",
+  "Enable {name}": "Ativar {name}",
+  "Run {name}": "Executar {name}",
+  "Apply theme {name}": "Aplicar tema {name}",
+  "Confirm uninstall {name}": "Confirmar desinstalação de {name}",
+  "From plugin {name}": "Do plugin {name}",
+  "{count} items": "{count} itens",
+  "Refactoring Preview: {title}": "Pré-visualização da refatoração: {title}",
+  "Include {path}": "Incluir {path}",
+  "Project View: {option}": "Visualização do projeto: {option}",
+  "Project View: Show {view}": "Visualização do projeto: mostrar {view}",
+  "Reveal in {fileManager}": "Revelar no {fileManager}",
+  "Unmark as {role}": "Desmarcar como {role}",
+  "Updated references in {count} file": "Referências atualizadas em {count} arquivo",
+  "Updated references in {count} files": "Referências atualizadas em {count} arquivos",
+  "Changed since the refactoring, not reverted: {files}": "Alterado desde a refatoração, não revertido: {files}",
+  "Remove '{name}'": "Remover '{name}'",
+  "{name} output": "Saída de {name}",
+  "Finished in {duration}, exit code {code}": "Concluído em {duration}, código de saída {code}",
+  "{name} terminal": "Terminal de {name}",
+  "Stop ({count} running)": "Parar ({count} em execução)",
+  "Rerun '{name}'": "Executar '{name}' novamente",
+  "Stop '{name}'": "Parar '{name}'",
+  "Comparison Failure: {name}": "Falha na comparação: {name}",
+  "Process '{name}' Is Running": "O processo '{name}' está em execução",
+  "'{name}' is not allowed to run in parallel.\nWould you like to stop {count} running instances?": "'{name}' não tem permissão para ser executado em paralelo.\nDeseja parar as {count} instâncias em execução?",
+  "'{name}' is not allowed to run in parallel.\nWould you like to stop the running one?": "'{name}' não tem permissão para ser executado em paralelo.\nDeseja parar a instância em execução?",
+  "Do you want to terminate the process '{name}'?": "Deseja encerrar o processo '{name}'?",
+  "Running '{name}' without the debugger.": "Executando '{name}' sem o depurador.",
+  "{className} is not part of the project, and no library sources are available for it.": "{className} não faz parte do projeto e não há fontes de biblioteca disponíveis para ela.",
+  "{count} running": "{count} em execução",
+  "Stack trace {title}": "Stack trace {title}",
+  "Error running '{name}': {message}\n": "Erro ao executar '{name}': {message}\n",
+  "Cannot write to stdin: {message}\n": "Não é possível gravar no stdin: {message}\n",
+  "Run Gradle tasks": "Executar tarefas do Gradle",
+  "Run Maven goals": "Executar goals do Maven",
+  "Delete the list '{name}' with its {count} bookmark?": "Excluir a lista '{name}' com seu {count} marcador?",
+  "Delete the list '{name}' with its {count} bookmarks?": "Excluir a lista '{name}' com seus {count} marcadores?",
+  "Delete {count} Bookmarks": "Excluir {count} marcadores",
+  "Remove the connection '{name}' from Services?": "Remover a conexão '{name}' de Serviços?",
+  "Remove the registry '{name}' and its saved password?": "Remover o registro '{name}' e sua senha salva?",
+  "Prune Unused Containers…": "Limpar contêineres não utilizados…",
+  "Prune Dangling Images…": "Limpar imagens órfãs…",
+  "Prune Unused Images…": "Limpar imagens não utilizadas…",
+  "Prune Unused Volumes…": "Limpar volumes não utilizados…",
+  "Prune Unused Networks…": "Limpar redes não utilizadas…",
+  "Prune Everything Unused…": "Limpar tudo não utilizado…",
+  "Delete Container": "Excluir contêiner",
+  "Delete container '{name}'? It is running and will be stopped.": "Excluir o contêiner '{name}'? Ele está em execução e será parado.",
+  "Delete container '{name}'?": "Excluir o contêiner '{name}'?",
+  "Delete Image": "Excluir imagem",
+  "Delete image '{name}'?": "Excluir a imagem '{name}'?",
+  "Delete Volume": "Excluir volume",
+  "Delete volume '{name}'?": "Excluir o volume '{name}'?",
+  "Delete Network": "Excluir rede",
+  "Delete network '{name}'?": "Excluir a rede '{name}'?",
+  "Stop and remove the containers and networks of '{name}'?": "Parar e remover os contêineres e redes de '{name}'?",
+  "Build Image '{tag}'": "Compilar imagem '{tag}'",
+  "Enter a value between {min} and {max}": "Insira um valor entre {min} e {max}",
+  "based on {parent}": "com base em {parent}",
+  "Delete keymap '{name}'?": "Excluir o mapa de teclas '{name}'?",
+  "Remove {shortcut}": "Remover {shortcut}",
+  "Keyboard Shortcut: {action}": "Atalho do teclado: {action}",
+  "Remove content root {path}": "Remover raiz de conteúdo {path}",
+  "Unmark {folder}": "Desmarcar {folder}",
+  "File name patterns of {name}": "Padrões de nome de arquivo de {name}",
+  "Hashbang patterns of {name}": "Padrões de hashbang de {name}",
+  "{group} popup type": "Tipo de pop-up de {group}",
+  "Show {group} in tool window": "Mostrar {group} na janela de ferramentas",
+  "{label} hex": "{label} hexadecimal",
+  "{label} custom value": "Valor personalizado de {label}",
+  "Delete inspection profile '{name}'?": "Excluir o perfil de inspeção '{name}'?",
+  "{server} problems with code {code} ({source}).": "Problemas de {server} com código {code} ({source}).",
+  "{server} problems with code {code}.": "Problemas de {server} com código {code}.",
+  "{description}\n\nExample: {sample}": "{description}\n\nExemplo: {sample}",
+  "Problems the {server} language server reports in {languages} files. Severity \"As reported\" keeps the level the server assigns; a code below can override it.": "Problemas relatados pelo servidor de linguagem {server} em arquivos {languages}. A gravidade \"Conforme relatado\" mantém o nível atribuído pelo servidor; um código abaixo pode substituí-lo.",
+  "Problems the {server} language server reports. Severity \"As reported\" keeps the level the server assigns; a code below can override it.": "Problemas relatados pelo servidor de linguagem {server}. A gravidade \"Conforme relatado\" mantém o nível atribuído pelo servidor; um código abaixo pode substituí-lo.",
+  "Auto-detected: {path}": "Detectado automaticamente: {path}",
+  "New {name}": "Novo {name}",
+  "Name (.{extension})": "Nome (.{extension})",
+  "'{abbreviation}' does not describe a single element.": "'{abbreviation}' não descreve um elemento único.",
+  "New {name}…": "Novo {name}…",
+  "{name} expression": "Expressão de {name}",
+  "{name} default value": "Valor padrão de {name}",
+  "Skip {name} if defined": "Ignorar {name} se definido",
+  "Enable .{key}": "Ativar .{key}",
+  "{keyword} colour": "Cor de {keyword}",
+  "{count} file": "{count} arquivo",
+  "{count} files": "{count} arquivos",
+  "Reinstall {name}": "Reinstalar {name}",
+  "Installed in {path}; it is used for projects targeting Java {version}.": "Instalado em {path}; é usado para projetos direcionados ao Java {version}.",
+  "Code insight for {languages} needs {command}. Install it via {method}?": "O code insight para {languages} necessita de {command}. Deseja instalá-lo via {method}?",
+  "Version {version}": "Versão {version}",
+  "Branch {name}": "Branch {name}",
+  "Tag {name}": "Tag {name}",
+  "Branch {branch} of {repository}": "Branch {branch} de {repository}",
+  "Branches of {root}": "Branches de {root}",
+  "Include {name} in commit": "Incluir {name} no commit",
+  "Compare {current} with {branch}": "Comparar {current} com {branch}",
+  "Rebase '{head}' onto Selected Commit": "Fazer rebase de '{head}' no commit selecionado",
+  "Revert {file} to the revision from {time} ({label})?": "Reverter {file} para a revisão de {time} ({label})?",
+  "Revert {count} files under {folder} to label '{label}'?": "Reverter {count} arquivos em {folder} para o rótulo '{label}'?",
+  "Revert {file} to label '{label}'?": "Reverter {file} para o rótulo '{label}'?",
+  "Revert from Local History": "Reverter do histórico local",
+  "{submodule} points to another commit. Check out the recorded commit in the submodule (git submodule update) to revert it.": "{submodule} aponta para outro commit. Faça checkout do commit registrado no submódulo (git submodule update) para revertê-lo.",
+  "New Branch from '{name}'…": "Novo branch a partir de '{name}'…",
+  "Rebase Current onto '{name}'": "Fazer rebase do atual em '{name}'",
+  "Merge '{name}' into Current": "Mesclar '{name}' no atual",
+  "Checkout and Rebase onto '{current}'": "Fazer checkout e rebase em '{current}'",
+  "Compare with '{current}'": "Comparar com '{current}'",
+  "Rebase '{current}' onto '{name}'": "Fazer rebase de '{current}' em '{name}'",
+  "Merge '{name}' into '{current}'": "Mesclar '{name}' em '{current}'",
+  "Create New Branch from {from}": "Criar novo branch a partir de {from}",
+  "Rename Branch {name}": "Renomear branch {name}",
+  "Delete branch '{name}' on the remote? The remote-tracking branch '{tracking}' is removed as well.": "Excluir o branch '{name}' no remoto? O branch de rastreamento remoto '{tracking}' também será removido.",
+  "New branch name (in {count} repositories):": "Novo nome de branch (em {count} repositórios):",
+  "Delete branch '{name}' in {count} repositories? Unmerged commits are discarded.": "Excluir o branch '{name}' em {count} repositórios? Commits não mesclados serão descartados.",
+  "Your local changes to the following files would be overwritten by checkout:\n{files}\n\nSmart Checkout can stash the changes, checkout and unstash them after that.": "Suas alterações locais nos seguintes arquivos seriam sobrescritas pelo checkout:\n{files}\n\nO Smart Checkout pode fazer stash das alterações, fazer checkout e restaurá-las do stash depois disso.",
+  "Unstash {ref} as branch {branch}": "Restaurar {ref} do stash como branch {branch}",
+  "Pop {ref}": "Fazer pop de {ref}",
+  "Apply {ref}": "Aplicar {ref}",
+  "Drop {ref} “{message}”? This cannot be undone.": "Descartar {ref} “{message}”? Esta ação não pode ser desfeita.",
+  "Drop {ref}? This cannot be undone.": "Descartar {ref}? Esta ação não pode ser desfeita.",
+  "Changelist '{name}' contains {count} change. It will be moved to '{target}'. Delete the changelist?": "A lista de alterações '{name}' contém {count} alteração. Ela será movida para '{target}'. Excluir a lista de alterações?",
+  "Changelist '{name}' contains {count} changes. They will be moved to '{target}'. Delete the changelist?": "A lista de alterações '{name}' contém {count} alterações. Elas serão movidas para '{target}'. Excluir a lista de alterações?",
+  "{name} (active)": "{name} (ativo)",
+  "from {path}": "de {path}",
+  "{dir} · from {path}": "{dir} · de {path}",
+  "Clipboard ↔ {file} (selection)": "Área de transferência ↔ {file} (seleção)",
+  "Clipboard ↔ {file}": "Área de transferência ↔ {file}",
+  "Pull to {head}": "Fazer pull para {head}",
+  "Merge into {head}": "Mesclar em {head}",
+  "Merge branch '{branch}' into {head}": "Mesclar o branch '{branch}' em {head}",
+  "Remove remote '{name}'? Its remote-tracking branches are deleted.": "Remover o remoto '{name}'? Seus branches de rastreamento remoto serão excluídos.",
+  "Remove the worktree at {path}? Its folder is deleted.": "Remover o worktree em {path}? Sua pasta será excluída.",
+  "{error}\n\nRemove it anyway, discarding its changes?": "{error}\n\nRemover mesmo assim, descartando suas alterações?",
+  "{count} file has conflicts: {files}": "{count} arquivo tem conflitos: {files}",
+  "{count} files have conflicts: {files}": "{count} arquivos têm conflitos: {files}",
+  "{status} (from {path})": "{status} (de {path})",
+  "Create New Tag On {commit}": "Criar nova tag em {commit}",
+  "Changes between {from} and Local Working Tree": "Alterações entre {from} e a árvore de trabalho local",
+  "Changes between {from} and {to}": "Alterações entre {from} e {to}",
+  "No rebase in progress": "Nenhum rebase em andamento",
+  "No merge in progress": "Nenhuma mesclagem em andamento",
+  "No cherry-pick in progress": "Nenhum cherry-pick em andamento",
+  "No revert in progress": "Nenhuma reversão em andamento",
+  "No patch application in progress": "Nenhuma aplicação de patch em andamento",
+  "Apply Patch: {source}": "Aplicar patch: {source}",
+  "Drop {count} commits from the current branch? Their changes are removed.": "Descartar {count} commits do branch atual? Suas alterações serão removidas.",
+  "Drop commit {id} “{summary}” from the current branch? Its changes are removed.": "Descartar o commit {id} “{summary}” do branch atual? Suas alterações serão removidas.",
+  "Action for {id}": "Ação para {id}",
+  "Rebasing {n} commit onto {onto}": "Fazendo rebase de {n} commit em {onto}",
+  "Rebasing {n} commits onto {onto}": "Fazendo rebase de {n} commits em {onto}",
+  "Rebasing {n} commit from the root": "Fazendo rebase de {n} commit a partir da raiz",
+  "Rebasing {n} commits from the root": "Fazendo rebase de {n} commits a partir da raiz",
+  "Push Commits to {remote}": "Fazer push dos commits para {remote}",
+  "Pushed {n} commit to {remote}": "{n} commit enviado para {remote}",
+  "Pushed {n} commits to {remote}": "{n} commits enviados para {remote}",
+  "You're going to force push to '{target}'. It may overwrite commits at the remote. Are you sure you want to proceed?": "Você está prestes a fazer push forçado para '{target}'. Isso pode sobrescrever commits no remoto. Tem certeza de que deseja continuar?",
+  "Delete “{name}” from the shelf? This cannot be undone.": "Excluir “{name}” do shelf? Esta ação não pode ser desfeita.",
+  "Handler for {keystroke}": "Manipulador para {keystroke}",
+  "Open '{path}' in Browser": "Abrir '{path}' no navegador",
+  "Open ({shortcut})": "Abrir ({shortcut})",
+  "Remove '{name}' from the list of recent projects?": "Remover '{name}' da lista de projetos recentes?",
+  "Disable Inspection '{name}'": "Desativar inspeção '{name}'",
+  "Download JDK {version}": "Baixar JDK {version}",
+  "Cancel {title}": "Cancelar {title}",
+  "Background tasks: {title}": "Tarefas em segundo plano: {title}",
+  "{files} files · {symbols} symbols": "{files} arquivos · {symbols} símbolos",
+  "{title} view options": "Opções de visualização de {title}",
+  "{title} views": "Visualizações de {title}",
+  "{title} options": "Opções de {title}",
+  "Delete the layout '{name}'?": "Excluir o layout '{name}'?",
+  "In {left}, not in {right}": "Em {left}, não em {right}",
+  "Local branch '{local}' has commits that do not exist in '{remote}'. Rebase '{local}' onto '{remote}', or drop local commits?": "O branch local '{local}' tem commits que não existem em '{remote}'. Fazer rebase de '{local}' em '{remote}' ou descartar os commits locais?",
+  "Add Language Server…": "Adicionar servidor de linguagem…",
+  "Use {displayName}": "Usar {displayName}",
+  "Select {name}": "Selecionar {name}",
+  "Root markers": "Marcadores de raiz",
+  "Initialization options": "Opções de inicialização",
+  "Global": "Global",
+  "This project": "Este projeto",
+  "Executable name or path": "Nome ou caminho do executável",
+  "Select the server executable": "Selecione o executável do servidor",
+  "Remove Language Server": "Remover servidor de linguagem",
+  "Missing ({missingCount})": "Ausentes ({missingCount})",
+  "Choose languages…": "Escolher linguagens…",
+  "Filter languages": "Filtrar linguagens",
+  "No languages match.": "Nenhuma linguagem correspondente.",
+  "Checked when the settings are applied.": "Verificado quando as configurações são aplicadas.",
+  "Using": "Usando",
+  "Not found on PATH.": "Não encontrado no PATH.",
+  "Use {displayName} for {join} files": "Usar {displayName} para arquivos {join}",
+  "Files marking the workspace root.": "Arquivos que marcam a raiz do espaço de trabalho.",
+  "Merged over the defaults shown when empty.": "Mesclado sobre os padrões mostrados quando vazio.",
+  "Workspace Configuration": "Configuração do espaço de trabalho",
+  "Enter the command that starts the server.": "Insira o comando que inicia o servidor.",
+  "Name: letters, digits, - _ + only.": "Nome: apenas letras, dígitos, - _ +.",
+  "{effectiveName} already exists.": "{effectiveName} já existe.",
+  "Choose the languages it serves.": "Escolha as linguagens atendidas.",
+  "New Language Server": "Novo servidor de linguagem",
+  "Any language server that talks LSP over stdio, with its arguments.": "Qualquer servidor de linguagem que se comunique via LSP por stdio, com seus argumentos.",
+  "Changing these restarts the server.": "Alterar estas configurações reinicia o servidor.",
+  "Sent to the running server; no restart needed.": "Enviado ao servidor em execução; nenhum reinício necessário.",
+  "SSH Configurations": "Configurações SSH",
+  "User name": "Nome de usuário",
+  "Authentication type": "Tipo de autenticação",
+  "Key pair (OpenSSH or PuTTY)": "Par de chaves (OpenSSH ou PuTTY)",
+  "Private key file": "Arquivo de chave privada",
+  "Save passphrase": "Salvar frase secreta",
+  "SSH Password": "Senha SSH",
+  "Yes": "Sim",
+  "No": "Não",
+  "Configuration:": "Configuração:",
+  "SSH configuration": "Configuração SSH",
+  "The authenticity of the host cannot be established. Trust it and add the key to ~/.ssh/known_hosts?": "A autenticidade do host não pode ser estabelecida. Confiar nele e adicionar a chave a ~/.ssh/known_hosts?",
+  "No SSH configurations. Click + to add one.": "Nenhuma configuração SSH. Clique em + para adicionar uma.",
+  "SSH configurations are shared by all projects: data source tunnels, deployment servers, run targets and Tools › Start SSH Session connect with them.": "As configurações SSH são compartilhadas por todos os projetos: túneis de fontes de dados, servidores de implantação, destinos de execução e Ferramentas › Iniciar sessão SSH conectam-se usando-as.",
+  "SSH configurations actions": "Ações de configurações SSH",
+  "SSH configurations": "Configurações SSH",
+  "No host": "Nenhum host",
+  "Edit SSH Configurations…": "Editar configurações SSH…",
+  "No SSH configurations. Add one…": "Nenhuma configuração SSH. Adicionar uma…",
+  "Cannot start SSH session": "Não é possível iniciar a sessão SSH",
+  "Start SSH Session": "Iniciar sessão SSH",
+  "Start SSH Session…": "Iniciar sessão SSH…",
+  "SSH Configurations…": "Configurações SSH…",
+  "SSH Session…": "Sessão SSH…",
+  "Custom (fields below)": "Personalizado (campos abaixo)",
+  "Connects to {target}.": "Conecta-se a {target}.",
+  "SSH configuration {id} no longer exists.": "A configuração SSH {id} não existe mais.",
+  "Run Targets": "Destinos de execução",
+  "Target Settings": "Configurações do destino",
+  "Project folder on target": "Pasta do projeto no destino",
+  "Files are uploaded here and the working directory is mapped into it.": "Os arquivos são enviados para cá e o diretório de trabalho é mapeado para ela.",
+  "Upload changed project files before each run": "Fazer upload dos arquivos alterados do projeto antes de cada execução",
+  "Node.js interpreter": "Interpretador Node.js",
+  "Java executable": "Executável Java",
+  "No run targets. Click + to add one.": "Nenhum destino de execução. Clique em + para adicionar um.",
+  "Run targets actions": "Ações de destinos de execução",
+  "Run targets": "Destinos de execução",
+  "Choose a target under “Run on” in a run configuration. Interpreters left empty are looked up on the target's PATH. SSH configurations are managed in Tools › SSH Configurations.": "Escolha um destino sob “Executar em” em uma configuração de execução. Interpretadores deixados em branco são pesquisados no PATH do destino. As configurações SSH são gerenciadas em Ferramentas › Configurações SSH.",
+  "Select Folder on Target": "Selecionar pasta no destino",
+  "Parent Folder": "Pasta pai",
+  "Remote path": "Caminho remoto",
+  "Remote folders": "Pastas remotas",
+  "Trust Host": "Confiar no host",
+  "Password or passphrase": "Senha ou frase secreta",
+  "No subfolders": "Nenhuma subpasta",
+  "{name} (missing)": "{name} (ausente)",
+  "Run on": "Executar em",
+  "Local machine": "Máquina local",
+  "Debugging is not available on run targets.": "A depuração não está disponível em destinos de execução.",
+  "Add SSH hosts in Settings › Build, Execution, Deployment › Run Targets.": "Adicione hosts SSH em Configurações › Build, Execução, Implantação › Destinos de Execução.",
+  "Debugging on run targets is not supported": "A depuração em destinos de execução não é suportada",
+  "'{name}' runs on {target}. Run it, or choose “Local machine” under “Run on” to debug it.": "'{name}' é executado em {target}. Execute-o ou escolha “Máquina local” sob “Executar em” para depurá-lo.",
+  "SSH Authentication": "Autenticação SSH",
+  "Deployment": "Implantação",
+  "Deployment servers": "Servidores de implantação",
+  "Mappings": "Mapeamentos",
+  "Excluded Paths": "Caminhos excluídos",
+  "Root path": "Caminho raiz",
+  "Mappings' deployment paths are relative to this folder.": "Os caminhos de implantação dos mapeamentos são relativos a esta pasta.",
+  "Login folder": "Pasta de login",
+  "Web server URL": "URL do servidor web",
+  "Choose Folder": "Escolher pasta",
+  "Home folder is unavailable": "A pasta pessoal não está disponível",
+  "Folder does not exist: {path}": "A pasta não existe: {path}",
+  "Not a folder: {path}": "Não é uma pasta: {path}",
+  "Folder is not writable: {path}: {error}": "A pasta não permite gravação: {path}: {error}",
+  "Source and destination are the same file: {path}": "Origem e destino são o mesmo arquivo: {path}",
+  "Local or mounted folder": "Pasta local ou montada",
+  "Folder path": "Caminho da pasta",
+  "SFTP": "SFTP",
+  "Connected successfully": "Conectado com sucesso",
+  "Trust Host Key and Retry": "Confiar na chave do host e tentar novamente",
+  "Choose Remote Folder": "Escolher pasta remota",
+  "Local path": "Caminho local",
+  "Deployment path": "Caminho de implantação",
+  "Web path": "Caminho web",
+  "Use as Default": "Usar como padrão",
+  "Mappings actions": "Ações de mapeamentos",
+  "No mappings: nothing is deployed": "Nenhum mapeamento: nada é implantado",
+  "Local paths are relative to the project root or absolute inside it (empty: the whole project); deployment paths are relative to the server's root path.": "Os caminhos locais são relativos à raiz do projeto ou absolutos dentro dela (vazio: todo o projeto); os caminhos de implantação são relativos ao caminho raiz do servidor.",
+  "No excluded paths": "Nenhum caminho excluído",
+  "Excluded remote paths": "Caminhos remotos excluídos",
+  "Remote paths that are never uploaded to, downloaded from or deleted.": "Caminhos remotos para os quais nunca é feito upload, download ou exclusão.",
+  "Deployment servers actions": "Ações de servidores de implantação",
+  "No servers. Click + to add one.": "Nenhum servidor. Clique em + para adicionar um.",
+  "Server settings": "Configurações do servidor",
+  "Add an SFTP server to upload, download and synchronize project files.": "Adicione um servidor SFTP para fazer upload, download e sincronizar arquivos do projeto.",
+  "Exclude items by name": "Excluir itens por nome",
+  "Names or wildcards separated by “;”, e.g. .git;*.pyc. Matching files and folders are never transferred.": "Nomes ou curingas separados por “;”, por exemplo: .git;*.pyc. Arquivos e pastas correspondentes nunca são transferidos.",
+  "Upload changed files automatically to the default server": "Fazer upload automático de arquivos alterados para o servidor padrão",
+  "On explicit save action": "Na ação explícita de salvar",
+  "Delete remote files when local are deleted": "Excluir arquivos remotos quando os locais forem excluídos",
+  "Preserve files timestamps": "Preservar carimbos de data/hora dos arquivos",
+  "Upload to Default Server": "Fazer upload para o servidor padrão",
+  "Upload to {server}": "Fazer upload para {server}",
+  "Download from {server}": "Fazer download de {server}",
+  "Sync with Deployed to {server}…": "Sincronizar com implantado em {server}…",
+  "Sync with Deployed to Default Server": "Sincronizar com implantado no servidor padrão",
+  "Compare local files with the default deployment server and synchronize them": "Comparar arquivos locais com o servidor de implantação padrão e sincronizá-los",
+  "Upload the selected files and folders to the default deployment server": "Fazer upload dos arquivos e pastas selecionados para o servidor de implantação padrão",
+  "Upload to…": "Fazer upload para…",
+  "Upload the selected files and folders to a deployment server": "Fazer upload dos arquivos e pastas selecionados para um servidor de implantação",
+  "Download from Default Server": "Fazer download do servidor padrão",
+  "Replace the selected files and folders with their copies on the default deployment server": "Substituir os arquivos e pastas selecionados por suas cópias no servidor de implantação padrão",
+  "Download from…": "Fazer download de…",
+  "Replace the selected files and folders with their copies on a deployment server": "Substituir os arquivos e pastas selecionados por suas cópias em um servidor de implantação",
+  "Sync with Deployed to…": "Sincronizar com implantado em…",
+  "Compare local files with a deployment server and synchronize them": "Comparar arquivos locais com um servidor de implantação e sincronizá-los",
+  "Delete from Server": "Excluir do servidor",
+  "Delete the remote copies of the selected files and folders on the default server": "Excluir as cópias remotas dos arquivos e pastas selecionados no servidor padrão",
+  "Automatic Upload": "Upload automático",
+  "Upload changed files to the default server automatically": "Fazer upload de arquivos alterados para o servidor padrão automaticamente",
+  "Browse Remote Host": "Navegar no host remoto",
+  "Show the files of a deployment server in the Remote Host tool window": "Mostrar os arquivos de um servidor de implantação na janela de ferramentas Host Remoto",
+  "Open in Browser (Deployed)": "Abrir no navegador (implantado)",
+  "Open the deployed URL of the file on the default server's web server": "Abrir a URL implantada do arquivo no servidor web do servidor padrão",
+  "Deployment Configuration…": "Configuração de implantação…",
+  "Edit the deployment servers and options": "Editar os servidores e opções de implantação",
+  "Configuration…": "Configuração…",
+  "No deployment server configured": "Nenhum servidor de implantação configurado",
+  "Select files in the Project view or open a file in the editor": "Selecione arquivos na visualização do projeto ou abra um arquivo no editor",
+  "Upload to": "Fazer upload para",
+  "Download from": "Fazer download de",
+  "Sync with Deployed to": "Sincronizar com implantado em",
+  "Skipped: {n}": "Ignorados: {n}",
+  "and {n} more": "e mais {n}",
+  "Uploaded {n} files to {server}": "{n} arquivos enviados para {server}",
+  "Upload to {server} finished with errors": "Upload para {server} concluído com erros",
+  "Downloaded {n} files from {server}": "{n} arquivos baixados de {server}",
+  "Download from {server} finished with errors": "Download de {server} concluído com erros",
+  "Deleted {n} files from {server}": "{n} arquivos excluídos de {server}",
+  "Delete from {server} finished with errors": "Exclusão de {server} concluída com erros",
+  "Synchronized {n} files with {server}": "{n} arquivos sincronizados com {server}",
+  "Sync with {server} finished with errors": "Sincronização com {server} concluída com erros",
+  "Cannot upload to {server}": "Não é possível fazer upload para {server}",
+  "Cannot download from {server}": "Não é possível fazer download de {server}",
+  "Cannot delete from {server}": "Não é possível excluir de {server}",
+  "Delete the remote copy of {name} from {server}?": "Excluir a cópia remota de {name} de {server}?",
+  "Delete the remote copies of {n} items from {server}?": "Excluir as cópias remotas de {n} itens de {server}?",
+  "No web server URL for this file": "Nenhuma URL de servidor web para este arquivo",
+  "This file is not mapped to the default server": "Este arquivo não está mapeado para o servidor padrão",
+  "Cannot open in browser": "Não é possível abrir no navegador",
+  "Cannot change automatic upload": "Não é possível alterar o upload automático",
+  "Remote Host": "Host remoto",
+  "No deployment servers": "Nenhum servidor de implantação",
+  "Download to Project": "Fazer download para o projeto",
+  "New Folder…": "Nova pasta…",
+  "Remote files": "Arquivos remotos",
+  "Empty folder": "Pasta vazia",
+  "Deployment server": "Servidor de implantação",
+  "Remote host actions": "Ações do host remoto",
+  "Enter a name": "Insira um nome",
+  "A name cannot contain “/”": "Um nome não pode conter “/”",
+  "Cannot create folder": "Não é possível criar a pasta",
+  "Cannot delete {name}": "Não é possível excluir {name}",
+  "Delete folder “{path}” from the server?": "Excluir a pasta “{path}” do servidor?",
+  "Delete file “{path}” from the server?": "Excluir o arquivo “{path}” do servidor?",
+  "Delete {n} items from the server?": "Excluir {n} itens do servidor?",
+  "Not mapped to a project path": "Não mapeado para um caminho do projeto",
+  "Unknown Host Key": "Chave de host desconhecida",
+  "{n} of {total} files will change": "{n} de {total} arquivos serão alterados",
+  "Comparing local and remote files…": "Comparando arquivos locais e remotos…",
+  "Files to synchronize": "Arquivos para sincronizar",
+  "Action": "Ação",
+  "Synchronizing…": "Sincronizando…",
+  "Local only": "Apenas local",
+  "Remote only": "Apenas remoto",
+  "Local is newer": "O local é mais recente",
+  "Remote is newer": "O remoto é mais recente",
+  "Identical": "Idêntico",
+  "Upload": "Fazer upload",
+  "Delete remote": "Excluir remoto",
+  "Delete local": "Excluir local",
+  "Remote Development": "Desenvolvimento remoto",
+  "The project runs on the remote host; the IDE backend is installed there on first use.": "O projeto é executado no host remoto; o back-end da IDE é instalado lá no primeiro uso.",
+  "SSH configuration:": "Configuração SSH:",
+  "No SSH configurations": "Nenhuma configuração SSH",
+  "Project directory:": "Diretório do projeto:",
+  "Remote Development…": "Desenvolvimento remoto…",
+  "Opens a project folder on an SSH host; the IDE backend runs on that host.": "Abre uma pasta de projeto em um host SSH; o back-end da IDE é executado nesse host.",
+  "Disconnect from Remote Host": "Desconectar do host remoto",
+  "Reload Environment": "Recarregar ambiente",
+  "Reads the login shell's environment (and devcontainer.json remoteEnv on a remote host) again for new terminals and processes.": "Lê novamente o ambiente do shell de login (e o remoteEnv de devcontainer.json em um host remoto) para novos terminais e processos.",
+  "No variables changed.": "Nenhuma variável foi alterada.",
+  "Changed: {names} and {more} more.": "Alteradas: {names} e mais {more}.",
+  "Changed: {names}.": "Alteradas: {names}.",
+  "Terminals and processes already running keep their old environment; new ones get the new one.": "Terminais e processos já em execução mantêm o ambiente antigo; os novos recebem o novo.",
+  "Restart Language Servers": "Reiniciar servidores de linguagem",
+  "Could not reload the environment": "Não foi possível recarregar o ambiente",
+  "Environment reloaded": "Ambiente recarregado",
+  "devcontainer.json was not applied": "devcontainer.json não foi aplicado",
+  "postStartCommand failed": "postStartCommand falhou",
+  "Opens a terminal tab connected to an SSH configuration (`arg`: its id; otherwise a chooser).": "Abre uma aba de terminal conectada a uma configuração SSH (`arg`: seu id; caso contrário, um seletor).",
+  "Connecting to the host…": "Conectando ao host…",
+  "Checking the IDE backend on the host…": "Verificando o back-end da IDE no host…",
+  "Downloading the IDE backend…": "Baixando o back-end da IDE…",
+  "Installing the IDE backend on the host…": "Instalando o back-end da IDE no host…",
+  "Starting the IDE backend…": "Iniciando o back-end da IDE…",
+  "Opening the project…": "Abrindo o projeto…",
+  "Cannot load agent tasks": "Não é possível carregar as tarefas do agente",
+  "Opening {name}…": "Abrindo {name}…",
+  "Copy Code": "Copiar código",
+  "Quote": "Citar",
+  "Find in Conversation": "Localizar na conversa",
+  "Find in conversation": "Localizar na conversa",
+  "0 results": "0 resultados",
+  "Time the agent took to answer": "Tempo que o agente levou para responder",
+  "Time the agent spent on this task": "Tempo que o agente gastou nesta tarefa",
+  "Send Again": "Enviar novamente",
+  "Customize IDE appearance and behavior: change themes and font size, configure system settings and notifications.": "Personalize a aparência e o comportamento da IDE: altere temas e tamanho da fonte, configure as opções do sistema e notificações.",
+  "Configure code editing: completion, folding, tabs, fonts, colors, code style and inspections.": "Configure a edição de código: preenchimento automático, dobramento de código, abas, fontes, cores, estilo de código e inspeções.",
+  "Configure build tools, run configurations, debugger and deployment.": "Configure ferramentas de build, configurações de execução, depurador e implantação.",
+  "Configure language servers, interpreters, SDKs and framework support.": "Configure servidores de linguagem, interpretadores, SDKs e suporte a frameworks.",
+  "Configure external tools, terminal, database and other integrations.": "Configure ferramentas externas, terminal, banco de dados e outras integrações.",
+  "Unversioned Files": "Arquivos não versionados",
+  "Merge Conflicts": "Conflitos de mesclagem",
+  "current": "atual",
+  "No matching repositories or branches": "Nenhum repositório ou branch correspondente",
+  "partial": "parcial",
+  "editable": "editável",
+  "on {date}": "em {date}",
+  "renamed from {name}": "renomeado de {name}",
+  "Label '{label}'": "Rótulo '{label}'",
+  "{n} file recorded before it": "{n} arquivo gravado antes dele",
+  "{n} files recorded before it": "{n} arquivos gravados antes dele",
+  "No local history for this folder yet": "Ainda não há histórico local para esta pasta",
+  "No local history for this path yet": "Ainda não há histórico local para este caminho",
+  "{name} has been resolved and staged.": "{name} foi resolvido e preparado no stage.",
+  "{selected} of {total} file will be reverted to their last committed state. Uncommitted changes are lost.": "{selected} de {total} arquivo será revertido para o seu último estado comitado. Alterações não comitadas serão perdidas.",
+  "{selected} of {total} files will be reverted to their last committed state. Uncommitted changes are lost.": "{selected} de {total} arquivos serão revertidos para o seu último estado comitado. Alterações não comitadas serão perdidas.",
+  "Current branch: {branch}": "Branch atual: {branch}",
+  "{count} TODO item found in the changed lines:": "{count} item de TODO encontrado nas linhas alteradas:",
+  "{count} TODO items found in the changed lines:": "{count} itens de TODO encontrados nas linhas alteradas:",
+  "{count} file ({names}) contain CRLF line separators and core.autocrlf is not set, so they would be committed with CRLF. Convert them with the line separator widget in the status bar, or set": "{count} arquivo ({names}) contém separadores de linha CRLF e core.autocrlf não está definido, portanto ele seria comitado com CRLF. Converta-o usando o widget de separador de linha na barra de status, ou defina",
+  "{count} files ({names}) contain CRLF line separators and core.autocrlf is not set, so they would be committed with CRLF. Convert them with the line separator widget in the status bar, or set": "{count} arquivos ({names}) contêm separadores de linha CRLF e core.autocrlf não está definido, portanto eles seriam comitados com CRLF. Converta-os usando o widget de separador de linha na barra de status, ou defina",
+  "Optional; creates an annotated tag": "Opcional; cria uma tag anotada",
+  "{count} file will be merged; conflicts open in the merge tool": "{count} arquivo será mesclado; conflitos serão abertos na ferramenta de mesclagem",
+  "{count} files will be merged; conflicts open in the merge tool": "{count} arquivos serão mesclados; conflitos serão abertos na ferramenta de mesclagem",
+  "{selected} of {total} file will be shelved and reverted in the working tree.": "{selected} de {total} arquivo será guardado no shelf e revertido na árvore de trabalho.",
+  "{selected} of {total} files will be shelved and reverted in the working tree.": "{selected} de {total} arquivos serão guardados no shelf e revertidos na árvore de trabalho.",
+  "tokens": "tokens",
+  "{count} occurrences · {lines} lines": "{count} ocorrências · {lines} linhas",
+  "{tokens} tokens": "{tokens} tokens",
+  "— no callers found": "— nenhum chamador encontrado",
+  "— no callees found": "— nenhum chamado encontrado",
+  "— no supertypes found": "— nenhum supertipo encontrado",
+  "— no subtypes found": "— nenhum subtipo encontrado",
+  "({calls} calls)": "({calls} chamadas)",
+  "Usages of {symbol}": "Usos de {symbol}",
+  "{shown} of {total} found": "{shown} de {total} encontrados",
+  "{total} found": "{total} encontrados",
+  "Nothing matches '{filter}'": "Nada corresponde a '{filter}'",
+  "{shown} of {rowCount} rows": "{shown} de {rowCount} linhas",
+  "Local filter": "Filtro local",
+  "Rename {what} '{initial}' to:": "Renomear {what} '{initial}' para:",
+  "Drop {kind}": "Excluir {kind}",
+  "{count} row": "{count} linha",
+  "(limit reached)": "(limite atingido)",
+  "Reached from the SSH host {label}.": "Acessado a partir do host SSH {label}.",
+  "table": "tabela",
+  "view": "view",
+  "materialized view": "view materializada",
+  "column": "coluna",
+  "index": "índice",
+  "schema": "esquema",
+  "function": "função",
+  "procedure": "procedimento",
+  "trigger": "gatilho",
+  "sequence": "sequência",
+  "data source": "fonte de dados",
+  "{count} library frames hidden": "{count} quadros de biblioteca ocultos",
+  "unverified": "não verificado",
+  "temp": "temp",
+  "Watching {dataId}": "Observando {dataId}",
+  "No attachable processes match the filter.": "Nenhum processo anexável corresponde ao filtro.",
+  "No attachable processes.": "Nenhum processo anexável.",
+  "{failed} failing": "{failed} com falha",
+  "Sending request #{n}…": "Enviando requisição #{n}…",
+  "Memory & Diagnostics": "Memória e diagnósticos",
+  "Over budget ({budget})": "Acima do orçamento ({budget})",
+  "dev": "dev",
+  "Zoomed into {name}": "Aproximado em {name}",
+  "Rename directory '{current}' and its usages to:": "Renomear diretório '{current}' e seus usos para:",
+  "Rename file '{current}' and its usages to:": "Renomear arquivo '{current}' e seus usos para:",
+  "{count} occurrence": "{count} ocorrência",
+  "{count} occurrences": "{count} ocorrências",
+  "References to update: {a} in {b}": "Referências a atualizar: {a} em {b}",
+  "Save '{name}' Configuration": "Salvar configuração '{name}'",
+  "test": "teste",
+  "user": "usuário",
+  "temporary": "temporário",
+  "<{count} internal line>": "<{count} linha interna>",
+  "<{count} internal lines>": "<{count} linhas internas>",
+  "{count} earlier lines were discarded": "{count} linhas anteriores foram descartadas",
+  "{count} passed": "{count} aprovados",
+  "{count} ignored": "{count} ignorados",
+  "Running…": "Executando…",
+  "No tests": "Nenhum teste",
+  "Replacing… {done}/{total} files": "Substituindo… {done}/{total} arquivos",
+  "changed": "alterado",
+  "Start Docker (context '{context}'); this view connects automatically.": "Inicie o Docker (contexto '{context}'); esta visualização se conecta automaticamente.",
+  "Start Docker; this view connects automatically.": "Inicie o Docker; esta visualização se conecta automaticamente.",
+  "Could not save: {error}": "Não foi possível salvar: {error}",
+  "{count} modified action": "{count} ação modificada",
+  "{count} modified actions": "{count} ações modificadas",
+  "Runs “<base> -m venv <location>”; the new interpreter becomes the project interpreter.": "Executa “<base> -m venv <location>”; o novo interpretador se torna o interpretador do projeto.",
+  "{vendor} {version} is unpacked into a folder of its own in {location}, where JDK detection finds it.": "O {vendor} {version} é descompactado em sua própria pasta em {location}, onde a detecção de JDK o localiza.",
+  "detected from {source}": "detectado de {source}",
+  "modified": "modificado",
+  "seconds": "segundos",
+  "columns": "colunas",
+  "Defaults from the {lang} language definition: tab.": "Padrões da definição da linguagem {lang}: tab.",
+  "Defaults from the {lang} language definition: {size} spaces.": "Padrões da definição da linguagem {lang}: {size} espaços.",
+  "Follows the IDE theme: currently {name}.": "Segue o tema da IDE: atualmente {name}.",
+  "<Project>": "<Projeto>",
+  "<none>": "<nenhum>",
+  "Invalid pattern: {patterns}": "Padrão inválido: {patterns}",
+  "Matches of an Issue ID regular expression in commit messages (Git log, commit details) become links; $0 is the whole match, $1… the groups.": "Correspondências de uma expressão regular de ID de issue em mensagens de commit (log do Git, detalhes do commit) tornam-se links; $0 é a correspondência inteira, $1… os grupos.",
+  "Abbreviation for <{tag}>, e.g.": "Abreviação de <{tag}>, ex.:",
+  "caret,": "o cursor,",
+  "{count} item": "{count} item",
+  "Language servers and debug adapters used by the IDE. Missing tools can be installed into the IDE's own tools folder; nothing is downloaded until you click Install.": "Servidores de linguagem e adaptadores de depuração usados pela IDE. Ferramentas ausentes podem ser instaladas na própria pasta de ferramentas da IDE; nada é baixado até que você clique em Instalar.",
+  "Large file": "Arquivo grande",
+  "Binary file": "Arquivo binário",
+  "read-only": "somente leitura",
+  "Offset 0x{hex} ({offset})": "Deslocamento 0x{hex} ({offset})",
+  "Cannot read the file: {error}": "Não é possível ler o arquivo: {error}",
+  "Cannot show the image: {error}": "Não é possível exibir a imagem: {error}",
+  "HTML preview": "Pré-visualização HTML",
+  "Open a folder from disk or clone a repository from version control.": "Abra uma pasta do disco ou clone um repositório do controle de versão.",
+  "Open a folder from disk.": "Abra uma pasta do disco.",
+  "No bookmarks yet. Toggle a line bookmark with {key}": "Ainda não há marcadores. Alterne um marcador de linha com {key}",
+  "Use Find in Files ({key}) and choose “Open in Find Window”.": "Use Localizar nos arquivos ({key}) e escolha “Abrir na janela de localização”.",
+  "Build message": "Mensagem de build",
+  "Ignored lines": "Linhas ignoradas",
+  "Open in browser": "Abrir no navegador",
+  "Plan node properties": "Propriedades do nó do plano",
+  "Values": "Valores",
+  "Vim rc file": "Arquivo rc do Vim",
+  "Breakpoints are not supported in output classes without source code.": "Pontos de interrupção não são suportados em classes de saída sem código-fonte.",
+  "Decompiled .class file: sources are not available.": "Arquivo .class descompilado: os fontes não estão disponíveis.",
+  "No column of the file matches the table": "Nenhuma coluna do arquivo corresponde à tabela",
+  "Not a URL of PostgreSQL, MySQL, SQLite or a compatible database": "Não é uma URL do PostgreSQL, MySQL, SQLite ou de um banco de dados compatível",
+  "The Database tree shows only the checked names and patterns (* and ?); the connected database always shows.": "A árvore de Banco de Dados mostra apenas os nomes e padrões (* e ?) marcados; o banco de dados conectado sempre é exibido.",
+  "Save the data source to pick from the server's names; patterns (* and ?) work any time.": "Salve a fonte de dados para escolher entre os nomes do servidor; padrões (* e ?) funcionam a qualquer momento.",
+  "Read-only data source.": "Fonte de dados somente leitura.",
+  "Use the query console to change ClickHouse data.": "Use o console de consulta para alterar os dados do ClickHouse.",
+  "Read-only: the table has no primary key to identify rows.": "Somente leitura: a tabela não possui uma chave primária para identificar linhas.",
+  "The session has finished.": "A sessão terminou.",
+  "Variables are available while suspended.": "Variáveis estão disponíveis enquanto suspenso.",
+  "Verified": "Verificado",
+  "Press Enter to evaluate": "Pressione Enter para avaliar",
+  "Evaluation is available while the program is suspended": "A avaliação está disponível enquanto o programa está suspenso",
+  "unknown type": "tipo desconhecido",
+  "Dev plugin loaded": "Plugin de desenvolvimento carregado",
+  "WebAssembly component (sandboxed)": "Componente WebAssembly (isolado)",
+  "None — contributions only": "Nenhum — apenas contribuições",
+  "Dark": "Escuro",
+  "Light": "Claro",
+  "No plugins installed.": "Nenhum plugin instalado.",
+  "No plugins match.": "Nenhum plugin correspondente.",
+  "No local plugin packages.": "Nenhum pacote de plugins local.",
+  "Waiting for test results…": "Aguardando resultados dos testes…",
+  "No test results": "Nenhum resultado de teste",
+  "Passed tests are hidden": "Testes aprovados estão ocultos",
+  "Search failed": "Falha na pesquisa",
+  "No edited files": "Nenhum arquivo editado",
+  "No matching files": "Nenhum arquivo correspondente",
+  "No recent files": "Nenhum arquivo recente",
+  "Recently Changed Locations": "Locais alterados recentemente",
+  "No changed locations": "Nenhum local alterado",
+  "No recent locations": "Nenhum local recente",
+  "Open a file first": "Abra um arquivo primeiro",
+  "1 detected folder is unmarked.": "1 pasta detectada não está marcada.",
+  "No packages match": "Nenhum pacote correspondente",
+  "No packages installed": "Nenhum pacote instalado",
+  "Installing": "Instalando",
+  "Upgrading": "Atualizando",
+  "Uninstalling": "Desinstalando",
+  "Contents are identical": "Os conteúdos são idênticos",
+  "working copy": "cópia de trabalho",
+  "No commits match the filters": "Nenhum commit corresponde aos filtros",
+  "No commits yet": "Ainda não há commits",
+  " · commit to conclude": " · faça commit para concluir",
+  "Abort": "Abortar",
+  "The current branch has no tracked branch; git pull may fail.": "A branch atual não tem branch rastreada; o git pull pode falhar.",
+  "HEAD is detached; check out a branch to push.": "HEAD está desanexada; faça checkout de uma branch para fazer push.",
+  "No shelved changes": "Nenhuma alteração no shelf",
+  "No recent projects": "Nenhum projeto recente",
+  "Current position {line}:{col}": "Posição atual {line}:{col}",
+  "{count} detected folders are unmarked.": "{count} pastas detectadas não estão marcadas.",
+  "Rebase commits of {head} not on:": "Fazer rebase dos commits de {head} ausentes em:",
+  "{head} has no upstream: commits up to {revision} will be pushed as a new branch:": "{head} não tem upstream: commits até {revision} serão enviados com push como uma nova branch:",
+  "{head} has no upstream: it will be pushed as a new branch and tracked:": "{head} não tem upstream: ela será enviada com push como uma nova branch e rastreada:",
+  "{count} excluded": "{count} excluídos",
+  "{count} file with conflicts": "{count} arquivo com conflitos",
+  "{count} files with conflicts": "{count} arquivos com conflitos",
+  "Clear {label} filter": "Limpar filtro {label}",
+  "in {count} commits": "em {count} commits",
+  "Callers": "Chamadores",
+  "Callees": "Chamados",
+  "Supertypes": "Supertipos",
+  "Subtypes": "Subtipos",
+  "Callers of {name}": "Chamadores de {name}",
+  "Callees of {name}": "Chamados por {name}",
+  "Supertypes of {name}": "Supertipos de {name}",
+  "Subtypes of {name}": "Subtipos de {name}",
+  "Changes requested": "Alterações solicitadas",
+  "Review required": "Revisão necessária",
+  "requested changes": "solicitou alterações",
+  "{n} minute ago": "há {n} minuto",
+  "{n} minutes ago": "há {n} minutos",
+  "just now": "agora mesmo",
+  "No symbols": "Nenhum símbolo",
+  "{behind} incoming, {ahead} outgoing commits": "{behind} commits de entrada, {ahead} de saída",
+  "{behind} incoming commits": "{behind} commits de entrada",
+  "{ahead} outgoing commits": "{ahead} commits de saída",
+  "Repository: {repo}": "Repositório: {repo}",
+  "Git branch: {head}": "Branch Git: {head}",
+  "Tracking {upstream}": "Rastreando {upstream}",
+  "In all {count} repositories": "Em todos os {count} repositórios",
+  "{current} of {count} differences": "{current} de {count} diferenças",
+  "{count} difference": "{count} diferença",
+  "{count} differences": "{count} diferenças",
+  "Cloning…": "Clonando…",
+  "locked": "bloqueado",
+  "prunable": "eliminável",
+  "Rebasing": "Fazendo rebase",
+  "Merging": "Mesclando",
+  "Cherry-picking": "Fazendo cherry-pick",
+  "Reverting": "Revertendo",
+  "Applying patches": "Aplicando patches",
+  "Rebasing {head}": "Fazendo rebase de {head}",
+  "Merging {head}": "Mesclando {head}",
+  "Cherry-picking {head}": "Fazendo cherry-pick de {head}",
+  "Reverting {head}": "Revertendo {head}",
+  "Applying patches to {head}": "Aplicando patches em {head}",
+  "Rebase in progress": "Rebase em andamento",
+  "Merge in progress": "Mesclagem em andamento",
+  "Cherry-pick in progress": "Cherry-pick em andamento",
+  "Revert in progress": "Revert em andamento",
+  "Patch application in progress": "Aplicação de patches em andamento",
+  "{conflicts} conflict": "{conflicts} conflito",
+  "{conflicts} conflicts": "{conflicts} conflitos",
+  "Continuing rebase": "Continuando rebase",
+  "Continuing merge": "Continuando mesclagem",
+  "Continuing cherry-pick": "Continuando cherry-pick",
+  "Continuing revert": "Continuando revert",
+  "Continuing patch application": "Continuando aplicação de patches",
+  "Skipping commit": "Ignorando commit",
+  "Aborting rebase": "Abortando rebase",
+  "Aborting merge": "Abortando mesclagem",
+  "Aborting cherry-pick": "Abortando cherry-pick",
+  "Aborting revert": "Abortando revert",
+  "Aborting patch application": "Abortando aplicação de patches",
+  "Rebase continued": "Rebase continuado",
+  "Merge continued": "Mesclagem continuada",
+  "Cherry-pick continued": "Cherry-pick continuado",
+  "Revert continued": "Revert continuado",
+  "Patch application continued": "Aplicação de patches continuada",
+  "Commit skipped": "Commit ignorado",
+  "Rebase aborted": "Rebase abortado",
+  "Merge aborted": "Mesclagem abortada",
+  "Cherry-pick aborted": "Cherry-pick abortado",
+  "Revert aborted": "Revert abortado",
+  "Patch application aborted": "Aplicação de patches abortada",
+  "Rebase failed": "Falha no rebase",
+  "Cherry-pick failed": "Falha no cherry-pick",
+  "Revert failed": "Falha no revert",
+  "Reset failed": "Falha no reset",
+  "Rebase stopped for editing; continue the rebase when done": "Rebase pausado para edição; continue o rebase quando concluir",
+  "Cherry-picked {label}": "Cherry-pick de {label} realizado",
+  "Reverted {label}": "Revert de {label} realizado",
+  "Reset {head} to {rev} ({mode})": "Redefinir {head} para {rev} ({mode})",
+  "Resetting": "Redefinindo",
+  "Fetching": "Executando fetch",
+  "Updating project": "Atualizando projeto",
+  "Pulling": "Executando pull",
+  "Pushing": "Executando push",
+  "Deleting remote branch": "Excluindo branch remota",
+  "Updating branch": "Atualizando branch",
+  "Delete remote branch": "Excluir branch remota",
+  "binary": "binário",
+  "Common Local Branches": "Branches locais comuns",
+  "Common Remote Branches": "Branches remotas comuns",
+  "Recent Branches in {name}": "Branches recentes em {name}",
+  "Local Branches in {name}": "Branches locais em {name}",
+  "Remote Branches in {name}": "Branches remotas em {name}",
+  "Tags in {name}": "Tags em {name}",
+  "Moments ago": "Há instantes",
+  "{min} min ago": "há {min} min",
+  "Today {time}": "Hoje {time}",
+  "Yesterday {time}": "Ontem {time}",
+  "Added lines": "Linhas adicionadas",
+  "Deleted lines": "Linhas excluídas",
+  "Added": "Adicionado",
+  "Renamed": "Renomeado",
+  "Unversioned": "Não versionado",
+  "Merge conflict": "Conflito de mesclagem",
+  "Automatic": "Automático",
+  "Custom combination": "Combinação personalizada",
+  "Language server for {languages}": "Servidor de linguagem para {languages}",
+  "Only one of these runs at a time. Automatic uses the first one available: {order}.": "Apenas um deles é executado por vez. O modo Automático usa o primeiro disponível: {order}.",
+  "Configure the settings related to version control used in your project": "Configure as opções relacionadas ao controle de versão usado em seu projeto",
+  "Use non-modal commit interface": "Usar interface de commit não modal",
+  "When off, Local Changes and Stash are tabs of the Git tool window and Commit opens a dialog.": "Quando desativado, Alterações locais e Stash são abas da janela de ferramentas do Git e Commit abre uma caixa de diálogo.",
+  "Clear initial commit message": "Limpar mensagem inicial de commit",
+  "Show options before Update": "Mostrar opções antes de Atualizar",
+  "Ask for confirmation to drop commits": "Pedir confirmação para descartar commits",
+  "Applicable to Git": "Aplicável ao Git",
+  "Highlight directories that contain modified files in the Project tree": "Destacar diretórios contendo arquivos modificados na árvore do Projeto",
+  "When patch is created": "Quando o patch é criado",
+  "Warn when committing files larger than": "Avisar ao comitar arquivos maiores que",
+  "Warn when committing files with names that might cause issues on other systems": "Avisar ao comitar arquivos com nomes que possam causar problemas em outros sistemas",
+  "Show Push dialog for Commit and Push": "Mostrar caixa de diálogo de Push para Commit e Push",
+  "Show Push dialog only when committing to protected branches": "Mostrar caixa de diálogo de Push apenas ao comitar em branches protegidas",
+  "Combine stashes and shelves in one tab": "Combinar stashes e shelves em uma única aba",
+  "Patch file created successfully. Show it in Finder?": "Arquivo de patch criado com sucesso. Mostrar no Finder?",
+  "File names": "Nomes de arquivos",
+  "Large files": "Arquivos grandes",
+  "Some files use reserved names that are not allowed on Windows: '{name}'. If you commit, it will not be possible to check out the Git repository on Windows.": "Alguns arquivos usam nomes reservados que não são permitidos no Windows: '{name}'. Se você comitar, não será possível fazer checkout do repositório Git no Windows.",
+  "Some of the file names contain characters that are not allowed on Windows: '{name}'. If you commit, it might not be possible to check out the Git repository on Windows.": "Alguns dos nomes de arquivo contêm caracteres que não são permitidos no Windows: '{name}'. Se você comitar, talvez não seja possível fazer checkout do repositório Git no Windows.",
+  "You are about to commit a large file into the repository: {name} ({size} MB). It is not recommended to store large files in a Git repository. Consider using Git LFS.": "Você está prestes a comitar um arquivo grande no repositório: {name} ({size} MB). Não é recomendado armazenar arquivos grandes em um repositório Git. Considere usar o Git LFS.",
+  "You are about to commit {count} large files into the repository with the total size of {size} MB. It is not recommended to store large files in a Git repository. Consider using Git LFS.": "Você está prestes a comitar {count} arquivos grandes no repositório com o tamanho total de {size} MB. Não é recomendado armazenar arquivos grandes em um repositório Git. Considere usar o Git LFS.",
+  "Hide Branches": "Ocultar branches",
+  "Show Branches": "Mostrar branches",
+  "Update Selected": "Atualizar selecionado",
+  "Navigate Log to Selected Branch": "Navegar no log para a branch selecionada",
+  "Branch or tag": "Branch ou tag",
+  "Filter branches and tags": "Filtrar branches e tags",
+  "Revert Selected Changes": "Reverter alterações selecionadas",
+  "Show only the first reference": "Mostrar apenas a primeira referência",
+  "Show tag names": "Mostrar nomes das tags",
+  "Show commit time rather than author time": "Mostrar data/hora do commit em vez da do autor",
+  "Show references on the left": "Mostrar referências à esquerda",
+  "Visible columns": "Colunas visíveis",
+  "Visible columns:": "Colunas visíveis:",
+  "Get from Revision": "Obter da revisão",
+  "Replace '{path}' with its content from the revision? Local changes to it are lost.": "Substituir '{path}' pelo seu conteúdo da revisão? Alterações locais nele serão perdidas.",
+  "Replace {length} files with their content from the revision? Local changes to them are lost.": "Substituir {length} arquivos pelo seu conteúdo da revisão? Alterações locais neles serão perdidas.",
+  "Get": "Obter",
+  "Got 1 file from revision": "1 arquivo obtido da revisão",
+  "Got {n} files from revision": "{n} arquivos obtidos da revisão",
+  "Nothing to revert": "Nada para reverter",
+  "Mark/Unmark As Favorite": "Marcar/desmarcar como favorito",
+  "Compare Before with Local": "Comparar anterior com o local",
+  "Group by Directory": "Agrupar por diretório",
+  "Stashes and Shelves": "Stashes e shelves",
+  "History: {name}": "Histórico: {name}",
+  "Log: {name}": "Log: {name}",
+  "Commit Changes": "Comitar alterações",
+  "Group by Prefix": "Agrupar por prefixo",
+  "Show Recent Branches": "Mostrar branches recentes",
+  "Show Tags": "Mostrar tags",
+  "Branches Popup Options": "Opções do pop-up Branches",
+  "Pull into '{cur}' Using Rebase": "Fazer pull em '{cur}' usando rebase",
+  "Pull into '{cur}' Using Merge": "Fazer pull em '{cur}' usando mesclagem",
+  "No problems at the caret": "Nenhum problema no cursor",
+  "Error Description": "Descrição do erro",
+  "Next Highlighted Usage": "Próximo uso destacado",
+  "Previous Highlighted Usage": "Uso destacado anterior",
+  "Move Caret to Code Block Start with Selection": "Mover cursor para o início do bloco de código com seleção",
+  "Move Caret to Code Block End with Selection": "Mover cursor para o fim do bloco de código com seleção",
+  "Auto-Indent Lines": "Indentar linhas automaticamente",
+  "Stretch to Left": "Esticar para a esquerda",
+  "Stretch to Right": "Esticar para a direita",
+  "Stretch to Top": "Esticar para cima",
+  "Stretch to Bottom": "Esticar para baixo",
+  "Copy File…": "Copiar arquivo…",
+  "Copy Directory…": "Copiar diretório…",
+  "Copy…": "Copiar…",
+  "Fold Code Block": "Recolher bloco de código",
+  "Go to Next Splitter": "Ir para o próximo divisor",
+  "Go to Previous Splitter": "Ir para o divisor anterior",
+  "File Path": "Caminho do arquivo",
+  "Cannot reveal in {fileManager}": "Não é possível exibir no {fileManager}",
+  "Surround with Live Template": "Envolver com modelo dinâmico",
+  "Surround with Live Template…": "Envolver com modelo dinâmico…",
+  "Quick Evaluate Expression": "Avaliação rápida de expressão",
+  "Nothing to evaluate at the caret": "Nada para avaliar no cursor",
+  "Choose a run/debug configuration and debug it": "Escolha uma configuração de execução/depuração e depure-a",
+  "Inspect Current File": "Inspecionar arquivo atual",
+  "No custom folding regions in this file": "Nenhuma região de recolhimento personalizada neste arquivo",
+  "Custom Folding Regions": "Regiões de recolhimento personalizadas",
+  "(no description)": "(sem descrição)",
+  "Custom Folding…": "Recolhimento personalizado…",
+  "Move Element Left": "Mover elemento para a esquerda",
+  "Move Element Right": "Mover elemento para a direita",
+  "Stop Background Processes…": "Parar processos em segundo plano…",
+  "No background processes to stop": "Nenhum processo em segundo plano para parar",
+  "Expand to Level 1": "Expandir para o nível 1",
+  "Expand All to Level 1": "Expandir tudo para o nível 1",
+  "Expand to Level 2": "Expandir para o nível 2",
+  "Expand All to Level 2": "Expandir tudo para o nível 2",
+  "Expand to Level 3": "Expandir para o nível 3",
+  "Expand All to Level 3": "Expandir tudo para o nível 3",
+  "Expand to Level 4": "Expandir para o nível 4",
+  "Expand All to Level 4": "Expandir tudo para o nível 4",
+  "Expand to Level 5": "Expandir para o nível 5",
+  "Expand All to Level 5": "Expandir tudo para o nível 5",
+  "Surround with Callable": "Envolver com Callable",
+  "Surround with ReadWriteLock.readLock": "Envolver com ReadWriteLock.readLock",
+  "Surround with ReadWriteLock.writeLock": "Envolver com ReadWriteLock.writeLock",
+  "Iterate Iterable or array": "Iterar sobre Iterable ou array",
+  "No live templates to surround with": "Nenhum modelo dinâmico disponível para envolver",
+  "Sort by Name": "Ordenar por nome",
+  "Sort by Type": "Ordenar por tipo",
+  "Sort by Modification Time": "Ordenar por data de modificação",
+  "Add Mouse Shortcut": "Adicionar atalho de mouse",
+  "Click here with Ctrl, Alt or Command held, or use a mouse side button": "Clique aqui mantendo Ctrl, Alt ou Command pressionado, ou use um botão lateral do mouse",
+  "Mouse shortcut": "Atalho de mouse",
+  "Mouse Shortcut: {action}": "Atalho de mouse: {action}",
+  "Accept Left Side": "Aceitar lado esquerdo",
+  "Accept Right Side": "Aceitar lado direito",
+  "Copies the change at the caret from the left side to the right one": "Copia a alteração no cursor do lado esquerdo para o lado direito",
+  "Copies the change at the caret from the right side to the left one": "Copia a alteração no cursor do lado direito para o lado esquerdo",
+  "Compare Next File": "Comparar próximo arquivo",
+  "Compare Previous File": "Comparar arquivo anterior",
+  "Context Info": "Informações de contexto",
+  "No context information here": "Nenhuma informação de contexto aqui",
+  "Diff Settings": "Configurações de diff",
+  "Viewer": "Visualizador",
+  "Ignore Whitespace": "Ignorar espaços em branco",
+  "Browse Console History": "Navegar pelo histórico do console",
+  "Focus the debug console input first": "Foque primeiro na entrada do console de depuração",
+  "No history": "Nenhum histórico",
+  "More Agents…": "Mais agentes…",
+  "More agents…": "Mais agentes…",
+  "Opens Settings › Build, Execution, Deployment › Maven": "Abre Configurações › Build, Execução, Implantação › Maven",
+  "Opens Settings › Tools › Agents: installs, updates or removes agents from the ACP Registry.": "Abre Configurações › Ferramentas › Agentes: instala, atualiza ou remove agentes do Registro ACP.",
+  "Search the ACP Registry": "Pesquisar no Registro ACP",
+  "Search agents": "Pesquisar agentes",
+  "Agents in the ACP Registry are third-party software. They run on this computer with your permissions and can read and change your files. Install only agents you trust.": "Os agentes no Registro ACP são softwares de terceiros. Eles são executados neste computador com suas permissões e podem ler e alterar seus arquivos. Instale apenas agentes em que você confia.",
+  "Cannot load the ACP Registry: {error}": "Não é possível carregar o Registro ACP: {error}",
+  "Loading the ACP Registry…": "Carregando o Registro ACP…",
+  "No agents match": "Nenhum agente correspondente",
+  "The registry has no agents for this system": "O registro não possui agentes para este sistema",
+  "{version} available": "{version} disponível",
+  "Installing {name} {version}…": "Instalando {name} {version}…",
+  "Website": "Site",
+  "Removing…": "Removendo…",
+  "Registry agents": "Agentes do registro",
+  "No checksum provided": "Nenhuma soma de verificação fornecida",
+  "{name} provides no checksum for its download, so the downloaded file cannot be verified. Install it anyway?": "{name} não fornece nenhuma soma de verificação para seu download, portanto o arquivo baixado não pode ser verificado. Instalar mesmo assim?",
+  "Usage limit": "Limite de uso",
+  "{provider} didn't start: {error}": "{provider} não iniciou: {error}",
+  "resets {resetsMs}": "reinicia em {resetsMs}",
+  "Copy to a New Task": "Copiar para uma nova tarefa",
+  "Couldn't copy the task": "Não foi possível copiar a tarefa",
+  "Copy to a New Task From Here": "Copiar para uma nova tarefa a partir daqui",
+  "Run Again From Here": "Executar novamente a partir daqui",
+  "The messages after this one are replaced. Files the agent changed stay as they are.": "As mensagens após esta são substituídas. Os arquivos que o agente alterou permanecem como estão.",
+  "Cancelling…": "Cancelando…",
+  "Code insight needs the index; it can't be stopped": "A análise de código precisa do índice; ela não pode ser interrompida",
+  "Waiting for other tasks": "Aguardando outras tarefas",
+  "This task can't be cancelled": "Esta tarefa não pode ser cancelada",
+  "Cancelled": "Cancelado",
+  "No proxy": "Sem proxy",
+  "Auto-detect proxy settings": "Detectar configurações de proxy automaticamente",
+  "Uses the system proxy: the HTTP_PROXY, HTTPS_PROXY and NO_PROXY environment variables.": "Usa o proxy do sistema: as variáveis de ambiente HTTP_PROXY, HTTPS_PROXY e NO_PROXY.",
+  "Manual proxy configuration": "Configuração manual de proxy",
+  "Proxy": "Proxy",
+  "Proxy type": "Tipo de proxy",
+  "Host name": "Nome do host",
+  "Port number": "Número da porta",
+  "No proxy for": "Sem proxy para",
+  "Comma-separated host names; * matches any characters, e.g. *.example.com, 192.168.*": "Nomes de host separados por vírgula; * corresponde a qualquer caractere, por exemplo, *.example.com, 192.168.*",
+  "Proxy authentication": "Autenticação de proxy",
+  "Login": "Login",
+  "Connection successful: {status}": "Conexão bem-sucedida: {status}",
+  "Problem with connection: {message}": "Problema com a conexão: {message}",
+  "Check connection…": "Verificar conexão…",
+  "Check connection": "Verificar conexão",
+  "Enter any URL to check connection to:": "Digite qualquer URL para verificar a conexão:",
+  "Check": "Verificar",
+  "HTTP Proxy": "Proxy HTTP",
+  "Proxy host is empty": "O host do proxy está vazio",
+  "Invalid proxy host": "Host de proxy inválido",
+  "Proxy port must be between 1 and 65535": "A porta do proxy deve estar entre 1 e 65535",
+  "Proxy login is empty": "O login do proxy está vazio",
+  "No interpreter": "Nenhum interpretador",
+  "Add New Interpreter…": "Adicionar novo interpretador…",
+  "Interpreter Settings…": "Configurações do interpretador…",
+  "Connection settings for SQL Server.": "Configurações de conexão para o SQL Server.",
+  "ClickHouse settings sent with each HTTP request. connect_timeout is in seconds.": "Configurações do ClickHouse enviadas a cada solicitação HTTP. connect_timeout é em segundos.",
+  "Microsoft SQL Server": "Microsoft SQL Server",
+  "Add to .gitignore": "Adicionar ao .gitignore",
+  "Add to .git/info/exclude": "Adicionar ao .git/info/exclude",
+  "Delete Agent Tasks": "Excluir tarefas do agente",
+  "Open Agent Task": "Abrir tarefa do agente",
+  "Open Agent Task in Editor": "Abrir tarefa do agente no editor",
+  "Open Agent Task in Tool Window": "Abrir tarefa do agente na janela de ferramentas",
+  "Archive Agent Tasks": "Arquivar tarefas do agente",
+  "Delete {count} agent tasks? Their branches and files outside worktrees are kept.": "Excluir {count} tarefas do agente? Seus branches e arquivos fora dos worktrees serão mantidos.",
+  "Also remove their worktree folders": "Também remover suas pastas de worktree",
+  "Cannot delete agent tasks": "Não é possível excluir as tarefas do agente",
+  "Cannot archive agent tasks": "Não é possível arquivar as tarefas do agente",
+  "Archive ({count})": "Arquivar ({count})",
+  "Delete ({count})…": "Excluir ({count})…",
+  "Run pytest tests": "Executar testes do pytest",
+  "e.g. pytest, uv, poetry, .venv/bin/pytest, python": "por exemplo, pytest, uv, poetry, .venv/bin/pytest, python",
+  "Runner arguments": "Argumentos do executor",
+  "e.g. `run pytest` for uv/poetry, `-m pytest` for python; empty calls the command itself": "por exemplo, `run pytest` para uv/poetry, `-m pytest` para python; vazio chama o próprio comando",
+  "Target": "Destino",
+  "Directory, file or test id; empty runs the whole suite": "Diretório, arquivo ou ID de teste; vazio executa toda a suíte",
+  "pytest options": "Opções do pytest",
+  "e.g. -x -q --tb=short": "por exemplo, -x -q --tb=short",
+  "Ruby": "Ruby",
+  "Run a Ruby script": "Executar um script Ruby",
+  "Ruby script": "Script Ruby",
+  "e.g. bin/rails or lib/app.rb": "por exemplo, bin/rails ou lib/app.rb",
+  "Script arguments": "Argumentos do script",
+  "e.g. server -p 3000": "por exemplo, server -p 3000",
+  "Ruby arguments": "Argumentos do Ruby",
+  "e.g. -Ilib -w": "por exemplo, -Ilib -w",
+  "Run with Bundler (bundle exec)": "Executar com Bundler (bundle exec)",
+  "Launcher": "Inicializador",
+  "Path of the tool (bundle when run with Bundler); empty uses the interpreter from Settings › Ruby": "Caminho da ferramenta (bundle quando executado com Bundler); vazio usa o interpretador de Configurações › Ruby",
+  "Rake": "Rake",
+  "Run a Rake task": "Executar uma tarefa Rake",
+  "Task name with arguments, e.g. db:migrate or test TEST=test/a_test.rb; empty runs the default task": "Nome da tarefa com argumentos, por exemplo, db:migrate ou test TEST=test/a_test.rb; vazio executa a tarefa padrão",
+  "Rake options": "Opções do Rake",
+  "e.g. --trace": "por exemplo, --trace",
+  "RSpec": "RSpec",
+  "Run RSpec examples": "Executar exemplos do RSpec",
+  "e.g. spec": "por exemplo, spec",
+  "Directory, file or file:line; empty runs the whole suite": "Diretório, arquivo ou arquivo:linha; vazio executa toda a suíte",
+  "RSpec options": "Opções do RSpec",
+  "e.g. --format documentation --fail-fast": "por exemplo, --format documentation --fail-fast",
+  "Ruby interpreter": "Interpretador Ruby",
+  "Runs the ruby, rake and rspec configurations and lists the standard library and gems under External Libraries. Installs from rbenv, rvm, chruby, mise and asdf are detected.": "Executa as configurações do ruby, rake e rspec e lista a biblioteca padrão e as gems em Bibliotecas Externas. Instalações do rbenv, rvm, chruby, mise e asdf são detectadas.",
+  "Monospaced": "Monoespaçada",
+  "Proportional": "Proporcional",
+  "Loading system fonts…": "Carregando fontes do sistema…",
+  "Refresh system fonts": "Atualizar fontes do sistema",
+  "No matching fonts. Enter a family name manually.": "Nenhuma fonte correspondente. Digite um nome de família manualmente.",
+  "This name was not found on this desktop. The saved preference is kept.": "Este nome não foi encontrado neste computador. A preferência salva é mantida.",
+  "No system fonts were returned. Bundled fonts and manual input are available.": "Nenhuma fonte do sistema foi retornada. Fontes integradas e entrada manual estão disponíveis.",
+  "Type a family name or search installed fonts.": "Digite um nome de família ou pesquise fontes instaladas.",
+  "Add Code Cell": "Adicionar célula de código",
+  "Add Markdown Cell": "Adicionar célula Markdown",
+  "Cell": "Célula",
+  "Cell outputs": "Saídas da célula",
+  "Cell type": "Tipo de célula",
+  "Delete Cell": "Excluir célula",
+  "Discard Changes and Reload": "Descartar alterações e recarregar",
+  "Discard all unsaved notebook changes and stop execution? This cannot be undone.": "Descartar todas as alterações não salvas do notebook e interromper a execução? Isso não pode ser desfeito.",
+  "Edit Markdown": "Editar Markdown",
+  "Inert JavaScript source": "Código-fonte JavaScript inerte",
+  "Insert Code Cell Below": "Inserir célula de código abaixo",
+  "Install ipykernel in the selected Python environment, then restart the kernel. No packages are installed automatically.": "Instale o ipykernel no ambiente Python selecionado e depois reinicie o kernel. Nenhum pacote é instalado automaticamente.",
+  "Interrupt Kernel": "Interromper kernel",
+  "JavaScript output is inert. Interactive widgets are not supported.": "A saída JavaScript é inerte. Widgets interativos não são suportados.",
+  "Loading notebook…": "Carregando notebook…",
+  "Markdown cell source": "Código-fonte da célula Markdown",
+  "Move Cell Down": "Mover célula para baixo",
+  "Move Cell Up": "Mover célula para cima",
+  "Notebook Python interpreter": "Interpretador Python do notebook",
+  "Notebook editing and execution require the desktop app.": "A edição e a execução do notebook exigem o aplicativo de desktop.",
+  "Notebook image output": "Saída de imagem do notebook",
+  "Notebook path is missing": "O caminho do notebook está ausente",
+  "Notebook toolbar": "Barra de ferramentas do notebook",
+  "Notebook unavailable": "Notebook indisponível",
+  "Output preview truncated; full output is retained in the notebook.": "Prévia da saída truncada; a saída completa é mantida no notebook.",
+  "Preview Markdown": "Visualizar Markdown",
+  "Python cell source": "Código-fonte da célula Python",
+  "Raw": "Bruto",
+  "Raw or unknown cell; original content is preserved read-only.": "Célula bruta ou desconhecida; o conteúdo original é preservado como somente leitura.",
+  "Redo": "Refazer",
+  "Refresh Python interpreters": "Atualizar interpretadores Python",
+  "Reload Notebook from Disk": "Recarregar notebook do disco",
+  "Restart Kernel": "Reiniciar kernel",
+  "Retry Pending Edits": "Tentar novamente edições pendentes",
+  "Run All": "Executar tudo",
+  "Run Cell": "Executar célula",
+  "Select Python interpreter": "Selecionar interpretador Python",
+  "Static notebook HTML output": "Saída HTML estática do notebook",
+  "This notebook has no cells": "Este notebook não tem células",
+  "Uncommitted source edits": "Edições de código-fonte não confirmadas",
+  "Unsupported output MIME type; original data is preserved.": "Tipo MIME de saída não suportado; os dados originais são preservados.",
+  "Unsupported output type; original data is preserved.": "Tipo de saída não suportado; os dados originais são preservados.",
+  "busy": "ocupado",
+  "dead": "encerrado",
+  "idle": "ocioso",
+  "starting": "iniciando",
+  "Gradle JVM": "JVM do Gradle",
+  "Distribution": "Distribuição",
+  "Gradle wrapper": "Gradle wrapper",
+  "Local installation": "Instalação local",
+  "Gradle home": "Gradle home",
+  "Gradle user home": "Diretório de usuário do Gradle",
+  "Gradle installation directory": "Diretório de instalação do Gradle",
+  "Select Gradle Home Directory": "Selecionar o diretório inicial do Gradle",
+  "Select Gradle User Home Directory": "Selecionar o diretório de usuário do Gradle",
+  "JDK used for Gradle sync, tasks, run configurations and tests. An explicit JAVA_HOME in a run configuration takes precedence.": "JDK usado para sincronização, tarefas, configurações de execução e testes do Gradle. Um JAVA_HOME explícito em uma configuração de execução tem precedência.",
+  "Uses the Gradle wrapper when present, otherwise the project-pinned mise/asdf Gradle, then Gradle on PATH.": "Usa o Gradle wrapper quando presente, caso contrário o Gradle do mise/asdf fixado no projeto, depois o Gradle no PATH.",
+  "Uses bin/gradle (bin/gradle.bat on Windows) instead of the wrapper or pinned toolchain.": "Usa bin/gradle (bin/gradle.bat no Windows) em vez do wrapper ou da toolchain fixada.",
+  "Sets GRADLE_USER_HOME. Empty uses Gradle's default.": "Define GRADLE_USER_HOME. Vazio usa o padrão do Gradle.",
+  "Passwords": "Senhas",
+  "Credentials the IDE answers git's HTTPS prompts with. Saved after a successful fetch / pull / push when \"Remember for this host\" was checked.": "Credenciais com as quais a IDE responde aos prompts HTTPS do git. Salvas após um fetch / pull / push bem-sucedido quando \"Lembrar para este host\" estava marcado.",
+  "No saved credentials": "Nenhuma credencial salva",
+  "Credentials the IDE answers git's HTTPS prompts with, stored in the app's own secret file (not git's credential.helper). A rejected credential is forgotten automatically.": "Credenciais com as quais a IDE responde aos prompts HTTPS do git, armazenadas no próprio arquivo secreto do aplicativo (não no credential.helper do git). Uma credencial rejeitada é esquecida automaticamente.",
+  "Saved git credentials": "Credenciais do git salvas",
+  "Forget": "Esquecer",
+  "Remember for this host": "Lembrar para este host",
+  "Unarchive Task": "Desarquivar tarefa",
+  "This task is archived. Unarchive it to continue the conversation.": "Esta tarefa está arquivada. Desarquive-a para continuar a conversa.",
+  "Unarchive": "Desarquivar",
+  "Unarchive Agent Tasks": "Desarquivar tarefas do agente",
+  "Cannot unarchive agent tasks": "Não é possível desarquivar as tarefas do agente",
+  "Unarchive ({archived})": "Desarquivar ({archived})",
+  "New Workspace…": "Novo espaço de trabalho…",
+  "New Workspace": "Novo espaço de trabalho",
+  "Open Workspace…": "Abrir espaço de trabalho…",
+  "Open Workspace": "Abrir espaço de trabalho",
+  "Manage Workspace…": "Gerenciar espaço de trabalho…",
+  "Manage Workspace": "Gerenciar espaço de trabalho",
+  "Merge All Project Windows": "Mesclar todas as janelas do projeto",
+  "Move Tab to New Window": "Mover aba para nova janela",
+  "Next Project Tab": "Próxima aba do projeto",
+  "Previous Project Tab": "Aba anterior do projeto",
+  "Project windows": "Janelas do projeto",
+  "Linked projects": "Projetos vinculados",
+  "Workspace name": "Nome do espaço de trabalho",
+  "Workspace location": "Local do espaço de trabalho",
+  "Workspace Location": "Local do espaço de trabalho",
+  "Choose workspace location": "Escolher local do espaço de trabalho",
+  "Add Projects": "Adicionar projetos",
+  "Add Projects…": "Adicionar projetos…",
+  "Project folder path": "Caminho da pasta do projeto",
+  "Add the projects you want to work on together.": "Adicione os projetos nos quais você deseja trabalhar juntos.",
+  "Project folders stay in place. Removing a project here keeps its files.": "As pastas do projeto permanecem no lugar. Remover um projeto aqui mantém seus arquivos.",
+  "Window group": "Grupo de janelas",
+  "Select Project Tab": "Selecionar aba do projeto",
+  "Close Project Tab": "Fechar aba do projeto",
+  "Close Other Project Tabs": "Fechar outras abas do projeto",
+  "Close Project Tabs to the Left": "Fechar abas do projeto à esquerda",
+  "Close Project Tabs to the Right": "Fechar abas do projeto à direita",
+  "Reorder Project Tabs": "Reordenar abas do projeto",
+  "Close {name}": "Fechar {name}",
+  "Tomcat Server": "Servidor Tomcat",
+  "Run a WAR application in a local Tomcat server": "Executar um aplicativo WAR em um servidor Tomcat local",
+  "Tomcat installation directory": "Diretório de instalação do Tomcat",
+  "Project WAR artifact (exploded)": "Artefato WAR do projeto (exploded)",
+  "WAR file": "Arquivo WAR",
+  "Exploded directory": "Diretório exploded",
+  "Context path": "Context path",
+  "Enter / or a context path such as /app": "Digite / ou um caminho de contexto como /app",
+  "HTTP port": "Porta HTTP",
+  "JRE": "JRE",
+  "Java installation directory; empty uses the project JDK": "Diretório de instalação do Java; vazio usa o JDK do projeto",
+  "Open browser after launch": "Abrir navegador após inicialização",
+  "Browser URL": "URL do navegador",
+  "Server URL from the HTTP port and context path": "URL do servidor a partir da porta HTTP e do caminho de contexto",
+  "Enter an HTTP or HTTPS URL": "Digite uma URL HTTP ou HTTPS",
+  "Before launch: build the artifact": "Antes de iniciar: compilar o artefato",
+  "WAR artifact": "Artefato WAR",
+  "Choose a WAR module": "Escolha um módulo WAR",
+  "No WAR modules found. Choose a WAR file or an exploded directory.": "Nenhum módulo WAR encontrado. Escolha um arquivo WAR ou um diretório exploded.",
+  "Invalid Tomcat installation: check bin/catalina and lib/catalina.jar": "Instalação inválida do Tomcat: verifique bin/catalina e lib/catalina.jar",
+  "Update Application": "Atualizar aplicativo",
+  "Update resources": "Atualizar recursos",
+  "Update classes and resources": "Atualizar classes e recursos",
+  "Redeploy": "Reimplantar",
+  "Restart server": "Reiniciar servidor",
+  "Application updated": "Aplicativo atualizado",
+  "Application update failed": "Falha na atualização do aplicativo",
+  "Tomcat Local requires the local machine": "Tomcat Local requer a máquina local",
+  "/artifact-name": "/artifact-name",
+  "Choose a WAR artifact": "Escolha um artefato WAR",
+  "Choose a Maven WAR module": "Escolha um módulo WAR do Maven",
+  "Choose a Gradle WAR module": "Escolha um módulo WAR do Gradle",
+  "Build the selected WAR artifact before launching Tomcat": "Compilar o artefato WAR selecionado antes de iniciar o Tomcat",
+  "Build the WAR artifact before launching Tomcat": "Compilar o artefato WAR antes de iniciar o Tomcat",
+  "The built WAR artifact does not exist: {path}": "O artefato WAR compilado não existe: {path}",
+  "Cannot resolve Maven WAR artifact: {details}": "Não é possível resolver o artefato WAR do Maven: {details}",
+  "Choose a WAR file or exploded directory": "Escolha um arquivo WAR ou diretório exploded",
+  "Invalid Tomcat deployment: {path}": "Implantação inválida do Tomcat: {path}",
+  "Unknown Tomcat deployment type": "Tipo de implantação do Tomcat desconhecido",
+  "Choose a Tomcat installation directory": "Escolha um diretório de instalação do Tomcat",
+  "HTTP port must be between 1 and 65535": "A porta HTTP deve estar entre 1 e 65535",
+  "Unknown Tomcat update operation": "Operação de atualização do Tomcat desconhecida",
+  "Start this Tomcat configuration before updating it": "Inicie esta configuração do Tomcat antes de atualizá-la",
+  "This Tomcat configuration is already running": "Esta configuração do Tomcat já está em execução",
+  "Tomcat server.xml has no HTTP connector": "O server.xml do Tomcat não possui um conector HTTP",
+  "WAR contains an invalid path": "O WAR contém um caminho inválido",
+  "Context path must start with / and contain only letters, digits, /, - or _": "O caminho de contexto deve começar com / e conter apenas letras, dígitos, /, - ou _",
+  "Tomcat home must contain bin/catalina.sh or bin/catalina.bat and lib/catalina.jar": "O diretório inicial do Tomcat deve conter bin/catalina.sh ou bin/catalina.bat e lib/catalina.jar",
+  "Can't rename '{name}' based on syntax: only local variables can be renamed this way": "Não é possível renomear '{name}' com base na sintaxe: apenas variáveis locais podem ser renomeadas dessa forma",
+  "Returns true when the value is falsey or the variable does not exist. Checking an undefined variable does not emit a warning.": "Retorna true quando o valor é falsey ou a variável não existe. Verificar uma variável indefinida não emite um aviso.",
+  "Returns true only when every supplied variable exists and is not null. Checks stop at the first unset or null variable.": "Retorna true apenas quando todas as variáveis fornecidas existem e não são nulas. As verificações param na primeira variável não definida ou nula.",
+  "Cannot save service order": "Não é possível salvar a ordem dos serviços",
+  "The order will be kept for this session only.": "A ordem será mantida apenas para esta sessão.",
+  "View Timeline": "Exibir linha do tempo",
+  "View in browser": "Exibir no navegador",
+  "Refresh Pull Requests List": "Atualizar lista de pull requests",
+  "Change Repository or Account…": "Alterar repositório ou conta…",
+  "Select Opened Pull Request": "Selecionar pull request aberta",
+  "View Pull Request": "Exibir pull request",
+  "View pull request information and timeline": "Exibir informações e linha do tempo da pull request",
+  "View pull request timeline": "Exibir linha do tempo da pull request",
+  "Refresh Pull Request": "Atualizar pull request",
+  "Refresh Timeline": "Atualizar linha do tempo",
+  "Check for new timeline events": "Verificar novos eventos na linha do tempo",
+  "View Pull Request in Browser": "Exibir pull request no navegador",
+  "Copy Pull Request URL": "Copiar URL da pull request",
+  "Checkout Branch": "Fazer checkout da branch",
+  "Fetch and checkout the pull request branch": "Fazer fetch e checkout da branch da pull request",
+  "Open in Worktree": "Abrir em worktree",
+  "Fetch and open the pull request branch in a Git worktree": "Fazer fetch e abrir a branch da pull request em um worktree do Git",
+  "Delete the merged branch on GitHub": "Excluir a branch mesclada no GitHub",
+  "Submit Review…": "Enviar revisão…",
+  "Toggle viewed/not viewed state": "Alternar estado visualizado/não visualizado",
+  "Toggle viewed/not viewed state for the selection or file": "Alternar estado visualizado/não visualizado para a seleção ou arquivo",
+  "Show Pull Request in the Tool Window": "Exibir pull request na janela de ferramentas",
+  "Update to Enable Review Mode…": "Atualizar para ativar o modo de revisão…",
+  "Review Mode": "Modo de revisão",
+  "Can't load pull requests": "Não é possível carregar as pull requests",
+  "Connect the Pull Requests tool window to this repository to see the timeline": "Conecte a janela de ferramentas Pull Requests a este repositório para ver a linha do tempo",
+  "Pull request tabs": "Abas de pull request",
+  "New Pull Request at {repo}": "Nova pull request em {repo}",
+  "Something went wrong": "Algo deu errado",
+  "Merge commit message:": "Mensagem do commit de mesclagem:",
+  "Merge commit message": "Mensagem do commit de mesclagem",
+  "1 minute ago": "há 1 minuto",
+  "1 hour ago": "há 1 hora",
+  "{n} hours ago": "há {n} horas",
+  "{n} days ago": "há {n} dias",
+  "yesterday": "ontem",
+  "Today": "Hoje",
+  "Yesterday": "Ontem",
+  "Select pull request base and head to view changes": "Selecione base e head da pull request para ver as alterações",
+  "Failed to load commits": "Falha ao carregar commits",
+  "Pull request does not contain any commits": "A pull request não contém nenhum commit",
+  "Changes from": "Alterações de",
+  "Next Commit": "Próximo commit",
+  "Previous Commit": "Commit anterior",
+  "Search commits": "Pesquisar commits",
+  "Hide details": "Ocultar detalhes",
+  "Failed to load changes": "Falha ao carregar alterações",
+  "Commit does not contain any changes": "O commit não contém nenhuma alteração",
+  "Checking pull request branches": "Verificando branches da pull request",
+  "Failed to check pull request branches": "Falha ao verificar as branches da pull request",
+  "Pull request already exists": "A pull request já existe",
+  "No changes between '{base}' and '{head}'": "Nenhuma alteração entre '{base}' e '{head}'",
+  "Pushing a pull request branch": "Fazendo push da branch da pull request",
+  "Creating a pull request": "Criando uma pull request",
+  "Updating pull request fields": "Atualizando campos da pull request",
+  "Failed to create a pull request": "Falha ao criar pull request",
+  "Create Draft Pull Request": "Criar rascunho de pull request",
+  "More create options": "Mais opções de criação",
+  "Create options": "Opções de criação",
+  "Head branch": "Branch de head",
+  "Repository:": "Repositório:",
+  "Head repository": "Repositório de head",
+  "Reviewers:": "Revisores:",
+  "No reviewers": "Nenhum revisor",
+  "Assignees:": "Responsáveis:",
+  "Unassigned": "Não atribuído",
+  "Assignees": "Responsáveis",
+  "Labels:": "Etiquetas:",
+  "No labels": "Nenhuma etiqueta",
+  "Labels": "Etiquetas",
+  "New Remote Branch for Pull Request": "Nova branch remota para pull request",
+  "Remote branch name:": "Nome da branch remota:",
+  "Remote branch name": "Nome da branch remota",
+  "Your changes will be pushed to the remote repository to create the pull request": "Suas alterações serão enviadas (push) para o repositório remoto para criar a pull request",
+  "Unrelated branches {baseName} {headBranch}": "Branches sem relação {baseName} {headBranch}",
+  "Push failed: {error}": "Falha no push: {error}",
+  "Checkout as detached HEAD": "Fazer checkout como HEAD desanexada",
+  "Show in Git Log": "Mostrar no Git Log",
+  "Copy Branch Name": "Copiar nome da branch",
+  "Remote branches are not available for private forks": "Branches remotas não estão disponíveis para forks privados",
+  "Show Diff in a New Tab or Window": "Exibir diff em uma nova aba ou janela",
+  "Pull request does not contain any changes": "A pull request não contém nenhuma alteração",
+  "Mark as Viewed": "Marcar como visualizado",
+  "Mark as Not Viewed": "Marcar como não visualizado",
+  "Mark All as Viewed": "Marcar tudo como visualizado",
+  "Mark All as Not Viewed": "Marcar tudo como não visualizado",
+  "{count} commit": "{count} commit",
+  "{count} commits": "{count} commits",
+  "1 commit": "1 commit",
+  "All commits ({count})": "Todos os commits ({count})",
+  "Can't load changes": "Não é possível carregar as alterações",
+  "Reopen Pull Request": "Reabrir pull request",
+  "Post Pull Request": "Publicar pull request",
+  "Request Review…": "Solicitar revisão…",
+  "Re-request Review…": "Solicitar revisão novamente…",
+  "Merge Review…": "Mesclar revisão…",
+  "Squash and Merge…": "Fazer squash e mesclar…",
+  "Close Pull Request": "Fechar pull request",
+  "Submit Review ({count})…": "Enviar revisão ({count})…",
+  "Set Myself as Reviewer": "Definir a mim mesmo como revisor",
+  "More merge options": "Mais opções de mesclagem",
+  "Loading pull request status": "Carregando status da pull request",
+  "At least {count} approving review is required by reviewers with write access": "É necessária pelo menos {count} revisão com aprovação de revisores com acesso de gravação",
+  "You are not authorized to merge request into this branch": "Você não está autorizado a mesclar a solicitação nesta branch",
+  "Missing reviewer": "Revisor ausente",
+  "Details…": "Detalhes…",
+  "Checking branch for conflicts": "Verificando conflitos na branch",
+  "Branch has conflicts that must be resolved": "A branch contém conflitos que devem ser resolvidos",
+  "Resolve": "Resolver",
+  "Re-request Review from {name}": "Solicitar revisão novamente de {name}",
+  "Remove {name} from reviewers": "Remover {name} dos revisores",
+  "Discard Pending Review": "Descartar revisão pendente",
+  "Are you sure you want to delete all pending comments?": "Tem certeza de que deseja excluir todos os comentários pendentes?",
+  "Submit Review": "Enviar revisão",
+  "{count} pending comment": "{count} comentário pendente",
+  "{count} pending comments": "{count} comentários pendentes",
+  "Discard pending comments": "Descartar comentários pendentes",
+  "Failed to submit review": "Falha ao enviar revisão",
+  "Approve": "Aprovar",
+  "Request Changes": "Solicitar alterações",
+  "Submit general feedback without explicit approval": "Enviar feedback geral sem aprovação explícita",
+  "Pull request action failed": "Falha na ação da pull request",
+  "Adjusting reviewers…": "Ajustando revisores…",
+  "Merge Review": "Mesclar revisão",
+  "Squash and Merge Review": "Fazer squash e mesclar revisão",
+  "All required checks have passed": "Todas as verificações obrigatórias foram aprovadas",
+  "Checks in progress, and some already failed…": "Verificações em andamento, e algumas já falharam…",
+  "Checks in progress…": "Verificações em andamento…",
+  "Checks failed": "As verificações falharam",
+  "{name} approved review": "{name} aprovou a revisão",
+  "{name} is waiting for updates": "{name} está aguardando atualizações",
+  "Waiting for review from {name}": "Aguardando revisão de {name}",
+  "Re-requested review from {name}": "Revisão solicitada novamente de {name}",
+  "{name} left comments": "{name} deixou comentários",
+  "{side} repository not found": "Repositório {side} não encontrado",
+  "{side} remote not found: {url}": "Remoto {side} não encontrado: {url}",
+  "Merge is already in progress": "A mesclagem já está em andamento",
+  "Details have not finished loading": "O carregamento dos detalhes ainda não terminou",
+  "Already resolved locally, push your changes to resolve": "Já resolvido localmente, envie (push) suas alterações para resolver",
+  "Repository access required to manage pull requests": "Acesso ao repositório é necessário para gerenciar pull requests",
+  "Repository write access required to merge pull requests": "Acesso de gravação ao repositório é necessário para mesclar pull requests",
+  "Merging is disabled for this project": "A mesclagem está desativada para este projeto",
+  "Refresh List": "Atualizar lista",
+  "No pull requests in {name}": "Nenhuma pull request em {name}",
+  "No pull requests matching filters": "Nenhuma pull request correspondente aos filtros",
+  "Clear filters": "Limpar filtros",
+  "Pull request cannot be merged": "A pull request não pode ser mesclada",
+  "Quick Filters": "Filtros rápidos",
+  "Clear {count} Filters": "Limpar {count} filtros",
+  "Reset {name}": "Redefinir {name}",
+  "Assignee": "Responsável",
+  "Label": "Etiqueta",
+  "Reviewer": "Revisor",
+  "Your pull requests": "Suas pull requests",
+  "Assigned to you": "Atribuídas a você",
+  "Review requests": "Solicitações de revisão",
+  "Closed": "Fechadas",
+  "Merged": "Mescladas",
+  "Approved review": "Revisão aprovada",
+  "Reviewed": "Revisadas",
+  "Reviewed by you": "Revisadas por você",
+  "Not reviewed": "Não revisadas",
+  "Not reviewed by you": "Não revisadas por você",
+  "Awaiting review": "Aguardando revisão",
+  "Awaiting review from you": "Aguardando sua revisão",
+  "Newest": "Mais recentes",
+  "Oldest": "Mais antigas",
+  "Most commented": "Mais comentadas",
+  "Least commented": "Menos comentadas",
+  "Recently updated": "Atualizadas recentemente",
+  "Least recently updated": "Atualizadas há mais tempo",
+  "No unresolved comments": "Nenhum comentário não resolvido",
+  "{count} unresolved comment": "{count} comentário não resolvido",
+  "{count} unresolved comments": "{count} comentários não resolvidos",
+  "{id} · created {date}, by {author}": "{id} · criada em {date}, por {author}",
+  "{id} · created {date}": "{id} · criada em {date}",
+  "Can't load pull request details": "Não é possível carregar os detalhes da pull request",
+  "Can't load timeline items": "Não é possível carregar os itens da linha do tempo",
+  "{submitShortcut} to comment": "{submitShortcut} para comentar",
+  "Pull Request Successfully Merged": "Pull request mesclada com sucesso",
+  "You can now {delete} {branch}.": "Agora você pode {delete} {branch}.",
+  "delete": "excluir",
+  "{branch} has been deleted. {restore}": "{branch} foi excluída. {restore}",
+  "Restore…": "Restaurar…",
+  "{newLineShortcut} to add new line": "{newLineShortcut} para adicionar nova linha",
+  "Mentions": "Menções",
+  "Delete Comment": "Excluir comentário",
+  "Are you sure you want to delete this comment?": "Tem certeza de que deseja excluir este comentário?",
+  "{submitShortcut} to save changes": "{submitShortcut} para salvar alterações",
+  "Add reaction": "Adicionar reação",
+  "{users} reacted with '{name}' emoji": "{users} reagiu com o emoji '{name}'",
+  "Suggested change": "Alteração sugerida",
+  "Apply Locally": "Aplicar localmente",
+  "{submitShortcut} to reply": "{submitShortcut} para responder",
+  "Could not load diff hunk for thread": "Não foi possível carregar o bloco de diff da conversa",
+  "Reply": "Responder",
+  "{n} reply": "{n} resposta",
+  "{n} replies": "{n} respostas",
+  "{hidden} more replies": "mais {hidden} respostas",
+  "Committing suggested change": "Fazendo commit da alteração sugerida",
+  "Applying suggested change": "Aplicando alteração sugerida",
+  "Conflicts in {files}": "Conflitos em {files}",
+  "{path}: nothing to commit": "{path}: nada a commitar",
+  "Resolving thread": "Resolvendo conversa",
+  "added labels {added} and removed labels {removed}": "adicionou as etiquetas {added} e removeu as etiquetas {removed}",
+  "added labels {labels}": "adicionou as etiquetas {labels}",
+  "removed labels {labels}": "removeu as etiquetas {labels}",
+  "assigned {assigned} and unassigned {unassigned}": "atribuiu a {assigned} e removeu a atribuição de {unassigned}",
+  "assigned {users}": "atribuiu a {users}",
+  "unassigned {users}": "removeu a atribuição de {users}",
+  "requested a review from {added} and removed review request from {removed}": "solicitou uma revisão de {added} e removeu a solicitação de revisão de {removed}",
+  "requested a review from {reviewers}": "solicitou uma revisão de {reviewers}",
+  "removed review request from {reviewers}": "removeu a solicitação de revisão de {reviewers}",
+  "renamed this pull request from '{from}' to '{to}'": "renomeou esta pull request de '{from}' para '{to}'",
+  "closed this": "fechou isto",
+  "reopened this": "reabriu isto",
+  "merged commit {commit} into {branch}": "mesclou o commit {commit} em {branch}",
+  "merged this": "mesclou isto",
+  "changed the base branch": "alterou a branch base",
+  "force-pushed the {branch} branch": "fez push forçado na branch {branch}",
+  "deleted the {branch} branch": "excluiu a branch {branch}",
+  "restored head branch": "restaurou a branch head",
+  "dismissed {login}'s stale review": "descartou a revisão desatualizada de {login}",
+  "marked this pull request as ready for review": "marcou esta pull request como pronta para revisão",
+  "marked this pull request as draft": "marcou esta pull request como rascunho",
+  "mentioned this pull request": "mencionou esta pull request",
+  "linked an issue that may be closed by this": "vinculou uma issue que pode ser fechada por isto",
+  "removed a link to an issue": "removeu o vínculo a uma issue",
+  "added a commit to this pull request": "adicionou um commit a esta pull request",
+  "added {n} commits to this pull request": "adicionou {n} commits a esta pull request",
+  "Cannot display item - {type}": "Não é possível exibir o item - {type}",
+  "approved the changes": "aprovou as alterações",
+  "started a review": "iniciou uma revisão",
+  "reviewed the changes": "revisou as alterações",
+  "No description provided": "Nenhuma descrição fornecida",
+  "Save Changes": "Salvar alterações",
+  "Unresolve": "Reabrir conversa",
+  "Outdated suggestions cannot be applied": "Sugestões desatualizadas não podem ser aplicadas",
+  "This suggestion has been resolved": "Esta sugestão foi resolvida",
+  "Unable to apply the suggested change from a pull request in a different branch": "Não foi possível aplicar a alteração sugerida de uma pull request em uma branch diferente",
+  "Add Review Comment": "Adicionar comentário de revisão",
+  "Add Multiline Review Comment": "Adicionar comentário de revisão multilinha",
+  "Previous Comment": "Comentário anterior",
+  "Next Comment": "Próximo comentário",
+  "Refresh Review Data": "Atualizar dados da revisão",
+  "Automatically mark opened files as viewed": "Marcar arquivos abertos como visualizados automaticamente",
+  "Discard Comment": "Descartar comentário",
+  "Are you sure you want to discard the unsaved comment?": "Tem certeza de que deseja descartar o comentário não salvo?",
+  "Create a new code review comment on the line under the caret": "Criar um novo comentário de revisão de código na linha sob o cursor",
+  "Create a new code review comment on the selected lines": "Criar um novo comentário de revisão de código nas linhas selecionadas",
+  "Go to previous visible comment": "Ir para o comentário visível anterior",
+  "Go to next visible comment": "Ir para o próximo comentário visível",
+  "Unresolved Only": "Apenas não resolvidos",
+  "Do Not Show": "Não mostrar",
+  "Show Review Threads": "Mostrar threads de revisão",
+  "Mark File as Viewed": "Marcar arquivo como visualizado",
+  "Mark File as Not Viewed": "Marcar arquivo como não visualizado",
+  "Leave a comment": "Deixar um comentário",
+  "Discard a comment": "Descartar um comentário",
+  "Start Review": "Iniciar revisão",
+  "Add Single Comment": "Adicionar comentário único",
+  "Drag to select several lines for commenting": "Arraste para selecionar várias linhas para comentar",
+  "The range of this comment is not adjustable as it contains suggestion": "O intervalo deste comentário não pode ser ajustado pois contém uma sugestão",
+  "Comment range cannot be adjusted while reviewing a single commit": "O intervalo do comentário não pode ser ajustado ao revisar um único commit",
+  "Update Branch to Enable Review Mode…": "Atualizar branch para ativar o modo de revisão…",
+  "Disable Review Mode": "Desativar modo de revisão",
+  "Show Unresolved Comments Only": "Mostrar apenas comentários não resolvidos",
+  "Show All Comments": "Mostrar todos os comentários",
+  "Configure review mode": "Configurar modo de revisão",
+  "In Review Mode, you can see review comments and proposed changes right in the editor": "No modo de revisão, você pode ver comentários de revisão e alterações propostas diretamente no editor",
+  "Pull request #{n} exists for current branch {branch}, but local branch is out of sync with remote": "O pull request #{n} existe para a branch atual {branch}, mas a branch local está dessincronizada com o remoto",
+  "Loading changes for pull request #{n}": "Carregando alterações do pull request #{n}",
+  "Pull request #{n} exists for current branch {branch}, but pull request details loading failed": "O pull request #{n} existe para a branch atual {branch}, mas o carregamento dos detalhes do pull request falhou",
+  "Pull request #{n} exists for current branch {branch}": "O pull request #{n} existe para a branch atual {branch}",
+  "Show Review Diff": "Mostrar diff da revisão",
+  "Pull Request branch update failed": "Falha na atualização da branch do pull request",
+  "#{n} on {branch}": "#{n} em {branch}",
+  "Markdown Images": "Imagens Markdown",
+  "Preview font size": "Tamanho da fonte da pré-visualização",
+  "Also used by Markdown cells in Jupyter notebooks. Defaults to the editor font size, independent of the UI font size.": "Também usado por células Markdown em notebooks Jupyter. O padrão é o tamanho da fonte do editor, independente do tamanho da fonte da interface.",
+  "Image folder": "Pasta de imagens",
+  "Relative to the Markdown file.": "Relativo ao arquivo Markdown.",
+  "Image name pattern": "Padrão de nome de imagem",
+  "For clipboard images: {timestamp} becomes YYYYMMDD-HHmmss. Source file names are preserved.": "Para imagens da área de transferência: {timestamp} se torna YYYYMMDD-HHmmss. Os nomes dos arquivos de origem são preservados.",
+  "Image folder must be relative.": "A pasta de imagens deve ser relativa.",
+  "Image exceeds 16 MB.": "A imagem excede 16 MB.",
+  "Cannot insert image": "Não é possível inserir a imagem",
+  "Import Scheme": "Importar esquema",
+  "Export Scheme": "Exportar esquema",
+  "Delete Scheme": "Excluir esquema",
+  "Keep Both": "Manter ambos",
+  "Scheme exported.": "Esquema exportado.",
+  "Invalid .icls color scheme": "Esquema de cores .icls inválido",
+  "IntelliJ Color Scheme": "Esquema de cores do IntelliJ",
+  "A scheme named '{name}' already exists.": "Um esquema chamado '{name}' já existe.",
+  "Applied {applied} values; skipped {skipped} unsupported or invalid values.": "{applied} valores aplicados; {skipped} valores inválidos ou não suportados ignorados.",
+  "Delete color scheme '{name}'?": "Excluir o esquema de cores '{name}'?",
+  "Overwrite": "Sobrescrever",
+  "Open Results in Find Window": "Abrir resultados na janela de localização",
+  "Multiple Cursors": "Múltiplos cursores",
+  "Scroll to Results During Typing": "Rolar até os resultados durante a digitação",
+  "Find options": "Opções de localização",
+  "Occurrences of '{0}'": "Ocorrências de '{0}'",
+  "Shelved base": "Base no Shelf",
+  "Shelved version": "Versão no Shelf",
+  "Local version": "Versão local",
+  "Show Diff in a New Tab": "Mostrar diff em uma nova aba",
+  "Copy as Patch to Clipboard": "Copiar como patch para a área de transferência",
+  "Import Patches…": "Importar patches…",
+  "Import patches": "Importar patches",
+  "Refresh Shelf": "Atualizar Shelf",
+  "Show Shelved Diff": "Mostrar diff do Shelf",
+  "Compare Shelved Changes with Local": "Comparar alterações no Shelf com a versão local",
+  "Create Patch from Shelved Changes…": "Criar patch a partir das alterações no Shelf…",
+  "Build Tags": "Tags de build",
+  "Go Version": "Versão do Go",
+  "Custom Tags": "Tags personalizadas",
+  "Experiments": "Experimentos",
+  "Open a project to configure Go build tags.": "Abra um projeto para configurar as tags de build do Go.",
+  "This Go file is excluded by the current build constraints.": "Este arquivo Go está excluído pelas restrições de build atuais.",
+  "Select one Go test file": "Selecione um arquivo de teste do Go",
+  "Go configuration": "Configuração do Go",
+  "Go Build": "Go Build",
+  "Go Test": "Go Test",
+  "Run kind": "Tipo de execução",
+  "Output directory": "Diretório de saída",
+  "Run after build": "Executar após o build",
+  "Go tool arguments": "Argumentos da ferramenta Go",
+  "Use all custom build tags": "Usar todas as tags de build personalizadas",
+  "Build and run a Go application": "Compilar e executar uma aplicação Go",
+  "Run Go tests": "Executar testes do Go",
+  "Go test file has no directory": "O arquivo de teste do Go não possui diretório",
+  "Go package discovery timed out": "A descoberta de pacotes Go atingiu o tempo limite",
+  "Go package discovery failed: {value}": "Falha na descoberta de pacotes Go: {value}",
+  "Go test file target is missing": "O destino do arquivo de teste Go está ausente",
+  "Go build and run requires the output console": "A compilação e execução do Go requerem o console de saída",
+  "run stopped after build": "execução interrompida após o build",
+  "Go Modules": "Módulos Go",
+  "Enable vendoring support automatically": "Ativar suporte a vendoring automaticamente",
+  "Inherit from environment": "Herdar do ambiente",
+  "Open a project to configure Go modules.": "Abra um projeto para configurar os módulos Go.",
+  "Go Mod Tidy": "Go Mod Tidy",
+  "Download Go Modules": "Baixar módulos Go",
+  "Sync Go Workspace": "Sincronizar espaço de trabalho Go",
+  "Add Directory to Go Workspace…": "Adicionar diretório ao espaço de trabalho Go…",
+  "Add Directory to Go Workspace": "Adicionar diretório ao espaço de trabalho Go",
+  "Module directory": "Diretório do módulo",
+  "Path relative to go.work, or an absolute directory containing go.mod": "Caminho relativo a go.work ou um diretório absoluto contendo go.mod",
+  "Reload External Libraries": "Recarregar bibliotecas externas",
+  "Run Go Generate": "Executar Go Generate",
+  "Go Generate File": "Go Generate no arquivo",
+  "Go Generate Package": "Go Generate no pacote",
+  "Architecture": "Arquitetura",
+  "Compiler": "Compilador",
+  "No CMake executable target for this file": "Nenhum destino executável do CMake para este arquivo",
+  "Run CMake Configure from the Run selector, then choose the executable target. Files in a CMake project are built with their target.": "Execute CMake Configure a partir do seletor de execução e escolha o destino executável. Arquivos em um projeto CMake são compilados com seu destino.",
+  "Cannot check deployment mappings": "Não é possível verificar os mapeamentos de implantação",
+  "No selected paths can be deployed to {server}": "Nenhum caminho selecionado pode ser implantado em {server}",
+  "No deployment server covers the selected paths": "Nenhum servidor de implantação cobre os caminhos selecionados",
+  "Not covered by this server's mappings": "Não coberto pelos mapeamentos deste servidor",
+  "Excluded from deployment": "Excluído da implantação",
+  "No debug output available": "Nenhuma saída de depuração disponível",
+  "The attached process may not provide standard output to the debugger.": "O processo anexado pode não fornecer a saída padrão para o depurador.",
+  "Show in Debug Tool Window": "Mostrar na janela de ferramentas Depurar",
+  "Suspended": "Suspenso",
+  "Usage access filters": "Filtros de acesso de uso",
+  "Show read accesses": "Mostrar acessos de leitura",
+  "Show write accesses": "Mostrar acessos de escrita",
+  "No usages match the access filters": "Nenhum uso corresponde aos filtros de acesso",
+  "On 'Update' action": "Na ação 'Atualizar'",
+  "Show chooser": "Mostrar seletor",
+  "On frame deactivation": "Na desativação da janela",
+  "When all project windows lose focus to another application": "Quando todas as janelas do projeto perderem o foco para outro aplicativo",
+  "Resources updated": "Recursos atualizados",
+  "Classes were compiled. Restart the application to load them, or launch with the debugger to use HotSwap.": "As classes foram compiladas. Reinicie o aplicativo para carregá-las ou inicie com o depurador para usar o HotSwap.",
+  "Application update build failed": "Falha no build de atualização do aplicativo",
+  "The Spring Boot configuration has no main class": "A configuração do Spring Boot não possui classe principal",
+  "Do nothing": "Não fazer nada",
+  "Cannot compare {root} against {label}: {error}": "Não é possível comparar {root} com {label}: {error}",
+  "Compare with Branch or Revision": "Comparar com branch ou revisão",
+  "No changes against {revision} in 1 repository": "Nenhuma alteração em relação a {revision} em 1 repositório",
+  "No changes against {revision} in {repositories} repositories": "Nenhuma alteração em relação a {revision} em {repositories} repositórios",
+  "Open or select a file or folder to compare": "Abra ou selecione um arquivo ou pasta para comparar",
+  "Selection is outside Git repositories": "A seleção está fora dos repositórios Git",
+  "Skipped content outside Git repositories: {skippedLabel}": "Conteúdo fora dos repositórios Git ignorado: {skippedLabel}",
+  "in {length} repositories": "em {length} repositórios",
+  "No repository in the selection has revision {label}": "Nenhum repositório na seleção possui a revisão {label}",
+  "{repoName} has no revision {label}": "{repoName} não possui a revisão {label}",
+  "Waiting for language server…": "Aguardando servidor de linguagem…",
+  "Compare Directories": "Comparar diretórios",
+  "Select two directories to compare": "Selecione dois diretórios para comparar",
+  "Select a directory to compare": "Selecione um diretório para comparar",
+  "Directory path": "Caminho do diretório",
+  "Only on left": "Apenas à esquerda",
+  "Only on right": "Apenas à direita",
+  "Contents differ": "Os conteúdos diferem",
+  "Comparing directories": "Comparando diretórios",
+  "Filter by name": "Filtrar por nome",
+  "Show identical files": "Mostrar arquivos idênticos",
+  "Copy to Left": "Copiar para a esquerda",
+  "Copy to Right": "Copiar para a direita",
+  "Compared files": "Arquivos comparados",
+  "Comparison cancelled": "Comparação cancelada",
+  "No matching differences": "Nenhuma diferença correspondente",
+  "Overwrite files?": "Sobrescrever arquivos?",
+  "Copy to {to} and overwrite existing files?": "Copiar para {to} e sobrescrever os arquivos existentes?",
+  "Left: {left}": "Esquerda: {left}",
+  "Right: {right}": "Direita: {right}",
+  "Compared {compared} of {total} entries": "{compared} de {total} entradas comparadas",
+  "Scanned {scanned} entries": "{scanned} entradas verificadas",
+  "Binary content": "Conteúdo binário",
+  "Binary files cannot be shown as text": "Arquivos binários não podem ser exibidos como texto",
+  "Delete {path}?": "Excluir {path}?",
+  "copy requires an absolute path": "a cópia requer um caminho absoluto",
+  "missing file name": "nome de arquivo ausente",
+  "copy requires absolute paths": "a cópia requer caminhos absolutos",
+  "copy paths must belong to the comparison roots": "os caminhos de cópia devem pertencer às raízes de comparação",
+  "cannot copy overlapping paths": "não é possível copiar caminhos sobrepostos",
+  "cannot copy through a destination symlink": "não é possível copiar por meio de um link simbólico de destino",
+  "expected a relative comparison entry path": "esperava-se um caminho relativo de entrada de comparação",
+  "Agent sessions": "Sessões do agente",
+  "Back to conversation": "Voltar para a conversa",
+  "Conversation location": "Local da conversa",
+  "Chat in Tool Window": "Chat na janela de ferramentas",
+  "Chat in Editor": "Chat no editor",
+  "Agent settings": "Configurações do agente",
+  "Describe a task…": "Descreva uma tarefa…",
+  "Formatting profile": "Perfil de formatação",
+  "Custom Eclipse formatter XML": "XML do formatador Eclipse personalizado",
+  "Eclipse formatter XML": "XML do formatador Eclipse",
+  "Changes take effect after Apply without restarting the Java language server.": "As alterações entram em vigor após Aplicar sem reiniciar o servidor de linguagem Java.",
+  "Absolute or project-relative path. To reload an edited XML file, switch to Default, apply, then select Custom again.": "Caminho absoluto ou relativo ao projeto. Para recarregar um arquivo XML editado, alterne para Padrão, aplique e selecione Personalizado novamente.",
+  "Cannot read Java formatter XML {path}: {error}": "Não é possível ler o XML do formatador Java {path}: {error}",
+  "Java formatter configuration unavailable": "Configuração do formatador Java indisponível",
+  "Choose an Eclipse formatter XML file.": "Escolha um arquivo XML do formatador Eclipse.",
+  "Not a formatter XML file: {path}": "Não é um arquivo XML de formatador: {path}",
+  "CMake profiles": "Perfis do CMake",
+  "CMake profile actions": "Ações do perfil CMake",
+  "No CMake profiles. Click + to add one.": "Nenhum perfil CMake. Clique em + para adicionar um.",
+  "Profile settings": "Configurações do perfil",
+  "Build type": "Tipo de build",
+  "Generator": "Gerador",
+  "CMake arguments": "Argumentos do CMake",
+  "Build directory": "Diretório de build",
+  "Build arguments": "Argumentos de build",
+  "CMake default": "Padrão do CMake",
+  "Quote arguments containing spaces. Build arguments go to cmake --build; use -- before native build tool options.": "Coloque entre aspas argumentos contendo espaços. Argumentos de build vão para cmake --build; use -- antes das opções nativas da ferramenta de build.",
+  "CMake profile {0}": "Perfil CMake {0}",
+  ".NET Project": "Projeto .NET",
+  ".NET project": "Projeto .NET",
+  "Run a .NET project with a launch profile": "Executar um projeto .NET com um perfil de inicialização",
+  "Target framework": "Framework de destino",
+  "Launch profile": "Perfil de inicialização",
+  "Empty disables launch profiles": "Vazio desativa os perfis de inicialização",
+  "Empty uses the launch profile's arguments": "Vazio usa os argumentos do perfil de inicialização",
+  "Application URL": "URL do aplicativo",
+  "Profile environment variables": "Variáveis de ambiente do perfil",
+  "Environment variables below override the profile": "As variáveis de ambiente abaixo substituem as do perfil",
+  "Build .NET project": "Compilar projeto .NET",
+  "Run .NET tests": "Executar testes .NET",
+  "Test arguments": "Argumentos de teste",
+  "netcoredbg is not installed": "O netcoredbg não está instalado",
+  ".NET Project requires the local machine": "O Projeto .NET requer a máquina local",
+  "Select a .NET project": "Selecione um projeto .NET",
+  "Invalid .NET project path": "Caminho de projeto .NET inválido",
+  ".NET launch profile '{profile_name}' is missing or is not a Project profile": "O perfil de inicialização .NET '{profile_name}' está ausente ou não é um perfil de Projeto",
+  ".NET output resolution timed out": "A resolução de saída do .NET atingiu o tempo limite",
+  ".NET build output is missing; run dotnet build before debugging": "A saída de build do .NET está ausente; execute dotnet build antes de depurar",
+  "Cannot paste clipboard media": "Não é possível colar mídia da área de transferência",
+  "Cannot paste this path safely in cmd.exe. Use PowerShell or a POSIX shell.": "Não é possível colar este caminho com segurança no cmd.exe. Use o PowerShell ou um shell POSIX.",
+  "Remote server does not support image paste.": "O servidor remoto não suporta colagem de imagens.",
+  "Clipboard image reading is unavailable.": "A leitura de imagem da área de transferência não está disponível.",
+  "Clipboard media is too large to paste (limit {limit} MB).": "A mídia da área de transferência é grande demais para colar (limite de {limit} MB).",
+  "unsupported clipboard media type": "tipo de mídia da área de transferência não suportado",
+  "Show inline blame for the current line": "Mostrar blame inline para a linha atual",
+  "You, now · Uncommitted changes": "Você, agora · Alterações não commitadas",
+  "now": "agora",
+  "Django tests": "Testes do Django",
+  "Run Django tests with manage.py test": "Executar testes do Django com manage.py test",
+  "e.g. python3, .venv/bin/python, uv, poetry": "ex.: python3, .venv/bin/python, uv, poetry",
+  "e.g. `run python` for uv/poetry; empty calls the interpreter itself": "ex.: `run python` para uv/poetry; vazio chama o próprio interpretador",
+  "App labels, modules or dotted test paths; empty runs every test": "Rótulos de aplicativos, módulos ou caminhos de teste separados por ponto; vazio executa todos os testes",
+  "Settings module": "Módulo de configurações",
+  "Passed as --settings; empty keeps DJANGO_SETTINGS_MODULE or the default in manage.py": "Passado como --settings; vazio mantém DJANGO_SETTINGS_MODULE ou o padrão em manage.py",
+  "e.g. --keepdb --parallel": "ex.: --keepdb --parallel",
+  "Run PHPUnit tests": "Executar testes do PHPUnit",
+  "e.g. vendor/bin/phpunit, phpunit, vendor/bin/pest": "ex.: vendor/bin/phpunit, phpunit, vendor/bin/pest",
+  "Test file or directory; empty runs the suites of the configuration file": "Arquivo ou diretório de teste; vazio executa as suítes do arquivo de configuração",
+  "Passed as --configuration; empty lets PHPUnit find phpunit.xml(.dist)": "Passado como --configuration; vazio deixa o PHPUnit encontrar phpunit.xml(.dist)",
+  "Test filter": "Filtro de teste",
+  "Passed as --filter: a test name or a regular expression": "Passado como --filter: um nome de teste ou uma expressão regular",
+  "PHPUnit options": "Opções do PHPUnit",
+  "e.g. --stop-on-failure --testsuite unit": "ex.: --stop-on-failure --testsuite unit",
+  "CLI Interpreter": "Interpretador CLI",
+  "PHP interpreter": "Interpretador PHP",
+  "Runs PHP scripts, PHPUnit, Composer and artisan, and the PHP-based language servers (phpactor). Its folder is put first on PATH, so vendor/bin/phpunit and other #!/usr/bin/env php scripts use it too.": "Executa scripts PHP, PHPUnit, Composer e artisan, e os servidores de linguagem baseados em PHP (phpactor). Sua pasta é colocada primeiro no PATH, de modo que vendor/bin/phpunit e outros scripts #!/usr/bin/env php também a utilizem.",
+  "Select PHP Interpreter": "Selecionar interpretador PHP",
+  "select files in a git repository to shelve": "selecione arquivos em um repositório git para guardar no Shelf",
+  "select files from a single git repository to shelve": "selecione arquivos de um único repositório git para guardar no Shelf",
+  "External file changes sync may be slow": "A sincronização de alterações externas de arquivos pode ser lenta",
+  "Cannot select Python interpreter": "Não é possível selecionar o interpretador Python",
+  "Python Interpreter: {label}": "Interpretador Python: {label}",
+  "recursive": "recursivo",
+  "Java project import failed": "Falha na importação do projeto Java",
+  "The Java project cannot be imported because these files use a name Windows reserves for devices: {paths}. Delete or rename them, then restart the Java language server.": "O projeto Java não pode ser importado porque estes arquivos usam um nome que o Windows reserva para dispositivos: {paths}. Exclua-os ou renomeie-os e reinicie o servidor de linguagem Java.",
+  "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.": "Este arquivo está fora das pastas fonte do seu módulo Java: apenas erros de sintaxe são relatados, e a navegação e o autocompletar não funcionam.",
+  "This Go file belongs to no package of the workspace: code insight is limited.": "Este arquivo Go não pertence a nenhum pacote do espaço de trabalho: a análise de código é limitada.",
+  "This Rust file is not included in any crate: rust-analyzer can't offer code insight for it.": "Este arquivo Rust não está incluído em nenhuma crate: o rust-analyzer não pode oferecer análise de código para ele.",
+  "Reload Maven Projects": "Recarregar projetos Maven",
+  "Reload Gradle Project": "Recarregar projeto Gradle",
+  "Binary files cannot be resolved in the merge editor.": "Arquivos binários não podem ser resolvidos no editor de mesclagem.",
+  "Accept (hold the modifier key to resolve using this side)": "Aceitar (mantenha a tecla modificadora pressionada para resolver usando este lado)",
+  "Ignore (hold the modifier key to ignore both sides)": "Ignorar (mantenha a tecla modificadora pressionada para ignorar ambos os lados)",
+  "Unresolved Changes": "Alterações não resolvidas",
+  "{remaining} change is unresolved and keeps the base text. Save and mark the file as resolved anyway?": "{remaining} alteração não está resolvida e mantém o texto base. Salvar e marcar o arquivo como resolvido mesmo assim?",
+  "{remaining} changes are unresolved and keep the base text. Save and mark the file as resolved anyway?": "{remaining} alterações não estão resolvidas e mantêm o texto base. Salvar e marcar o arquivo como resolvido mesmo assim?",
+  "Apply Non-Conflicting Changes from the Left Side": "Aplicar alterações sem conflito do lado esquerdo",
+  "Apply All Non-Conflicting Changes": "Aplicar todas as alterações sem conflito",
+  "Apply Non-Conflicting Changes from the Right Side": "Aplicar alterações sem conflito do lado direito",
+  "Automatically Apply Non-Conflicting Changes": "Aplicar alterações sem conflito automaticamente",
+  "Resolve Automatically": "Resolver automaticamente",
+  "Resolve Simple Conflicts": "Resolver conflitos simples",
+  "Revert Conflict Resolution": "Reverter resolução de conflito",
+  "Ignore": "Ignorar",
+  "Accept": "Aceitar",
+  "Resolve Using Yours": "Resolver usando os seus",
+  "Resolve Using Theirs": "Resolver usando os deles",
+  "All changes processed": "Todas as alterações foram processadas",
+  "{pending} change left": "{pending} alteração restante",
+  "{pending} changes left": "{pending} alterações restantes",
+  "Compare Contents": "Comparar conteúdos",
+  "Yours and Result": "Seus e o resultado",
+  "Result and Theirs": "O resultado e deles",
+  "Yours and Theirs": "Seus e deles",
+  "Base and Yours": "Base e seus",
+  "Base and Result": "Base e o resultado",
+  "Base and Theirs": "Base e deles",
+  "Base": "Base",
+  "Discard Changes": "Descartar alterações",
+  "The result was changed. Discard the changes and take this version as it is?": "O resultado foi alterado. Descartar as alterações e usar esta versão como está?",
+  "Cancel Merge": "Cancelar mesclagem",
+  "Exit without applying the changes made in the result?": "Sair sem aplicar as alterações feitas no resultado?",
+  "Apply Merge Result": "Aplicar resultado da mesclagem",
+  "Merge Settings": "Configurações de mesclagem",
+  "Resolve Merge Change": "Resolver alteração de mesclagem",
+  "File has unresolved merge conflicts": "O arquivo tem conflitos de mesclagem não resolvidos",
+  "Resolve conflicts…": "Resolver conflitos…",
+  "Unresolved merge conflict marker": "Marcador de conflito de mesclagem não resolvido",
+  "Unresolved merge conflicts": "Conflitos de mesclagem não resolvidos",
+  "Reports the <<<<<<<, ======= and >>>>>>> lines a merge leaves in a file, whatever its language and whether or not a language server is installed.": "Relata as linhas <<<<<<<, ======= e >>>>>>> que uma mesclagem deixa em um arquivo, qualquer que seja a sua linguagem e haja ou não um servidor de linguagem instalado.",
+  "Merge/Rebase Widget": "Widget de mesclagem/rebase",
+  "Unresolved merge conflict markers": "Marcadores de conflito de mesclagem não resolvidos",
+  "What the session has cost so far, as the agent reports it": "Quanto a sessão custou até o momento, conforme informado pelo agente",
+  "{name}: {percent}% used": "{name}: {percent}% usado",
+  "{used}, resets in {reset}": "{used}, redefine em {reset}",
+  "5-hour limit": "Limite de 5 horas",
+  "Weekly limit": "Limite semanal",
+  "Weekly Opus limit": "Limite semanal do Opus",
+  "Weekly Sonnet limit": "Limite semanal do Sonnet",
+  "Chat": "Chat",
+  "Shown in the Task Header": "Mostrado no cabeçalho da tarefa",
+  "Context window usage": "Uso da janela de contexto",
+  "Time spent on the task": "Tempo gasto na tarefa",
+  "Usage limits": "Limites de uso",
+  "The account's 5-hour and weekly limits, when the agent reports them (Claude Code)": "Os limites de 5 horas e semanais da conta, quando o agente os informa (Claude Code)",
+  "Session cost": "Custo da sessão",
+  "What the session has cost so far, as the agent reports it (API pricing, also shown on subscriptions)": "Quanto a sessão custou até o momento, conforme informado pelo agente (preço de API, também exibido em assinaturas)",
+  "Local: {path}": "Local: {path}",
+  "Local: (does not exist)": "Local: (não existe)",
+  "Synchronize All": "Sincronizar tudo",
+  "Deployment comparison options": "Opções de comparação de implantação",
+  "Refresh comparison": "Atualizar comparação",
+  "Show local-only files": "Mostrar apenas arquivos locais",
+  "Show different files": "Mostrar arquivos diferentes",
+  "Show remote-only files": "Mostrar apenas arquivos remotos",
+  "Compare by:": "Comparar por:",
+  "Compare by": "Comparar por",
+  "Size and Timestamp": "Tamanho e carimbo de data/hora",
+  "Binary Content": "Conteúdo binário",
+  "Synchronize Selected": "Sincronizar selecionados",
+  "Stop content comparison": "Parar comparação de conteúdo",
+  "Filter:": "Filtrar:",
+  "Local files": "Arquivos locais",
+  "Local name": "Nome local",
+  "Remote name": "Nome remoto",
+  "Space changes the selected operation. Enter synchronizes the selected file. Synchronize All applies all chosen operations.": "Espaço altera a operação selecionada. Enter sincroniza o arquivo selecionado. Sincronizar tudo aplica todas as operações escolhidas.",
+  "Resize file list and diff preview": "Redimensionar lista de arquivos e pré-visualização de diff",
+  "The deployment server or project is no longer available": "O servidor de implantação ou projeto não está mais disponível",
+  "Select a file to compare its contents": "Selecione um arquivo para comparar seu conteúdo",
+  "Loading file contents…": "Carregando conteúdo do arquivo…",
+  "This file is too large for the text preview. Use Binary Content to compare it.": "Este arquivo é muito grande para a pré-visualização de texto. Use Conteúdo binário para compará-lo.",
+  "Deployment comparison": "Comparação de implantação",
+  "Wait for synchronization to finish before opening another comparison.": "Aguarde a sincronização terminar antes de abrir outra comparação.",
+  "Save local changes?": "Salvar alterações locais?",
+  "Save the local files edited in this comparison before closing.": "Salvar os arquivos locais editados nesta comparação antes de fechar.",
+  "Save and Close": "Salvar e fechar",
+  "Cannot close deployment comparison": "Não é possível fechar a comparação de implantação",
+  "Deployment Comparison": "Comparação de implantação",
+  "Opening deployment comparison…": "Abrindo comparação de implantação…",
+  "Diff Between 'local files' and 'files on {server}'": "Diff entre 'arquivos locais' e 'arquivos em {server}'",
+  "Comparing contents: {done} of {total}": "Comparando conteúdo: {done} de {total}",
+  "A file changed during comparison. Refresh and compare again.": "Um arquivo foi alterado durante a comparação. Atualize e compare novamente.",
+  "The project is no longer open.": "O projeto não está mais aberto.",
+  "The deployment server is no longer available.": "O servidor de implantação não está mais disponível.",
+  "No selected files are mapped to this deployment server.": "Nenhum dos arquivos selecionados está mapeado para este servidor de implantação.",
+  "Cannot open comparison for {server}": "Não é possível abrir a comparação para {server}",
+  "Could not refresh comparison: {error}": "Não foi possível atualizar a comparação: {error}",
+  "Build and run using": "Compilar e executar usando",
+  "Gradle runs a main class as a JavaExec task on its source set's runtime classpath (Gradle's resource processing included). OpenIDEA launches it on the Java language server's classpath.": "O Gradle executa uma classe principal como uma tarefa JavaExec no classpath de runtime de seu source set (processamento de recursos do Gradle incluído). O OpenIDEA a inicia no classpath do servidor de linguagem Java.",
+  "Set an absolute root path on the Connection tab first": "Defina primeiro um caminho raiz absoluto na aba Conexão",
+  "Needs permission": "Requer permissão",
+  "linked": "vinculado",
+  "Revoke {id}": "Revogar {id}",
+  "Allow {id}": "Permitir {id}",
+  "This version asks for new permissions. It stays off until you allow them.": "Esta versão solicita novas permissões. Ela permanecerá desativada até que você as permita.",
+  "Plugins from a project folder run only after you allow them.": "Plugins de uma pasta de projeto só são executados depois que você os permitir.",
+  "Review Permissions…": "Revisar permissões…",
+  "Statistics": "Estatísticas",
+  "Activated {activations}× (last in {toFixed} ms), {calls} calls, {errors} errors, slowest {toFixed} ms": "Ativado {activations}× (última em {toFixed} ms), {calls} chamadas, {errors} erros, mais lenta em {toFixed} ms",
+  "Recent calls p95 {toFixed} ms; {crashes} crashes, {slowCalls} editor results too late, reclaimed {reclaims}× when idle": "Chamadas recentes p95 {toFixed} ms; {crashes} falhas, {slowCalls} resultados de editor muito tardios, recuperado {reclaims}× quando ocioso",
+  "Linked plugin": "Plugin vinculado",
+  "Project plugin": "Plugin do projeto",
+  "Signed by {publisher}": "Assinado por {publisher}",
+  "Unsigned": "Não assinado",
+  "Roll Back to {previousVersion}": "Reverter para {previousVersion}",
+  "Install Plugin from Package File…": "Instalar plugin de arquivo de pacote…",
+  "Marketplace": "Marketplace",
+  "Could not download plugin": "Não foi possível baixar o plugin",
+  "Rolled back {name} to {version}": "{name} revertido para {version}",
+  "Could not roll back": "Não foi possível reverter",
+  "Could not open the package": "Não foi possível abrir o pacote",
+  "Settings of the plugin; projects can override them.": "Configurações do plugin; os projetos podem substituí-las.",
+  "Menus": "Menus",
+  "Shortcuts": "Atalhos",
+  "Status Bar Items": "Itens da barra de status",
+  "Editors": "Editores",
+  "Open With": "Abrir com",
+  "The plugin could not show this view": "O plugin não pôde mostrar esta exibição",
+  "Loading": "Carregando",
+  "Insert Row Above": "Inserir linha acima",
+  "Insert Row Below": "Inserir linha abaixo",
+  "Delete {length} Rows": "Excluir {length} linhas",
+  "Delete Row": "Excluir linha",
+  "No rows": "Nenhuma linha",
+  "Cell value": "Valor da célula",
+  "Secrets": "Segredos",
+  "Stored": "Armazenado",
+  "Not set": "Não definido",
+  "Replace…": "Substituir…",
+  "Value of {label}": "Valor de {label}",
+  "The plugin can only send these with its network requests; it cannot read them.": "O plugin só pode enviar estes valores com suas requisições de rede; ele não pode lê-los.",
+  "Editor Providers": "Provedores de editor",
+  "Linked for development": "Vinculado para desenvolvimento",
+  "Low": "Baixo",
+  "Medium": "Médio",
+  "High": "Alto",
+  "Install {name} {version}?": "Instalar {name} {version}?",
+  "Allow {name} to run?": "Permitir que {name} seja executado?",
+  "Allow": "Permitir",
+  "This package is not signed. Only continue if you trust where it came from.": "Este pacote não está assinado. Continue apenas se você confiar na sua procedência.",
+  "This plugin needs no special permissions.": "Este plugin não necessita de permissões especiais.",
+  "Requested permissions": "Permissões solicitadas",
+  "Required": "Obrigatório",
+  "High-risk permissions are equivalent to running arbitrary code on this machine.": "Permissões de alto risco equivalem a executar código arbitrário nesta máquina.",
+  "{icons} icons": "{icons} ícones",
+  "Use Default Icons": "Usar ícones padrão",
+  "Apply icon theme {label}": "Aplicar tema de ícones {label}",
+  "File Icon Themes": "Temas de ícones de arquivo",
+  "File Icons": "Ícones de arquivo",
+  "File Templates": "Modelos de arquivo",
+  "Cannot show {label}": "Não é possível mostrar {label}",
+  "{title} layout": "Layout de {title}",
+  "Editor and {title}": "Editor e {title}",
+  "{title} Only": "Apenas {title}",
+  "File icon theme": "Tema de ícones de arquivo",
+  "Plugin not enabled": "Plugin não ativado",
+  "Problems the {plugin} plugin reports. Severity \"As reported\" keeps the level the plugin assigns; a code below can override it.": "Problemas relatados pelo plugin {plugin}. A gravidade \"Conforme relatado\" mantém o nível que o plugin atribui; um código abaixo pode substituí-lo.",
+  "The plugin system is a preview: its API and the plugins may still change.": "O sistema de plugins é uma prévia: sua API e os plugins ainda podem mudar.",
+  "'{expected}' expected": "Esperado '{expected}'",
+  "Unexpected token": "Token inesperado",
+  "Syntax": "Sintaxe",
+  "Syntax errors": "Erros de sintaxe",
+  "Reports code the built-in parser cannot read, in files no language server checks (none is configured for the language, or it is not installed, stopped or crashed). A running language server reports syntax errors itself.": "Relata código que o analisador integrado não consegue ler, em arquivos que nenhum servidor de linguagem verifica (nenhum está configurado para a linguagem, ou não está instalado, foi parado ou falhou). Um servidor de linguagem em execução relata erros de sintaxe por conta própria.",
+  "Some items could not be restored": "Alguns itens não puderam ser restaurados",
+  "Not in Local History: {names}. They are in the Trash.": "Não estão no histórico local: {names}. Eles estão na Lixeira.",
+  "Show All Commits": "Mostrar todos os commits",
+  "Pin": "Fixar",
+  "Unpin": "Desafixar",
+  "Project default": "Padrão do projeto",
+  "The node executable this script runs on; empty uses Settings › Languages & Frameworks › Node.js.": "O executável node no qual este script é executado; vazio usa Configurações › Linguagens e frameworks › Node.js.",
+  "Loading repositories…": "Carregando repositórios…",
+  "GitHub repositories are listed with the": "Os repositórios do GitHub são listados com o",
+  "Search repositories": "Pesquisar repositórios",
+  "Repositories": "Repositórios",
+  "No matching repositories": "Nenhum repositório correspondente",
+  "No repositories": "Nenhum repositório",
+  "fork": "fork",
+  "archived": "arquivado",
+  "Could not forward port {port}": "Não foi possível encaminhar a porta {port}",
+  "Remote port": "Porta remota",
+  "Remote port, e.g. 3000": "Porta remota, ex.: 3000",
+  "Forward Port": "Encaminhar porta",
+  "No forwarded ports": "Nenhuma porta encaminhada",
+  "Forward a port of the remote host to reach it from this machine, e.g. a web server in a browser.": "Encaminhe uma porta do host remoto para acessá-la a partir desta máquina, por exemplo, um servidor web em um navegador.",
+  "Forwarded ports": "Portas encaminhadas",
+  "Open {addr} in Browser": "Abrir {addr} no navegador",
+  "Copy {addr}": "Copiar {addr}",
+  "Stop Forwarding Port {remotePort}": "Parar de encaminhar a porta {remotePort}",
+  "Ports": "Portas",
+  "GraphQL views": "Exibições do GraphQL",
+  "Schemas and Project Structure": "Esquemas e estrutura do projeto",
+  "Query Result": "Resultado da consulta",
+  "Default project-wide schema": "Esquema padrão em todo o projeto",
+  "the configuration is code and is not evaluated": "a configuração é código e não é avaliada",
+  "schema is empty": "o esquema está vazio",
+  "Schema discovery summary": "Resumo da descoberta de esquemas",
+  "Schema errors": "Erros de esquema",
+  "No errors found": "Nenhum erro encontrado",
+  "Endpoints": "Endpoints",
+  "No endpoints available in this schema": "Nenhum endpoint disponível neste esquema",
+  "No endpoints available in the default schema": "Nenhum endpoint disponível no esquema padrão",
+  "GraphQL actions": "Ações do GraphQL",
+  "Discovering GraphQL schemas": "Descobrindo esquemas GraphQL",
+  "GraphQL schemas": "Esquemas GraphQL",
+  "Running GraphQL query": "Executando consulta GraphQL",
+  "No query results": "Nenhum resultado de consulta",
+  "Add Schema Configuration": "Adicionar configuração de esquema",
+  "Open the project's graphql-config, creating graphql.config.yml when there is none": "Abre o graphql-config do projeto, criando graphql.config.yml caso não exista nenhum",
+  "Restart Schema Discovery": "Reiniciar descoberta de esquemas",
+  "Find the project's GraphQL schemas and configurations again": "Localizar os esquemas e configurações GraphQL do projeto novamente",
+  "GraphQL schema discovery failed": "Falha na descoberta de esquemas GraphQL",
+  "Cannot create the GraphQL configuration": "Não é possível criar a configuração do GraphQL",
+  "No GraphQL endpoint": "Nenhum endpoint GraphQL",
+  "Declare one under extensions.endpoints in graphql.config.yml.": "Declare um em extensions.endpoints no graphql.config.yml.",
+  "The field type '{name}' is not present when resolving type '{owner}'": "O tipo de campo '{name}' não está presente ao resolver o tipo '{owner}'",
+  "GraphQL editor actions": "Ações do editor GraphQL",
+  "Open Configuration File": "Abrir arquivo de configuração",
+  "Toggle Variables Editor": "Alternar editor de variáveis",
+  "GraphQL endpoint": "Endpoint GraphQL",
+  "No endpoints": "Nenhum endpoint",
+  "Execute GraphQL": "Executar GraphQL",
+  "Rerun Introspection Query": "Executar novamente a consulta de introspecção",
+  "Open Introspection Schema": "Abrir esquema de introspecção",
+  "GraphQL variables": "Variáveis do GraphQL",
+  "{types} types, {inputs} inputs, {enums} enums, {directives} directives": "{types} tipos, {inputs} inputs, {enums} enums, {directives} diretivas",
+  "Run a query with Execute GraphQL in the toolbar of a GraphQL file.": "Execute uma consulta com Executar GraphQL na barra de ferramentas de um arquivo GraphQL.",
+  "Query result": "Resultado da consulta",
+  "Opens the GraphQL config file for the current file's schema": "Abre o arquivo de configuração GraphQL para o esquema do arquivo atual",
+  "Reruns the latest introspection query to update the local schema file": "Executa novamente a consulta de introspecção mais recente para atualizar o arquivo de esquema local",
+  "Executes the current GraphQL file against the specified GraphQL endpoint": "Executa o arquivo GraphQL atual no endpoint GraphQL especificado",
+  "Invalid GraphQL variables": "Variáveis GraphQL inválidas",
+  "Get GraphQL Schema from Endpoint": "Obter esquema GraphQL do endpoint",
+  "Replace the contents of {target} with the schema of {name}?": "Substituir o conteúdo de {target} pelo esquema de {name}?",
+  "Cannot write the GraphQL schema": "Não é possível gravar o esquema GraphQL",
+  "{target} did not open in an editor": "{target} não abriu em um editor",
+  "GraphQL schema updated": "Esquema GraphQL atualizado",
+  "No introspection schema yet": "Nenhum esquema de introspecção ainda",
+  "Run Introspection Query on an endpoint to generate it.": "Execute a consulta de introspecção em um endpoint para gerá-lo.",
+  ", 1 error": ", 1 erro",
+  ", {count} errors": ", {count} erros",
+  "GraphQL Environment Variables": "Variáveis de ambiente do GraphQL",
+  "Environment variables actions": "Ações de variáveis de ambiente",
+  "{file}: {ms} ms execution time, {size} response": "{file}: {ms} ms de tempo de execução, resposta de {size}",
+  "GraphQL error": "Erro de GraphQL",
+  "GraphQL request to {url} failed.": "A solicitação GraphQL para {url} falhou.",
+  "Show error": "Mostrar erro",
+  "Run to Cursor failed": "Falha ao executar até o cursor",
+  "Cannot start debugging": "Não é possível iniciar a depuração",
+  "Cannot attach the debugger": "Não é possível anexar o depurador",
+  "Resume failed": "Falha ao retomar",
+  "Pause failed": "Falha ao pausar",
+  "Force Step Over failed": "Falha ao forçar passar por cima (Step Over)",
+  "Force Step Into failed": "Falha ao forçar entrar (Step Into)",
+  "Reset Frame failed": "Falha ao redefinir quadro",
+  "Force Run to Cursor failed": "Falha ao forçar execução até o cursor",
+  "Cannot create file": "Não é possível criar o arquivo",
+  "Cannot access the clipboard": "Não é possível acessar a área de transferência",
+  "Could not start container": "Não foi possível iniciar o contêiner",
+  "Could not stop container": "Não foi possível parar o contêiner",
+  "Could not restart container": "Não foi possível reiniciar o contêiner",
+  "Could not pause container": "Não foi possível pausar o contêiner",
+  "Could not unpause container": "Não foi possível despausar o contêiner",
+  "Could not kill container": "Não foi possível forçar a parada do contêiner",
+  "Could not remove container": "Não foi possível remover o contêiner",
+  "Could not remove image": "Não foi possível remover a imagem",
+  "Could not remove volume": "Não foi possível remover o volume",
+  "Could not remove network": "Não foi possível remover a rede",
+  "Could not pull {reference}": "Não foi possível fazer pull de {reference}",
+  "Could not prune": "Não foi possível limpar",
+  "Pruning stopped containers…": "Limpando contêineres parados…",
+  "Pruning dangling images…": "Limpando imagens órfãs…",
+  "Pruning unused images…": "Limpando imagens não utilizadas…",
+  "Pruning unused volumes…": "Limpando volumes não utilizados…",
+  "Pruning unused networks…": "Limpando redes não utilizadas…",
+  "Pruning the system…": "Limpando o sistema…",
+  "Starting Compose project {project}…": "Iniciando projeto Compose {project}…",
+  "Stopping Compose project {project}…": "Parando projeto Compose {project}…",
+  "Restarting Compose project {project}…": "Reiniciando projeto Compose {project}…",
+  "Taking down Compose project {project}…": "Encerrando projeto Compose {project}…",
+  "Could not start Compose project {project}": "Não foi possível iniciar o projeto Compose {project}",
+  "Could not stop Compose project {project}": "Não foi possível parar o projeto Compose {project}",
+  "Could not restart Compose project {project}": "Não foi possível reiniciar o projeto Compose {project}",
+  "Could not take down Compose project {project}": "Não foi possível encerrar o projeto Compose {project}",
+  "Stage hunk of {path}": "Preparar bloco de {path}",
+  "{path} reverted": "{path} revertido",
+  "{length} files reverted": "{length} arquivos revertidos",
+  "Resolve {path}": "Resolver {path}",
+  "{path}: conflicts resolved": "{path}: conflitos resolvidos",
+  "Create branch {value}": "Criar branch {value}",
+  "Merge {branch} into {current}": "Mesclar {branch} em {current}",
+  "Merged {branch} into {current}": "{branch} mesclado em {current}",
+  "Rebase {current} onto {branch}": "Fazer rebase de {current} sobre {branch}",
+  "Rebased {current} onto {branch}": "Rebase de {current} sobre {branch} concluído",
+  "Rename branch {name}": "Renomear branch {name}",
+  "Renamed branch {name} to {to}": "Branch {name} renomeado para {to}",
+  "Delete branch {name}": "Excluir branch {name}",
+  "Restore branch {name}": "Restaurar branch {name}",
+  "Merge {branch} ({root})": "Mesclar {branch} ({root})",
+  "Rebase onto {branch} ({root})": "Fazer rebase sobre {branch} ({root})",
+  "Delete branch {name} ({root})": "Excluir branch {name} ({root})",
+  "1 file amended in {several} repositories": "1 arquivo emendado em {several} repositórios",
+  "{n} files amended in {several} repositories": "{n} arquivos emendados em {several} repositórios",
+  "1 file amended": "1 arquivo emendado",
+  "{n} files amended": "{n} arquivos emendados",
+  "1 file committed in {several} repositories": "1 arquivo comitado em {several} repositórios",
+  "{n} files committed in {several} repositories": "{n} arquivos comitados em {several} repositórios",
+  "1 file committed": "1 arquivo comitado",
+  "{n} files committed": "{n} arquivos comitados",
+  "Rolled back 1 file": "1 arquivo revertido",
+  "Rolled back {length} files": "{length} arquivos revertidos",
+  "Add 1 file to Git": "Adicionar 1 arquivo ao Git",
+  "Add {length} files to Git": "Adicionar {length} arquivos ao Git",
+  "Stash changes": "Guardar alterações no stash",
+  "Changes stashed": "Alterações salvas no stash",
+  "Unstashed {ref} on branch {branch}": "Restaurado {ref} do stash na branch {branch}",
+  "Unstashed {ref}": "Restaurado {ref} do stash",
+  "Applied {ref}": "{ref} aplicado",
+  "Dropped {ref}": "{ref} descartado",
+  "Remove 1 file from Git": "Remover 1 arquivo do Git",
+  "Remove {n} files from Git": "Remover {n} arquivos do Git",
+  "Accept yours for {path}": "Aceitar sua versão para {path}",
+  "Accept theirs for {path}": "Aceitar a versão deles para {path}",
+  "{path} resolved": "{path} resolvido",
+  "Revert selected changes": "Reverter alterações selecionadas",
+  "Create tag {value}": "Criar tag {value}",
+  "Created tag {value} on {id}": "Tag {value} criada em {id}",
+  "Created tag {tag}": "Tag {tag} criada",
+  "Create patch": "Criar patch",
+  "Apply patch ({source})": "Aplicar patch ({source})",
+  "Undo commit {id}": "Desfazer commit {id}",
+  "Undid commit {id} “{summary}”; its changes are staged": "Commit {id} “{summary}” desfeito; suas alterações estão preparadas",
+  "Shelve changes “{trim}”": "Guardar alterações no shelf “{trim}”",
+  "Unshelve “{name}”": "Restaurar “{name}” do shelf",
+  "Delete shelved changes “{name}”": "Excluir alterações do shelf “{name}”",
+  "Rename shelved changes": "Renomear alterações no shelf",
+  "Passed to the agent process, replacing variables of the same name. Changes apply to new sessions.": "Passado para o processo do agente, substituindo variáveis de mesmo nome. As alterações se aplicam a novas sessões.",
+  "Expected NAME=value: {pair}": "Esperado NAME=value: {pair}",
+  "Checking out #{number}…": "Fazendo checkout de #{number}…",
+  "Couldn't check out #{number}": "Não foi possível fazer checkout de #{number}",
+  "Fetching #{number}…": "Fazendo fetch de #{number}…",
+  "Couldn't fetch #{number}": "Não foi possível fazer fetch de #{number}",
+  "Creating worktree for #{number}…": "Criando worktree para #{number}…",
+  "Couldn't create the worktree for #{number}": "Não foi possível criar a worktree para #{number}",
+  "Couldn't commit the suggested change": "Não foi possível fazer commit da alteração sugerida",
+  "Couldn't apply the suggested change": "Não foi possível aplicar a alteração sugerida",
+  "Couldn't resolve the thread": "Não foi possível resolver a conversa",
+  "Could not close comparison": "Não foi possível fechar a comparação",
+  "Could not open comparison": "Não foi possível abrir a comparação",
+  "Could not show diff": "Não foi possível exibir o diff",
+  "Back to Changed Files": "Voltar para Arquivos alterados",
+  "Default (the module's JDK)": "Padrão (JDK do módulo)",
+  "Use classpath of module": "Usar classpath do módulo",
+  "Find by main class": "Localizar por classe principal"
+}
diff --git a/src/platform/locales/text/zh.json b/src/platform/locales/text/zh.json
index 3aeb866a..8e78de66 100644
--- a/src/platform/locales/text/zh.json
+++ b/src/platform/locales/text/zh.json
@@ -1,4 +1,13 @@
 {
+  "Link Gradle Projects": "关联 Gradle 项目",
+  "Unlink Gradle Project": "取消关联 Gradle 项目",
+  "Unlink Gradle project?": "取消关联 Gradle 项目？",
+  "Remove this build from Gradle? Files will remain in the Project view; link its build file again to restore it.": "从 Gradle 中移除此构建？文件将保留在项目视图中；重新关联其构建文件即可恢复。",
+  "Gradle build files": "Gradle 构建文件",
+  "Unity": "Unity 项目",
+  "Show Meta Files": "显示 Meta 文件",
+  "Show Generated Files": "显示生成的文件",
+  "C# project files are missing. In Unity, select an external script editor in Preferences > External Tools, then regenerate project files.": "缺少 C# 项目文件。请在 Unity 的偏好设置 > 外部工具中选择外部脚本编辑器，然后重新生成项目文件。",
   "Edit {name}": "编辑 {name}",
   "Whitespace-only changes": "仅空白字符更改",
   " · Whitespace-only changes": " · 仅空白字符更改",
@@ -28,6 +37,8 @@
   "Not found": "未找到",
   "Not found on PATH": "未在 PATH 中找到",
   "Reports newer crate versions that Cargo.toml requirements do not already allow.": "报告 Cargo.toml 版本要求尚未允许的较新 crate 版本。",
+  "Serializable class without 'serialVersionUID'": "没有 'serialVersionUID' 的可序列化类",
+  "Reports classes that implement Serializable but declare no serialVersionUID field. Alt+Enter on the class name adds a default or a generated ID. The Java language server checks it, and restarts when this is changed.": "报告实现了 Serializable 但没有声明 serialVersionUID 字段的类。在类名上按 Alt+Enter 可添加默认 ID 或生成的 ID。此检查由 Java 语言服务器执行，更改后语言服务器会重启。",
   "Run `auggie login` in a terminal.": "在终端中运行 `auggie login`。",
   "Run `claude` in a terminal and sign in.": "在终端中运行 `claude` 并登录。",
   "Run `codex login` in a terminal.": "在终端中运行 `codex login`。",
@@ -343,6 +354,7 @@
   "Cannot export data": "无法导出数据",
   "Cannot find usages of '{name}'": "无法查找 '{name}' 的用法",
   "Cannot generate the DDL": "无法生成 DDL",
+  "Cannot generate the SQL script": "无法生成 SQL 脚本",
   "Cannot get the DDL of {name}": "无法获取 {name} 的 DDL",
   "Cannot open file": "无法打开文件",
   "Cannot open library class": "无法打开库类",
@@ -470,6 +482,7 @@
   "Comment": "评论",
   "Comment:": "注释：",
   "Commit": "提交",
+  "Commit details": "提交详细信息",
   "Commit Anyway": "仍然提交",
   "Commit Changelist…": "提交更改列表…",
   "Commit Checks": "提交检查",
@@ -847,7 +860,6 @@
   "File name with extension": "带扩展名的文件名",
   "File name without extension": "不带扩展名的文件名",
   "File not found": "未找到文件",
-  "File or folder": "文件或文件夹",
   "File patterns": "文件模式",
   "File templates": "文件模板",
   "File:": "文件：",
@@ -863,7 +875,6 @@
   "Filter TODO Items": "过滤 TODO 项",
   "Filter by Branch": "按分支过滤",
   "Filter by Date": "按日期过滤",
-  "Filter by Path": "按路径过滤",
   "Filter by User": "按用户过滤",
   "Filter by message": "按消息过滤",
   "Filter by name, PID or command line": "按名称、PID 或命令行过滤",
@@ -1030,7 +1041,7 @@
   "Implement Members": "实现成员",
   "Implementation(s)": "实现",
   "Imports": "导入",
-  "In Project": "在项目中",
+  "In Project": "在项目",
   "Include": "包括",
   "Include non-project items": "包括非项目项",
   "Include untracked files": "包括未跟踪的文件",
@@ -1207,11 +1218,13 @@
   "Matches": "匹配项",
   "Maven actions": "Maven 操作",
   "Maven command line": "Maven 命令行",
+  "Maven Daemon home path": "Maven Daemon 主路径",
   "Maven home path": "Maven 主路径",
   "Maven projects": "Maven 项目",
   "Maven Settings…": "Maven 设置…",
   "Maven sync finished with errors": "Maven 同步完成，但有错误",
   "Maven wrapper, else mvn on PATH": "Maven wrapper，否则使用 PATH 中的 mvn",
+  "MVND_HOME, else auto-detected": "MVND_HOME，否则自动检测",
   "Maximize": "最大化",
   "Maximize Tool Window": "最大化工具窗口",
   "Maximum local history size per project": "每个项目的最大本地历史记录大小",
@@ -1454,7 +1467,6 @@
   "Other File Types": "其他文件类型",
   "Other hints (chaining, closing labels…)": "其他提示（链式调用、结束标签…）",
   "Other names or emails (comma-separated):": "其他名称或电子邮件（逗号分隔）：",
-  "Other revisions (comma-separated):": "其他修订（逗号分隔）：",
   "Otherwise line breakpoints can only be set in files of languages that have a debugger.": "否则只能在有调试器的语言文件中设置行断点。",
   "Outgoing commits": "传出的提交",
   "Output": "输出",
@@ -1749,7 +1761,6 @@
   "Reopen projects on startup": "启动时重新打开项目",
   "Replace": "替换",
   "Replace All": "全部替换",
-  "Replace All in This File": "在此文件中全部替换",
   "Replace Preview": "替换预览",
   "Replace Selected": "替换所选内容",
   "Replace Structurally": "结构化替换",
@@ -1759,7 +1770,6 @@
   "Replace in Files": "在文件中替换",
   "Replace in Files…": "在文件中替换…",
   "Replace in file": "在文件中替换",
-  "Replace preview": "替换预览",
   "Replace template": "替换模板",
   "Replace this occurrence only": "仅替换此匹配项",
   "Replace with": "替换为",
@@ -1895,11 +1905,11 @@
   "Runs Maven with -o": "使用 -o 运行 Maven",
   "Runs Optimize Imports when the file has no errors, unless it would change the caret line.": "文件没有错误时运行“优化导入”，除非这会更改光标所在行。",
   "Runs npm scripts and Node-based language servers (vtsls, eslint, pyright…).": "运行 npm 脚本和基于 Node 的语言服务器（vtsls、eslint、pyright…）。",
-  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw.": "用于同步、构建和 Maven 运行配置。选定后将代替项目的 mvnw。",
+  "Runs sync, builds and Maven run configurations. A chosen home is used instead of the project's mvnw. Bypassed while the Maven daemon is enabled.": "用于同步、构建和 Maven 运行配置。选定后将代替项目的 mvnw。启用 Maven daemon 时将被绕过。",
   "Runs the language server's Organize Imports action.": "运行语言服务器的“整理导入”操作。",
   "Runs the language server's formatter before an explicit save (Actions on Save).": "在显式保存前运行语言服务器的格式化程序（保存时操作）。",
   "Search history": "搜索历史",
-  "Search history (⌥↑ / ⌥↓)": "搜索历史（⌥↑ / ⌥↓）",
+  "Search history ({previous} / {next})": "搜索历史（{previous} / {next}）",
   "Searching for usages of '{symbol}'": "正在搜索 '{symbol}' 的用法",
   "SQL completion": "SQL 补全",
   "SQL Inserts": "SQL Insert 语句",
@@ -1922,7 +1932,7 @@
   "Save to file:": "保存到文件：",
   "Scanning for TODO items…": "正在扫描 TODO 项…",
   "Scheme": "方案",
-  "Scope": "范围",
+  "Scope": "作用域",
   "Scratches": "临时文件",
   "Script": "脚本",
   "Scroll to End": "滚动到末尾",
@@ -1939,8 +1949,8 @@
   "Search frames": "搜索帧",
   "Search in comments and strings": "在注释和字符串中搜索",
   "Search installed plugins": "搜索已安装的插件",
-  "Search local plugins": "搜索本地插件",
   "Search packages": "搜索软件包",
+  "Search plugins": "搜索插件",
   "Search projects": "搜索项目",
   "Search pull requests": "搜索拉取请求",
   "Search query": "搜索查询",
@@ -1959,6 +1969,7 @@
   "Select GOPATH": "选择 GOPATH",
   "Select JDK Home Directory": "选择 JDK 主目录",
   "Select Local Repository": "选择本地仓库",
+  "Select Maven Daemon Home Directory": "选择 Maven Daemon 主目录",
   "Select Maven Home Directory": "选择 Maven 主目录",
   "Select Search Directory": "选择查找目录",
   "Select Maven settings.xml": "选择 Maven settings.xml",
@@ -2029,6 +2040,12 @@
   "Show Hidden Tabs": "显示隐藏的标签页",
   "Show History": "显示历史记录",
   "Show History for File": "显示文件的历史记录",
+  "Show History for Selection": "显示所选内容的历史记录",
+  "History for Selection": "所选内容的历史记录",
+  "Open a file to show the history of its selection": "打开文件以显示所选内容的历史记录",
+  "No commits changed these lines": "没有提交更改过这些行",
+  "These lines are not committed yet": "这些行尚未提交",
+  "Not Committed Yet": "尚未提交",
   "Show Ignored": "显示已忽略",
   "Show Infos and Hints": "显示信息和提示",
   "Show Local History": "显示本地历史记录",
@@ -2246,7 +2263,9 @@
   "The caches will be invalidated and rebuilt on the next startup: the symbol index of every project and the syntax caches.": "缓存将被清除，并在下次启动时重建：包括每个项目的符号索引和语法缓存。",
   "The caret is not inside a conflict": "光标不在冲突内",
   "The clipboard does not contain a patch": "剪贴板中没有补丁",
+  "The mvnd home (or its executable). Empty = $MVND_HOME, else mvnd on PATH.": "mvnd 主目录（或其可执行文件）。留空 = $MVND_HOME，否则使用 PATH 中的 mvnd。",
   "The patch file is empty": "补丁文件为空",
+  "Builds, sync and Maven run configurations run through mvnd for speed. It embeds its own Maven (the home and mvnw are bypassed), needs Java 17+ and builds in parallel by default. Falls back to mvn when mvnd is missing or the JDK is too old.": "构建、同步和 Maven 运行配置改用 mvnd 执行以提速。它内嵌自己的 Maven（主路径与 mvnw 被绕过），需要 Java 17+，且默认并行构建。mvnd 缺失或 JDK 过旧时自动回退到 mvn。",
   "The project is not a Git repository.": "该项目不是 Git 仓库。",
   "The project path is always shown in the status bar navigation bar.": "项目路径始终显示在状态栏导航栏中。",
   "The remote contains commits that are not in your branch. Update the branch, then push again.": "远程包含您的分支中没有的提交。请更新分支，然后再次推送。",
@@ -2375,6 +2394,7 @@
   "Use DROP CASCADE syntax": "使用 DROP CASCADE 语法",
   "Use Default Theme": "使用默认主题",
   "Use Find Usages (⌥F7) on a symbol to see its usages here": "对符号使用查找用法 (⌥F7)，即可在此查看其用法",
+  "Use Maven Daemon (mvnd)": "使用 Maven Daemon (mvnd)",
   "Use IF EXISTS syntax": "使用 IF EXISTS 语法",
   "Use Option as Meta key": "将 Option 用作 Meta 键",
   "Use SSH tunnel": "使用 SSH 隧道",
@@ -2525,8 +2545,7 @@
   "{name} has unsaved changes": "{name} 有未保存的更改",
   "{name} installed": "{name} 已安装",
   "{name} is not installed": "{name} 未安装",
-  "↵ Open · ⇧↵ Open to the side · ⌘↵ Open in Find Window": "↵ 打开 · ⇧↵ 在侧边打开 · ⌘↵ 在查找窗口中打开",
-  "⌘↵ to open in Find tool window": "⌘↵ 在“查找”工具窗口中打开",
+  "{key} to open in Find tool window": "{key} 在“查找”工具窗口中打开",
   "⌥← / ⌥→ and ⌥⌫ stop at humps of camelCase names.": "⌥← / ⌥→ 和 ⌥⌫ 会在 camelCase 名称的驼峰处停止。",
   "Specify commit message": "请填写提交信息",
   "Author:": "作者:",
@@ -2624,7 +2643,6 @@
   "Except Comments and String Literals": "注释和字符串字面量除外",
   "Recent Replacements": "最近的替换",
   "No recent replacements": "没有最近的替换",
-  "↵ Replace Selected · ⇧⌥↵ Replace All · ⌘↵ Open in Find Window": "↵ 替换所选 · ⇧⌥↵ 全部替换 · ⌘↵ 在查找窗口中打开",
   "Replace {count} Occurrences": "替换 {count} 处",
   "Add Mnemonic Bookmark": "添加助记符书签",
   "Change Mnemonic": "更改助记符",
@@ -2683,7 +2701,7 @@
   "No remotes": "无远程",
   "Include disabled actions": "包括禁用的操作",
   "Symbol Kinds": "符号类型",
-  "⌥↵ to assign a shortcut": "⌥↵ 分配快捷键",
+  "{key} to assign a shortcut": "{key} 分配快捷键",
   "Open Settings Page": "打开设置页面",
   "Assign Shortcut…": "分配快捷键…",
   "New List…": "新建列表…",
@@ -2736,10 +2754,10 @@
   "Search Scope": "搜索范围",
   "Filter Search Results": "过滤搜索结果",
   "Filter search results": "过滤搜索结果",
-  "Replace (⌥P)": "替换 (⌥P)",
-  "Replace All (⌥A)": "全部替换 (⌥A)",
-  "Include (⌥L)": "包括 (⌥L)",
-  "Exclude (⌥L)": "排除 (⌥L)",
+  "Replace ({key})": "替换 ({key})",
+  "Replace All ({key})": "全部替换 ({key})",
+  "Include ({key})": "包括 ({key})",
+  "Exclude ({key})": "排除 ({key})",
   "Recent searches": "最近的搜索",
   "New Line": "新行",
   "New Line in Search Field": "在搜索字段中插入新行",
@@ -3497,7 +3515,7 @@
   "Not installed": "未安装",
   "{command} was not found on PATH": "在 PATH 中找不到 {command}",
   "Agent tasks": "Agent 任务",
-  "Describe a task for the agent. @ references a file, / runs a command": "描述要交给 agent 的任务。@ 引用文件，/ 运行命令",
+  "Describe a task for the agent. @ references a file or folder, / runs a command": "描述要交给 agent 的任务。@ 引用文件或文件夹，/ 运行命令",
   "away from your changes": "不影响你的改动",
   "edits your files directly": "直接修改你的文件",
   "from": "基于",
@@ -3772,7 +3790,6 @@
   "Godot command line options, e.g. --debug-collisions": "Godot 命令行选项，例如 --debug-collisions",
   "Bookmark description": "书签描述",
   "Cannot open {path}": "无法打开 {path}",
-  "Replace All (⇧⌥↵, ⌥A)": "全部替换 (⇧⌥↵, ⌥A)",
   "Search context": "搜索上下文",
   "not": "非",
   "and": "与",
@@ -3921,6 +3938,12 @@
   "omitted for duplicate": "因重复而省略",
   "omitted for cycle": "因循环依赖而省略",
   "version managed from {version}": "版本由 {version} 经依赖管理调整",
+  "No Maven or Gradle projects": "没有 Maven 或 Gradle 项目",
+  "Resolving dependencies…": "正在解析依赖…",
+  "Cannot resolve dependencies": "无法解析依赖",
+  "requested {version}": "请求的版本为 {version}",
+  "not resolved": "未解析",
+  "Shows a Gradle project's resolved dependencies per configuration, version conflicts and where each library comes from": "按配置显示 Gradle 项目解析后的依赖、版本冲突以及每个库的来源",
   "Cannot find the declaration": "找不到声明",
   "Cannot exclude {name}": "无法排除 {name}",
   "Solarized Light": "Solarized 浅色",
@@ -3964,6 +3987,7 @@
   "Implemented and overridden": "已实现和已重写",
   "Implementing and overriding": "实现和重写",
   "Implemented and overridden declarations": "已被实现和重写的声明",
+  "Color preview": "颜色预览",
   "Implementing and overriding methods": "实现和重写超类型方法的方法",
   "Replace all {count} occurrences": "替换全部 {count} 处",
   "↵ Apply · Esc Keep '{name}'": "↵ 应用 · Esc 保留 '{name}'",
@@ -4223,6 +4247,8 @@
   "Root markers": "根标记",
   "Initialization options": "初始化选项",
   "Global": "全局",
+  "global": "全局",
+  "Available in all projects": "在所有项目中可用",
   "This project": "此项目",
   "Executable name or path": "可执行文件名或路径",
   "Select the server executable": "选择服务器可执行文件",
@@ -4406,24 +4432,15 @@
   "Delete {n} items from the server?": "要从服务器删除 {n} 个项目吗？",
   "Not mapped to a project path": "未映射到项目路径",
   "Unknown Host Key": "未知的主机密钥",
-  "Sync with {server}": "与 {server} 同步",
-  "Hide identical files ({n})": "隐藏相同的文件（{n}）",
-  "Synchronize": "同步",
   "{n} of {total} files will change": "{total} 个文件中有 {n} 个将被更改",
   "Comparing local and remote files…": "正在比较本地和远程文件…",
   "Files to synchronize": "要同步的文件",
   "Action": "操作",
-  "Local size": "本地大小",
-  "Local modified": "本地修改时间",
-  "Remote size": "远程大小",
-  "Remote modified": "远程修改时间",
-  "Local and remote files are identical": "本地和远程文件相同",
   "Synchronizing…": "正在同步…",
   "Local only": "仅本地",
   "Remote only": "仅远程",
   "Local is newer": "本地较新",
   "Remote is newer": "远程较新",
-  "Different size": "大小不同",
   "Identical": "相同",
   "Upload": "上传",
   "Delete remote": "删除远程",
@@ -4476,7 +4493,6 @@
   "partial": "部分",
   "editable": "可编辑",
   "on {date}": "于 {date}",
-  "Merge of {parents}": "合并自 {parents}",
   "renamed from {name}": "已从 {name} 重命名",
   "Label '{label}'": "标签“{label}”",
   "{n} file recorded before it": "在此之前记录了 {n} 个文件",
@@ -4537,7 +4553,6 @@
   "Memory & Diagnostics": "内存与诊断",
   "Over budget ({budget})": "超出预算（{budget}）",
   "dev": "开发",
-  "{label}. Showing plugin packages available on this machine.": "{label}。显示此计算机上可用的插件包。",
   "Zoomed into {name}": "已缩放到 {name}",
   "Rename directory '{current}' and its usages to:": "将目录“{current}”及其用法重命名为：",
   "Rename file '{current}' and its usages to:": "将文件“{current}”及其用法重命名为：",
@@ -4603,6 +4618,7 @@
   "The Database tree shows only the checked names and patterns (* and ?); the connected database always shows.": "数据库树只显示选中的名称和模式（* 和 ?）；已连接的数据库始终显示。",
   "Save the data source to pick from the server's names; patterns (* and ?) work any time.": "保存数据源后可从服务器上的名称中选取；模式（* 和 ?）随时可用。",
   "Read-only data source.": "只读数据源。",
+  "Use the query console to change ClickHouse data.": "请使用查询控制台修改 ClickHouse 数据。",
   "Read-only: the table has no primary key to identify rows.": "只读：该表没有可用于标识行的主键。",
   "The session has finished.": "会话已结束。",
   "Variables are available while suspended.": "变量仅在挂起时可用。",
@@ -4650,7 +4666,6 @@
   "Rebase commits of {head} not on:": "变基 {head} 中不在以下分支上的提交：",
   "{head} has no upstream: commits up to {revision} will be pushed as a new branch:": "{head} 没有上游分支：截至 {revision} 的提交将作为新分支推送：",
   "{head} has no upstream: it will be pushed as a new branch and tracked:": "{head} 没有上游分支：它将作为新分支推送并被跟踪：",
-  "{count} matches in {files} files": "{files} 个文件中有 {count} 个匹配项",
   "{count} excluded": "已排除 {count} 项",
   "{count} file with conflicts": "{count} 个文件存在冲突",
   "{count} files with conflicts": "{count} 个文件存在冲突",
@@ -4941,6 +4956,7 @@
   "Add New Interpreter…": "添加新的解释器…",
   "Interpreter Settings…": "解释器设置…",
   "Connection settings for SQL Server.": "SQL Server 的连接设置。",
+  "ClickHouse settings sent with each HTTP request. connect_timeout is in seconds.": "每个 HTTP 请求附带的 ClickHouse 设置。connect_timeout 的单位为秒。",
   "Microsoft SQL Server": "微软 SQL Server",
   "Add to .gitignore": "添加到 .gitignore",
   "Add to .git/info/exclude": "添加到 .git/info/exclude",
@@ -5646,6 +5662,27 @@
   "PHP interpreter": "PHP 解释器",
   "Runs PHP scripts, PHPUnit, Composer and artisan, and the PHP-based language servers (phpactor). Its folder is put first on PATH, so vendor/bin/phpunit and other #!/usr/bin/env php scripts use it too.": "运行 PHP 脚本、PHPUnit、Composer 和 artisan，以及基于 PHP 的语言服务器（phpactor）。其所在文件夹会被置于 PATH 最前，因此 vendor/bin/phpunit 等 #!/usr/bin/env php 脚本也会使用它。",
   "Select PHP Interpreter": "选择 PHP 解释器",
+  "PHP language level": "PHP 语言级别",
+  "The PHP version Intelephense checks the code against: newer syntax and functions are reported. Auto uses config.platform.php from composer.json, else the lowest version require.php allows.": "Intelephense 检查代码时所针对的 PHP 版本：更新版本的语法和函数会被报告。“自动”使用 composer.json 中的 config.platform.php，否则使用 require.php 允许的最低版本。",
+  "from composer.json": "来自 composer.json",
+  "PHP Language Level": "PHP 语言级别",
+  "PHP Language Level: {label}": "PHP 语言级别：{label}",
+  "Select PHP Language Level": "选择 PHP 语言级别",
+  "Cannot select PHP language level": "无法选择 PHP 语言级别",
+  "No PHP version in the settings or composer.json: Intelephense uses its default": "设置和 composer.json 中均未指定 PHP 版本：Intelephense 使用其默认版本",
+  "PHP {version}, set in the settings": "PHP {version}，在设置中指定",
+  "PHP {version}, from config.platform.php in composer.json": "PHP {version}，来自 composer.json 中的 config.platform.php",
+  "PHP {version}, the lowest version require.php in composer.json allows": "PHP {version}，composer.json 中 require.php 允许的最低版本",
+  "Set in the settings of the linked project {name}": "在关联项目 {name} 的设置中指定",
+  "Include paths": "包含路径",
+  "Folders outside the project whose classes and functions Intelephense indexes too, such as the platform a module extends. Absolute, or relative to the project.": "Intelephense 额外索引其中类和函数的项目外文件夹，例如模块所扩展的平台。可以是绝对路径，或相对于项目的路径。",
+  "No include paths": "没有包含路径",
+  "Include path": "包含路径",
+  "Additional stubs": "附加存根",
+  "Intelephense stub sets loaded on top of its defaults, such as wordpress. Each ext-* in require or require-dev of composer.json adds its own.": "在 Intelephense 默认存根之外加载的存根集，例如 wordpress。composer.json 的 require 或 require-dev 中的每个 ext-* 会自动加上对应的存根。",
+  "No additional stubs": "没有附加存根",
+  "Stub": "存根",
+  "Stub name, e.g. wordpress": "存根名称，例如 wordpress",
   "select files in a git repository to shelve": "请选择 Git 仓库中的文件以搁置更改",
   "select files from a single git repository to shelve": "请一次只选择同一个 Git 仓库中的文件以搁置更改",
   "External file changes sync may be slow": "外部文件更改同步可能较慢",
@@ -5655,7 +5692,7 @@
   "Java project import failed": "Java 项目导入失败",
   "The Java project cannot be imported because these files use a name Windows reserves for devices: {paths}. Delete or rename them, then restart the Java language server.": "无法导入 Java 项目，因为这些文件使用了 Windows 保留的设备名：{paths}。请删除或重命名这些文件，然后重启 Java 语言服务器。",
   "This file is outside the source folders of its Java module: only syntax errors are reported, and navigation and completion don't work.": "此文件不在所属 Java 模块的源码目录中：只报告语法错误，跳转和补全不可用。",
-  "This file does not belong to an imported Java project: only syntax errors are reported, and navigation and completion don't work.": "此文件不属于已导入的 Java 项目：只报告语法错误，跳转和补全不可用。",
+  "This file does not belong to an imported Java project: only syntax errors are reported, and only JDK classes resolve.": "此文件不属于已导入的 Java 项目：只报告语法错误，只能解析 JDK 中的类。",
   "This Go file belongs to no package of the workspace: code insight is limited.": "此 Go 文件不属于工作区中的任何包：代码洞察功能受限。",
   "This Rust file is not included in any crate: rust-analyzer can't offer code insight for it.": "此 Rust 文件未包含在任何 crate 中：rust-analyzer 无法为它提供代码洞察。",
   "Reload Maven Projects": "重新加载 Maven 项目",
@@ -5717,6 +5754,46 @@
   "The account's 5-hour and weekly limits, when the agent reports them (Claude Code)": "账户的 5 小时和每周限额，在智能体报告时显示（Claude Code）",
   "Session cost": "会话花费",
   "What the session has cost so far, as the agent reports it (API pricing, also shown on subscriptions)": "智能体报告的本会话目前花费（按 API 价格计算，订阅账户也会显示）",
+  "Local: {path}": "本地：{path}",
+  "Local: (does not exist)": "本地：（不存在）",
+  "Synchronize All": "同步全部",
+  "Deployment comparison options": "部署比较选项",
+  "Refresh comparison": "刷新比较",
+  "Show local-only files": "显示仅本地存在的文件",
+  "Show different files": "显示有差异的文件",
+  "Show remote-only files": "显示仅远程存在的文件",
+  "Compare by:": "比较依据：",
+  "Compare by": "比较依据",
+  "Size and Timestamp": "大小和时间戳",
+  "Binary Content": "二进制内容",
+  "Synchronize Selected": "同步所选文件",
+  "Stop content comparison": "停止内容比较",
+  "Filter:": "筛选：",
+  "Local files": "本地文件",
+  "Local name": "本地名称",
+  "Remote name": "远程名称",
+  "Space changes the selected operation. Enter synchronizes the selected file. Synchronize All applies all chosen operations.": "空格键切换所选操作，Enter 键同步所选文件。“同步全部”执行所有已选择的操作。",
+  "Resize file list and diff preview": "调整文件列表和差异预览的大小",
+  "The deployment server or project is no longer available": "部署服务器或项目已不可用",
+  "Select a file to compare its contents": "选择文件以比较其内容",
+  "Loading file contents…": "正在加载文件内容…",
+  "This file is too large for the text preview. Use Binary Content to compare it.": "此文件过大，无法进行文本预览。请使用“二进制内容”比较。",
+  "Deployment comparison": "部署比较",
+  "Wait for synchronization to finish before opening another comparison.": "请等待同步完成后再打开其他比较。",
+  "Save local changes?": "保存本地更改？",
+  "Save the local files edited in this comparison before closing.": "关闭前保存本次比较中编辑的本地文件。",
+  "Save and Close": "保存并关闭",
+  "Cannot close deployment comparison": "无法关闭部署比较",
+  "Deployment Comparison": "部署比较",
+  "Opening deployment comparison…": "正在打开部署比较…",
+  "Diff Between 'local files' and 'files on {server}'": "本地文件与“{server}”上的文件的差异",
+  "Comparing contents: {done} of {total}": "正在比较内容：{done}/{total}",
+  "A file changed during comparison. Refresh and compare again.": "比较期间文件已更改，请刷新后重新比较。",
+  "The project is no longer open.": "项目已关闭。",
+  "The deployment server is no longer available.": "部署服务器已不可用。",
+  "No selected files are mapped to this deployment server.": "所选文件均未映射到此部署服务器。",
+  "Cannot open comparison for {server}": "无法打开与 {server} 的比较",
+  "Could not refresh comparison: {error}": "无法刷新比较：{error}",
   "Build and run using": "构建和运行使用",
   "Gradle runs a main class as a JavaExec task on its source set's runtime classpath (Gradle's resource processing included). OpenIDEA launches it on the Java language server's classpath.": "Gradle 以 JavaExec 任务在源集的运行时类路径上运行主类（包括 Gradle 的资源处理）。OpenIDEA 在 Java 语言服务器的类路径上启动它。",
   "Set an absolute root path on the Connection tab first": "请先在“连接”页设置绝对根路径",
@@ -5736,14 +5813,30 @@
   "Unsigned": "未签名",
   "Roll Back to {previousVersion}": "回滚到 {previousVersion}",
   "Install Plugin from Package File…": "从插件包文件安装…",
-  "Marketplace index URL": "插件市场索引 URL",
-  "Refresh Marketplace": "刷新插件市场",
+  "Import Theme from IntelliJ IDE…": "从 IntelliJ IDE 导入主题…",
+  "Import IntelliJ Theme from File…": "从文件导入 IntelliJ 主题…",
+  "Import Theme from IntelliJ IDE": "从 IntelliJ IDE 导入主题",
+  "Import IntelliJ Theme": "导入 IntelliJ 主题",
+  "IntelliJ theme plugin or theme file": "IntelliJ 主题插件或主题文件",
+  "Could not import the IntelliJ theme": "无法导入 IntelliJ 主题",
+  "Import": "导入",
+  "In use": "使用中",
+  "IntelliJ themes": "IntelliJ 主题",
+  "Looking for IntelliJ themes": "正在查找 IntelliJ 主题",
+  "Looking for IntelliJ themes…": "正在查找 IntelliJ 主题…",
+  "Theme plugins installed in the JetBrains IDEs on this computer. Importing a theme brings every theme of its plugin and applies the chosen one. Colours without an OpenIDEA counterpart keep the default theme colours.": "此计算机上 JetBrains IDE 中安装的主题插件。导入某个主题会一并导入其插件的全部主题，并应用所选主题。没有对应 OpenIDEA 颜色的项保留默认主题的颜色。",
+  "1 theme": "1 个主题",
+  "{count} themes": "{count} 个主题",
+  "No theme plugins found in JetBrains IDEs on this computer. Choose a theme plugin downloaded from the JetBrains Marketplace (.jar or .zip) or a .theme.json file instead.": "在此计算机上的 JetBrains IDE 中未找到主题插件。请改为选择从 JetBrains Marketplace 下载的主题插件（.jar 或 .zip）或 .theme.json 文件。",
   "Marketplace": "插件市场",
+  "Plugin Repository…": "插件仓库…",
+  "Plugin Repository": "插件仓库",
+  "Marketplace index URL:": "插件市场索引 URL：",
+  "Leave empty to use the default repository.": "留空则使用默认仓库。",
   "Could not download plugin": "无法下载插件",
   "Rolled back {name} to {version}": "已将 {name} 回滚到 {version}",
   "Could not roll back": "无法回滚",
   "Could not open the package": "无法打开插件包",
-  "Marketplace index URL (https://…/index.json or a folder path)": "插件市场索引 URL（https://…/index.json 或文件夹路径）",
   "Settings of the plugin; projects can override them.": "插件的设置；项目可以覆盖。",
   "Menus": "菜单",
   "Shortcuts": "快捷键",
@@ -5822,6 +5915,63 @@
   "Copy {addr}": "复制 {addr}",
   "Stop Forwarding Port {remotePort}": "停止转发端口 {remotePort}",
   "Ports": "端口",
+  "GraphQL views": "GraphQL 视图",
+  "Schemas and Project Structure": "架构和项目结构",
+  "Query Result": "查询结果",
+  "Default project-wide schema": "默认项目范围架构",
+  "the configuration is code and is not evaluated": "配置为代码，不会被求值",
+  "schema is empty": "架构为空",
+  "Schema discovery summary": "架构发现摘要",
+  "Schema errors": "架构错误",
+  "No errors found": "未发现错误",
+  "Endpoints": "端点",
+  "No endpoints available in this schema": "此架构中没有可用的端点",
+  "No endpoints available in the default schema": "默认架构中没有可用的端点",
+  "GraphQL actions": "GraphQL 操作",
+  "Discovering GraphQL schemas": "正在发现 GraphQL 架构",
+  "GraphQL schemas": "GraphQL 架构",
+  "Running GraphQL query": "正在运行 GraphQL 查询",
+  "No query results": "没有查询结果",
+  "Add Schema Configuration": "添加架构配置",
+  "Open the project's graphql-config, creating graphql.config.yml when there is none": "打开项目的 graphql-config，没有时创建 graphql.config.yml",
+  "Restart Schema Discovery": "重新发现架构",
+  "Find the project's GraphQL schemas and configurations again": "重新查找项目的 GraphQL 架构和配置",
+  "GraphQL schema discovery failed": "GraphQL 架构发现失败",
+  "Cannot create the GraphQL configuration": "无法创建 GraphQL 配置",
+  "No GraphQL endpoint": "没有 GraphQL 端点",
+  "Declare one under extensions.endpoints in graphql.config.yml.": "请在 graphql.config.yml 的 extensions.endpoints 下声明端点。",
+  "The field type '{name}' is not present when resolving type '{owner}'": "解析类型 '{owner}' 时，字段类型 '{name}' 不存在",
+  "GraphQL editor actions": "GraphQL 编辑器操作",
+  "Open Configuration File": "打开配置文件",
+  "Toggle Variables Editor": "切换变量编辑器",
+  "GraphQL endpoint": "GraphQL 端点",
+  "No endpoints": "没有端点",
+  "Execute GraphQL": "执行 GraphQL",
+  "Rerun Introspection Query": "重新运行内省查询",
+  "Open Introspection Schema": "打开内省架构",
+  "GraphQL variables": "GraphQL 变量",
+  "{types} types, {inputs} inputs, {enums} enums, {directives} directives": "{types} 个类型，{inputs} 个输入，{enums} 个枚举，{directives} 个指令",
+  "Run a query with Execute GraphQL in the toolbar of a GraphQL file.": "在 GraphQL 文件的工具栏中使用“执行 GraphQL”运行查询。",
+  "Query result": "查询结果",
+  "Opens the GraphQL config file for the current file's schema": "打开当前文件所属架构的 GraphQL 配置文件",
+  "Reruns the latest introspection query to update the local schema file": "重新运行最近的内省查询以更新本地架构文件",
+  "Executes the current GraphQL file against the specified GraphQL endpoint": "针对指定的 GraphQL 端点执行当前 GraphQL 文件",
+  "Invalid GraphQL variables": "无效的 GraphQL 变量",
+  "Get GraphQL Schema from Endpoint": "从端点获取 GraphQL 架构",
+  "Replace the contents of {target} with the schema of {name}?": "要用 {name} 的架构替换 {target} 的内容吗？",
+  "Cannot write the GraphQL schema": "无法写入 GraphQL 架构",
+  "{target} did not open in an editor": "{target} 未能在编辑器中打开",
+  "GraphQL schema updated": "GraphQL 架构已更新",
+  "No introspection schema yet": "尚无内省架构",
+  "Run Introspection Query on an endpoint to generate it.": "对端点运行内省查询以生成它。",
+  ", 1 error": "，1 个错误",
+  ", {count} errors": "，{count} 个错误",
+  "GraphQL Environment Variables": "GraphQL 环境变量",
+  "Environment variables actions": "环境变量操作",
+  "{file}: {ms} ms execution time, {size} response": "{file}: 执行时间 {ms} 毫秒，响应 {size}",
+  "GraphQL error": "GraphQL 错误",
+  "GraphQL request to {url} failed.": "对 {url} 的 GraphQL 请求失败。",
+  "Show error": "显示错误",
   "Run to Cursor failed": "运行到光标处失败",
   "Cannot start debugging": "无法开始调试",
   "Cannot attach the debugger": "无法附加调试器",
@@ -5921,5 +6071,122 @@
   "Couldn't create the worktree for #{number}": "无法为 #{number} 创建工作树",
   "Couldn't commit the suggested change": "无法提交建议的更改",
   "Couldn't apply the suggested change": "无法应用建议的更改",
-  "Couldn't resolve the thread": "无法解决讨论串"
+  "Couldn't resolve the thread": "无法解决讨论串",
+  "Could not close comparison": "无法关闭比较窗口",
+  "Could not open comparison": "无法打开比较窗口",
+  "Could not show diff": "无法显示差异",
+  "Back to Changed Files": "返回更改文件列表",
+  "Default (the module's JDK)": "默认（模块的 JDK）",
+  "Use classpath of module": "使用模块的类路径",
+  "Find by main class": "按主类查找",
+  "Pull Members Up…": "上拉成员…",
+  "Push Members Down…": "下推成员…",
+  "Pull Members Up": "上拉成员",
+  "Push Members Down": "下推成员",
+  "Caret should be inside a class that has members to pull up": "光标应位于具有可上拉成员的类中",
+  "Caret should be inside a class that has members to push down": "光标应位于具有可下推成员的类中",
+  "Problems Detected": "检测到问题",
+  "Nothing to change": "没有需要更改的内容",
+  "Pull Members Up from '{name}'": "从 '{name}' 上拉成员",
+  "Push Members Down from '{name}'": "从 '{name}' 下推成员",
+  "Pull up members of {name} to:": "将 {name} 的成员上拉到：",
+  "Push members of {name} down to:": "将 {name} 的成员下推到：",
+  "Checking for conflicts…": "正在检查冲突…",
+  "Destination class": "目标类",
+  "Members to be pulled up": "要上拉的成员",
+  "Members to be pushed down": "要下推的成员",
+  "Member": "成员",
+  "Make abstract": "设为抽象",
+  "Keep abstract": "保留抽象声明",
+  "Methods pulled up to an interface are declared abstract there.": "上拉到接口的方法将在接口中声明为抽象方法。",
+  "The file changed; open the dialog again": "文件已更改，请重新打开对话框",
+  "Type search query to find in files": "输入搜索内容以在文件中查找",
+  "Invalid pattern": "模式无效",
+  "Searching…": "正在搜索…",
+  "No search text entered": "没有输入搜索内容",
+  "Search with Regex": "使用正则表达式搜索",
+  "Search option used: {label}": "搜索已用选项：{label}",
+  "Search options used:": "搜索已用选项：",
+  "Clear option": "清除选项",
+  "Clear all options": "清除所有选项",
+  "Open results in new tab": "在新标签打开",
+  "Use {next} and {previous} to select usages": "使用 {next} 和 {previous} 选择用法",
+  "Replace preview": "替换预览",
+  "Bookmarked Commits": "已添加书签的提交",
+  "Open Another Log Tab": "打开另一个日志标签页",
+  "In Tool Window": "在工具窗口中",
+  "In Editor": "在编辑器中",
+  "External Repository…": "外部仓库…",
+  "Recent Filters": "最近使用的过滤条件",
+  "All commits": "所有提交",
+  "Incoming Commits First": "优先显示传入提交",
+  "Linearize Merges": "线性显示合并",
+  "Remove Commit Bookmark": "移除提交书签",
+  "Bookmark Commit": "为提交添加书签",
+  "Browse Repository at Revision": "浏览此修订版本的仓库",
+  "Signature": "签名",
+  "Commit is outside the loaded history": "提交位于已加载历史记录之外",
+  "Move Left": "向左移动",
+  "Move Right": "向右移动",
+  "Reset Width": "重置宽度",
+  "Resize {title} column": "调整{title}列宽度",
+  "Commit graph": "提交关系图",
+  "Go to connected commit": "转到关联提交",
+  "Expand this fragment": "展开此片段",
+  "Collapse this fragment": "折叠此片段",
+  "Collapse or expand this branch": "折叠或展开此分支",
+  "Diff Preview Location": "差异预览位置",
+  "Parent": "父提交",
+  "Commit {shortId}": "提交 {shortId}",
+  "Expand Commit Message": "展开提交消息",
+  "Committed by": "提交者",
+  "Merge of": "合并自",
+  "Containing branches": "包含此提交的分支",
+  "Could not load containing branches or signature details": "无法加载包含此提交的分支或签名详情",
+  "Could not verify": "无法验证",
+  "Choose an absolute path inside a selected repository.": "请选择所选仓库内的绝对路径。",
+  "Filter by Paths": "按多个路径过滤",
+  "Files and folders": "文件和文件夹",
+  "Additional absolute path": "其他绝对路径",
+  "Selected paths": "已选路径",
+  "Open Git Log": "打开 Git 日志",
+  "Could not open Git log": "无法打开 Git 日志",
+  "Search repository files": "搜索仓库文件",
+  "Repository files": "仓库文件",
+  "Open Revision in Editor": "在编辑器中打开修订版本",
+  "Open External Git Log…": "打开外部 Git 日志…",
+  "Repository at {slice}": "修订版本 {slice} 的仓库",
+  "Select a file to view its repository version": "选择文件以查看其仓库版本",
+  "Branches, patterns, exclusions or ranges (comma-separated):": "分支、模式、排除项或范围（逗号分隔）：",
+  "Select Parent Commit": "选择父提交",
+  "Select Child Commit": "选择子提交",
+  "Select Repository Commit": "选择仓库中的提交",
+  "Good signature with unknown trust": "签名有效，信任状态未知",
+  "Bad signature": "签名无效",
+  "Expired signature": "签名已过期",
+  "Expired signing key": "签名密钥已过期",
+  "Revoked signing key": "签名密钥已撤销",
+  "Load Newer Commits": "加载较新的提交",
+  "Shallow history boundary": "浅克隆历史边界",
+  "All Parents": "所有父提交",
+  "Show Commit Bookmark": "显示提交书签",
+  "Indexing Git log: {indexed} / {total}": "正在索引 Git 日志：{indexed} / {total}",
+  "Resume Indexing": "继续索引",
+  "Pause Indexing": "暂停索引",
+  "Incompatible": "不兼容",
+  "Needs plugin API {engine}. Update OpenIDEA to install it.": "需要插件 API {engine}。请更新 OpenIDEA 后再安装。",
+  "Icon Themes": "图标主题",
+  "Linters & Formatters": "检查与格式化",
+  "AI": "人工智能",
+  "Frameworks": "框架",
+  "All Categories": "全部分类",
+  "Category": "分类",
+  "Update All Plugins": "更新全部插件",
+  "Update All Plugins ({updates})": "更新全部插件（{updates}）",
+  "Update All": "全部更新",
+  "Show Plugins": "查看插件",
+  "Plugin update available": "有插件可更新",
+  "{length} plugin updates available": "{length} 个插件可更新",
+  "Updated {updated} plugins": "已更新 {updated} 个插件",
+  "This version is signed with a different key than the installed one, and the publisher's earlier key doesn't vouch for it. Only continue if you know the publisher changed keys.": "此版本的签名密钥与已安装的版本不同，且发布者之前的密钥没有为它背书。只有在确认发布者更换了密钥时才继续。"
 }
diff --git a/src/platform/locales/textCatalog.test.ts b/src/platform/locales/textCatalog.test.ts
index b35f033d..58691210 100644
--- a/src/platform/locales/textCatalog.test.ts
+++ b/src/platform/locales/textCatalog.test.ts
@@ -118,6 +118,7 @@ const UNTRANSLATED = new Set<string>([
   "basedpyright",
   "Cargo Check",
   "Clippy",
+  "ClickHouse",
   "CockroachDB",
   "CodeLLDB",
   "CodeLLDB (Rust, C, C++)",
@@ -138,6 +139,7 @@ const UNTRANSLATED = new Set<string>([
   "Go",
   "Godot",
   "Gradle",
+  "GraphQL",
   "Greenplum",
   "Java",
   "java-debug (Java)",
diff --git a/src/platform/locales/zh.json b/src/platform/locales/zh.json
index 20801b94..3dbaef00 100644
--- a/src/platform/locales/zh.json
+++ b/src/platform/locales/zh.json
@@ -242,6 +242,8 @@
   "menu.refactor.extractVariable": "引入变量…",
   "menu.refactor.inline": "内联…",
   "menu.refactor.move": "移动…",
+  "menu.refactor.pullMembersUp": "上拉成员…",
+  "menu.refactor.pushMembersDown": "下推成员…",
   "menu.refactor.rename": "重命名…",
   "menu.refactor.safeDelete": "安全删除…",
   "menu.refactor.thisMenu": "重构此项…",
@@ -338,6 +340,7 @@
   "menu.vcs.addToVcs": "添加到 VCS",
   "menu.vcs.compareWithBranch": "与分支或修订比较…",
   "menu.vcs.showHistory": "显示历史记录",
+  "menu.vcs.showHistoryForSelection": "显示所选内容的历史记录",
   "menu.build": "构建",
   "menu.build.buildProject": "构建项目",
   "menu.build.buildModule": "构建模块",
@@ -447,5 +450,7 @@
   "menu.editor.contextInfo": "上下文信息",
   "run.services.configurationCount": "{count} 个配置",
   "search.bookmarks.count": "{count} 个书签",
+  "search.find.matches": "在 {files} 个文件中有 {matches} 个匹配项",
+  "search.find.matchesIncomplete": "在 {files}+ 个文件中有 {matches}+ 个匹配项",
   "settings.zoom.hint": "使用 {zoomIn} 或 {zoomOut} 更改，使用 {reset} 重置为 100%"
 }
diff --git a/src/platform/pointerFocus.test.ts b/src/platform/pointerFocus.test.ts
new file mode 100644
index 00000000..613d2bfc
--- /dev/null
+++ b/src/platform/pointerFocus.test.ts
@@ -0,0 +1,45 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { installPointerFocus } from "./pointerFocus";
+
+let uninstall: () => void;
+beforeEach(() => {
+  document.body.innerHTML = `
+    <button id="tab" role="tab"><span id="label">go-app</span></button>
+    <button id="other">Other</button>
+    <div id="row" role="treeitem" tabindex="0">row</div>`;
+  uninstall = installPointerFocus();
+});
+afterEach(() => uninstall());
+
+const el = (id: string) => document.getElementById(id)!;
+const press = (id: string) => el(id).dispatchEvent(new PointerEvent("pointerdown", { bubbles: true }));
+const key = (k: string) => document.dispatchEvent(new KeyboardEvent("keydown", { key: k, bubbles: true }));
+const marked = (id: string) => el(id).hasAttribute("data-pointer-focus");
+
+describe("installPointerFocus", () => {
+  it("marks the control under a press, not other focusable elements", () => {
+    press("label");
+    press("row");
+    expect([marked("tab"), marked("row")]).toEqual([true, false]);
+  });
+
+  it("keeps the mark when focus comes back without keyboard navigation (a popup closed with Esc)", () => {
+    press("tab");
+    el("tab").focus();
+    el("other").focus();
+    key("Escape");
+    el("tab").focus();
+    expect(marked("tab")).toBe(true);
+  });
+
+  it("clears the mark when Tab or an arrow key moves focus onto the control", () => {
+    press("tab");
+    press("other");
+    key("Tab");
+    el("tab").focus();
+    expect(marked("tab")).toBe(false);
+    key("ArrowRight");
+    el("other").focus();
+    expect(marked("other")).toBe(false);
+  });
+});
diff --git a/src/platform/pointerFocus.ts b/src/platform/pointerFocus.ts
new file mode 100644
index 00000000..3901470b
--- /dev/null
+++ b/src/platform/pointerFocus.ts
@@ -0,0 +1,34 @@
+/**
+ * No focus ring on a control the user only clicked. The webview focuses a clicked button and
+ * the focus outlives the click (across window-tab switches, and popups hand it back to their
+ * trigger); the next keystroke then switches the engine to keyboard modality and rings a button
+ * that was never reached by keyboard. Focus itself stays put (actions resolve their context from
+ * it): a pressed control is marked, `global.css` drops the ring of marked controls, and moving
+ * focus onto one with Tab or the arrow keys clears its mark.
+ */
+const CONTROL = "button, [role='button'], [role='tab'], a[href], summary";
+const MARK = "data-pointer-focus";
+const NAVIGATION = new Set(["Tab", "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown", "Home", "End"]);
+
+export function installPointerFocus(win: Window = window): () => void {
+  const doc = win.document;
+  let navigating = false;
+  const onPointerDown = (e: PointerEvent) => {
+    navigating = false;
+    if (e.target instanceof Element) e.target.closest(CONTROL)?.setAttribute(MARK, "");
+  };
+  const onKeyDown = (e: KeyboardEvent) => {
+    navigating = NAVIGATION.has(e.key);
+  };
+  const onFocusIn = (e: FocusEvent) => {
+    if (navigating && e.target instanceof Element) e.target.removeAttribute(MARK);
+  };
+  doc.addEventListener("pointerdown", onPointerDown, true);
+  doc.addEventListener("keydown", onKeyDown, true);
+  doc.addEventListener("focusin", onFocusIn, true);
+  return () => {
+    doc.removeEventListener("pointerdown", onPointerDown, true);
+    doc.removeEventListener("keydown", onKeyDown, true);
+    doc.removeEventListener("focusin", onFocusIn, true);
+  };
+}
diff --git a/src/platform/projectPresentation.test.ts b/src/platform/projectPresentation.test.ts
index 68a3d264..e2dc62c1 100644
--- a/src/platform/projectPresentation.test.ts
+++ b/src/platform/projectPresentation.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect } from "vitest";
 import { buildPresentation, isModuleFolder, moduleFolderIcon } from "./projectPresentation";
 import type { BuildModel } from "./ipc";
 
-const model = (partial: unknown) => ({ maven: null, gradle: null, ...(partial as object) }) as BuildModel;
+const model = (partial: unknown) => ({ maven: null, gradle: [], ...(partial as object) }) as BuildModel;
 describe("build presentation context", () => {
   it.each(["maven", "gradle"] as const)("uses distinct %s root and nested module glyphs", (tool) => {
     const modules = new Map([
@@ -45,12 +45,14 @@ describe("build presentation context", () => {
   it("includes Gradle root and nested project directories", () => {
     const context = buildPresentation(
       model({
-        gradle: {
-          projects: [
-            { dir: "", tasks: [] },
-            { dir: "lib/core", tasks: [] },
-          ],
-        },
+        gradle: [
+          {
+            projects: [
+              { dir: "", tasks: [] },
+              { dir: "lib/core", tasks: [] },
+            ],
+          },
+        ],
       }),
     );
     expect([...context.modules]).toEqual([
@@ -67,9 +69,27 @@ describe("build presentation context", () => {
         }),
       ).spring,
     ).toBe(true);
-    expect(buildPresentation(model({ gradle: { projects: [{ dir: "", tasks: [{ name: "bootRun" }] }] } })).spring).toBe(
-      true,
-    );
+    expect(
+      buildPresentation(model({ gradle: [{ projects: [{ dir: "", tasks: [{ name: "bootRun" }] }] }] })).spring,
+    ).toBe(true);
   });
   it("keeps plain folders plain", () => expect(buildPresentation(model({})).modules.size).toBe(0));
 });
+
+it("includes modules and Spring tasks from every independently linked Gradle build", () => {
+  const context = buildPresentation(
+    model({
+      gradle: [
+        {
+          projects: [
+            { dir: "first", tasks: [] },
+            { dir: "first/app", tasks: [] },
+          ],
+        },
+        { projects: [{ dir: "second", tasks: [{ name: "bootRun" }] }] },
+      ],
+    }),
+  );
+  expect([...context.modules.keys()]).toEqual(["first", "first/app", "second"]);
+  expect(context.spring).toBe(true);
+});
diff --git a/src/platform/projectPresentation.ts b/src/platform/projectPresentation.ts
index cc6f4f10..1a588eb1 100644
--- a/src/platform/projectPresentation.ts
+++ b/src/platform/projectPresentation.ts
@@ -14,13 +14,13 @@ export const useBuildPresentation = create<BuildPresentation>(() => EMPTY);
 export function buildPresentation(model: BuildModel): BuildPresentation {
   const modules = new Map<string, "maven" | "gradle">();
   for (const p of model.maven?.projects ?? []) modules.set(p.dir, "maven");
-  for (const p of model.gradle?.projects ?? []) modules.set(p.dir, "gradle");
+  for (const p of (model.gradle ?? []).flatMap((g) => g.projects)) modules.set(p.dir, "gradle");
   const spring =
     (model.maven?.projects ?? []).some(
       (p) =>
         p.dependencies.some((d) => d.groupId.startsWith("org.springframework")) ||
         p.plugins.some((p) => p.groupId.startsWith("org.springframework")),
-    ) || (model.gradle?.projects ?? []).some((p) => p.tasks.some((t) => t.name === "bootRun"));
+    ) || (model.gradle ?? []).some((g) => g.projects.some((p) => p.tasks.some((t) => t.name === "bootRun")));
   return { modules, spring };
 }
 
diff --git a/src/platform/reordered-tap-click.test.ts b/src/platform/reordered-tap-click.test.ts
new file mode 100644
index 00000000..e415ac99
--- /dev/null
+++ b/src/platform/reordered-tap-click.test.ts
@@ -0,0 +1,116 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { installReorderedTapClick } from "./reordered-tap-click";
+
+/** An event as the engine would deliver it: native `timeStamp`, mouse pointer. */
+function ev(type: string, timeStamp: number, extra: { detail?: number; pointerType?: string } = {}) {
+  const e = new MouseEvent(type, { bubbles: true, cancelable: true, detail: extra.detail ?? 0 });
+  Object.defineProperty(e, "timeStamp", { value: timeStamp });
+  if (type.startsWith("pointer")) Object.assign(e, { pointerType: extra.pointerType ?? "mouse", isPrimary: true });
+  return e;
+}
+
+describe("installReorderedTapClick", () => {
+  let uninstall: () => void;
+  let el: HTMLElement;
+  let log: string[];
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    uninstall = installReorderedTapClick({ isTrusted: () => true });
+    el = document.body.appendChild(document.createElement("div"));
+    log = [];
+    for (const t of ["pointerdown", "pointerup", "mouseup", "click", "dblclick"])
+      el.addEventListener(t, (e) => log.push(`${t}:${(e as MouseEvent).detail}`));
+  });
+  afterEach(() => {
+    uninstall();
+    el.remove();
+    vi.useRealTimers();
+  });
+
+  /** WebKit's order for a tap while an input method is active: up, then the stale down. */
+  const reversedTap = (up: number, down: number, detail = 1) => {
+    el.dispatchEvent(ev("pointerup", up));
+    el.dispatchEvent(ev("mouseup", up));
+    el.dispatchEvent(ev("pointerdown", down));
+    el.dispatchEvent(ev("mousedown", down, { detail }));
+    vi.runAllTimers();
+  };
+  const inOrderTap = (down: number, up: number) => {
+    el.dispatchEvent(ev("pointerdown", down));
+    el.dispatchEvent(ev("mousedown", down, { detail: 1 }));
+    el.dispatchEvent(ev("pointerup", up));
+    el.dispatchEvent(ev("mouseup", up));
+    el.dispatchEvent(ev("click", up, { detail: 1 }));
+    vi.runAllTimers();
+  };
+
+  it("leaves an in-order tap alone", () => {
+    inOrderTap(10, 20);
+    expect(log).toEqual(["pointerdown:0", "pointerup:0", "mouseup:0", "click:1"]);
+  });
+
+  it("finishes a reordered tap with exactly one click", () => {
+    reversedTap(1393, 1386);
+    // The engine's own pointerup/mouseup, then ours; one click only.
+    expect(log.filter((l) => l.startsWith("click"))).toEqual(["click:1"]);
+    expect(log.filter((l) => l.startsWith("pointerup"))).toHaveLength(2);
+  });
+
+  it("gives the next press the pointerdown the engine skips, and keeps its click", () => {
+    reversedTap(1393, 1386);
+    log = [];
+    // The engine still considers the button down: the next tap starts with a bare mousedown.
+    el.dispatchEvent(ev("mousedown", 2000, { detail: 1 }));
+    el.dispatchEvent(ev("pointerup", 2050));
+    el.dispatchEvent(ev("mouseup", 2050));
+    el.dispatchEvent(ev("click", 2050, { detail: 1 }));
+    vi.runAllTimers();
+    expect(log).toEqual(["pointerdown:0", "pointerup:0", "mouseup:0", "click:1"]);
+  });
+
+  it("adds no pointerdown to an in-order press", () => {
+    inOrderTap(10, 20);
+    inOrderTap(30, 40);
+    expect(log.filter((l) => l.startsWith("pointerdown"))).toEqual(["pointerdown:0", "pointerdown:0"]);
+  });
+
+  it("adds no pointerdown to a press another pointer type started", () => {
+    el.dispatchEvent(ev("pointerdown", 10, { pointerType: "touch" }));
+    el.dispatchEvent(ev("mousedown", 10, { detail: 1 }));
+    expect(log).toEqual(["pointerdown:0"]);
+  });
+
+  it("does not drop the click of an in-order tap that follows a reordered one", () => {
+    reversedTap(1393, 1386);
+    inOrderTap(3000, 3050);
+    expect(log.filter((l) => l.startsWith("click"))).toEqual(["click:1", "click:1"]);
+  });
+
+  it("repeats the double-click detail of the stale press", () => {
+    reversedTap(1393, 1386, 2);
+    expect(log).toContain("click:2");
+    expect(log).toContain("dblclick:2");
+  });
+
+  it("ignores touch and pen pointers", () => {
+    el.dispatchEvent(ev("pointerup", 1393, { pointerType: "touch" }));
+    el.dispatchEvent(ev("pointerdown", 1386, { pointerType: "touch" }));
+    vi.runAllTimers();
+    expect(log).toEqual(["pointerup:0", "pointerdown:0"]);
+  });
+
+  it("does nothing when the target left the document before the tick", () => {
+    el.dispatchEvent(ev("pointerup", 1393));
+    el.dispatchEvent(ev("pointerdown", 1386));
+    el.remove();
+    vi.runAllTimers();
+    expect(log).toEqual(["pointerup:0", "pointerdown:0"]);
+  });
+
+  it("stops intercepting after uninstall", () => {
+    uninstall();
+    reversedTap(1393, 1386);
+    expect(log.filter((l) => l.startsWith("click"))).toEqual([]);
+  });
+});
diff --git a/src/platform/reordered-tap-click.ts b/src/platform/reordered-tap-click.ts
new file mode 100644
index 00000000..b2c2d048
--- /dev/null
+++ b/src/platform/reordered-tap-click.ts
@@ -0,0 +1,134 @@
+/**
+ * macOS WebKit routes mouse events through the input method while an editable element has
+ * focus, and with a third-party input method it can hand the page a tap as `pointerup` ->
+ * `pointerdown` (WebKit bug 219670). The press then has no release: the tap's click is lost,
+ * and the engine, which still considers the button down, starts the next tap with a bare
+ * `mousedown` (no `pointerdown`). `pointerdown.timeStamp` stays native, so a press stamped no
+ * later than the `pointerup` just before it is a reordered tap: finish it with a synthetic
+ * `pointerup`/`mouseup`/`click`, and give the next press the `pointerdown` the engine skips.
+ * The next tap's own click lands on its own target, so it is left alone.
+ *
+ * TODO: remove once the minimum supported macOS ships a WebKit with bug 219670 fixed (WebKit#76581).
+ */
+interface Options {
+  win?: Window;
+  /** Tests dispatch untrusted events. */
+  isTrusted?: (e: Event) => boolean;
+}
+
+const primaryMouse = (e: PointerEvent) => e.pointerType === "mouse" && e.isPrimary && e.button === 0;
+
+/** The engine's id of the mouse pointer (the only one a reordered tap concerns). */
+const MOUSE_POINTER_ID = 1;
+
+export function installReorderedTapClick({
+  win = window,
+  isTrusted: trusted = (e) => e.isTrusted,
+}: Options = {}): () => void {
+  // Events this shim dispatches must not be mistaken for the engine's.
+  const own = new WeakSet<Event>();
+  const isTrusted = (e: Event) => trusted(e) && !own.has(e);
+  const send = (target: Element, e: Event) => {
+    own.add(e);
+    target.dispatchEvent(e);
+  };
+  let lastUp: number | null = null;
+  // A pointer is down as far as the page has been told; a mouse press without one is a skipped pointerdown.
+  let down = false;
+  let pending: { target: Element; detail: number; x: number; y: number; mods: MouseEventInit } | null = null;
+
+  const mods = (e: MouseEvent): MouseEventInit => ({
+    ctrlKey: e.ctrlKey,
+    shiftKey: e.shiftKey,
+    altKey: e.altKey,
+    metaKey: e.metaKey,
+  });
+
+  const onPointerUp = (e: PointerEvent) => {
+    if (!isTrusted(e)) return;
+    down = false;
+    if (primaryMouse(e)) lastUp = e.timeStamp;
+  };
+
+  const onPointerCancel = (e: PointerEvent) => {
+    if (isTrusted(e)) down = false;
+  };
+
+  const onPointerDown = (e: PointerEvent) => {
+    if (!isTrusted(e)) return;
+    down = true;
+    const before = lastUp;
+    lastUp = null;
+    pending = null;
+    if (!primaryMouse(e) || before === null || e.timeStamp > before) return;
+    if (!(e.target instanceof Element)) return;
+    pending = { target: e.target, detail: 1, x: e.clientX, y: e.clientY, mods: mods(e) };
+    // After this tick the page's own pointerdown/mousedown handlers have run, as for an in-order tap.
+    setTimeout(finish);
+  };
+
+  const onMouseDown = (e: MouseEvent) => {
+    if (!isTrusted(e) || e.button !== 0) return;
+    if (pending) {
+      pending.detail = e.detail || 1;
+      return;
+    }
+    if (down || !(e.target instanceof Element)) return;
+    down = true;
+    send(
+      e.target,
+      new PointerEvent("pointerdown", {
+        bubbles: true,
+        cancelable: true,
+        composed: true,
+        pointerId: MOUSE_POINTER_ID,
+        pointerType: "mouse",
+        isPrimary: true,
+        button: 0,
+        buttons: 1,
+        clientX: e.clientX,
+        clientY: e.clientY,
+        screenX: e.screenX,
+        screenY: e.screenY,
+        ...mods(e),
+      }),
+    );
+  };
+
+  const finish = () => {
+    const tap = pending;
+    pending = null;
+    if (!tap) return;
+    down = false;
+    if (!tap.target.isConnected) return;
+    const init = {
+      bubbles: true,
+      cancelable: true,
+      composed: true,
+      button: 0,
+      buttons: 0,
+      clientX: tap.x,
+      clientY: tap.y,
+      ...tap.mods,
+    };
+    send(
+      tap.target,
+      new PointerEvent("pointerup", { ...init, pointerId: MOUSE_POINTER_ID, pointerType: "mouse", isPrimary: true }),
+    );
+    send(tap.target, new MouseEvent("mouseup", { ...init, detail: tap.detail }));
+    send(tap.target, new MouseEvent("click", { ...init, detail: tap.detail }));
+    if (tap.detail === 2) send(tap.target, new MouseEvent("dblclick", { ...init, detail: 2 }));
+  };
+
+  const capture = { capture: true };
+  win.addEventListener("pointerup", onPointerUp as EventListener, capture);
+  win.addEventListener("pointercancel", onPointerCancel as EventListener, capture);
+  win.addEventListener("pointerdown", onPointerDown as EventListener, capture);
+  win.addEventListener("mousedown", onMouseDown as EventListener, capture);
+  return () => {
+    win.removeEventListener("pointerup", onPointerUp as EventListener, capture);
+    win.removeEventListener("pointercancel", onPointerCancel as EventListener, capture);
+    win.removeEventListener("pointerdown", onPointerDown as EventListener, capture);
+    win.removeEventListener("mousedown", onMouseDown as EventListener, capture);
+  };
+}
diff --git a/src/platform/themes.test.ts b/src/platform/themes.test.ts
index d8df8716..d8d332fe 100644
--- a/src/platform/themes.test.ts
+++ b/src/platform/themes.test.ts
@@ -8,6 +8,7 @@ import {
   parsePluginThemeRef,
   pluginThemeRef,
   themeChoices,
+  themeGroups,
   themeKind,
   useContributedThemes,
 } from "./themes";
@@ -19,6 +20,7 @@ import {
   resolveThemeId,
   themeSelectOptions,
 } from "@/workbench/theme";
+import { themeItems } from "@/workbench/quickSwitch";
 import { validateSettings } from "@/features/settings/model/schema";
 import { applyPluginTheme } from "@/features/plugins/bridge";
 
@@ -108,7 +110,10 @@ describe("plugin themes", () => {
     const remove = addContributedTheme({ id: ref, label: "Night", kind: "dark", origin: "Acme" });
     expect(isThemeAvailable(ref)).toBe(true);
     expect(themeChoices().at(-1)).toMatchObject({ id: ref, label: "Night" });
-    expect(themeSelectOptions(themeChoices(), ref).at(-1)).toEqual({ value: ref, label: "Night", detail: "Acme" });
+    expect(themeSelectOptions(themeChoices(), ref).slice(-2)).toEqual([
+      { value: "plugin:acme.night", label: "Acme", section: true },
+      { value: ref, label: "Night" },
+    ]);
     // Its tokens apply over the default of its kind.
     expect(resolveThemeId(a, false)).toBe("dark");
 
@@ -116,7 +121,55 @@ describe("plugin themes", () => {
     expect(isThemeAvailable(ref)).toBe(false);
     // Its plugin off: the base of the kind it had shows, and the pickers keep it listed.
     expect(resolveThemeId(a, false)).toBe("dark");
-    expect(themeSelectOptions(themeChoices(), ref).at(-1)).toMatchObject({ value: ref, label: "night" });
+    expect(themeSelectOptions(themeChoices(), ref).slice(-2)).toMatchObject([
+      { value: "plugin:acme.night", label: "acme.night", section: true },
+      { value: ref, label: "night", detail: "Plugin not enabled" },
+    ]);
+    // Its plugin live but the theme gone (an update dropped it): listed under that plugin's heading.
+    const stay = addContributedTheme({
+      id: pluginThemeRef("acme.night", "dawn"),
+      label: "Dawn",
+      kind: "dark",
+      origin: "Acme",
+    });
+    addContributedTheme({ id: pluginThemeRef("zeta.blue", "blue"), label: "Blue", kind: "dark", origin: "Zeta" });
+    expect(
+      themeSelectOptions(themeChoices(), ref)
+        .slice(BUILTIN_THEMES.length)
+        .map((o) => (o.section ? `[${o.label}]` : o.label)),
+    ).toEqual(["[Acme]", "Dawn", "night", "[Zeta]", "Blue"]);
+    stay();
+  });
+
+  it("are grouped by plugin: the built-in ones first, then each plugin's by name", () => {
+    const theme = (plugin: string, id: string, label: string, origin: string) =>
+      addContributedTheme({ id: pluginThemeRef(plugin, id), label, kind: "dark", origin });
+    theme("intellij.dracula", "dracula", "Dracula", "Dracula Theme");
+    theme("acme.night", "night", "Night", "Acme");
+    theme("intellij.dracula", "alucard", "Dracula Alucard", "Dracula Theme");
+    theme("acme.night", "dawn", "Dawn", "Acme");
+
+    const groups = themeGroups();
+    expect(groups.map((g) => [g.origin, g.themes.map((t) => t.label)])).toEqual([
+      [undefined, BUILTIN_THEMES.map((t) => t.label)],
+      ["Acme", ["Dawn", "Night"]],
+      ["Dracula Theme", ["Dracula", "Dracula Alucard"]],
+    ]);
+    expect(themeChoices().map((t) => t.label)).toEqual(groups.flatMap((g) => g.themes.map((t) => t.label)));
+
+    // Menus draw a line between the groups, as IDEA's Theme list.
+    const items = themeItems("light");
+    const lines = items.flatMap((item, i) => (item.kind === "separator" ? [i] : []));
+    expect(lines).toEqual([BUILTIN_THEMES.length, BUILTIN_THEMES.length + 3]);
+    expect(items.find((i) => i.kind !== "separator" && "checked" in i && i.checked)).toMatchObject({
+      label: "Islands Light",
+    });
+    // Selects head each plugin's themes with its name.
+    expect(
+      themeSelectOptions(themeChoices())
+        .slice(BUILTIN_THEMES.length)
+        .map((o) => (o.section ? `[${o.label}]` : o.label)),
+    ).toEqual(["[Acme]", "Dawn", "Night", "[Dracula Theme]", "Dracula", "Dracula Alucard"]);
   });
 
   it("parse only well-formed references", () => {
diff --git a/src/platform/themes.ts b/src/platform/themes.ts
index 9eaa5ad6..4fd4ff74 100644
--- a/src/platform/themes.ts
+++ b/src/platform/themes.ts
@@ -77,11 +77,58 @@ export function addContributedTheme(theme: ThemeChoice): () => void {
   return () => useContributedThemes.setState((s) => ({ themes: s.themes.filter((t) => t !== theme) }));
 }
 
-/** Every theme that can be selected: the built-in ones, then the contributed ones by name. */
+/** Themes of one origin: the built-in ones, or one plugin's. */
+export interface ThemeGroup {
+  /** The contributing plugin; none for the built-in themes. */
+  pluginId?: string;
+  /** The plugin's name. */
+  origin?: string;
+  themes: ThemeChoice[];
+}
+
+/** The selectable themes by origin: the built-in ones, then each plugin's by its name, themes by name. */
+export function themeGroups(
+  contributed: readonly ThemeChoice[] = useContributedThemes.getState().themes,
+): ThemeGroup[] {
+  const plugins = new Map<string, ThemeGroup>();
+  for (const theme of contributed) {
+    const pluginId = parsePluginThemeRef(theme.id)?.pluginId ?? "";
+    const group = plugins.get(pluginId) ?? { pluginId, origin: theme.origin, themes: [] };
+    plugins.set(pluginId, group);
+    group.themes.push(theme);
+  }
+  const name = (g: ThemeGroup) => g.origin ?? g.pluginId ?? "";
+  const groups = [...plugins.values()].sort(
+    (a, b) => name(a).localeCompare(name(b)) || (a.pluginId ?? "").localeCompare(b.pluginId ?? ""),
+  );
+  for (const group of groups) group.themes.sort((a, b) => a.label.localeCompare(b.label));
+  return [{ themes: [...BUILTIN_THEMES] }, ...groups];
+}
+
+/** Every theme that can be selected, in the order of `themeGroups`. */
 export function themeChoices(
   contributed: readonly ThemeChoice[] = useContributedThemes.getState().themes,
 ): ThemeChoice[] {
-  return [...BUILTIN_THEMES, ...[...contributed].sort((a, b) => a.label.localeCompare(b.label))];
+  return themeGroups(contributed).flatMap((g) => g.themes);
+}
+
+/**
+ * Shows a plugin theme in this window without selecting it, `null` none, or
+ * `"selected"` the one selected again. The plugins feature provides it.
+ */
+export type PluginThemePreview = (theme: PluginThemeRef | null | "selected") => void;
+
+let pluginThemePreview: PluginThemePreview | null = null;
+
+export function providePluginThemePreview(preview: PluginThemePreview): () => void {
+  pluginThemePreview = preview;
+  return () => {
+    if (pluginThemePreview === preview) pluginThemePreview = null;
+  };
+}
+
+export function previewPluginTheme(theme: PluginThemeRef | null | "selected"): void {
+  pluginThemePreview?.(theme);
 }
 
 /** Whether `id` can be applied now (a contributed theme's plugin may be off). */
@@ -102,11 +149,63 @@ export function baseTheme(id: ThemeChoiceId, fallback: BuiltinThemeId = "light")
 
 // --- file icon themes (plugins) -------------------------------------------------
 
+export interface IconThemePack {
+  id: string;
+  name: string;
+  enabled: boolean;
+}
+
+export interface IconThemeVariant {
+  id: string;
+  name: string;
+  default: string;
+  options: readonly { id: string; name: string }[];
+}
+
+export type IconThemeSettingOption =
+  | "hideFiles"
+  | "hideFolders"
+  | "hideUiIcons"
+  | "hidePsiIcons"
+  | "hollowFolders"
+  | "groups"
+  | "choice"
+  | "accent"
+  | "monochrome"
+  | "saturation"
+  | "opacity"
+  | "iconSize"
+  | "rowHeight";
+
+export interface IconThemeSettingItem {
+  option: IconThemeSettingOption;
+  label?: string | null;
+  hint?: string | null;
+  invert?: boolean;
+  choice?: string | null;
+  columns?: number | null;
+  default?: number | string | null;
+}
+
+export interface IconThemeSettingsSection {
+  title: string;
+  items: readonly IconThemeSettingItem[];
+}
+
+export interface IconThemeDetails {
+  groups: readonly IconThemePack[];
+  choices: readonly IconThemeVariant[];
+  accent: boolean;
+  settings: readonly IconThemeSettingsSection[];
+}
+
 export interface IconThemeChoice {
   /** `<pluginId>/<themeId>`: the `appearance.fileIconTheme` value. */
   id: string;
   label: string;
   origin?: string;
+  settingsPage?: string;
+  details?: () => Promise<IconThemeDetails | null>;
 }
 
 /** File icon themes of live plugins, for Settings › Appearance. */
diff --git a/src/styles/global.css b/src/styles/global.css
index 31ff0c06..9169b90b 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -41,6 +41,8 @@ html[data-selection-lock] *:not([data-selection-scope], [data-selection-scope] *
 input:not([type="checkbox"], [type="radio"], [type="range"], [type="color"]),
 textarea,
 [contenteditable="true"] {
+  -webkit-user-select: text;
+  user-select: text;
   cursor: text;
 }
 
@@ -152,6 +154,12 @@ a:hover {
   outline-offset: -2px;
 }
 
+/* A control the user only clicked keeps no ring once a keystroke turns on keyboard modality
+   (`platform/pointerFocus.ts`); `!important` covers the components' own focus rings. */
+[data-pointer-focus]:focus-visible {
+  outline: none !important;
+}
+
 ::selection {
   background: var(--bg-editor-selection);
 }
@@ -160,6 +168,54 @@ a:hover {
   font-family: var(--font-mono);
 }
 
+/* Syntax colours for read-only previews and result lines: the `tok-*` classes
+   CodeMirror's `classHighlighter` emits (`codeHighlighter`/`tokenSpans`). One
+   shared set instead of a copy per view module; editor tooltips have the same
+   colours scoped to their DOM in editor/lsp/theme.ts. The main editor is
+   unaffected: it colours itself with the inline `HighlightStyle` in
+   editor/core/cm/highlight.ts. */
+.tok-keyword,
+.tok-modifier,
+.tok-controlKeyword,
+.tok-operatorKeyword {
+  color: var(--syn-keyword);
+}
+.tok-string,
+.tok-string2 {
+  color: var(--syn-string);
+}
+.tok-number,
+.tok-bool,
+.tok-atom {
+  color: var(--syn-number);
+}
+.tok-typeName,
+.tok-className,
+.tok-namespace {
+  color: var(--syn-type);
+}
+.tok-comment {
+  color: var(--syn-comment);
+  font-style: var(--syn-comment-style);
+}
+.tok-meta,
+.tok-macroName {
+  color: var(--syn-annotation);
+}
+.tok-propertyName {
+  color: var(--syn-property);
+}
+.tok-variableName.tok-definition {
+  color: var(--syn-function);
+}
+.tok-punctuation,
+.tok-operator {
+  color: var(--syn-punct);
+}
+.tok-invalid {
+  color: var(--syn-invalid);
+}
+
 /* macOS-style overlay scrollbars (ScrollBar.Mac.thumbColor / hoverThumbColor) */
 ::-webkit-scrollbar {
   width: 10px;
diff --git a/src/styles/tokens.css b/src/styles/tokens.css
index a572274a..6324353c 100644
--- a/src/styles/tokens.css
+++ b/src/styles/tokens.css
@@ -116,6 +116,7 @@ html {
   --syn-number: #2aacb8;
   --syn-punct: #bcbec4;
   --syn-variable: #bcbec4;
+  --syn-global: var(--syn-variable);
   --syn-param: #bcbec4;
   --syn-property: #c77dbb;
   --syn-constant: #c77dbb;
@@ -229,7 +230,8 @@ html {
 
   /* metrics (theme JSON at 100%) */
   --h-titlebar: 40px;
-  --h-stripe-button: 48px;
+  /* tool window stripe button, icons only */
+  --stripe-icon-button: 28px;
   --h-header: 40px;
   --h-tabbar: 38px;
   --h-tab: 28px;
@@ -494,6 +496,7 @@ html {
   --syn-number: #1750eb;
   --syn-punct: #080808;
   --syn-variable: #080808;
+  --syn-global: var(--syn-variable);
   --syn-param: #080808;
   --syn-property: #871094;
   --syn-constant: #871094;
@@ -748,6 +751,7 @@ html {
   --syn-number: #4fd0dc;
   --syn-punct: #e3e4e8;
   --syn-variable: #e3e4e8;
+  --syn-global: var(--syn-variable);
   --syn-param: #e3e4e8;
   --syn-property: #e0a0d6;
   --syn-constant: #e0a0d6;
@@ -1087,6 +1091,7 @@ html {
   --syn-number: var(--palette-number);
   --syn-punct: var(--palette-fg);
   --syn-variable: var(--palette-variable);
+  --syn-global: var(--syn-variable);
   --syn-param: var(--palette-fg);
   --syn-property: var(--palette-property);
   --syn-constant: var(--palette-number);
@@ -1159,8 +1164,8 @@ html {
   --palette-fg: #657b83;
   --palette-muted: #657b83;
   --palette-border: #eee8d5;
-  --palette-hover: #eee8d5;
-  --palette-selection: #eee8d5;
+  --palette-hover: #e4ddc8;
+  --palette-selection: #c2d3d4;
   --palette-line: #eee8d5;
   --palette-accent: #268bd2;
   --palette-on-accent: #002b36;
@@ -1191,6 +1196,9 @@ html {
   --syn-markup-code: #2aa198;
   --syn-tag: #268bd2;
   --syn-escape: #dc322f;
+  /* Selection and hover differ from the panel and popup surfaces; the editor keeps Solarized's own selection. */
+  --bg-editor-selection: #eee8d5;
+  --bg-editor-selection-inactive: #eee8d5;
 }
 
 :root[data-color-theme="solarized-dark"] {
@@ -1208,8 +1216,8 @@ html {
   --palette-fg: #839496;
   --palette-muted: #839496;
   --palette-border: #073642;
-  --palette-hover: #073642;
-  --palette-selection: #073642;
+  --palette-hover: #0b4053;
+  --palette-selection: #10506d;
   --palette-line: #073642;
   --palette-accent: #268bd2;
   --palette-on-accent: #002b36;
@@ -1240,6 +1248,9 @@ html {
   --syn-markup-code: #2aa198;
   --syn-tag: #268bd2;
   --syn-escape: #dc322f;
+  /* Selection and hover differ from the panel and popup surfaces; the editor keeps Solarized's own selection. */
+  --bg-editor-selection: #073642;
+  --bg-editor-selection-inactive: #073642;
 }
 
 :root[data-color-theme="one-light"] {
@@ -1341,7 +1352,7 @@ html {
   --h-row: 20px;
   --h-list-row: 20px;
   --h-statusbar: 24px;
-  --h-stripe-button: 40px;
+  --stripe-icon-button: 24px;
   --h-field: 24px;
   --h-button: 24px;
 }
diff --git a/src/ui/Dialog.test.tsx b/src/ui/Dialog.test.tsx
index d8695f1f..7b5bef89 100644
--- a/src/ui/Dialog.test.tsx
+++ b/src/ui/Dialog.test.tsx
@@ -125,6 +125,49 @@ describe("Dialog chrome", () => {
     expect(dialog.style.translate).toBe("190px 30px");
   });
 
+  it("resizes a top popup by its corner, keeping its top edge, and reports the size", () => {
+    const onResized = vi.fn();
+    render(
+      <Dialog
+        open
+        onClose={() => {}}
+        position="top"
+        aria-label="Find in Files"
+        width={400}
+        resizable="both"
+        minWidth={200}
+        minHeight={100}
+        onResized={onResized}
+      >
+        <div>rows</div>
+      </Dialog>,
+    );
+    const dialog = screen.getByRole("dialog");
+    fireEvent.pointerDown(screen.getByRole("separator", { name: "Resize" }), { button: 0, clientX: 0, clientY: 0 });
+    fireEvent.pointerMove(window, { buttons: 1, clientX: 500, clientY: 300 });
+    fireEvent.pointerUp(window);
+    expect([dialog.style.width, dialog.style.height]).toEqual(["500px", "300px"]);
+    expect(dialog.style.translate).toBe("250px 0px");
+    expect(onResized).toHaveBeenCalledExactlyOnceWith({ w: 500, h: 300 });
+  });
+
+  it("opens a resizable popup at a remembered size", () => {
+    render(
+      <Dialog
+        open
+        onClose={() => {}}
+        position="top"
+        aria-label="Find in Files"
+        resizable="both"
+        initialSize={{ w: 600, h: 400 }}
+      >
+        <div>rows</div>
+      </Dialog>,
+    );
+    const dialog = screen.getByRole("dialog");
+    expect([dialog.style.width, dialog.style.height]).toEqual(["600px", "400px"]);
+  });
+
   it("still drags a window dialog by its title bar", () => {
     render(
       <Dialog open onClose={() => {}} title="Usages Detected" buttons={safeDelete()} platform="other">
diff --git a/src/ui/Dialog.tsx b/src/ui/Dialog.tsx
index 6482f7e9..940c6e90 100644
--- a/src/ui/Dialog.tsx
+++ b/src/ui/Dialog.tsx
@@ -110,10 +110,17 @@ export interface DialogProps {
   footer?: ReactNode;
   width?: number | string;
   /**
-   * `both` shows a corner grip resizing the window. The content lays out again
-   * against the new size; a numeric `width` is also the minimum width.
+   * `both` shows a corner grip resizing the window or popup. The content lays out
+   * again against the new size; a numeric `width` is also the minimum width
+   * unless `minWidth` says otherwise.
    */
   resizable?: "both";
+  minWidth?: number;
+  minHeight?: number;
+  /** Size to open at, such as one remembered from `onResized`; kept inside the window. */
+  initialSize?: { w: number; h: number } | null;
+  /** The size a resize ended at. */
+  onResized?: (size: { w: number; h: number }) => void;
   /**
    * `top` places a lightweight modal popup (choosers, Search Everywhere) near
    * the top. Popups (also any dialog without a title) get no window title bar
@@ -201,6 +208,10 @@ function DialogInner({
   footer,
   width = 480,
   resizable,
+  minWidth,
+  minHeight,
+  initialSize,
+  onResized,
   position = "center",
   className,
   dismissOnBackdrop,
@@ -224,7 +235,11 @@ function DialogInner({
 
   const [offset, setOffset] = useState({ x: 0, y: 0 });
   const [active, setActive] = useState(() => typeof document === "undefined" || document.hasFocus());
-  const [size, setSize] = useState<{ w: number; h: number } | null>(null);
+  const [size, setSize] = useState<{ w: number; h: number } | null>(() =>
+    resizable && initialSize && typeof window !== "undefined"
+      ? { w: Math.min(initialSize.w, window.innerWidth - 24), h: Math.min(initialSize.h, window.innerHeight - 24) }
+      : null,
+  );
 
   useEffect(() => {
     const onFocus = () => setActive(true);
@@ -318,7 +333,7 @@ function DialogInner({
 
   const label = aria["aria-label"] ?? (typeof title === "string" ? title : undefined);
   const hasFooter = !!(buttons?.length || footerStart || onHelp || footer);
-  const canResize = resizable === "both" && !popup;
+  const canResize = resizable === "both";
 
   const resize = (e: PointerEvent<HTMLDivElement>) => {
     if (e.button !== 0) return;
@@ -327,21 +342,30 @@ function DialogInner({
     e.preventDefault();
     const start = { x: e.clientX, y: e.clientY };
     const rect = el.getBoundingClientRect();
-    const minW = typeof width === "number" ? width : 320;
+    const minW = minWidth ?? (typeof width === "number" ? width : 320);
     const chrome = el.querySelector<HTMLElement>("[data-dialog-titlebar]")?.offsetHeight ?? 0;
-    const minH = chrome + 120;
+    const minH = minHeight ?? chrome + 120;
     const origin = offset;
+    let last: { w: number; h: number } | null = null;
     const move = (ev: globalThis.PointerEvent) => {
       if (!(ev.buttons & 1)) return up();
       const w = Math.min(Math.max(rect.width + ev.clientX - start.x, minW), window.innerWidth - 24);
-      const h = Math.min(Math.max(rect.height + ev.clientY - start.y, minH), window.innerHeight - 24);
-      setSize({ w, h });
-      // The overlay centres the dialog: shift by half the growth so its top-left stays put.
-      setOffset({ x: origin.x + (w - rect.width) / 2, y: origin.y + (h - rect.height) / 2 });
+      // A `top` popup grows downwards from where it sits.
+      const maxH = position === "top" ? window.innerHeight - rect.top - 12 : window.innerHeight - 24;
+      const h = Math.min(Math.max(rect.height + ev.clientY - start.y, minH), maxH);
+      last = { w, h };
+      setSize(last);
+      // The overlay centres the dialog (a `top` popup only horizontally): shift by half
+      // the growth so its top-left stays put.
+      setOffset({
+        x: origin.x + (w - rect.width) / 2,
+        y: position === "top" ? origin.y : origin.y + (h - rect.height) / 2,
+      });
     };
     const up = () => {
       window.removeEventListener("pointermove", move);
       window.removeEventListener("pointerup", up);
+      if (last) onResized?.(last);
     };
     window.addEventListener("pointermove", move);
     window.addEventListener("pointerup", up);
diff --git a/src/ui/Input.tsx b/src/ui/Input.tsx
index 1898156a..89e87765 100644
--- a/src/ui/Input.tsx
+++ b/src/ui/Input.tsx
@@ -15,6 +15,7 @@ import { IconButton } from "./Button";
 import styles from "./Input.module.css";
 import { setContext } from "@/platform/context";
 import { useTx } from "@/platform/i18n";
+import { shortcutLabel } from "@/platform/keymap";
 
 export interface InputProps extends Omit<InputHTMLAttributes<HTMLInputElement>, "size"> {
   invalid?: boolean;
@@ -199,7 +200,7 @@ export const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(functi
         <IconButton
           icon="search-history"
           title="Recent Searches"
-          shortcut="⌥↓"
+          shortcut={shortcutLabel("find.field.recentSearches")}
           size="small"
           iconSize={iconSize}
           tabIndex={-1}
@@ -253,7 +254,7 @@ export const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(functi
         <IconButton
           icon="new-line"
           title="New Line"
-          shortcut="⇧⌘↵"
+          shortcut={shortcutLabel("find.field.newLine")}
           size="small"
           tabIndex={-1}
           onMouseDown={(e) => e.preventDefault()}
diff --git a/src/ui/Menu.tsx b/src/ui/Menu.tsx
index be637b6b..0b083979 100644
--- a/src/ui/Menu.tsx
+++ b/src/ui/Menu.tsx
@@ -45,6 +45,8 @@ export type MenuItem =
       checked?: boolean;
       danger?: boolean;
       run?: () => void;
+      /** The pointer or the keyboard made it the active item (not on opening the menu). */
+      onActive?: () => void;
       submenu?: MenuItem[];
     };
 
@@ -58,6 +60,7 @@ interface Resolved {
   checked?: boolean;
   danger?: boolean;
   run?: () => void;
+  onActive?: () => void;
   submenu?: MenuItem[];
 }
 
@@ -122,16 +125,30 @@ export function MenuList({ items, onDone, onCloseLevel, autoFocusFirst = true, .
   const [subAnchor, setSubAnchor] = useState<HTMLElement | null>(null);
   const itemRefs = useRef<Array<HTMLButtonElement | null>>([]);
   const hoverTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  // Pointer movement highlights a row without focusing it. Focusing on every
+  // enter drops the hover paint in the Windows webview, so the menu looks frozen.
+  const pointerHover = useRef(false);
+  // Row the pointer last entered: pointerenter and mouseenter both report it.
+  const hovered = useRef(-1);
   const setOpenSub = (i: number | null) => {
     setSubAnchor(i === null ? null : (itemRefs.current[i] ?? null));
     setOpenSubIndex(i);
   };
 
   useLayoutEffect(() => {
-    if (active >= 0 && openSub === null) itemRefs.current[active]?.focus({ preventScroll: false });
+    if (pointerHover.current) {
+      pointerHover.current = false;
+      return;
+    }
+    if (active >= 0 && openSub === null) itemRefs.current[active]?.focus({ preventScroll: true });
   }, [active, openSub]);
   useEffect(() => () => clearTimeout(hoverTimer.current), []);
 
+  const focusItem = (i: number) => {
+    setActive(i);
+    resolved[i]?.onActive?.();
+  };
+
   const move = (delta: number, from = active) => {
     const n = resolved.length;
     if (!n) return;
@@ -139,7 +156,7 @@ export function MenuList({ items, onDone, onCloseLevel, autoFocusFirst = true, .
     for (let step = 0; step < n; step++) {
       i = (i + delta + n) % n;
       if (selectable(resolved[i])) {
-        setActive(i);
+        focusItem(i);
         return;
       }
     }
@@ -157,6 +174,20 @@ export function MenuList({ items, onDone, onCloseLevel, autoFocusFirst = true, .
     item!.run?.();
   };
 
+  const hover = (i: number) => {
+    const item = resolved[i];
+    if (!item || item.disabled || item.kind !== "item") return;
+    if (hovered.current !== i) {
+      hovered.current = i;
+      if (i !== active) {
+        pointerHover.current = true;
+        focusItem(i);
+      }
+    }
+    clearTimeout(hoverTimer.current);
+    hoverTimer.current = setTimeout(() => setOpenSub(item.submenu ? i : null), item.submenu ? 120 : 200);
+  };
+
   const onKeyDown = (e: ReactKeyboardEvent) => {
     switch (e.key) {
       case "ArrowDown":
@@ -191,7 +222,7 @@ export function MenuList({ items, onDone, onCloseLevel, autoFocusFirst = true, .
             const i = (active + s + n) % n;
             const r = resolved[i]!;
             if (selectable(r) && r.label.toLowerCase().startsWith(ch)) {
-              setActive(i);
+              focusItem(i);
               break;
             }
           }
@@ -233,12 +264,10 @@ export function MenuList({ items, onDone, onCloseLevel, autoFocusFirst = true, .
                 r.disabled && styles.disabled,
                 r.danger && styles.danger,
               )}
-              onPointerEnter={() => {
-                if (r.disabled) return;
-                setActive(i);
-                clearTimeout(hoverTimer.current);
-                hoverTimer.current = setTimeout(() => setOpenSub(hasSub ? i : null), hasSub ? 120 : 200);
-              }}
+              onPointerEnter={() => hover(i)}
+              onMouseEnter={() => hover(i)}
+              onPointerLeave={() => (hovered.current = -1)}
+              onMouseLeave={() => (hovered.current = -1)}
               onClick={() => activate(i)}
             >
               <span className={styles.icon} data-menu-icon={!r.checked && r.icon ? "" : undefined}>
diff --git a/src/ui/Mnemonic.test.tsx b/src/ui/Mnemonic.test.tsx
new file mode 100644
index 00000000..2cd2c69e
--- /dev/null
+++ b/src/ui/Mnemonic.test.tsx
@@ -0,0 +1,29 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { render } from "@testing-library/react";
+import { usePlatform } from "@/platform/platformInfo";
+import { Mnemonic } from "./Mnemonic";
+
+const os = usePlatform.getState().os;
+afterEach(() => usePlatform.setState({ os }));
+
+const html = (text: string, char: string) =>
+  render(<Mnemonic text={text} char={char} />).container.querySelector("span")!.innerHTML;
+
+describe("Mnemonic", () => {
+  it.each([
+    ["In Project", "P", "In <u>P</u>roject"],
+    ["Replace All", "A", "Replace <u>A</u>ll"],
+    ["File mask:", "K", "File mas<u>k</u>:"],
+    ["Open results in new tab", "B", "Open results in new ta<u>b</u>"],
+    ["在项目", "P", "在项目 (<u>P</u>)"],
+    ["文件掩码：", "K", "文件掩码 (<u>K</u>)："],
+  ])("underlines %s's %s on Windows and Linux", (text, char, expected) => {
+    usePlatform.setState({ os: "linux" });
+    expect(html(text, char)).toBe(expected);
+  });
+
+  it("is plain text on macOS", () => {
+    usePlatform.setState({ os: "macos" });
+    expect(html("在项目", "P")).toBe("在项目");
+  });
+});
diff --git a/src/ui/Mnemonic.tsx b/src/ui/Mnemonic.tsx
new file mode 100644
index 00000000..4b7deff8
--- /dev/null
+++ b/src/ui/Mnemonic.tsx
@@ -0,0 +1,34 @@
+import { usePlatform } from "@/platform/platformInfo";
+
+/** Where the mnemonic letter sits in `text`: an upper-case match first ("Replace &All"), else any. */
+export function mnemonicIndex(text: string, char: string): number {
+  const upper = text.indexOf(char.toUpperCase());
+  return upper >= 0 ? upper : text.toLowerCase().indexOf(char.toLowerCase());
+}
+
+/**
+ * A control label with its Alt+letter mnemonic as IDEA draws it on Windows and Linux:
+ * the letter underlined, or `(X)` added to text without it (CJK translations).
+ * macOS has no mnemonics. `text` is already translated. One span, so a flex
+ * container (a button) doesn't space its pieces apart.
+ */
+export function Mnemonic({ text, char }: { text: string; char: string }) {
+  const mac = usePlatform((p) => p.os === "macos");
+  if (mac) return <span>{text}</span>;
+  const at = mnemonicIndex(text, char);
+  if (at >= 0)
+    return (
+      <span>
+        {text.slice(0, at)}
+        <u>{text[at]}</u>
+        {text.slice(at + 1)}
+      </span>
+    );
+  // "文件掩码：" → "文件掩码 (K)："
+  const colon = /[:：]$/.exec(text)?.[0] ?? "";
+  return (
+    <span>
+      {text.slice(0, text.length - colon.length)} (<u>{char.toUpperCase()}</u>){colon}
+    </span>
+  );
+}
diff --git a/src/ui/Popup.test.tsx b/src/ui/Popup.test.tsx
index ed98b039..2d0c2492 100644
--- a/src/ui/Popup.test.tsx
+++ b/src/ui/Popup.test.tsx
@@ -5,6 +5,7 @@ import { getContext, setContext } from "@/platform/context";
 import { registerAction } from "@/platform/actions";
 import { Popup } from "./Popup";
 import { ContextMenuHost, Menu, MenuList, hideContextMenu, showContextMenu } from "./Menu";
+import menuStyles from "./Menu.module.css";
 import { Dialog } from "./Dialog";
 
 function Harness({ onClose }: { onClose?: (r: string) => void }) {
@@ -192,6 +193,41 @@ describe("Menu action enablement", () => {
     expect(input).toHaveFocus();
   });
 
+  it("highlights the row under the pointer without moving focus", () => {
+    render(
+      <MenuList
+        items={[
+          { label: "Open", run: () => undefined },
+          { label: "Save", run: () => undefined },
+        ]}
+        onDone={() => {}}
+      />,
+    );
+    const open = screen.getByRole("menuitem", { name: "Open" });
+    const save = screen.getByRole("menuitem", { name: "Save" });
+    expect(open).toHaveFocus();
+    expect(open.className).toContain(menuStyles.active);
+    fireEvent.pointerEnter(save);
+    expect(save.className).toContain(menuStyles.active);
+    expect(open.className).not.toContain(menuStyles.active);
+    expect(open).toHaveFocus();
+  });
+
+  it("reports a hovered row once and lets the keyboard continue from it", () => {
+    const active: string[] = [];
+    const item = (label: string) => ({ label, onActive: () => active.push(label), run: () => undefined });
+    render(<MenuList items={[item("Open"), item("Save"), item("Close")]} onDone={() => {}} />);
+    const save = screen.getByRole("menuitem", { name: "Save" });
+    fireEvent.pointerEnter(save);
+    fireEvent.mouseEnter(save);
+    expect(active).toEqual(["Save"]);
+    fireEvent.keyDown(save, { key: "ArrowDown" });
+    expect(screen.getByRole("menuitem", { name: "Close" })).toHaveFocus();
+    fireEvent.pointerLeave(save);
+    fireEvent.pointerEnter(save);
+    expect(active).toEqual(["Save", "Close", "Save"]);
+  });
+
   it("follows context changes after the menu opened", () => {
     const dispose = registerAction({ id: "test.menuWhen", title: "Needs Flag", when: "qaMenuFlag", run: () => {} });
     setContext("qaMenuFlag", false);
diff --git a/src/ui/SourcePreview.module.css b/src/ui/SourcePreview.module.css
index 93d2e7b1..82a2b95e 100644
--- a/src/ui/SourcePreview.module.css
+++ b/src/ui/SourcePreview.module.css
@@ -14,7 +14,7 @@
   /* The workbench disables selection globally; preview text stays selectable/copyable. */
   -webkit-user-select: text;
   user-select: text;
-  cursor: text;
+  cursor: default;
 }
 .empty {
   display: flex;
@@ -28,6 +28,7 @@
   padding: 4px 0;
   font: inherit;
   min-width: max-content;
+  cursor: text;
 }
 .codeLine {
   display: flex;
diff --git a/src/ui/SourcePreview.test.tsx b/src/ui/SourcePreview.test.tsx
index 46e9a408..00965639 100644
--- a/src/ui/SourcePreview.test.tsx
+++ b/src/ui/SourcePreview.test.tsx
@@ -1,11 +1,77 @@
 import { describe, expect, it } from "vitest";
-import { render, screen } from "@testing-library/react";
+import { render, screen, waitFor } from "@testing-library/react";
+import { previewColors } from "@/editor/lineTokens";
 import { SourcePreview } from "./SourcePreview";
 
 /** A stable loader reference (a new function reloads, like the real module-level ones). */
 const loadOf = (content: string) => () => Promise.resolve(content);
 
+const firstTok = (container: HTMLElement) => container.querySelector<HTMLElement>("[class*='tok-']");
+
 describe("SourcePreview", () => {
+  it("colours lines with the whole file as context", async () => {
+    const { container } = render(
+      <SourcePreview
+        colorize={previewColors}
+        path="/p/a.ts"
+        line={1}
+        load={loadOf('const lib = "x";\n/* block\ncomment */')}
+      />,
+    );
+    await waitFor(() => expect(container.querySelector(".tok-string")).toBeTruthy(), { timeout: 5000 });
+    expect(container.querySelector(".tok-string")?.textContent).toBe('"x"');
+    // `comment */` only reads as a comment tail when the file was parsed whole.
+    expect(container.querySelector('[data-line="2"] .tok-comment')?.textContent).toBe("comment */");
+  });
+
+  it("marks ranges inside tokens without losing text", async () => {
+    const content = 'const lib = "xyz";';
+    const { container } = render(
+      <SourcePreview
+        colorize={previewColors}
+        path="/p/a.ts"
+        line={0}
+        load={loadOf(content)}
+        highlights={[{ line: 0, ranges: [[13, 15]] }]}
+      />,
+    );
+    await waitFor(() => expect(container.querySelector("mark .tok-string")).toBeTruthy(), { timeout: 5000 });
+    // `xy` sits inside the string token: marked, while the rest stays coloured.
+    expect(container.querySelector("mark")?.textContent).toBe("xy");
+    expect(container.querySelector("mark .tok-string")?.textContent).toBe("xy");
+    expect(container.textContent).toBe(`1${content}`);
+  });
+
+  it("leaves unknown languages plain", async () => {
+    const content = 'const lib = "x";';
+    const { container } = render(
+      <SourcePreview colorize={previewColors} path="/p/a.unknownext" line={0} load={loadOf(content)} />,
+    );
+    await screen.findByText(content);
+    expect(firstTok(container)).toBeNull();
+    expect(container.textContent).toContain(content);
+  });
+
+  it("stays plain beyond the parse cap", async () => {
+    const filler = "// filler line to pass the parse cap\n".repeat(16000);
+    const { container } = render(
+      <SourcePreview colorize={previewColors} path="/p/big.ts" line={0} load={loadOf(`${filler}const lib = "x";`)} />,
+    );
+    await waitFor(() => expect(container.querySelector('[data-line="0"]')?.textContent).toContain("filler"));
+    expect(firstTok(container)).toBeNull();
+  });
+
+  it("recolours when the file changes", async () => {
+    const load = loadOf('const lib = "x";');
+    const { container, rerender } = render(
+      <SourcePreview colorize={previewColors} path="/p/a.ts" line={0} load={load} />,
+    );
+    await waitFor(() => expect(container.querySelector(".tok-string")).toBeTruthy(), { timeout: 5000 });
+    rerender(<SourcePreview colorize={previewColors} path="/p/b.unknownext" line={0} load={load} />);
+    await screen.findByText('const lib = "x";');
+    expect(firstTok(container)).toBeNull();
+  });
+
   it("renders the loaded lines around the current one", async () => {
     const { container } = render(
       <SourcePreview
@@ -21,9 +87,12 @@ describe("SourcePreview", () => {
   });
 
   it("makes its text selectable as a selection boundary", async () => {
-    const { container } = render(<SourcePreview path="/p/a.ts" line={0} load={loadOf("// TODO")} />);
+    const { container } = render(
+      <SourcePreview colorize={previewColors} path="/p/a.ts" line={0} load={loadOf("// TODO")} />,
+    );
     await screen.findByText("// TODO");
     // The scroll pane is a selection scope: drags stay inside, text stays copyable.
-    expect(container.querySelector("[data-selection-scope]")).toBeTruthy();
+    // Set by an effect, which can run after the text is on screen.
+    await waitFor(() => expect(container.querySelector("[data-selection-scope]")).toBeTruthy());
   });
 });
diff --git a/src/ui/SourcePreview.tsx b/src/ui/SourcePreview.tsx
index fe4cbf21..6ae41756 100644
--- a/src/ui/SourcePreview.tsx
+++ b/src/ui/SourcePreview.tsx
@@ -2,10 +2,17 @@
  * Read-only source view around a line, with line numbers and highlighted
  * ranges: the preview pane beside result trees (TODO, Problems, Inspection
  * Results…). The caller supplies the text loader (open buffer or disk).
+ *
+ * With `colorize` (the editor's whole-file highlighter), lines are syntax-coloured
+ * from one parse of the file, so a line inside a block comment or multi-line
+ * string is coloured as such, like the result lines of Find in Files / Show
+ * Usages. Files beyond `MAX_PARSE` stay plain rather than colouring the window
+ * with the wrong block-comment context.
  */
-import { useEffect, useLayoutEffect, useRef, useState, type ReactNode } from "react";
+import { useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import clsx from "clsx";
 import { T } from "./T";
+import { tokenSpans, type SourceToken } from "./tokenSpans";
 import styles from "./SourcePreview.module.css";
 import { useSelectionBoundary } from "./useSelectionBoundary";
 import { tx } from "@/platform/i18n";
@@ -19,6 +26,15 @@ export interface SourceHighlight {
 /** Lines rendered on each side of the current one. */
 const WINDOW = 300;
 
+/** Files larger than this aren't parsed for colouring (same cap as `lineTokens`). */
+const MAX_PARSE = 500_000;
+
+/** Whole-file highlighter over the parsed text, or null when it stays plain. */
+type Highlighter = ((from: number, to: number) => SourceToken[]) | null;
+
+/** Parses `text` (the file at `path`) for syntax colours; null leaves it plain. */
+export type SourceColorizer = (text: string, path: string) => Promise<Highlighter>;
+
 export interface SourcePreviewProps {
   path: string | null;
   /** 0-based line to centre and mark as current. */
@@ -28,12 +44,23 @@ export interface SourcePreviewProps {
   load: (path: string) => Promise<string>;
   /** Bump to reload the same path. */
   version?: number;
+  /** Stable (module-level) syntax colouring; without it lines stay plain. */
+  colorize?: SourceColorizer;
   className?: string;
 }
 
-export function SourcePreview({ path, line, highlights = [], load, version = 0, className }: SourcePreviewProps) {
+export function SourcePreview({
+  path,
+  line,
+  highlights = [],
+  load,
+  version = 0,
+  colorize,
+  className,
+}: SourcePreviewProps) {
   const [text, setText] = useState<{ path: string; lines: string[] } | null>(null);
   const [error, setError] = useState<string | null>(null);
+  const [highlighter, setHighlighter] = useState<{ path: string; fn: Highlighter } | null>(null);
   const current = text && text.path === path ? text : null;
 
   useEffect(() => {
@@ -56,6 +83,67 @@ export function SourcePreview({ path, line, highlights = [], load, version = 0,
     };
   }, [path, version, load]);
 
+  // One whole-file parse per loaded text: `current` changes identity only when
+  // another text loads, not when the centred line moves. Grammar loading is
+  // async, so the pane renders plain first and recolours when the parse lands;
+  // `alive` drops late results after a fast switch to another file.
+  useEffect(() => {
+    if (!current) return;
+    let alive = true;
+    const { path } = current;
+    const full = current.lines.join("\n");
+    const build = !colorize || full.length > MAX_PARSE ? Promise.resolve(null) : colorize(full, path);
+    void build.then((fn) => {
+      if (alive) setHighlighter({ path, fn });
+    });
+    return () => {
+      alive = false;
+    };
+  }, [current, colorize]);
+
+  // Offsets of every line in the newline-normalised text, so whole-file token
+  // ranges can be sliced per rendered line.
+  const offsets = useMemo(() => {
+    if (!current) return null;
+    const o = new Array<number>(current.lines.length);
+    let at = 0;
+    for (let i = 0; i < current.lines.length; i++) {
+      o[i] = at;
+      at += current.lines[i]!.length + 1;
+    }
+    return o;
+  }, [current]);
+
+  // The window's whole-file token ranges, sliced per line into in-line offsets.
+  const tokensByLine = useMemo(() => {
+    if (!current || !offsets) return null;
+    const fn = highlighter?.path === current.path ? highlighter.fn : null;
+    if (!fn) return null;
+    const lines = current.lines;
+    const start = Math.max(0, line - WINDOW);
+    const end = Math.min(lines.length, line + WINDOW);
+    const last = lines.length - 1;
+    const map = new Map<number, SourceToken[]>();
+    let li = start;
+    const from = offsets[start]!;
+    const to = end < offsets.length ? offsets[end]! : offsets[last]! + (lines[last]?.length ?? 0);
+    for (const t of fn(from, to)) {
+      // A token may span lines (a block comment); clip it into each covered line.
+      while (li + 1 < end && offsets[li + 1]! <= t.from) li++;
+      for (let n = li; n < end && offsets[n]! < t.to; n++) {
+        const at = offsets[n]!;
+        const s = Math.max(t.from, at) - at;
+        const e = Math.min(t.to, at + (lines[n]?.length ?? 0)) - at;
+        if (e > s) {
+          const spans = map.get(n) ?? [];
+          spans.push({ from: s, to: e, cls: t.cls });
+          map.set(n, spans);
+        }
+      }
+    }
+    return map;
+  }, [current, offsets, highlighter, line]);
+
   if (!path)
     return (
       <div className={clsx(styles.preview, styles.empty, className)}>
@@ -65,7 +153,16 @@ export function SourcePreview({ path, line, highlights = [], load, version = 0,
   if (error && !current) return <div className={clsx(styles.preview, styles.empty, className)}>{error}</div>;
   if (!current) return <div className={clsx(styles.preview, className)} />;
 
-  return <PreviewBody path={path} line={line} lines={current.lines} highlights={highlights} className={className} />;
+  return (
+    <PreviewBody
+      path={path}
+      line={line}
+      lines={current.lines}
+      tokensByLine={tokensByLine}
+      highlights={highlights}
+      className={className}
+    />
+  );
 }
 
 /**
@@ -77,12 +174,14 @@ function PreviewBody({
   path,
   line,
   lines,
+  tokensByLine,
   highlights,
   className,
 }: {
   path: string;
   line: number;
   lines: string[];
+  tokensByLine: Map<number, SourceToken[]> | null;
   highlights: readonly SourceHighlight[];
   className?: string;
 }) {
@@ -103,10 +202,13 @@ function PreviewBody({
   for (let n = start; n < end; n++) {
     const content = lines[n] ?? "";
     const ranges = byLine.get(n);
+    const lineTokens = tokensByLine?.get(n);
     rows.push(
       <div key={n} data-line={n} className={clsx(styles.codeLine, n === line && styles.currentLine)}>
         <span className={styles.gutter}>{n + 1}</span>
-        <span className={styles.code}>{ranges ? highlight(content, ranges) : content || " "}</span>
+        <span className={styles.code}>
+          {ranges || lineTokens?.length ? highlight(content, ranges ?? [], lineTokens ?? null) : content || " "}
+        </span>
       </div>,
     );
   }
@@ -117,21 +219,26 @@ function PreviewBody({
   );
 }
 
-function highlight(text: string, ranges: ReadonlyArray<readonly [number, number]>): ReactNode[] {
+/** `text` with `ranges` marked up; every segment coloured by the line's `tokens`. */
+function highlight(
+  text: string,
+  ranges: ReadonlyArray<readonly [number, number]>,
+  tokens: readonly SourceToken[] | null,
+): ReactNode[] {
   const parts: ReactNode[] = [];
   let pos = 0;
   [...ranges]
     .sort((a, b) => a[0] - b[0])
     .forEach(([s, e], i) => {
       if (s < pos || e <= s) return;
-      if (s > pos) parts.push(text.slice(pos, s));
+      if (s > pos) parts.push(...tokenSpans(text, pos, s, tokens, `g${i}:`));
       parts.push(
         <mark key={i} className={styles.match}>
-          {text.slice(s, e)}
+          {tokenSpans(text, s, e, tokens, `m${i}:`)}
         </mark>,
       );
       pos = e;
     });
-  if (pos < text.length) parts.push(text.slice(pos));
+  if (pos < text.length) parts.push(...tokenSpans(text, pos, text.length, tokens, "t:"));
   return parts;
 }
diff --git a/src/ui/Tree.tsx b/src/ui/Tree.tsx
index eedf4181..5612f458 100644
--- a/src/ui/Tree.tsx
+++ b/src/ui/Tree.tsx
@@ -33,6 +33,9 @@ import { T } from "./T";
 import { tx } from "@/platform/i18n";
 import { useTreeReorder, type TreeReorder } from "./treeReorder";
 import { useTreeDirectoryContext } from "./treeDirectoryContext";
+import { useIconRowHeight } from "./iconAppearance";
+
+const DEFAULT_ROW_HEIGHT = 24;
 export type { TreeReorder } from "./treeReorder";
 
 export interface TreeRowState {
@@ -223,7 +226,7 @@ export function Tree<T>(props: TreeProps<T>) {
     onContextMenu,
     speedSearch = true,
     speedSearchMode = "highlight",
-    rowHeight = 24,
+    rowHeight: fixedRowHeight,
     indent = 20,
     className,
     rowClassName,
@@ -299,6 +302,8 @@ export function Tree<T>(props: TreeProps<T>) {
   const indexOfKey = useMemo(() => new Map(rows.map((r, i) => [r.key, i])), [rows]);
   const leadIndex = lead != null ? (indexOfKey.get(lead) ?? -1) : -1;
 
+  const themedRowHeight = useIconRowHeight();
+  const rowHeight = fixedRowHeight ?? themedRowHeight ?? DEFAULT_ROW_HEIGHT;
   const virtualizer = useVirtualizer({
     count: rows.length,
     getScrollElement: () => scrollRef.current,
@@ -306,6 +311,7 @@ export function Tree<T>(props: TreeProps<T>) {
     overscan: 12,
     getItemKey: (i) => rows[i]!.key,
   });
+  useEffect(() => virtualizer.measure(), [virtualizer, rowHeight]);
 
   // Keep the keyboard lead in view when the lead changes — not when its index
   // shifts because expanding or collapsing elsewhere inserted rows above it:
diff --git a/src/ui/expui/inline/newLine.svg b/src/ui/expui/inline/newLine.svg
new file mode 100644
index 00000000..0e20818b
--- /dev/null
+++ b/src/ui/expui/inline/newLine.svg
@@ -0,0 +1,5 @@
+<!-- Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.5 5C12.4328 5 13.9999 6.56719 14 8.5C13.9999 10.4328 12.4328 12 10.5 12H3.70703L5.85352 14.1465C6.04862 14.3417 6.04858 14.6583 5.85352 14.8535C5.65828 15.0487 5.34172 15.0486 5.14648 14.8535L2.14648 11.8535C1.95141 11.6583 1.95135 11.3417 2.14648 11.1465L5.14648 8.14648C5.34169 7.95147 5.6583 7.9515 5.85352 8.14648C6.04871 8.34169 6.0486 8.65824 5.85352 8.85352L3.70703 11H10.5C11.8805 11 12.9999 9.88052 13 8.5C12.9999 7.11948 11.8805 6 10.5 6H2.5C2.22396 5.99994 2.00008 5.77604 2 5.5C2.0002 5.22406 2.22403 5.00006 2.5 5H10.5Z" fill="#6C707E"/>
+<path d="M13.5 2C13.7761 2 14 2.22386 14 2.5C14 2.77614 13.7761 3 13.5 3H2.5C2.22386 3 2 2.77614 2 2.5C2 2.22386 2.22386 2 2.5 2H13.5Z" fill="#6C707E"/>
+</svg>
diff --git a/src/ui/expui/inline/newLine_dark.svg b/src/ui/expui/inline/newLine_dark.svg
new file mode 100644
index 00000000..8fa77300
--- /dev/null
+++ b/src/ui/expui/inline/newLine_dark.svg
@@ -0,0 +1,5 @@
+<!-- Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.5 5C12.4328 5 13.9999 6.56719 14 8.5C13.9999 10.4328 12.4328 12 10.5 12H3.70703L5.85352 14.1465C6.04862 14.3417 6.04858 14.6583 5.85352 14.8535C5.65828 15.0487 5.34172 15.0486 5.14648 14.8535L2.14648 11.8535C1.95141 11.6583 1.95135 11.3417 2.14648 11.1465L5.14648 8.14648C5.34169 7.95147 5.6583 7.9515 5.85352 8.14648C6.04871 8.34169 6.0486 8.65824 5.85352 8.85352L3.70703 11H10.5C11.8805 11 12.9999 9.88052 13 8.5C12.9999 7.11948 11.8805 6 10.5 6H2.5C2.22396 5.99994 2.00008 5.77604 2 5.5C2.0002 5.22406 2.22403 5.00006 2.5 5H10.5Z" fill="#CED0D6"/>
+<path d="M13.5 2C13.7761 2 14 2.22386 14 2.5C14 2.77614 13.7761 3 13.5 3H2.5C2.22386 3 2 2.77614 2 2.5C2 2.22386 2.22386 2 2.5 2H13.5Z" fill="#CED0D6"/>
+</svg>
diff --git a/src/ui/expui/inline/preserveCase.svg b/src/ui/expui/inline/preserveCase.svg
new file mode 100644
index 00000000..9d898aad
--- /dev/null
+++ b/src/ui/expui/inline/preserveCase.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.3695 14H0.1815L3.0085 6.3H4.213L7.139 14H5.984L5.28 12.042H2.013L1.3695 14ZM3.476 7.741L2.321 11.1235H4.95L3.729 7.741L3.6025 7.268L3.476 7.741Z" fill="#6C707E"/>
+<path d="M9.8695 14H8.6815L11.5085 6.3H12.713L15.639 14H14.484L13.78 12.042H10.513L9.8695 14ZM11.976 7.741L10.821 11.1235H13.45L12.229 7.741L12.1025 7.268L11.976 7.741Z" fill="#6C707E"/>
+<path d="M7 5.8125L9.40625 3.40625L7 1" stroke="#6C707E" stroke-linecap="round"/>
+</svg>
diff --git a/src/ui/expui/inline/preserveCase_dark.svg b/src/ui/expui/inline/preserveCase_dark.svg
new file mode 100644
index 00000000..8b7ee30a
--- /dev/null
+++ b/src/ui/expui/inline/preserveCase_dark.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.2035 14L3.0305 6.3H4.235L7.1555 14H6.0005L5.302 12.042H2.035L1.3805 14H0.2035ZM2.343 11.1235H4.972L3.751 7.763L3.6245 7.29L3.498 7.763L2.343 11.1235Z" fill="#CED0D6"/>
+<path d="M8.7035 14L11.5305 6.3H12.735L15.6555 14H14.5005L13.802 12.042H10.535L9.8805 14H8.7035ZM10.843 11.1235H13.472L12.251 7.763L12.1245 7.29L11.998 7.763L10.843 11.1235Z" fill="#CED0D6"/>
+<path d="M7 5.8125L9.40625 3.40625L7 1" stroke="#CED0D6" stroke-linecap="round"/>
+</svg>
diff --git a/src/ui/expui/inline/searchHistory.svg b/src/ui/expui/inline/searchHistory.svg
new file mode 100644
index 00000000..1024447e
--- /dev/null
+++ b/src/ui/expui/inline/searchHistory.svg
@@ -0,0 +1,5 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.85355 10.1432C8.65829 9.94789 8.34171 9.94789 8.14645 10.1432C7.95118 10.3384 7.95118 10.655 8.14645 10.8503L8.85355 10.1432ZM11.1457 13.8495C11.3409 14.0447 11.6575 14.0447 11.8528 13.8495C12.048 13.6542 12.048 13.3376 11.8528 13.1424L11.1457 13.8495ZM9 7C9 9.20914 7.20914 11 5 11V12C7.76142 12 10 9.76142 10 7H9ZM5 11C2.79086 11 1 9.20914 1 7H0C0 9.76142 2.23858 12 5 12V11ZM1 7C1 4.79086 2.79086 3 5 3V2C2.23858 2 0 4.23858 0 7H1ZM5 3C7.20914 3 9 4.79086 9 7H10C10 4.23858 7.76142 2 5 2V3ZM8.14645 10.8503L11.1457 13.8495L11.8528 13.1424L8.85355 10.1432L8.14645 10.8503Z" fill="#6C707E"/>
+<path d="M11 7L13.5 9.5L16 7H11Z" fill="#6C707E"/>
+</svg>
diff --git a/src/ui/expui/inline/searchHistory_dark.svg b/src/ui/expui/inline/searchHistory_dark.svg
new file mode 100644
index 00000000..ff83a9e6
--- /dev/null
+++ b/src/ui/expui/inline/searchHistory_dark.svg
@@ -0,0 +1,5 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.85355 10.1432C8.65829 9.94789 8.34171 9.94789 8.14645 10.1432C7.95118 10.3384 7.95118 10.655 8.14645 10.8503L8.85355 10.1432ZM11.1457 13.8495C11.3409 14.0447 11.6575 14.0447 11.8528 13.8495C12.048 13.6542 12.048 13.3376 11.8528 13.1424L11.1457 13.8495ZM9 7C9 9.20914 7.20914 11 5 11V12C7.76142 12 10 9.76142 10 7H9ZM5 11C2.79086 11 1 9.20914 1 7H0C0 9.76142 2.23858 12 5 12V11ZM1 7C1 4.79086 2.79086 3 5 3V2C2.23858 2 0 4.23858 0 7H1ZM5 3C7.20914 3 9 4.79086 9 7H10C10 4.23858 7.76142 2 5 2V3ZM8.14645 10.8503L11.1457 13.8495L11.8528 13.1424L8.85355 10.1432L8.14645 10.8503Z" fill="#CED0D6"/>
+<path d="M11 7L13.5 9.5L16 7H11Z" fill="#CED0D6"/>
+</svg>
diff --git a/src/ui/iconAppearance.test.tsx b/src/ui/iconAppearance.test.tsx
new file mode 100644
index 00000000..8a0cadf3
--- /dev/null
+++ b/src/ui/iconAppearance.test.tsx
@@ -0,0 +1,45 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { act, render } from "@testing-library/react";
+import { Tree } from "./Tree";
+import { setIconAppearance } from "./iconAppearance";
+
+const root = () => document.documentElement;
+
+afterEach(() => setIconAppearance(null));
+
+describe("icon appearance", () => {
+  it("applies monochrome, saturation, opacity, accent and tree icon size to the document", () => {
+    setIconAppearance({ monochrome: "#546E7A", saturation: 10, opacity: 60, accent: "#009688", iconSize: 20 });
+    expect(root().style.getPropertyValue("--oi-icon-filter")).toBe("url(#oi-icon-mono) saturate(0.5)");
+    expect(root().style.getPropertyValue("--oi-icon-opacity")).toBe("0.6");
+    expect(root().style.getPropertyValue("--oi-icon-accent")).toBe("#009688");
+    expect(root().style.getPropertyValue("--oi-tree-icon-size")).toBe("20px");
+    expect(root().dataset.oiIconFilter).toBe("");
+    expect(root().dataset.oiAccent).toBe("");
+    expect(document.querySelector("#oi-icon-mono feColorMatrix")?.getAttribute("values")).toContain("0.");
+
+    setIconAppearance(null);
+    expect(root().style.getPropertyValue("--oi-icon-filter")).toBe("");
+    expect(root().dataset.oiIconFilter).toBeUndefined();
+    expect(root().dataset.oiAccent).toBeUndefined();
+    expect(root().dataset.oiTreeIconSize).toBeUndefined();
+  });
+
+  it("uses the theme row height in trees that do not set their own", () => {
+    const roots = [{ key: "a", label: "a" }];
+    const { container } = render(
+      <Tree
+        roots={roots}
+        getKey={(n) => n.key}
+        getLabel={(n) => n.label}
+        getChildren={() => undefined}
+        isExpandable={() => false}
+        aria-label="t"
+      />,
+    );
+    const row = () => container.querySelector<HTMLElement>('[role="treeitem"]');
+    expect(row()?.style.height).toBe("24px");
+    act(() => setIconAppearance({ rowHeight: 30 }));
+    expect(row()?.style.height).toBe("30px");
+  });
+});
diff --git a/src/ui/iconAppearance.ts b/src/ui/iconAppearance.ts
new file mode 100644
index 00000000..2df83b16
--- /dev/null
+++ b/src/ui/iconAppearance.ts
@@ -0,0 +1,69 @@
+import { create } from "zustand";
+import type { FileIconThemeOptions } from "@/bindings";
+
+const MONO_FILTER_ID = "oi-icon-mono";
+const MAX_SATURATION = 20;
+const MONO_GAIN = 1.4;
+const MONO_LIFT = 0.15;
+const LUMA = [0.2126, 0.7152, 0.0722] as const;
+const SVG_NS = "http://www.w3.org/2000/svg";
+
+export const useIconRowHeight = create<number | null>(() => null);
+
+function monoMatrix(hex: string): string {
+  const channel = (at: number) => parseInt(hex.slice(at, at + 2), 16) / 255;
+  const rows = [channel(1), channel(3), channel(5)].map((c) =>
+    [...LUMA.map((l) => (c * MONO_GAIN * l).toFixed(4)), "0", (c * MONO_LIFT).toFixed(4)].join(" "),
+  );
+  return [...rows, "0 0 0 1 0"].join(" ");
+}
+
+function monoFilter(hex: string) {
+  let matrix = document.querySelector<SVGFEColorMatrixElement>(`#${MONO_FILTER_ID} feColorMatrix`);
+  if (!matrix) {
+    const svg = document.createElementNS(SVG_NS, "svg");
+    svg.setAttribute("aria-hidden", "true");
+    svg.setAttribute("width", "0");
+    svg.setAttribute("height", "0");
+    svg.style.position = "absolute";
+    const filter = document.createElementNS(SVG_NS, "filter");
+    filter.id = MONO_FILTER_ID;
+    filter.setAttribute("color-interpolation-filters", "sRGB");
+    matrix = document.createElementNS(SVG_NS, "feColorMatrix");
+    matrix.setAttribute("type", "matrix");
+    filter.append(matrix);
+    svg.append(filter);
+    document.body.append(svg);
+  }
+  matrix.setAttribute("values", monoMatrix(hex));
+}
+
+function setVar(name: string, flag: string, value: string | null) {
+  const root = document.documentElement;
+  if (value === null) {
+    root.style.removeProperty(name);
+    delete root.dataset[flag];
+  } else {
+    root.style.setProperty(name, value);
+    root.dataset[flag] = "";
+  }
+}
+
+function iconFilter(o: FileIconThemeOptions | null): string | null {
+  const parts: string[] = [];
+  if (o?.monochrome) {
+    monoFilter(o.monochrome);
+    parts.push(`url(#${MONO_FILTER_ID})`);
+  }
+  if (o?.saturation) parts.push(`saturate(${1 - o.saturation / MAX_SATURATION})`);
+  return parts.length ? parts.join(" ") : null;
+}
+
+export function setIconAppearance(o: FileIconThemeOptions | null): void {
+  useIconRowHeight.setState(o?.rowHeight ?? null, true);
+  if (typeof document === "undefined") return;
+  setVar("--oi-icon-filter", "oiIconFilter", iconFilter(o));
+  setVar("--oi-icon-opacity", "oiIconOpacity", o?.opacity ? String(o.opacity / 100) : null);
+  setVar("--oi-icon-accent", "oiAccent", o?.accent ?? null);
+  setVar("--oi-tree-icon-size", "oiTreeIconSize", o?.iconSize ? `${o.iconSize}px` : null);
+}
diff --git a/src/ui/icons.module.css b/src/ui/icons.module.css
index b3d2d0c7..d85e4d04 100644
--- a/src/ui/icons.module.css
+++ b/src/ui/icons.module.css
@@ -31,3 +31,32 @@
   line-height: 1;
   color: var(--fg-subtle);
 }
+
+:global(:root[data-oi-icon-filter]) .icon {
+  filter: var(--oi-icon-filter);
+}
+
+:global(:root[data-oi-icon-opacity]) .icon {
+  opacity: var(--oi-icon-opacity);
+}
+
+.icon [data-themed="true"][fill] {
+  fill: var(--oi-icon-accent, var(--accent));
+}
+
+.icon [data-themed="true"][stroke] {
+  stroke: var(--oi-icon-accent, var(--accent));
+}
+
+:global(:root[data-oi-accent]) .icon [data-tint="true"][fill] {
+  fill: var(--oi-icon-accent);
+}
+
+:global(:root[data-oi-accent]) .icon [data-tint="true"][stroke] {
+  stroke: var(--oi-icon-accent);
+}
+
+:global(:root[data-oi-tree-icon-size]) :global([role="tree"]) .icon {
+  width: var(--oi-tree-icon-size);
+  height: var(--oi-tree-icon-size);
+}
diff --git a/src/ui/icons.test.tsx b/src/ui/icons.test.tsx
index 8ad1b2e0..8179d2a4 100644
--- a/src/ui/icons.test.tsx
+++ b/src/ui/icons.test.tsx
@@ -4,7 +4,17 @@ import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
 import { render } from "@testing-library/react";
 import { activateFeatures } from "@/features";
 import { useContributions } from "@/workbench/contributions";
-import { Icon, ICON_NAMES, SymbolBadge, fileIconName, hasIcon, iconMarkup, iconMarkupOrFallback } from "./icons";
+import {
+  Icon,
+  ICON_NAMES,
+  SymbolBadge,
+  fileIconName,
+  hasIcon,
+  iconMarkup,
+  iconMarkupOrFallback,
+  registerExternalIcons,
+  setFileIconTheme,
+} from "./icons";
 
 describe("tool window icons", () => {
   let dispose: () => void = () => {};
@@ -46,11 +56,35 @@ describe("Icon", () => {
 
   it("falls back like <Icon> for unknown names, without React", () => {
     const { container } = render(<Icon name="symbol-macro" />);
-    expect(iconMarkupOrFallback("symbol-macro")).toBe(container.innerHTML);
-    const withoutIds = (html: string) => html.replace(/\bm\d+-/g, "");
+    const withoutData = (html: string) => html.replace(/ data-icon(?:-[a-z]+)?="[^"]*"/g, "");
+    expect(withoutData(iconMarkupOrFallback("symbol-macro"))).toBe(container.innerHTML);
+    const withoutIds = (html: string) => withoutData(html).replace(/\bm\d+-/g, "");
     expect(withoutIds(iconMarkupOrFallback("no-such-icon"))).toBe(withoutIds(iconMarkup("file")!));
   });
 
+  it("keeps the requested name on markup so a theme change can repaint it", () => {
+    expect(iconMarkupOrFallback("no-such-icon", 14, "x")).toContain(
+      'data-icon="no-such-icon" data-icon-size="14" data-icon-class="x"',
+    );
+    expect(iconMarkupOrFallback("symbol-macro")).toContain('data-icon="symbol-macro"');
+  });
+
+  it("repaints markup outside React when the icon theme changes", () => {
+    const unregister = registerExternalIcons([["ext:t/arrow", '<svg viewBox="0 0 16 16"><path d="M1 1h9z"/></svg>']]);
+    document.body.innerHTML = `<div>${iconMarkupOrFallback("chevron-right", 14)}</div>`;
+    setFileIconTheme({
+      file: () => null,
+      folder: () => null,
+      icon: (n) => (n === "chevron-right" ? "ext:t/arrow" : null),
+    });
+    expect(document.body.innerHTML).toContain("M1 1h9z");
+    expect(document.body.querySelector("[data-icon]")?.getAttribute("data-icon")).toBe("chevron-right");
+    setFileIconTheme(null);
+    expect(document.body.innerHTML).not.toContain("M1 1h9z");
+    unregister();
+    document.body.innerHTML = "";
+  });
+
   it("renders monochrome icons with currentColor and coloured ones with both theme variants", () => {
     const { container } = render(
       <>
diff --git a/src/ui/icons.tsx b/src/ui/icons.tsx
index 77b04b77..7caf7306 100644
--- a/src/ui/icons.tsx
+++ b/src/ui/icons.tsx
@@ -183,6 +183,7 @@ const ICONS = {
   "toolwindow-changes": "toolwindows/changes",
   "toolwindow-database": "openidea/toolwindows/database",
   "toolwindow-agents": "openidea/toolwindows/agents",
+  "toolwindow-graphql": "openidea/toolwindows/graphql",
   // Coding agents (logos via Paseo)
   "agent-claude": "openidea/agents/claude",
   "agent-codex": "openidea/agents/codex",
@@ -217,12 +218,15 @@ const ICONS = {
   word: "inline/exactWords",
   "text-match": "openidea/nodes/textMatch",
   "open-in-tool-window": "general/openInToolWindow",
-  "preserve-case": "openidea/inline/preserveCase",
-  "new-line": "openidea/inline/newLine",
-  "search-history": "openidea/inline/searchHistory",
+  "preserve-case": "inline/preserveCase",
+  "new-line": "inline/newLine",
+  "search-history": "inline/searchHistory",
   filter: "general/filter",
   refresh: "general/refresh",
   settings: "general/settings",
+  help: "openidea/general/help",
+  sliders: "openidea/general/sliders",
+  "graphql-variables": "openidea/general/graphqlVariables",
   layout: "general/layout",
   split: "general/splitVertically",
   "split-horizontal": "general/splitHorizontally",
@@ -303,6 +307,7 @@ const ICONS = {
   "db-disconnect": "openidea/database/disconnect",
   "db-sqlite": "openidea/database/sqlite",
   "db-postgres": "openidea/database/postgres",
+  "db-clickhouse": "openidea/database/clickhouse",
   "db-mysql": "openidea/database/mysql",
   "db-sqlserver": "openidea/database/sqlserver",
   "db-mariadb": "openidea/database/mariadb",
@@ -534,11 +539,20 @@ const SYMBOL_ICONS: Partial<Record<SymbolKind, string>> = {
   text: "fileTypes/text",
 };
 
+const NOT_SYMBOLS: ReadonlySet<string> = new Set(["file", "text"]);
+
+export function isSymbolIcon(name: string): boolean {
+  if (name.startsWith("symbol-")) return true;
+  return Object.hasOwn(SYMBOL_ICONS, name) && !NOT_SYMBOLS.has(name);
+}
+
 export type IconName = BaseName | `symbol-${SymbolKind}`;
 
 export const ICON_NAMES = Object.keys(ICONS) as BaseName[];
 
 function iconPath(name: string): string | undefined {
+  const themed = fileIconTheme?.icon?.(name);
+  if (themed && EXTERNAL.has(themed)) return themed;
   if (name.startsWith(EXTERNAL_PREFIX)) return EXTERNAL.has(name) ? name : undefined;
   if (name.startsWith("symbol-")) return SYMBOL_ICONS[name.slice(7) as SymbolKind];
   return (ICONS as Record<string, string>)[name];
@@ -572,9 +586,10 @@ export function registerExternalIcons(icons: ReadonlyArray<readonly [name: strin
 
 /** A file icon theme (plugin `iconThemes`). Each method returns an icon name, or null for the built-in one. */
 export interface FileIconTheme {
-  file(fileName: string): string | null;
+  file(fileName: string, path?: string | null): string | null;
   /** Plain folders only: folders with a role (source root, excluded, …) keep their built-in icons. */
-  folder(folderName: string, expanded: boolean): string | null;
+  folder(folderName: string, expanded: boolean, holdsOpenFile?: boolean, path?: string | null): string | null;
+  icon?(name: string): string | null;
 }
 
 let fileIconTheme: FileIconTheme | null = null;
@@ -593,8 +608,13 @@ export function setFileIconTheme(theme: FileIconTheme | null) {
 }
 
 /** The icon theme's icon for a plain folder, or null to keep the built-in one. */
-export function themedFolderIconName(folderName: string, expanded = false): IconName | null {
-  return (fileIconTheme?.folder(folderName, expanded) ?? null) as IconName | null;
+export function themedFolderIconName(
+  folderName: string,
+  expanded = false,
+  holdsOpenFile = false,
+  path: string | null = null,
+): IconName | null {
+  return (fileIconTheme?.folder(folderName, expanded, holdsOpenFile, path) ?? null) as IconName | null;
 }
 
 // ---------------------------------------------------------------------------
@@ -693,6 +713,7 @@ export interface IconProps {
 }
 
 export function Icon({ name, size = 16, className, style, label }: IconProps) {
+  useFileIconRevision();
   const uid = useId();
   const path = iconPath(name);
   const p = (path && prepare(path, size >= 18)) || prepare(ICONS.file, size >= 18) || EMPTY;
@@ -721,14 +742,37 @@ let markupSeq = 0;
 
 /** SVG markup for non-React (CodeMirror DOM) callers; `null` when the name is unknown. */
 export function iconMarkup(name: string, size = 16, className?: string): string | null {
+  return markupAs(name, name, size, className);
+}
+
+function markupAs(name: string, shown: string, size: number, className?: string): string | null {
   const path = iconPath(name);
   const p = path && prepare(path, size >= 18);
   if (!p) return null;
   const cls = clsx(styles.icon, p.mono && styles.mono, className);
   const html = withIds(p, `m${++markupSeq}-`);
-  return `<svg class="${cls}" width="${size}" height="${size}" viewBox="${p.viewBox}" fill="none" aria-hidden="true" focusable="false">${html}</svg>`;
+  return `<svg class="${cls}" ${markupData(shown, size, className)} width="${size}" height="${size}" viewBox="${p.viewBox}" fill="none" aria-hidden="true" focusable="false">${html}</svg>`;
 }
 
+const attr = (v: string) => v.replace(/[&<>"]/g, (c) => `&#${c.charCodeAt(0)};`);
+
+function markupData(name: string, size: number, className?: string) {
+  const cls = className ? ` data-icon-class="${attr(className)}"` : "";
+  return `data-icon="${attr(name)}" data-icon-size="${size}"${cls}`;
+}
+
+function repaintMarkup() {
+  if (typeof document === "undefined") return;
+  for (const el of document.querySelectorAll<HTMLElement | SVGElement>("[data-icon][data-icon-size]")) {
+    const name = el.getAttribute("data-icon") ?? "";
+    const size = Number(el.getAttribute("data-icon-size")) || 16;
+    const className = el.getAttribute("data-icon-class") ?? undefined;
+    el.outerHTML = iconMarkupOrFallback(name, size, className);
+  }
+}
+
+useFileIconRevision.subscribe(repaintMarkup);
+
 /**
  * Gutter icon markup in the 14px gutter column. The plain play glyph fills its canvas, so it is
  * drawn smaller; the other gutter icons (run-all, status badges, inheritance arrows, file types)
@@ -743,15 +787,15 @@ export function gutterIconMarkup(name: string): string | null {
  * (a symbol letter badge, else the generic file icon). Plain strings, so
  * CodeMirror callers need no React renderer.
  */
-export function iconMarkupOrFallback(name: string, size = 16): string {
-  const html = iconMarkup(name, size);
+export function iconMarkupOrFallback(name: string, size = 16, className?: string): string {
+  const html = iconMarkup(name, size, className);
   if (html !== null) return html;
   if (name.startsWith("symbol-")) {
     const kind = name.slice(7).replace(/[^\w-]/g, "");
     const letter = symbolLetter(kind).replace(/[&<>]/g, (c) => `&#${c.charCodeAt(0)};`);
-    return `<span class="${styles.symbol}" data-kind="${kind}" aria-hidden="true">${letter}</span>`;
+    return `<span class="${styles.symbol}" ${markupData(name, size, className)} data-kind="${kind}" aria-hidden="true">${letter}</span>`;
   }
-  return iconMarkup("file", size) ?? "";
+  return markupAs("file", name, size, className) ?? "";
 }
 
 export function hasIcon(name: string): boolean {
@@ -1001,14 +1045,14 @@ export function addFileIconProvider(resolve: (fileName: string) => string | null
 }
 
 /** Picks a file-type icon from a file name. */
-export function fileIconName(fileName: string): IconName {
+export function fileIconName(fileName: string, path: string | null = null): IconName {
   const custom = iconOverride?.(fileName);
   if (custom) return custom;
   for (const provide of fileIconProviders) {
     const icon = provide(fileName);
     if (icon && iconPath(icon)) return icon as IconName;
   }
-  const themed = fileIconTheme?.file(fileName);
+  const themed = fileIconTheme?.file(fileName, path);
   if (themed) return themed as IconName;
   const lower = fileName.toLowerCase();
   const named = FILE_NAMES[lower] ?? NAME_PATTERNS.find(([re]) => re.test(lower))?.[1];
diff --git a/src/ui/index.ts b/src/ui/index.ts
index 6aac9442..5633d0a1 100644
--- a/src/ui/index.ts
+++ b/src/ui/index.ts
@@ -2,6 +2,7 @@ export * from "./icons";
 export * from "./Button";
 export * from "./FloatingToolbar";
 export * from "./Kbd";
+export * from "./Mnemonic";
 export * from "./Tooltip";
 export * from "./Input";
 export * from "./Checkbox";
diff --git a/src/ui/openidea/database/clickhouse.svg b/src/ui/openidea/database/clickhouse.svg
new file mode 100644
index 00000000..f0a7e8c4
--- /dev/null
+++ b/src/ui/openidea/database/clickhouse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><rect width="512" height="512" rx="8" fill="#161616"/><g fill="#FCFF74"><rect x="83" y="83" width="38" height="346" rx="3"/><rect x="160" y="83" width="38" height="346" rx="3"/><rect x="237" y="83" width="38" height="346" rx="3"/><rect x="314" y="83" width="38" height="346" rx="3"/><rect x="391" y="218" width="38" height="76" rx="3"/></g></svg>
diff --git a/src/ui/openidea/general/graphqlVariables.svg b/src/ui/openidea/general/graphqlVariables.svg
new file mode 100644
index 00000000..566d812b
--- /dev/null
+++ b/src/ui/openidea/general/graphqlVariables.svg
@@ -0,0 +1,4 @@
+<!-- OpenIDEA: GraphQL variables editor toggle (V badge) -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.5" y="1.5" width="13" height="13" rx="2" fill="#FFF4EB" stroke="#E66D17"/><path d="M5 4.5L8 11.5L11 4.5" stroke="#E66D17" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/ui/openidea/general/graphqlVariables_dark.svg b/src/ui/openidea/general/graphqlVariables_dark.svg
new file mode 100644
index 00000000..73fc1565
--- /dev/null
+++ b/src/ui/openidea/general/graphqlVariables_dark.svg
@@ -0,0 +1,4 @@
+<!-- OpenIDEA: GraphQL variables editor toggle (V badge) -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.5" y="1.5" width="13" height="13" rx="2" fill="#45322B" stroke="#E08855"/><path d="M5 4.5L8 11.5L11 4.5" stroke="#E08855" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/ui/openidea/general/help.svg b/src/ui/openidea/general/help.svg
new file mode 100644
index 00000000..e172c0cf
--- /dev/null
+++ b/src/ui/openidea/general/help.svg
@@ -0,0 +1,4 @@
+<!-- OpenIDEA: Help (question mark) -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.5 6C5.5 4.62 6.62 3.5 8 3.5C9.38 3.5 10.5 4.62 10.5 6C10.5 7.1 9.79 7.6 9.1 8.08C8.5 8.5 8 8.85 8 9.75V10.25" stroke="#6C707E" stroke-linecap="round"/><circle cx="8" cy="12.5" r="0.75" fill="#6C707E"/>
+</svg>
diff --git a/src/ui/openidea/general/sliders.svg b/src/ui/openidea/general/sliders.svg
new file mode 100644
index 00000000..ef256b8c
--- /dev/null
+++ b/src/ui/openidea/general/sliders.svg
@@ -0,0 +1,4 @@
+<!-- OpenIDEA: Settings sliders (options) -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 4.5H8M11 4.5H14M2 11.5H4M7 11.5H14" stroke="#6C707E" stroke-linecap="round"/><circle cx="9.5" cy="4.5" r="1.5" stroke="#6C707E"/><circle cx="5.5" cy="11.5" r="1.5" stroke="#6C707E"/>
+</svg>
diff --git a/src/ui/openidea/inline/newLine.svg b/src/ui/openidea/inline/newLine.svg
deleted file mode 100644
index ef17e8ff..00000000
--- a/src/ui/openidea/inline/newLine.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 3V8.5C12.5 9.32843 11.8284 10 11 10H3" stroke="#6C707E" stroke-linecap="round"/>
-<path d="M5.5 7.5L3 10L5.5 12.5" stroke="#6C707E" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/ui/openidea/inline/newLine_dark.svg b/src/ui/openidea/inline/newLine_dark.svg
deleted file mode 100644
index fd64540d..00000000
--- a/src/ui/openidea/inline/newLine_dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 3V8.5C12.5 9.32843 11.8284 10 11 10H3" stroke="#CED0D6" stroke-linecap="round"/>
-<path d="M5.5 7.5L3 10L5.5 12.5" stroke="#CED0D6" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/ui/openidea/inline/preserveCase.svg b/src/ui/openidea/inline/preserveCase.svg
deleted file mode 100644
index f17d75d3..00000000
--- a/src/ui/openidea/inline/preserveCase.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 12.5L4.25 3.5L7.5 12.5M2.25 9.25H6.25" stroke="#6C707E" stroke-width="1.2"/>
-<path d="M9.5 3.5V12.5H12.6C13.9 12.5 14.9 11.6 14.9 10.35C14.9 9.1 13.9 8.2 12.6 8.2H9.5M9.5 8.2H12.2C13.3 8.2 14.2 7.4 14.2 5.85C14.2 4.3 13.3 3.5 12.2 3.5H9.5" stroke="#6C707E" stroke-width="1.2"/>
-<path d="M1 14.5H15" stroke="#6C707E" stroke-width="1"/>
-</svg>
diff --git a/src/ui/openidea/inline/preserveCase_dark.svg b/src/ui/openidea/inline/preserveCase_dark.svg
deleted file mode 100644
index 914b59a5..00000000
--- a/src/ui/openidea/inline/preserveCase_dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 12.5L4.25 3.5L7.5 12.5M2.25 9.25H6.25" stroke="#CED0D6" stroke-width="1.2"/>
-<path d="M9.5 3.5V12.5H12.6C13.9 12.5 14.9 11.6 14.9 10.35C14.9 9.1 13.9 8.2 12.6 8.2H9.5M9.5 8.2H12.2C13.3 8.2 14.2 7.4 14.2 5.85C14.2 4.3 13.3 3.5 12.2 3.5H9.5" stroke="#CED0D6" stroke-width="1.2"/>
-<path d="M1 14.5H15" stroke="#CED0D6" stroke-width="1"/>
-</svg>
diff --git a/src/ui/openidea/inline/searchHistory.svg b/src/ui/openidea/inline/searchHistory.svg
deleted file mode 100644
index dad03f4c..00000000
--- a/src/ui/openidea/inline/searchHistory.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="6" cy="6" r="3.5" stroke="#6C707E"/>
-<path d="M8.5 8.5L11.5 11.5" stroke="#6C707E" stroke-linecap="round"/>
-<path d="M11 5H15L13 7.5L11 5Z" fill="#6C707E"/>
-</svg>
diff --git a/src/ui/openidea/inline/searchHistory_dark.svg b/src/ui/openidea/inline/searchHistory_dark.svg
deleted file mode 100644
index 6113d010..00000000
--- a/src/ui/openidea/inline/searchHistory_dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="6" cy="6" r="3.5" stroke="#CED0D6"/>
-<path d="M8.5 8.5L11.5 11.5" stroke="#CED0D6" stroke-linecap="round"/>
-<path d="M11 5H15L13 7.5L11 5Z" fill="#CED0D6"/>
-</svg>
diff --git a/src/ui/openidea/toolwindows/graphql.svg b/src/ui/openidea/toolwindows/graphql.svg
new file mode 100644
index 00000000..00963cd8
--- /dev/null
+++ b/src/ui/openidea/toolwindows/graphql.svg
@@ -0,0 +1,4 @@
+<!-- OpenIDEA: GraphQL tool window (hexagon with inscribed triangle) -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2L13.2 5V11L8 14L2.8 11V5L8 2Z" stroke="#6C707E" stroke-linejoin="round"/><path d="M8 2L13.2 11H2.8L8 2Z" stroke="#6C707E" stroke-linejoin="round"/><circle cx="8" cy="2" r="1.25" fill="#6C707E"/><circle cx="13.2" cy="5" r="1.25" fill="#6C707E"/><circle cx="13.2" cy="11" r="1.25" fill="#6C707E"/><circle cx="8" cy="14" r="1.25" fill="#6C707E"/><circle cx="2.8" cy="11" r="1.25" fill="#6C707E"/><circle cx="2.8" cy="5" r="1.25" fill="#6C707E"/>
+</svg>
diff --git a/src/ui/openidea/toolwindows/graphql@20x20.svg b/src/ui/openidea/toolwindows/graphql@20x20.svg
new file mode 100644
index 00000000..eb7c043f
--- /dev/null
+++ b/src/ui/openidea/toolwindows/graphql@20x20.svg
@@ -0,0 +1,4 @@
+<!-- OpenIDEA: GraphQL tool window (hexagon with inscribed triangle), stripe size -->
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 2.5L16.5 6.25V13.75L10 17.5L3.5 13.75V6.25L10 2.5Z" stroke="#6C707E" stroke-width="1.2" stroke-linejoin="round"/><path d="M10 2.5L16.5 13.75H3.5L10 2.5Z" stroke="#6C707E" stroke-width="1.2" stroke-linejoin="round"/><circle cx="10" cy="2.5" r="1.5" fill="#6C707E"/><circle cx="16.5" cy="6.25" r="1.5" fill="#6C707E"/><circle cx="16.5" cy="13.75" r="1.5" fill="#6C707E"/><circle cx="10" cy="17.5" r="1.5" fill="#6C707E"/><circle cx="3.5" cy="13.75" r="1.5" fill="#6C707E"/><circle cx="3.5" cy="6.25" r="1.5" fill="#6C707E"/>
+</svg>
diff --git a/src/ui/patternIndex.test.ts b/src/ui/patternIndex.test.ts
new file mode 100644
index 00000000..a0d9f096
--- /dev/null
+++ b/src/ui/patternIndex.test.ts
@@ -0,0 +1,77 @@
+import { describe, expect, it } from "vitest";
+import { createPatternIndex, extensionKeys, firstCharKeys } from "./patternIndex";
+
+describe("pattern index keys", () => {
+  it("derives the extensions a pattern can end with", () => {
+    expect(extensionKeys("\\.ya?ml$")?.sort()).toEqual(["yaml", "yml"]);
+    expect(extensionKeys(".*\\.(es|edql)$")?.sort()).toEqual(["edql", "es"]);
+    expect(extensionKeys("\\.[cm]?js$")?.sort()).toEqual(["cjs", "js", "mjs"]);
+    expect(extensionKeys("\\.(tar\\.gz|tgz)$")?.sort()).toEqual(["gz", "tgz"]);
+    expect(extensionKeys("^Cargo\\.toml$")).toEqual(["toml"]);
+    expect(extensionKeys("/(tests?)/.*\\.java$")).toEqual(["java"]);
+    expect(extensionKeys("\\.js")).toBeNull();
+    expect(extensionKeys("\\.(md|[a-z]+)$")).toBeNull();
+    expect(extensionKeys("a\\.md$|b\\.txt$")).toBeNull();
+    expect(extensionKeys("(architecture)(\\.(md|txt))?$")).toBeNull();
+  });
+
+  it("derives the characters an anchored pattern can start with", () => {
+    expect(firstCharKeys("^README")).toEqual(["R"]);
+    expect(firstCharKeys("^(README|readme)(\\.md)?$")?.sort()).toEqual(["R", "r"]);
+    expect(firstCharKeys("^[Mm]akefile$")?.sort()).toEqual(["M", "m"]);
+    expect(firstCharKeys("^\\.babelrc$")).toEqual(["."]);
+    expect(firstCharKeys("^\\.?kitchen")).toBeNull();
+    expect(firstCharKeys("README")).toBeNull();
+    expect(firstCharKeys("^a|b")).toBeNull();
+  });
+});
+
+describe("pattern index", () => {
+  const patterns = [
+    "^README",
+    "\\.ya?ml$",
+    "(main|ci)\\.ya?ml$",
+    "\\.md$",
+    "^\\.github",
+    "/tests?/.*\\.java$",
+    "\\.java$",
+    "^(a|b)",
+    "x",
+    "^cargo\\.toml$",
+    "\\.TXT$",
+  ].map((source, order) => ({
+    re: new RegExp(source, source.includes("cargo") || source.includes("TXT") ? "i" : ""),
+    source,
+    path: source.startsWith("/"),
+    order,
+  }));
+
+  const linear = (name: string, path: string | null) =>
+    patterns.find((p) => {
+      const subject = p.path ? path : name;
+      return subject !== null && p.re.test(subject);
+    })?.order;
+
+  it("finds the same first match as a linear scan", () => {
+    const index = createPatternIndex(patterns);
+    const names = [
+      "README.md",
+      "ci.yml",
+      "a.yaml",
+      "x.md",
+      ".github",
+      "Foo.java",
+      "b.txt",
+      "box",
+      "nothing.rs",
+      "md",
+      "Cargo.toml",
+      "NOTES.txt",
+    ];
+    for (const name of names) {
+      for (const path of [null, `/p/tests/${name}`, `/p/src/${name}`]) {
+        expect(index.find(name, path)?.order, `${name} ${path}`).toBe(linear(name, path));
+      }
+    }
+  });
+});
diff --git a/src/ui/patternIndex.ts b/src/ui/patternIndex.ts
new file mode 100644
index 00000000..7d7012cc
--- /dev/null
+++ b/src/ui/patternIndex.ts
@@ -0,0 +1,219 @@
+const MAX_STRINGS = 64;
+const SPECIAL = new Set([".", "*", "+", "?", "{", "}", "(", ")", "[", "]", "|", "^", "$", "\\"]);
+const ESCAPED_LITERALS = new Set([
+  ".",
+  "-",
+  "_",
+  "/",
+  "+",
+  "(",
+  ")",
+  "[",
+  "]",
+  "{",
+  "}",
+  "$",
+  "^",
+  "|",
+  "?",
+  "*",
+  "\\",
+]);
+
+type Strings = string[] | null;
+
+interface Cursor {
+  src: string;
+  at: number;
+}
+
+function product(a: string[], b: string[]): Strings {
+  if (a.length * b.length > MAX_STRINGS) return null;
+  return a.flatMap((x) => b.map((y) => x + y));
+}
+
+function parseClass(c: Cursor): Strings {
+  const chars: string[] = [];
+  c.at++;
+  while (c.at < c.src.length && c.src[c.at] !== "]") {
+    const ch = c.src[c.at]!;
+    if (ch === "^" || ch === "[" || (ch === "-" && chars.length > 0 && c.src[c.at + 1] !== "]")) return null;
+    if (ch === "\\") {
+      const next = c.src[c.at + 1];
+      if (!next || !ESCAPED_LITERALS.has(next)) return null;
+      chars.push(next);
+      c.at += 2;
+      continue;
+    }
+    chars.push(ch);
+    c.at++;
+  }
+  if (c.src[c.at] !== "]") return null;
+  c.at++;
+  return chars.length ? chars : null;
+}
+
+function parseAtom(c: Cursor): Strings {
+  const ch = c.src[c.at]!;
+  if (ch === "(") {
+    c.at += c.src.startsWith("(?:", c.at) ? 3 : 1;
+    if (c.src[c.at] === "?") return null;
+    const inner = parseAlternation(c);
+    if (inner === null || c.src[c.at] !== ")") return null;
+    c.at++;
+    return inner;
+  }
+  if (ch === "[") return parseClass(c);
+  if (ch === "\\") {
+    const next = c.src[c.at + 1];
+    if (!next || !ESCAPED_LITERALS.has(next)) return null;
+    c.at += 2;
+    return [next];
+  }
+  if (SPECIAL.has(ch)) return null;
+  c.at++;
+  return [ch];
+}
+
+function parseConcat(c: Cursor): Strings {
+  let out: string[] = [""];
+  while (c.at < c.src.length && c.src[c.at] !== "|" && c.src[c.at] !== ")") {
+    const atom = parseAtom(c);
+    if (atom === null) return null;
+    const quantifier = c.src[c.at];
+    if (quantifier === "*" || quantifier === "+" || quantifier === "{") return null;
+    const options = quantifier === "?" ? [...atom, ""] : atom;
+    if (quantifier === "?") c.at++;
+    const next = product(out, options);
+    if (next === null) return null;
+    out = next;
+  }
+  return out;
+}
+
+function parseAlternation(c: Cursor): Strings {
+  const out: string[] = [];
+  for (;;) {
+    const branch = parseConcat(c);
+    if (branch === null) return null;
+    out.push(...branch);
+    if (out.length > MAX_STRINGS) return null;
+    if (c.src[c.at] !== "|") return out;
+    c.at++;
+  }
+}
+
+function finiteStrings(src: string): Strings {
+  const c = { src, at: 0 };
+  const out = parseAlternation(c);
+  return out !== null && c.at === src.length ? out : null;
+}
+
+interface TopLevel {
+  alternation: boolean;
+  lastDot: number;
+}
+
+function scanTopLevel(src: string): TopLevel {
+  let depth = 0;
+  let inClass = false;
+  let lastDot = -1;
+  let alternation = false;
+  for (let i = 0; i < src.length; i++) {
+    const ch = src[i];
+    if (ch === "\\") {
+      if (!inClass && depth === 0 && src[i + 1] === ".") lastDot = i;
+      i++;
+    } else if (inClass) {
+      if (ch === "]") inClass = false;
+    } else if (ch === "[") inClass = true;
+    else if (ch === "(") depth++;
+    else if (ch === ")") depth--;
+    else if (ch === "|" && depth === 0) alternation = true;
+  }
+  return { alternation, lastDot };
+}
+
+export function extensionKeys(src: string): string[] | null {
+  if (!src.endsWith("$") || src.endsWith("\\$")) return null;
+  const { alternation, lastDot } = scanTopLevel(src);
+  if (alternation || lastDot < 0) return null;
+  const tail = finiteStrings(src.slice(lastDot + 2, -1));
+  if (tail === null) return null;
+  return [...new Set(tail.map((s) => s.slice(s.lastIndexOf(".") + 1)))];
+}
+
+export function firstCharKeys(src: string): string[] | null {
+  if (!src.startsWith("^") || scanTopLevel(src).alternation || src.length < 2) return null;
+  const c = { src, at: 1 };
+  const atom = parseAtom(c);
+  const quantifier = src[c.at];
+  if (atom === null || quantifier === "?" || quantifier === "*" || quantifier === "+" || quantifier === "{") {
+    return null;
+  }
+  if (atom.some((s) => s === "")) return null;
+  return [...new Set(atom.map((s) => s[0]!))];
+}
+
+export interface IndexedPattern {
+  re: RegExp;
+  source: string;
+  path: boolean;
+  order: number;
+}
+
+export interface PatternIndex<T extends IndexedPattern> {
+  find(name: string, path: string | null): T | undefined;
+}
+
+function add<T>(map: Map<string, T[]>, key: string, item: T) {
+  const list = map.get(key);
+  if (list) list.push(item);
+  else map.set(key, [item]);
+}
+
+const NONE: readonly never[] = [];
+
+export function createPatternIndex<T extends IndexedPattern>(
+  patterns: readonly T[],
+  accept: (pattern: T, name: string, path: string | null) => boolean = (p, name, path) => {
+    const subject = p.path ? path : name;
+    return subject !== null && p.re.test(subject);
+  },
+): PatternIndex<T> {
+  const byExt = new Map<string, T[]>();
+  const byFirst = new Map<string, T[]>();
+  const generic: T[] = [];
+  for (const p of patterns) {
+    const ext = extensionKeys(p.source);
+    if (ext) {
+      for (const key of new Set(ext.map((k) => k.toLowerCase()))) add(byExt, key, p);
+      continue;
+    }
+    const first = p.path ? null : firstCharKeys(p.source);
+    if (first) for (const key of new Set(first.map((k) => k.toLowerCase()))) add(byFirst, key, p);
+    else generic.push(p);
+  }
+  return {
+    find(name, path) {
+      const dot = name.lastIndexOf(".");
+      const lists = [
+        generic,
+        dot >= 0 ? (byExt.get(name.slice(dot + 1).toLowerCase()) ?? NONE) : NONE,
+        byFirst.get(name.charAt(0).toLowerCase()) ?? NONE,
+      ];
+      const at = [0, 0, 0];
+      for (;;) {
+        let pick = -1;
+        for (let l = 0; l < 3; l++) {
+          const item = lists[l]![at[l]!];
+          if (item && (pick < 0 || item.order < lists[pick]![at[pick]!]!.order)) pick = l;
+        }
+        if (pick < 0) return undefined;
+        const item = lists[pick]![at[pick]!]!;
+        at[pick]!++;
+        if (accept(item, name, path)) return item;
+      }
+    },
+  };
+}
diff --git a/src/ui/tokenSpans.tsx b/src/ui/tokenSpans.tsx
new file mode 100644
index 00000000..9adb22e3
--- /dev/null
+++ b/src/ui/tokenSpans.tsx
@@ -0,0 +1,39 @@
+import type { ReactNode } from "react";
+
+/** A syntax-coloured span of a text: `[from, to)` with its `tok-*` class names. */
+export interface SourceToken {
+  from: number;
+  to: number;
+  cls: string;
+}
+
+/**
+ * `text` between `from` and `to` as spans with the tokens' `tok-*` classes
+ * (styled in global.css); `key` prefixes the React keys.
+ */
+export function tokenSpans(
+  text: string,
+  from: number,
+  to: number,
+  tokens: readonly SourceToken[] | null,
+  key = "",
+): ReactNode[] {
+  if (!tokens?.length) return [text.slice(from, to)];
+  const out: ReactNode[] = [];
+  let pos = from;
+  for (const t of tokens) {
+    if (t.to <= pos) continue;
+    if (t.from >= to) break;
+    const s = Math.max(t.from, pos);
+    const e = Math.min(t.to, to);
+    if (s > pos) out.push(text.slice(pos, s));
+    out.push(
+      <span key={`${key}${s}`} className={t.cls}>
+        {text.slice(s, e)}
+      </span>,
+    );
+    pos = e;
+  }
+  if (pos < to) out.push(text.slice(pos, to));
+  return out;
+}
diff --git a/src/workbench/MainMenu.tsx b/src/workbench/MainMenu.tsx
index f9adf94a..53dc658e 100644
--- a/src/workbench/MainMenu.tsx
+++ b/src/workbench/MainMenu.tsx
@@ -229,6 +229,9 @@ function MainMenuBar({ merged, onExpandedChange }: MainMenuProps & { merged: boo
           onPointerEnter={() => {
             if (open !== null) setOpen(i);
           }}
+          onMouseEnter={() => {
+            if (open !== null) setOpen(i);
+          }}
           onClick={() => {
             if (open === i) close();
             else setOpen(i);
diff --git a/src/workbench/TitleBar.tsx b/src/workbench/TitleBar.tsx
index cd8b6b3c..3ac6a89a 100644
--- a/src/workbench/TitleBar.tsx
+++ b/src/workbench/TitleBar.tsx
@@ -28,6 +28,7 @@ import { useContributedThemes } from "@/platform/themes";
 import { currentThemeChoice, useThemeOverride } from "./theme";
 import styles from "./TitleBar.module.css";
 import { useNativeTitlebar } from "./nativeTitlebar";
+import { windowDragRegion } from "./window-drag";
 
 export function orderTitleItems(items: Iterable<TitleItemContribution>) {
   const all = [...items];
@@ -287,11 +288,11 @@ export function TitleBar({
   // main menu (Windows, Linux) it stays, or nothing would lead back out of the mode.
   if (bare)
     return (
-      <header ref={setBar} className={className} data-tauri-drag-region data-titlebar="bare">
+      <header ref={setBar} className={className} {...windowDragRegion} data-titlebar="bare">
         {frameless && (
           <>
             <MainMenu />
-            <div className={styles.drag} data-tauri-drag-region />
+            <div className={styles.drag} {...windowDragRegion} />
             <WindowControls />
           </>
         )}
@@ -303,7 +304,7 @@ export function TitleBar({
     <header
       ref={setBar}
       className={clsx(className, minimal && styles.minimal, dialog && styles.dialogBar)}
-      data-tauri-drag-region
+      {...windowDragRegion}
       onContextMenu={(e) => {
         if (!toolbar || e.defaultPrevented) return;
         e.preventDefault();
@@ -312,12 +313,12 @@ export function TitleBar({
     >
       {frameless && !minimal && <MainMenu onExpandedChange={setMenuExpanded} />}
       {title && (
-        <span className={styles.windowTitle} data-tauri-drag-region>
+        <span className={styles.windowTitle} {...windowDragRegion}>
           {typeof title === "string" ? <T>{title}</T> : title}
         </span>
       )}
       {toolbar && !menuExpanded && shown.left.map(entry)}
-      <div className={styles.drag} data-tauri-drag-region />
+      <div className={styles.drag} {...windowDragRegion} />
       {!minimal && (
         <>
           {toolbar && !menuExpanded && shown.right.map(entry)}
diff --git a/src/workbench/Workbench.tsx b/src/workbench/Workbench.tsx
index 9b5c832c..67a50b57 100644
--- a/src/workbench/Workbench.tsx
+++ b/src/workbench/Workbench.tsx
@@ -20,16 +20,16 @@ import { useApplyTheme } from "./theme";
 import { ToolWindowLayout } from "./toolwindows/ToolWindows";
 import { Welcome } from "./Welcome";
 import { WindowResizeHandles } from "./WindowResizeHandles";
-import { useContributions } from "./contributions";
+import { useContributions, useStandaloneEditor } from "./contributions";
 import styles from "./Workbench.module.css";
 
 /** LightEdit: editor tabs only; no tool windows, toolbar widgets or project status items. */
-function LightEditFrame() {
+function LightEditFrame({ title }: { title?: string }) {
   const path = useEditorRegistry((s) => s.active?.ctx.path);
   const distractionFree = useDistractionFree((s) => s.active);
   return (
     <>
-      <TitleBar lightEdit bare={distractionFree} title={path ? basename(path) : "LightEdit"} />
+      <TitleBar lightEdit bare={distractionFree} title={title ?? (path ? basename(path) : "LightEdit")} />
       <main className={styles.lightEdit} data-light-edit>
         <div className={styles.lightEditIsland}>
           <EditorArea />
@@ -66,10 +66,11 @@ export function Workbench() {
   const banners = useContributions((s) => s.workbenchBanners);
   const project = useProject((s) => s.project);
   const lightEdit = useProject((s) => s.lightEdit);
+  const standaloneTitle = useStandaloneEditor((s) => s.title);
   const openingPath = useProject((s) => s.openingPath);
   const root = project?.root ?? null;
   const distractionFree = useDistractionFree((s) => s.active);
-  const frame = project ? styles.framed : lightEdit ? styles.lightEditFrame : undefined;
+  const frame = project ? styles.framed : lightEdit || standaloneTitle ? styles.lightEditFrame : undefined;
 
   return (
     <div
@@ -88,8 +89,8 @@ export function Workbench() {
             <ToolWindowLayout key={root} editor={<EditorArea />} />
             {!distractionFree && <StatusBar />}
           </>
-        ) : lightEdit ? (
-          <LightEditFrame />
+        ) : lightEdit || standaloneTitle ? (
+          <LightEditFrame title={standaloneTitle ?? undefined} />
         ) : (
           <Welcome />
         )}
diff --git a/src/workbench/contributions.ts b/src/workbench/contributions.ts
index 553b8b83..7b7c2a63 100644
--- a/src/workbench/contributions.ts
+++ b/src/workbench/contributions.ts
@@ -120,6 +120,10 @@ export interface EditorKindContribution {
    * `data` must be plain JSON). The editor closes tabs whose target is gone itself.
    */
   restorable?: boolean;
+  /** Can remain visible in a window without a project (for example, an external Git log). */
+  standalone?: boolean;
+  /** Last tab showing this input closed (including split tabs and tab-limit eviction). */
+  onClose?(input: EditorInput): void;
   /**
    * The editor owns a document with unsaved state (a notebook): it takes part in
    * the dirty mark, Save All, autosave and the close prompts. Tabs with equal
@@ -158,6 +162,7 @@ export interface EditorDocumentLifecycle {
 
 /** Bumped by `notifyEditorDocumentChanged`; selectors reading `isDirty` re-run on it. */
 export const useEditorDocuments = create<{ revision: number }>(() => ({ revision: 0 }));
+export const useStandaloneEditor = create<{ title: string | null }>(() => ({ title: null }));
 
 /** A custom editor document's dirty state (or pending edits) may have changed: tab marks and counts refresh. */
 export function notifyEditorDocumentChanged() {
@@ -1107,7 +1112,9 @@ export interface RunConfigTypeField {
   /** Visible lines of a `textarea` (default 4). */
   rows?: number;
   placeholder?: string;
-  options?: ReadonlyArray<{ value: string; label: string }>;
+  options?: ReadonlyArray<{ value: string; label: string; detail?: string }>;
+  /** A `select`'s further options, read when the form shows it (installed JDKs, build modules). */
+  loadOptions?(): Promise<ReadonlyArray<{ value: string; label: string; detail?: string }>>;
   /** Values offered while typing (e.g. the scripts of detected configurations). */
   suggestions?(configs: readonly RunConfig[], params: Readonly<Record<string, string>>): string[];
   required?: boolean;
diff --git a/src/workbench/distractionFree.test.tsx b/src/workbench/distractionFree.test.tsx
index 295dcfac..b38bafbd 100644
--- a/src/workbench/distractionFree.test.tsx
+++ b/src/workbench/distractionFree.test.tsx
@@ -217,7 +217,8 @@ describe("distraction free shell", () => {
     expect(screen.queryByRole("button", { name: "Project" })).toBeNull();
     expect(screen.queryByRole("button", { name: "Search Everywhere" })).toBeNull();
     const bar = document.querySelector("header[data-titlebar='bare']");
-    expect(bar).toHaveAttribute("data-tauri-drag-region");
+    // macOS uses its own drag region attribute (window-drag.ts); jsdom reports the host OS.
+    expect(bar?.hasAttribute("data-tauri-drag-region") || bar?.hasAttribute("data-window-drag-region")).toBe(true);
 
     act(() => setDistractionFree(false));
     expect(screen.getByText("df-demo")).toBeInTheDocument();
diff --git a/src/workbench/lightEdit.test.tsx b/src/workbench/lightEdit.test.tsx
index 56075374..0feb9da6 100644
--- a/src/workbench/lightEdit.test.tsx
+++ b/src/workbench/lightEdit.test.tsx
@@ -4,7 +4,7 @@ import { useEditorRegistry } from "@/editor/api";
 import { evaluateWhen } from "@/platform/context";
 import { useProject } from "@/platform/project";
 import { activateWorkbench } from "./activate";
-import { registerStatusItem, registerTitleItem, registerToolWindow } from "./contributions";
+import { registerStatusItem, registerTitleItem, registerToolWindow, useStandaloneEditor } from "./contributions";
 import { EmptyEditor } from "./EditorArea";
 import { chooseProjectWindow } from "./projectWindow";
 import { Workbench } from "./Workbench";
@@ -36,6 +36,7 @@ describe("LightEdit window", () => {
     );
   });
   afterEach(() => {
+    useStandaloneEditor.setState({ title: null });
     disposers.splice(0).forEach((d) => d());
     useProject.setState({ project: null, lightEdit: false });
     useEditorRegistry.setState({ active: null });
@@ -52,6 +53,16 @@ describe("LightEdit window", () => {
     expect(screen.queryByText("Welcome to OpenIDEA")).toBeNull();
   });
 
+  it("keeps a standalone log visible without a project or LightEdit session", () => {
+    useProject.setState({ lightEdit: false });
+    useStandaloneEditor.setState({ title: "External Git Log" });
+    render(<Workbench />);
+    expect(screen.getByText("External Git Log")).toBeInTheDocument();
+    expect(document.querySelector("[data-editor-area]")).not.toBeNull();
+    expect(screen.queryByText("Welcome to OpenIDEA")).toBeNull();
+    expect(document.querySelector("[data-stripe-side]")).toBeNull();
+  });
+
   it("hints only at opening files in an empty editor", () => {
     render(<EmptyEditor />);
     expect(screen.getByText("Open File")).toBeInTheDocument();
diff --git a/src/workbench/quickSwitch.test.tsx b/src/workbench/quickSwitch.test.tsx
new file mode 100644
index 00000000..9d5c7d10
--- /dev/null
+++ b/src/workbench/quickSwitch.test.tsx
@@ -0,0 +1,116 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { ContextMenuHost, hideContextMenu, MenuList } from "@/ui";
+import { showQuickSwitch, THEME_PREVIEW_DELAY, themePreview } from "./quickSwitch";
+import {
+  applyThemeAttributes,
+  currentThemeId,
+  STARTUP_THEME_KEY,
+  syncWindowBackground,
+  useThemeOverride,
+} from "./theme";
+
+const root = document.documentElement;
+const shown = () => [root.dataset.theme, root.dataset.colorTheme ?? null];
+
+beforeEach(() => {
+  vi.useFakeTimers();
+  useThemeOverride.setState({ theme: null });
+  applyThemeAttributes(currentThemeId());
+});
+
+afterEach(() => {
+  act(() => hideContextMenu());
+  vi.useRealTimers();
+  useThemeOverride.setState({ theme: null });
+  applyThemeAttributes(currentThemeId());
+});
+
+describe("menu items", () => {
+  it("report becoming active by pointer or keyboard, not on opening", () => {
+    const active: string[] = [];
+    const item = (label: string) => ({ label, onActive: () => active.push(label), run: () => {} });
+    render(<MenuList items={[item("One"), item("Two"), item("Three")]} onDone={() => {}} />);
+    expect(active).toEqual([]);
+    fireEvent.keyDown(screen.getByRole("menu"), { key: "ArrowDown" });
+    fireEvent.pointerEnter(screen.getByRole("menuitem", { name: "Three" }));
+    fireEvent.keyDown(screen.getByRole("menu"), { key: "o" });
+    expect(active).toEqual(["Two", "Three", "One"]);
+  });
+});
+
+describe("Quick Switch theme preview", () => {
+  it("shows the active theme after a moment, in this window only, and takes it back", () => {
+    syncWindowBackground();
+    const startup = localStorage.getItem(STARTUP_THEME_KEY);
+    const before = shown();
+    const preview = themePreview();
+    preview.preview("solarized-dark");
+    vi.advanceTimersByTime(THEME_PREVIEW_DELAY - 1);
+    expect(shown()).toEqual(before);
+    // Moving on restarts the delay: only the theme the user stays on shows.
+    preview.preview("one-light");
+    vi.advanceTimersByTime(THEME_PREVIEW_DELAY - 1);
+    expect(shown()).toEqual(before);
+    vi.advanceTimersByTime(1);
+    expect(shown()).toEqual(["light", "one-light"]);
+    // Nothing is selected or saved, not even as the next start-up's theme.
+    expect(useThemeOverride.getState().theme).toBeNull();
+    expect(localStorage.getItem(STARTUP_THEME_KEY)).toBe(startup);
+
+    preview.restore();
+    expect(shown()).toEqual(before);
+    expect(localStorage.getItem(STARTUP_THEME_KEY)).toBe(startup);
+    preview.preview("solarized-dark");
+    vi.advanceTimersByTime(THEME_PREVIEW_DELAY);
+    preview.end();
+    expect(shown()).toEqual(before);
+  });
+
+  it("selects the chosen theme and keeps it when the menu closes", () => {
+    const preview = themePreview();
+    preview.preview("solarized-dark");
+    vi.advanceTimersByTime(THEME_PREVIEW_DELAY);
+    preview.choose("one-dark");
+    expect(useThemeOverride.getState().theme).toBe("one-dark");
+    expect(shown()).toEqual(["dark", "one-dark"]);
+    preview.end();
+    expect(shown()).toEqual(["dark", "one-dark"]);
+  });
+
+  it("previews from the Theme submenu and takes the preview back when the menu closes", async () => {
+    const before = shown();
+    render(<ContextMenuHost />);
+    act(() => showQuickSwitch({ x: 10, y: 10 }));
+    fireEvent.pointerEnter(screen.getByRole("menuitem", { name: "Theme" }));
+    act(() => vi.advanceTimersByTime(200));
+    fireEvent.pointerEnter(screen.getByRole("menuitemcheckbox", { name: "Solarized Light" }));
+    act(() => vi.advanceTimersByTime(THEME_PREVIEW_DELAY));
+    expect(shown()).toEqual(["light", "solarized-light"]);
+
+    // Back on another entry: the selected theme again.
+    fireEvent.pointerEnter(screen.getByRole("menuitem", { name: "Keymap" }));
+    expect(shown()).toEqual(before);
+
+    fireEvent.pointerEnter(screen.getByRole("menuitem", { name: "Theme" }));
+    act(() => vi.advanceTimersByTime(200));
+    fireEvent.pointerEnter(screen.getByRole("menuitemcheckbox", { name: "Solarized Light" }));
+    act(() => vi.advanceTimersByTime(THEME_PREVIEW_DELAY));
+    act(() => hideContextMenu());
+    await act(async () => {});
+    expect(shown()).toEqual(before);
+    expect(useThemeOverride.getState().theme).toBeNull();
+  });
+
+  it("selects a theme clicked in the Theme submenu", async () => {
+    render(<ContextMenuHost />);
+    act(() => showQuickSwitch({ x: 10, y: 10 }));
+    fireEvent.pointerEnter(screen.getByRole("menuitem", { name: "Theme" }));
+    act(() => vi.advanceTimersByTime(200));
+    fireEvent.click(screen.getByRole("menuitemcheckbox", { name: "Solarized Dark" }));
+    await act(async () => {});
+    expect(useThemeOverride.getState().theme).toBe("solarized-dark");
+    expect(shown()).toEqual(["dark", "solarized-dark"]);
+    expect(screen.queryByRole("menu")).toBeNull();
+  });
+});
diff --git a/src/workbench/quickSwitch.ts b/src/workbench/quickSwitch.ts
index fb3d5039..e45266b2 100644
--- a/src/workbench/quickSwitch.ts
+++ b/src/workbench/quickSwitch.ts
@@ -7,9 +7,9 @@ import { listSchemes } from "@/platform/colorScheme";
 import { editorPrefs } from "@/platform/editorSettings";
 import { PRESET_TITLES, useKeymap } from "@/platform/keymap";
 import { useProject } from "@/platform/project";
-import type { MenuItem } from "@/ui";
-import { themeChoices } from "@/platform/themes";
-import { currentThemeChoice, setTheme } from "./theme";
+import { showContextMenu, useContextMenuStore, type MenuItem } from "@/ui";
+import { themeGroups, type ThemeChoiceId } from "@/platform/themes";
+import { currentThemeChoice, previewTheme, setTheme } from "./theme";
 
 async function setGlobal(key: string, value: unknown, what: string) {
   if (!isTauri()) return;
@@ -22,15 +22,67 @@ async function setGlobal(key: string, value: unknown, what: string) {
 
 export const selectKeymap = (id: string) => setGlobal("keymap", id, "keymap");
 
-export function themeItems(themeId: string = currentThemeChoice()): MenuItem[] {
-  return themeChoices().map<MenuItem>((c) => ({
-    id: `theme.${c.id}`,
-    label: c.label,
-    // Plugin themes keep their own names.
-    verbatim: !!c.origin,
-    checked: c.id === themeId,
-    run: () => void setTheme(c.id),
-  }));
+/** How long a theme stays under the pointer or keyboard before Quick Switch shows it (IDEA's delay). */
+export const THEME_PREVIEW_DELAY = 500;
+
+/**
+ * IDEA's instant theme switch (`ide.instant.theme.switch`): in Quick Switch
+ * the active theme shows after a moment, in this window only; choosing one
+ * selects it, and closing the menu without a choice brings the selected
+ * theme back.
+ */
+export interface ThemePreview {
+  preview(id: ThemeChoiceId): void;
+  /** Back to the selected theme (another Quick Switch entry became active). */
+  restore(): void;
+  choose(id: ThemeChoiceId): void;
+  /** The menu closed. */
+  end(): void;
+}
+
+export function themePreview(): ThemePreview {
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  let shown: ThemeChoiceId | null = null;
+  let chosen = false;
+  const restore = () => {
+    clearTimeout(timer);
+    if (shown !== null && !chosen) previewTheme(null);
+    shown = null;
+  };
+  return {
+    preview(id) {
+      clearTimeout(timer);
+      timer = setTimeout(() => {
+        shown = id;
+        previewTheme(id);
+      }, THEME_PREVIEW_DELAY);
+    },
+    restore,
+    choose(id) {
+      clearTimeout(timer);
+      chosen = true;
+      // Shown right away; selecting it then changes nothing visible.
+      if (shown !== id) previewTheme(id);
+      void setTheme(id);
+    },
+    end: restore,
+  };
+}
+
+/** The built-in themes, then each plugin's, a separator between them (as IDEA's Theme list). */
+export function themeItems(themeId: string = currentThemeChoice(), preview?: ThemePreview): MenuItem[] {
+  return themeGroups().flatMap<MenuItem>((group, i) => [
+    ...(i > 0 ? [{ kind: "separator" as const }] : []),
+    ...group.themes.map<MenuItem>((c) => ({
+      id: `theme.${c.id}`,
+      label: c.label,
+      // Plugin themes keep their own names.
+      verbatim: !!c.origin,
+      checked: c.id === themeId,
+      onActive: preview && (() => preview.preview(c.id)),
+      run: () => (preview ? preview.choose(c.id) : void setTheme(c.id)),
+    })),
+  ]);
 }
 
 export function keymapItems(keymapId: string, customKeymaps: string[]): MenuItem[] {
@@ -78,17 +130,32 @@ export function keymapState(): { keymapId: string; customs: string[] } {
   };
 }
 
-/** View › Quick Switch Scheme…: IDEA's popup of the switchable schemes. */
-export function quickSwitchItems(): MenuItem[] {
+/** View › Quick Switch Scheme…: IDEA's popup of the switchable schemes, its themes previewed. */
+export function quickSwitchItems(preview?: ThemePreview): MenuItem[] {
   const { keymapId, customs } = keymapState();
+  const restore = preview && (() => preview.restore());
   return [
     {
       id: "qs.scheme",
       label: "Editor Color Scheme",
+      onActive: restore,
       submenu: colorSchemeItems(useProject.getState().settings?.editor?.colorScheme),
     },
-    { id: "qs.keymap", label: "Keymap", submenu: keymapItems(keymapId, customs) },
-    { id: "qs.viewMode", label: "View Mode", submenu: VIEW_MODE_ITEMS },
-    { id: "qs.theme", label: "Theme", submenu: themeItems() },
+    { id: "qs.keymap", label: "Keymap", onActive: restore, submenu: keymapItems(keymapId, customs) },
+    { id: "qs.viewMode", label: "View Mode", onActive: restore, submenu: VIEW_MODE_ITEMS },
+    { id: "qs.theme", label: "Theme", submenu: themeItems(undefined, preview) },
   ];
 }
+
+/** Opens Quick Switch Scheme; a theme previewed there goes away with the menu unless chosen. */
+export function showQuickSwitch(at: { x: number; y: number }) {
+  const preview = themePreview();
+  showContextMenu(at, quickSwitchItems(preview));
+  const menu = useContextMenuStore.getState().menu;
+  const unsubscribe = useContextMenuStore.subscribe((s) => {
+    if (s.menu === menu) return;
+    unsubscribe();
+    // A chosen item runs right after the menu closes: let it choose first.
+    queueMicrotask(() => preview.end());
+  });
+}
diff --git a/src/workbench/shellActions.ts b/src/workbench/shellActions.ts
index 8ef0762d..f12a5c77 100644
--- a/src/workbench/shellActions.ts
+++ b/src/workbench/shellActions.ts
@@ -3,7 +3,7 @@ import { isTauri } from "@/platform/ipc";
 import { closeProject, confirmLeaveProject, openProject, useProject } from "@/platform/project";
 import { runSearchFieldCommand, showContextMenu } from "@/ui";
 import { showCustomizeToolbar } from "./MainToolbarDialog";
-import { quickSwitchItems } from "./quickSwitch";
+import { showQuickSwitch } from "./quickSwitch";
 import { notify } from "./notificationStore";
 import { NOTIFICATIONS_TOOL_WINDOW } from "./Notifications";
 import { activateToolWindow } from "./toolwindows/store";
@@ -96,7 +96,7 @@ export function registerShellActions(): () => void {
       title: "Quick Switch Scheme…",
       category: "View",
       keywords: ["theme", "color scheme", "keymap", "view mode"],
-      run: () => showContextMenu({ x: window.innerWidth / 2 - 120, y: 96 }, quickSwitchItems()),
+      run: () => showQuickSwitch({ x: window.innerWidth / 2 - 120, y: 96 }),
     },
     {
       id: "toolbar.customize",
diff --git a/src/workbench/theme.ts b/src/workbench/theme.ts
index 44e73c78..e4559ad3 100644
--- a/src/workbench/theme.ts
+++ b/src/workbench/theme.ts
@@ -6,8 +6,10 @@ import { call, commands, isTauri } from "@/platform/ipc";
 import { useProject } from "@/platform/project";
 import {
   baseTheme,
+  isBuiltinTheme,
   isThemeChoiceId,
   parsePluginThemeRef,
+  previewPluginTheme,
   themeChoices,
   themeKind,
   useContributedThemes,
@@ -181,7 +183,7 @@ export function rememberStartupTheme(root: HTMLElement = document.documentElemen
  * for the next window's start-up.
  */
 export function syncWindowBackground() {
-  rememberStartupTheme();
+  if (!previewing) rememberStartupTheme();
   if (!isTauri()) return;
   const color = windowBackgroundColor();
   if (!color) return;
@@ -231,6 +233,28 @@ export async function setTheme(next: ThemeSetting) {
   }
 }
 
+/** A previewed theme is not the next start-up's (`rememberStartupTheme`). */
+let previewing = false;
+
+/**
+ * Shows `id` in this window without selecting it (Quick Switch's instant
+ * theme switch); `null` shows the selected theme again. Nothing is saved and
+ * other windows keep theirs.
+ */
+export function previewTheme(id: ThemeChoiceId | null) {
+  previewing = id !== null;
+  if (id === null) {
+    previewPluginTheme("selected");
+    applyThemeAttributes(currentThemeId());
+  } else if (isBuiltinTheme(id)) {
+    previewPluginTheme(null);
+    applyThemeAttributes(id);
+  } else {
+    previewPluginTheme(id);
+  }
+  syncWindowBackground();
+}
+
 export async function toggleTheme() {
   await setTheme(currentTheme() === "dark" ? "light" : "dark");
 }
@@ -244,14 +268,30 @@ export function originDetail(t: { label: string; origin?: string }): string | un
  * Options for a theme picker: built-in themes, then plugins' (with the plugin
  * named beside them). A selected plugin theme whose plugin is off stays listed.
  */
+/** The themes for a picker: each plugin's under a heading with its name (`choices` in `themeGroups` order). */
 export function themeSelectOptions(choices: readonly ThemeChoice[], selected?: string): SelectOption<ThemeChoiceId>[] {
-  const options: SelectOption<ThemeChoiceId>[] = choices.map((c) => ({
-    value: c.id,
-    label: c.label,
-    detail: originDetail(c),
-  }));
+  const options: SelectOption<ThemeChoiceId>[] = [];
+  let group: string | undefined;
+  for (const c of choices) {
+    const pluginId = parsePluginThemeRef(c.id)?.pluginId;
+    if (pluginId && pluginId !== group)
+      options.push({ value: `plugin:${pluginId}`, label: c.origin ?? pluginId, section: true });
+    group = pluginId;
+    // Under its plugin's heading a theme needs no origin.
+    options.push({ value: c.id, label: c.label });
+  }
   const missing = parsePluginThemeRef(selected);
-  if (missing && !options.some((o) => o.value === selected))
-    options.push({ value: selected as ThemeChoiceId, label: missing.themeId, detail: "Plugin not enabled" });
+  if (missing && !options.some((o) => o.value === selected)) {
+    // Under its own plugin's heading, not the last one listed.
+    const option = { value: selected as ThemeChoiceId, label: missing.themeId, detail: "Plugin not enabled" };
+    const heading = options.findIndex((o) => o.section && o.value === `plugin:${missing.pluginId}`);
+    if (heading < 0)
+      options.push({ value: `plugin:${missing.pluginId}`, label: missing.pluginId, section: true }, option);
+    else {
+      let end = heading + 1;
+      while (end < options.length && !options[end]!.section) end++;
+      options.splice(end, 0, option);
+    }
+  }
   return options;
 }
diff --git a/src/workbench/toolwindows/ToolWindows.module.css b/src/workbench/toolwindows/ToolWindows.module.css
index 200448b9..57be4487 100644
--- a/src/workbench/toolwindows/ToolWindows.module.css
+++ b/src/workbench/toolwindows/ToolWindows.module.css
@@ -159,9 +159,9 @@
 /* Stripes */
 .stripe {
   /* --stripe-drag: the width under the pointer while the stripe edge is dragged. */
-  --stripe-button: var(--stripe-drag, 32px);
-  /* Outer padding: icons only sit centred between equal margins. */
-  --stripe-pad: var(--island-gap);
+  --stripe-button: var(--stripe-drag, var(--stripe-icon-button));
+  /* Outer padding: narrower than the island gap so the side frame stays close to the status bar's height, as in IDEA. */
+  --stripe-pad: 4px;
   width: calc(var(--stripe-button) + var(--stripe-pad) + var(--island-gap));
   container-type: inline-size;
   flex: none;
@@ -237,8 +237,8 @@
 .stripeButton {
   position: relative;
   flex: none;
-  width: 32px;
-  height: 32px;
+  width: var(--stripe-icon-button);
+  height: var(--stripe-icon-button);
   display: flex;
   flex-direction: column;
   align-items: center;
diff --git a/src/workbench/toolwindows/ToolWindows.tsx b/src/workbench/toolwindows/ToolWindows.tsx
index 07e7afd8..cfd19e70 100644
--- a/src/workbench/toolwindows/ToolWindows.tsx
+++ b/src/workbench/toolwindows/ToolWindows.tsx
@@ -133,8 +133,7 @@ async function setShowToolWindowNames(on: boolean) {
   useProject.setState({ settings });
 }
 
-/** Stripe button widths: icons only, and the range with names. */
-const STRIPE_ICONS = 32;
+/** Stripe button widths with names; icons only follow `--stripe-icon-button` (smaller in compact mode). */
 const STRIPE_MIN = 44;
 const STRIPE_DEFAULT = 56;
 const STRIPE_MAX = 96;
@@ -202,8 +201,8 @@ function StripeHandle({
 }) {
   const sign = side === "left" ? 1 : -1;
   // The stripe follows the pointer; names show from STRIPE_MIN (truncated), icons only below it.
-  const resolve = (raw: number) => {
-    const px = Math.round(Math.min(STRIPE_MAX, Math.max(STRIPE_ICONS, raw)));
+  const resolve = (raw: number, icons: number) => {
+    const px = Math.round(Math.min(STRIPE_MAX, Math.max(icons, raw)));
     return px < STRIPE_MIN ? { names: false, width, px } : { names: true, width: px, px };
   };
 
@@ -214,13 +213,14 @@ function StripeHandle({
     const el = e.currentTarget;
     el.setPointerCapture(e.pointerId);
     const origin = e.clientX;
-    const start = names ? width : STRIPE_ICONS;
+    const icons = parseFloat(getComputedStyle(stripe).getPropertyValue("--stripe-icon-button")) || 28;
+    const start = names ? width : icons;
     const cursor = document.body.style.cursor;
     document.body.style.cursor = "col-resize";
     let next = { names, width, px: start };
     const move = (ev: globalThis.PointerEvent) => {
       if (!(ev.buttons & 1)) return end();
-      const r = resolve(start + sign * (ev.clientX - origin));
+      const r = resolve(start + sign * (ev.clientX - origin), icons);
       if (r.names !== next.names) onPreview(r.names);
       next = r;
       stripe.style.setProperty("--stripe-drag", `${r.px}px`);
@@ -716,6 +716,9 @@ function HeaderRow({
   );
 }
 
+/** How long an activated tool window waits for lazily loaded content to focus. */
+const LATE_FOCUS_MS = 5000;
+
 function ToolWindowView({ tw, hidden }: { tw: ToolWindowContribution; hidden: boolean }) {
   const ref = useRef<HTMLElement>(null);
   const focusRequest = useToolWindowLayout((s) => s.focusRequest);
@@ -726,20 +729,47 @@ function ToolWindowView({ tw, hidden }: { tw: ToolWindowContribution; hidden: bo
 
   useEffect(() => {
     if (!focusRequest || focusRequest.id !== tw.id || hidden) return;
+    let observer: MutationObserver | null = null;
+    let timer = 0;
+    const stop = () => {
+      observer?.disconnect();
+      observer = null;
+      window.clearTimeout(timer);
+    };
     const raf = requestAnimationFrame(() => {
       const root = ref.current;
       if (!root) return;
       const body = root.querySelector<HTMLElement>("[data-toolwindow-body]");
       // Like IDEA, activation focuses the content (a field, list or tree), never a button or
       // link: a scripted focus on one draws its focus ring (an empty view's "New…" link).
-      const content = [...(body?.querySelectorAll<HTMLElement>(FOCUSABLE) ?? [])].find(
-        (el) => !el.matches('button, a[href], [role="button"], [role="link"]'),
-      );
-      if (body && !content && !body.hasAttribute("tabindex")) body.tabIndex = -1;
-      const target = body?.querySelector<HTMLElement>("[data-autofocus]") ?? content ?? body ?? root;
-      target.focus({ preventScroll: true });
+      const contentTarget = () =>
+        body?.querySelector<HTMLElement>("[data-autofocus]") ??
+        [...(body?.querySelectorAll<HTMLElement>(FOCUSABLE) ?? [])].find(
+          (el) => !el.matches('button, a[href], [role="button"], [role="link"]'),
+        );
+      const target = contentTarget();
+      if (target || !body) {
+        (target ?? root).focus({ preventScroll: true });
+        return;
+      }
+      if (!body.hasAttribute("tabindex")) body.tabIndex = -1;
+      body.focus({ preventScroll: true });
+      // Lazily loaded views (the Terminal) render their field after this: focus it when it
+      // appears, unless focus has moved on meanwhile.
+      observer = new MutationObserver(() => {
+        if (document.activeElement !== body) return stop();
+        const late = contentTarget();
+        if (!late) return;
+        stop();
+        late.focus({ preventScroll: true });
+      });
+      observer.observe(body, { childList: true, subtree: true, attributes: true, attributeFilter: ["data-autofocus"] });
+      timer = window.setTimeout(stop, LATE_FOCUS_MS);
     });
-    return () => cancelAnimationFrame(raf);
+    return () => {
+      cancelAnimationFrame(raf);
+      stop();
+    };
   }, [focusRequest, tw.id, hidden]);
 
   return (
diff --git a/src/workbench/window-drag.test.ts b/src/workbench/window-drag.test.ts
new file mode 100644
index 00000000..4c8125ca
--- /dev/null
+++ b/src/workbench/window-drag.test.ts
@@ -0,0 +1,68 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { installWindowDrag } from "./window-drag";
+
+describe("installWindowDrag", () => {
+  let uninstall: () => void;
+  let bar: HTMLElement;
+  let region: HTMLElement;
+  let button: HTMLButtonElement;
+  const start = vi.fn();
+  const toggleMaximize = vi.fn();
+
+  beforeEach(() => {
+    start.mockClear();
+    toggleMaximize.mockClear();
+    uninstall = installWindowDrag({ enabled: true, start, toggleMaximize });
+    bar = document.body.appendChild(document.createElement("header"));
+    region = bar.appendChild(document.createElement("div"));
+    region.setAttribute("data-window-drag-region", "");
+    button = bar.appendChild(document.createElement("button"));
+  });
+  afterEach(() => {
+    uninstall();
+    bar.remove();
+  });
+
+  const mouse = (el: Element, type: string, init: MouseEventInit = {}) => {
+    const e = new MouseEvent(type, { bubbles: true, cancelable: true, composed: true, button: 0, detail: 1, ...init });
+    el.dispatchEvent(e);
+    return e;
+  };
+
+  it("starts a native drag only while the primary button is held", () => {
+    const e = mouse(region, "mousedown", { buttons: 1 });
+    expect(start).toHaveBeenCalledOnce();
+    expect(e.defaultPrevented).toBe(true);
+  });
+
+  it("does not drag for a tap whose mousedown arrives after the release", () => {
+    mouse(region, "mousedown", { buttons: 0 });
+    expect(start).not.toHaveBeenCalled();
+  });
+
+  it("ignores presses on controls, other buttons and the region's children", () => {
+    mouse(button, "mousedown", { buttons: 1 });
+    mouse(region, "mousedown", { buttons: 2, button: 2 });
+    const child = region.appendChild(document.createElement("span"));
+    mouse(child, "mousedown", { buttons: 1 });
+    expect(start).not.toHaveBeenCalled();
+  });
+
+  it("zooms on the mouseup of a double click that did not move, not on a drag away", () => {
+    mouse(region, "mousedown", { detail: 2, clientX: 5, clientY: 5, buttons: 1 });
+    expect(start).not.toHaveBeenCalled();
+    mouse(region, "mouseup", { detail: 2, clientX: 5, clientY: 5 });
+    expect(toggleMaximize).toHaveBeenCalledOnce();
+
+    mouse(region, "mousedown", { detail: 2, clientX: 5, clientY: 5, buttons: 1 });
+    mouse(region, "mouseup", { detail: 2, clientX: 40, clientY: 5 });
+    expect(toggleMaximize).toHaveBeenCalledOnce();
+  });
+
+  it("does nothing when disabled or after uninstall", () => {
+    uninstall();
+    uninstall = installWindowDrag({ enabled: false, start, toggleMaximize });
+    mouse(region, "mousedown", { buttons: 1 });
+    expect(start).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/workbench/window-drag.ts b/src/workbench/window-drag.ts
new file mode 100644
index 00000000..a21c948e
--- /dev/null
+++ b/src/workbench/window-drag.ts
@@ -0,0 +1,86 @@
+import { invoke } from "@tauri-apps/api/core";
+import { commands } from "@/platform/ipc";
+import { guessOs } from "@/platform/platformInfo";
+
+/**
+ * Title bar drag on macOS, replacing Tauri's injected `data-tauri-drag-region` script there.
+ * That script starts the native drag on any `mousedown`, but WebKit can deliver a tap's `mousedown`
+ * after the button is already up; AppKit then drags the window until the next click. Here the drag
+ * starts only while the button is down (`buttons` here, and again natively in `window_start_drag`).
+ * Windows and Linux keep the Tauri attribute.
+ */
+const REGION = "data-window-drag-region";
+
+/** Attribute that makes an element a title bar drag region on this OS. */
+export const windowDragRegion: Record<string, string> =
+  guessOs() === "macos" ? { [REGION]: "" } : { "data-tauri-drag-region": "" };
+
+const CLICKABLE_TAGS = new Set(["A", "BUTTON", "INPUT", "SELECT", "TEXTAREA", "LABEL", "SUMMARY"]);
+const INTERACTIVE_ROLES = new Set(["button", "link", "menuitem", "tab", "checkbox", "radio", "switch", "option"]);
+
+function isClickable(el: HTMLElement) {
+  const editable = el.getAttribute("contenteditable");
+  const tabindex = el.getAttribute("tabindex");
+  return (
+    CLICKABLE_TAGS.has(el.tagName) ||
+    (editable !== null && editable !== "false") ||
+    (tabindex !== null && tabindex !== "-1") ||
+    INTERACTIVE_ROLES.has(el.getAttribute("role") ?? "")
+  );
+}
+
+/** Same rules as Tauri's script: a bare attribute counts only for direct clicks, `deep` for the subtree. */
+function isDragRegion(path: EventTarget[]) {
+  for (const el of path) {
+    if (!(el instanceof HTMLElement)) continue;
+    const attr = el.getAttribute(REGION);
+    if (attr === null) {
+      if (isClickable(el)) return false;
+      continue;
+    }
+    if (attr === "false") return false;
+    if (attr === "deep") return true;
+    return el === path[0];
+  }
+  return false;
+}
+
+interface Deps {
+  enabled?: boolean;
+  start?: () => unknown;
+  toggleMaximize?: () => unknown;
+}
+
+/** Installs the handlers on macOS (no-op elsewhere); returns the uninstall function. */
+export function installWindowDrag({
+  enabled = guessOs() === "macos",
+  start = () => commands.windowStartDrag(),
+  toggleMaximize = () => invoke("plugin:window|internal_toggle_maximize"),
+}: Deps = {}): () => void {
+  if (!enabled) return () => {};
+  let down = { x: 0, y: 0 };
+
+  const onMouseDown = (e: MouseEvent) => {
+    if (e.button !== 0 || (e.detail !== 1 && e.detail !== 2) || !isDragRegion(e.composedPath())) return;
+    // Zoom happens on mouseup, as in AppKit, so moving away cancels it.
+    if (e.detail === 2) {
+      down = { x: e.clientX, y: e.clientY };
+      return;
+    }
+    e.preventDefault(); // no text cursor
+    e.stopImmediatePropagation();
+    // A tap's mousedown arrives with the button already released: nothing to drag.
+    if (e.buttons & 1) void start();
+  };
+  const onMouseUp = (e: MouseEvent) => {
+    if (e.button !== 0 || e.detail !== 2 || e.clientX !== down.x || e.clientY !== down.y) return;
+    if (isDragRegion(e.composedPath())) void toggleMaximize();
+  };
+
+  document.addEventListener("mousedown", onMouseDown);
+  document.addEventListener("mouseup", onMouseUp);
+  return () => {
+    document.removeEventListener("mousedown", onMouseDown);
+    document.removeEventListener("mouseup", onMouseUp);
+  };
+}
diff --git a/wit/events.wit b/wit/events.wit
index 8470c298..2d118d81 100644
--- a/wit/events.wit
+++ b/wit/events.wit
@@ -2,36 +2,15 @@ package openidea:plugin@1.0.0;
 
 /// Workbench events, delivered in batches to `event-handler.handle`.
 interface events {
-    use types.{error};
-
-    enum event-kind {
-        file-opened,
-        file-saved,
-        /// The focused editor changed.
-        editor-focused,
-        /// An IDE action ran. Requires `events.input`.
-        action-performed,
-        /// A repository's state changed (commit, checkout, fetch, …).
-        vcs-changed,
-        /// The plugin's `on-schedule` period elapsed.
-        scheduled,
-    }
-
-    /// How the user started an action.
-    enum action-source {
-        keyboard,
-        menu,
-        toolbar,
-        context-menu,
-        search,
-        other,
-    }
+    use types.{error, extension};
 
     record action-performed {
         /// Action id (`editor.duplicate-line`).
         action: string,
         title: string,
-        source: action-source,
+        /// How the user started it: `keyboard`, `menu`, `toolbar`,
+        /// `context-menu`, `search` or `other` (more may be added).
+        source: string,
         /// Its keyboard shortcut, when it has one (`Ctrl+D`).
         shortcut: option<string>,
     }
@@ -43,14 +22,21 @@ interface events {
         action-performed(action-performed),
         vcs-changed(string),
         scheduled,
+        /// A kind added after 1.0 (subscribed to by its name).
+        other(extension),
     }
 
     /// Delivers `kind` events from now on, for the rest of the session (also
     /// across idle reclaim: an event activates the plugin again). Declare
     /// `activation = ["on-event:<kind>"]` to get them before first use.
+    /// Kinds: `file-opened`, `file-saved`, `editor-focused` (the focused editor
+    /// changed), `vcs-changed` (a repository's state changed: commit,
+    /// checkout, fetch…), `action-performed` (an IDE action ran) and
+    /// `scheduled` (the `on-schedule` period elapsed); later IDEs add more,
+    /// and an IDE that doesn't know one fails with `invalid`.
     /// Requires `events` (`events.input` for `action-performed`).
-    subscribe: func(kind: event-kind) -> result<_, error>;
-    unsubscribe: func(kind: event-kind);
+    subscribe: func(kind: string) -> result<_, error>;
+    unsubscribe: func(kind: string);
 }
 
 /// Long-running work with a progress indicator. While a task is open, the
diff --git a/wit/io.wit b/wit/io.wit
index a1aeb849..f1fe634a 100644
--- a/wit/io.wit
+++ b/wit/io.wit
@@ -2,7 +2,7 @@ package openidea:plugin@1.0.0;
 
 /// Problems in files, shown in the editor and the Problems view.
 interface diagnostics {
-    use types.{error, range};
+    use types.{error, range, location};
 
     enum severity {
         error,
@@ -11,12 +11,23 @@ interface diagnostics {
         hint,
     }
 
+    /// Another place that explains a diagnostic (the earlier declaration, say).
+    record related-information {
+        location: location,
+        message: string,
+    }
+
     record diagnostic {
         range: range,
         severity: severity,
         message: string,
         /// Rule or check id (`LineLength`).
         code: option<string>,
+        /// The tool that found it, when not the plugin itself (`checkstyle`).
+        source: option<string>,
+        /// `unnecessary` (shown faded) and `deprecated` (struck through); unknown ones are ignored.
+        tags: list<string>,
+        related: list<related-information>,
     }
 
     /// Replaces the plugin's diagnostics for the file at `path` (absolute, in
diff --git a/wit/providers.wit b/wit/providers.wit
index cfca6560..97dd4c7a 100644
--- a/wit/providers.wit
+++ b/wit/providers.wit
@@ -5,7 +5,7 @@ package openidea:plugin@1.0.0;
 /// on the editing path: a result later than ~50 ms is dropped, a call still
 /// running at 500 ms is interrupted.
 interface providers {
-    use types.{position, range, text-edit, location};
+    use types.{error, position, range, text-edit, location};
 
     /// The document a request is about.
     record document {
@@ -24,11 +24,17 @@ interface providers {
         /// constant, struct, event, operator or type-parameter. Unknown kinds
         /// show no icon.
         kind: option<string>,
+        /// With `snippet`, tab stops and placeholders (`$1`, `${1:name}`, `$0`).
         insert-text: string,
+        snippet: bool,
         /// Replaced on accept; `none`: the word at the caret.
         replace: option<range>,
         sort-text: option<string>,
+        /// Matched against what was typed instead of `label`.
+        filter-text: option<string>,
         documentation: option<string>,
+        /// Applied with the item elsewhere in the document (an import).
+        additional-edits: list<text-edit>,
     }
 
     record inline-suggestion {
@@ -48,6 +54,9 @@ interface providers {
         kind: option<string>,
         preferred: bool,
         edits: list<file-edit>,
+        /// The plugin's own reference: with it and no `edits`, the edits are
+        /// computed by `resolve-code-action` once the user picks the action.
+        data: option<string>,
     }
 
     record line-marker {
@@ -64,6 +73,9 @@ interface providers {
     inline-completion: func(doc: document, at: position) -> option<inline-suggestion>;
     /// Actions for `selection` (quick fixes for the plugin's own diagnostics).
     code-actions: func(doc: document, selection: range) -> list<code-action>;
+    /// The edits of an action `code-actions` returned with `data`, when the
+    /// user picks it (the command budget applies, not the editor's 50 ms).
+    resolve-code-action: func(doc: document, action: code-action) -> result<code-action, error>;
     definition: func(doc: document, at: position) -> list<location>;
     line-markers: func(doc: document) -> list<line-marker>;
 }
diff --git a/wit/types.wit b/wit/types.wit
index 5c4f237e..2e2b48f7 100644
--- a/wit/types.wit
+++ b/wit/types.wit
@@ -52,6 +52,15 @@ interface types {
         range: range,
     }
 
+    /// A case added after 1.0, carried by the `other` case of a variant that
+    /// grows (events, view bodies, view events, form fields): its kind and its
+    /// data as JSON. Whoever doesn't know the kind ignores it or shows a
+    /// fallback; the SDKs decode the kinds they know.
+    record extension {
+        kind: string,
+        data: string,
+    }
+
     /// Passed to `lifecycle.activate`.
     record context {
         plugin-id: string,
diff --git a/wit/views.wit b/wit/views.wit
index de1ae780..c4435ece 100644
--- a/wit/views.wit
+++ b/wit/views.wit
@@ -8,6 +8,8 @@ package openidea:plugin@1.0.0;
 /// runs in the WebView, except a `html` body, which is shown in a sandboxed
 /// frame that can only exchange messages with the plugin.
 interface view-types {
+    use types.{extension};
+
     record button {
         id: string,
         label: string,
@@ -43,6 +45,8 @@ interface view-types {
         checkbox(bool),
         /// The options and the chosen one.
         choice(tuple<list<string>, string>),
+        /// A field type added after 1.0 (an IDE that doesn't know it leaves it out).
+        other(extension),
     }
 
     record field {
@@ -72,6 +76,8 @@ interface view-types {
         /// network, no IDE API. Its script talks to the plugin with
         /// `openidea.postMessage(text)` / `openidea.onMessage(fn)`.
         html(string),
+        /// A body added after 1.0; an IDE that doesn't know it says it needs updating.
+        other(extension),
     }
 
     record view {
@@ -109,6 +115,8 @@ interface view-types {
         delete-rows(list<u32>),
         /// From the `html` body's script.
         message(string),
+        /// An event added after 1.0, from a body or field added after 1.0.
+        other(extension),
     }
 }
 
@@ -125,6 +133,10 @@ interface views {
     /// `program` (pinned by a `process:<program>` grant) with `args` in the
     /// project root: long-running output (logs) and interactive sessions.
     open-terminal: func(title: string, program: string, args: list<string>) -> result<_, error>;
+    /// Opens `path` (project-relative or absolute, inside the project) in an
+    /// editor of the window the call came from, the caret at `line` and
+    /// `column` (0-based; UTF-16 column): a view's links to code.
+    open-location: func(path: string, line: u32, column: u32) -> result<_, error>;
 }
 
 /// The plugin's own settings (`[contributes.settings]`), as the user set them