diff --git a/.github/workflows/frontend-ci.yml b/.github/workflows/frontend-ci.yml
index 9a87bf94..a575a9c4 100644
--- a/.github/workflows/frontend-ci.yml
+++ b/.github/workflows/frontend-ci.yml
@@ -27,7 +27,9 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          # 22+: the test script passes --no-experimental-webstorage, which Node 20 rejects as an
+          # unknown option. Node 20 reached end of life in April 2026.
+          node-version: 24
           cache: npm
           cache-dependency-path: cardinal/package-lock.json
 
diff --git a/AGENTS.md b/AGENTS.md
index 4ad23657..c349786f 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,7 +4,8 @@
 - Desktop app lives in `cardinal/` (React UI in `src/`, Tauri/native glue in `src-tauri/`, build output in `cardinal/dist/`).
 - Workspace crates (root `Cargo.toml`): `lsf/` (CLI), `cardinal-sdk/` (shared types), `fswalk/`, `fs-icon/`, `namepool/`, `query-segmentation/`, `search-cache/`, `search-cancel/`, `cardinal-syntax/`, `slab-mmap/` (mmap-backed slab for the cache), `was/` (CLI that streams FSEvents via the SDK).
 - Tests sit next to code; cross-crate cases belong in each crate’s `tests/` directory. Generated outputs (`target/`, `cardinal/dist/`, vendor bundles) stay out of commits.
-- Toolchain pinned via `rust-toolchain.toml` (`nightly-2025-05-09`); install with `rustup toolchain install nightly-2025-05-09`.
+- Toolchain pinned via `rust-toolchain.toml` (`nightly-2025-12-11`); install with `rustup toolchain install nightly-2025-12-11`. Let the rustup shim pick it up rather than putting a toolchain's `bin/` on `PATH`: an older rustc still builds here from cache, but the proc-macro dylibs it emits are rejected by recent macOS dyld with `mis-aligned LINKEDIT string pool` as soon as anything has to be rebuilt.
+- Keep `target/` out of iCloud-synced folders (`CARGO_TARGET_DIR`). If iCloud evicts a fingerprint file, cargo blocks forever in `read()` waiting for a download that never lands.
 
 ## Build, Test, and Development Commands
 - `cargo check --workspace` — fast compile validation for all crates.
diff --git a/cardinal/package-lock.json b/cardinal/package-lock.json
index 597030bf..f67b0b67 100644
--- a/cardinal/package-lock.json
+++ b/cardinal/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@crabnebula/tauri-plugin-drag": "^2.1.0",
         "@tauri-apps/api": "^2",
+        "@tauri-apps/plugin-dialog": "^2.7.2",
         "@tauri-apps/plugin-global-shortcut": "^2.3.1",
         "@tauri-apps/plugin-opener": "^2",
         "@tauri-apps/plugin-window-state": "^2.4.1",
@@ -1348,9 +1349,9 @@
       "license": "MIT"
     },
     "node_modules/@tauri-apps/api": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.10.1.tgz",
-      "integrity": "sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw==",
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.11.1.tgz",
+      "integrity": "sha512-M2FPuYND2m+wh5hfW9ZpSdxMPdEJovPBWwoHJmwUpysTYNHaOkVFN419m/K0LIgjb/7KU2vBgsUepJWugQCvAA==",
       "license": "Apache-2.0 OR MIT",
       "funding": {
         "type": "opencollective",
@@ -1574,6 +1575,15 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@tauri-apps/plugin-dialog": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.7.2.tgz",
+      "integrity": "sha512-pX0IGm1I3I6wc+zeKYcq1GSqogK6okCNX5fOdaNU5ab1AjGS6l1E5wFNjEb7meg7ZFSp0JUs+0jQGQNyOvLrsg==",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@tauri-apps/api": "^2.11.0"
+      }
+    },
     "node_modules/@tauri-apps/plugin-global-shortcut": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
diff --git a/cardinal/package.json b/cardinal/package.json
index e5fe8f2d..5a86a199 100644
--- a/cardinal/package.json
+++ b/cardinal/package.json
@@ -8,8 +8,8 @@
     "build": "vite build",
     "preview": "vite preview",
     "tauri": "tauri",
-    "test": "vitest --watch=false",
-    "test:watch": "vitest --watch",
+    "test": "NODE_OPTIONS=--no-experimental-webstorage vitest --watch=false",
+    "test:watch": "NODE_OPTIONS=--no-experimental-webstorage vitest --watch",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write .",
     "format:check": "prettier --check ."
@@ -17,6 +17,7 @@
   "dependencies": {
     "@crabnebula/tauri-plugin-drag": "^2.1.0",
     "@tauri-apps/api": "^2",
+    "@tauri-apps/plugin-dialog": "^2.7.2",
     "@tauri-apps/plugin-global-shortcut": "^2.3.1",
     "@tauri-apps/plugin-opener": "^2",
     "@tauri-apps/plugin-window-state": "^2.4.1",
diff --git a/cardinal/src-tauri/Cargo.lock b/cardinal/src-tauri/Cargo.lock
index e19f1ca0..c067c179 100644
--- a/cardinal/src-tauri/Cargo.lock
+++ b/cardinal/src-tauri/Cargo.lock
@@ -404,6 +404,7 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-build",
+ "tauri-plugin-dialog",
  "tauri-plugin-drag",
  "tauri-plugin-global-shortcut",
  "tauri-plugin-macos-permissions",
@@ -761,14 +762,20 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.9"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98"
 dependencies = [
- "quote",
- "syn 2.0.117",
+ "ctor-proc-macro",
+ "dtor",
 ]
 
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
+
 [[package]]
 name = "darling"
 version = "0.23.0"
@@ -803,6 +810,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "dbus"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -984,6 +1002,21 @@ dependencies = [
  "dtoa",
 ]
 
+[[package]]
+name = "dtor"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
+
 [[package]]
 name = "dunce"
 version = "1.0.5"
@@ -1851,7 +1884,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.62.2",
+ "windows-core 0.58.0",
 ]
 
 [[package]]
@@ -1870,7 +1903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
 dependencies = [
  "byteorder",
- "png",
+ "png 0.17.16",
 ]
 
 [[package]]
@@ -2287,6 +2320,15 @@ version = "0.2.184"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
 
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -2462,9 +2504,9 @@ dependencies = [
 
 [[package]]
 name = "muda"
-version = "0.17.2"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9fec5a4e89860383d778d10563a605838f8f0b2f9303868937e5ff32e86177"
+checksum = "1dd04e60bc0b07438a6771710ee1698f98f6ebbc7f89b61264af1563b8aeb878"
 dependencies = [
  "crossbeam-channel",
  "dpi",
@@ -2475,10 +2517,10 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.18.1",
  "serde",
  "thiserror 2.0.18",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2509,12 +2551,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
 [[package]]
 name = "ndk-sys"
 version = "0.6.0+11769913"
@@ -2680,6 +2716,16 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-core-services"
 version = "0.3.2"
@@ -2828,9 +2874,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.11.0",
+ "block2",
  "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
  "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
  "objc2-foundation",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
 ]
 
 [[package]]
@@ -2843,6 +2898,16 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-web-kit"
 version = "0.3.2"
@@ -2986,7 +3051,6 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
- "phf_macros 0.11.3",
  "phf_shared 0.11.3",
 ]
 
@@ -3085,19 +3149,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "phf_macros"
 version = "0.13.1"
