Pluralize: drop PluralCount newtype, take plain u64

Cast `usize`/`u32` etc. at the call site with `as u64`. The 25-line `Into<PluralCount>` wrapper bought callers a missing cast at the cost of an unusual signature; replacing it with a plain `u64` arg matches what every other Rust codebase does and trims the helper to two ~6-line fns. Test-only `chunks` counters in the AI smoke tests flipped from `usize` to `u64` for the same reason (no cast at the format site).

Caught and fixed via `cargo check --tests`: 23 call sites needed `as u64`; clippy + 1942 rust-tests stayed green.

Author: vdavid

apps/desktop/src-tauri/src/ai/api_keys.rs

@@ -54,7 +54,7 @@ pub fn save(provider_id: &str, api_key: &str) -> Result<(), AiApiKeyError> {
     crate::secrets::store().set(&key, api_key.as_bytes())?;
     info!(
         "AI API key saved for provider {provider_id} ({})",
-        pluralize(key_len, "byte")
+        pluralize(key_len as u64, "byte")
     );
     Ok(())
 }

apps/desktop/src-tauri/src/ai/client_local_llama_test.rs

@@ -69,7 +69,7 @@ async fn local_streaming_emits_multiple_chunks_progressively() {
         .await
         .expect("stream should open against local server");
 
-    let mut chunks: usize = 0;
+    let mut chunks: u64 = 0;
     let mut total = String::new();
     let mut first_chunk_at = None;
     while let Some(item) = stream.next().await {

apps/desktop/src-tauri/src/ai/client_real_anthropic_test.rs

@@ -75,7 +75,7 @@ async fn smoke_claude_haiku_stream() {
     .expect("stream open");
 
     let mut text = String::new();
-    let mut chunks: usize = 0;
+    let mut chunks: u64 = 0;
     while let Some(item) = stream.next().await {
         let chunk = item.expect("chunk ok");
         text.push_str(&chunk);

apps/desktop/src-tauri/src/ai/client_real_openai_test.rs

@@ -113,7 +113,7 @@ async fn collect_stream(backend: &AiBackend, model_label: &str) -> String {
     .await
     .expect("stream open");
     let mut text = String::new();
-    let mut chunks: usize = 0;
+    let mut chunks: u64 = 0;
     while let Some(item) = stream.next().await {
         let chunk = item.expect("chunk ok");
         text.push_str(&chunk);

apps/desktop/src-tauri/src/ai/extract.rs

@@ -85,6 +85,6 @@ pub fn extract_bundled_llama_server<R: Runtime>(app: &AppHandle<R>, ai_dir: &Pat
         return Err(String::from("llama-server binary not found in bundled resources"));
     }
 
-    log::debug!("AI: copied {} from bundled resources", pluralize(copied_count, "file"));
+    log::debug!("AI: copied {} from bundled resources", pluralize(copied_count as u64, "file"));
     Ok(())
 }

apps/desktop/src-tauri/src/ai/manager.rs

@@ -995,7 +995,7 @@ async fn wait_for_server_health(ai_dir: &Path, pid: u32, port: u16) -> Result<()
             if let Some((line_count, last_line)) = log_diagnostics(ai_dir) {
                 log::debug!(
                     "AI server: log has {}, last: {last_line}",
-                    pluralize(line_count, "line")
+                    pluralize(line_count as u64, "line")
                 );
             }
         }

apps/desktop/src-tauri/src/commands/error_reporter.rs

@@ -126,8 +126,8 @@ fn validate_user_note(user_note: Option<String>) -> Result<Option<String>, Strin
     match user_note {
         Some(n) if n.chars().count() > MAX_USER_NOTE_CHARS => Err(format!(
             "User note is too long ({}). Maximum is {}.",
-            pluralize(n.chars().count(), "char"),
-            pluralize(MAX_USER_NOTE_CHARS, "char"),
+            pluralize(n.chars().count() as u64, "char"),
+            pluralize(MAX_USER_NOTE_CHARS as u64, "char"),
         )),
         other => Ok(other),
     }

apps/desktop/src-tauri/src/file_system/volume/smb.rs

@@ -4234,7 +4234,7 @@ mod tests {
         if total_iters < 20 {
             panic!(
                 "soak ran only {}; need at least 20 to compute drift (set CMDR_SOAK_ITERATIONS=100 minimum)",
-                crate::pluralize::pluralize(total_iters, "iteration")
+                crate::pluralize::pluralize(total_iters as u64, "iteration")
             );
         }
 

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

@@ -84,7 +84,7 @@ pub fn compute_all_aggregates_reported(
     let dir_count = dir_entries.len();
     log::debug!(
         "Aggregation: starting bottom-up computation for {}",
-        pluralize_with(dir_count, "directory", "directories")
+        pluralize_with(dir_count as u64, "directory", "directories")
     );
 
     // Bulk-load direct children stats for ALL parent IDs in two SQL queries
@@ -278,7 +278,7 @@ pub fn compute_subtree_aggregates(conn: &Connection, root: &str) -> Result<u64,
     let dir_count = dir_entries.len();
     log::debug!(
         "Subtree aggregation: starting bottom-up computation for {} under {root}",
-        pluralize_with(dir_count, "directory", "directories")
+        pluralize_with(dir_count as u64, "directory", "directories")
     );
 
     // Load direct children stats scoped to this subtree via recursive CTE
@@ -337,7 +337,7 @@ pub fn backfill_missing_dir_stats(conn: &Connection) -> Result<u64, IndexStoreEr
     let count = missing_ids.len();
     log::debug!(
         "Backfill: {} missing dir_stats, computing...",
-        pluralize_with(count, "directory", "directories")
+        pluralize_with(count as u64, "directory", "directories")
     );
 
     // Load ALL directory entries for the topological sort (we need the full

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

@@ -120,7 +120,7 @@ pub fn enrich_entries_with_index(entries: &mut [FileEntry]) {
         None => return,
     };
 
-    log::debug!("enrich: {} under {parent_path}", pluralize(dir_count, "dir"));
+    log::debug!("enrich: {} under {parent_path}", pluralize(dir_count as u64, "dir"));
 
     // Use the integer-keyed fast path: resolve parent once, batch-fetch child stats
     if let Err(e) = pool
@@ -136,7 +136,7 @@ pub fn enrich_entries_with_index(entries: &mut [FileEntry]) {
         .iter()
         .filter(|e| e.is_directory && !e.is_symlink && e.recursive_size.is_some())
         .count();
-    log::debug!("enrich: {enriched}/{} got sizes", pluralize(dir_count, "dir"));
+    log::debug!("enrich: {enriched}/{} got sizes", pluralize(dir_count as u64, "dir"));
 }
 
 /// Fast path: resolve parent dir → id, get child dir IDs, batch-fetch stats.