Skip to content

Fix progress insertion after collapsed rows#2292

Merged
j178 merged 1 commit into
masterfrom
fix-progress-collapse-anchor
Jul 4, 2026
Merged

Fix progress insertion after collapsed rows#2292
j178 merged 1 commit into
masterfrom
fix-progress-collapse-anchor

Conversation

@j178

@j178 j178 commented Jul 4, 2026

Copy link
Copy Markdown
Owner

Summary

  • Keep project insertion anchors based on live running tails and visible completed rows.
  • Place hidden summaries at the collapsed row anchor.
  • Update output and completion layout state before removing progress bars.

Context

Follow-up to #2291. A collapsed summary could become the next insertion anchor while an older hook in the same project was still running, which allowed later hooks to render above older running rows and corrupt later collapse order.

Copilot AI review requested due to automatic review settings July 4, 2026 09:46
@j178 j178 added the bug Something isn't working label Jul 4, 2026
@codecov

codecov Bot commented Jul 4, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 95.88235% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 93.13%. Comparing base (ce4363d) to head (2042732).

Files with missing lines Patch % Lines
crates/prek/src/cli/run/reporter.rs 95.88% 7 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2292   +/-   ##
=======================================
  Coverage   93.13%   93.13%           
=======================================
  Files         127      127           
  Lines       28094    28167   +73     
=======================================
+ Hits        26164    26234   +70     
- Misses       1930     1933    +3     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adjusts the CLI hook-run progress reporter’s insertion logic so new progress rows are anchored to the correct “visual tail” (running output tails and latest visible completed rows), preventing collapsed summaries from becoming the next insertion anchor and causing row reordering/collapse corruption.

Changes:

  • Replace per-project last_line/active_tail tracking with running_tails and a computed insertion_anchor().
  • Place the hidden summary line at the collapsed-row anchor (instead of always near the header), and keep anchors based on visible/running lines.
  • Rework completion/output flows and update tests to reflect the new anchoring behavior.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread crates/prek/src/cli/run/reporter.rs Outdated
Comment thread crates/prek/src/cli/run/reporter.rs

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1148e532d7

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread crates/prek/src/cli/run/reporter.rs Outdated
@prek-ci-bot

prek-ci-bot Bot commented Jul 4, 2026

Copy link
Copy Markdown

📦 Cargo Bloat Comparison

Binary size change: -0.74% (26.9 MiB → 26.7 MiB)

Expand for cargo-bloat output

Head Branch Results

 File  .text     Size             Crate Name
 1.2%   2.5% 332.0KiB        aws_lc_sys aws_lc_0_41_0_aes_gcm_encrypt_avx512
 1.2%   2.5% 332.0KiB        aws_lc_sys aws_lc_0_41_0_aes_gcm_decrypt_avx512
 0.4%   0.7%  97.1KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.3%   0.7%  93.0KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.3%   0.7%  92.0KiB              prek prek::languages::<impl prek::config::Language>::install::{{closure}}
 0.2%   0.5%  65.4KiB             prek? <prek::cli::Command as clap_builder::derive::Subcommand>::augment_subcommands
 0.2%   0.4%  49.4KiB annotate_snippets annotate_snippets::renderer::render::render
 0.2%   0.4%  48.3KiB              prek prek::run::{{closure}}
 0.2%   0.3%  43.2KiB              prek prek::cli::run::run::run::{{closure}}
 0.2%   0.3%  42.6KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::Config>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.3%  34.2KiB               std core::ptr::drop_in_place<prek::languages::<impl prek::config::Language>::install::{{closure}}>
 0.1%   0.2%  33.1KiB              prek prek::archive::unpack::{{closure}}
 0.1%   0.2%  31.2KiB             prek? <prek::cli::RunOptions as clap_builder::derive::Args>::augment_args
 0.1%   0.2%  29.8KiB     granit_parser granit_parser::scanner::Scanner<T>::fetch_more_tokens
 0.1%   0.2%  28.0KiB        aws_lc_sys aws_lc_0_41_0_edwards25519_scalarmuldouble_alt
 0.1%   0.2%  27.5KiB        aws_lc_sys aws_lc_0_41_0_edwards25519_scalarmuldouble
 0.1%   0.2%  27.3KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::RemoteHook>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.2%  24.8KiB              prek prek::cli::try_repo::try_repo::{{closure}}
 0.1%   0.2%  24.7KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::LocalHook>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.2%  24.6KiB              prek prek::languages::ruby::installer::RubyInstaller::install::{{closure}}
42.1%  86.2%  11.2MiB                   And 24517 smaller methods. Use -n N to show more.
48.8% 100.0%  13.1MiB                   .text section size, the file size is 26.7MiB

