From cb08f4c2e186663eda982694606fbcea1fc2e0b2 Mon Sep 17 00:00:00 2001 From: dayfine Date: Sun, 15 Nov 2026 16:26:14 -0800 Subject: [PATCH] PLZA upstream plan: #572 approved and waiting for a slot, new chain tips, #1916, upstream-main --- autostory/plza/UPSTREAM_PLAN.md | 54 +++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/autostory/plza/UPSTREAM_PLAN.md b/autostory/plza/UPSTREAM_PLAN.md index abe3f921e7..436499099f 100644 --- a/autostory/plza/UPSTREAM_PLAN.md +++ b/autostory/plza/UPSTREAM_PLAN.md @@ -7,16 +7,21 @@ merged or passes on console. Detail notes: `~/BDSPLab/notes/plza-slice1-plan.md` You open every upstream PR and write its description; agents never do. -1. **Review the slice PRs** bottom first: #572, then #573 to #577 (slice 1), then #580, #582. -2. **Hand upstream, one at a time, under the three-open limit:** #572 first (shared with SV), then - #573 up the chain. Before each one, ask for the pre-flight: an agent merges `main` in, fixes - every code-health finding, gets the unit tests green and reports the tested SHA. -3. **Land the test frames upstream before #575.** dayfine/CommandLineTests#18 (`plza/all-frames`) +1. **Send #572 upstream when a slot frees.** You approved it ("good enough for 572", 2026-11-15; + review rounds 1 and 2 done, tip 0758e5c24). We are at 3/3 open upstream: + PokemonAutomation/Arduino-Source#1845, #1881, #1916. When one closes, an agent folds #572 into + one commit on upstream `main` and you open the PR and write its description. +2. **Review the rest of the chain** bottom first: #573 to #577 (slice 1), then #580, #582. +3. **Hand upstream, one at a time, under the three-open limit:** #573 up the chain after #572. + Before each one, ask for the pre-flight: an agent merges `main` in, fixes every code-health + finding (code-health `--base-ref origin/upstream-main`, see below), gets the unit tests green + and reports the tested SHA. +4. **Land the test frames upstream before #575.** dayfine/CommandLineTests#18 (`plza/all-frames`) holds every frame the PLZA tests read; open its PR on PokemonAutomation/CommandLineTests. Nine AutoStoryScreenEvents frames are missing and need a recapture on console B (ours): `za2_m3o_s1`, `za2_m3p_s1`, `za2_m2q_s1`, `za2_hud_s3`, `za2_m2n_s1`, `za2_hud_s1`, `za2_m3s_s1`, `za2_m3w_s2`, `za2_m2m_s1`. -4. **Close the old PRs** listed at the bottom, when you're ready. +5. **Close the old PRs** listed at the bottom, when you're ready. No open questions right now. @@ -38,30 +43,41 @@ No open questions right now. - A shared throw helper (lock on, optional ball scroll, throw), used by our catch, InPlaceCatcher and PostKillCatcher, goes in its own PR before slice 5. - The 01.00 save is `autosave` (a run log showed the badge). +- Fork branch `upstream-main` mirrors upstream `main`. It is the code-health PR base for + upstream-bound branches: fork `main` has 58 fork-only commits, so diffing against it reports + unrelated findings. ## Chain Fork drafts on dayfine/Arduino-Source, linear, bottom first. Lines added, from the PR file list (test = unit tests and fakes). CI: Fork Draft CI only runs on PRs into `main`, so the slice PRs -got a dispatched Ubuntu run at their tip; failures are named. - -| PR | Branch | Base | Purpose | Code / test (+lines) | CI (2026-11-15) | Console | -|---|---|---|---|---|---|---| -| #572 | `autostory/story-range-options-sv` | `main` | start/end checkpoint range options, shared with SV | +168 / +261 | rerunning at 7078725ae | - | -| #573 | `plza/slice1/b` | #572 | story checkpoint data and its JSON reader | +1882 / +1071 | 1 unit test fails (StoryFiles: trailing space) | - | -| #574 | `plza/slice1/c` | #573 | story engine for a zone game | +1671 / +1190 | 4 fail (StoryFiles; StoryEngine expects `Home`, gets `HOME`) | - | -| #575 | `plza/slice1/d` | #574 | PLZA opening detectors; CI pins CLT #18 | +1167 / +997 | same 4 | - | -| #577 | `plza/slice1/e` | #575 | new game to leaving the platform (01.00, 01.01 start) | +1627 / +371 | same 4 | 01.00 1/1, 01.01 3/3 (below) | -| #580 | `plza/slice2/a` | #577 | 01.01 arrival scenes to Main Mission 01 | +1141 / +984 | not run | - | -| #582 | `plza/slice2/b` | #580 | 01.02, Pancham's chase to the battle area | +554 / +690 | 10 fail (same 4 + 6) | - | -| #576 | `plza/autostory` | `main` | long-lived branch (+54k, 425 files) | - | Fork Draft CI fails on the 9 missing frames; code-health fails | - | -| CLT #18 | `plza/all-frames` | `main` | every frame the PLZA tests read (84 files) | - | - | 9 frames missing | +got a dispatched Ubuntu run at their tip; failures are named. The CI column is from the earlier +tips; #572's review round 2 was merged up the whole chain on 2026-11-15, giving the tips below, +which have not been rerun yet. + +| PR | Branch | Base | Tip (2026-11-15) | Purpose | Code / test (+lines) | CI (earlier tip) | Console | +|---|---|---|---|---|---|---|---| +| #572 | `autostory/story-range-options-sv` | `main` | 0758e5c24 | start/end checkpoint range options, shared with SV | +168 / +261 | review rounds 1+2 done; approved, waits for an upstream slot | - | +| #573 | `plza/slice1/b` | #572 | 015ade1a1 | story checkpoint data and its JSON reader | +1882 / +1071 | 1 unit test fails (StoryFiles: trailing space) | - | +| #574 | `plza/slice1/c` | #573 | 8e3f39126 | story engine for a zone game | +1671 / +1190 | 4 fail (StoryFiles; StoryEngine expects `Home`, gets `HOME`) | - | +| #575 | `plza/slice1/d` | #574 | 3db337f78 | PLZA opening detectors; CI pins CLT #18 | +1167 / +997 | same 4 | - | +| #577 | `plza/slice1/e` | #575 | a2c0d34a1 | new game to leaving the platform (01.00, 01.01 start) | +1627 / +371 | same 4 | 01.00 passed, 01.01 3/3 (below) | +| #580 | `plza/slice2/a` | #577 | dff98199b | 01.01 arrival scenes to Main Mission 01 | +1141 / +984 | not run | - | +| #582 | `plza/slice2/b` | #580 | 1d54c5d74 | 01.02, Pancham's chase to the battle area | +554 / +690 | 10 fail (same 4 + 6) | - | +| #576 | `plza/autostory` | `main` | 2f7b152b8 | long-lived branch (+54k, 425 files) | - | Fork Draft CI fails on the 9 missing frames; code-health fails | - | +| CLT #18 | `plza/all-frames` | `main` | - | every frame the PLZA tests read (84 files) | - | - | 9 frames missing | Console records, lab build e36a816a4 (slice 1 E + lab tooling), 2026-11-15: - 01.00 passed once: new game to the platform, autosave badge seen. - 01.01 3/3; runs 2 and 3 reloaded the latest save and walked to the plaza fade. +## Side PRs + +- Fork #585 (StringSelect dropdown text was black in dark mode; found while testing #572's + dropdowns) went upstream as PokemonAutomation/Arduino-Source#1916: one commit f8ed1ceae on + branch `upstream/string-select-text-color`. You tested it on console B's lab app. + ## Later slices | Slice | Checkpoints | Adds |