@@ -3196,6 +3247,19 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.11.0",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -3589,6 +3653,30 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "rfd"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
+dependencies = [
+ "block2",
+ "dispatch2",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "js-sys",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -4220,15 +4308,16 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.34.8"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9103edf55f2da3c82aea4c7fab7c4241032bfeea0e71fa557d98e00e7ce7cc20"
+checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
 dependencies = [
  "bitflags 2.11.0",
  "block2",
  "core-foundation 0.10.1",
  "core-graphics 0.25.0",
  "crossbeam-channel",
+ "dbus",
  "dispatch2",
  "dlopen2",
  "dpi",
@@ -4239,13 +4328,14 @@ dependencies = [
  "libc",
  "log",
  "ndk",
- "ndk-context",
  "ndk-sys",
  "objc2",
  "objc2-app-kit",
  "objc2-foundation",
+ "objc2-ui-kit",
  "once_cell",
  "parking_lot",
+ "percent-encoding",
  "raw-window-handle",
  "tao-macros",
  "unicode-segmentation",
@@ -4275,9 +4365,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.10.3"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da77cc00fb9028caf5b5d4650f75e31f1ef3693459dfca7f7e506d1ecef0ba2d"
+checksum = "b93bd86d231f0a8138f11a02a584769fe4b703dc36ae133d783228dbc4801405"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4326,9 +4416,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.5.6"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bbc990d1dbf57a8e1c7fa2327f2a614d8b757805603c1b9ba5c81bade09fd4d"
+checksum = "bc9ce40b16101cb6ea63d3e221567affd1c3a9205f95d7bc574941a10636b632"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -4342,22 +4432,21 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "toml 0.9.12+spec-1.1.0",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-codegen"
-version = "2.5.5"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a24476afd977c5d5d169f72425868613d82747916dd29e0a357c84c4bd6d29"
+checksum = "08279169ff42f8fc45a1dbc9dcae888893ba95288142e5880c59b93a26d2cfc5"
 dependencies = [
  "base64 0.22.1",
  "brotli",
  "ico",
  "json-patch",
  "plist",
- "png",
+ "png 0.17.16",
  "proc-macro2",
  "quote",
  "semver",
@@ -4375,9 +4464,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.5.5"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d39b349a98dadaffebb73f0a40dcd1f23c999211e5a2e744403db384d0c33de7"
+checksum = "e8b394794f399a421811d06966343e7933fcae92d59f5180b9388d1174497a45"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -4404,6 +4493,24 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "tauri-plugin-dialog"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2d3c1dbe38037e7f590cdf2492594d5ceebe031e7bc7e827509b22a999d2940"
+dependencies = [
+ "log",
+ "raw-window-handle",
+ "rfd",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "tauri-plugin-fs",
+ "thiserror 2.0.18",
+ "url",
+]
+
 [[package]]
 name = "tauri-plugin-drag"
 version = "2.1.0"
@@ -4419,6 +4526,30 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "tauri-plugin-fs"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7ecc274121aca0c036a2b42d1cbe83d368d348f54e0bb8a735c2b1548e8f371"
+dependencies = [
+ "anyhow",
+ "dunce",
+ "glob",
+ "log",
+ "objc2-foundation",
+ "percent-encoding",
+ "schemars 0.8.22",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "tauri-utils",
+ "thiserror 2.0.18",
+ "toml 1.1.2+spec-1.1.0",
+ "url",
+]
+
 [[package]]
 name = "tauri-plugin-global-shortcut"
 version = "2.3.1"
@@ -4502,9 +4633,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.10.1"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2826d79a3297ed08cd6ea7f412644ef58e32969504bc4fbd8d7dbeabc4445ea2"
+checksum = "b0b4bc95aed361b0019067d189a1174a603d460d0f6c72606512d59fc9c12ec8"
 dependencies = [
  "cookie",
  "dpi",
@@ -4527,9 +4658,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.10.1"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11ea2e6f801d275fdd890d6c9603736012742a1c33b96d0db788c9cdebf7f9e"
+checksum = "4e6fac707727b7a2f48e4ded90976324267371073edbb415ffb73bb0458d203f"
 dependencies = [
  "gtk",
  "http",
@@ -4553,14 +4684,15 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.8.3"
+version = "2.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219a1f983a2af3653f75b5747f76733b0da7ff03069c7a41901a5eb3ace4557d"
+checksum = "3e176a18e67764923c4f1ce66f25ae4abe5f688384d5eb1a0fa6c77f3d90f887"
 dependencies = [
  "anyhow",
  "brotli",
  "cargo_metadata",
  "ctor",
+ "dom_query",
  "dunce",
  "glob",
  "html5ever 0.29.1",
@@ -4570,7 +4702,8 @@ dependencies = [
  "kuchikiki",
  "log",
  "memchr",
- "phf 0.11.3",
+ "phf 0.13.1",
+ "plist",
  "proc-macro2",
  "quote",
  "regex",
@@ -4582,7 +4715,7 @@ dependencies = [
  "serde_with",
  "swift-rs",
  "thiserror 2.0.18",
- "toml 0.9.12+spec-1.1.0",
+ "toml 1.1.2+spec-1.1.0",
  "url",
  "urlpattern",
  "uuid",
@@ -4802,6 +4935,21 @@ dependencies = [
  "winnow 0.7.15",
 ]
 
+[[package]]
+name = "toml"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
+dependencies = [
+ "indexmap 2.13.1",
+ "serde_core",
+ "serde_spanned 1.1.1",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 1.0.1",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.3"
@@ -4988,9 +5136,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.21.3"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
+checksum = "15edbb0d80583e85ee8df283410038e17314df5cba30da2087a54a85216c0773"
 dependencies = [
  "crossbeam-channel",
  "dirs",
@@ -5002,10 +5150,10 @@ dependencies = [
  "objc2-core-graphics",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.18.1",
  "serde",
  "thiserror 2.0.18",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5569,19 +5717,6 @@ dependencies = [
  "windows-strings 0.4.2",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
-dependencies = [
- "windows-implement 0.60.2",
- "windows-interface 0.59.3",
- "windows-link 0.2.1",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
-]
-
 [[package]]
 name = "windows-future"
 version = "0.2.1"
@@ -5699,15 +5834,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
-dependencies = [
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.1.0"
@@ -5727,15 +5853,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
-dependencies = [
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -6109,9 +6226,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "wry"
-version = "0.54.4"
+version = "0.55.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a8135d8676225e5744de000d4dff5a082501bf7db6a1c1495034f8c314edbc"
+checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"
 dependencies = [
  "base64 0.22.1",
  "block2",
diff --git a/cardinal/src-tauri/Cargo.toml b/cardinal/src-tauri/Cargo.toml
index 386b1944..d4b09d92 100644
--- a/cardinal/src-tauri/Cargo.toml
+++ b/cardinal/src-tauri/Cargo.toml
@@ -22,6 +22,7 @@ tauri = { version = "2", features = ["tray-icon"] }
 tauri-plugin-opener = "2"
 tauri-plugin-global-shortcut = "2"
 tauri-plugin-drag = "2"
+tauri-plugin-dialog = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 crossbeam-channel = "0.5.15"
diff --git a/cardinal/src-tauri/capabilities/default.json b/cardinal/src-tauri/capabilities/default.json
index ce8f857a..ce95cafe 100644
--- a/cardinal/src-tauri/capabilities/default.json
+++ b/cardinal/src-tauri/capabilities/default.json
@@ -12,6 +12,7 @@
     "drag:default",
     "global-shortcut:allow-is-registered",
     "global-shortcut:allow-register",
-    "global-shortcut:allow-unregister"
+    "global-shortcut:allow-unregister",
+    "dialog:allow-open"
   ]
 }
diff --git a/cardinal/src-tauri/src/commands.rs b/cardinal/src-tauri/src/commands.rs
index ae863611..f3300cf0 100644
--- a/cardinal/src-tauri/src/commands.rs
+++ b/cardinal/src-tauri/src/commands.rs
@@ -19,8 +19,10 @@ use objc2::{
 use objc2_app_kit::{NSPasteboard, NSPasteboardItem, NSPasteboardTypeString, NSPasteboardWriting};
 use objc2_foundation::{NSArray, NSString, NSURL};
 use parking_lot::Mutex;
+use rayon::prelude::*;
 use search_cache::{
     SearchOptions, SearchOutcome, SearchQuery, SearchResultNode, SlabIndex, SlabNodeMetadata,
+    content_snippet, content_terms_of_query,
 };
 use search_cancel::CancellationToken;
 use serde::{Deserialize, Serialize};
@@ -217,6 +219,8 @@ pub struct NodeInfo {
     pub path: String,
     pub metadata: Option<NodeInfoMetadata>,
     pub icon: Option<String>,
+    #[serde(rename = "contentContext")]
+    pub content_context: Option<String>,
 }
 
 #[derive(Serialize, Default)]
@@ -224,6 +228,9 @@ pub struct NodeInfo {
 pub struct SearchResponse {
     pub results: Vec<SlabIndex>,
     pub highlights: Vec<String>,
+    /// `content:` terms of this query, so the UI highlights in a snippet exactly what the search
+    /// looked for inside files.
+    pub content_terms: Vec<String>,
     pub status_code: u8,
 }
 
@@ -291,6 +298,10 @@ pub async fn search(
     search_activity::note_search_activity();
 
     let options = options.unwrap_or_default();
+    let content_terms = query
+        .as_deref()
+        .map(content_terms_of_query)
+        .unwrap_or_default();
     let cancellation_token = CancellationToken::new_search();
     let (result_tx, result_rx) = bounded(1);
     if let Err(e) = state.search_tx.send(SearchJob {
@@ -325,6 +336,7 @@ pub async fn search(
         SearchResponse {
             results,
             highlights,
+            content_terms,
             status_code,
         }
     })
@@ -335,6 +347,8 @@ pub async fn search(
 pub fn get_nodes_info(
     results: Vec<SlabIndex>,
     include_icons: Option<bool>,
+    content_terms: Option<Vec<String>>,
+    case_insensitive: Option<bool>,
     state: State<'_, SearchState>,
 ) -> Vec<NodeInfo> {
     if results.is_empty() {
@@ -342,11 +356,17 @@ pub fn get_nodes_info(
     }
 
     let include_icons = include_icons.unwrap_or(true);
+    let content_terms = content_terms.unwrap_or_default();
+    let case_insensitive = case_insensitive.unwrap_or_default();
     let nodes = state.request_nodes(results);
 
+    // Rows are independent, and each one may read a file for its icon and its content snippet.
     nodes
-        .into_iter()
+        .into_par_iter()
         .map(|SearchResultNode { path, metadata }| {
+            let content_context = content_terms
+                .iter()
+                .find_map(|term| content_snippet(&path, term, case_insensitive));
             let path = path.to_string_lossy().into_owned();
             let icon = if include_icons {
                 fs_icon::icon_of_path_ns(&path).map(|data| {
@@ -362,6 +382,7 @@ pub fn get_nodes_info(
                 path,
                 icon,
                 metadata: metadata.as_ref().map(NodeInfoMetadata::from_metadata),
+                content_context,
             }
         })
         .collect()
diff --git a/cardinal/src-tauri/src/lib.rs b/cardinal/src-tauri/src/lib.rs
index 920840c0..57fa33c0 100644
--- a/cardinal/src-tauri/src/lib.rs
+++ b/cardinal/src-tauri/src/lib.rs
@@ -79,6 +79,7 @@ pub fn run() -> Result<()> {
     builder = builder
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_drag::init())
+        .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_global_shortcut::Builder::new().build())
         .plugin(tauri_plugin_macos_permissions::init())
         .plugin(tauri_plugin_window_state::Builder::new().build())
diff --git a/cardinal/src/App.css b/cardinal/src/App.css
index 5d6af384..784e2cea 100644
--- a/cardinal/src/App.css
+++ b/cardinal/src/App.css
@@ -117,6 +117,98 @@ main,
   height: 100vh;
 }
 
+/* === Reordenar columnas arrastrando el título === */
+.header-cell {
+  cursor: grab;
+}
+
+.header-cell--dragging {
+  opacity: 0.45;
+}
+
+/* La línea marca dónde va a caer la columna. */
+.header-cell--drop-target {
+  box-shadow: inset 2px 0 0 var(--color-accent);
+}
+
+/* El asa de redimensionar vive dentro de la celda arrastrable: sin esto, tomarla arrastra
+   la columna entera en vez de cambiarle el ancho. */
+.col-resizer {
+  cursor: col-resize;
+}
+
+/* === Campo "Contiene": busca dentro de los archivos === */
+.content-search-segment {
+  flex: 0 1 min(15rem, 26vw);
+  min-width: 6rem;
+  gap: 0;
+  padding-left: 0.6rem;
+  overflow: hidden;
+}
+
+.content-search-label {
+  flex: 0 0 auto;
+  padding-right: 0.4rem;
+  color: var(--color-muted);
+  font-size: 0.78rem;
+  white-space: nowrap;
+  border-right: 1px solid var(--color-border);
+  cursor: text;
+}
+
+#content-search-input {
+  height: 100%;
+  width: 100%;
+  min-width: 0;
+  padding: 0.45rem 0.55rem;
+  border: none;
+  background: transparent;
+  box-shadow: none;
+  font-size: 0.92rem;
+  overflow: hidden;
+}
+
+#content-search-input:focus {
+  outline: none;
+}
+
+#content-search-input::placeholder {
+  color: var(--color-muted);
+}
+
+#content-search-input:disabled {
+  cursor: not-allowed;
+  font-style: italic;
+}
+
+/* Cierra el campo de carpeta; el icono de carpeta ahora abre el selector del sistema. */
+.directory-scope-close {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 1.1rem;
+  width: 1.1rem;
+  height: var(--search-segment-height);
+  padding: 0;
+  background: transparent;
+  color: var(--color-muted);
+  cursor: pointer;
+}
+
+.directory-scope-close svg {
+  width: 0.62rem;
+  height: 0.62rem;
+  fill: none;
+  stroke: currentColor;
+  stroke-width: 2.4;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+
+.directory-scope-close:hover {
+  color: var(--color-text);
+}
+
 /* === Search Bar === */
 .search-container {
   margin: var(--container-padding) var(--container-padding) 0;
@@ -356,6 +448,57 @@ main,
   font-size: 0.78rem;
 }
 
+/* Native <select>: the popup, keyboard handling and RTL layout come from the platform. Only the
+   default macOS chrome is stripped so it reads as part of the toolbar. */
+.file-type-select {
+  appearance: none;
+  max-width: 9rem;
+  height: 1.8rem;
+  padding: 0 1.1rem 0 0.5rem;
+  border: none;
+  border-radius: 0.55rem;
+  background-color: transparent;
+  /* Chevron drawn inline so no asset is needed; currentColor keeps it on-theme. */
+  background-image:
+    linear-gradient(45deg, transparent 50%, currentColor 50%),
+    linear-gradient(135deg, currentColor 50%, transparent 50%);
+  background-position:
+    right 0.5rem top 55%,
+    right 0.26rem top 55%;
+  background-size:
+    0.24rem 0.24rem,
+    0.24rem 0.24rem;
+  background-repeat: no-repeat;
+  color: var(--color-muted);
+  font: inherit;
+  font-size: 0.78rem;
+  line-height: 1;
+  text-overflow: ellipsis;
+  cursor: pointer;
+}
+
+.file-type-select:hover {
+  background-color: var(--search-toggle-hover-bg);
+}
+
+/* Active filter reads like the case toggle when it is on.
+   Matched on a class, not `:not([value=''])`. React sets a controlled select's
+   value as a DOM property and never writes the attribute, so the attribute selector matches on
+   first paint and never updates — the accent colour stays on after switching back to "All". */
+.file-type-select.is-active {
+  color: var(--color-accent);
+}
+
+.file-type-select:focus-visible {
+  outline: 2px solid rgba(var(--color-accent-rgb), 0.5);
+  outline-offset: 2px;
+}
+
+.file-type-select option {
+  color: var(--color-text);
+  background-color: var(--color-bg);
+}
+
 .search-option input:focus-visible + .search-option__display {
   outline: 2px solid rgba(var(--color-accent-rgb), 0.5);
   outline-offset: 2px;
@@ -461,6 +604,7 @@ button:active:not(:disabled) {
   --columns-total: calc(
     var(--w-filename) + var(--w-path) + var(--w-size) + var(--w-modified) + var(--w-created)
   );
+  --columns-total-with-context: calc(var(--columns-total) + var(--w-context));
 }
 
 .scroll-area {
@@ -597,6 +741,14 @@ button:active:not(:disabled) {
   min-width: var(--columns-total);
 }
 
+.scroll-area--with-context .columns {
+  grid-template-columns:
+    var(--w-filename) var(--w-context) var(--w-path) var(--w-size) var(--w-modified)
+    var(--w-created);
+  width: var(--columns-total-with-context);
+  min-width: var(--columns-total-with-context);
+}
+
 /* === Header Row === */
 .header-row-container {
   overflow: hidden;
@@ -628,6 +780,16 @@ button:active:not(:disabled) {
     var(--virtual-scrollbar-width);
 }
 
+.scroll-area--with-context .header-row {
+  width: calc(var(--columns-total-with-context) + var(--virtual-scrollbar-width));
+}
+
+.scroll-area--with-context .header-row.columns {
+  grid-template-columns:
+    var(--w-filename) var(--w-context) var(--w-path) var(--w-size) var(--w-modified)
+    var(--w-created) var(--virtual-scrollbar-width);
+}
+
 .header {
   font-weight: 600;
   color: var(--color-header);
@@ -933,6 +1095,13 @@ button:active:not(:disabled) {
   padding: 0 var(--cell-hpad);
 }
 
+.context-text {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 var(--cell-hpad);
+}
+
 .filename-text {
   flex: 1;
   min-width: 0;
diff --git a/cardinal/src/App.tsx b/cardinal/src/App.tsx
index 6a49e9a1..28dbc17c 100644
--- a/cardinal/src/App.tsx
+++ b/cardinal/src/App.tsx
@@ -9,6 +9,7 @@ import PreferencesOverlay from './components/PreferencesOverlay';
 import StatusBar from './components/StatusBar';
 import type { SearchResultItem } from './types/search';
 import { useColumnResize } from './hooks/useColumnResize';
+import { CONTEXT_COLUMN, useColumnOrder } from './hooks/useColumnOrder';
 import { useContextMenu } from './hooks/useContextMenu';
 import { useFileSearch } from './hooks/useFileSearch';
 import { useEventColumnWidths } from './hooks/useEventColumnWidths';
@@ -52,6 +53,7 @@ function App() {
     currentQuery,
     currentDirectoryQuery,
     highlightTerms,
+    contentTerms,
     showLoadingUI,
     initialFetchCompleted,
     durationMs,
@@ -66,6 +68,7 @@ function App() {
   const searchInputRef = useRef<HTMLInputElement>(null);
 
   const { colWidths, onResizeStart, autoFitColumns } = useColumnResize();
+  const { columnOrder, moveColumn } = useColumnOrder();
   const { caseSensitive, directoryQuery, directoryScopeOpen } = searchParams;
   const { eventColWidths, onEventResizeStart, autoFitEventColumns } = useEventColumnWidths();
   const { t, i18n } = useTranslation();
@@ -262,6 +265,19 @@ function App() {
   }, []);
 
   const selectedIndexSet = useMemo(() => new Set(selectedIndices), [selectedIndices]);
+  const showContentContext = contentTerms.length > 0;
+  const fileRowsWidth = showContentContext
+    ? 'var(--columns-total-with-context)'
+    : 'var(--columns-total)';
+  // The grid template is built here rather than in CSS because the user owns the column order.
+  const visibleColumns = useMemo(
+    () => columnOrder.filter((column) => column !== CONTEXT_COLUMN || showContentContext),
+    [columnOrder, showContentContext],
+  );
+  const columnsTemplate = useMemo(
+    () => visibleColumns.map((column) => `var(--w-${column})`).join(' '),
+    [visibleColumns],
+  );
 
   const handleRowContextMenu = useCallback(
     (event: ReactMouseEvent<HTMLDivElement>, path: string, rowIndex: number) => {
@@ -289,7 +305,7 @@ function App() {
           <div
             key={`placeholder-${rowIndex}`}
             className="row columns row-loading"
-            style={{ ...rowStyle, width: 'var(--columns-total)' }}
+            style={{ ...rowStyle, width: fileRowsWidth, gridTemplateColumns: columnsTemplate }}
           />
         );
       }
@@ -299,11 +315,14 @@ function App() {
           key={item.path}
           rowIndex={rowIndex}
           item={item}
-          style={{ ...rowStyle, width: 'var(--columns-total)' }}
+          style={{ ...rowStyle, width: fileRowsWidth }}
           isSelected={selectedIndexSet.has(rowIndex)}
           selectedPathsForDrag={selectedPaths}
           caseInsensitive={!caseSensitive}
           highlightTerms={highlightTerms}
+          contentTerms={contentTerms}
+          showContentContext={showContentContext}
+          columnOrder={visibleColumns}
           onContextMenu={handleRowContextMenu}
           onSelect={handleRowSelect}
           onOpen={openResultPath}
@@ -314,6 +333,11 @@ function App() {
       handleRowContextMenu,
       handleRowSelect,
       highlightTerms,
+      contentTerms,
+      showContentContext,
+      fileRowsWidth,
+      visibleColumns,
+      columnsTemplate,
       caseSensitive,
       selectedIndexSet,
       selectedPaths,
@@ -335,6 +359,7 @@ function App() {
       ({
         '--w-filename': `${colWidths.filename}px`,
         '--w-path': `${colWidths.path}px`,
+        '--w-context': `${Math.max(420, Math.floor(window.innerWidth * 0.4))}px`,
         '--w-size': `${colWidths.size}px`,
         '--w-modified': `${colWidths.modified}px`,
         '--w-created': `${colWidths.created}px`,
@@ -349,6 +374,19 @@ function App() {
     [colWidths, eventColWidths],
   );
 
+  // The file-type dropdown rewrites the query text, so it commits like pressing Enter rather than
+  // waiting out the keystroke debounce: a click should show results now.
+  const onFileTypeQueryChange = useCallback(
+    (nextQuery: string) => submitFilesQuery(nextQuery, { immediate: true }),
+    [submitFilesQuery],
+  );
+
+  // A path picked in the native dialog is a decision, not typing: search for it right away.
+  const onDirectoryValueChange = useCallback(
+    (nextDirectory: string) => queueDirectorySearch(nextDirectory, { immediate: true }),
+    [queueDirectorySearch],
+  );
+
   const showFullDiskAccessOverlay = fullDiskAccessStatus === 'denied';
   const overlayStatusMessage = isCheckingFullDiskAccess
     ? t('app.fullDiskAccess.status.checking')
@@ -390,6 +428,9 @@ function App() {
           caseSensitive={caseSensitive}
           onToggleCaseSensitive={onToggleCaseSensitive}
           caseSensitiveLabel={caseSensitiveLabel}
+          fileTypeEnabled={activeTab === 'files'}
+          onQueryValueChange={onFileTypeQueryChange}
+          onDirectoryValueChange={onDirectoryValueChange}
           onFocus={handleSearchFocus}
           onBlur={handleSearchBlur}
         />
@@ -428,6 +469,12 @@ function App() {
               onSortToggle={handleSortToggle}
               sortDisabled={sortButtonsDisabled}
               sortDisabledTooltip={sortDisabledTooltip}
+              showContentContext={showContentContext}
+              contentTerms={contentTerms}
+              caseInsensitive={!caseSensitive}
+              columnOrder={visibleColumns}
+              onColumnMove={moveColumn}
+              columnsTemplate={columnsTemplate}
             />
           )}
         </div>
diff --git a/cardinal/src/__tests__/App.contextMenu.test.tsx b/cardinal/src/__tests__/App.contextMenu.test.tsx
index 2a20b2f5..abfaa416 100644
--- a/cardinal/src/__tests__/App.contextMenu.test.tsx
+++ b/cardinal/src/__tests__/App.contextMenu.test.tsx
@@ -113,6 +113,7 @@ vi.mock('../hooks/useFileSearch', () => ({
       currentQuery: '',
       currentDirectoryQuery: '',
       highlightTerms: [],
+      contentTerms: [],
       showLoadingUI: false,
       initialFetchCompleted: true,
       durationMs: 0,
diff --git a/cardinal/src/__tests__/App.searchNavigation.test.tsx b/cardinal/src/__tests__/App.searchNavigation.test.tsx
index fd49492c..783d9d5d 100644
--- a/cardinal/src/__tests__/App.searchNavigation.test.tsx
+++ b/cardinal/src/__tests__/App.searchNavigation.test.tsx
@@ -104,6 +104,7 @@ vi.mock('../hooks/useFileSearch', () => ({
       currentQuery: 'needle',
       currentDirectoryQuery: 'Work/Docs',
       highlightTerms: [],
+      contentTerms: [],
       showLoadingUI: false,
       initialFetchCompleted: true,
       durationMs: 0,
diff --git a/cardinal/src/components/ColumnHeader.tsx b/cardinal/src/components/ColumnHeader.tsx
index 7de4f9a8..0758a8ae 100644
--- a/cardinal/src/components/ColumnHeader.tsx
+++ b/cardinal/src/components/ColumnHeader.tsx
@@ -1,16 +1,17 @@
-import { forwardRef } from 'react';
-import type { MouseEvent as ReactMouseEvent } from 'react';
+import React, { forwardRef, useCallback, useState } from 'react';
+import type { DragEvent } from 'react';
+import { useTranslation } from 'react-i18next';
 import type { ColumnKey } from '../constants';
 import type { SortKey, SortState } from '../types/sort';
-import { useTranslation } from 'react-i18next';
+import { CONTEXT_COLUMN, type OrderedColumn } from '../hooks/useColumnOrder';
 
-const columns: Array<{ key: ColumnKey; labelKey: string; className: string }> = [
-  { key: 'filename', labelKey: 'columns.filename', className: 'filename-text' },
-  { key: 'path', labelKey: 'columns.path', className: 'path-text' },
-  { key: 'size', labelKey: 'columns.size', className: 'size-text' },
-  { key: 'modified', labelKey: 'columns.modified', className: 'mtime-text' },
-  { key: 'created', labelKey: 'columns.created', className: 'ctime-text' },
-];
+const columnMeta: Record<ColumnKey, { labelKey: string; className: string }> = {
+  filename: { labelKey: 'columns.filename', className: 'filename-text' },
+  path: { labelKey: 'columns.path', className: 'path-text' },
+  size: { labelKey: 'columns.size', className: 'size-text' },
+  modified: { labelKey: 'columns.modified', className: 'mtime-text' },
+  created: { labelKey: 'columns.created', className: 'ctime-text' },
+};
 
 const sortableColumns: Record<ColumnKey, SortKey> = {
   filename: 'filename',
@@ -21,27 +22,118 @@ const sortableColumns: Record<ColumnKey, SortKey> = {
 };
 
 type ColumnHeaderProps = {
-  onResizeStart: (columnKey: ColumnKey) => (event: ReactMouseEvent<HTMLSpanElement>) => void;
-  onContextMenu: (event: ReactMouseEvent<HTMLDivElement>) => void;
-  sortState: SortState;
+  onResizeStart: (key: ColumnKey) => (event: React.MouseEvent<HTMLSpanElement>) => void;
+  onContextMenu: (event: React.MouseEvent<HTMLDivElement>) => void;
+  sortState: SortState | null;
   onSortToggle: (sortKey: SortKey) => void;
   sortDisabled: boolean;
   sortDisabledTooltip: string | null;
+  showContentContext: boolean;
+  columnOrder: readonly OrderedColumn[];
+  onColumnMove: (dragged: OrderedColumn, target: OrderedColumn) => void;
+  columnsTemplate: string;
 };
 
 // Column widths are applied via CSS vars on container; no need to pass colWidths prop.
 export const ColumnHeader = forwardRef<HTMLDivElement, ColumnHeaderProps>(
   (
-    { onResizeStart, onContextMenu, sortState, onSortToggle, sortDisabled, sortDisabledTooltip },
+    {
+      onResizeStart,
+      onContextMenu,
+      sortState,
+      onSortToggle,
+      sortDisabled,
+      sortDisabledTooltip,
+      showContentContext,
+      columnOrder,
+      onColumnMove,
+      columnsTemplate,
+    },
     ref,
   ) => {
     const { t } = useTranslation();
+    const [draggedColumn, setDraggedColumn] = useState<OrderedColumn | null>(null);
+    const [dropTarget, setDropTarget] = useState<OrderedColumn | null>(null);
+
+    const handleDragStart = useCallback(
+      (column: OrderedColumn) => (event: DragEvent<HTMLSpanElement>) => {
+        setDraggedColumn(column);
+        // Firefox ignores a drag that carries no data, and "move" gets the right cursor.
+        event.dataTransfer.setData('text/plain', column);
+        event.dataTransfer.effectAllowed = 'move';
+      },
+      [],
+    );
+
+    const handleDragOver = useCallback(
+      (column: OrderedColumn) => (event: DragEvent<HTMLSpanElement>) => {
+        if (!draggedColumn) {
+          return;
+        }
+        // Without preventDefault the browser refuses the drop outright.
+        event.preventDefault();
+        event.dataTransfer.dropEffect = 'move';
+        setDropTarget(column);
+      },
+      [draggedColumn],
+    );
+
+    const handleDrop = useCallback(
+      (column: OrderedColumn) => (event: DragEvent<HTMLSpanElement>) => {
+        event.preventDefault();
+        if (draggedColumn) {
+          onColumnMove(draggedColumn, column);
+        }
+        setDraggedColumn(null);
+        setDropTarget(null);
+      },
+      [draggedColumn, onColumnMove],
+    );
+
+    const handleDragEnd = useCallback(() => {
+      setDraggedColumn(null);
+      setDropTarget(null);
+    }, []);
+
+    const dragClasses = (column: OrderedColumn) =>
+      [
+        draggedColumn === column ? 'header-cell--dragging' : '',
+        dropTarget === column && draggedColumn !== column ? 'header-cell--drop-target' : '',
+      ]
+        .filter(Boolean)
+        .join(' ');
+
     return (
       <div ref={ref} className="header-row-container">
-        <div className="header-row columns" onContextMenu={onContextMenu}>
-          {columns.map(({ key, labelKey, className }) => {
+        <div
+          className="header-row columns"
+          style={{ gridTemplateColumns: columnsTemplate }}
+          onContextMenu={onContextMenu}
+        >
+          {columnOrder.map((column) => {
+            if (column === CONTEXT_COLUMN) {
+              if (!showContentContext) {
+                return null;
+              }
+              // No sort key and no resizer: the snippet column's width follows the window.
+              return (
+                <span
+                  key={column}
+                  className={`context-text header header-cell ${dragClasses(column)}`}
+                  draggable
+                  onDragStart={handleDragStart(column)}
+                  onDragOver={handleDragOver(column)}
+                  onDrop={handleDrop(column)}
+                  onDragEnd={handleDragEnd}
+                >
+                  {t('columns.context')}
+                </span>
+              );
+            }
+
+            const { labelKey, className } = columnMeta[column];
             const label = t(labelKey);
-            const sortKey = sortableColumns[key];
+            const sortKey = sortableColumns[column];
             const isActive = sortState?.key === sortKey;
             const indicatorClasses = ['sort-indicator'];
 
@@ -62,7 +154,15 @@ export const ColumnHeader = forwardRef<HTMLDivElement, ColumnHeaderProps>(
             const title = sortDisabled ? sortDisabledTooltip || undefined : undefined;
 
             return (
-              <span key={key} className={`${className} header header-cell`}>
+              <span
+                key={column}
+                className={`${className} header header-cell ${dragClasses(column)}`}
+                draggable
+                onDragStart={handleDragStart(column)}
+                onDragOver={handleDragOver(column)}
+                onDrop={handleDrop(column)}
+                onDragEnd={handleDragEnd}
+              >
                 <button
                   type="button"
                   className="sort-button"
@@ -76,7 +176,11 @@ export const ColumnHeader = forwardRef<HTMLDivElement, ColumnHeaderProps>(
                 </button>
                 <span
                   className="col-resizer"
-                  onMouseDown={onResizeStart(key)} // consume column-specific resize closures from the parent hook
+                  // Dragging the resizer must not start a column drag: the handle sits inside the
+                  // draggable header cell, and the browser hands the gesture to the parent.
+                  draggable={false}
+                  onDragStart={(event) => event.preventDefault()}
+                  onMouseDown={onResizeStart(column)} // consume column-specific resize closures from the parent hook
                 />
               </span>
             );
diff --git a/cardinal/src/components/FileRow.tsx b/cardinal/src/components/FileRow.tsx
index 695dba11..1436ea2f 100644
--- a/cardinal/src/components/FileRow.tsx
+++ b/cardinal/src/components/FileRow.tsx
@@ -1,5 +1,6 @@
 import React, { memo, useCallback, DragEvent, useRef } from 'react';
 import type { CSSProperties, MouseEvent as ReactMouseEvent } from 'react';
+import { CONTEXT_COLUMN, type OrderedColumn } from '../hooks/useColumnOrder';
 import { MiddleEllipsisHighlight } from './MiddleEllipsisHighlight';
 import { formatKB, formatTimestamp } from '../utils/format';
 import type { SearchResultItem } from '../types/search';
@@ -21,6 +22,9 @@ type FileRowProps = {
   selectedPathsForDrag?: string[];
   caseInsensitive?: boolean;
   highlightTerms?: readonly string[];
+  contentTerms?: readonly string[];
+  showContentContext?: boolean;
+  columnOrder: readonly OrderedColumn[];
 };
 
 export const FileRow = memo(function FileRow({
@@ -34,6 +38,9 @@ export const FileRow = memo(function FileRow({
   selectedPathsForDrag = [],
   caseInsensitive,
   highlightTerms,
+  contentTerms,
+  showContentContext = false,
+  columnOrder,
 }: FileRowProps): React.JSX.Element {
   const pendingSelectRef = useRef<{
     isShift: boolean;
@@ -148,26 +155,71 @@ export const FileRow = memo(function FileRow({
       aria-selected={isSelected}
       title={path}
     >
-      <div className="filename-column">
-        {item.icon ? (
-          <img src={item.icon} alt="icon" className="file-icon" />
-        ) : (
-          <span className="file-icon file-icon-placeholder" aria-hidden="true" />
-        )}
-        <MiddleEllipsisHighlight
-          className="filename-text"
-          text={filename}
-          highlightTerms={highlightTerms}
-          caseInsensitive={caseInsensitive}
-        />
-      </div>
-      {/* Directory column renders the parent path (the filename column already shows the leaf). */}
-      <span className="path-text" title={directoryPath}>
-        {directoryPath}
-      </span>
-      <span className={`size-text ${!sizeText ? 'muted' : ''}`}>{sizeText || '—'}</span>
-      <span className={`mtime-text ${!mtimeText ? 'muted' : ''}`}>{mtimeText || '—'}</span>
-      <span className={`ctime-text ${!ctimeText ? 'muted' : ''}`}>{ctimeText || '—'}</span>
+      {columnOrder.map((column) => {
+        switch (column) {
+          case 'filename':
+            return (
+              <div key={column} className="filename-column">
+                {item.icon ? (
+                  <img src={item.icon} alt="icon" className="file-icon" />
+                ) : (
+                  <span className="file-icon file-icon-placeholder" aria-hidden="true" />
+                )}
+                <MiddleEllipsisHighlight
+                  className="filename-text"
+                  text={filename}
+                  highlightTerms={highlightTerms}
+                  caseInsensitive={caseInsensitive}
+                />
+              </div>
+            );
+          case CONTEXT_COLUMN:
+            if (!showContentContext) {
+              return null;
+            }
+            return item.contentContext ? (
+              <MiddleEllipsisHighlight
+                key={column}
+                className="context-text"
+                text={item.contentContext}
+                highlightTerms={contentTerms}
+                caseInsensitive={caseInsensitive}
+                ellipsisMode="end"
+              />
+            ) : (
+              <span key={column} className="context-text muted">
+                —
+              </span>
+            );
+          case 'path':
+            // The parent path only; the filename column already shows the leaf.
+            return (
+              <span key={column} className="path-text" title={directoryPath}>
+                {directoryPath}
+              </span>
+            );
+          case 'size':
+            return (
+              <span key={column} className={`size-text ${!sizeText ? 'muted' : ''}`}>
+                {sizeText || '—'}
+              </span>
+            );
+          case 'modified':
+            return (
+              <span key={column} className={`mtime-text ${!mtimeText ? 'muted' : ''}`}>
+                {mtimeText || '—'}
+              </span>
+            );
+          case 'created':
+            return (
+              <span key={column} className={`ctime-text ${!ctimeText ? 'muted' : ''}`}>
+                {ctimeText || '—'}
+              </span>
+            );
+          default:
+            return null;
+        }
+      })}
     </div>
   );
 });
diff --git a/cardinal/src/components/FilesTabContent.tsx b/cardinal/src/components/FilesTabContent.tsx
index 267e2ad7..dd339b26 100644
--- a/cardinal/src/components/FilesTabContent.tsx
+++ b/cardinal/src/components/FilesTabContent.tsx
@@ -1,3 +1,4 @@
+import type { OrderedColumn } from '../hooks/useColumnOrder';
 import React from 'react';
 import type { CSSProperties, ReactNode } from 'react';
 import type { MouseEvent as ReactMouseEvent } from 'react';
@@ -36,6 +37,12 @@ type FilesTabContentProps = {
   onSortToggle: (sortKey: SortKey) => void;
   sortDisabled: boolean;
   sortDisabledTooltip: string | null;
+  showContentContext: boolean;
+  contentTerms: readonly string[];
+  caseInsensitive: boolean;
+  columnOrder: readonly OrderedColumn[];
+  onColumnMove: (dragged: OrderedColumn, target: OrderedColumn) => void;
+  columnsTemplate: string;
 };
 
 export function FilesTabContent({
@@ -58,9 +65,15 @@ export function FilesTabContent({
   onSortToggle,
   sortDisabled,
   sortDisabledTooltip,
+  showContentContext,
+  contentTerms,
+  caseInsensitive,
+  columnOrder,
+  onColumnMove,
+  columnsTemplate,
 }: FilesTabContentProps): React.JSX.Element {
   return (
-    <div className="scroll-area">
+    <div className={`scroll-area${showContentContext ? ' scroll-area--with-context' : ''}`}>
       <ColumnHeader
         ref={headerRef}
         onResizeStart={onResizeStart}
@@ -69,6 +82,10 @@ export function FilesTabContent({
         onSortToggle={onSortToggle}
         sortDisabled={sortDisabled}
         sortDisabledTooltip={sortDisabledTooltip}
+        showContentContext={showContentContext}
+        columnOrder={columnOrder}
+        onColumnMove={onColumnMove}
+        columnsTemplate={columnsTemplate}
       />
       <div className="flex-fill">
         {displayState !== 'results' ? (
@@ -88,6 +105,8 @@ export function FilesTabContent({
             overscan={overscan}
             renderRow={renderRow}
             onScrollSync={onScrollSync}
+            contentTerms={contentTerms}
+            caseInsensitive={caseInsensitive}
           />
         )}
       </div>
diff --git a/cardinal/src/components/MiddleEllipsisHighlight.tsx b/cardinal/src/components/MiddleEllipsisHighlight.tsx
index b024bc46..d086e7c8 100644
--- a/cardinal/src/components/MiddleEllipsisHighlight.tsx
+++ b/cardinal/src/components/MiddleEllipsisHighlight.tsx
@@ -131,11 +131,44 @@ function applyMiddleEllipsis(parts: HighlightSegment[], maxChars: number): Highl
   return [...leftParts, { text: '…', isHighlight: false }, ...rightParts];
 }
 
+function applyEndEllipsis(parts: HighlightSegment[], maxChars: number): HighlightSegment[] {
+  if (maxChars <= 1) {
+    return [{ text: '…', isHighlight: false }];
+  }
+
+  const totalLength = parts.reduce((sum, part) => sum + part.text.length, 0);
+  if (totalLength <= maxChars) {
+    return parts;
+  }
+
+  const visibleChars = maxChars - 1;
+  const visibleParts: HighlightSegment[] = [];
+  let visibleCount = 0;
+  for (const part of parts) {
+    const remainingSpace = visibleChars - visibleCount;
+    if (remainingSpace <= 0) break;
+
+    if (part.text.length <= remainingSpace) {
+      visibleParts.push(part);
+      visibleCount += part.text.length;
+    } else {
+      visibleParts.push({
+        text: part.text.slice(0, remainingSpace),
+        isHighlight: part.isHighlight,
+      });
+      break;
+    }
+  }
+
+  return [...visibleParts, { text: '…', isHighlight: false }];
+}
+
 type MiddleEllipsisHighlightProps = {
   text: string;
   className?: string;
   highlightTerms?: readonly string[];
   caseInsensitive?: boolean;
+  ellipsisMode?: 'middle' | 'end';
 };
 
 export function MiddleEllipsisHighlight({
@@ -143,6 +176,7 @@ export function MiddleEllipsisHighlight({
   className,
   highlightTerms,
   caseInsensitive,
+  ellipsisMode = 'middle',
 }: MiddleEllipsisHighlightProps): React.JSX.Element {
   const containerRef = useRef<HTMLSpanElement | null>(null);
   const [containerWidth, setContainerWidth] = useState(0);
@@ -157,8 +191,10 @@ export function MiddleEllipsisHighlight({
     if (!containerWidth || highlightedParts.length === 0) return highlightedParts;
 
     const maxChars = Math.floor(containerWidth / CHAR_WIDTH) - 1;
-    return applyMiddleEllipsis(highlightedParts, maxChars);
-  }, [highlightedParts, containerWidth]);
+    return ellipsisMode === 'end'
+      ? applyEndEllipsis(highlightedParts, maxChars)
+      : applyMiddleEllipsis(highlightedParts, maxChars);
+  }, [highlightedParts, containerWidth, ellipsisMode]);
 
   // Measure before paint so result refreshes do not flash the full text before truncation.
   // ResizeObserver keeps truncation in sync with later layout shifts.
diff --git a/cardinal/src/components/SearchBar.tsx b/cardinal/src/components/SearchBar.tsx
index 3bb190ca..2faab364 100644
--- a/cardinal/src/components/SearchBar.tsx
+++ b/cardinal/src/components/SearchBar.tsx
@@ -1,6 +1,17 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 import type { ChangeEvent, FocusEventHandler } from 'react';
+import { useTranslation } from 'react-i18next';
+import { open } from '@tauri-apps/plugin-dialog';
 import { hasModifierKey } from '../utils/keyboard';
+import {
+  CUSTOM,
+  FILE_TYPE_OPTIONS,
+  readContentTerm,
+  readFileType,
+  setContentTerm,
+  setFileType,
+  type FileTypeValue,
+} from '../utils/searchBarQuery';
 
 const MACOS_FOLDER_ICON =
   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAADGUlEQVRYCe1XsW4TQRCdPZ9tEsuxiEmTABIFSijpKKClooiEhNKAlJJIFBRUfAEVEgW/QEoKkCiQKEAUNDRE0EBQFKBACbIT49z57pb39rx3Z0exneSiUGSsOe/tzs68ndmZ3RM5oWP2gMrYd9Eud7mQ6e9vRujwutzpH9zvuwVA47W7r78/Gps4fdsRXRqgKPK9ztsn16YWIPMH7IP1APmBQxZA7c7L1celanWR0lpraLRD6XzFXqWkgDGtvW/NlU/3l5euf4BEmEoNbFHOei+gpLVy7uarX18dkaJWWiKshyD6icYddLsQdAuOFCDr4KfYOYwgEumo7W01l5/Nzz2AeAMc0PWk8a22V6SBvVYfixExjAJ2AQ/+GwBDIkC9Xe+NSbGyeGP5i/tiYe4edDYsgMJ2G6FUWNoIZFesdKx46BSoJVACJpDIcW9hzkNwAkC1PWxo2tejgRhqtE+AoC1gtJht4xSxHpC/vi9n6xNyabouk9US4mu3R5+mA76G2FObW758/rkh65vb1GJSPQFQr47LlYvTRn0A4c6o+3pEQIxurVI2Nt6srHOWWWECYHbmjHgB0g87e9hGHNFmj5gK4xRmGGZnJuV9dzQBMHaqJF4YLxuiGI6B9Gg54AuzgKSERVSEtiwlALBsAUhTaLSOBa3QYf9tTbFpntWXAAgiFCYESkX5br6sMeNVhFgyC0wARPS+sT1CVevVuv+3jIkEQIj6q1S+rt8LmQ0Jx3sAAMFec/Ltz5wzPQCO1QORSZGjKcO73ZeG+j/yQBggCwfdxHav46A92qRcPDvxgOnToSlER3UiosjEF500AmkWBPSAOd/hBQdFIe9jmSlOtXhoXrm6ZD0Qtdo7UnZdhAGCuG4pVqu89iRU8ZCTEB6Aq73AXAfRm9aBnUajuVafqJw3wFiSc64Jpvh0S3Cj2VqDnR3aspWnjvaFy0/fPa+UyjPFYl5Lp4mUOp1IWr734+PS1Xn0roI3LACejwQxBa6BmQ4cs+NoHooYdDJPHN6Gf4M3wH7WAEHYL6M8jUOtIQvCfhfwg+aE5B+lBx09YnlGKQAAAABJRU5ErkJggg==';
@@ -23,6 +34,9 @@ type SearchBarProps = {
   caseSensitive: boolean;
   onToggleCaseSensitive: (event: ChangeEvent<HTMLInputElement>) => void;
   caseSensitiveLabel: string;
+  fileTypeEnabled: boolean;
+  onQueryValueChange: (value: string) => void;
+  onDirectoryValueChange: (value: string) => void;
   onFocus: FocusEventHandler<HTMLInputElement>;
   onBlur: FocusEventHandler<HTMLInputElement>;
 };
@@ -53,10 +67,46 @@ export function SearchBar({
   caseSensitive,
   onToggleCaseSensitive,
   caseSensitiveLabel,
+  fileTypeEnabled,
+  onQueryValueChange,
+  onDirectoryValueChange,
   onFocus,
   onBlur,
 }: SearchBarProps): React.JSX.Element {
+  const { t } = useTranslation();
   const directoryInputRef = useRef<HTMLInputElement | null>(null);
+  const fileType = readFileType(value);
+
+  const handleFileTypeChange = useCallback(
+    (event: ChangeEvent<HTMLSelectElement>) => {
+      const next = event.target.value;
+      // Selecting the read-only "custom" entry would have nothing to write; the query already
+      // says something this control cannot express, so leave it untouched.
+      if (next === CUSTOM) {
+        return;
+      }
+      onQueryValueChange(setFileType(value, next as FileTypeValue | ''));
+    },
+    [onQueryValueChange, value],
+  );
+
+  const contentTerm = readContentTerm(value);
+  const contentIsCustom = contentTerm === CUSTOM;
+
+  const handleContentChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => {
+      onQueryValueChange(setContentTerm(value, event.target.value));
+    },
+    [onQueryValueChange, value],
+  );
+
+  const handleBrowseDirectory = useCallback(async () => {
+    // Native picker: `directory: true` makes it a folder chooser, and it returns null on cancel.
+    const chosen = await open({ directory: true, multiple: false, title: directoryScopeLabel });
+    if (typeof chosen === 'string') {
+      onDirectoryValueChange(chosen);
+    }
+  }, [directoryScopeLabel, onDirectoryValueChange]);
 
   useEffect(() => {
     if (directoryScopeOpen) {
@@ -131,10 +181,9 @@ export function SearchBar({
                 <button
                   type="button"
                   className="directory-scope-field-toggle"
-                  aria-label={directoryScopeLabel}
-                  aria-pressed="true"
-                  title={directoryScopeLabel}
-                  onClick={onToggleDirectoryScope}
+                  aria-label={t('search.directory.browse')}
+                  title={t('search.directory.browse')}
+                  onClick={handleBrowseDirectory}
                 >
                   <img src={MACOS_FOLDER_ICON} alt="" aria-hidden="true" />
                 </button>
@@ -155,6 +204,19 @@ export function SearchBar({
                 onFocus={onFocus}
                 onBlur={onBlur}
               />
+              {directoryScopeOpen ? (
+                <button
+                  type="button"
+                  className="directory-scope-close"
+                  aria-label={t('search.directory.close')}
+                  title={t('search.directory.close')}
+                  onClick={onToggleDirectoryScope}
+                >
+                  <svg viewBox="0 0 16 16" aria-hidden="true">
+                    <path d="M12 0L4 8l8 8" />
+                  </svg>
+                </button>
+              ) : null}
             </div>
           </div>
         ) : null}
@@ -175,7 +237,48 @@ export function SearchBar({
             onBlur={onBlur}
           />
         </div>
+        <div className="search-segment content-search-segment">
+          <label className="content-search-label" htmlFor="content-search-input">
+            {t('search.content.label')}
+          </label>
+          <input
+            id="content-search-input"
+            value={contentIsCustom ? '' : contentTerm}
+            onChange={handleContentChange}
+            onKeyDown={onKeyDown}
+            placeholder={contentIsCustom ? t('search.content.custom') : t('search.content.hint')}
+            disabled={contentIsCustom}
+            title={contentIsCustom ? t('search.content.custom') : undefined}
+            spellCheck={false}
+            autoCorrect="off"
+            autoComplete="off"
+            autoCapitalize="off"
+            onFocus={onFocus}
+            onBlur={onBlur}
+          />
+        </div>
         <div className="search-segment search-options">
+          {fileTypeEnabled ? (
+            <label className="search-option file-type-option" title={t('search.fileType.label')}>
+              <span className="sr-only">{t('search.fileType.label')}</span>
+              <select
+                className={`file-type-select${fileType ? ' is-active' : ''}`}
+                value={fileType}
+                onChange={handleFileTypeChange}
+                aria-label={t('search.fileType.label')}
+              >
+                <option value="">{t('search.fileType.all')}</option>
+                {FILE_TYPE_OPTIONS.map(({ value: option, icon }) => (
+                  <option key={option} value={option}>
+                    {icon} {t(`search.fileType.${option}`)}
+                  </option>
+                ))}
+                {fileType === CUSTOM ? (
+                  <option value={CUSTOM}>{t('search.fileType.custom')}</option>
+                ) : null}
+              </select>
+            </label>
+          ) : null}
           <label className="search-option" title={caseSensitiveLabel}>
             <input
               type="checkbox"
diff --git a/cardinal/src/components/VirtualList.tsx b/cardinal/src/components/VirtualList.tsx
index 838ac2a5..713eb49c 100644
--- a/cardinal/src/components/VirtualList.tsx
+++ b/cardinal/src/components/VirtualList.tsx
@@ -39,6 +39,8 @@ type VirtualListProps = {
     rowStyle: CSSProperties,
   ) => React.ReactNode;
   onScrollSync: (scrollLeft: number) => void;
+  contentTerms?: readonly string[];
+  caseInsensitive?: boolean;
 };
 
 // Virtualized list with lazy row hydration plus a short-lived frozen viewport during
@@ -52,6 +54,8 @@ export const VirtualList = forwardRef<VirtualListHandle, VirtualListProps>(funct
     overscan,
     renderRow,
     onScrollSync,
+    contentTerms = [],
+    caseInsensitive = false,
   },
   ref,
 ) {
@@ -67,7 +71,12 @@ export const VirtualList = forwardRef<VirtualListHandle, VirtualListProps>(funct
   const rowCount = results.length;
 
   // ----- data loader -----
-  const { cache, ensureRangeLoaded } = useDataLoader(results, dataResultsVersion);
+  const { cache, ensureRangeLoaded } = useDataLoader(
+    results,
+    dataResultsVersion,
+    contentTerms,
+    caseInsensitive,
+  );
 
   // Virtualized height powers the scrollbar math
   const totalHeight = rowCount * rowHeight;
diff --git a/cardinal/src/components/__tests__/FileRow.test.tsx b/cardinal/src/components/__tests__/FileRow.test.tsx
index adb6d3c4..642c2090 100644
--- a/cardinal/src/components/__tests__/FileRow.test.tsx
+++ b/cardinal/src/components/__tests__/FileRow.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { describe, expect, it, vi } from 'vitest';
 import { render, fireEvent } from '@testing-library/react';
+import { DEFAULT_COLUMN_ORDER } from '../../hooks/useColumnOrder';
 import { FileRow } from '../FileRow';
 
 const baseItem = {
@@ -10,7 +11,14 @@ const baseItem = {
 
 const renderRow = (props?: Partial<React.ComponentProps<typeof FileRow>>) => {
   return render(
-    <FileRow rowIndex={0} item={baseItem} isSelected={true} onSelect={vi.fn()} {...props} />,
+    <FileRow
+      rowIndex={0}
+      item={baseItem}
+      isSelected={true}
+      onSelect={vi.fn()}
+      columnOrder={DEFAULT_COLUMN_ORDER}
+      {...props}
+    />,
   );
 };
 
diff --git a/cardinal/src/components/__tests__/SearchBar.test.tsx b/cardinal/src/components/__tests__/SearchBar.test.tsx
index 2e1bb62d..53deb964 100644
--- a/cardinal/src/components/__tests__/SearchBar.test.tsx
+++ b/cardinal/src/components/__tests__/SearchBar.test.tsx
@@ -1,9 +1,19 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { createRef } from 'react';
 import type { ComponentProps } from 'react';
 import { describe, expect, it, vi } from 'vitest';
+import { open } from '@tauri-apps/plugin-dialog';
 import { SearchBar } from '../SearchBar';
 
+// The bar now labels the file-type dropdown through i18n; keys are enough for these assertions.
+vi.mock('@tauri-apps/plugin-dialog', () => ({
+  open: vi.fn().mockResolvedValue(null),
+}));
+
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
 const renderSearchBar = (overrides: Partial<ComponentProps<typeof SearchBar>> = {}) => {
   const props: ComponentProps<typeof SearchBar> = {
     inputRef: createRef<HTMLInputElement>(),
@@ -23,6 +33,9 @@ const renderSearchBar = (overrides: Partial<ComponentProps<typeof SearchBar>> =
     caseSensitive: false,
     onToggleCaseSensitive: vi.fn(),
     caseSensitiveLabel: 'Case sensitive',
+    fileTypeEnabled: true,
+    onQueryValueChange: vi.fn(),
+    onDirectoryValueChange: vi.fn(),
     onFocus: vi.fn(),
     onBlur: vi.fn(),
     ...overrides,
@@ -48,18 +61,47 @@ describe('SearchBar', () => {
     expect(screen.queryByRole('separator')).toBeNull();
   });
 
-  it('uses the folder icon inside the opened directory scope to fold it', () => {
+  it('browses for a folder with the folder icon, and folds with the chevron beside it', async () => {
     const onToggleDirectoryScope = vi.fn();
-    renderSearchBar({ onToggleDirectoryScope });
+    const onDirectoryValueChange = vi.fn();
+    vi.mocked(open).mockResolvedValueOnce('/Users/someone/Documents');
+    renderSearchBar({ onToggleDirectoryScope, onDirectoryValueChange });
 
-    const toggle = screen.getByRole('button', { name: 'Folder scope' });
-    expect(toggle).toHaveAttribute('aria-pressed', 'true');
-    expect(toggle).toHaveClass('directory-scope-field-toggle');
+    // The folder icon used to fold the field, which read as a lie: it looks like "pick a folder".
+    const browse = screen.getByRole('button', { name: 'search.directory.browse' });
+    expect(browse).toHaveClass('directory-scope-field-toggle');
+    fireEvent.click(browse);
+    await waitFor(() =>
+      expect(open).toHaveBeenCalledWith(expect.objectContaining({ directory: true })),
+    );
+    await waitFor(() =>
+      expect(onDirectoryValueChange).toHaveBeenCalledWith('/Users/someone/Documents'),
+    );
+    expect(onToggleDirectoryScope).not.toHaveBeenCalled();
 
-    fireEvent.click(toggle);
+    fireEvent.click(screen.getByRole('button', { name: 'search.directory.close' }));
     expect(onToggleDirectoryScope).toHaveBeenCalledTimes(1);
   });
 
+  it('leaves the folder untouched when the picker is cancelled', async () => {
+    const onDirectoryValueChange = vi.fn();
+    vi.mocked(open).mockResolvedValueOnce(null);
+    renderSearchBar({ onDirectoryValueChange });
+
+    fireEvent.click(screen.getByRole('button', { name: 'search.directory.browse' }));
+    await waitFor(() => expect(open).toHaveBeenCalled());
+    expect(onDirectoryValueChange).not.toHaveBeenCalled();
+  });
+
+  it('writes what the contains field types into the query as a quoted content filter', () => {
+    const onQueryValueChange = vi.fn();
+    renderSearchBar({ value: 'informe', onQueryValueChange });
+
+    const contains = screen.getByPlaceholderText('search.content.hint');
+    fireEvent.change(contains, { target: { value: 'Bearer token' } });
+    expect(onQueryValueChange).toHaveBeenCalledWith('informe content:"Bearer token"');
+  });
+
   it('routes directory input focus state through the shared search focus handlers', () => {
     const onFocus = vi.fn();
     const onBlur = vi.fn();
@@ -197,4 +239,26 @@ describe('SearchBar', () => {
     expect(onDirectoryKeyDown).toHaveBeenCalledTimes(1);
     expect(document.activeElement).not.toBe(queryInput);
   });
+
+  it('writes the picked file type into the query and reflects what is already there', () => {
+    const onQueryValueChange = vi.fn();
+    renderSearchBar({ value: 'informe', onQueryValueChange });
+
+    const select = screen.getByLabelText('search.fileType.label') as HTMLSelectElement;
+    expect(select.value).toBe('');
+
+    fireEvent.change(select, { target: { value: 'image' } });
+    expect(onQueryValueChange).toHaveBeenCalledWith('informe type:image');
+  });
+
+  it('shows a custom entry, and changes nothing, for a query it cannot represent', () => {
+    const onQueryValueChange = vi.fn();
+    renderSearchBar({ value: 'informe !type:image', onQueryValueChange });
+
+    const select = screen.getByLabelText('search.fileType.label') as HTMLSelectElement;
+    expect(select.value).toBe('custom');
+
+    fireEvent.change(select, { target: { value: 'custom' } });
+    expect(onQueryValueChange).not.toHaveBeenCalled();
+  });
 });
diff --git a/cardinal/src/hooks/__tests__/useColumnOrder.test.ts b/cardinal/src/hooks/__tests__/useColumnOrder.test.ts
new file mode 100644
index 00000000..62026665
--- /dev/null
+++ b/cardinal/src/hooks/__tests__/useColumnOrder.test.ts
@@ -0,0 +1,41 @@
+import { act, renderHook } from '@testing-library/react';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { COLUMN_ORDER_STORAGE_KEY, DEFAULT_COLUMN_ORDER, useColumnOrder } from '../useColumnOrder';
+
+beforeEach(() => {
+  window.localStorage.clear();
+});
+
+describe('useColumnOrder', () => {
+  it('starts with the name first and the snippet right after it', () => {
+    const { result } = renderHook(() => useColumnOrder());
+    expect(result.current.columnOrder.slice(0, 2)).toEqual(['filename', 'context']);
+  });
+
+  it('moves a column to where the drop target sits, in both directions', () => {
+    const { result } = renderHook(() => useColumnOrder());
+
+    act(() => result.current.moveColumn('size', 'filename'));
+    expect(result.current.columnOrder[0]).toBe('size');
+
+    act(() => result.current.moveColumn('size', 'created'));
+    expect(result.current.columnOrder[result.current.columnOrder.length - 1]).toBe('size');
+  });
+
+  it('persists the order and repairs a stored one that is missing a column', () => {
+    window.localStorage.setItem(COLUMN_ORDER_STORAGE_KEY, JSON.stringify(['size', 'filename']));
+    const { result } = renderHook(() => useColumnOrder());
+
+    // Missing columns are appended rather than dropped, so a column added in a later version
+    // still shows up for someone who already saved an order.
+    expect(result.current.columnOrder).toHaveLength(DEFAULT_COLUMN_ORDER.length);
+    expect(result.current.columnOrder.slice(0, 2)).toEqual(['size', 'filename']);
+  });
+
+  it('ignores a stored order containing junk', () => {
+    window.localStorage.setItem(COLUMN_ORDER_STORAGE_KEY, JSON.stringify(['nope', 'filename']));
+    const { result } = renderHook(() => useColumnOrder());
+    expect(result.current.columnOrder).not.toContain('nope');
+    expect(result.current.columnOrder).toHaveLength(DEFAULT_COLUMN_ORDER.length);
+  });
+});
diff --git a/cardinal/src/hooks/__tests__/useDataLoader.test.ts b/cardinal/src/hooks/__tests__/useDataLoader.test.ts
index 28daba49..2bc8d445 100644
--- a/cardinal/src/hooks/__tests__/useDataLoader.test.ts
+++ b/cardinal/src/hooks/__tests__/useDataLoader.test.ts
@@ -32,6 +32,17 @@ const renderDataLoader = (initialProps: HookProps) =>
     initialProps,
   });
 
+const renderDataLoaderWithContent = (
+  initialProps: HookProps & { contentTerms: string[]; caseInsensitive: boolean },
+) =>
+  renderHook(
+    ({ results, version, contentTerms, caseInsensitive }) =>
+      useDataLoader(results, version, contentTerms, caseInsensitive),
+    {
+      initialProps,
+    },
+  );
+
 const createDeferred = <T>() => {
   let resolve!: (value: T) => void;
   const promise = new Promise<T>((res) => {
@@ -159,4 +170,23 @@ describe('useDataLoader', () => {
 
     expect(iconUpdateUnlisten).toHaveBeenCalled();
   });
+
+  it('passes content snippet options to node info requests', async () => {
+    const { result } = renderDataLoaderWithContent({
+      results: [11 as SlabIndex],
+      version: 1,
+      contentTerms: ['needle'],
+      caseInsensitive: true,
+    });
+
+    await act(async () => {
+      await result.current.ensureRangeLoaded(0, 0);
+    });
+
+    expect(mockedInvoke).toHaveBeenCalledWith('get_nodes_info', {
+      results: [11],
+      contentTerms: ['needle'],
+      caseInsensitive: true,
+    });
+  });
 });
diff --git a/cardinal/src/hooks/useColumnOrder.ts b/cardinal/src/hooks/useColumnOrder.ts
new file mode 100644
index 00000000..6e3243b8
--- /dev/null
+++ b/cardinal/src/hooks/useColumnOrder.ts
@@ -0,0 +1,76 @@
+import { useCallback } from 'react';
+import { useStoredState } from './useStoredState';
+import type { ColumnKey } from '../constants';
+
+/** The snippet column only exists while a `content:` search is running, so it is not a ColumnKey. */
+export const CONTEXT_COLUMN = 'context';
+export type OrderedColumn = ColumnKey | typeof CONTEXT_COLUMN;
+
+// Name first, then why the file matched, then where it lives.
+export const DEFAULT_COLUMN_ORDER: OrderedColumn[] = [
+  'filename',
+  CONTEXT_COLUMN,
+  'path',
+  'size',
+  'modified',
+  'created',
+];
+
+export const COLUMN_ORDER_STORAGE_KEY = 'cardinal.columns.order';
+
+const isOrderedColumn = (value: unknown): value is OrderedColumn =>
+  typeof value === 'string' && DEFAULT_COLUMN_ORDER.includes(value as OrderedColumn);
+
+/**
+ * Stored order is repaired rather than trusted: a column added in a later version would otherwise
+ * never appear for anyone who had already saved an order, and a removed one would linger forever.
+ */
+const normalize = (value: OrderedColumn[]): OrderedColumn[] => {
+  const seen = new Set<OrderedColumn>();
+  const kept = value.filter(
+    (column) => isOrderedColumn(column) && !seen.has(column) && seen.add(column),
+  );
+  return [...kept, ...DEFAULT_COLUMN_ORDER.filter((column) => !seen.has(column))];
+};
+
+export function useColumnOrder() {
+  const [order, setOrder] = useStoredState<OrderedColumn[]>({
+    key: COLUMN_ORDER_STORAGE_KEY,
+    defaultValue: DEFAULT_COLUMN_ORDER,
+    read: (raw) => {
+      const parsed: unknown = JSON.parse(raw);
+      // Normalize here as well, not only in the option below. useStoredState runs
+      // `normalize` on write and returns whatever it read verbatim, so an order saved by an older
+      // version — or hand-edited in localStorage — reached the grid with unknown or missing
+      // columns and the header stopped matching the rows.
+      return Array.isArray(parsed) ? normalize(parsed as OrderedColumn[]) : null;
+    },
+    write: (value) => JSON.stringify(value),
+    normalize,
+    readErrorMessage: 'Failed to read stored column order',
+    writeErrorMessage: 'Failed to persist column order',
+  });
+
+  /** Moves `dragged` so it lands where `target` currently sits. */
+  const moveColumn = useCallback(
+    (dragged: OrderedColumn, target: OrderedColumn) => {
+      if (dragged === target) {
+        return;
+      }
+      const next = order.filter((column) => column !== dragged);
+      const at = next.indexOf(target);
+      if (at === -1) {
+        return;
+      }
+      // Dropping on a column to the right means "take its place", so insert after it.
+      const insertAt = order.indexOf(dragged) < order.indexOf(target) ? at + 1 : at;
+      next.splice(insertAt, 0, dragged);
+      setOrder(next);
+    },
+    [order, setOrder],
+  );
+
+  const resetOrder = useCallback(() => setOrder(DEFAULT_COLUMN_ORDER), [setOrder]);
+
+  return { columnOrder: order, moveColumn, resetOrder };
+}
diff --git a/cardinal/src/hooks/useDataLoader.ts b/cardinal/src/hooks/useDataLoader.ts
index 2b2b19ec..2871c4bf 100644
--- a/cardinal/src/hooks/useDataLoader.ts
+++ b/cardinal/src/hooks/useDataLoader.ts
@@ -15,11 +15,17 @@ const fromNodeInfo = (node: NodeInfoResponse): SearchResultItem => ({
   mtime: node.mtime ?? node.metadata?.mtime,
   ctime: node.ctime ?? node.metadata?.ctime,
   icon: node.icon ?? undefined,
+  contentContext: node.contentContext ?? undefined,
 });
 
 // Data-only loader for visible rows. It owns row metadata caching and stale-request rejection;
 // VirtualList handles any temporary frozen-view rendering during result-set swaps.
-export function useDataLoader(results: SlabIndex[], dataResultsVersion: number) {
+export function useDataLoader(
+  results: SlabIndex[],
+  dataResultsVersion: number,
+  contentTerms: readonly string[] = [],
+  caseInsensitive = false,
+) {
   const loadingRef = useRef<Set<SlabIndex>>(new Set());
   // Monotonic epoch for range-load requests. A new search result-set bumps this value so
   // late `get_nodes_info` responses from the previous result-set can be ignored safely.
@@ -32,7 +38,11 @@ export function useDataLoader(results: SlabIndex[], dataResultsVersion: number)
     return initial;
   });
   const resultsRef = useRef<SlabIndex[]>([]);
+  const contentTermsRef = useRef<readonly string[]>([]);
+  const caseInsensitiveRef = useRef(caseInsensitive);
   resultsRef.current = results;
+  contentTermsRef.current = contentTerms;
+  caseInsensitiveRef.current = caseInsensitive;
 
   // Reset cache state whenever the backing result-set changes so slab-index reuse in the
   // backend cannot surface stale row data for a newer search result-set.
@@ -102,7 +112,11 @@ export function useDataLoader(results: SlabIndex[], dataResultsVersion: number)
       }
       if (needLoading.length === 0) return;
       const versionAtRequest = versionRef.current;
-      const fetched = await invoke<NodeInfoResponse[]>('get_nodes_info', { results: needLoading });
+      const fetched = await invoke<NodeInfoResponse[]>('get_nodes_info', {
+        results: needLoading,
+        contentTerms: contentTermsRef.current,
+        caseInsensitive: caseInsensitiveRef.current,
+      });
       if (versionRef.current !== versionAtRequest) {
         // The result-set changed while this request was in flight. Drop the payload instead of
         // merging stale rows into the cache for the new query.
diff --git a/cardinal/src/hooks/useFileSearch.ts b/cardinal/src/hooks/useFileSearch.ts
index e9edf73f..68abd82b 100644
--- a/cardinal/src/hooks/useFileSearch.ts
+++ b/cardinal/src/hooks/useFileSearch.ts
@@ -20,6 +20,7 @@ type SearchState = {
   currentQuery: string;
   currentDirectoryQuery: string;
   highlightTerms: string[];
+  contentTerms: string[];
   showLoadingUI: boolean;
   initialFetchCompleted: boolean;
   durationMs: number | null;
@@ -58,6 +59,7 @@ type SearchAction =
         duration: number;
         count: number;
         highlightTerms: string[];
+        contentTerms: string[];
       };
     }
   | {
@@ -79,6 +81,7 @@ const initialSearchState: SearchState = {
   currentQuery: '',
   currentDirectoryQuery: '',
   highlightTerms: [],
+  contentTerms: [],
   showLoadingUI: false,
   initialFetchCompleted: false,
   durationMs: null,
@@ -152,6 +155,7 @@ function reducer(state: SearchState, action: SearchAction): SearchState {
         currentQuery: action.payload.query,
         currentDirectoryQuery: action.payload.directoryQuery,
         highlightTerms: action.payload.highlightTerms,
+        contentTerms: action.payload.contentTerms,
         showLoadingUI: false,
         initialFetchCompleted: true,
         durationMs: action.payload.duration,
@@ -167,6 +171,7 @@ function reducer(state: SearchState, action: SearchAction): SearchState {
         durationMs: action.payload.duration,
         resultCount: 0,
         highlightTerms: [],
+        contentTerms: [],
       };
     case 'SEARCH_CANCELLED':
       return {
@@ -313,9 +318,12 @@ export function useFileSearch(): UseFileSearchResult {
       }
 
       const searchResults = rawResults.results as SlabIndex[];
-      const highlightTerms = Array.isArray(rawResults.highlights)
-        ? rawResults.highlights.filter((term): term is string => typeof term === 'string')
-        : [];
+      const stringTerms = (value: unknown): string[] =>
+        Array.isArray(value)
+          ? value.filter((term): term is string => typeof term === 'string')
+          : [];
+      const highlightTerms = stringTerms(rawResults.highlights);
+      const contentTerms = stringTerms(rawResults.contentTerms);
 
       cancelTimer(loadingDelayTimerRef);
 
@@ -331,6 +339,7 @@ export function useFileSearch(): UseFileSearchResult {
           duration,
           count: searchResults.length,
           highlightTerms,
+          contentTerms,
         },
       });
     } catch (error) {
diff --git a/cardinal/src/i18n/resources/ar-SA.json b/cardinal/src/i18n/resources/ar-SA.json
index 39ba76ab..09d1572b 100644
--- a/cardinal/src/i18n/resources/ar-SA.json
+++ b/cardinal/src/i18n/resources/ar-SA.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "ابحث عن الملفات والمجلدات...",
       "events": "رشّح الأحداث حسب المسار أو الاسم...",
-      "directory": "نطاق المجلد..."
+      "directory": "البحث في… (القرص بالكامل)"
     },
     "options": {
       "caseSensitive": "تفعيل/إيقاف حساسية حالة الأحرف",
-      "directoryScope": "تبديل نطاق المجلد"
+      "directoryScope": "تبديل البحث في المجلد"
+    },
+    "fileType": {
+      "label": "نوع الملف",
+      "custom": "مخصص",
+      "all": "كل الأنواع",
+      "image": "صورة",
+      "video": "فيديو",
+      "audio": "صوت",
+      "email": "بريد",
+      "archive": "أرشيف",
+      "code": "شيفرة",
+      "app": "تطبيق",
+      "folder": "مجلد",
+      "document": "مستند"
     },
     "aria": {
       "searchInput": "إدخال البحث"
+    },
+    "directory": {
+      "browse": "اختيار مجلد",
+      "close": "إغلاق"
+    },
+    "content": {
+      "label": "يحتوي على",
+      "hint": "نص بالداخل",
+      "custom": "محدد في شريط البحث"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "خطأ في البحث",
     "emptyTitle": "لا نتائج لـ \"{{query}}\"",
     "emptyMessage": "جرّب تعديل الكلمات المفتاحية أو عوامل التصفية.",
-    "emptyTitleWithDirectory": "لا نتائج لـ \"{{query}}\" ضمن نطاق المجلد \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "لا توجد نتائج لـ \"{{query}}\" في \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "اسم الملف",
     "path": "المسار",
     "size": "الحجم",
     "modified": "تاريخ التعديل",
-    "created": "تاريخ الإنشاء"
+    "created": "تاريخ الإنشاء",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "تم تعطيل الفرز. كثرة النتائج ({{limit}}+) قد تؤثر على الأداء. يمكنك تعديل العتبة في التفضيلات."
diff --git a/cardinal/src/i18n/resources/de-DE.json b/cardinal/src/i18n/resources/de-DE.json
index 69b594f7..2f20c4bf 100644
--- a/cardinal/src/i18n/resources/de-DE.json
+++ b/cardinal/src/i18n/resources/de-DE.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Nach Dateien und Ordnern suchen...",
       "events": "Ereignisse nach Pfad oder Name filtern...",
-      "directory": "Ordnerbereich..."
+      "directory": "Suchen in… (ganze Festplatte)"
     },
     "options": {
       "caseSensitive": "Groß-/Kleinschreibung beachten",
-      "directoryScope": "Ordnerbereich umschalten"
+      "directoryScope": "Suche im Ordner umschalten"
+    },
+    "fileType": {
+      "label": "Dateityp",
+      "custom": "Benutzerdefiniert",
+      "all": "Alle Typen",
+      "image": "Bild",
+      "video": "Video",
+      "audio": "Audio",
+      "email": "E-Mail",
+      "archive": "Archiv",
+      "code": "Code",
+      "app": "App",
+      "folder": "Ordner",
+      "document": "Dokument"
     },
     "aria": {
       "searchInput": "Sucheingabe"
+    },
+    "directory": {
+      "browse": "Ordner auswählen",
+      "close": "Schließen"
+    },
+    "content": {
+      "label": "Enthält",
+      "hint": "Text darin",
+      "custom": "in der Suchleiste festgelegt"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Suchfehler",
     "emptyTitle": "Keine Ergebnisse für \"{{query}}\"",
     "emptyMessage": "Passe deine Suchbegriffe oder Filter an.",
-    "emptyTitleWithDirectory": "Keine Ergebnisse für \"{{query}}\" im Ordnerbereich \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "Keine Ergebnisse für \"{{query}}\" in \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Dateiname",
     "path": "Pfad",
     "size": "Größe",
     "modified": "Geändert",
-    "created": "Erstellt"
+    "created": "Erstellt",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "Sortieren ist deaktiviert. Zu viele Ergebnisse ({{limit}}+) können die Leistung beeinträchtigen. Sie können den Schwellenwert in den Einstellungen anpassen."
diff --git a/cardinal/src/i18n/resources/en-US.json b/cardinal/src/i18n/resources/en-US.json
index 1a41e567..6dd3b580 100644
--- a/cardinal/src/i18n/resources/en-US.json
+++ b/cardinal/src/i18n/resources/en-US.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Search for files and folders...",
       "events": "Filter events by path or name...",
-      "directory": "Folder scope..."
+      "directory": "Search in… (whole disk)"
     },
     "options": {
       "caseSensitive": "Toggle case-sensitive matching",
-      "directoryScope": "Toggle folder scope"
+      "directoryScope": "Toggle search in folder"
+    },
+    "fileType": {
+      "label": "File type",
+      "custom": "Custom",
+      "all": "All types",
+      "image": "Image",
+      "video": "Video",
+      "audio": "Audio",
+      "email": "Email",
+      "archive": "Archive",
+      "code": "Code",
+      "app": "App",
+      "folder": "Folder",
+      "document": "Document"
     },
     "aria": {
       "searchInput": "Search input"
+    },
+    "directory": {
+      "browse": "Browse for a folder",
+      "close": "Close"
+    },
+    "content": {
+      "label": "Contains",
+      "hint": "text inside",
+      "custom": "set in the search bar"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Search Error",
     "emptyTitle": "No results for \"{{query}}\"",
     "emptyMessage": "Try adjusting your keywords or filters.",
-    "emptyTitleWithDirectory": "No results for \"{{query}}\" in folder scope \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "No results for \"{{query}}\" in \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Filename",
     "path": "Path",
     "size": "Size",
     "modified": "Modified",
-    "created": "Created"
+    "created": "Created",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "Sorting is disabled. Too many results ({{limit}}+) may impact performance. You can adjust the threshold in Preferences."
diff --git a/cardinal/src/i18n/resources/es-ES.json b/cardinal/src/i18n/resources/es-ES.json
index 2677c5e3..cd25b02e 100644
--- a/cardinal/src/i18n/resources/es-ES.json
+++ b/cardinal/src/i18n/resources/es-ES.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Buscar archivos y carpetas...",
       "events": "Filtrar eventos por ruta o nombre...",
-      "directory": "Ámbito de carpeta..."
+      "directory": "Buscar en… (todo el disco)"
     },
     "options": {
       "caseSensitive": "Activar coincidencia sensible a mayúsculas",
-      "directoryScope": "Alternar ámbito de carpeta"
+      "directoryScope": "Alternar buscar en carpeta"
+    },
+    "fileType": {
+      "label": "Tipo de archivo",
+      "custom": "Personalizado",
+      "all": "Todos los tipos",
+      "image": "Imagen",
+      "video": "Video",
+      "audio": "Audio",
+      "email": "Email",
+      "archive": "Comprimido",
+      "code": "Código",
+      "app": "Aplicación",
+      "folder": "Carpeta",
+      "document": "Documento"
     },
     "aria": {
       "searchInput": "Entrada de búsqueda"
+    },
+    "directory": {
+      "browse": "Elegir una carpeta",
+      "close": "Cerrar"
+    },
+    "content": {
+      "label": "Contiene",
+      "hint": "texto dentro",
+      "custom": "definido en la barra de búsqueda"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Error de búsqueda",
     "emptyTitle": "Sin resultados para \"{{query}}\"",
     "emptyMessage": "Prueba ajustando tus palabras clave o filtros.",
-    "emptyTitleWithDirectory": "Sin resultados para \"{{query}}\" en el ámbito de carpeta \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "Sin resultados para \"{{query}}\" en \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Nombre de archivo",
     "path": "Ruta",
     "size": "Tamaño",
     "modified": "Modificado",
-    "created": "Creado"
+    "created": "Creado",
+    "context": "Contexto"
   },
   "sorting": {
     "disabled": "La ordenación está deshabilitada. Demasiados resultados ({{limit}}+) pueden afectar el rendimiento. Puede ajustar el umbral en Preferencias."
diff --git a/cardinal/src/i18n/resources/fr-FR.json b/cardinal/src/i18n/resources/fr-FR.json
index a305099a..849d0048 100644
--- a/cardinal/src/i18n/resources/fr-FR.json
+++ b/cardinal/src/i18n/resources/fr-FR.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Rechercher des fichiers et des dossiers...",
       "events": "Filtrer les événements par chemin ou nom...",
-      "directory": "Portée du dossier..."
+      "directory": "Rechercher dans… (tout le disque)"
     },
     "options": {
       "caseSensitive": "Activer la correspondance sensible à la casse",
-      "directoryScope": "Afficher la portée du dossier"
+      "directoryScope": "Activer la recherche dans un dossier"
+    },
+    "fileType": {
+      "label": "Type de fichier",
+      "custom": "Personnalisé",
+      "all": "Tous les types",
+      "image": "Image",
+      "video": "Vidéo",
+      "audio": "Audio",
+      "email": "E-mail",
+      "archive": "Archive",
+      "code": "Code",
+      "app": "Application",
+      "folder": "Dossier",
+      "document": "Document"
     },
     "aria": {
       "searchInput": "Entrée de recherche"
+    },
+    "directory": {
+      "browse": "Choisir un dossier",
+      "close": "Fermer"
+    },
+    "content": {
+      "label": "Contient",
+      "hint": "texte dedans",
+      "custom": "défini dans la barre de recherche"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Erreur de recherche",
     "emptyTitle": "Aucun résultat pour \"{{query}}\"",
     "emptyMessage": "Essayez d'ajuster vos mots-clés ou filtres.",
-    "emptyTitleWithDirectory": "Aucun résultat pour \"{{query}}\" dans la portée de dossier \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "Aucun résultat pour \"{{query}}\" dans \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Nom de fichier",
     "path": "Chemin",
     "size": "Taille",
     "modified": "Modifié",
-    "created": "Créé"
+    "created": "Créé",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "Le tri est désactivé. Trop de résultats ({{limit}}+) peuvent affecter les performances. Vous pouvez ajuster le seuil dans les Préférences."
diff --git a/cardinal/src/i18n/resources/hi-IN.json b/cardinal/src/i18n/resources/hi-IN.json
index 839fca43..961dfca5 100644
--- a/cardinal/src/i18n/resources/hi-IN.json
+++ b/cardinal/src/i18n/resources/hi-IN.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "फ़ाइलों और फ़ोल्डरों में खोजें...",
       "events": "पथ या नाम से ईवेंट फ़िल्टर करें...",
-      "directory": "फ़ोल्डर स्कोप..."
+      "directory": "इसमें खोजें… (पूरी डिस्क)"
     },
     "options": {
       "caseSensitive": "केस-सेंसिटिव मिलान टॉगल करें",
-      "directoryScope": "फ़ोल्डर स्कोप टॉगल करें"
+      "directoryScope": "फ़ोल्डर में खोज टॉगल करें"
+    },
+    "fileType": {
+      "label": "फ़ाइल प्रकार",
+      "custom": "कस्टम",
+      "all": "सभी प्रकार",
+      "image": "छवि",
+      "video": "वीडियो",
+      "audio": "ऑडियो",
+      "email": "ईमेल",
+      "archive": "संग्रह",
+      "code": "कोड",
+      "app": "ऐप",
+      "folder": "फ़ोल्डर",
+      "document": "दस्तावेज़"
     },
     "aria": {
       "searchInput": "खोज इनपुट"
+    },
+    "directory": {
+      "browse": "फ़ोल्डर चुनें",
+      "close": "बंद करें"
+    },
+    "content": {
+      "label": "इसमें है",
+      "hint": "अंदर का पाठ",
+      "custom": "खोज बार में सेट है"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "खोज त्रुटि",
     "emptyTitle": "\"{{query}}\" के लिए कोई परिणाम नहीं",
     "emptyMessage": "अपनी कुंजियाँ या फ़िल्टर बदलकर देखिए।",
-    "emptyTitleWithDirectory": "फ़ोल्डर स्कोप \"{{directoryQuery}}\" में \"{{query}}\" के लिए कोई परिणाम नहीं"
+    "emptyTitleWithDirectory": "\"{{directoryQuery}}\" में \"{{query}}\" के लिए कोई परिणाम नहीं"
   },
   "columns": {
     "filename": "फ़ाइल नाम",
     "path": "पथ",
     "size": "आकार",
     "modified": "संशोधित",
-    "created": "निर्मित"
+    "created": "निर्मित",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "सॉर्टिंग बंद है। बहुत अधिक परिणाम ({{limit}}+) प्रदर्शन को प्रभावित कर सकते हैं। आप सीमा को प्राथमिकताओं में बदल सकते हैं।"
diff --git a/cardinal/src/i18n/resources/it-IT.json b/cardinal/src/i18n/resources/it-IT.json
index a2075a30..87b3514f 100644
--- a/cardinal/src/i18n/resources/it-IT.json
+++ b/cardinal/src/i18n/resources/it-IT.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Cerca file e cartelle...",
       "events": "Filtra eventi per percorso o nome...",
-      "directory": "Ambito cartella..."
+      "directory": "Cerca in… (tutto il disco)"
     },
     "options": {
       "caseSensitive": "Attiva/disattiva distinzione tra maiuscole e minuscole",
-      "directoryScope": "Mostra ambito cartella"
+      "directoryScope": "Attiva ricerca nella cartella"
+    },
+    "fileType": {
+      "label": "Tipo di file",
+      "custom": "Personalizzato",
+      "all": "Tutti i tipi",
+      "image": "Immagine",
+      "video": "Video",
+      "audio": "Audio",
+      "email": "Email",
+      "archive": "Archivio",
+      "code": "Codice",
+      "app": "App",
+      "folder": "Cartella",
+      "document": "Documento"
     },
     "aria": {
       "searchInput": "Input di ricerca"
+    },
+    "directory": {
+      "browse": "Scegli una cartella",
+      "close": "Chiudi"
+    },
+    "content": {
+      "label": "Contiene",
+      "hint": "testo dentro",
+      "custom": "impostato nella barra di ricerca"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Errore di ricerca",
     "emptyTitle": "Nessun risultato per \"{{query}}\"",
     "emptyMessage": "Prova a modificare parole chiave o filtri.",
-    "emptyTitleWithDirectory": "Nessun risultato per \"{{query}}\" nell'ambito cartella \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "Nessun risultato per \"{{query}}\" in \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Nome file",
     "path": "Percorso",
     "size": "Dimensione",
     "modified": "Modificato",
-    "created": "Creato"
+    "created": "Creato",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "L'ordinamento è disattivato. Troppi risultati ({{limit}}+) potrebbero influire sulle prestazioni. Puoi regolare la soglia in Preferenze."
diff --git a/cardinal/src/i18n/resources/ja-JP.json b/cardinal/src/i18n/resources/ja-JP.json
index 8673c6a1..76899fc4 100644
--- a/cardinal/src/i18n/resources/ja-JP.json
+++ b/cardinal/src/i18n/resources/ja-JP.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "ファイルやフォルダを検索...",
       "events": "パスまたは名前でイベントを絞り込む...",
-      "directory": "フォルダ範囲..."
+      "directory": "検索する場所…（ディスク全体）"
     },
     "options": {
       "caseSensitive": "大文字と小文字を区別する",
-      "directoryScope": "フォルダ範囲を切り替え"
+      "directoryScope": "フォルダ内検索を切り替え"
+    },
+    "fileType": {
+      "label": "ファイルの種類",
+      "custom": "カスタム",
+      "all": "すべての種類",
+      "image": "画像",
+      "video": "動画",
+      "audio": "オーディオ",
+      "email": "メール",
+      "archive": "アーカイブ",
+      "code": "コード",
+      "app": "アプリ",
+      "folder": "フォルダ",
+      "document": "書類"
     },
     "aria": {
       "searchInput": "検索入力"
+    },
+    "directory": {
+      "browse": "フォルダを選択",
+      "close": "閉じる"
+    },
+    "content": {
+      "label": "内容",
+      "hint": "中のテキスト",
+      "custom": "検索バーで指定済み"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "検索エラー",
     "emptyTitle": "\"{{query}}\" に一致する結果がありません",
     "emptyMessage": "キーワードやフィルターを調整してください。",
-    "emptyTitleWithDirectory": "フォルダースコープ \"{{directoryQuery}}\" 内で \"{{query}}\" に一致する結果がありません"
+    "emptyTitleWithDirectory": "\"{{directoryQuery}}\" に \"{{query}}\" の結果はありません"
   },
   "columns": {
     "filename": "ファイル名",
     "path": "パス",
     "size": "サイズ",
     "modified": "更新日時",
-    "created": "作成日時"
+    "created": "作成日時",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "並べ替えは無効化されています。結果が多すぎる ({{limit}}+) とパフォーマンスに影響する可能性があります。環境設定でしきい値を調整できます。"
diff --git a/cardinal/src/i18n/resources/ko-KR.json b/cardinal/src/i18n/resources/ko-KR.json
index d4bd5bd0..0cecc587 100644
--- a/cardinal/src/i18n/resources/ko-KR.json
+++ b/cardinal/src/i18n/resources/ko-KR.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "파일과 폴더 검색...",
       "events": "경로 또는 이름으로 이벤트 필터링...",
-      "directory": "폴더 범위..."
+      "directory": "검색 위치… (디스크 전체)"
     },
     "options": {
       "caseSensitive": "대소문자 구분 검색 전환",
-      "directoryScope": "폴더 범위 전환"
+      "directoryScope": "폴더 내 검색 전환"
+    },
+    "fileType": {
+      "label": "파일 종류",
+      "custom": "사용자 지정",
+      "all": "모든 종류",
+      "image": "이미지",
+      "video": "비디오",
+      "audio": "오디오",
+      "email": "이메일",
+      "archive": "압축 파일",
+      "code": "코드",
+      "app": "앱",
+      "folder": "폴더",
+      "document": "문서"
     },
     "aria": {
       "searchInput": "검색 입력"
+    },
+    "directory": {
+      "browse": "폴더 선택",
+      "close": "닫기"
+    },
+    "content": {
+      "label": "포함",
+      "hint": "내부 텍스트",
+      "custom": "검색 창에서 설정됨"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "검색 오류",
     "emptyTitle": "\"{{query}}\"에 대한 결과가 없습니다",
     "emptyMessage": "키워드나 필터를 조정해 보세요.",
-    "emptyTitleWithDirectory": "폴더 범위 \"{{directoryQuery}}\"에서 \"{{query}}\"에 대한 결과가 없습니다"
+    "emptyTitleWithDirectory": "\"{{directoryQuery}}\"에서 \"{{query}}\" 결과가 없습니다"
   },
   "columns": {
     "filename": "파일 이름",
     "path": "경로",
     "size": "크기",
     "modified": "수정됨",
-    "created": "생성됨"
+    "created": "생성됨",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "정렬이 비활성화되었습니다. 결과가 너무 많으면 ({{limit}}+) 성능에 영향을 줄 수 있습니다. 환경설정에서 임계값을 조정할 수 있습니다."
diff --git a/cardinal/src/i18n/resources/pt-BR.json b/cardinal/src/i18n/resources/pt-BR.json
index 68c69549..8e4aba0f 100644
--- a/cardinal/src/i18n/resources/pt-BR.json
+++ b/cardinal/src/i18n/resources/pt-BR.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Buscar por arquivos e pastas...",
       "events": "Filtrar eventos por caminho ou nome...",
-      "directory": "Escopo de pasta..."
+      "directory": "Buscar em… (todo o disco)"
     },
     "options": {
       "caseSensitive": "Alternar correspondência sensível a maiúsculas",
-      "directoryScope": "Alternar escopo de pasta"
+      "directoryScope": "Alternar buscar na pasta"
+    },
+    "fileType": {
+      "label": "Tipo de arquivo",
+      "custom": "Personalizado",
+      "all": "Todos os tipos",
+      "image": "Imagem",
+      "video": "Vídeo",
+      "audio": "Áudio",
+      "email": "E-mail",
+      "archive": "Compactado",
+      "code": "Código",
+      "app": "Aplicativo",
+      "folder": "Pasta",
+      "document": "Documento"
     },
     "aria": {
       "searchInput": "Entrada de pesquisa"
+    },
+    "directory": {
+      "browse": "Escolher uma pasta",
+      "close": "Fechar"
+    },
+    "content": {
+      "label": "Contém",
+      "hint": "texto dentro",
+      "custom": "definido na barra de busca"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Erro na busca",
     "emptyTitle": "Nenhum resultado para \"{{query}}\"",
     "emptyMessage": "Tente ajustar suas palavras-chave ou filtros.",
-    "emptyTitleWithDirectory": "Nenhum resultado para \"{{query}}\" no escopo de pasta \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "Sem resultados para \"{{query}}\" em \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Nome do arquivo",
     "path": "Caminho",
     "size": "Tamanho",
     "modified": "Modificado",
-    "created": "Criado"
+    "created": "Criado",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "A ordenação está desativada. Muitos resultados ({{limit}}+) podem afetar o desempenho. Ajuste o limite em Preferências."
diff --git a/cardinal/src/i18n/resources/ru-RU.json b/cardinal/src/i18n/resources/ru-RU.json
index 527fdb48..577b916d 100644
--- a/cardinal/src/i18n/resources/ru-RU.json
+++ b/cardinal/src/i18n/resources/ru-RU.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Поиск файлов и папок...",
       "events": "Фильтруйте события по пути или имени...",
-      "directory": "Область папок..."
+      "directory": "Искать в… (весь диск)"
     },
     "options": {
       "caseSensitive": "Включить учет регистра",
-      "directoryScope": "Переключить область папок"
+      "directoryScope": "Переключить поиск в папке"
+    },
+    "fileType": {
+      "label": "Тип файла",
+      "custom": "Другое",
+      "all": "Все типы",
+      "image": "Изображение",
+      "video": "Видео",
+      "audio": "Аудио",
+      "email": "Письмо",
+      "archive": "Архив",
+      "code": "Код",
+      "app": "Программа",
+      "folder": "Папка",
+      "document": "Документ"
     },
     "aria": {
       "searchInput": "Поле поиска"
+    },
+    "directory": {
+      "browse": "Выбрать папку",
+      "close": "Закрыть"
+    },
+    "content": {
+      "label": "Содержит",
+      "hint": "текст внутри",
+      "custom": "задано в строке поиска"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Ошибка поиска",
     "emptyTitle": "Нет результатов для \"{{query}}\"",
     "emptyMessage": "Попробуйте изменить ключевые слова или фильтры.",
-    "emptyTitleWithDirectory": "Нет результатов для \"{{query}}\" в области папки \"{{directoryQuery}}\""
+    "emptyTitleWithDirectory": "Нет результатов для \"{{query}}\" в \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Имя файла",
     "path": "Путь",
     "size": "Размер",
     "modified": "Изменено",
-    "created": "Создано"
+    "created": "Создано",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "Сортировка отключена. Слишком много результатов ({{limit}}+) может повлиять на производительность. Вы можете изменить порог в Настройках."
diff --git a/cardinal/src/i18n/resources/tr-TR.json b/cardinal/src/i18n/resources/tr-TR.json
index 461976ed..3705d35f 100644
--- a/cardinal/src/i18n/resources/tr-TR.json
+++ b/cardinal/src/i18n/resources/tr-TR.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Dosya ve klasör arayın...",
       "events": "Olayları yol veya ada göre filtreleyin...",
-      "directory": "Klasör kapsamı..."
+      "directory": "Şurada ara… (tüm disk)"
     },
     "options": {
       "caseSensitive": "Büyük/küçük harfe duyarlı eşleşmeyi değiştir",
-      "directoryScope": "Klasör kapsamını değiştir"
+      "directoryScope": "Klasörde aramayı aç/kapat"
+    },
+    "fileType": {
+      "label": "Dosya türü",
+      "custom": "Özel",
+      "all": "Tüm türler",
+      "image": "Görsel",
+      "video": "Video",
+      "audio": "Ses",
+      "email": "E-posta",
+      "archive": "Arşiv",
+      "code": "Kod",
+      "app": "Uygulama",
+      "folder": "Klasör",
+      "document": "Belge"
     },
     "aria": {
       "searchInput": "Arama girişi"
+    },
+    "directory": {
+      "browse": "Klasör seç",
+      "close": "Kapat"
+    },
+    "content": {
+      "label": "İçerir",
+      "hint": "içindeki metin",
+      "custom": "arama çubuğunda ayarlandı"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Arama hatası",
     "emptyTitle": "\"{{query}}\" için sonuç yok",
     "emptyMessage": "Anahtar kelimeleri veya filtreleri değiştirmeyi deneyin.",
-    "emptyTitleWithDirectory": "\"{{directoryQuery}}\" klasör kapsamında \"{{query}}\" için sonuç yok"
+    "emptyTitleWithDirectory": "\"{{directoryQuery}}\" içinde \"{{query}}\" için sonuç yok"
   },
   "columns": {
     "filename": "Dosya adı",
     "path": "Yol",
     "size": "Boyut",
     "modified": "Değiştirildi",
-    "created": "Oluşturuldu"
+    "created": "Oluşturuldu",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "Sıralama devre dışı. Çok fazla sonuç ({{limit}}+) performansı etkileyebilir. Eşiği Tercihler'de ayarlayabilirsiniz."
diff --git a/cardinal/src/i18n/resources/uk-UA.json b/cardinal/src/i18n/resources/uk-UA.json
index 2a78a132..67885eed 100644
--- a/cardinal/src/i18n/resources/uk-UA.json
+++ b/cardinal/src/i18n/resources/uk-UA.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "Пошук файлів і папок...",
       "events": "Фільтруйте події за шляхом чи назвою...",
-      "directory": "Область папок..."
+      "directory": "Шукати в… (весь диск)"
     },
     "options": {
       "caseSensitive": "Перемкнути врахування регістру",
-      "directoryScope": "Перемкнути область папок"
+      "directoryScope": "Перемкнути пошук у теці"
+    },
+    "fileType": {
+      "label": "Тип файлу",
+      "custom": "Інше",
+      "all": "Усі типи",
+      "image": "Зображення",
+      "video": "Відео",
+      "audio": "Аудіо",
+      "email": "Лист",
+      "archive": "Архів",
+      "code": "Код",
+      "app": "Програма",
+      "folder": "Тека",
+      "document": "Документ"
     },
     "aria": {
       "searchInput": "Поле пошуку"
+    },
+    "directory": {
+      "browse": "Вибрати теку",
+      "close": "Закрити"
+    },
+    "content": {
+      "label": "Містить",
+      "hint": "текст усередині",
+      "custom": "задано в рядку пошуку"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "Помилка пошуку",
     "emptyTitle": "Немає результатів для «{{query}}»",
     "emptyMessage": "Спробуйте змінити ключові слова чи фільтри.",
-    "emptyTitleWithDirectory": "Немає результатів для «{{query}}» в області папки «{{directoryQuery}}»"
+    "emptyTitleWithDirectory": "Немає результатів для \"{{query}}\" у \"{{directoryQuery}}\""
   },
   "columns": {
     "filename": "Назва файла",
     "path": "Шлях",
     "size": "Розмір",
     "modified": "Змінено",
-    "created": "Створено"
+    "created": "Створено",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "Сортування вимкнено. Забагато результатів ({{limit}}+) може вплинути на продуктивність. Ви можете змінити поріг у Налаштуваннях."
diff --git a/cardinal/src/i18n/resources/zh-CN.json b/cardinal/src/i18n/resources/zh-CN.json
index 74eace44..de07aa43 100644
--- a/cardinal/src/i18n/resources/zh-CN.json
+++ b/cardinal/src/i18n/resources/zh-CN.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "搜索文件和文件夹…",
       "events": "按路径或名称筛选事件…",
-      "directory": "限定文件夹范围…"
+      "directory": "在此处搜索…（整个磁盘）"
     },
     "options": {
       "caseSensitive": "切换区分大小写匹配",
-      "directoryScope": "切换文件夹范围"
+      "directoryScope": "切换在文件夹中搜索"
+    },
+    "fileType": {
+      "label": "文件类型",
+      "custom": "自定义",
+      "all": "所有类型",
+      "image": "图片",
+      "video": "视频",
+      "audio": "音频",
+      "email": "邮件",
+      "archive": "压缩包",
+      "code": "代码",
+      "app": "应用",
+      "folder": "文件夹",
+      "document": "文档"
     },
     "aria": {
       "searchInput": "搜索输入"
+    },
+    "directory": {
+      "browse": "选择文件夹",
+      "close": "关闭"
+    },
+    "content": {
+      "label": "包含",
+      "hint": "文件内文本",
+      "custom": "已在搜索栏中设置"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "搜索出现错误",
     "emptyTitle": "\"{{query}}\" 没有匹配结果",
     "emptyMessage": "尝试调整关键字或筛选条件。",
-    "emptyTitleWithDirectory": "在文件夹范围 \"{{directoryQuery}}\" 中没有找到 \"{{query}}\""
+    "emptyTitleWithDirectory": "在 \"{{directoryQuery}}\" 中没有 \"{{query}}\" 的结果"
   },
   "columns": {
     "filename": "文件名",
     "path": "路径",
     "size": "大小",
     "modified": "修改时间",
-    "created": "创建时间"
+    "created": "创建时间",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "排序已禁用。结果超过 {{limit}} 个可能影响性能。您可以在偏好设置中调整阈值。"
diff --git a/cardinal/src/i18n/resources/zh-TW.json b/cardinal/src/i18n/resources/zh-TW.json
index ea865ce3..4e5f0947 100644
--- a/cardinal/src/i18n/resources/zh-TW.json
+++ b/cardinal/src/i18n/resources/zh-TW.json
@@ -3,14 +3,37 @@
     "placeholder": {
       "files": "搜尋檔案和資料夾…",
       "events": "依路徑或名稱篩選事件…",
-      "directory": "限定資料夾範圍…"
+      "directory": "在此處搜尋…（整個磁碟）"
     },
     "options": {
       "caseSensitive": "切換區分大小寫比對",
-      "directoryScope": "切換資料夾範圍"
+      "directoryScope": "切換在資料夾中搜尋"
+    },
+    "fileType": {
+      "label": "檔案類型",
+      "custom": "自訂",
+      "all": "所有類型",
+      "image": "圖片",
+      "video": "影片",
+      "audio": "音訊",
+      "email": "郵件",
+      "archive": "壓縮檔",
+      "code": "程式碼",
+      "app": "應用程式",
+      "folder": "資料夾",
+      "document": "文件"
     },
     "aria": {
       "searchInput": "搜尋輸入"
+    },
+    "directory": {
+      "browse": "選擇資料夾",
+      "close": "關閉"
+    },
+    "content": {
+      "label": "包含",
+      "hint": "檔案內文字",
+      "custom": "已在搜尋列中設定"
     }
   },
   "stateDisplay": {
@@ -18,14 +41,15 @@
     "error": "搜尋發生錯誤",
     "emptyTitle": "「{{query}}」沒有符合結果",
     "emptyMessage": "試著調整關鍵字或篩選條件。",
-    "emptyTitleWithDirectory": "在資料夾範圍「{{directoryQuery}}」中沒有找到「{{query}}」"
+    "emptyTitleWithDirectory": "在 \"{{directoryQuery}}\" 中沒有 \"{{query}}\" 的結果"
   },
   "columns": {
     "filename": "檔名",
     "path": "路徑",
     "size": "大小",
     "modified": "修改時間",
-    "created": "建立時間"
+    "created": "建立時間",
+    "context": "Context"
   },
   "sorting": {
     "disabled": "排序已停用。結果超過 {{limit}} 個可能影響效能。你可以在偏好設定中調整門檻。"
diff --git a/cardinal/src/types/ipc.ts b/cardinal/src/types/ipc.ts
index b25c391c..20c03da8 100644
--- a/cardinal/src/types/ipc.ts
+++ b/cardinal/src/types/ipc.ts
@@ -33,5 +33,6 @@ export enum SearchStatusCode {
 export type SearchResponsePayload = {
   results: number[];
   highlights?: string[];
+  contentTerms?: string[];
   statusCode: SearchStatusCode;
 };
diff --git a/cardinal/src/types/search.ts b/cardinal/src/types/search.ts
index 3b3d3a7e..7867cc76 100644
--- a/cardinal/src/types/search.ts
+++ b/cardinal/src/types/search.ts
@@ -12,6 +12,7 @@ export type SearchResultItem = Readonly<{
   mtime?: number;
   ctime?: number;
   icon?: string;
+  contentContext?: string;
 }>;
 
 export type NodeInfoResponse = Readonly<{
@@ -21,4 +22,5 @@ export type NodeInfoResponse = Readonly<{
   size?: number | null;
   mtime?: number | null;
   ctime?: number | null;
+  contentContext?: string | null;
 }>;
diff --git a/cardinal/src/utils/__tests__/searchBarQuery.test.ts b/cardinal/src/utils/__tests__/searchBarQuery.test.ts
new file mode 100644
index 00000000..13340167
--- /dev/null
+++ b/cardinal/src/utils/__tests__/searchBarQuery.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from 'vitest';
+import {
+  CUSTOM,
+  readContentTerm,
+  readFileType,
+  setContentTerm,
+  setFileType,
+} from '../searchBarQuery';
+
+describe('file type', () => {
+  it('reads the token the dropdown writes', () => {
+    expect(readFileType('informe type:image')).toBe('image');
+    expect(readFileType('TYPE:IMAGE')).toBe('image');
+    expect(readFileType('informe')).toBe('');
+  });
+
+  it('round-trips the multi-group documents option', () => {
+    const query = setFileType('informe', 'document');
+    expect(query).toBe('informe (type:doc|type:pdf|type:presentation|type:spreadsheet)');
+    expect(readFileType(query)).toBe('document');
+  });
+
+  it('reports custom when it cannot represent the query faithfully', () => {
+    expect(readFileType('informe !type:image')).toBe(CUSTOM);
+    expect(readFileType('type:image type:video')).toBe(CUSTOM);
+    expect(readFileType('(type:image | *.png)')).toBe(CUSTOM);
+    expect(readFileType('type:unknownthing')).toBe(CUSTOM);
+  });
+
+  it('ignores a type: that is part of a quoted value, not a filter', () => {
+    expect(readFileType('content:"type:image"')).toBe('');
+  });
+
+  it('replaces its own token, including a hand-written bare alias', () => {
+    expect(setFileType('informe type:image', 'video')).toBe('informe type:video');
+    expect(setFileType('informe type:pdf', 'image')).toBe('informe type:image');
+    expect(setFileType('informe (type:doc|type:pdf|type:presentation|type:spreadsheet)', '')).toBe(
+      'informe',
+    );
+    expect(setFileType('', 'email')).toBe('type:email');
+  });
+
+  it('keeps tokens it did not write', () => {
+    expect(setFileType('!type:image informe', 'pdf' as never)).toBe('!type:image informe');
+  });
+});
+
+describe('contains', () => {
+  it('round-trips a phrase, spaces and all', () => {
+    const query = setContentTerm('informe', 'Bearer token');
+    expect(query).toBe('informe content:"Bearer token"');
+    expect(readContentTerm(query)).toBe('Bearer token');
+  });
+
+  it('keeps a trailing space, which the engine searches for', () => {
+    expect(readContentTerm('content:"Bearer "')).toBe('Bearer ');
+  });
+
+  it('escapes quotes so the token cannot be broken out of', () => {
+    const query = setContentTerm('', 'say "hi"');
+    expect(query).toBe('content:"say \\"hi\\""');
+    expect(readContentTerm(query)).toBe('say "hi"');
+  });
+
+  it('replaces rather than stacks, and clears on empty', () => {
+    expect(setContentTerm('a content:"one" b', 'two')).toBe('a b content:"two"');
+    expect(setContentTerm('a content:"one"', '   ')).toBe('a');
+  });
+
+  it('reports custom for a content filter it did not write', () => {
+    expect(readContentTerm('!content:"draft"')).toBe(CUSTOM);
+    expect(readContentTerm('content:"a" content:"b"')).toBe(CUSTOM);
+    expect(readContentTerm('informe')).toBe('');
+  });
+});
diff --git a/cardinal/src/utils/searchBarQuery.ts b/cardinal/src/utils/searchBarQuery.ts
new file mode 100644
index 00000000..5205147a
--- /dev/null
+++ b/cardinal/src/utils/searchBarQuery.ts
@@ -0,0 +1,144 @@
+// The search-bar controls (file type, "contains") edit the query text instead of holding filter
+// state of their own, so the search bar stays the single source of truth and the user sees the
+// syntax each control writes.
+//
+// Each control reads back only the token it authored. Anything it cannot represent faithfully — a
+// negated filter, two of them, one inside a boolean group — reads as CUSTOM so the control says
+// "custom" rather than lying about what the query does. This is deliberately not a query parser:
+// the real parsing lives in cardinal-syntax. In particular, the terms highlighted in a content
+// snippet still come from the backend, which parses the query for real; guessing them here is what
+// the deleted contentQuery.ts used to do, and it drifted from the engine on negation and quoting.
+
+export const CUSTOM = 'custom';
+
+/** Aliases of `lookup_type_group` (search-cache/src/query.rs) that a control may have written. */
+const KNOWN_TYPE_ALIASES = [
+  'image',
+  'video',
+  'audio',
+  'doc',
+  'pdf',
+  'presentation',
+  'spreadsheet',
+  'email',
+  'archive',
+  'code',
+  'app',
+  'folder',
+];
+
+/**
+ * One entry per dropdown row. `token` is written verbatim into the query, so what the user reads in
+ * the bar is exactly what the engine evaluates.
+ *
+ * "Documents" is an OR of four groups rather than a new engine category: widening `type:doc` there
+ * would silently change what `type:doc` means for everyone, including upstream's tests.
+ */
+export const FILE_TYPE_OPTIONS = [
+  { value: 'image', icon: '🖼️', token: 'type:image' },
+  { value: 'video', icon: '🎬', token: 'type:video' },
+  { value: 'audio', icon: '🎵', token: 'type:audio' },
+  {
+    value: 'document',
+    icon: '📄',
+    token: '(type:doc|type:pdf|type:presentation|type:spreadsheet)',
+  },
+  { value: 'email', icon: '✉️', token: 'type:email' },
+  { value: 'archive', icon: '🗜️', token: 'type:archive' },
+  { value: 'code', icon: '⌨️', token: 'type:code' },
+  { value: 'app', icon: '🚀', token: 'type:app' },
+  { value: 'folder', icon: '📁', token: 'type:folder' },
+] as const;
+
+export type FileTypeValue = (typeof FILE_TYPE_OPTIONS)[number]['value'];
+
+const escapeRegExp = (value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+/** Removes `token` where it stands as a whole term, leaving the surrounding query untouched. */
+const removeToken = (query: string, token: string): string =>
+  query.replace(new RegExp(`(^|\\s)${escapeRegExp(token)}(?=\\s|$)`, 'gi'), '$1');
+
+const collapse = (query: string) => query.replace(/\s+/g, ' ').trim();
+
+// This looks redundant next to the token matching below and is not. A token match
+// requires whitespace before `type:`, so `(type:image | *.png)` matched nothing and the dropdown
+// showed "All types" for a query that filters to images. Same for a negated `!type:`.
+const MENTIONS_TYPE = /(^|[\s(!])type:/i;
+const MENTIONS_CONTENT = /(^|[\s(!])content:/i;
+
+// ----- file type -----
+
+/**
+ * The type the dropdown should display: a `FileTypeValue`, `''` for "all types", or CUSTOM when the
+ * query filters by type in a way the dropdown cannot represent.
+ */
+export const readFileType = (query: string): FileTypeValue | '' | typeof CUSTOM => {
+  if (!MENTIONS_TYPE.test(query)) {
+    return '';
+  }
+  for (const option of FILE_TYPE_OPTIONS) {
+    const rest = removeToken(query, option.token);
+    // Removing this one token left nothing type-shaped behind, so it describes the whole query.
+    if (rest !== query && !MENTIONS_TYPE.test(rest)) {
+      return option.value;
+    }
+  }
+  return CUSTOM;
+};
+
+/** Query with its file-type filter set to `value`, or removed when `value` is empty. */
+export const setFileType = (query: string, value: FileTypeValue | ''): string => {
+  let base = query;
+  for (const option of FILE_TYPE_OPTIONS) {
+    base = removeToken(base, option.token);
+  }
+  // Also drop a hand-written bare alias, so picking a type never leaves two contradicting filters.
+  base = base.replace(
+    new RegExp(`(^|\\s)type:(${KNOWN_TYPE_ALIASES.join('|')})(?=\\s|$)`, 'gi'),
+    '$1',
+  );
+  base = collapse(base);
+
+  const token = FILE_TYPE_OPTIONS.find((option) => option.value === value)?.token;
+  if (!token) {
+    return base;
+  }
+  return base ? `${base} ${token}` : token;
+};
+
+// ----- contains (content:) -----
+
+// Always quoted, so a phrase with spaces round-trips and the reader below has one shape to match.
+const CONTENT_TOKEN = /(^|\s)content:"((?:[^"\\]|\\.)*)"(?=\s|$)/gi;
+
+/**
+ * The text the "contains" field should display: the searched phrase, `''` when the query has no
+ * content filter, or CUSTOM when it has one this field cannot represent (negated, grouped, or more
+ * than one).
+ */
+export const readContentTerm = (query: string): string | typeof CUSTOM => {
+  if (!MENTIONS_CONTENT.test(query)) {
+    return '';
+  }
+  const matches = [...query.matchAll(CONTENT_TOKEN)];
+  if (matches.length !== 1) {
+    return CUSTOM;
+  }
+  const rest = query.replace(CONTENT_TOKEN, '$1');
+  if (MENTIONS_CONTENT.test(rest)) {
+    return CUSTOM;
+  }
+  return matches[0][2].replace(/\\(.)/g, '$1');
+};
+
+/** Query with its content filter set to `term`, or removed when `term` is empty. */
+export const setContentTerm = (query: string, term: string): string => {
+  const base = collapse(query.replace(CONTENT_TOKEN, '$1'));
+  const trimmed = term.trim();
+  if (!trimmed) {
+    return base;
+  }
+  const escaped = trimmed.replace(/(["\\])/g, '\\$1');
+  const token = `content:"${escaped}"`;
+  return base ? `${base} ${token}` : token;
+};
diff --git a/doc/pub/search-syntax.md b/doc/pub/search-syntax.md
index 011265a2..4d9a8ad9 100644
--- a/doc/pub/search-syntax.md
+++ b/doc/pub/search-syntax.md
@@ -168,6 +168,7 @@ These filters take an absolute path as their argument; a leading `~` is expanded
 - Presentations: `type:presentation`, `type:presentations`, `type:ppt`, `type:slides`
 - Spreadsheets: `type:spreadsheet`, `type:spreadsheets`, `type:xls`, `type:excel`, `type:sheet`, `type:sheets`
 - PDF: `type:pdf`
+- Email: `type:email`, `type:emails`, `type:mail`, `type:mails`, `type:message`, `type:messages` — covers `.eml`, `.emlx`, `.emlxpart` (Apple Mail), `.msg` (Outlook) and `.mbox`
 - Archives: `type:archive`, `type:archives`, `type:compressed`, `type:zip`
 - Code: `type:code`, `type:source`, `type:dev`
 - Executables: `type:exe`, `type:exec`, `type:executable`, `type:executables`, `type:program`, `type:programs`, `type:app`, `type:apps`
diff --git a/search-cache/src/cache.rs b/search-cache/src/cache.rs
index 6ef6cc8a..f3ddcb12 100644
--- a/search-cache/src/cache.rs
+++ b/search-cache/src/cache.rs
@@ -2982,6 +2982,44 @@ mod tests {
         assert!(nodes[0].path.ends_with("notes.txt"));
     }
 
+    #[test]
+    fn content_snippet_reads_context_across_chunks() {
+        let temp_dir = TempDir::new("content_snippet_reads_context_across_chunks").unwrap();
+        let path = temp_dir.path().join("large.log");
+
+        // Straddle a read boundary: the match starts one byte before the end of the first chunk,
+        // and its trailing context lives in the next one.
+        let mut payload = vec![b'a'; CONTENT_BUFFER_BYTES - 1];
+        payload.extend_from_slice(b"NeedLe tail text\n");
+        payload.extend(std::iter::repeat_n(b'z', 4096));
+        fs::write(&path, &payload).unwrap();
+
+        let snippet = crate::content_snippet(&path, "needle", true).unwrap();
+        assert!(snippet.starts_with('…'), "elided prefix: {snippet}");
+        assert!(snippet.ends_with('…'), "elided suffix: {snippet}");
+        assert!(
+            snippet.contains("NeedLe tail text"),
+            "original case: {snippet}"
+        );
+        assert!(!snippet.contains('\n'), "single row: {snippet}");
+
+        assert!(crate::content_snippet(&path, "needle", false).is_none());
+        assert!(crate::content_snippet(&path, "absent", true).is_none());
+    }
+
+    #[test]
+    fn content_snippet_marks_only_the_edges_it_cuts() {
+        let temp_dir = TempDir::new("content_snippet_marks_only_the_edges_it_cuts").unwrap();
+        let path = temp_dir.path().join("small.txt");
+        fs::write(&path, b"token here").unwrap();
+
+        // Whole file fits in the context window, so neither edge is elided.
+        assert_eq!(
+            crate::content_snippet(&path, "token", false).unwrap(),
+            "token here"
+        );
+    }
+
     #[test]
     fn content_filter_matches_across_chunks() {
         let temp_dir = TempDir::new("content_filter_matches_across_chunks").unwrap();
diff --git a/search-cache/src/highlight.rs b/search-cache/src/highlight.rs
index ca497f3a..202f9eef 100644
--- a/search-cache/src/highlight.rs
+++ b/search-cache/src/highlight.rs
@@ -1,5 +1,7 @@
-use crate::query_preprocessor::strip_query_quotes_text;
-use cardinal_syntax::{ArgumentKind, Expr, FilterArgument, Term};
+use crate::query_preprocessor::{
+    expand_query_home_dirs, strip_query_quotes, strip_query_quotes_text,
+};
+use cardinal_syntax::{ArgumentKind, Expr, FilterArgument, FilterKind, Term, parse_query};
 use query_segmentation::{Segment, query_segmentation};
 use std::collections::BTreeSet;
 
@@ -9,6 +11,46 @@ pub fn derive_highlight_terms(expr: &Expr) -> Vec<String> {
     collector.into_terms()
 }
 
+/// The `content:` arguments a query searches file bodies for, in query order, after the same
+/// preprocessing the search itself applies. Callers use these to show why a file matched.
+pub fn content_terms_of_query(line: &str) -> Vec<String> {
+    let Ok(parsed) = parse_query(line) else {
+        return Vec::new();
+    };
+    let query = strip_query_quotes(expand_query_home_dirs(parsed));
+    let mut terms = Vec::new();
+    collect_content_terms(&query.expr, &mut terms);
+    terms
+}
+
+fn collect_content_terms(expr: &Expr, terms: &mut Vec<String>) {
+    match expr {
+        // A negated branch matches files *lacking* the term, so it has no occurrence to point at.
+        Expr::Empty | Expr::Not(_) => {}
+        Expr::Term(Term::Filter(filter)) if matches!(filter.kind, FilterKind::Content) => {
+            // Verbatim, no `.trim()`. Trimming looks harmless and is wrong:
+            // `content:"Bearer "` searches for the trailing space, so a trimmed term stops
+            // matching what the engine matched and the snippet lookup finds nothing.
+            let Some(value) = filter
+                .argument
+                .as_ref()
+                .map(|argument| argument.raw.as_str())
+            else {
+                return;
+            };
+            if !value.is_empty() && !terms.iter().any(|term| term == value) {
+                terms.push(value.to_string());
+            }
+        }
+        Expr::Term(_) => {}
+        Expr::And(parts) | Expr::Or(parts) => {
+            for part in parts {
+                collect_content_terms(part, terms);
+            }
+        }
+    }
+}
+
 #[derive(Default)]
 struct HighlightCollector {
     terms: BTreeSet<String>,
@@ -2772,4 +2814,20 @@ mod tests {
         assert_eq!(terms[2], "mmm");
         assert_eq!(terms[3], "zzz");
     }
+
+    #[test]
+    fn content_terms_keep_query_order_and_skip_negated() {
+        assert_eq!(
+            content_terms_of_query(r#"*.md content:"Bearer " report content:token"#),
+            vec!["Bearer ", "token"]
+        );
+        // The file matched by *lacking* this term, so there is nothing to point at inside it.
+        assert!(content_terms_of_query("report !content:draft").is_empty());
+        assert!(content_terms_of_query("report").is_empty());
+        assert_eq!(
+            content_terms_of_query("content:dup content:dup").len(),
+            1,
+            "the same term twice is one snippet lookup"
+        );
+    }
 }
diff --git a/search-cache/src/lib.rs b/search-cache/src/lib.rs
index a426ce42..c20c8ca3 100644
--- a/search-cache/src/lib.rs
+++ b/search-cache/src/lib.rs
@@ -15,9 +15,11 @@ mod type_and_size;
 pub use cache::*;
 pub use file_nodes::*;
 pub use fswalk::WalkData;
+pub use highlight::content_terms_of_query;
 pub use metadata_cache::*;
 pub use name_index::*;
 pub use persistent::*;
+pub use query::content_snippet;
 pub use segment::*;
 pub use slab::*;
 pub use slab_node::*;
diff --git a/search-cache/src/query.rs b/search-cache/src/query.rs
index a2c16510..1b692101 100644
--- a/search-cache/src/query.rs
+++ b/search-cache/src/query.rs
@@ -1052,6 +1052,114 @@ impl SearchCache {
     }
 }
 
+/// Bytes of surrounding file text kept around a `content:` match.
+const SNIPPET_BEFORE_BYTES: usize = 24;
+const SNIPPET_AFTER_BYTES: usize = 160;
+
+/// One line of file text around the first occurrence of `term`, for showing *why* a `content:`
+/// search matched. Reads in the same chunks with the same finder as
+/// [`SearchCache::node_content_matches`], so a snippet is found wherever the filter found a match.
+//
+// No cancellation token: the caller hydrates visible rows only, over files the content filter
+// just read, so the pages are cached. Wire one in if snippets ever run ahead of the search.
+pub fn content_snippet(path: &Path, term: &str, case_insensitive: bool) -> Option<String> {
+    let needle = if case_insensitive {
+        term.to_ascii_lowercase().into_bytes()
+    } else {
+        term.as_bytes().to_vec()
+    };
+    if needle.is_empty() {
+        return None;
+    }
+
+    let mut file = File::open(path).ok()?;
+    let finder = rabinkarp::Finder::new(&needle);
+    // Carry enough of each chunk to catch a match split across reads *and* to keep the leading
+    // context of a match that lands at the start of the next one.
+    let overlap = needle.len().saturating_sub(1).max(SNIPPET_BEFORE_BYTES);
+    let mut buffer = vec![0u8; CONTENT_BUFFER_BYTES + overlap];
+    // The second buffer is not waste. `node_content_matches` right above folds the
+    // chunk in place, which is cheaper and is wrong here: the snippet is cut from these same bytes,
+    // so folding in place returns the matched line entirely in lowercase.
+    let mut folded = Vec::new();
+    let mut carry_len = 0usize;
+    let mut chunk_offset = 0usize;
+
+    loop {
+        let read = file.read(&mut buffer[carry_len..]).ok()?;
+        if read == 0 {
+            return None;
+        }
+        let chunk_len = carry_len + read;
+
+        let haystack = if case_insensitive {
+            folded.resize(chunk_len, 0);
+            folded[carry_len..].copy_from_slice(&buffer[carry_len..chunk_len]);
+            folded[carry_len..].make_ascii_lowercase();
+            &folded[..chunk_len]
+        } else {
+            &buffer[..chunk_len]
+        };
+
+        if let Some(at) = finder.find(haystack, &needle) {
+            return Some(snippet_at(
+                &mut file,
+                &buffer[..chunk_len],
+                at,
+                needle.len(),
+                chunk_offset,
+            ));
+        }
+
+        let keep = overlap.min(chunk_len);
+        buffer.copy_within(chunk_len - keep..chunk_len, 0);
+        if case_insensitive {
+            folded.copy_within(chunk_len - keep..chunk_len, 0);
+        }
+        chunk_offset += chunk_len - keep;
+        carry_len = keep;
+    }
+}
+
+/// `chunk_offset` is the file offset `chunk` starts at, which decides whether the snippet needs a
+/// leading ellipsis.
+fn snippet_at(
+    file: &mut File,
+    chunk: &[u8],
+    at: usize,
+    needle_len: usize,
+    chunk_offset: usize,
+) -> String {
+    let start = at.saturating_sub(SNIPPET_BEFORE_BYTES);
+    let wanted_end = at + needle_len + SNIPPET_AFTER_BYTES;
+    let end = wanted_end.min(chunk.len());
+    let mut bytes = chunk[start..end].to_vec();
+
+    let mut truncated = end < chunk.len();
+    if wanted_end > chunk.len() {
+        // The trailing context runs past what we read; the rest is the next bytes of the file.
+        let mut tail = vec![0u8; wanted_end - chunk.len()];
+        if let Ok(read) = file.read(&mut tail) {
+            bytes.extend_from_slice(&tail[..read]);
+            truncated = read == tail.len();
+        }
+    }
+
+    // Collapse newlines and runs of spaces so the snippet stays on one row, and drop the partial
+    // UTF-8 sequences that cutting on byte boundaries leaves at either edge.
+    let text = String::from_utf8_lossy(&bytes);
+    let compact = text
+        .split_whitespace()
+        .collect::<Vec<_>>()
+        .join(" ")
+        .trim_matches(char::REPLACEMENT_CHARACTER)
+        .to_string();
+
+    let prefix = if chunk_offset + start > 0 { "…" } else { "" };
+    let suffix = if truncated { "…" } else { "" };
+    format!("{prefix}{compact}{suffix}")
+}
+
 fn normalize_extensions(argument: &FilterArgument) -> HashSet<String> {
     let mut values = HashSet::new();
     match &argument.kind {
@@ -1124,6 +1232,9 @@ fn lookup_type_group(name: &str) -> Option<TypeFilterTarget> {
             Some(TypeFilterTarget::Extensions(SPREADSHEET_EXTENSIONS))
         }
         "pdf" => Some(TypeFilterTarget::Extensions(PDF_EXTENSIONS)),
+        "email" | "emails" | "mail" | "mails" | "message" | "messages" => {
+            Some(TypeFilterTarget::Extensions(EMAIL_EXTENSIONS))
+        }
         "archive" | "archives" | "compressed" | "zip" => {
             Some(TypeFilterTarget::Extensions(ARCHIVE_EXTENSIONS))
         }
@@ -1152,6 +1263,9 @@ const DOCUMENT_EXTENSIONS: &[&str] = &[
 const PRESENTATION_EXTENSIONS: &[&str] = &["ppt", "pptx", "key", "odp"];
 const SPREADSHEET_EXTENSIONS: &[&str] = &["xls", "xlsx", "csv", "numbers", "ods"];
 const PDF_EXTENSIONS: &[&str] = &["pdf"];
+// `emlx`/`emlxpart` are Apple Mail's on-disk format, the one nobody finds by name; `msg` is
+// Outlook, `mbox` a whole mailbox exported as one file.
+const EMAIL_EXTENSIONS: &[&str] = &["eml", "emlx", "emlxpart", "msg", "mbox"];
 const ARCHIVE_EXTENSIONS: &[&str] = &[
     "zip", "rar", "7z", "tar", "gz", "tgz", "bz2", "xz", "zst", "cab", "iso", "dmg",
 ];
diff --git a/search-cache/src/tests/type_filters.rs b/search-cache/src/tests/type_filters.rs
index 6ba977f8..9344c5ce 100644
--- a/search-cache/src/tests/type_filters.rs
+++ b/search-cache/src/tests/type_filters.rs
@@ -302,6 +302,23 @@ fn test_type_pdf_filter() {
     assert_eq!(pdfs.len(), 3);
 }
 
+#[test]
+fn test_type_email_and_aliases() {
+    let tmp = TempDir::new("type_email").unwrap();
+    fs::write(tmp.path().join("plain.eml"), b"x").unwrap();
+    fs::write(tmp.path().join("apple_mail.emlx"), b"x").unwrap();
+    fs::write(tmp.path().join("attachment.emlxpart"), b"x").unwrap();
+    fs::write(tmp.path().join("outlook.msg"), b"x").unwrap();
+    fs::write(tmp.path().join("mailbox.mbox"), b"x").unwrap();
+    fs::write(tmp.path().join("notes.txt"), b"x").unwrap();
+
+    let mut cache = SearchCache::walk_fs(tmp.path());
+
+    assert_eq!(cache.search("type:email").unwrap().len(), 5);
+    assert_eq!(cache.search("type:mail").unwrap().len(), 5);
+    assert_eq!(cache.search("type:emails").unwrap().len(), 5);
+}
+
 #[test]
 fn test_type_archive_comprehensive() {
     let tmp = TempDir::new("type_archive").unwrap();