Author SHA1 Message Date
bchanot af846d6dbe feat(doctrine): end-of-run sites restate the merge-reuse clause
a11y, guardrails, ship-feature and init-project cite lib/effort-shift.md
without loading it; their end step now says a later merge proposal reuses
the answer and names code commits made after it. loops-light locks it.
2026-11-19 14:49:05 +01:00
5 changed files with 21 additions and 4 deletions

No files matched your search

+11
View File
@@ -19,6 +19,8 @@ ASK="$REPO/skills/a11y/SKILL.md"
HSKL="$REPO/skills/hotfix/SKILL.md" HSKL="$REPO/skills/hotfix/SKILL.md"
AUD="$REPO/agents/security-auditor.md" AUD="$REPO/agents/security-auditor.md"
EFF="$REPO/lib/effort-shift.md" EFF="$REPO/lib/effort-shift.md"
SFK="$REPO/skills/ship-feature/SKILL.md"
ISK="$REPO/skills/init-project/SKILL.md"
PASS=0; FAIL=0 PASS=0; FAIL=0
tf() { # tf <label> <file> <fixed-string> tf() { # tf <label> <file> <fixed-string>
@@ -129,6 +131,15 @@ for f in "$INC" "$AUD" "$HSKL"; do
tn "$n DEGRADED no branch" "$f" "DEGRADED (semgrep absent) →" tn "$n DEGRADED no branch" "$f" "DEGRADED (semgrep absent) →"
done done
echo "── end-of-run merge reuse at the site (TODO:14, LRN-297) ──"
tf "effort-shift merge reuse" "$EFF" "reuses the last run's answer, or its skip, and names any code commit"
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 doc/memory excepted" "$f" "commits excepted)."
done
echo "" echo ""
echo "loops-light structure locks: $PASS pass, $FAIL fail" echo "loops-light structure locks: $PASS pass, $FAIL fail"
[ "$FAIL" -eq 0 ] [ "$FAIL" -eq 0 ]
+2 -1
View File
@@ -200,7 +200,8 @@ open and say so plainly. Never report a fix the re-pass did not prove.
Before the reply, the main loop prints the run's diff stat, then makes its Before the reply, the main loop prints the run's diff stat, then makes its
end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer
goes into the reply as an `Advisor:` line, and a fix it drives goes goes into the reply as an `Advisor:` line, and a fix it drives goes
back through the gates. back through the gates. A later merge proposal reuses this answer and
names any code commit made after it (doc and memory commits excepted).
2. `mcp__model-router__route(phase="apply")` for the tail. Reply with: fixed 2. `mcp__model-router__route(phase="apply")` for the tail. Reply with: fixed
and proven (proposal, rule, file), still open and why, the walk's result, and proven (proposal, rule, file), still open and why, the walk's result,
the branch name. Merge waits for the user's explicit signal. the branch name. Merge waits for the user's explicit signal.
+2 -1
View File
@@ -277,7 +277,8 @@ open and say so plainly. Never report a fix the re-pass did not prove.
Before the reply, the main loop prints the run's diff stat, then makes its Before the reply, the main loop prints the run's diff stat, then makes its
end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer
goes into the reply as an `Advisor:` line, and a fix it drives goes goes into the reply as an `Advisor:` line, and a fix it drives goes
back through the gates. back through the gates. A later merge proposal reuses this answer and
names any code commit made after it (doc and memory commits excepted).
2. `mcp__model-router__route(phase="apply")` for the tail. Reply with: fixed 2. `mcp__model-router__route(phase="apply")` for the tail. Reply with: fixed
and proven (proposal, rule, file), still open and why, MANUAL steps left and proven (proposal, rule, file), still open and why, MANUAL steps left
for the user, the branch name. Merge waits for the user's explicit signal. for the user, the branch name. Merge waits for the user's explicit signal.
+3 -1
View File
@@ -360,7 +360,9 @@ patched. Report per its rc table — rc 4 = a LOUD upstream BDR-022 anomaly, not
Before proposing the finish, the main loop prints the run's diff stat, Before proposing the finish, the main loop prints the run's diff stat,
then makes its end-of-run advisor call (`lib/effort-shift.md` § Advisor); then makes its end-of-run advisor call (`lib/effort-shift.md` § Advisor);
its answer goes with the proposal as an `Advisor:` line, and a fix it its answer goes with the proposal as an `Advisor:` line, and a fix it
drives goes back through the gates. drives goes back through the gates. A later merge proposal reuses this
answer and names any code commit made after it (doc and memory
commits excepted).
Tests pass, build clean, no placeholders. Integrate the MVP feature into develop Tests pass, build clean, no placeholders. Integrate the MVP feature into develop
— **only on the user's explicit go** (the `gitflow` finish gate): — **only on the user's explicit go** (the `gitflow` finish gate):
+3 -1
View File
@@ -324,7 +324,9 @@ on the branch FINISH integrates.
Before proposing the finish, the main loop prints the run's diff stat, Before proposing the finish, the main loop prints the run's diff stat,
then makes its end-of-run advisor call (`lib/effort-shift.md` § Advisor); then makes its end-of-run advisor call (`lib/effort-shift.md` § Advisor);
its answer goes with the proposal as an `Advisor:` line, and a fix it its answer goes with the proposal as an `Advisor:` line, and a fix it
drives goes back through the gates. drives goes back through the gates. A later merge proposal reuses this
answer and names any code commit made after it (doc and memory
commits excepted).
Tests pass, build clean. Integrate the feature into develop — **only on the Tests pass, build clean. Integrate the feature into develop — **only on the
user's explicit go** (the `gitflow` finish gate): user's explicit go** (the `gitflow` finish gate):