From 87566e2a1ed012b66d255f2210950acb9d12ba77 Mon Sep 17 00:00:00 2001 From: bchanot Date: Thu, 19 Nov 2026 16:16:24 +0100 Subject: [PATCH] feat(doctrine): feat and bugfix end lines restate the merge-reuse clause Completes the six gate flows: a later merge proposal reuses the last run's answer, or its skip, and names code commits made after it. loops-light locks both sites and pins the doc/memory exception in both loops. --- lib/tests/loops-light.test.sh | 8 +++++++- skills/bugfix/SKILL.md | 4 +++- skills/feat/SKILL.md | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/tests/loops-light.test.sh b/lib/tests/loops-light.test.sh index d382c27..1a7b72b 100644 --- a/lib/tests/loops-light.test.sh +++ b/lib/tests/loops-light.test.sh @@ -136,7 +136,13 @@ tf "effort-shift merge reuse" "$EFF" "reuses the last run's answer, or its skip for f in "$ASK" "$GSK" "$SFK" "$ISK"; do n=$(basename "$(dirname "$f")") tf "$n merge reuses answer" "$f" "the gates. A later merge proposal reuses this" - tf "$n names later commits" "$f" "names any code commit made after it" + tf "$n names later commits" "$f" "names any code commit made after it (doc and memory" + tf "$n doc/memory excepted" "$f" "commits excepted)." +done +for f in "$FSK" "$BSK"; do + n=$(basename "$(dirname "$f")") + tf "$n merge reuses answer" "$f" "the gates. A later merge proposal reuses the last run's answer," + tf "$n reuse covers skip" "$f" "or its skip, and names any code commit made after it (doc and memory" tf "$n doc/memory excepted" "$f" "commits excepted)." done diff --git a/skills/bugfix/SKILL.md b/skills/bugfix/SKILL.md index a833e35..223e7cd 100644 --- a/skills/bugfix/SKILL.md +++ b/skills/bugfix/SKILL.md @@ -240,7 +240,9 @@ Parse the `BUGFIX-EXEC REPORT`: auditor's `TOOL:` line, beside a PASS. A skip also settles the global "long task before calling it done" trigger. The answer, or the skip, goes into the summary's `ADVISOR` field, and a fix it drives goes back - through the gates. + through the gates. A later merge proposal reuses the last run's answer, + or its skip, and names any code commit made after it (doc and memory + commits excepted). 4. Print summary: ``` BUGFIX COMPLETE diff --git a/skills/feat/SKILL.md b/skills/feat/SKILL.md index acedb11..9f6ffcb 100644 --- a/skills/feat/SKILL.md +++ b/skills/feat/SKILL.md @@ -214,7 +214,9 @@ a verdict no longer in view runs the call. DEGRADED shows on the auditor's `TOOL:` line, beside a PASS. A skip also settles the global "long task before calling it done" trigger. The answer, or the skip, goes into the summary's `ADVISOR` field, and a fix it drives goes back -through the gates. +through the gates. A later merge proposal reuses the last run's answer, +or its skip, and names any code commit made after it (doc and memory +commits excepted). Print summary: ```