Base Branch Results

 File  .text     Size             Crate Name
 1.2%   2.5% 332.0KiB        aws_lc_sys aws_lc_0_41_0_aes_gcm_encrypt_avx512
 1.2%   2.5% 332.0KiB        aws_lc_sys aws_lc_0_41_0_aes_gcm_decrypt_avx512
 0.4%   0.7%  97.4KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.4%   0.7%  97.1KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.3%   0.7%  92.0KiB              prek prek::languages::<impl prek::config::Language>::install::{{closure}}
 0.2%   0.5%  66.8KiB             prek? <prek::cli::Command as clap_builder::derive::Subcommand>::augment_subcommands
 0.2%   0.4%  49.4KiB annotate_snippets annotate_snippets::renderer::render::render
 0.2%   0.4%  48.3KiB              prek prek::run::{{closure}}
 0.2%   0.3%  43.3KiB              prek prek::cli::run::run::run::{{closure}}
 0.2%   0.3%  42.6KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::Config>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.3%  34.6KiB               std core::ptr::drop_in_place<prek::languages::<impl prek::config::Language>::install::{{closure}}>
 0.1%   0.2%  33.4KiB              prek prek::archive::unpack::{{closure}}
 0.1%   0.2%  32.1KiB             prek? <prek::cli::RunOptions as clap_builder::derive::Args>::augment_args
 0.1%   0.2%  29.8KiB     granit_parser granit_parser::scanner::Scanner<T>::fetch_more_tokens
 0.1%   0.2%  28.0KiB        aws_lc_sys aws_lc_0_41_0_edwards25519_scalarmuldouble_alt
 0.1%   0.2%  27.5KiB        aws_lc_sys aws_lc_0_41_0_edwards25519_scalarmuldouble
 0.1%   0.2%  27.3KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::RemoteHook>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.2%  24.8KiB              prek prek::cli::try_repo::try_repo::{{closure}}
 0.1%   0.2%  24.7KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::LocalHook>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.2%  24.5KiB              prek prek::languages::ruby::installer::RubyInstaller::install::{{closure}}
42.4%  86.3%  11.4MiB                   And 24558 smaller methods. Use -n N to show more.
49.1% 100.0%  13.2MiB                   .text section size, the file size is 26.9MiB

@prek-ci-bot

prek-ci-bot Bot commented Jul 4, 2026

Copy link
Copy Markdown

⚡️ Hyperfine Benchmarks

Summary: 0 regressions, 0 improvements above the 10% threshold.

Environment
  • OS: Linux 6.17.0-1018-azure
  • CPU: 4 cores
  • prek version: prek 0.4.6+10 (f4c12be 2026-07-04)
  • Rust version: rustc 1.96.1 (31fca3adb 2026-06-26)
  • Hyperfine version: hyperfine 1.20.0
CLI Commands

Benchmarking basic commands in the main repo:

prek --version

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base --version 1.9 ± 0.1 1.8 2.6 1.00 ± 0.06
prek-head --version 1.9 ± 0.1 1.8 2.1 1.00

prek list

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base list 7.5 ± 0.1 7.3 7.7 1.00
prek-head list 8.1 ± 5.9 7.3 66.0 1.08 ± 0.78

prek validate-config .pre-commit-config.yaml

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base validate-config .pre-commit-config.yaml 2.7 ± 0.1 2.6 2.9 1.00
prek-head validate-config .pre-commit-config.yaml 2.7 ± 0.0 2.6 2.8 1.01 ± 0.03

prek sample-config

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base sample-config 2.2 ± 0.1 2.1 2.3 1.01 ± 0.03
prek-head sample-config 2.1 ± 0.0 2.1 2.2 1.00
Cold vs Warm Runs

Comparing first run (cold) vs subsequent runs (warm cache):

prek run --all-files (cold - no cache)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run --all-files 58.3 ± 2.6 54.6 62.5 1.00
prek-head run --all-files 58.6 ± 2.2 56.1 62.0 1.01 ± 0.06

prek run --all-files (warm - with cache)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run --all-files 58.3 ± 2.5 55.2 63.1 1.00
prek-head run --all-files 59.8 ± 2.7 54.3 63.9 1.03 ± 0.06
Full Hook Suite

Running the builtin hook suite on the benchmark workspace:

prek run --all-files (full builtin hook suite)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run --all-files 58.5 ± 2.4 54.2 63.5 1.00
prek-head run --all-files 58.7 ± 2.1 55.1 63.4 1.00 ± 0.05
Individual Hook Performance

