chore(plan): advisor points B2 review fix blocks (fix path, hold wording, bugfix route)

This commit is contained in:
bchanot committed 2026-11-17 18:34:54 +01:00
1 parent 24354d9b68
commit 25660542d3
2 files changed
+65 -13

No files matched your search

@@ -1,4 +1,4 @@
# Advisor call points, run B2 — Implementation Plan (r3)
# Advisor call points, run B2 — Implementation Plan (r3 + STEP 6 review fix)
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
@@ -41,7 +41,7 @@
| E4 | skills/init-project/SKILL.md | `([[LRN-095]]) — both run.\n\n## STEP 10 — CODE REVIEW` (end of STEP 9) | insert Block stuck + blank line before the heading |
| E5 | skills/a11y/SKILL.md, skills/guardrails/SKILL.md | ` the include's; loop decisions stay in this main loop.\n` (end of item 6 Gates) | append Block stuck (3-space indent) inside item 6 |
| E6 | skills/feat/SKILL.md | `\nPrint summary:\n```\nFEAT COMPLETE` (STEP 5, after the commit and the reflect route) | insert Block end-report + blank line before `Print summary:` |
| E7 | skills/bugfix/SKILL.md | ` two sentences of body).\n4. Print summary:` (STEP 6, after the commit) | append Block end-report (3-space indent) to item 3 |
| E7 | skills/bugfix/SKILL.md | ` two sentences of body).\n4. Print summary:` (STEP 6, after the commit) | append Block route-reflect + Block end-report (3-space indent) to item 3 |
| E8 | skills/ship-feature/SKILL.md (`## STEP 9 — FINISH\n`), skills/init-project/SKILL.md (`## STEP 11 — FINISH\n`) | heading line | insert Block end-finish + blank line after the heading |
| E9 | skills/a11y/SKILL.md, skills/guardrails/SKILL.md | ` commit, project convention else 50 words at most.\n2. \`mcp__model-router__route` | append Block end-handover (3-space indent) to item 1, before the apply route |
| E10 | skills/audit-delta/SKILL.md | `## STEP 4 — FINAL SUMMARY\n\n` | insert Block end-audit + blank line after |
@@ -57,6 +57,10 @@
| E20 | lib/effort-shift.md | `3. Before proposing a merge (\`gitflow finish\`) or calling a long task\n done.\n` | replace with Block item3 (ends with a blank line before block I) |
Groups: `skills` = E1-E14 (17 edits), `agents` = E15-E20 (6 edits).
`review1` (STEP 6 code-review fix, from HEAD 24354d9): rewrites the end-report,
end-finish and end-handover blocks in the six gate flows (diff stat, fix back
through the gates), end-release ("makes hold the recommended answer"), and adds
Block route-reflect before the bugfix end call (7 edits).
## Contract additions at STEP 3 (`[gated 2026-11-17]`)
@@ -142,24 +146,32 @@ first ran → the main loop calls the advisor per `lib/verify-secure-loop.md`
### Block end-report
```
Before the summary, the main loop makes its
Before the summary, the main loop prints the run's diff stat, then makes its
end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer
goes into the summary as an `Advisor:` line.
goes into the summary as an `Advisor:` line, and a fix it drives goes
back through the gates.
```
### Block route-reflect
```
`mcp__model-router__route(phase="reflect")` first (route: end-of-run review).
```
### Block end-finish
```
`mcp__model-router__route(phase="plan")` first (route: end-of-run review).
Before proposing the finish, the main loop makes its
end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer
goes with the proposal as an `Advisor:` line.
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);
its answer goes with the proposal as an `Advisor:` line, and a fix it
drives goes back through the gates.
```
### Block end-handover
```
Before the reply, the main loop 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
goes into the reply as an `Advisor:` line.
goes into the reply as an `Advisor:` line, and a fix it drives goes
back through the gates.
```
### Block end-audit
@@ -198,7 +210,8 @@ waits for a new run.
`mcp__model-router__route(phase="reflect")` first (route: end-of-run review).
Before the ask, the main loop makes its
end-of-run advisor call (`lib/effort-shift.md` § Advisor); its answer
goes with the ask as an `Advisor:` line; a fix it calls for means hold.
goes with the ask as an `Advisor:` line, and a fix it calls for makes
hold the recommended answer.
```
### Block verifier-head
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
"""Apply run B2 blocks to a repo root.
Usage: apply.py <plan.md> <repo root> <skills|agents>
Usage: apply.py <plan.md> <repo root> <skills|agents|review1>
Blocks are read from the plan (### Block <name> + fenced body). Every anchor
must occur exactly once in its file; any miss aborts before writing anything.
"""
@@ -61,7 +61,8 @@ def end_edits(b):
return [
("skills/feat/SKILL.md", feat, "\n" + b["end-report"] + feat),
("skills/bugfix/SKILL.md", bug,
bug.replace("\n4. ", "\n" + indent(b["end-report"], 3) + "4. ")),
bug.replace("\n4. ", "\n" + indent(b["route-reflect"] + b["end-report"], 3)
+ "4. ")),
("skills/ship-feature/SKILL.md", step9, step9 + b["end-finish"] + "\n"),
("skills/init-project/SKILL.md", step11, step11 + b["end-finish"] + "\n"),
("skills/a11y/SKILL.md", item1, item1.replace("\n2. ", "\n" + ho + "2. ")),
@@ -119,7 +120,45 @@ def agents_edits(b):
]
GROUPS = {"skills": skills_edits, "agents": agents_edits}
OLD_END_REPORT = (
"Before the summary, the main loop makes its\n"
"end-of-run advisor call (`lib/effort-shift.md` \u00a7 Advisor); its answer\n"
"goes into the summary as an `Advisor:` line.\n")
OLD_END_FINISH = (
"`mcp__model-router__route(phase=\"plan\")` first (route: end-of-run review).\n"
"Before proposing the finish, the main loop makes its\n"
"end-of-run advisor call (`lib/effort-shift.md` \u00a7 Advisor); its answer\n"
"goes with the proposal as an `Advisor:` line.\n")
OLD_END_HANDOVER = (
"Before the reply, the main loop makes its\n"
"end-of-run advisor call (`lib/effort-shift.md` \u00a7 Advisor); its answer\n"
"goes into the reply as an `Advisor:` line.\n")
OLD_END_RELEASE = (
"`mcp__model-router__route(phase=\"reflect\")` first (route: end-of-run review).\n"
"Before the ask, the main loop makes its\n"
"end-of-run advisor call (`lib/effort-shift.md` \u00a7 Advisor); its answer\n"
"goes with the ask as an `Advisor:` line; a fix it calls for means hold.\n")
def review1_edits(b):
"""STEP 6 code-review fix, applied on top of HEAD 24354d9."""
report = b["end-report"]
return [
("skills/feat/SKILL.md", OLD_END_REPORT, report),
("skills/bugfix/SKILL.md", indent(OLD_END_REPORT, 3),
indent(b["route-reflect"] + report, 3)),
("skills/ship-feature/SKILL.md", OLD_END_FINISH, b["end-finish"]),
("skills/init-project/SKILL.md", OLD_END_FINISH, b["end-finish"]),
("skills/a11y/SKILL.md", indent(OLD_END_HANDOVER, 3),
indent(b["end-handover"], 3)),
("skills/guardrails/SKILL.md", indent(OLD_END_HANDOVER, 3),
indent(b["end-handover"], 3)),
("skills/release-candidate/SKILL.md", OLD_END_RELEASE, b["end-release"]),
]
GROUPS = {"skills": skills_edits, "agents": agents_edits,
"review1": review1_edits}
def main():