From 79783ff9ee6726365a2804ea58d22fd19438d760 Mon Sep 17 00:00:00 2001 From: MechaCat02 Date: Tue, 1 Sep 2026 17:59:59 +0200 Subject: [PATCH] agents: point each brief at its human branch, to merge on the first iteration Both are pushed. The decoder's carries the R1 register reclassification and tools/stale-instrument; the port's carries the two input fixes, verify-input and BLOCKED H1-H3. Each branches from that agent's own tip, so it is a fast-forward on the line they are already on -- and the port must merge before touching input or it will re-derive a fix that is already asserted. --- docs/agents/decoder-loop.md | 13 +++++++++++++ docs/agents/port-loop.md | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/docs/agents/decoder-loop.md b/docs/agents/decoder-loop.md index 3cb53595..b6781e33 100644 --- a/docs/agents/decoder-loop.md +++ b/docs/agents/decoder-loop.md @@ -73,6 +73,19 @@ an export schema, stop and go back to the question you were answering. git -C /work fetch origin && git -C /work merge --no-edit origin/main ``` +🔴 **On your FIRST iteration after 2026-09-01, also merge the human's branch:** + +```bash +git -C /work merge --no-edit origin/human/r1-register-reclassification +``` + +It carries the **R1 reclassification of `REFUTED.md`** (every entry now names its +`⟨instrument⟩`; ten moved ❌ → 🟡), R1 as standing text in `PROTOCOL.md`, and +`tools/stale-instrument`. It branches from `auto/frame-blend-draw-path`, so if +you are on that line it is a fast-forward. **Two of the ten re-opened entries +land on this iteration's focus** — do not start the splashes without reading +them. + You work on a topic branch, and you read the protocol, the mission and the shared tooling **from your own checkout** — so without this you are following whichever version of the rules existed when your branch started. That is not diff --git a/docs/agents/port-loop.md b/docs/agents/port-loop.md index e5e0fcdb..5a23a9f7 100644 --- a/docs/agents/port-loop.md +++ b/docs/agents/port-loop.md @@ -68,6 +68,19 @@ guess of yours is indistinguishable from a fact and will be believed later. git -C /work fetch origin && git -C /work merge --no-edit origin/main ``` +🔴 **On your FIRST iteration after 2026-09-01, also merge the human's branch:** + +```bash +git -C /work merge --no-edit origin/human/r1-retro-tick +``` + +It carries **the two input fixes made for you** (`port/scripts/gamepad.gd`, +`tools/port/verify-input` + its control, wired into `check-all`), the new +`BLOCKED.md` rows **H1–H3**, and the retro tick. It branches from +`auto/port-p6-audio`, so on that line it is a fast-forward. **Merge it before +touching input**, or you will re-derive a fix that is already written and +asserted. + You work on a topic branch, and you read the protocol, the mission and the shared tooling **from your own checkout** — so without this you are following whichever version of the rules existed when your branch started. That is not