Benchmarking each hook individually on the test repo:

prek run trailing-whitespace --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run trailing-whitespace --all-files 15.9 ± 0.4 15.4 16.6 1.01 ± 0.03
prek-head run trailing-whitespace --all-files 15.8 ± 0.2 15.3 16.3 1.00

prek run end-of-file-fixer --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run end-of-file-fixer --all-files 20.2 ± 1.4 18.5 23.0 1.00
prek-head run end-of-file-fixer --all-files 20.4 ± 1.6 18.6 24.7 1.01 ± 0.10

prek run check-json --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run check-json --all-files 6.4 ± 0.2 6.0 6.8 1.01 ± 0.04
prek-head run check-json --all-files 6.3 ± 0.2 6.1 6.8 1.00

prek run check-yaml --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run check-yaml --all-files 6.2 ± 0.1 6.0 6.4 1.01 ± 0.02
prek-head run check-yaml --all-files 6.1 ± 0.1 6.0 6.4 1.00

prek run check-toml --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run check-toml --all-files 6.4 ± 0.6 5.9 9.1 1.02 ± 0.09
prek-head run check-toml --all-files 6.2 ± 0.2 5.9 6.7 1.00

prek run check-xml --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run check-xml --all-files 6.2 ± 0.2 6.0 6.7 1.00
prek-head run check-xml --all-files 6.3 ± 0.2 5.9 6.8 1.00 ± 0.04

prek run detect-private-key --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run detect-private-key --all-files 10.5 ± 0.8 9.3 12.1 1.01 ± 0.11
prek-head run detect-private-key --all-files 10.4 ± 0.8 9.3 12.4 1.00

prek run fix-byte-order-marker --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run fix-byte-order-marker --all-files 14.4 ± 0.7 13.2 15.9 1.02 ± 0.06
prek-head run fix-byte-order-marker --all-files 14.1 ± 0.5 13.4 15.7 1.00
Installation Performance

Benchmarking hook installation (fast path hooks skip Python setup):

prek install-hooks (cold - no cache)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base install-hooks 3.8 ± 0.0 3.8 3.9 1.01 ± 0.02
prek-head install-hooks 3.8 ± 0.1 3.7 3.8 1.00

prek install-hooks (warm - with cache)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base install-hooks 3.8 ± 0.0 3.8 3.9 1.00
prek-head install-hooks 3.9 ± 0.1 3.9 4.0 1.02 ± 0.02
File Filtering/Scoping Performance

Testing different file selection modes:

prek run (staged files only)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run 30.2 ± 0.6 29.4 31.9 1.00
prek-head run 30.5 ± 0.7 29.4 31.9 1.01 ± 0.03

prek run --files '*.json' (specific file type)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run --files '*.json' 6.6 ± 0.1 6.5 6.7 1.00
prek-head run --files '*.json' 6.7 ± 0.0 6.6 6.8 1.00 ± 0.01
Workspace Discovery & Initialization

Benchmarking hook discovery and initialization overhead:

prek run --dry-run --all-files (measures init overhead)

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run --dry-run --all-files 5.7 ± 0.1 5.6 6.0 1.01 ± 0.02
prek-head run --dry-run --all-files 5.7 ± 0.1 5.5 5.7 1.00
Meta Hooks Performance

Benchmarking meta hooks separately:

prek run check-hooks-apply --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run check-hooks-apply --all-files 9.6 ± 0.5 8.8 10.0 1.08 ± 0.06
prek-head run check-hooks-apply --all-files 8.9 ± 0.1 8.8 9.2 1.00

prek run check-useless-excludes --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run check-useless-excludes --all-files 8.8 ± 0.1 8.7 8.9 1.00
prek-head run check-useless-excludes --all-files 8.9 ± 0.1 8.7 9.2 1.01 ± 0.02

prek run identity --all-files

Command Mean [ms] Min [ms] Max [ms] Relative
prek-base run identity --all-files 8.3 ± 0.1 8.2 8.4 1.00
prek-head run identity --all-files 8.3 ± 0.1 8.2 8.5 1.00 ± 0.01

@j178 j178 force-pushed the fix-progress-collapse-anchor branch from 1148e53 to b039df3 Compare July 4, 2026 10:01
Copilot AI review requested due to automatic review settings July 4, 2026 10:20
@j178 j178 force-pushed the fix-progress-collapse-anchor branch from b039df3 to 2042732 Compare July 4, 2026 10:20

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

@j178 j178 merged commit 5f0e654 into master Jul 4, 2026
37 checks passed
@j178 j178 deleted the fix-progress-collapse-anchor branch July 4, 2026 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants