Fix 3-10s startup block from index enrichment

`enrich_entries_with_index` blocked the listing pipeline waiting on `GLOBAL_INDEX_STORE` mutex held by post-replay verification (hundreds of serial SQLite queries for affected dirs).

- Switch `.lock()` to `.try_lock();` skip enrichment if busy
- Subsequent get_file_range calls retry once lock is free
- Fix loading message: "1 files" → "1 file", pluralize dynamically
- Replace opaque "just a moment now" with "sorting your files, preparing view..."

Author: vdavid

apps/desktop/src-tauri/src/indexing/CLAUDE.md

@@ -99,14 +99,14 @@ Key test files are alongside each module (test functions within `#[cfg(test)]` b
 
 **Writer-side delete-with-propagation**: `DeleteEntry` and `DeleteSubtree` handlers in the writer automatically read old data before deleting and propagate accurate negative deltas. This means every deletion -- replay, live, verification -- gets correct dir_stats updates without callers needing to send separate `PropagateDelta` messages. `delete_subtree` and `propagate_delta` have no internal transactions, so they're safe inside the replay's `BEGIN IMMEDIATE` transaction.
 
-**Post-replay verification is bidirectional**: `verify_affected_dirs` checks both directions: (1) stale entries in DB but not on disk (sends `DeleteEntry`/`DeleteSubtree`), and (2) missing entries on disk but not in DB (sends `UpsertEntry` + `PropagateDelta` for files, collects directory paths for `scan_subtree`). New directories are scanned and their subtree totals propagated up the ancestor chain. Uses a two-phase pattern to avoid blocking `enrich_entries_with_index`: Phase 1 holds the `GLOBAL_INDEX_STORE` lock briefly for bulk SQLite reads into a `HashMap`, Phase 2 does all disk I/O (hundreds of `readdir`/`exists`/`symlink_metadata` calls) without any lock.
+**Post-replay verification is bidirectional**: `verify_affected_dirs` checks both directions: (1) stale entries in DB but not on disk (sends `DeleteEntry`/`DeleteSubtree`), and (2) missing entries on disk but not in DB (sends `UpsertEntry` + `PropagateDelta` for files, collects directory paths for `scan_subtree`). New directories are scanned and their subtree totals propagated up the ancestor chain. Uses a two-phase pattern: Phase 1 holds the `GLOBAL_INDEX_STORE` lock for bulk SQLite reads into a `HashMap` (can take seconds with hundreds of affected dirs), Phase 2 does all disk I/O without any lock. `enrich_entries_with_index` uses `try_lock` to avoid blocking on Phase 1.
 
 **Schema version mismatch drops the DB**: If `schema_version` in meta doesn't match what the code expects, the entire DB is deleted and rebuilt. No migration path (it's a cache, not user data).
 
 **`verifier.rs` is a placeholder**: Per-navigation readdir diff is a future milestone. Currently just a TODO comment.
 
 **Scan cancellation leaves partial data**: By design. `scan_completed_at` not set in meta, so next startup detects incomplete scan and runs fresh. No cleanup needed.
 
-**Global read-only store uses `std::sync::Mutex`**: Not `RwLock`, because `rusqlite::Connection` is `Send` but not `Sync`. The mutex is held briefly for each batch read.
+**Global read-only store uses `std::sync::Mutex`**: Not `RwLock`, because `rusqlite::Connection` is `Send` but not `Sync`. `enrich_entries_with_index` uses `try_lock` to avoid blocking the listing pipeline when `verify_affected_dirs` Phase 1 holds the lock during startup (hundreds of serial SQLite queries for affected dirs). If the lock is busy, enrichment is skipped and retried on subsequent `get_file_range` calls.
 
 **Progress events use `tauri::async_runtime::spawn`**: Not `tokio::spawn`, because indexing can start from Tauri's synchronous `setup()` hook where no Tokio runtime context exists.

apps/desktop/src-tauri/src/indexing/mod.rs

