fix(task): resolve jobs=1 hang and keep-order panic; improve Ctrl-C handling#6264
fix(task): resolve jobs=1 hang and keep-order panic; improve Ctrl-C handling#6264
Conversation
…andling\n\n- Don’t take semaphore permits for orchestrator-only tasks\n- Safely register keep-order buffers for injected tasks\n- Loop Ctrl-C handler and propagate SIGINT to children\n- Add e2e tests for jobs=1 and keep-order
There was a problem hiding this comment.
Pull Request Overview
This PR fixes critical issues with task execution including jobs=1 hanging, keep-order output panics, and improves Ctrl-C signal handling. The changes focus on proper resource management and signal propagation.
- Implement conditional semaphore acquisition to prevent orchestrator-only tasks from consuming permits
- Add defensive programming for keep-order output buffers to handle injected tasks safely
- Convert Ctrl-C handler to a loop for better signal handling and child process propagation
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/ui/ctrlc.rs | Modified Ctrl-C handler to loop and continuously handle interrupts |
| src/cli/run.rs | Added conditional semaphore logic and defensive keep-order buffer handling |
| e2e/tasks/test_task_sequence_keep_order | E2E test for keep-order output functionality |
| e2e/tasks/test_task_sequence_jobs1 | E2E test for jobs=1 execution |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| fn task_needs_permit(task: &Task) -> bool { | ||
| // Only shell/script tasks execute external commands and need a concurrency slot. | ||
| // Orchestrator-only tasks (pure groups of sub-tasks) do not. | ||
| task.file.is_some() || !task.run_script_strings().is_empty() |
There was a problem hiding this comment.
[nitpick] Consider using a more explicit boolean expression instead of relying on double negation. The logic would be clearer as task.file.is_some() || task.run_script_strings().is_empty() == false or restructuring to avoid the negation entirely.
| task.file.is_some() || !task.run_script_strings().is_empty() | |
| task.file.is_some() || task.run_script_strings().is_empty() == false |
| if !map.contains_key(task) { | ||
| map.insert(task.clone(), Default::default()); | ||
| } | ||
| if let Some(entry) = map.get_mut(task) { | ||
| entry.0.push((prefix.to_string(), line)); | ||
| } | ||
| }); | ||
| cmd = cmd.with_on_stderr(|line| { | ||
| self.keep_order_output | ||
| .lock() | ||
| .unwrap() | ||
| .get_mut(task) | ||
| .unwrap() | ||
| .1 | ||
| .push((prefix.to_string(), line)); | ||
| let mut map = self.keep_order_output.lock().unwrap(); | ||
| if !map.contains_key(task) { | ||
| map.insert(task.clone(), Default::default()); | ||
| } | ||
| if let Some(entry) = map.get_mut(task) { | ||
| entry.1.push((prefix.to_string(), line)); | ||
| } |
There was a problem hiding this comment.
The code performs two map lookups (contains_key and get_mut) when it could use a single entry API call. Consider using map.entry(task.clone()).or_default().0.push((prefix.to_string(), line)) for better performance.
| if !map.contains_key(task) { | ||
| map.insert(task.clone(), Default::default()); | ||
| } | ||
| if let Some(entry) = map.get_mut(task) { | ||
| entry.0.push((prefix.to_string(), line)); | ||
| } | ||
| }); | ||
| cmd = cmd.with_on_stderr(|line| { | ||
| self.keep_order_output | ||
| .lock() | ||
| .unwrap() | ||
| .get_mut(task) | ||
| .unwrap() | ||
| .1 | ||
| .push((prefix.to_string(), line)); | ||
| let mut map = self.keep_order_output.lock().unwrap(); | ||
| if !map.contains_key(task) { | ||
| map.insert(task.clone(), Default::default()); | ||
| } | ||
| if let Some(entry) = map.get_mut(task) { | ||
| entry.1.push((prefix.to_string(), line)); | ||
| } |
There was a problem hiding this comment.
Same issue as the stdout handler above - this performs two map lookups when it could use the entry API. Consider using map.entry(task.clone()).or_default().1.push((prefix.to_string(), line)) for better performance.
Hyperfine Performance
|
| Command | Mean [ms] | Min [ms] | Max [ms] | Relative |
|---|---|---|---|---|
mise-2025.9.8 x -- echo |
20.2 ± 0.6 | 18.6 | 22.5 | 1.00 |
mise x -- echo |
20.5 ± 0.8 | 19.0 | 21.9 | 1.02 ± 0.05 |
mise env
| Command | Mean [ms] | Min [ms] | Max [ms] | Relative |
|---|---|---|---|---|
mise-2025.9.8 env |
19.6 ± 0.8 | 18.2 | 28.6 | 1.00 |
mise env |
20.3 ± 0.8 | 18.2 | 22.6 | 1.03 ± 0.06 |
mise hook-env
| Command | Mean [ms] | Min [ms] | Max [ms] | Relative |
|---|---|---|---|---|
mise-2025.9.8 hook-env |
19.9 ± 0.4 | 18.6 | 21.7 | 1.00 |
mise hook-env |
20.6 ± 0.6 | 19.0 | 24.8 | 1.03 ± 0.04 |
mise ls
| Command | Mean [ms] | Min [ms] | Max [ms] | Relative |
|---|---|---|---|---|
mise-2025.9.8 ls |
17.7 ± 0.7 | 15.8 | 19.1 | 1.00 |
mise ls |
18.4 ± 0.6 | 16.8 | 21.9 | 1.04 ± 0.05 |
xtasks/test/perf
| Command | mise-2025.9.8 | mise | Variance |
|---|---|---|---|
| install (cached) | 179ms | ✅ 109ms | +64% |
| ls (cached) | 68ms | 68ms | +0% |
| bin-paths (cached) | 74ms | 74ms | +0% |
| task-ls (cached) | 520ms | 514ms | +1% |
✅ Performance improvement: install cached is 64%
### 🐛 Bug Fixes - **(backend)** make HTTP installs atomic and serialize with cache lock by @jdx in [#6259](#6259) - **(env)** allow nested env._.path directives by @risu729 in [#6160](#6160) - **(env)** disallow nested env objects by @risu729 in [#6268](#6268) - **(schema)** allow nested arrays in task.depends by @risu729 in [#6265](#6265) - **(task)** resolve jobs=1 hang and keep-order panic; improve Ctrl-C handling by @jdx in [#6264](#6264) - **(tasks)** stop CLI group after first failure without --continue-on-error by @jdx in [#6270](#6270) ### 📚 Documentation - fixed toml issues in URL replacements settings documentation by @ThomasSteinbach in [#6269](#6269) ### Chore - **(schema)** strict oneOf branches and DRY env_directive in schemas by @jdx in [#6271](#6271) - add schema linter by @risu729 in [#6267](#6267) Co-authored-by: mise-en-dev <release@mise.jdx.dev>
## [2025.9.12](https://github.com/jdx/mise/compare/v2025.9.11..v2025.9.12) - 2025-09-16 ### 🐛 Bug Fixes - **(ci)** properly exclude aqua-registry files from hk linting by @jdx in [42d7758](jdx/mise@42d7758) ### Chore - **(release)** embed aqua-registry under crate and publish like vfox by @jdx in [#6306](jdx/mise#6306) - ignore aqua-registry assets from prettier by @jdx in [047d77b](jdx/mise@047d77b) - disable "useless cat" shellcheck by @jdx in [a6def59](jdx/mise@a6def59) ## [2025.9.11](https://github.com/jdx/mise/compare/v2025.9.10..v2025.9.11) - 2025-09-16 ### 📦 Registry - indicate aws-cli is v2 by @jayvdb in [#6300](jdx/mise#6300) ### 🚀 Features - **(ci)** run all registry tools when workflow_dispatch is triggered by @jdx in [#6295](jdx/mise#6295) - **(cli)** handle non-existent working directories gracefully by @jdx in [#6304](jdx/mise#6304) - **(set)** add -E/--env flag to mise set command by @jdx in [#6291](jdx/mise#6291) - **(tasks)** make auto outputs default by @risu729 in [#6137](jdx/mise#6137) ### 🐛 Bug Fixes - align crate versions to fix release-plz script by @jdx in [5a464e9](jdx/mise@5a464e9) ### 🚜 Refactor - **(aqua)** extract aqua registry into internal subcrate by @jdx in [#6293](jdx/mise#6293) ### 📚 Documentation - fix mkdir paths by @risu729 in [#6298](jdx/mise#6298) - fix rust profile default by @risu729 in [#6305](jdx/mise#6305) ### Chore - **(aqua-registry)** remove unused aqua-registry files by @jdx in [#6294](jdx/mise#6294) - **(release)** make release-plz idempotent for existing crate versions by @jdx in [dbdfd6a](jdx/mise@dbdfd6a) - **(release)** skip publishing mise when aqua-registry is a path dep by @jdx in [47efffd](jdx/mise@47efffd) - keep aqua-registry LICENSE file by @risu729 in [#6297](jdx/mise#6297) ### New Contributors - @jayvdb made their first contribution in [#6300](jdx/mise#6300) ## [2025.9.10](https://github.com/jdx/mise/compare/v2025.9.9..v2025.9.10) - 2025-09-13 ### 📦 Registry - use asdf to install semver-tool by @jylenhof in [#6233](jdx/mise#6233) ### 🐛 Bug Fixes - **(tool-stub)** detect binary names from single-file downloads by @jdx in [#6281](jdx/mise#6281) ### 🚜 Refactor - allow any collection types in deserialize_arr by @risu729 in [#6282](jdx/mise#6282) - use deserialize_arr for task runs by @risu729 in [#6253](jdx/mise#6253) ### 📚 Documentation - **(getting-started)** add backends step with diagram, github example, env vars and simple tasks by @jdx in [#6288](jdx/mise#6288) - simplify OS detection in tool plugin development by @jdx in [#6287](jdx/mise#6287) - update backend plugin template references by @jdx in [942f5eb](jdx/mise@942f5eb) ### 📦️ Dependency Updates - update rust crate chrono to v0.4.42 by @renovate[bot] in [#6274](jdx/mise#6274) - update taiki-e/install-action digest to 0154864 by @renovate[bot] in [#6273](jdx/mise#6273) ### Chore - **(schema)** fix schema for subtasks by @risu729 in [#6289](jdx/mise#6289) - update render:schema task by @risu729 in [#6275](jdx/mise#6275) ## [2025.9.9](https://github.com/jdx/mise/compare/v2025.9.8..v2025.9.9) - 2025-09-11 ### 🐛 Bug Fixes - **(backend)** make HTTP installs atomic and serialize with cache lock by @jdx in [#6259](jdx/mise#6259) - **(env)** allow nested env._.path directives by @risu729 in [#6160](jdx/mise#6160) - **(env)** disallow nested env objects by @risu729 in [#6268](jdx/mise#6268) - **(schema)** allow nested arrays in task.depends by @risu729 in [#6265](jdx/mise#6265) - **(task)** resolve jobs=1 hang and keep-order panic; improve Ctrl-C handling by @jdx in [#6264](jdx/mise#6264) - **(tasks)** stop CLI group after first failure without --continue-on-error by @jdx in [#6270](jdx/mise#6270) ### 📚 Documentation - fixed toml issues in URL replacements settings documentation by @ThomasSteinbach in [#6269](jdx/mise#6269) ### Chore - **(schema)** strict oneOf branches and DRY env_directive in schemas by @jdx in [#6271](jdx/mise#6271) - add schema linter by @risu729 in [#6267](jdx/mise#6267) ## [2025.9.8](https://github.com/jdx/mise/compare/v2025.9.7..v2025.9.8) - 2025-09-10 ### 🐛 Bug Fixes - **(tasks)** prevent hang when task fails in sequence by @jdx in [#6260](jdx/mise#6260) - **(version)** fetch mise version if cached version is older than the current by @risu729 in [#6252](jdx/mise#6252) ### 📦️ Dependency Updates - update rhysd/action-setup-vim action to v1.4.3 by @renovate[bot] in [#6249](jdx/mise#6249) ## [2025.9.7](https://github.com/jdx/mise/compare/v2025.9.6..v2025.9.7) - 2025-09-09 ### 🐛 Bug Fixes - **(env)** allow mixed map for env._.file by @risu729 in [#6148](jdx/mise#6148) - **(tasks)** restore parallel starts with poetry via list_paths cache and stable exec-env cache by @jdx in [#6237](jdx/mise#6237) - add 'unknown' to the list of OS patterns by @efussi in [#6235](jdx/mise#6235) - propagate errors from backend installs by @jdx in [#6236](jdx/mise#6236) ### 📦️ Dependency Updates - update taiki-e/install-action digest to 0c5db7f by @renovate[bot] in [#6244](jdx/mise#6244) - update golang docker tag to v1.25.1 by @renovate[bot] in [#6247](jdx/mise#6247) - update dependency vitepress to v1.6.4 by @renovate[bot] in [#6246](jdx/mise#6246) ### New Contributors - @efussi made their first contribution in [#6235](jdx/mise#6235)
Fix task sequencing hangs and panics.
--jobs=1; fix panic withMISE_TASK_OUTPUT=keep-order; improve Ctrl-C handling.--jobs=1)e2e/tasks/test_task_sequence_jobs1,e2e/tasks/test_task_sequence_keep_orderRefs: #6257