Repository navigation
sync: pull 3 commits from upstream max-sixty/worktrunk - #3
Merged
Merged
Conversation
…l now carries (max-sixty#4189) Two H3 sections under `## Issue Triage` in the `running-tend` overlay restate rules that tend's bundled `fix-a-bug` skill carries, so the overlay copies can only drift from them — and one already has. - **`Don't fix tests by adding skip guards`** duplicates bundled **Don't "fix" tests by adding skip guards**, down to the same smell list (`let Ok(_) = … else { return };`, `if !path.exists() { return; }`, `#[ignore]`). The bundled version is already wider: it adds `skipIf` / `pytest.skip`, and it leads with the test that generalizes — does the change restore the assertion, or remove coverage for the failing scenario? - **`Same-root-cause-class triage`** duplicates bundled **Defer to in-flight same-root-cause PRs**, with nothing left over. The drift that matters is scope. Both overlay copies sat under `## Issue Triage`, so they read as triage-only rules; `fix-a-bug` is loaded before any fix in any workflow, so the bundled rules bind a nightly sweep and a CI-fix run too. A session reading the overlay alone could conclude a skip guard is fair game outside triage. That's the same correction max-sixty#4086 made for the root-cause rule. So this PR deletes both sections and keeps only what is genuinely worktrunk's, as an addition to the bundled rule rather than a restatement of it: a test leaning on inherited state reworks its own setup via `TestRepo::with_initial_commit()` plus a tempdir. That survivor moves to a top-level section beside the test commands, since it is no more triage-specific than the rules it defers to, and says so explicitly. Both rules were added by max-sixty#2639, whose own body flagged that the skip-guard one "may also generalize beyond worktrunk" — it since has. No regression test: this is instruction text with no code path to exercise. The overlay carries no cross-references to either heading, and `.agents/skills` is a symlink to `.claude/skills`, so the Codex view follows automatically. --------- Co-authored-by: worktrunk-bot <254187624+worktrunk-bot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Clean merge of the 3 commits our fork main was behind upstream on:
No conflicts with our --author patch or the docs regen; touches src/git/parse.rs, src/commands/list/collect/tasks.rs, and .claude/skills/running-tend/SKILL.md only.