From 00ac122b2b5c13eac5b6757612be2aa8dfdcefac Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 21 Feb 2026 20:58:30 +0200 Subject: Update --- fish/conf.d/taskwarrior.fish | 1 + prompts/skills/project-taskwarrior/3-complete-task.md | 9 ++++++--- prompts/skills/project-taskwarrior/SKILL.md | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fish/conf.d/taskwarrior.fish b/fish/conf.d/taskwarrior.fish index 2daa8f4..7ec437b 100644 --- a/fish/conf.d/taskwarrior.fish +++ b/fish/conf.d/taskwarrior.fish @@ -126,6 +126,7 @@ end function taskwarrior::db::prune yes | task +random status:completed delete + yes | task +agent status:completed delete end function taskwarrior::invoke diff --git a/prompts/skills/project-taskwarrior/3-complete-task.md b/prompts/skills/project-taskwarrior/3-complete-task.md index 598afdc..df03f85 100644 --- a/prompts/skills/project-taskwarrior/3-complete-task.md +++ b/prompts/skills/project-taskwarrior/3-complete-task.md @@ -10,6 +10,7 @@ A task is **not** considered done until all of the following are true: - **Compilable** — all code compiles successfully (e.g. full build succeeds). - **Tests pass** — all tests pass (e.g. full test suite green). - **Negative tests where plausible** — for any new or changed tests, include negative tests (invalid input, errors, failure cases) wherever plausible. +- **All changes committed to git** — on completion of the task, all changes must be committed to git (e.g. a single commit or logical commits with a clear message referencing the task). If any of these fail, fix the issues and recheck. Do not mark the task complete until they are all met. @@ -40,7 +41,8 @@ If the answer suggests improvements or inconsistencies, address them first. Only 2. Sub-agent reviews the diff, code, or deliverables for the task (including test coverage and test quality — see “What the review sub-agent must check”) and **reports back** to the main agent (review comments, suggestions, issues). 3. Main agent **addresses all review comments** from the sub-agent — no exceptions. Fix or respond to every point. 4. **Self-review again** (see above). Then **spawn another sub-agent** (fresh context again) to **review the code again** (including test coverage and test quality) and confirm the fixes. If this second review finds further issues, address them and repeat the sub-agent review until the review is satisfied. -5. Only then: +5. **Commit all changes to git** (e.g. `git add` and `git commit` with a message that references the task). Do not mark the task complete with uncommitted changes. +6. Only then: ```bash task done @@ -49,7 +51,8 @@ task done ## Conventions - When creating or changing tests, add negative tests (invalid input, errors, failure paths) wherever plausible; the review sub-agent will check for this. -- A task is not done until: best practices met, code compiles, all tests pass, negative tests included where plausible, all first-round review comments addressed (including coverage and test-quality checks), **and** a second sub-agent review has confirmed the code (or any further issues have been addressed and re-reviewed). +- A task is not done until: best practices met, code compiles, all tests pass, negative tests included where plausible, all first-round review comments addressed (including coverage and test-quality checks), a second sub-agent review has confirmed the code, **and all changes are committed to git**. - Before every sub-agent review handoff, do the self-review: “Did it all make sense? Is there a better way?” Fix anything that comes up, then hand off. -- Complete with `task done` only after completion criteria, self-review(s), first review, addressing all comments, and the follow-up sub-agent review are satisfied. +- **On completion, commit all changes to git** before running `task done`; do not leave uncommitted work when marking a task complete. +- Complete with `task done` only after completion criteria, self-review(s), first review, addressing all comments, follow-up sub-agent review, and git commit are satisfied. - When completing a task, note which tasks were unblocked (dependents that became ready), if any. diff --git a/prompts/skills/project-taskwarrior/SKILL.md b/prompts/skills/project-taskwarrior/SKILL.md index 7686efb..a170839 100644 --- a/prompts/skills/project-taskwarrior/SKILL.md +++ b/prompts/skills/project-taskwarrior/SKILL.md @@ -21,6 +21,6 @@ Always load `00-context.md` first (project name resolution and global rules); th ## Task lifecycle (overview) -1. Create task → 2. Start task → 3. Annotate as you go → 4. **Completion criteria** (best practices, compilable, all tests pass) → 5. Sub-agent review (fresh context) → 6. Main agent addresses all review comments → 7. **Second sub-agent review** (fresh context again) to confirm fixes → 8. Complete task +1. Create task → 2. Start task → 3. Annotate as you go → 4. **Completion criteria** (best practices, compilable, all tests pass, negative tests where plausible) → 5. Sub-agent review (fresh context) → 6. Main agent addresses all review comments → 7. **Second sub-agent review** (fresh context again) to confirm fixes → 8. **Commit all changes to git** → 9. Complete task -A task is not done until criteria are met, all review comments are addressed, and a second sub-agent review has confirmed the code. Details are in `3-complete-task.md`. +A task is not done until criteria are met, all review comments are addressed, a second sub-agent review has confirmed the code, and all changes are committed to git. Details are in `3-complete-task.md`. -- cgit v1.2.3