feat: add before_render hook to select_list and use nearest-package detection for current-package prioritization

Author: branchseer

crates/vite_select/src/interactive.rs

@@ -238,6 +238,7 @@ pub fn run(
     selected_index: &mut usize,
     header: Option<&str>,
     page_size: usize,
+    mut before_render: impl FnMut(&mut Vec<usize>, &str),
     mut after_render: impl FnMut(&RenderState<'_>),
 ) -> anyhow::Result<()> {
     if items.is_empty() {
@@ -250,6 +251,7 @@ pub fn run(
     crossterm::execute!(out, cursor::Hide)?;
 
     let mut state = State::new(items, initial_query, page_size);
+    before_render(&mut state.filtered, &state.query);
 
     // Initial render
     render(&mut out, &mut state, header)?;
@@ -263,6 +265,7 @@ pub fn run(
                     // Clear the search query and reset the filter
                     state.query.clear();
                     state.refilter();
+                    before_render(&mut state.filtered, &state.query);
                 }
                 KeyCode::Char('c') if modifiers.contains(KeyModifiers::CONTROL) => {
                     cleanup(&mut out, &state)?;
@@ -284,10 +287,12 @@ pub fn run(
                 KeyCode::Char(c) => {
                     state.query.push(c);
                     state.refilter();
+                    before_render(&mut state.filtered, &state.query);
                 }
                 KeyCode::Backspace => {
                     state.query.pop();
                     state.refilter();
+                    before_render(&mut state.filtered, &state.query);
                 }
                 _ => continue,
             },

crates/vite_select/src/lib.rs

@@ -34,6 +34,17 @@ pub struct RenderState<'a> {
     pub selected_index: usize,
 }
 
+/// Parameters for [`select_list`].
+pub struct SelectParams<'a> {
+    pub items: &'a [SelectItem],
+    /// Initial search query (pre-filled in interactive, used as filter in non-interactive).
+    pub query: Option<&'a str>,
+    /// Header line rendered above the list (e.g. an error message).
+    pub header: Option<&'a str>,
+    /// Max visible rows (interactive only).
+    pub page_size: usize,
+}
+
 /// Show a task selection list.
 ///
 /// In [`Mode::Interactive`], enters a terminal UI with fuzzy search and
@@ -50,18 +61,24 @@ pub struct RenderState<'a> {
 /// Returns an error if terminal I/O fails.
 pub fn select_list(
     writer: &mut impl Write,
-    items: &[SelectItem],
-    query: Option<&str>,
+    params: &SelectParams<'_>,
     mode: Mode<'_>,
-    header: Option<&str>,
-    page_size: usize,
+    before_render: impl FnMut(&mut Vec<usize>, &str),
     after_render: impl FnMut(&RenderState<'_>),
 ) -> anyhow::Result<()> {
     match mode {
-        Mode::Interactive { selected_index } => {
-            interactive::run(items, query, selected_index, header, page_size, after_render)
+        Mode::Interactive { selected_index } => interactive::run(
+            params.items,
+            params.query,
+            selected_index,
+            params.header,
+            params.page_size,
+            before_render,
+            after_render,
+        ),
+        Mode::NonInteractive => {
+            non_interactive(writer, params.items, params.query, params.header, before_render)
         }
-        Mode::NonInteractive => non_interactive(writer, items, query, header),
     }
 }
 
@@ -70,10 +87,12 @@ fn non_interactive(
     items: &[SelectItem],
     query: Option<&str>,
     header: Option<&str>,
+    mut before_render: impl FnMut(&mut Vec<usize>, &str),
 ) -> anyhow::Result<()> {
     let labels: Vec<&str> = items.iter().map(|item| item.label.as_str()).collect();
-    let filtered: Vec<usize> =
+    let mut filtered: Vec<usize> =
         query.map_or_else(|| (0..items.len()).collect(), |q| fuzzy_match(q, &labels));
+    before_render(&mut filtered, query.unwrap_or_default());
     let len = filtered.len();
 
     render_items(

crates/vite_task/src/session/mod.rs

@@ -300,6 +300,7 @@ impl<'a> Session<'a> {
     ) -> anyhow::Result<ExitStatus> {
         let cwd = Arc::clone(&self.cwd);
         let task_graph = self.ensure_task_graph_loaded().await?;
+        let current_package_path = task_graph.get_package_path_from_cwd(&cwd).cloned();
         let mut entries = task_graph.list_tasks();
         entries.sort_unstable_by(|a, b| {
             a.task_display
@@ -308,31 +309,19 @@ impl<'a> Session<'a> {
                 .then_with(|| a.task_display.task_name.cmp(&b.task_display.task_name))
         });
 
-        // Find the most specific package containing the CWD (longest matching path)
-        let current_package_path = entries
+        // Build items: current package tasks use unqualified names (no '#'),
+        // other packages use qualified "package#task" names.
+        let select_items: Vec<SelectItem> = entries
             .iter()
-            .map(|e| &e.task_display.package_path)
-            .filter(|p| cwd.as_path().starts_with(p.as_path()))
-            .max_by_key(|p| p.as_path().as_os_str().len())
-            .cloned();
-
-        // Sort: current package tasks first, then others
-        let (current, others): (Vec<_>, Vec<_>) = entries
-            .iter()
-            .partition(|e| current_package_path.as_ref() == Some(&e.task_display.package_path));
-
-        // Build the items list: current package tasks first (unqualified name),
-        // then other packages (qualified with package#task).
-        let select_items: Vec<SelectItem> = current
-            .iter()
-            .map(|entry| SelectItem {
-                label: entry.task_display.task_name.clone(),
-                description: entry.command.clone(),
+            .map(|entry| {
+                let label =
+                    if current_package_path.as_ref() == Some(&entry.task_display.package_path) {
+                        entry.task_display.task_name.clone()
+                    } else {
+                        vite_str::format!("{}", entry.task_display)
+                    };
+                SelectItem { label, description: entry.command.clone() }
             })
-            .chain(others.iter().map(|entry| SelectItem {
-                label: vite_str::format!("{}", entry.task_display),
-                description: entry.command.clone(),
-            }))
             .collect();
 
         // Build header: interactive says "not found.", non-interactive "did you mean:" suffix
@@ -347,19 +336,30 @@ impl<'a> Session<'a> {
         // Build mode-dependent params and call select_list once
         let mut selected_index = if is_interactive { Some(0) } else { None };
         let mut stdout = std::io::stdout();
-        let mode = if let Some(selected_index) = selected_index.as_mut() {
-            vite_select::Mode::Interactive { selected_index }
-        } else {
-            vite_select::Mode::NonInteractive
+        let mode =
+            selected_index.as_mut().map_or(vite_select::Mode::NonInteractive, |selected_index| {
+                vite_select::Mode::Interactive { selected_index }
+            });
+
+        let params = vite_select::SelectParams {
+            items: &select_items,
+            query: not_found_name,
+            header: header.as_deref(),
+            page_size: 8,
         };
 
         vite_select::select_list(
             &mut stdout,
-            &select_items,
-            not_found_name,
+            &params,
             mode,
-            header.as_deref(),
-            8,
+            |filtered, query| {
+                // When the query doesn't contain '#', move current-package tasks (those
+                // without '#' in their label) to the top. `sort_by_key` is a stable sort,
+                // so the fuzzy rating order is preserved within each group.
+                if !query.contains('#') {
+                    filtered.sort_by_key(|&idx| select_items[idx].label.contains('#'));
+                }
+            },
             |state| {
                 use std::io::Write;
                 let milestone_name =

crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots.toml

@@ -77,6 +77,46 @@ steps = [
     { "write-key" = "up" },{ "write-key" = "up" },{ "write-key" = "up" },{ "write-key" = "up" },{ "write-key" = "up" },{ "write-key" = "up" },{ "write-key" = "up" },{ "write-key" = "up" },{ "expect-milestone" = "task-select::0" },{ "write-key" = "enter" },] },
 ]
 
+# Non-interactive: list tasks from lib package (lib tasks first, unqualified)
+[[e2e]]
+name = "non-interactive list tasks from lib"
+cwd = "packages/lib"
+steps = [
+  "echo '' | vp run",
+]
+
+# Interactive: select from lib package (first item is lib's task)
+[[e2e]]
+name = "interactive select task from lib"
+cwd = "packages/lib"
+steps = [
+  { command = "vp run", interactions = [{ "expect-milestone" = "task-select::0" }, { "write-key" = "enter" }] },
+]
+
+# Interactive: search for a task that only exists in another package
+[[e2e]]
+name = "interactive search other package task"
+cwd = "packages/app"
+steps = [
+  { command = "vp run", interactions = [{ "expect-milestone" = "task-select::0" }, { "write" = "typec" }, { "expect-milestone" = "task-select:typec:0" }, { "write-key" = "enter" }] },
+]
+
+# Interactive: '#' in query skips current-package reordering
+[[e2e]]
+name = "interactive search with hash skips reorder"
+cwd = "packages/app"
+steps = [
+  { command = "vp run", interactions = [{ "expect-milestone" = "task-select::0" }, { "write" = "lib#" }, { "expect-milestone" = "task-select:lib#:0" }, { "write-key" = "enter" }] },
+]
+
+# Interactive: multiple current-package matches preserve fuzzy rating order
+[[e2e]]
+name = "interactive search preserves rating within package"
+cwd = "packages/lib"
+steps = [
+  { command = "vp run", interactions = [{ "expect-milestone" = "task-select::0" }, { "write" = "t" }, { "expect-milestone" = "task-select:t:0" }, { "write-key" = "enter" }] },
+]
+
 # Typo inside a task script should fail with an error, NOT show a list
 [[e2e]]
 name = "typo in task script fails without list"

crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search other package task.snap

@@ -0,0 +1,37 @@
+---
+source: crates/vite_task_bin/tests/e2e_snapshots/main.rs
+expression: e2e_outputs
+---
+> vp run
+@ expect-milestone: task-select::0
+Search task (↑/↓ to move, enter to select):
+> build: echo build app
+  lint: echo lint app
+  test: echo test app
+  lib#build: echo build lib
+  lib#lint: echo lint lib
+  lib#test: echo test lib
+  lib#typecheck: echo typecheck lib
+  task-select-test#check: echo check root
+  (…4 more)
+@ write: typec
+@ expect-milestone: task-select:typec:0
+Search task (↑/↓ to move, enter to select): typec
+> lib#typecheck: echo typecheck lib
+@ write-key: enter
+~/packages/lib$ echo typecheck lib ⊘ cache disabled: built-in command
+typecheck lib
+
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    Vite+ Task Runner • Execution Summary
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Statistics:   1 tasks • 0 cache hits • 0 cache misses • 1 cache disabled 
+Performance:  0% cache hit rate
+
+Task Details:
+────────────────────────────────────────────────
+  [1] lib#typecheck: ~/packages/lib$ echo typecheck lib ✓
+      → Cache disabled for built-in command
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search preserves rating within package.snap

@@ -0,0 +1,45 @@
+---
+source: crates/vite_task_bin/tests/e2e_snapshots/main.rs
+expression: e2e_outputs
+---
+> vp run
+@ expect-milestone: task-select::0
+Search task (↑/↓ to move, enter to select):
+> build: echo build lib
+  lint: echo lint lib
+  test: echo test lib
+  typecheck: echo typecheck lib
+  app#build: echo build app
+  app#lint: echo lint app
+  app#test: echo test app
+  task-select-test#check: echo check root
+  (…4 more)
+@ write: t
+@ expect-milestone: task-select:t:0
+Search task (↑/↓ to move, enter to select): t
+> test: echo test lib
+  typecheck: echo typecheck lib
+  lint: echo lint lib
+  task-select-test#check: echo check root
+  task-select-test#format: echo format root
+  task-select-test#hello: echo hello from root
+  task-select-test#run-typo-task: vp run nonexistent-xyz
+  task-select-test#validate: echo validate root
+  (…2 more)
+@ write-key: enter
+~/packages/lib$ echo test lib ⊘ cache disabled: built-in command
+test lib
+
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    Vite+ Task Runner • Execution Summary
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Statistics:   1 tasks • 0 cache hits • 0 cache misses • 1 cache disabled 
+Performance:  0% cache hit rate
+
+Task Details:
+────────────────────────────────────────────────
+  [1] lib#test: ~/packages/lib$ echo test lib ✓
+      → Cache disabled for built-in command
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive search with hash skips reorder.snap

@@ -0,0 +1,40 @@
+---
+source: crates/vite_task_bin/tests/e2e_snapshots/main.rs
+expression: e2e_outputs
+---
+> vp run
+@ expect-milestone: task-select::0
+Search task (↑/↓ to move, enter to select):
+> build: echo build app
+  lint: echo lint app
+  test: echo test app
+  lib#build: echo build lib
+  lib#lint: echo lint lib
+  lib#test: echo test lib
+  lib#typecheck: echo typecheck lib
+  task-select-test#check: echo check root
+  (…4 more)
+@ write: lib#
+@ expect-milestone: task-select:lib#:0
+Search task (↑/↓ to move, enter to select): lib#
+> lib#build: echo build lib
+  lib#lint: echo lint lib
+  lib#test: echo test lib
+  lib#typecheck: echo typecheck lib
+@ write-key: enter
+~/packages/lib$ echo build lib ⊘ cache disabled: built-in command
+build lib
+
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    Vite+ Task Runner • Execution Summary
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Statistics:   1 tasks • 0 cache hits • 0 cache misses • 1 cache disabled 
+Performance:  0% cache hit rate
+
+Task Details:
+────────────────────────────────────────────────
+  [1] lib#build: ~/packages/lib$ echo build lib ✓
+      → Cache disabled for built-in command
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

crates/vite_task_bin/tests/e2e_snapshots/fixtures/task-select/snapshots/interactive select task from lib.snap

@@ -0,0 +1,33 @@
+---
+source: crates/vite_task_bin/tests/e2e_snapshots/main.rs
+expression: e2e_outputs
+---
+> vp run
+@ expect-milestone: task-select::0
+Search task (↑/↓ to move, enter to select):
+> build: echo build lib
+  lint: echo lint lib
+  test: echo test lib
+  typecheck: echo typecheck lib
+  app#build: echo build app
+  app#lint: echo lint app
+  app#test: echo test app
+  task-select-test#check: echo check root
+  (…4 more)
+@ write-key: enter
+~/packages/lib$ echo build lib ⊘ cache disabled: built-in command
+build lib
+
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    Vite+ Task Runner • Execution Summary
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Statistics:   1 tasks • 0 cache hits • 0 cache misses • 1 cache disabled 
+Performance:  0% cache hit rate
+
+Task Details:
+────────────────────────────────────────────────
+  [1] lib#build: ~/packages/lib$ echo build lib ✓
+      → Cache disabled for built-in command
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━