Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
perf(select): parallelize preview pre-computation via rayon (#1048)
Maximilian Roos1da588cfaeee
diff --git a/src/commands/select/items.rs b/src/commands/select/items.rsindex 083c112a3..c964ece6e 100644--- a/src/commands/select/items.rs+++ b/src/commands/select/items.rs@@ -160,14 +160,12 @@ impl WorktreeSkimItem {fn preview_for_mode(&self, mode: PreviewMode, width: usize, height: usize) -> String {let cache_key = (self.branch_name.clone(), mode);- // Get from cache or compute- let result = if let Some(cached) = self.preview_cache.get(&cache_key) {- cached.clone()- } else {- let computed = Self::compute_preview(&self.item, mode, width, height);- self.preview_cache.insert(cache_key, computed.clone());- computed- };+ let result = self+ .preview_cache+ .entry(cache_key)+ .or_insert_with(|| Self::compute_preview(&self.item, mode, width, height))+ .value()+ .clone();// Apply pager at display time for diff modes (1, 3, 4)// Log mode (2) doesn't benefit from diff pagersdiff --git a/src/commands/select/mod.rs b/src/commands/select/mod.rsindex 0cf118b3a..6bb505693 100644--- a/src/commands/select/mod.rs+++ b/src/commands/select/mod.rs@@ -220,33 +220,29 @@ pub fn handle_select(}drop(tx);- // Spawn background thread to pre-compute all preview modes for all worktrees.- // Use same dimension calculation as skim's preview window.- // Thread runs until complete or process exits — no join needed since ongoing+ // Pre-compute all preview modes for all worktrees in parallel via rayon.+ // Each (worktree, mode) pair is a separate rayon task, allowing the thread pool+ // to overlap I/O-bound git commands. Tasks are fire-and-forget — ongoing// git commands are harmless read-only operations even if skim exits early.let (preview_width, preview_height) = state.initial_layout.preview_dimensions(num_items);- let precompute_cache = Arc::clone(&preview_cache);- std::thread::spawn(move || {- let modes = [- PreviewMode::WorkingTree,- PreviewMode::Log,- PreviewMode::BranchDiff,- PreviewMode::UpstreamDiff,- ];- for item in items_for_precompute {- let branch_name = item.branch_name().to_string();- for mode in modes {- let cache_key = (branch_name.clone(), mode);- // Skip if already cached (e.g., user viewed it before we got here)- if precompute_cache.contains_key(&cache_key) {- continue;- }- let preview =- WorktreeSkimItem::compute_preview(&item, mode, preview_width, preview_height);- precompute_cache.insert(cache_key, preview);- }+ let modes = [+ PreviewMode::WorkingTree,+ PreviewMode::Log,+ PreviewMode::BranchDiff,+ PreviewMode::UpstreamDiff,+ ];+ for item in items_for_precompute {+ for mode in modes {+ let cache = Arc::clone(&preview_cache);+ let item = Arc::clone(&item);+ rayon::spawn(move || {+ let cache_key = (item.branch_name().to_string(), mode);+ cache.entry(cache_key).or_insert_with(|| {+ WorktreeSkimItem::compute_preview(&item, mode, preview_width, preview_height)+ });+ });}- });+ }// Run skimlet output = Skim::run_with(&options, Some(rx));