added trash

updated photos gallery
version bump
2026-11-04 16:56:59 +01:00 · 2026-07-14 14:55:54 +02:00 · 2026-07-14 12:40:33 +02:00 · 2026-07-13 02:44:59 +02:00 · 2026-07-13 02:44:20 +02:00 · 2026-07-13 02:33:18 +02:00
26 changed files with 5291 additions and 1220 deletions
@@ -62,6 +62,7 @@ jobs:
          cp target/release/pdfs dist/binaries/
          cp target/release/pdfs-tray dist/binaries/
          cp target/release/pdfs-app dist/binaries/
+          cp target/release/pdfs-prompt dist/binaries/
          
          # Create tarball
          tar -czf proton-drive-linux-${{ env.VERSION }}-x86_64.tar.gz -C dist/binaries .
@@ -78,6 +79,7 @@ jobs:
          cp target/release/pdfs deb/usr/bin/
          cp target/release/pdfs-tray deb/usr/bin/
          cp target/release/pdfs-app deb/usr/bin/
+          cp target/release/pdfs-prompt deb/usr/bin/

          # Copy desktop integration files
          cp packaging/io.narl.proton-drive-linux.desktop deb/usr/share/applications/
@@ -101,7 +103,7 @@ jobs:
           Proton Drive client for Linux featuring:
           - FUSE files-on-demand mount
           - Command-line interface (CLI)
-           - GTK4 system tray and desktop application
+           - GTK4 system tray, desktop application, and search launcher
          EOF

          # Build Debian package
@@ -468,6 +468,16 @@ dependencies = [
 "cipher 0.5.2",
 ]

+[[package]]
+name = "bstr"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
+dependencies = [
+ "memchr",
+ "serde_core",
+]
+
 [[package]]
 name = "buffer-redux"
 version = "1.1.0"
@@ -804,6 +814,25 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0"

+[[package]]
+name = "crossbeam-deque"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -1689,6 +1718,19 @@ dependencies = [
 "system-deps",
 ]

+[[package]]
+name = "globset"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "log",
+ "regex-automata",
+ "regex-syntax",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.20.10"
@@ -2152,6 +2194,22 @@ dependencies = [
 "icu_properties",
 ]

+[[package]]
+name = "ignore"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2adf14691c72bcfc1058740436a35bdd3ae9c07d1a941ef00b749e9ea16aefa7"
+dependencies = [
+ "crossbeam-deque",
+ "globset",
+ "log",
+ "memchr",
+ "regex-automata",
+ "same-file",
+ "walkdir",
+ "winapi-util",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.14.0"
@@ -2278,6 +2336,15 @@ dependencies = [
 "signature",
 ]

+[[package]]
+name = "kamadak-exif"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1130d80c7374efad55a117d715a3af9368f0fa7a2c54573afc15a188cd984837"
+dependencies = [
+ "mutate_once",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.6"
@@ -2502,6 +2569,12 @@ dependencies = [
 "windows-sys 0.61.2",
 ]

+[[package]]
+name = "mutate_once"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13d2233c9842d08cfe13f9eac96e207ca6a2ea10b80259ebe8ad0268be27d2af"
+
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -2825,7 +2898,7 @@ dependencies = [

 [[package]]
 name = "pdfs-cli"
-version = "0.2.3"
+version = "0.4.0"
 dependencies = [
 "anyhow",
 "clap 4.6.1",
@@ -2840,9 +2913,10 @@ dependencies = [

 [[package]]
 name = "pdfs-core"
-version = "0.2.3"
+version = "0.4.0"
 dependencies = [
 "directories",
+ "ignore",
 "keyring",
 "proton-drive-rs",
 "proton-sdk",
@@ -2857,7 +2931,7 @@ dependencies = [

 [[package]]
 name = "pdfs-fuse"
-version = "0.2.3"
+version = "0.4.0"
 dependencies = [
 "fuser",
 "libc",
@@ -2870,14 +2944,16 @@ dependencies = [

 [[package]]
 name = "pdfs-gui"
-version = "0.2.3"
+version = "0.4.0"
 dependencies = [
 "anyhow",
 "async-channel",
 "gtk4",
+ "kamadak-exif",
 "ksni",
 "libadwaita",
 "pdfs-core",
+ "serde_json",
 "tokio",
 "tracing",
 "tracing-subscriber",
@@ -3085,9 +3161,8 @@ dependencies = [

 [[package]]
 name = "proton-drive-rs"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e4399b4d9b076c5886c7db87ae7f70322dd7127e6c5a4e7eff8719434d2434"
+version = "0.1.4"
+source = "git+https://github.com/narrrl/proton-sdk-rs?branch=main#a24785d1a911b539d1d148d712691c5a89d561b5"
 dependencies = [
 "async-trait",
 "base64",
@@ -3110,9 +3185,8 @@ dependencies = [

 [[package]]
 name = "proton-sdk"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099f6f20709452f2cdb0cee4db0a82e61a29bec261295812908bf956ffcdaa00"
+version = "0.1.4"
+source = "git+https://github.com/narrrl/proton-sdk-rs?branch=main#a24785d1a911b539d1d148d712691c5a89d561b5"
 dependencies = [
 "aes-gcm",
 "async-trait",
@@ -3,16 +3,15 @@ resolver = "2"
 members = ["crates/pdfs-core", "crates/pdfs-fuse", "crates/pdfs-cli", "crates/pdfs-gui"]

 [workspace.package]
-version = "0.2.3"
+version = "0.4.0"
 edition = "2024"
 license = "MIT"
 authors = ["Nils Pukropp <contact@narl.io>"]
 rust-version = "1.96"

 [workspace.dependencies]
-# Local Proton SDK crates (path deps until published; switch to versioned later).
-proton-sdk = "0.1.3"
-proton-drive-rs = "0.1.3"
+proton-sdk = "0.1.4"
+proton-drive-rs = "0.1.4"

 # Internal crates.
 pdfs-core = { path = "crates/pdfs-core" }
@@ -26,6 +25,7 @@ anyhow = "1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 directories = "5"
+ignore = "0.4"
 sha2 = "0.10"
 rusqlite = { version = "0.32", features = ["bundled"] }
 keyring = { version = "3", features = ["sync-secret-service", "crypto-rust"] }
@@ -34,3 +34,9 @@ rpassword = "7"
 fuser = "0.17"
 libc = "0.2"

+[patch.crates-io]
+# Track the SDK's `main` on GitHub rather than a sibling checkout, so a clean
+# clone (and CI, and the PKGBUILD) builds without the working tree next door.
+# `cargo update -p proton-sdk -p proton-drive-rs` pulls newer pushes.
+proton-sdk = { git = "https://github.com/narrrl/proton-sdk-rs", branch = "main" }
+proton-drive-rs = { git = "https://github.com/narrrl/proton-sdk-rs", branch = "main" }
@@ -8,6 +8,7 @@ A fast, unofficial Proton Drive client for Linux. This client features an advanc
 - **Command-Line Interface (CLI)**: Manage your drive, authenticate, and monitor sync status directly from the terminal.
 - **Non-Blocking GTK4 Desktop App**: Browse files, manage pins, and configure options through a modern, native GUI with a fully non-blocking asynchronous main loop.
 - **System Tray Integration**: Background indicator for status monitoring, quick actions, and fast sync controls.
+- **Fuzzy Search Launcher Prompt (HUD)**: A Google Drive-style search launcher (`pdfs-prompt`) for finding and opening files or folders instantly, ideal for binding to a system-wide hotkey.
 - **Secure Credential Storage**: Integrates with the system Secret Service (GNOME Keyring, KWallet, etc.) with smart in-memory credential caching to avoid UI thread blockages.
 - **Proton Photos Support**: Access your Proton Photos timeline, view thumbnails, and download backed-up media natively (available in the GUI as a navigation tab and via the CLI).

@@ -23,15 +24,15 @@ The client includes several optimizations designed for high efficiency, a low me

 ## Screenshots

-### GUI Application
+### GUI Application & Launcher

-| Login Screen | Account Overview |
+| Login Screen | Files Browser |
 | :---: | :---: |
-| ![Login Screen](images/login.png) | ![Account Overview](images/account.png) |
+| ![Login Screen](images/login.png) | ![Files Browser](images/files.png) |

-| Files (Grid View) | Files (List View) |
+| Photos Timeline | Search Launcher Prompt |
 | :---: | :---: |
-| ![Files Grid](images/files_grid.png) | ![Files List](images/files_list.png) |
+| ![Photos Timeline](images/photos.png) | ![Search Launcher Prompt](images/prompt.png) |

 ---

@@ -76,6 +77,7 @@ The compiled binaries will be available under `target/release/`:
 - `pdfs`: The CLI utility.
 - `pdfs-app`: The GTK4 application.
 - `pdfs-tray`: The tray status notifier.
+- `pdfs-prompt`: The launcher prompt for quick HUD search.

 ---

@@ -108,7 +110,7 @@ This project has a GitHub Actions CI workflow configured under `.github/workflow
   - Sets up the Rust compiler and caches build targets to speed up runs.
   - Compiles the workspace members in release mode.
 3. **Artifact Packaging**:
-   - Generates a `.tar.gz` containing the raw binaries (`pdfs`, `pdfs-app`, `pdfs-tray`).
+   - Generates a `.tar.gz` containing the raw binaries (`pdfs`, `pdfs-app`, `pdfs-tray`, `pdfs-prompt`).
   - Packs them into a Debian package (`.deb`).
 4. **Publishing**:
   - Creates a GitHub Release matching the pushed tag and uploads the `.deb` and `.tar.gz` packages as release assets.
@@ -1,5 +1,6 @@
 //! `pdfs` — command-line front-end for the Proton Drive Linux client.

+use std::collections::HashMap;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -121,6 +122,23 @@ enum Command {
    },
    /// Show the daemon's in-flight transfers (active uploads/downloads).
    Transfers,
+    /// List what is in the account's trash, with the uids the restore and
+    /// delete-forever commands take.
+    Trash,
+    /// Restore trashed items, by uid, to the folders they were trashed from.
+    Restore {
+        /// Node uids (`volume~link`), as printed by `pdfs trash`.
+        #[arg(required = true)]
+        uids: Vec<String>,
+    },
+    /// Permanently delete trashed items by uid. This cannot be undone.
+    DeleteForever {
+        /// Node uids (`volume~link`), as printed by `pdfs trash`.
+        #[arg(required = true)]
+        uids: Vec<String>,
+    },
+    /// Permanently delete everything in the trash. This cannot be undone.
+    EmptyTrash,
 }

 fn main() -> Result<()> {
@@ -154,6 +172,10 @@ fn main() -> Result<()> {
        Command::Mkdir { parent, name } => cmd_mkdir(parent, name),
        Command::Upload { file, parent } => cmd_upload(file, parent),
        Command::Transfers => cmd_transfers(),
+        Command::Trash => cmd_trash(),
+        Command::Restore { uids } => cmd_restore(uids),
+        Command::DeleteForever { uids } => cmd_delete_forever(uids),
+        Command::EmptyTrash => cmd_empty_trash(),
    }
 }

@@ -251,7 +273,9 @@ fn cmd_daemon(mountpoint: Option<PathBuf>) -> Result<()> {
                std::thread::sleep(std::time::Duration::from_secs(2));
            }
            Err(e) => {
-                tracing::error!(error = %e, "mount failed; retrying in 5s");
+                // `{:#}` so the whole anyhow chain lands in the log — the top
+                // context alone ("mount failed") never says *why*.
+                tracing::error!(error = format!("{e:#}"), "mount failed; retrying in 5s");
                std::thread::sleep(std::time::Duration::from_secs(5));
            }
        }
@@ -292,39 +316,11 @@ fn mount_once(mountpoint: Option<PathBuf>) -> Result<pdfs_fuse::MountOutcome> {
        .block_on(auth::resume_client())
        .context("resume session (run `pdfs login` first)")?;

-    // Persist rotated tokens for the daemon's lifetime. Proton refresh tokens are
-    // single-use: the 401-refresh path swaps in a new access+refresh pair, and if
-    // that pair is never written back the keyring keeps a now-dead refresh token,
-    // so the next `pdfs mount` fails with `InvalidRefreshToken`. The session
-    // shares its token store with the Drive client (one `Arc`-backed token store),
-    // so both the poll below and the shutdown flush see every rotation.
-    //
-    // `ProtonApiSession` is `Clone` over that shared store, so the polling task
-    // gets its own handle and we keep `session` here for a final flush. The poll
-    // is a backstop for long-lived mounts; the flush after `mount` returns is what
-    // makes the common case correct — a refresh shortly before a clean unmount
-    // would otherwise be lost in the poll gap, leaving a dead token behind.
-    let poll_session = session.clone();
-    rt.spawn(async move {
-        let mut last = poll_session.current_tokens().await;
-        loop {
-            tokio::time::sleep(std::time::Duration::from_secs(10)).await;
-            let current = poll_session.current_tokens().await;
-            if current.access_token == last.access_token
-                && current.refresh_token == last.refresh_token
-            {
-                continue;
-            }
-            match auth::persist(&poll_session).await {
-                Ok(()) => {
-                    tracing::info!("persisted refreshed session tokens");
-                    last = current;
-                }
-                Err(e) => tracing::warn!(error = %e, "failed to persist refreshed tokens"),
-            }
-        }
-    });
-
+    // Token updates are persisted automatically in real-time. The SDK session has
+    // a token refresh callback registered during `resume_client` that writes updated
+    // credentials back to the OS keyring immediately upon rotation. This prevents
+    // the system keyring from holding stale refresh tokens even if the daemon crashes,
+    // the system is suspended, or the network changes.
    let handle = rt.handle().clone();
    let result = pdfs_fuse::mount(
        client,
@@ -336,11 +332,9 @@ fn mount_once(mountpoint: Option<PathBuf>) -> Result<pdfs_fuse::MountOutcome> {
        username,
    );

-    // Clean unmount: flush whatever tokens the store holds now so the keyring
-    // always ends a session with the live refresh token, not a stale one. Runs
-    // even if `mount` errored — a rotation may still have happened first.
+    // Clean unmount check (as a best-effort final backup).
    if let Err(e) = rt.block_on(auth::persist(&session)) {
-        tracing::warn!(error = %e, "failed to persist tokens on shutdown");
+        tracing::debug!(error = %e, "no new tokens to persist on shutdown");
    }

    let outcome = result.context("mount failed")?;
@@ -443,8 +437,22 @@ fn cmd_photos(limit: usize, offset: usize) -> Result<()> {
        }
        CtlResponse::Photos { items, .. } if items.is_empty() => println!("No photos."),
        CtlResponse::Photos { items, .. } => {
+            // The timeline reply only carries thumbnails already in the cache, so
+            // pull the rest of the page's in one batch to print a path per photo.
+            let uids: Vec<String> = items.iter().map(|p| p.uid.clone()).collect();
+            let thumbs: HashMap<String, Option<String>> =
+                match control_request(CtlRequest::PhotoThumbs { uids })? {
+                    CtlResponse::Thumbs { items } => {
+                        items.into_iter().map(|t| (t.uid, t.path)).collect()
+                    }
+                    _ => HashMap::new(),
+                };
            for p in items {
-                let thumb = p.thumb_path.as_deref().unwrap_or("(no thumbnail)");
+                let thumb = thumbs
+                    .get(&p.uid)
+                    .and_then(|p| p.as_deref())
+                    .or(p.thumb_path.as_deref())
+                    .unwrap_or("(no thumbnail)");
                println!("{}  {}  {thumb}", p.capture_time, p.uid);
            }
        }
@@ -514,6 +522,67 @@ fn cmd_rm(path: PathBuf) -> Result<()> {
    Ok(())
 }

+fn cmd_trash() -> Result<()> {
+    match control_request(CtlRequest::ListTrash)? {
+        CtlResponse::Entries { entries } if entries.is_empty() => println!("(trash is empty)"),
+        CtlResponse::Entries { entries } => {
+            for e in entries {
+                let kind = if e.is_dir { "d" } else { "-" };
+                println!("{kind} {:>12}  {}  [{}]", e.size, e.name, e.uid);
+            }
+        }
+        CtlResponse::Error { message } => bail!("{message}"),
+        other => bail!("unexpected response: {other:?}"),
+    }
+    Ok(())
+}
+
+fn cmd_restore(uids: Vec<String>) -> Result<()> {
+    match control_request(CtlRequest::Restore { uids })? {
+        CtlResponse::Ok { message } => println!("{message}"),
+        CtlResponse::Error { message } => bail!("{message}"),
+        other => bail!("unexpected response: {other:?}"),
+    }
+    Ok(())
+}
+
+fn cmd_delete_forever(uids: Vec<String>) -> Result<()> {
+    confirm(&format!(
+        "Permanently delete {} item(s)? This cannot be undone.",
+        uids.len()
+    ))?;
+    match control_request(CtlRequest::DeleteForever { uids })? {
+        CtlResponse::Ok { message } => println!("{message}"),
+        CtlResponse::Error { message } => bail!("{message}"),
+        other => bail!("unexpected response: {other:?}"),
+    }
+    Ok(())
+}
+
+fn cmd_empty_trash() -> Result<()> {
+    confirm("Permanently delete everything in the trash? This cannot be undone.")?;
+    match control_request(CtlRequest::EmptyTrash)? {
+        CtlResponse::Ok { message } => println!("{message}"),
+        CtlResponse::Error { message } => bail!("{message}"),
+        other => bail!("unexpected response: {other:?}"),
+    }
+    Ok(())
+}
+
+/// Ask for a typed `yes` before an irreversible destroy. Errors (aborting the
+/// command) on anything else, including a non-interactive stdin: a piped or
+/// scripted invocation must not silently wipe the trash.
+fn confirm(prompt: &str) -> Result<()> {
+    print!("{prompt} [type \"yes\" to confirm] ");
+    std::io::stdout().flush()?;
+    let mut answer = String::new();
+    std::io::stdin().read_line(&mut answer)?;
+    if answer.trim() != "yes" {
+        bail!("aborted");
+    }
+    Ok(())
+}
+
 fn cmd_mkdir(parent: PathBuf, name: String) -> Result<()> {
    match control_request(CtlRequest::CreateFolder {
        parent: path_arg(&parent)?,
@@ -16,6 +16,7 @@ serde_json.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 directories.workspace = true
+ignore.workspace = true
 sha2.workspace = true
 rusqlite.workspace = true
 keyring.workspace = true
@@ -7,7 +7,7 @@
 //! path, so no fresh 2FA is required until the refresh token itself expires.

 use keyring::Entry;
-use proton_drive_rs::ProtonDriveClient;
+use proton_drive_rs::{KeySalt, ProtonDriveClient};
 use proton_sdk::config::ProtonClientConfiguration;
 use proton_sdk::session::{PasswordMode, ProtonApiSession, ResumeParameters};
 use serde::{Deserialize, Serialize};
@@ -32,6 +32,20 @@ pub struct StoredSession {
    /// Mailbox (data) password — required by `ProtonDriveClient::new` to derive
    /// the key chain. Lives only in the OS keyring, never on disk in cleartext.
    pub mailbox_password: String,
+    /// The account's key salts, captured at login.
+    ///
+    /// `core/v4/keys/salts` requires the `locked` scope, which only the access
+    /// token minted by a password login carries: once that token has been
+    /// rotated through `auth/v4/refresh` (as it is on every daemon start after
+    /// the first), the endpoint answers 403 and the key chain can no longer be
+    /// unlocked. Salts only change when the password changes, so store them
+    /// once and seed the Drive client with them on resume.
+    ///
+    /// Empty for blobs written before this field existed; [`resume_client`]
+    /// then falls back to fetching (and, if the token is still scoped for it,
+    /// backfilling) them.
+    #[serde(default)]
+    pub key_salts: Vec<KeySalt>,
 }

 impl StoredSession {
@@ -84,12 +98,24 @@ pub async fn login(
        session.apply_second_factor_code(code.trim()).await?;
    }

-    save(&session, password).await?;
+    // Grab the key salts while this access token still has the `locked` scope:
+    // after its first refresh it never will again, and without them no later
+    // resume can unlock the key chain. See `StoredSession::key_salts`.
+    let client = ProtonDriveClient::new(&session, password.as_bytes().to_vec());
+    let key_salts = client.account().key_salts().await?;
+
+    register_refresh_handler(&session, password.to_owned(), key_salts.clone());
+
+    save(&session, password, key_salts).await?;
    Ok(())
 }

-/// Persist the session's current tokens + mailbox password to the keyring.
-pub async fn save(session: &ProtonApiSession, mailbox_password: &str) -> Result<()> {
+/// Persist the session's current tokens, mailbox password and key salts.
+pub async fn save(
+    session: &ProtonApiSession,
+    mailbox_password: &str,
+    key_salts: Vec<KeySalt>,
+) -> Result<()> {
    let tokens = session.current_tokens().await;
    let stored = StoredSession {
        session_id: session.session_id().as_str().to_owned(),
@@ -103,6 +129,7 @@ pub async fn save(session: &ProtonApiSession, mailbox_password: &str) -> Result<
            PasswordMode::Dual => 2,
        },
        mailbox_password: mailbox_password.to_owned(),
+        key_salts,
    };
    let json = serde_json::to_string(&stored)?;
    keyring_entry()?.set_password(&json)?;
@@ -137,7 +164,30 @@ pub fn logout() -> Result<()> {
 pub async fn resume_client() -> Result<(ProtonDriveClient, ProtonApiSession)> {
    let stored = load()?;
    let session = ProtonApiSession::resume(client_config(), stored.to_params())?;
-    let client = ProtonDriveClient::new(&session, stored.mailbox_password.clone().into_bytes());
+    let password = stored.mailbox_password.clone();
+
+    // Blobs written before key salts were persisted have none: fetch them once
+    // more and write them back, which only works while the stored access token
+    // still carries the `locked` scope. If it doesn't, the account must be
+    // logged into again — no refresh can restore that scope.
+    let key_salts = if stored.key_salts.is_empty() {
+        register_refresh_handler(&session, password.clone(), Vec::new());
+        let probe = ProtonDriveClient::new(&session, password.clone().into_bytes());
+        let salts = probe.account().key_salts().await.map_err(|e| match &e {
+            proton_sdk::error::ProtonError::Api(api) if api.is_insufficient_scope() => {
+                Error::ReloginRequired
+            }
+            _ => e.into(),
+        })?;
+        save(&session, &password, salts.clone()).await?;
+        salts
+    } else {
+        stored.key_salts
+    };
+
+    register_refresh_handler(&session, password.clone(), key_salts.clone());
+
+    let client = ProtonDriveClient::with_key_salts(&session, password.into_bytes(), key_salts);
    Ok((client, session))
 }

@@ -148,6 +198,44 @@ pub async fn resume_client() -> Result<(ProtonDriveClient, ProtonApiSession)> {
 /// preserved. Call whenever the session may have rotated its tokens through the
 /// 401-refresh path so a later [`resume_client`] presents a live refresh token.
 pub async fn persist(session: &ProtonApiSession) -> Result<()> {
-    let mailbox_password = load()?.mailbox_password;
-    save(session, &mailbox_password).await
+    let stored = load()?;
+    save(session, &stored.mailbox_password, stored.key_salts).await
+}
+
+fn register_refresh_handler(
+    session: &ProtonApiSession,
+    mailbox_password: String,
+    key_salts: Vec<KeySalt>,
+) {
+    let session_id = session.session_id().as_str().to_owned();
+    let username = session.username().to_owned();
+    let user_id = session.user_id().as_str().to_owned();
+    let scopes = session.scopes().to_vec();
+    let password_mode = match session.password_mode() {
+        PasswordMode::Single => 1,
+        PasswordMode::Dual => 2,
+    };
+
+    session.http().set_on_tokens_refreshed(move |tokens| {
+        let stored = StoredSession {
+            session_id: session_id.clone(),
+            username: username.clone(),
+            user_id: user_id.clone(),
+            access_token: tokens.access_token,
+            refresh_token: tokens.refresh_token,
+            scopes: scopes.clone(),
+            password_mode,
+            mailbox_password: mailbox_password.clone(),
+            key_salts: key_salts.clone(),
+        };
+        if let Ok(json) = serde_json::to_string(&stored)
+            && let Ok(entry) = keyring_entry()
+        {
+            if let Err(e) = entry.set_password(&json) {
+                tracing::warn!(error = %e, "failed to auto-persist refreshed tokens in keyring");
+            } else {
+                tracing::info!("successfully auto-persisted refreshed tokens in keyring");
+            }
+        }
+    });
 }
@@ -142,6 +142,12 @@ impl AppDirs {
        self.state_dir().join("tray.sock")
    }

+    /// The user's home directory — the root the daemon indexes for local
+    /// (non-Drive) file search. `None` if it cannot be resolved.
+    pub fn home_dir(&self) -> Option<PathBuf> {
+        directories::UserDirs::new().map(|u| u.home_dir().to_path_buf())
+    }
+
    /// Default mountpoint when the user does not pass one explicitly.
    pub fn default_mountpoint(&self) -> PathBuf {
        directories::UserDirs::new()
@@ -44,9 +44,15 @@ pub enum Request {
    /// List a directory for the in-app file browser. `path` is
    /// mountpoint-relative (empty or "." = the mount root).
    ListDir { path: String },
-    /// Fetch a page of the photos timeline, newest first. Thumbnails for the
-    /// page are fetched into the cache and their on-disk paths returned.
+    /// Fetch a page of the photos timeline, newest first. Returns metadata only:
+    /// a thumbnail path comes back only for photos already in the cache, so the
+    /// reply never waits on the network. Front-ends ask for the thumbnails they
+    /// actually display with [`Request::PhotoThumbs`].
    PhotosTimeline { offset: usize, limit: usize },
+    /// Fetch thumbnails for the given photo uids, downloading the ones not
+    /// already cached (one batched round-trip) and replying with their on-disk
+    /// paths. Keep the batch small — it is served on demand, as tiles scroll in.
+    PhotoThumbs { uids: Vec<String> },
    /// Download a photo's full content into the cache; replies with its path.
    OpenPhoto { uid: String },
    /// Upload a photo with the given name, media type, and content bytes.
@@ -63,6 +69,10 @@ pub enum Request {
    /// Full-text search node names against the daemon's local metadata index.
    /// `limit` caps the number of hits returned. Replies with [`Response::SearchResults`].
    Search { query: String, limit: usize },
+    /// Search the daemon's index of *local* (non-Drive) files on this machine.
+    /// Independent of [`Request::Search`] so a front-end can fire both at once and
+    /// render whichever lands first. Replies with [`Response::LocalResults`].
+    SearchLocal { query: String, limit: usize },
    /// Rename a file or folder. `path` is mountpoint-relative; `new_name` is a
    /// single path component (no separators). Replies with [`Response::Ok`].
    Rename { path: String, new_name: String },
@@ -93,6 +103,20 @@ pub enum Request {
    /// Replies with [`Response::Transfers`]. Cheap to poll: the daemon keeps the
    /// registry in memory, so a front-end can render a live progress widget.
    GetQueueStatus,
+    /// List what is in the account's trash. Replies with [`Response::Entries`];
+    /// a trashed node has no path inside the mount, so each entry carries only
+    /// its `uid` — the handle for [`Request::Restore`] and
+    /// [`Request::DeleteForever`] — and its `path` is empty.
+    ListTrash,
+    /// Restore trashed nodes, by uid, to the folders they were trashed from.
+    /// Replies with [`Response::Ok`].
+    Restore { uids: Vec<String> },
+    /// Permanently delete trashed nodes by uid. Irreversible: the content is
+    /// gone from Proton Drive, not moved. Replies with [`Response::Ok`].
+    DeleteForever { uids: Vec<String> },
+    /// Permanently delete everything in the trash. Irreversible.
+    /// Replies with [`Response::Ok`].
+    EmptyTrash,
 }

 /// Which way an active transfer is moving, in a [`TransferItem`].
@@ -140,8 +164,10 @@ pub struct DirEntry {
    pub uid: String,
    /// Full mountpoint-relative path. Empty for a [`Request::ListDir`] listing
    /// (the entry lives in the requested directory, so the caller derives the
-    /// path by joining its name); populated when an entry can live anywhere in
-    /// the tree, as for search hits rendered through the browser.
+    /// path by joining its name) and for a [`Request::ListTrash`] listing (a
+    /// trashed node has no path inside the mount at all); populated when an entry
+    /// can live anywhere in the tree, as for search hits rendered through the
+    /// browser.
    #[serde(default)]
    pub path: String,
 }
@@ -162,6 +188,20 @@ pub struct SearchHit {
    pub uid: String,
 }

+/// One hit in a [`Request::SearchLocal`] result: a file on this machine, outside
+/// Proton Drive. Unlike [`SearchHit`] there is no uid or pin state — the file is
+/// already local, so the front-end opens `path` directly.
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct LocalHit {
+    pub name: String,
+    /// Absolute path on this machine.
+    pub path: String,
+    pub is_dir: bool,
+    pub size: u64,
+    /// Modification time, epoch seconds.
+    pub modified: i64,
+}
+
 /// One photo in a [`Request::PhotosTimeline`] page.
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct PhotoItem {
@@ -169,10 +209,21 @@ pub struct PhotoItem {
    pub uid: String,
    /// Capture time, epoch seconds (the timeline is newest-first).
    pub capture_time: i64,
-    /// On-disk path to the cached thumbnail, if one was available/fetched.
+    /// On-disk path to the cached thumbnail, when one is *already* cached. A
+    /// `None` here means "not fetched yet", not "has no thumbnail" — ask for it
+    /// with [`Request::PhotoThumbs`].
    pub thumb_path: Option<String>,
 }

+/// One thumbnail in a [`Response::Thumbs`] batch.
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PhotoThumb {
+    pub uid: String,
+    /// On-disk path, or `None` when the photo genuinely has no thumbnail (or the
+    /// fetch failed) — a front-end can then stop asking for it.
+    pub path: Option<String>,
+}
+
 /// The daemon's reply to a [`Request`].
 #[derive(Serialize, Deserialize, Debug)]
 pub enum Response {
@@ -194,7 +245,8 @@ pub enum Response {
    Ok { message: String },
    /// The pin registry.
    Pins { pins: Vec<Pin> },
-    /// A directory listing (reply to [`Request::ListDir`]).
+    /// A directory listing (reply to [`Request::ListDir`]) or a trash listing
+    /// (reply to [`Request::ListTrash`]).
    Entries { entries: Vec<DirEntry> },
    /// A page of the photos timeline. `available` is false when the account
    /// has no photos volume.
@@ -202,10 +254,16 @@ pub enum Response {
        available: bool,
        items: Vec<PhotoItem>,
    },
+    /// Thumbnails for a [`Request::PhotoThumbs`] batch.
+    Thumbs { items: Vec<PhotoThumb> },
    /// An on-disk path the front-end can open (e.g. a downloaded photo).
    FilePath { path: String },
    /// Full-text search results (reply to [`Request::Search`]).
    SearchResults { hits: Vec<SearchHit> },
+    /// Local-file search results (reply to [`Request::SearchLocal`]). `indexing`
+    /// is true while a scan of the machine is still running, so a front-end can
+    /// say "still indexing" instead of "no matches" on a cold first launch.
+    LocalResults { hits: Vec<LocalHit>, indexing: bool },
    /// A snapshot of in-flight transfers (reply to [`Request::GetQueueStatus`]).
    Transfers { items: Vec<TransferItem> },
    /// The request failed.
@@ -268,4 +326,27 @@ mod tests {
            assert_eq!(line, serde_json::to_string(&back).unwrap());
        }
    }
+
+    /// The trash requests carry uids rather than paths; they must survive the same
+    /// line-delimited round-trip, since a mangled uid would restore or destroy the
+    /// wrong node.
+    #[test]
+    fn trash_requests_roundtrip() {
+        let reqs = [
+            Request::ListTrash,
+            Request::Restore {
+                uids: vec!["vol~link".into(), "vol~other".into()],
+            },
+            Request::DeleteForever {
+                uids: vec!["vol~link".into()],
+            },
+            Request::EmptyTrash,
+        ];
+        for req in reqs {
+            let line = serde_json::to_string(&req).unwrap();
+            assert!(!line.contains('\n'), "wire form must be a single line");
+            let back: Request = serde_json::from_str(&line).unwrap();
+            assert_eq!(line, serde_json::to_string(&back).unwrap());
+        }
+    }
 }
@@ -18,9 +18,10 @@ use proton_drive_rs::{Node, NodeKind};
 use rusqlite::{Connection, OptionalExtension, params};

 use crate::Result;
+use crate::localindex::LocalEntry;

 /// Current schema version. Bump on every forward migration added below.
-const SCHEMA_VERSION: i64 = 5;
+const SCHEMA_VERSION: i64 = 6;

 /// Below this length the trigram tokenizer indexes nothing (it needs 3-char
 /// grams), so short queries fall back to a `LIKE` scan over `nodes.name`.
@@ -119,6 +120,9 @@ impl Db {
        if current < 5 {
            tx.execute_batch(MIGRATION_V5)?;
        }
+        if current < 6 {
+            tx.execute_batch(MIGRATION_V6)?;
+        }
        tx.execute(
            "INSERT INTO sync_state (key, value) VALUES ('schema_version', ?1)
             ON CONFLICT(key) DO UPDATE SET value = excluded.value",
@@ -213,9 +217,13 @@ impl Db {
            )?;
            collect_pairs(stmt.query_map(params![pat, limit as i64], pair)?)?
        } else {
-            // Quote the user input as a single FTS phrase so its characters are
-            // matched literally, never parsed as FTS query syntax.
-            let phrase = format!("\"{}\"", query.replace('"', "\"\""));
+            // Escape double quotes and quote each term, then combine with AND so
+            // all terms must match but can appear in any order or position.
+            let phrase = query
+                .split_whitespace()
+                .map(|word| format!("\"{}\"", word.replace('"', "\"\"")))
+                .collect::<Vec<_>>()
+                .join(" AND ");
            let mut stmt = conn.prepare(
                "SELECT n.node_json, n.uid
                 FROM nodes_fts f JOIN nodes n ON n.uid = f.uid
@@ -522,6 +530,161 @@ impl Db {
        }
        Ok(out)
    }
+
+    // ---- local (non-Drive) file index (schema v6) ----
+
+    /// Open a new local-index scan generation. Rows written under it survive
+    /// [`local_finish_scan`](Self::local_finish_scan); rows still carrying an
+    /// older generation are pruned there as "no longer on disk".
+    pub fn local_begin_scan(&self) -> Result<i64> {
+        let conn = self.conn.lock().unwrap();
+        let current: i64 = conn
+            .query_row(
+                "SELECT value FROM sync_state WHERE key = 'local_scan_gen'",
+                [],
+                |row| row.get::<_, String>(0),
+            )
+            .optional()?
+            .and_then(|v| v.parse().ok())
+            .unwrap_or(0);
+        let next = current + 1;
+        conn.execute(
+            "INSERT INTO sync_state (key, value) VALUES ('local_scan_gen', ?1)
+             ON CONFLICT(key) DO UPDATE SET value = excluded.value",
+            [next.to_string()],
+        )?;
+        Ok(next)
+    }
+
+    /// Write one batch of walked entries under scan generation `generation`. The
+    /// FTS index is *not* touched here — it is rebuilt once in
+    /// [`local_finish_scan`](Self::local_finish_scan).
+    pub fn local_upsert_batch(&self, generation: i64, entries: &[LocalEntry]) -> Result<()> {
+        let mut conn = self.conn.lock().unwrap();
+        let tx = conn.transaction()?;
+        {
+            let mut stmt = tx.prepare_cached(
+                "INSERT INTO local_files (path, name, is_dir, size, mtime, scan_gen)
+                 VALUES (?1, ?2, ?3, ?4, ?5, ?6)
+                 ON CONFLICT(path) DO UPDATE SET
+                   name     = excluded.name,
+                   is_dir   = excluded.is_dir,
+                   size     = excluded.size,
+                   mtime    = excluded.mtime,
+                   scan_gen = excluded.scan_gen",
+            )?;
+            for e in entries {
+                stmt.execute(params![
+                    e.path,
+                    e.name,
+                    e.is_dir as i64,
+                    e.size,
+                    e.mtime,
+                    generation
+                ])?;
+            }
+        }
+        tx.commit()?;
+        Ok(())
+    }
+
+    /// Close scan generation `generation`: drop every row an older scan wrote
+    /// (those paths are gone from disk), rebuild the FTS index over what remains,
+    /// and stamp the completion time. Returns the number of indexed entries.
+    pub fn local_finish_scan(&self, generation: i64, finished_at: i64) -> Result<i64> {
+        let mut conn = self.conn.lock().unwrap();
+        let tx = conn.transaction()?;
+        tx.execute(
+            "DELETE FROM local_files WHERE scan_gen != ?1",
+            params![generation],
+        )?;
+        tx.execute_batch("INSERT INTO local_fts(local_fts) VALUES('rebuild');")?;
+        tx.execute(
+            "INSERT INTO sync_state (key, value) VALUES ('local_indexed_at', ?1)
+             ON CONFLICT(key) DO UPDATE SET value = excluded.value",
+            [finished_at.to_string()],
+        )?;
+        let count: i64 = tx.query_row("SELECT COUNT(*) FROM local_files", [], |r| r.get(0))?;
+        tx.commit()?;
+        Ok(count)
+    }
+
+    /// When the last local scan completed (epoch seconds), or `None` if the index
+    /// has never been built. The daemon uses this to decide whether a fresh mount
+    /// needs an immediate rescan or can serve the existing index.
+    pub fn local_indexed_at(&self) -> Result<Option<i64>> {
+        let conn = self.conn.lock().unwrap();
+        Ok(conn
+            .query_row(
+                "SELECT value FROM sync_state WHERE key = 'local_indexed_at'",
+                [],
+                |row| row.get::<_, String>(0),
+            )
+            .optional()?
+            .and_then(|v| v.parse().ok()))
+    }
+
+    /// Substring search over indexed local file names, newest-modified first
+    /// within a relevance tier. Mirrors [`search`](Self::search): the trigram
+    /// index handles queries of at least [`TRIGRAM_MIN`] chars, shorter ones fall
+    /// back to a `LIKE` scan.
+    pub fn search_local(&self, query: &str, limit: usize) -> Result<Vec<LocalFileHit>> {
+        let query = query.trim();
+        if query.is_empty() {
+            return Ok(Vec::new());
+        }
+        let conn = self.conn.lock().unwrap();
+        let mut stmt;
+        let rows = if query.chars().count() < TRIGRAM_MIN {
+            let pat = format!("%{}%", like_escape(query));
+            stmt = conn.prepare(
+                "SELECT path, name, is_dir, size, mtime FROM local_files
+                 WHERE name LIKE ?1 ESCAPE '\\'
+                 ORDER BY mtime DESC LIMIT ?2",
+            )?;
+            stmt.query_map(params![pat, limit as i64], local_hit)?
+        } else {
+            let phrase = query
+                .split_whitespace()
+                .map(|word| format!("\"{}\"", word.replace('"', "\"\"")))
+                .collect::<Vec<_>>()
+                .join(" AND ");
+            stmt = conn.prepare(
+                "SELECT f.path, f.name, f.is_dir, f.size, f.mtime
+                 FROM local_fts x JOIN local_files f ON f.id = x.rowid
+                 WHERE x.name MATCH ?1
+                 ORDER BY x.rank LIMIT ?2",
+            )?;
+            stmt.query_map(params![phrase, limit as i64], local_hit)?
+        };
+        let mut out = Vec::new();
+        for r in rows {
+            out.push(r?);
+        }
+        Ok(out)
+    }
+}
+
+/// One hit from [`Db::search_local`]: an indexed file on the machine itself, not
+/// in Drive. `path` is absolute.
+pub struct LocalFileHit {
+    pub path: String,
+    pub name: String,
+    pub is_dir: bool,
+    pub size: i64,
+    pub mtime: i64,
+}
+
+/// Row mapper for [`Db::search_local`]'s two query paths, which select the same
+/// columns in the same order.
+fn local_hit(row: &rusqlite::Row) -> rusqlite::Result<LocalFileHit> {
+    Ok(LocalFileHit {
+        path: row.get(0)?,
+        name: row.get(1)?,
+        is_dir: row.get::<_, i64>(2)? != 0,
+        size: row.get(3)?,
+        mtime: row.get(4)?,
+    })
 }

 /// Row mapper for the `(node_json, uid)` pairs both search paths return.
@@ -660,6 +823,32 @@ CREATE TABLE pins (
 );
 ";

+/// Schema v6: the index of *local* (non-Drive) files, so the launcher prompt can
+/// search the machine alongside Drive. `local_files` is keyed by absolute path;
+/// `scan_gen` stamps the scan that last saw a row, so a rescan prunes vanished
+/// files with one `DELETE` instead of diffing.
+///
+/// `local_fts` is an *external-content* FTS5 index over `local_files.name`: the
+/// text lives once in the base table and the index is rebuilt in bulk at the end
+/// of a scan (`INSERT INTO local_fts(local_fts) VALUES('rebuild')`). That is far
+/// cheaper than the delete-then-insert-per-row dance `nodes_fts` needs, because
+/// a scan rewrites most rows at once rather than trickling single updates.
+const MIGRATION_V6: &str = "
+CREATE TABLE local_files (
+  id       INTEGER PRIMARY KEY,
+  path     TEXT NOT NULL UNIQUE,
+  name     TEXT NOT NULL,
+  is_dir   INTEGER NOT NULL,
+  size     INTEGER NOT NULL DEFAULT 0,
+  mtime    INTEGER NOT NULL DEFAULT 0,
+  scan_gen INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE VIRTUAL TABLE local_fts USING fts5(
+  name, content='local_files', content_rowid='id', tokenize='trigram'
+);
+";
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -784,6 +973,62 @@ mod tests {
        );
    }

+    fn local(path: &str, name: &str, is_dir: bool) -> LocalEntry {
+        LocalEntry {
+            path: path.into(),
+            name: name.into(),
+            is_dir,
+            size: 10,
+            mtime: 5,
+        }
+    }
+
+    /// A local scan is searchable by substring, and a *later* scan prunes the
+    /// paths it no longer sees — including out of the FTS index, so a deleted
+    /// file cannot keep surfacing in the prompt.
+    #[test]
+    fn local_scan_indexes_then_prunes_stale_paths() {
+        let db = Db::open_in_memory().unwrap();
+
+        let gen1 = db.local_begin_scan().unwrap();
+        db.local_upsert_batch(
+            gen1,
+            &[
+                local("/home/u/docs/report.pdf", "report.pdf", false),
+                local("/home/u/docs/notes.md", "notes.md", false),
+            ],
+        )
+        .unwrap();
+        assert_eq!(db.local_finish_scan(gen1, 1_000).unwrap(), 2);
+
+        // Trigram index gives substring (not just prefix) matches.
+        let hits = db.search_local("port", 10).unwrap();
+        assert_eq!(hits.len(), 1);
+        assert_eq!(hits[0].path, "/home/u/docs/report.pdf");
+        assert!(!hits[0].is_dir);
+        assert_eq!(db.local_indexed_at().unwrap(), Some(1_000));
+
+        // Second scan sees only notes.md → report.pdf is gone from disk.
+        let gen2 = db.local_begin_scan().unwrap();
+        db.local_upsert_batch(gen2, &[local("/home/u/docs/notes.md", "notes.md", false)])
+            .unwrap();
+        assert_eq!(db.local_finish_scan(gen2, 2_000).unwrap(), 1);
+        assert!(db.search_local("report", 10).unwrap().is_empty());
+        assert_eq!(db.search_local("notes", 10).unwrap().len(), 1);
+    }
+
+    /// Queries below the trigram minimum still match, via the `LIKE` fallback.
+    #[test]
+    fn local_search_short_query_like_fallback() {
+        let db = Db::open_in_memory().unwrap();
+        let g = db.local_begin_scan().unwrap();
+        db.local_upsert_batch(g, &[local("/home/u/a.txt", "a.txt", false)])
+            .unwrap();
+        db.local_finish_scan(g, 1).unwrap();
+        assert_eq!(db.search_local("a", 10).unwrap().len(), 1);
+        assert!(db.search_local("", 10).unwrap().is_empty());
+    }
+
    #[test]
    fn event_cursor_roundtrip() {
        let db = Db::open_in_memory().unwrap();
@@ -805,6 +1050,13 @@ mod tests {
        db.upsert_node(&file("f1", "docs", "report.pdf", 1))
            .unwrap();
        db.upsert_node(&file("f2", "root", "notes.txt", 2)).unwrap();
+        db.upsert_node(&file(
+            "f3",
+            "root",
+            "Rampage Open Air 2026 - order 166765244.pdf",
+            3,
+        ))
+        .unwrap();

        // Substring match (trigram), not just prefix.
        let hits = db.search("port", 10).unwrap();
@@ -816,6 +1068,14 @@ mod tests {
        // Top-level file → bare name.
        let hits = db.search("notes", 10).unwrap();
        assert_eq!(hits[0].path, "notes.txt");
+
+        // Multi-term FTS5 query matching (out of order, separated terms)
+        let hits = db.search("rampage 2026", 10).unwrap();
+        assert_eq!(hits.len(), 1);
+        assert_eq!(
+            hits[0].node.name,
+            "Rampage Open Air 2026 - order 166765244.pdf"
+        );
    }

    #[test]
@@ -23,6 +23,12 @@ pub enum Error {
    #[error("not logged in (no saved session)")]
    NotLoggedIn,

+    /// The stored session can no longer unlock the account key chain: reading
+    /// the key salts needs the `locked` scope, which a refreshed access token
+    /// does not have. Only a fresh password login restores it.
+    #[error("saved session can no longer unlock your keys — run `pdfs login` again")]
+    ReloginRequired,
+
    #[error("{0}")]
    Other(String),
 }
@@ -8,7 +8,9 @@ pub mod config;
 pub mod control;
 pub mod db;
 pub mod error;
+pub mod localindex;
 pub mod service;
+pub mod shell;

 pub use error::{Error, Result};

@@ -0,0 +1,224 @@
+//! Filesystem walker behind the daemon's index of *local* (non-Drive) files.
+//!
+//! The launcher prompt searches Proton Drive and the machine's own files side by
+//! side. Drive names come from the `nodes` FTS index; local names come from the
+//! `local_files` index this module feeds. The daemon runs [`scan`] on a
+//! background thread — never on a FUSE or control-socket thread — and streams
+//! batches into [`crate::db::Db::local_upsert_batch`].
+//!
+//! Walking is deliberately shallow on cost: we stat each entry once (the walker
+//! already has the `DirEntry` metadata) and skip the directories that dominate a
+//! home directory's inode count without ever being interesting to search
+//! (`node_modules`, `target`, caches, VCS internals). The Drive mountpoint is
+//! always excluded — walking it would fault in every remote node through FUSE.
+
+use std::path::{Path, PathBuf};
+use std::time::UNIX_EPOCH;
+
+use ignore::{WalkBuilder, WalkState};
+
+/// Directory names skipped anywhere in the tree. These hold build artefacts,
+/// dependency trees, and caches: high inode count, no search value.
+const SKIP_DIRS: &[&str] = &[
+    "node_modules",
+    "target",
+    "__pycache__",
+    "venv",
+    ".venv",
+    "vendor",
+    "dist-newstyle",
+    "Trash",
+];
+
+/// Hard cap on indexed entries, so a pathological home directory cannot grow the
+/// database without bound. Reaching it stops the walk early.
+const MAX_ENTRIES: usize = 400_000;
+
+/// Rows handed to the sink at a time. Large enough that the per-transaction cost
+/// amortises, small enough that the writer lock is released often (FUSE
+/// write-through shares the same connection).
+const BATCH: usize = 2_000;
+
+/// One indexed local file or directory.
+#[derive(Debug, Clone)]
+pub struct LocalEntry {
+    /// Absolute path.
+    pub path: String,
+    /// Final path component.
+    pub name: String,
+    pub is_dir: bool,
+    /// Size in bytes (0 for directories).
+    pub size: i64,
+    /// Modification time, epoch seconds.
+    pub mtime: i64,
+}
+
+/// Walk `roots` in parallel, calling `sink` with batches of entries.
+///
+/// Hidden files and anything under `excludes` (the Drive mountpoint, our own
+/// state/cache dirs) are skipped, as are the [`SKIP_DIRS`] names at any depth.
+/// Symlinks are not followed, so a link loop cannot hang the scan. Returns the
+/// number of entries handed to `sink`.
+///
+/// `sink` is called from the walker's worker threads, serialized by an internal
+/// mutex; it must not block for long.
+pub fn scan(
+    roots: &[PathBuf],
+    excludes: &[PathBuf],
+    sink: impl FnMut(Vec<LocalEntry>) + Send,
+) -> usize {
+    let Some((first, rest)) = roots.split_first() else {
+        return 0;
+    };
+
+    let mut builder = WalkBuilder::new(first);
+    for root in rest {
+        builder.add(root);
+    }
+    let excludes: Vec<PathBuf> = excludes.to_vec();
+    builder
+        // `standard_filters` would honour .gitignore/.ignore files: a source
+        // tree's ignored-but-present files are still files the user may want to
+        // find, so only the hidden filter stays on.
+        .standard_filters(false)
+        .hidden(true)
+        .follow_links(false)
+        .same_file_system(true)
+        .threads(std::thread::available_parallelism().map_or(4, |n| n.get().min(8)))
+        .filter_entry(move |entry| {
+            let path = entry.path();
+            if excludes.iter().any(|e| path.starts_with(e)) {
+                return false;
+            }
+            !matches!(entry.file_name().to_str(), Some(name) if SKIP_DIRS.contains(&name))
+        });
+
+    let state = std::sync::Mutex::new(SinkState {
+        buf: Vec::with_capacity(BATCH),
+        total: 0,
+        sink,
+    });
+
+    builder.build_parallel().run(|| {
+        Box::new(|result| {
+            let Ok(entry) = result else {
+                return WalkState::Continue;
+            };
+            // Depth 0 is a root itself; indexing it adds nothing to search.
+            if entry.depth() == 0 {
+                return WalkState::Continue;
+            }
+            let Some(local) = to_entry(&entry) else {
+                return WalkState::Continue;
+            };
+
+            let mut state = state.lock().unwrap();
+            state.push(local);
+            if state.total >= MAX_ENTRIES {
+                return WalkState::Quit;
+            }
+            WalkState::Continue
+        })
+    });
+
+    let mut state = state.into_inner().unwrap();
+    state.flush();
+    state.total
+}
+
+/// Batching buffer shared by the walker's worker threads.
+struct SinkState<F: FnMut(Vec<LocalEntry>)> {
+    buf: Vec<LocalEntry>,
+    total: usize,
+    sink: F,
+}
+
+impl<F: FnMut(Vec<LocalEntry>)> SinkState<F> {
+    fn push(&mut self, entry: LocalEntry) {
+        self.buf.push(entry);
+        self.total += 1;
+        if self.buf.len() >= BATCH {
+            self.flush();
+        }
+    }
+
+    fn flush(&mut self) {
+        if !self.buf.is_empty() {
+            let batch = std::mem::take(&mut self.buf);
+            (self.sink)(batch);
+        }
+    }
+}
+
+/// Convert a walker entry into a [`LocalEntry`], reusing the metadata the walker
+/// already fetched. Entries with non-UTF-8 paths are dropped: the index (and the
+/// JSON wire format) is UTF-8 only.
+fn to_entry(entry: &ignore::DirEntry) -> Option<LocalEntry> {
+    let path = entry.path().to_str()?.to_string();
+    let name = entry.file_name().to_str()?.to_string();
+    let meta = entry.metadata().ok()?;
+    let is_dir = meta.is_dir();
+    let mtime = meta
+        .modified()
+        .ok()
+        .and_then(|t| t.duration_since(UNIX_EPOCH).ok())
+        .map_or(0, |d| d.as_secs() as i64);
+    Some(LocalEntry {
+        path,
+        name,
+        is_dir,
+        size: if is_dir { 0 } else { meta.len() as i64 },
+        mtime,
+    })
+}
+
+/// The paths a scan should never descend into: the Drive mountpoint (walking it
+/// would fault every remote node in through FUSE) plus our own state and cache
+/// dirs, which hold blobs no user searches for by name.
+pub fn default_excludes(mountpoint: &Path, state_dir: &Path, cache_dir: &Path) -> Vec<PathBuf> {
+    vec![
+        mountpoint.to_path_buf(),
+        state_dir.to_path_buf(),
+        cache_dir.to_path_buf(),
+    ]
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// A scan indexes plain files, skips the excluded subtree and the junk dirs,
+    /// and reports names/paths the search index can match on.
+    #[test]
+    fn scan_indexes_files_and_honours_excludes() {
+        let tmp = std::env::temp_dir().join(format!("pdfs-scan-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&tmp);
+        std::fs::create_dir_all(tmp.join("docs")).unwrap();
+        std::fs::create_dir_all(tmp.join("node_modules/pkg")).unwrap();
+        std::fs::create_dir_all(tmp.join("mnt")).unwrap();
+        std::fs::write(tmp.join("docs/report.pdf"), b"x").unwrap();
+        std::fs::write(tmp.join("node_modules/pkg/index.js"), b"x").unwrap();
+        std::fs::write(tmp.join("mnt/remote.txt"), b"x").unwrap();
+
+        let mut got = Vec::new();
+        let n = scan(std::slice::from_ref(&tmp), &[tmp.join("mnt")], |batch| {
+            got.extend(batch)
+        });
+
+        let names: Vec<&str> = got.iter().map(|e| e.name.as_str()).collect();
+        assert_eq!(n, got.len());
+        assert!(names.contains(&"report.pdf"));
+        assert!(names.contains(&"docs"));
+        // Junk dir pruned, mountpoint-style exclude pruned.
+        assert!(!names.contains(&"index.js"));
+        assert!(!names.contains(&"node_modules"));
+        assert!(!names.contains(&"remote.txt"));
+
+        let report = got.iter().find(|e| e.name == "report.pdf").unwrap();
+        assert!(!report.is_dir);
+        assert_eq!(report.size, 1);
+        assert!(report.path.ends_with("docs/report.pdf"));
+
+        std::fs::remove_dir_all(&tmp).unwrap();
+    }
+}
@@ -0,0 +1,97 @@
+//! File-manager integration: right-click actions inside the mounted Drive.
+//!
+//! Nautilus (and Nemo/Caja, which read the same directories) runs any executable
+//! in its scripts folder with the selected paths in the environment, and shows it
+//! under a "Scripts" submenu. That gives us pin/unpin from the file manager
+//! without shipping a Python extension or a GNOME-version-specific plugin.
+//!
+//! Installation is idempotent and best-effort: the scripts are (re)written on
+//! every app start so an upgraded `pdfs` never leaves a stale script behind, and
+//! any failure is logged rather than surfaced — a missing file manager is not an
+//! error the user needs to act on.
+
+use std::io;
+use std::path::PathBuf;
+
+/// Scripts shipped into the file manager: `(file name, `pdfs` subcommand)`.
+const SCRIPTS: [(&str, &str); 2] = [
+    ("Keep offline (Proton Drive)", "pin"),
+    ("Remove offline copy (Proton Drive)", "unpin"),
+];
+
+/// The script body. Nautilus passes the selection as newline-separated paths in
+/// `NAUTILUS_SCRIPT_SELECTED_FILE_PATHS`; the positional args carry the same
+/// selection when the script runs on a local (non-URI) folder, so we prefer the
+/// environment and fall back to `"$@"` for the Nemo/Caja variants.
+fn script_body(subcommand: &str) -> String {
+    format!(
+        "#!/bin/sh\n\
+         # Installed by proton-drive-linux. Regenerated on every app start.\n\
+         set -eu\n\
+         \n\
+         paths=\"${{NAUTILUS_SCRIPT_SELECTED_FILE_PATHS:-}}\"\n\
+         if [ -z \"$paths\" ]; then\n\
+         \x20   paths=\"${{NEMO_SCRIPT_SELECTED_FILE_PATHS:-}}\"\n\
+         fi\n\
+         if [ -z \"$paths\" ]; then\n\
+         \x20   for arg in \"$@\"; do\n\
+         \x20       paths=\"$paths$arg\\n\"\n\
+         \x20   done\n\
+         fi\n\
+         \n\
+         printf '%s' \"$paths\" | while IFS= read -r path; do\n\
+         \x20   [ -n \"$path\" ] || continue\n\
+         \x20   pdfs {subcommand} \"$path\" || exit 1\n\
+         done\n"
+    )
+}
+
+/// The scripts directories to populate, for whichever file managers are present.
+fn script_dirs() -> Vec<PathBuf> {
+    let Some(data) = dirs_data_home() else {
+        return Vec::new();
+    };
+    ["nautilus/scripts", "nemo/scripts"]
+        .iter()
+        .map(|rel| data.join(rel))
+        .collect()
+}
+
+/// `$XDG_DATA_HOME`, or `~/.local/share`.
+fn dirs_data_home() -> Option<PathBuf> {
+    if let Some(dir) = std::env::var_os("XDG_DATA_HOME").filter(|d| !d.is_empty()) {
+        return Some(PathBuf::from(dir));
+    }
+    std::env::var_os("HOME").map(|home| PathBuf::from(home).join(".local/share"))
+}
+
+/// Install (or refresh) the pin/unpin scripts. Best-effort: logs and moves on.
+pub fn install_file_manager_scripts() {
+    for dir in script_dirs() {
+        // Only populate a file manager the user actually has: creating
+        // `~/.local/share/nemo` on a GNOME box would be litter.
+        if !dir.parent().is_some_and(|p| p.exists()) {
+            continue;
+        }
+        if let Err(e) = write_scripts(&dir) {
+            tracing::warn!("couldn't install file-manager scripts in {dir:?}: {e}");
+        }
+    }
+}
+
+/// Write both scripts into `dir`, creating it if needed, and make them
+/// executable — a script without the exec bit is silently ignored by Nautilus.
+fn write_scripts(dir: &PathBuf) -> io::Result<()> {
+    std::fs::create_dir_all(dir)?;
+    for (name, subcommand) in SCRIPTS {
+        let path = dir.join(name);
+        std::fs::write(&path, script_body(subcommand))?;
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o755))?;
+        }
+    }
+    tracing::debug!("installed file-manager scripts in {dir:?}");
+    Ok(())
+}
@@ -38,6 +38,7 @@ use std::io::{BufRead, BufReader, Write as _};
 use std::os::unix::fs::FileExt;
 use std::os::unix::net::{UnixListener, UnixStream};
 use std::path::{Component, Path, PathBuf};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

@@ -51,10 +52,11 @@ use fuser::{
 use pdfs_core::cache::{BLOCK_SIZE, ContentCache};
 use pdfs_core::config::AppDirs;
 use pdfs_core::control::{
-    DirEntry, PhotoItem, Request as CtlRequest, Response as CtlResponse, SearchHit,
-    TransferDirection,
+    DirEntry, LocalHit, PhotoItem, PhotoThumb, Request as CtlRequest, Response as CtlResponse,
+    SearchHit, TransferDirection,
 };
 use pdfs_core::db::{Db, StoredNode};
+use pdfs_core::localindex;
 use proton_drive_rs::proton_sdk::error::ProtonError;
 use proton_drive_rs::proton_sdk::ids::{DriveEventId, LinkId, NodeUid, VolumeId};
 use proton_drive_rs::{
@@ -78,9 +80,23 @@ const POLL_INTERVAL: Duration = Duration::from_secs(10);
 /// in [`Core`] and serve every page from memory until it goes stale.
 const TIMELINE_TTL: Duration = Duration::from_secs(60);

+/// How stale the local-file index may get before the background scanner rebuilds
+/// it. A rescan is a full walk of `$HOME`, so this trades index freshness against
+/// disk churn; the scanner also always rebuilds once per daemon start when the
+/// index is older than this.
+const LOCAL_INDEX_TTL: Duration = Duration::from_secs(15 * 60);
+
+/// How often the scanner thread wakes to check whether the index went stale.
+const LOCAL_INDEX_CHECK: Duration = Duration::from_secs(60);
+
 /// The FUSE root inode is always 1.
 const ROOT_INO: u64 = 1;

+/// Parent inode for a persisted node whose parent row is missing from the DB.
+/// No folder carries this inode, so such a node is listed by nobody and stays
+/// inert until a live enumeration re-parents it.
+const ORPHAN_INO: u64 = 0;
+
 /// Extended attribute exposing the small server-side thumbnail of a file.
 const XATTR_THUMBNAIL: &str = "user.proton.thumbnail";
 /// Extended attribute exposing the larger server-side preview image of a file.
@@ -301,6 +317,9 @@ struct Core {
    /// In-flight upload/download progress, served to `GetQueueStatus`. Shared
    /// across the FUSE session and the control-socket task.
    transfers: Arc<TransferRegistry>,
+    /// True while the background scanner is rebuilding the local-file index, so
+    /// `SearchLocal` can tell a front-end "still indexing" apart from "no match".
+    indexing: Arc<AtomicBool>,
 }

 /// The whole photos timeline plus when it was fetched, for TTL freshness.
@@ -353,21 +372,26 @@ impl Core {
            if ino == ROOT_INO {
                continue;
            }
+            // A node whose parent row never made it to disk must not be adopted
+            // by the root: it would surface as a phantom top-level entry.
            let parent = node
                .parent_uid
                .as_ref()
                .and_then(|p| st.by_uid.get(p).copied())
-                .unwrap_or(ROOT_INO);
+                .unwrap_or(ORPHAN_INO);
            let uid = node.uid.clone();
            st.entries.insert(ino, Entry { uid, parent, node });
        }

-        // Pass 3: rebuild child listings for fully-enumerated folders.
+        // Pass 3: rebuild child listings for fully-enumerated folders. The root
+        // is its own parent (that is what `..` resolves to), so it would match
+        // its own filter; a directory listed inside itself makes the kernel fail
+        // the lookup with EIO, taking the whole listing down with it.
        for dir_ino in listed_dirs {
            let kids: Vec<u64> = st
                .entries
                .iter()
-                .filter(|(_, e)| e.parent == dir_ino && !e.node.trashed)
+                .filter(|&(&ino, e)| ino != dir_ino && e.parent == dir_ino && !e.node.trashed)
                .map(|(&ino, _)| ino)
                .collect();
            st.children.insert(dir_ino, kids);
@@ -401,7 +425,7 @@ impl Core {
                }
                let mut child_inos = Vec::with_capacity(nodes.len());
                for node in nodes {
-                    if node.trashed {
+                    if node.trashed || node.uid == folder_uid {
                        continue;
                    }
                    child_inos.push(st.intern(ino, node));
@@ -435,7 +459,9 @@ impl Core {
        }
        let mut child_inos = Vec::with_capacity(nodes.len());
        for node in nodes {
-            if node.trashed {
+            // A folder listed among its own children would alias its inode into
+            // its own listing, which the kernel rejects with EIO.
+            if node.trashed || node.uid == folder_uid {
                continue;
            }
            child_inos.push(st.intern(ino, node));
@@ -1001,9 +1027,32 @@ impl Core {
            .collect())
    }

-    /// A page of the photos timeline (newest first), with the page's thumbnails
-    /// fetched into the cache and their paths attached. `Ok(None)` when the
-    /// account has no photos volume.
+    /// Search the index of files on this machine (outside Drive), built by the
+    /// background scanner in [`run_local_index`]. Pure local lookup, never hits
+    /// the network — and never touches the FUSE mount, which the scanner excludes.
+    fn search_local(&self, query: &str, limit: usize) -> Result<Vec<LocalHit>, String> {
+        let hits = self
+            .db
+            .search_local(query, limit)
+            .map_err(|e| format!("local search: {e}"))?;
+        Ok(hits
+            .into_iter()
+            .map(|h| LocalHit {
+                name: h.name,
+                path: h.path,
+                is_dir: h.is_dir,
+                size: h.size.max(0) as u64,
+                modified: h.mtime,
+            })
+            .collect())
+    }
+
+    /// A page of the photos timeline (newest first). Metadata only: a thumbnail
+    /// path is attached for photos whose thumbnail is *already* cached, and no
+    /// thumbnail is downloaded here — the page comes back as fast as the cached
+    /// timeline can be sliced, and the front-end pulls the thumbnails it actually
+    /// paints via [`Core::photo_thumbs`]. `Ok(None)` when the account has no
+    /// photos volume.
    ///
    /// The SDK's `enumerate_timeline` returns the *whole* timeline, so the first
    /// request (or the first after [`TIMELINE_TTL`] elapses) fetches and caches
@@ -1049,37 +1098,6 @@ impl Core {
            }
        };
        let ttype = ThumbnailType::Thumbnail.as_i32();
-
-        // Batch-fetch only the thumbnails not already cached fresh.
-        let want: Vec<NodeUid> = page
-            .iter()
-            .filter(|it| {
-                self.cache
-                    .cached_thumbnail_path(&it.uid, ttype, it.capture_time)
-                    .is_none()
-            })
-            .map(|it| it.uid.clone())
-            .collect();
-        if !want.is_empty() {
-            let cap: HashMap<NodeUid, i64> = page
-                .iter()
-                .map(|it| (it.uid.clone(), it.capture_time))
-                .collect();
-            match self.rt.block_on(
-                self.photos()
-                    .enumerate_thumbnails(&want, ThumbnailType::Thumbnail),
-            ) {
-                Ok(thumbs) => {
-                    for ft in thumbs {
-                        if let (Ok(bytes), Some(&tag)) = (ft.result, cap.get(&ft.file_uid)) {
-                            let _ = self.cache.store_thumbnail(&ft.file_uid, ttype, tag, &bytes);
-                        }
-                    }
-                }
-                Err(e) => warn!(error = %e, "batch photo thumbnails failed"),
-            }
-        }
-
        Ok(Some(
            page.into_iter()
                .map(|it| {
@@ -1097,6 +1115,64 @@ impl Core {
        ))
    }

+    /// Thumbnails for `uids`, served from the cache and downloaded (in one
+    /// batched SDK call) for whatever is missing. Requested on demand as tiles
+    /// scroll into view, so a cold timeline paints immediately and only the
+    /// photos actually on screen cost a round-trip.
+    ///
+    /// The cache tags a thumbnail with its photo's capture time, which is what
+    /// the timeline carries — a uid absent from the cached timeline therefore
+    /// can't be validated and is skipped rather than guessed at.
+    fn photo_thumbs(&self, uids: &[NodeUid]) -> Vec<PhotoThumb> {
+        let ttype = ThumbnailType::Thumbnail.as_i32();
+        let tags: HashMap<NodeUid, i64> = {
+            let guard = self.timeline.lock().unwrap();
+            match guard.as_ref() {
+                Some(c) => c
+                    .items
+                    .iter()
+                    .map(|it| (it.uid.clone(), it.capture_time))
+                    .collect(),
+                None => HashMap::new(),
+            }
+        };
+
+        let want: Vec<NodeUid> = uids
+            .iter()
+            .filter(|uid| {
+                tags.get(*uid)
+                    .is_some_and(|&tag| self.cache.cached_thumbnail_path(uid, ttype, tag).is_none())
+            })
+            .cloned()
+            .collect();
+        if !want.is_empty() {
+            match self.rt.block_on(
+                self.photos()
+                    .enumerate_thumbnails(&want, ThumbnailType::Thumbnail),
+            ) {
+                Ok(thumbs) => {
+                    for ft in thumbs {
+                        if let (Ok(bytes), Some(&tag)) = (ft.result, tags.get(&ft.file_uid)) {
+                            let _ = self.cache.store_thumbnail(&ft.file_uid, ttype, tag, &bytes);
+                        }
+                    }
+                }
+                Err(e) => warn!(error = %e, "batch photo thumbnails failed"),
+            }
+        }
+
+        uids.iter()
+            .map(|uid| PhotoThumb {
+                uid: uid.to_string(),
+                path: tags.get(uid).and_then(|&tag| {
+                    self.cache
+                        .cached_thumbnail_path(uid, ttype, tag)
+                        .map(|p| p.display().to_string())
+                }),
+            })
+            .collect()
+    }
+
    /// Download a photo's full content into the content cache, returning its
    /// on-disk path (served from cache when a fresh blob already exists).
    fn open_photo(&self, uid: &NodeUid) -> Result<PathBuf, String> {
@@ -1227,6 +1303,114 @@ impl Core {
        Ok(name)
    }

+    /// List the account's trash. Trashed nodes are outside the mounted tree — the
+    /// FUSE side forgot them when they were trashed — so this always goes to the
+    /// server rather than to `State` or the DB, and each entry is identified by
+    /// its uid (its only remaining handle) with an empty path.
+    fn list_trash(&self) -> Result<Vec<DirEntry>, String> {
+        let uids = self
+            .rt
+            .block_on(self.client.enumerate_trash_node_uids())
+            .map_err(|e| format!("enumerate trash: {e}"))?;
+        if uids.is_empty() {
+            return Ok(Vec::new());
+        }
+        let nodes = self
+            .rt
+            .block_on(self.client.enumerate_nodes(&uids))
+            .map_err(|e| format!("enumerate nodes: {e}"))?;
+        Ok(nodes
+            .into_iter()
+            .map(|node| DirEntry {
+                name: node.name.clone(),
+                is_dir: node.is_folder(),
+                size: node_size(&node),
+                modified: node.modification_time,
+                // A trashed node can't be pinned or served from the mount, so its
+                // content is never current cache: report neither.
+                pinned: false,
+                cached: false,
+                uid: node.uid.to_string(),
+                path: String::new(),
+            })
+            .collect())
+    }
+
+    /// Parse wire uids (`volume~link`) into [`NodeUid`]s, rejecting the whole
+    /// batch if any is malformed — a partial trash mutation is worse than none.
+    fn parse_uids(uids: &[String]) -> Result<Vec<NodeUid>, String> {
+        if uids.is_empty() {
+            return Err("no nodes given".to_string());
+        }
+        uids.iter()
+            .map(|u| parse_uid(u).ok_or_else(|| format!("invalid uid: {u}")))
+            .collect()
+    }
+
+    /// Restore trashed nodes to the folders they were trashed from. The parents
+    /// are read *before* the restore — a restored node reappears in a listing the
+    /// daemon may already have cached, so each destination folder is invalidated
+    /// and re-enumerated on next access.
+    fn restore(&self, uids: &[String]) -> Result<usize, String> {
+        let parsed = Self::parse_uids(uids)?;
+        let parents: Vec<NodeUid> = self
+            .rt
+            .block_on(self.client.enumerate_nodes(&parsed))
+            .map_err(|e| format!("enumerate nodes: {e}"))?
+            .into_iter()
+            .filter_map(|n| n.parent_uid)
+            .collect();
+        self.rt
+            .block_on(self.client.restore_nodes(&parsed))
+            .map_err(|e| format!("restore: {e}"))?;
+        let mut st = self.state.lock().unwrap();
+        for parent in parents {
+            if let Some(&ino) = st.by_uid.get(&parent) {
+                st.invalidate_listing(ino);
+            }
+        }
+        Ok(parsed.len())
+    }
+
+    /// Permanently delete trashed nodes. Irreversible on the server; locally it
+    /// drops any metadata and cached content the node still owns.
+    fn delete_forever(&self, uids: &[String]) -> Result<usize, String> {
+        let parsed = Self::parse_uids(uids)?;
+        self.rt
+            .block_on(self.client.delete_nodes(&parsed))
+            .map_err(|e| format!("delete: {e}"))?;
+        self.drop_local(&parsed);
+        Ok(parsed.len())
+    }
+
+    /// Permanently delete everything in the trash. The uids are listed first so
+    /// the blobs of items trashed by *another* client — which this daemon may
+    /// still hold in its cache — are reclaimed too, not just the ones it trashed.
+    fn empty_trash(&self) -> Result<usize, String> {
+        let uids = self
+            .rt
+            .block_on(self.client.enumerate_trash_node_uids())
+            .map_err(|e| format!("enumerate trash: {e}"))?;
+        self.rt
+            .block_on(self.client.empty_trash())
+            .map_err(|e| format!("empty trash: {e}"))?;
+        self.drop_local(&uids);
+        Ok(uids.len())
+    }
+
+    /// Forget every trace of nodes that no longer exist anywhere: their inode and
+    /// DB row, and their cached content.
+    fn drop_local(&self, uids: &[NodeUid]) {
+        let mut st = self.state.lock().unwrap();
+        for uid in uids {
+            st.forget(uid);
+        }
+        drop(st);
+        for uid in uids {
+            self.cache.evict(uid);
+        }
+    }
+
    /// Create a folder named `name` under the mountpoint-relative `parent_rel`.
    /// Interns the new node directly so it shows up without a re-enumeration.
    fn create_folder(&self, parent_rel: &Path, name: &str) -> Result<String, String> {
@@ -2293,6 +2477,73 @@ async fn run_event_sync(
    }
 }

+/// Keep the local-file index fresh for the launcher prompt's "This computer"
+/// results. Rebuilds the index whenever it is older than [`LOCAL_INDEX_TTL`],
+/// then sleeps; runs on its own thread for the life of the daemon.
+///
+/// The walk is the one part of the daemon that touches the wider filesystem, so
+/// it is deliberately kept off every hot path: it never runs on a FUSE or
+/// control-socket thread, and it excludes the mountpoint (walking it would fault
+/// every remote node in through FUSE, defeating on-demand hydration).
+fn run_local_index(db: Arc<Db>, indexing: Arc<AtomicBool>, mountpoint: PathBuf) {
+    loop {
+        let age = db.local_indexed_at().ok().flatten();
+        let stale =
+            age.is_none_or(|at| now_secs().saturating_sub(at) >= LOCAL_INDEX_TTL.as_secs() as i64);
+        if stale {
+            scan_local_once(&db, &indexing, &mountpoint);
+        }
+        std::thread::sleep(LOCAL_INDEX_CHECK);
+    }
+}
+
+/// Walk `$HOME` once and replace the local-file index with what it finds.
+/// Batches stream straight into SQLite, so peak memory is one batch — not the
+/// whole home directory.
+fn scan_local_once(db: &Db, indexing: &AtomicBool, mountpoint: &Path) {
+    let dirs = match AppDirs::new() {
+        Ok(d) => d,
+        Err(e) => {
+            warn!(error = %e, "local index: cannot resolve app dirs");
+            return;
+        }
+    };
+    let Some(home) = dirs.home_dir() else {
+        warn!("local index: cannot resolve home directory");
+        return;
+    };
+    let generation = match db.local_begin_scan() {
+        Ok(g) => g,
+        Err(e) => {
+            warn!(error = %e, "local index: cannot open scan generation");
+            return;
+        }
+    };
+
+    let excludes = localindex::default_excludes(mountpoint, &dirs.state_dir(), &dirs.cache_dir());
+    indexing.store(true, Ordering::Relaxed);
+    let started = Instant::now();
+
+    let walked = localindex::scan(&[home], &excludes, |batch| {
+        if let Err(e) = db.local_upsert_batch(generation, &batch) {
+            warn!(error = %e, "local index: batch write failed");
+        }
+    });
+
+    // Prune what this scan did not see and rebuild the FTS index over the rest,
+    // even if some batches failed — a partial index still beats none.
+    match db.local_finish_scan(generation, now_secs()) {
+        Ok(indexed) => info!(
+            walked,
+            indexed,
+            elapsed_ms = started.elapsed().as_millis() as u64,
+            "local index rebuilt"
+        ),
+        Err(e) => warn!(error = %e, "local index: finish failed"),
+    }
+    indexing.store(false, Ordering::Relaxed);
+}
+
 /// Turn a CLI-supplied path into a mountpoint-relative path. An absolute path
 /// must live under `mountpoint`; a relative path is taken as already relative to
 /// the mount root.
@@ -2374,6 +2625,12 @@ fn handle_control_conn(core: &Core, username: &str, mountpoint: &Path, stream: U
                Err(e) => CtlResponse::Error { message: e },
            }
        }
+        Ok(CtlRequest::PhotoThumbs { uids }) => {
+            let parsed: Vec<NodeUid> = uids.iter().filter_map(|u| parse_uid(u)).collect();
+            CtlResponse::Thumbs {
+                items: core.photo_thumbs(&parsed),
+            }
+        }
        Ok(CtlRequest::OpenPhoto { uid }) => match parse_uid(&uid) {
            Some(u) => match core.open_photo(&u) {
                Ok(p) => CtlResponse::FilePath {
@@ -2436,6 +2693,13 @@ fn handle_control_conn(core: &Core, username: &str, mountpoint: &Path, stream: U
            Ok(hits) => CtlResponse::SearchResults { hits },
            Err(e) => CtlResponse::Error { message: e },
        },
+        Ok(CtlRequest::SearchLocal { query, limit }) => match core.search_local(&query, limit) {
+            Ok(hits) => CtlResponse::LocalResults {
+                hits,
+                indexing: core.indexing.load(Ordering::Relaxed),
+            },
+            Err(e) => CtlResponse::Error { message: e },
+        },
        Ok(CtlRequest::Rename { path, new_name }) => match rel_to_mount(mountpoint, &path) {
            Ok(rel) => match core.rename(&rel, &new_name) {
                Ok(name) => CtlResponse::Ok {
@@ -2490,6 +2754,28 @@ fn handle_control_conn(core: &Core, username: &str, mountpoint: &Path, stream: U
            },
            Err(e) => CtlResponse::Error { message: e },
        },
+        Ok(CtlRequest::ListTrash) => match core.list_trash() {
+            Ok(entries) => CtlResponse::Entries { entries },
+            Err(e) => CtlResponse::Error { message: e },
+        },
+        Ok(CtlRequest::Restore { uids }) => match core.restore(&uids) {
+            Ok(n) => CtlResponse::Ok {
+                message: format!("restored {n} item(s)"),
+            },
+            Err(e) => CtlResponse::Error { message: e },
+        },
+        Ok(CtlRequest::DeleteForever { uids }) => match core.delete_forever(&uids) {
+            Ok(n) => CtlResponse::Ok {
+                message: format!("permanently deleted {n} item(s)"),
+            },
+            Err(e) => CtlResponse::Error { message: e },
+        },
+        Ok(CtlRequest::EmptyTrash) => match core.empty_trash() {
+            Ok(n) => CtlResponse::Ok {
+                message: format!("emptied trash ({n} item(s))"),
+            },
+            Err(e) => CtlResponse::Error { message: e },
+        },
        Ok(CtlRequest::PurgeCache) => {
            let freed = core.cache.clear_unpinned();
            CtlResponse::Ok {
@@ -2538,13 +2824,29 @@ fn handle_control_conn(core: &Core, username: &str, mountpoint: &Path, stream: U
    let _ = stream.write_all(&out);
 }

-/// Listen on the control socket, serving one CLI command per connection. Runs on
-/// its own thread; returns only if the listener itself fails.
+/// Listen on the control socket, serving one command per connection, each on its
+/// own thread. Runs on its own thread; returns only if the listener itself fails.
+///
+/// Concurrent rather than serial because requests differ wildly in cost: an
+/// `OpenPhoto` downloads a whole photo, and while it ran the accept loop used to
+/// stall every other caller behind it — the GUI's 2s status poll, and the
+/// thumbnail batches the gallery needs to paint. [`Core`] is a bundle of handles
+/// (`Arc`/`Clone`), so each connection gets its own copy of it.
 fn run_control_socket(core: Core, username: String, mountpoint: PathBuf, listener: UnixListener) {
    info!("control socket listening");
    for conn in listener.incoming() {
        match conn {
-            Ok(stream) => handle_control_conn(&core, &username, &mountpoint, stream),
+            Ok(stream) => {
+                let core = core.clone();
+                let username = username.clone();
+                let mountpoint = mountpoint.clone();
+                if let Err(e) = std::thread::Builder::new()
+                    .name("pdfs-control".into())
+                    .spawn(move || handle_control_conn(&core, &username, &mountpoint, stream))
+                {
+                    warn!(error = %e, "control: spawn handler failed");
+                }
+            }
            Err(e) => {
                warn!(error = %e, "control: accept failed");
            }
@@ -2629,8 +2931,20 @@ pub fn mount(
        db,
        timeline: Arc::new(Mutex::new(None)),
        transfers: TransferRegistry::new(),
+        indexing: Arc::new(AtomicBool::new(false)),
    };

+    // Keep the launcher prompt's "This computer" index fresh. Its own thread:
+    // the walk is I/O-heavy and must never sit in front of a FUSE callback.
+    {
+        let db = core.db.clone();
+        let indexing = core.indexing.clone();
+        let mountpoint = mountpoint.to_path_buf();
+        std::thread::Builder::new()
+            .name("pdfs-localindex".into())
+            .spawn(move || run_local_index(db, indexing, mountpoint))?;
+    }
+
    let mut config = Config::default();
    config.mount_options = vec![
        MountOption::FSName("protondrive".to_string()),
@@ -24,7 +24,9 @@ tracing.workspace = true
 tracing-subscriber.workspace = true
 anyhow.workspace = true
 tokio.workspace = true
+serde_json.workspace = true
 ksni = "0.2"
 gtk4 = { version = "0.9", features = ["v4_12"] }
 adw = { package = "libadwaita", version = "0.7", features = ["v1_5"] }
 async-channel = "2"
+exif = { version = "0.6", package = "kamadak-exif" }
@@ -1,21 +1,22 @@
 # Maintainer: Nils Pukropp <contact@narl.io>
 #
 # Local-build PKGBUILD. Builds the proton-drive-linux workspace from the
-# checkout this file lives in. Path deps point at a sibling ../proton-sdk-rs
-# checkout (the Proton SDK is unpublished), so this is NOT a source-fetch
-# package: it compiles the working tree in place.
+# checkout this file lives in: this is NOT a source-fetch package, it compiles
+# the working tree in place. The Proton SDK is unpublished and comes from its
+# GitHub repo (pinned by Cargo.lock), so the build needs network access — no
+# sibling checkout required any more.
 #
 # Build + install:   cd packaging && makepkg -fi

 pkgname=proton-drive-linux
-pkgver=0.2.1
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="Proton Drive client for Linux: FUSE files-on-demand mount, CLI, GTK4 app + tray"
 arch=('x86_64')
 url="https://github.com/narl/proton-drive-linux"
 license=('MIT')
 depends=('fuse3' 'gtk4' 'libadwaita')
-makedepends=('cargo')
+makedepends=('cargo' 'git')
 provides=('pdfs')
 # Files-on-demand mount + keyring need these at runtime.
 optdepends=('gnome-keyring: credential storage via Secret Service'
@@ -40,7 +41,9 @@ build() {
  cd "$_workspace"
  export RUSTUP_TOOLCHAIN=stable
  export CARGO_TARGET_DIR="$_workspace/target"
-  cargo build --release --frozen \
+  # `--locked` not `--frozen`: the lock is authoritative, but cargo must still be
+  # allowed to fetch the git-sourced SDK.
+  cargo build --release --locked \
    --bin pdfs \
    --bin pdfs-tray \
    --bin pdfs-app \
Author	SHA1	Message	Date
nvrl	c52d829a43	added trash	2026-07-14 14:55:54 +02:00
nvrl	30039c43d7	updated photos gallery	2026-07-14 12:40:33 +02:00
nvrl	6c67226ab0	version bump	2026-07-13 02:44:59 +02:00
nvrl	6f7269b9b6	updated to use github repo for sdk	2026-07-13 02:44:20 +02:00
nvrl	dacacf51bb	added local file search to prompt	2026-07-13 02:33:18 +02:00
nvrl	8f28f5fd22	improvements to the photos gallery	2026-07-13 02:15:08 +02:00
nvrl	924e07e85f	updated prompt design	2026-07-10 16:03:31 +02:00
nvrl	e77ab0ffa9	updated readme + workflows	2026-07-01 00:50:20 +02:00