Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

chore(ci): weekly renovation 2026-08-23 (#3880)

Worktrunk Botf2ae1c5fb5e2
diff --git a/.claude/skills/running-tend/SKILL.md b/.claude/skills/running-tend/SKILL.md
index 3321622e5..dd017b45c 100644
--- a/.claude/skills/running-tend/SKILL.md
+++ b/.claude/skills/running-tend/SKILL.md
@@ -266,6 +266,11 @@ Files to update:
| `Cargo.toml` | `rust-version` | `"1.93"` |
| `tests/helpers/wt-perf/Cargo.toml` | `rust-version` | `"1.93"` |
| `rust-toolchain.toml` | `channel` | `"1.93.0"` |
+| `.github/workflows/nightly.yaml` | `rustup override set nightly-<date>`, twice (`minimal-versions`, `check-unused-dependencies`) | a nightly from the last few weeks |
+
+Bump the nightly pins only when the pinned date is more than three months old.
+Cargo refuses a workspace whose `rust-version` exceeds the toolchain, so an
+MSRV bump past a stale pin fails both jobs before they check anything.
`flake.nix` reads the channel from `rust-toolchain.toml`, so no separate bump
is needed. After updating the toolchain, refresh `flake.lock` so the locked
@@ -339,9 +344,26 @@ Triage each duplicate:
open an issue or fix it. Common shapes: `merge_base("main", "<sha>")` vs
`merge_base("main", "branch")` keying separately;
`worktree_at(cwd)` vs `worktree_at(porcelain_path)` not canonicalizing.
+- **Measurement artifact** — `-vv` is what produces the trace, and the
+ diagnostic collector that writes the bundle runs its own `git --version`,
+ `gh --version`, and `git worktree list --porcelain` (`src/diagnostic.rs`)
+ *after* the render, into the same trace. So the report reliably pairs those
+ with the render's calls on an otherwise clean run. Only a duplicate *within*
+ the render is a finding; the collector's calls are the trailing block in
+ `"$(git rev-parse --git-common-dir)/wt/logs/trace.log"`.
Baseline: ~29 git subprocesses per render on a clean tree; a jump above
-~32 warrants investigation.
+~32 warrants investigation. `command_count` in the same JSON report is the
+number to read, minus the collector's three calls: the baseline was measured
+before the recipe used `-vv`, so it counts the render alone, and three is the
+whole width of the ~32 threshold.
+
+Discounting by hand is a stopgap — the durable fix is to give the collector's
+subprocesses a reserved context in `Profile::from_entries` and exclude it from
+both `command_count` and the duplicate bucketing, so the number means the
+render again. When that lands, delete this paragraph, the **Measurement
+artifact** bullet, and the discount clause in the paragraph above — the
+`~29`/`~32` baseline itself stays.
## Weekly Maintenance: LLM Model Names in Docs
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 86ce1f499..6b22de575 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -35,7 +35,7 @@ jobs:
- uses: baptiste0928/cargo-install@v3
with:
crate: cargo-llvm-cov
- version: "=0.8.7"
+ version: "=0.9.0"
- uses: baptiste0928/cargo-install@v3
with:
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index d33498335..0fb22e2f7 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -288,8 +288,9 @@ jobs:
- name: 📂 Checkout code
uses: actions/checkout@v7
- # cargo-udeps requires nightly; update date periodically
- - run: rustup override set nightly-2026-03-01
+ # cargo-udeps requires nightly. Keep at or above `rust-version` in
+ # `Cargo.toml`; see the note on `minimal-versions`' identical pin.
+ - run: rustup override set nightly-2026-08-01
- name: 💰 Cache
uses: Swatinem/rust-cache@v2
@@ -324,7 +325,12 @@ jobs:
- name: 📂 Checkout code
uses: actions/checkout@v7
- - run: rustup override set nightly-2026-03-01
+ # Pinned so `-Z direct-minimal-versions` resolves reproducibly. Must stay
+ # at or above `rust-version` in `Cargo.toml`: cargo refuses a workspace
+ # whose MSRV exceeds the toolchain, so a stale pin fails the job outright
+ # rather than reporting on dependency floors. Bumped by the weekly MSRV
+ # pass, with headroom so that isn't every week.
+ - run: rustup override set nightly-2026-08-01
- name: 💰 Cache
uses: Swatinem/rust-cache@v2
diff --git a/Cargo.toml b/Cargo.toml
index 4ee8575cf..147cfcdbd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ filterset = "test(/readme_sync/)"
name = "worktrunk"
version = "0.74.0"
edition = "2024"
-rust-version = "1.96"
+rust-version = "1.97"
build = "build.rs"
repository = "https://github.com/max-sixty/worktrunk"
homepage = "https://worktrunk.dev"
diff --git a/flake.lock b/flake.lock
index fdc680bbf..d0c393e9c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,11 +64,11 @@
]
},
"locked": {
- "lastModified": 1780370483,
- "narHash": "sha256-7mDa7OBAaf7MU6ZovT9ENfD62kH911SsSazBb4KTDF0=",
+ "lastModified": 1787454509,
+ "narHash": "sha256-r4LDUF+zmJnkftvCVkCrUhSJazsf6EVJF+V2l4/MYbI=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "4a408e1fc99ad517b4cb402fd0de7464f40c05e1",
+ "rev": "f60c1b57ff805a46b5175c76fc981fb4f81efbcc",
"type": "github"
},
"original": {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 4f0430eac..2c202d45e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
[toolchain]
-channel = "1.96.0"
+channel = "1.97.0"
components = ["rustfmt", "clippy"]
diff --git a/tests/CLAUDE.md b/tests/CLAUDE.md
index e52c49e5a..cef11a54f 100644
--- a/tests/CLAUDE.md
+++ b/tests/CLAUDE.md
@@ -48,9 +48,11 @@ When `codecov/patch` fails, investigate before declaring ready (the merge gate i
```bash
task coverage
-cargo llvm-cov report --show-missing-lines | grep <file> # authoritative miss list; matches codecov line-for-line
+cargo llvm-cov report --show-missing-lines | grep <file> # authoritative miss list; same lines codecov counts
```
+Since cargo-llvm-cov 0.9.0 that column collapses consecutive misses into ranges (`12-18`, not `12, 13, …`), so expand a range before comparing it against a codecov line list.
+
For each uncovered function, either write a test (integration tests via `assert_cmd_snapshot!` do capture subprocess coverage) or document why it's intentionally untested.
**Querying codecov directly** serves two cases the local report can't: disputing a posted check, and running in CI, where `task coverage` isn't installed. Prefer measuring everywhere else.
diff --git a/tests/helpers/wt-perf/Cargo.toml b/tests/helpers/wt-perf/Cargo.toml
index 739885daf..25aa1a513 100644
--- a/tests/helpers/wt-perf/Cargo.toml
+++ b/tests/helpers/wt-perf/Cargo.toml
@@ -7,7 +7,7 @@
name = "wt-perf"
version = "0.1.0"
edition = "2024"
-rust-version = "1.96"
+rust-version = "1.97"
publish = false
description = "Performance testing and tracing tools for worktrunk"