The `iris` submodule's `main` was the fork's own line -- the app's 45 commits -- and not an ancestor of upstream's main, so it sat four merged pull requests behind PR #19's actual base. Every obvious command was therefore wrong in a way that looked plausible: `git diff main...` showed #10, #12, #16 and #17 as the review branch's work, which is how the parley text migration's undo path kept being reported as #19's. The app's line is now `app-pin`, pushed to origin, and `main` tracks `upstream/main`. `.gitmodules` follows `app-pin`, so `submodule update --remote` cannot drag the pin onto upstream. The recorded commit is unchanged at 32f6ad8; only the name it is reachable by has changed. `origin/main` on the fork is left alone: moving it is a non-fast-forward on a shared branch. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
8.1 KiB
Handoff
Where the work in flight stands. The settled layout design, the vocabulary
and the measurement method are in docs/LAYOUT.md; what the review of #19
found is in docs/LAYOUT_LOG.md.
The Iris layout repair is submitted
Iris PR #19 (layout/one-ask) replaces closed #18. The tip is b7b8d09,
and past the reviewed cadfba0 it is eight rounds, each described in
docs/LAYOUT_LOG.md:
- The repair,
add6774and84dad21-- collapsed-share placement, retained mask ownership, a redraw-on-reparent defect, and repeated work in the test harness. - The vocabulary and the container API,
5642f20through58ce74d. - Naming,
55df32athrough40b89c1. - A sweep over the logic those names exposed,
8d2b7a5and6c84b6f. - A clarity sweep,
3da1c71through1ebd4d3-- naming the pairs layout returns,Span::slot, a diagnostic that printed the rel base while calling it the box, andin_parentmatching a place's own cases. - A quality sweep,
aea0387through69ba915-- a kept contract judged against the placed box rather than the box asked about, two things nothing read, three reuse rejections the diagnostics could not see, and a fuzz case that ran only in the long scan. - A sweep over the renderer, the text store and the retained path,
d8d5122through1096c31-- a contract kept where the new window left it out, a surface configured under its own texture, a counter naming the wrong contract, things nothing reads, and a question asked through a value rather than a reference. - A sweep over the shader boundary and the position widgets,
b7b8d09-- two constants the shader and the CPU both count in written twice, and aScrollpositioning content the framework positions, which cost a redraw at the default alignment.
The settled design of the last three is in docs/LAYOUT.md under "Three
names, and the one argument that says them". Bryan settled the API over
2026-09-17 to 19; it is current, not frozen.
The core design remains sound. Round-to-nearest is still unchanged.
Two checkouts share one Git storage: /home/bob/repos/iris is the active
layout/one-ask worktree, and ai-app-2/iris stays on app-pin at the
app's 32f6ad8 pin until the integration below is ready.
The branch layout, and the trap that used to be here
main is PR #19's base and tracks upstream/main (iris/iris), so the
obvious commands are the right ones:
git merge-base main layout/one-ask # ca2b4b2, the PR's base
git diff main...layout/one-ask # exactly what #19 changes
It was not always so. Until 2026-09-20 main tracked origin/main -- the
fork's line, which carries the app's 45 commits, is not an ancestor of
upstream's main, and sat four merged pull requests behind it (#10 parley
text, #12 pointer routing, #16 draw/size merge, #17 headless rig). Diffing
against it showed all four as this branch's work, which is how the parley
migration's undo path kept being reported as #19's; the sixth sweep lost
half a session to it before Bryan caught it, and the fourth and fifth
sweeps deleted Painter::text_data partly on the same false reading.
Bryan asked for the setup fixed rather than documented. What changed:
- The app's line is now the branch
app-pin(32f6ad8), pushed toorigin. That is the name to use for it; it is no longer calledmain. mainpoints at and tracksupstream/main..gitmodulespins theirissubmodule tobranch = app-pin, sogit submodule update --remotefollows the app's line and cannot drag the pin onto upstream.git iris-baseandgit iris-diffare still configured and still correct; they now agree with plainmain.
The submodule's recorded commit is unchanged at 32f6ad8, so nothing about
the app's pin moved -- only the name it is reachable by. origin/main on
the fork is still 32f6ad8: moving it is a non-fast-forward on a shared
branch, so it is left for Bryan to decide. Until it moves, a fresh clone of
the fork still gets the old, misleading main.
How to check a round
Always, because they cost nothing: format, workspace clippy under
-D warnings with and without layout-diagnostics, the workspace tests, and
the cold dump. layout_dump over 400 depth-5 trees is 34,492 boxes, and
it is the only thing that catches two same-typed values being swapped, which
is the failure mode of a rename or a move. The repair moved 650 of those
boxes, all from the collapsed-share correction; every commit since has been
byte-identical to 84dad21.
Only when the change can alter what layout computes: the three seed scans -- 400 at depth 5, 1,000 at depth 6, 2,000 at depth 4. They cost about a quarter of an hour and they exist to find logic that is wrong on some tree shape, so a rename has nothing for them to find (Bryan, 2026-09-19). Never start one and then edit the tree: cargo rebuilds mid-flight and exits 1 from a compile error, which reads exactly like a fuzzer failure.
What is next, in order
- Bryan's review of #19. Fixes are themselves unreviewed code: repeat
pre-submit-reviewover each round's changes, and apply the gate above to whatever each one touched. The ordinary oracle does not replace absolute geometry and retained-primitive expectations. - A review of everything written before the review gate existed.
pre-submit-reviewand the rule that nothing is submitted unreviewed arrived on 2026-09-13, well after the Rust port and most of Iris were written, so all of that code went in unreviewed and none of the five sweeps above covered more than the layout branch. It wants a pass of its own (Bryan, 2026-09-20). The surface-texture defect in02048eais the argument: nothing about that arm was hard, and it was written wrong anyway, which is what a first reader catches and a later sweep of some other subject does not. - Integrate the app's Iris capabilities before changing its pin.
32f6ad8has 45 commits not reachable from the review branch; shared UI ownership, richer masks, Android support, and app-side performance work must survive the integration. What has to survive is those capabilities, not the calls the app makes today: the app is to be largely rewritten against the new API rather than ported call by call, so nothing in Iris is kept alive for the app's sake (Bryan, 2026-09-20). - Round-to-nearest, CPU and shader together as one verified change.
Bryan approved it on 2026-09-17 and neither half has landed; the
derivation, the form to use and what to re-check are in
docs/LAYOUT.mdunder "Rendering the grid (pending)".
Wanted but not started, recorded in iris/TODO: transforms on a move entry,
so a whole subtree scales or rotates with one buffer write and no redraw.
Compose-style stretch at the end of a scroll area is the use that prompted
it. A move entry only translates today, and composing through one scales the
rel part while px passes through untouched, so fixed-size content and
glyphs do not follow a shortened entry.
Smaller layout items, none urgent
- Nested spans pass
leftoverweight up, so three leftover children in one inner span beside one in another get three quarters to one quarter. No other layout system does that; confirm it is wanted. - A span can overflow itself without bound, so boxes of negative length reach children and nothing states what a widget may assume about one.
Fixed::divby zero answersMIN/MAXwhileratioanswersZERO; both are caller bugs underdebug_assert, but the fallbacks differ.docs/LAYOUT.md§4, §5 and the density section namePainter::place,Painter::region(),SetSize,desired_width,apply_rest,Len::dp,AlignedandMaxSize, none of which exist. Do not restoreOnResize::TranslateorOrthoSize.LazySpan, thenSizeRule::{Min, Max, Clamp}. A cap may not containleftover; whetherMaxnarrows the child's drawing box is a product decision.Scrolltaking a direction rather than one axis.
Other product work is in docs/PLAN.md and the focused documents it links.
Do not mix it into the Iris layout branch.