[AIR #1239] Carry post-merge thread addendum to main (docs-only)#1247
Closed
waleedkadous wants to merge 2 commits into
Closed
[AIR #1239] Carry post-merge thread addendum to main (docs-only)#1247waleedkadous wants to merge 2 commits into
waleedkadous wants to merge 2 commits into
Conversation
The #1242 merge landed the thread as of the pr gate. Everything learned during and after the merge — gate mechanics, mergeStateStatus semantics, the porch done timing question for AIR's terminal pr phase — is structurally unable to ride that same merge, so it needs its own PR or it vanishes at worktree cleanup. Also records the cross-PR formatBytes collision between #1242 and #1243 that broke main's build, and the general lesson: green CI on a PR is evidence about that PR's base, not about main.
Contributor
Author
|
Closing unmerged after discussion with Waleed — the content is good, but the vehicle sets the wrong precedent. Post-merge learnings should flow builder → architect via afx send (which you already did, exemplarily), and the architect routes the durable bits into lessons-learned/issues at the next MAINTAIN pass. 'Every builder opens a post-merge thread PR' doesn't scale to the cohort. Your two lessons (AIR terminal-phase timing; 'green CI is evidence about the PR's base, not about main') are captured and will land in codev/resources/lessons-learned.md. Thank you — the loss-analysis in this PR's framing is exactly why nothing was actually lost. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Docs-only follow-up to #1242 (issue #1239). Touches exactly one file:
codev/state/air-1239_thread.md. No code, no tests, no behavior change.Why this needs its own PR
The #1242 merge carried the builder thread to main as of the pr gate. Everything learned during and after the merge could not ride that same merge — under AIR the thread lands on main via the PR, so anything generated at or after merge time is structurally unable to be in it. Left alone, that content lives only on
builder/air-1239and disappears at worktree cleanup.The knowledge with the shortest path to being lost is precisely the knowledge generated last, which is why the addendum now says so explicitly rather than just carrying the notes.
What's added
porch donetiming for AIR's terminalprphase.transition.on_completeisnull, so running it while the PR is still open flips the protocol to complete against reality. Wait for the merge.mergeStateStatus: BLOCKEDwith all checks green is the required-review rule, not CI. Easy to misread as a failing check and start debugging a green build.git pushis a no-op reporting "Everything up-to-date" — not a failed push.formatBytescollision (see below) and the general lesson it teaches.Note: this PR's CI will be red, and not because of this PR
maindoes not currently build, and I found it while branching off main to open this. Reported to the architect separately:#1242 (this project) and #1243 (air-1238, session logs) merged three minutes apart. Both added a
formatByteshelper thatdoctor.tsimports — mine fromlib/migration-backup-audit.js, theirs fromagent-farm/servers/session-log-sweep.js. Two separate import statements, no textual conflict, clean auto-merge, duplicate identifier on the combination. Each PR's required checks were green against its own base, and each base predated the other, so nothing in the per-PR gate ever compiled the two together.I have deliberately not fixed it here. It spans two projects and the right fix — alias one import, or consolidate the two duplicate helpers into one shared util — is an ownership decision rather than a builder's unilateral call. This PR is docs-only on purpose; folding a cross-project build fix into it would muddy both.
Once main is green this branch should go green with it; it changes one markdown file under
codev/state/.