@@ -68,13 +68,16 @@ fn clear_global_index_store() {
 /// Enrich directory entries with recursive size data from the index.
 ///
 /// Called from `get_file_range` on every page fetch. Does nothing if
-/// indexing is not initialized. For directories (non-symlinks), populates
-/// `recursive_size`, `recursive_file_count`, and `recursive_dir_count`
-/// from the `dir_stats` table via a batch SQLite read.
+/// indexing is not initialized. Uses `try_lock` to avoid blocking the
+/// listing pipeline when background verification holds the lock at startup.
+/// Skipped enrichment is retried on subsequent fetches.
 pub fn enrich_entries_with_index(entries: &mut [FileEntry]) {
-    let guard = match GLOBAL_INDEX_STORE.lock() {
+    let guard = match GLOBAL_INDEX_STORE.try_lock() {
         Ok(g) => g,
-        Err(_) => return,
+        Err(_) => {
+            log::debug!("Index enrichment skipped: store lock is held (background verification likely in progress)");
+            return;
+        }
     };
     let store = match guard.as_ref() {
         Some(s) => s,

apps/desktop/src/lib/ui/CLAUDE.md

@@ -53,8 +53,8 @@ Variants: `primary` | `secondary` (default) | `danger`. Sizes: `regular` (defaul
 
 Progressive status text driven by props (mutually exclusive, evaluated top-down):
 
-1. `finalizingCount` set → "All N files loaded, just a moment now."
-2. `loadedCount` set → "Loaded N files..."
+1. `finalizingCount` set → "All N file/files loaded. Sorting your files, preparing view..."
+2. `loadedCount` set → "Loaded N file/files..."
 3. `openingFolder` true → "Opening folder..."
 4. Default → "Loading..."
 

apps/desktop/src/lib/ui/LoadingIcon.svelte

@@ -16,9 +16,12 @@
 <div class="loading-container">
     <div class="spinner spinner-lg"></div>
     {#if finalizingCount !== undefined}
-        <div class="loading-text">All {formatNumber(finalizingCount)} files loaded, just a moment now.</div>
+        <div class="loading-text">
+            All {formatNumber(finalizingCount)}
+            {finalizingCount === 1 ? 'file' : 'files'} loaded. Sorting your files, preparing view...
+        </div>
     {:else if loadedCount !== undefined}
-        <div class="loading-text">Loaded {formatNumber(loadedCount)} files...</div>
+        <div class="loading-text">Loaded {formatNumber(loadedCount)} {loadedCount === 1 ? 'file' : 'files'}...</div>
     {:else if openingFolder}
         <div class="loading-text">Opening folder...</div>
     {:else}

apps/desktop/src/lib/ui/streaming-loading.test.ts

@@ -51,6 +51,14 @@ describe('LoadingIcon component', () => {
             expect(loadingText?.textContent).toBe('Loaded 1,500 files...')
         })
 
+        it('uses singular "file" when loadedCount is 1', async () => {
+            mount(LoadingIcon, { target, props: { loadedCount: 1 } })
+            await tick()
+
+            const loadingText = target.querySelector('.loading-text')
+            expect(loadingText?.textContent).toBe('Loaded 1 file...')
+        })
+
         it('shows count of 0 when loadedCount is 0', async () => {
             mount(LoadingIcon, { target, props: { loadedCount: 0 } })
             await tick()
@@ -112,15 +120,23 @@ describe('LoadingIcon component', () => {
             await tick()
 
             const loadingText = target.querySelector('.loading-text')
-            expect(loadingText?.textContent).toBe('All 600 files loaded, just a moment now.')
+            expect(loadingText?.textContent).toBe('All 600 files loaded. Sorting your files, preparing view...')
+        })
+
+        it('uses singular "file" when finalizingCount is 1', async () => {
+            mount(LoadingIcon, { target, props: { finalizingCount: 1 } })
+            await tick()
+
+            const loadingText = target.querySelector('.loading-text')
+            expect(loadingText?.textContent).toBe('All 1 file loaded. Sorting your files, preparing view...')
         })
 
         it('finalizingCount takes precedence over loadedCount', async () => {
             mount(LoadingIcon, { target, props: { loadedCount: 500, finalizingCount: 600 } })
             await tick()
 
             const loadingText = target.querySelector('.loading-text')
-            expect(loadingText?.textContent).toBe('All 600 files loaded, just a moment now.')
+            expect(loadingText?.textContent).toBe('All 600 files loaded. Sorting your files, preparing view...')
         })
 
         it('shows finalizing message with cancel hint', async () => {
@@ -130,7 +146,7 @@ describe('LoadingIcon component', () => {
             const loadingText = target.querySelector('.loading-text')
             const cancelHint = target.querySelector('.cancel-hint')
 
-            expect(loadingText?.textContent).toBe('All 1,000 files loaded, just a moment now.')
+            expect(loadingText?.textContent).toBe('All 1,000 files loaded. Sorting your files, preparing view...')
             expect(cancelHint?.textContent).toBe('Press ESC to cancel and go back')
         })
     })
@@ -157,7 +173,7 @@ describe('LoadingIcon component', () => {
             await tick()
 
             const loadingText = target.querySelector('.loading-text')
-            expect(loadingText?.textContent).toBe('All 500 files loaded, just a moment now.')
+            expect(loadingText?.textContent).toBe('All 500 files loaded. Sorting your files, preparing view...')
         })
 
         it('shows "Loading..." when openingFolder is false and no counts', async () => {