Brummel/AILang
1
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

skills/implement: reorder Step 3 — switch to main BEFORE Boss edits

Browse Source 
The orchestrator-agent ends its run with the worktree on
iter/<iter_id>. Step 3 previously listed 'append INDEX line' as
item 3 and 'switch+merge' as item 4 — natural reading order is
top-to-bottom, so the INDEX append (and any other Boss edit) was
landing on the iter branch by mistake. Observed three times on
2026-05-11 during the iter 23.4 family's prep iters.

Fix: explicit warning at the top of Step 3, plus reorder so the
'git switch main && git merge --ff-only' happens before any
Boss-side edit. Summary rewrites (step 2's decision) now defer to
step 5, which runs after the switch, so they also land on main.
This commit is contained in:
Brummel
2026-05-11 19:15:10 +02:00
parent d96d8c5cc2
commit a97433655a
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/implement/SKILL.md
+20 -11
View File
@@ -114,21 +114,30 @@ orchestrator-agent.
### Step 3 — Boss merge step (on DONE or PARTIAL)
1. Open the per-iter journal file on the branch:
`git show iter/<iter_id>:docs/journals/<YYYY-MM-DD>-iter-<iter_id>.md`
(or check out the branch if a closer look is needed).
2. Accept the agent's Summary section as-is, OR rewrite it with
Boss-level framing. The rest of the journal file is factual and
preserved verbatim.
3. Append one line to `docs/journals/INDEX.md`:
`- YYYY-MM-DD — iter <iter_id>: <one-line title> → <YYYY-MM-DD>-iter-<iter_id>.md`
4. Fast-forward main to the iter branch:
> **Switch to main FIRST.** The orchestrator-agent ends its run with
> the worktree on `iter/<iter_id>` (Phase 0 created the branch and
> all per-task commits land on it). Any Boss commit issued before
> `git switch main` lands on the iter branch by mistake — including
> the INDEX-append below. This is a recurring papercut. Do the
> switch before any Boss-side edit.
1. Open the per-iter journal file on the branch (read-only, branch-
independent): `git show iter/<iter_id>:docs/journals/<YYYY-MM-DD>-iter-<iter_id>.md`.
2. Decide whether the agent's Summary section is acceptable or needs
a Boss-level rewrite. The rest of the journal file is factual and
preserved verbatim. Defer the actual edit to step 5 — it lands on
main, not on the iter branch.
3. Fast-forward main to the iter branch:
`git switch main && git merge --ff-only iter/<iter_id>`. Since the
iter branch was created from local `main` (Phase 0 of the
orchestrator-agent) and no commits have landed on main since, the
fast-forward is always linear.
5. Optionally delete the branch: `git branch -D iter/<iter_id>`.
6. If trigger is done-state and the user is away, write a
4. Append one line to `docs/journals/INDEX.md` and commit:
`- YYYY-MM-DD — iter <iter_id>: <one-line title> → <YYYY-MM-DD>-iter-<iter_id>.md`
5. If the Summary needed rewriting (step 2), edit the journal file
on main now and commit.
6. Optionally delete the branch: `git branch -D iter/<iter_id>`.
7. If trigger is done-state and the user is away, write a
`docs/WhatsNew.md` entry + `notify.sh` per CLAUDE.md's
"Done-state notifications" subsection.