Skip to content

[Bugfix #1279] Docs: carry post-merge thread addendum and porch completion state to main - #1287

Open
waleedkadous wants to merge 2 commits into
mainfrom
builder/bugfix-1279
Open

[Bugfix #1279] Docs: carry post-merge thread addendum and porch completion state to main#1287
waleedkadous wants to merge 2 commits into
mainfrom
builder/bugfix-1279

Conversation

@waleedkadous

Copy link
Copy Markdown
Contributor

Summary

Docs-only follow-up to PR #1283 (the template-delivery fix for #1279), which merged as 54118ef0. Carries two post-merge artifacts to main that the merge itself couldn't include, following the [AIR #1239] Carry post-merge thread addendum to main precedent.

No code, no tests, no framework files. 43 lines across 2 files.

What's here

1. codev/state/bugfix-1279_thread.md — the closeout section (+41 lines)

I wrote the thread's final section after PR #1283 merged, so it landed on the builder branch instead of main. The version currently on main stops at the CMAP section, missing:

  • the merge outcome (commit 54118ef0, issue auto-closed) and the post-merge verification done against main itself rather than inferred from a green PR
  • the branch-protection merge path — that an approved porch pr gate is not sufficient to merge in this repo: main independently requires 1 approving review (which a builder cannot self-supply) plus 6 status checks, so gh pr merge --merge fails with "the base branch policy prohibits the merge" until both clear. This is the part most worth having on main — the next builder will hit it.
  • the CI flake resolutionsend-integration.e2e.test.ts ("Hook timed out in 10000ms", Tower Integration Tests) failed twice on the branch and was called pre-existing flake on evidence; the final run passing that job in 1m23s on the same content confirmed it. Recording both the call and the confirmation, so the next person who sees this test fail has the history.

2. codev/projects/bugfix-1279-.../status.yaml (+2/−2)

Porch's own completion write: phase: pr → verified and a timestamp bump, emitted by porch done after the merge. Per the repo's data-capture convention, project state is committed to main.

Test Plan

Not applicable — no executable content changes. The framework files, protocol definitions, and test suite are untouched by this PR; all of that shipped in #1283 and is already on main (verified there: includes present at spir/prompts/specify.md:95, spir/prompts/review.md:62, maintain/protocol.md:190; codev-skeleton/protocols/aspir/templates/ absent).

Note for the reviewer

Opened from the same builder/bugfix-1279 branch rather than a fresh docs branch, deliberately: the branch already contains exactly these two commits and nothing else beyond main, and cutting a new branch would have meant moving the worktree's HEAD while the architect is holding the worktree pending a cleanup decision.

I am not merging this myself — it will hit the same branch protection as #1283, and merge authorization is the architect's to obtain.

Related to #1279 (already closed by #1283). Intentionally no Fixes keyword.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant