From 271881ec47e5884fc69426b8a68827e1339d34e3 Mon Sep 17 00:00:00 2001 From: M Waleed Kadous Date: Wed, 29 Jul 2026 04:27:07 -0700 Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix=20#1279]=20Docs:=20thread=20closeou?= =?UTF-8?q?t=20=E2=80=94=20merge,=20verification=20on=20main,=20flake=20re?= =?UTF-8?q?solution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- codev/state/bugfix-1279_thread.md | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/codev/state/bugfix-1279_thread.md b/codev/state/bugfix-1279_thread.md index 48b987ae5..c8a1adaef 100644 --- a/codev/state/bugfix-1279_thread.md +++ b/codev/state/bugfix-1279_thread.md @@ -168,3 +168,44 @@ a regression. CLAUDE.md says it: never run npm/test commands from the repo root, run them from `packages/codev`. Package-scoped run was green throughout. Final: 3793 passed / 48 skipped / 0 failed. Awaiting the `pr` gate. + +## Merged + +PR #1283 merged 2026-07-29T11:26:39Z as merge commit `54118ef0` (regular merge, +not squash). Issue #1279 auto-closed by `Fixes #1279`. + +Verified live on `main` after the merge, not just assumed from a green PR: all +three new includes are present in the shipped skeleton +(`spir/prompts/specify.md:95`, `spir/prompts/review.md:62`, +`maintain/protocol.md:190`) and `codev-skeleton/protocols/aspir/` no longer has +a `templates/` directory. + +### Merge path — worth recording for the next builder + +The porch `pr` gate approving is **not** sufficient to merge in this repo. +GitHub branch protection on `main` independently requires: + +- 1 approving review (`reviewDecision: REVIEW_REQUIRED`) — a builder cannot + self-approve its own PR; bypass allowance is limited to `waleedkadous` and + `amrmelsayed` +- 6 status checks: Unit Tests, CLI Tests (ubuntu + macos), CLI Integration + Tests, Tower Integration Tests, Package Install Verification + +`gh pr merge --merge` fails with "the base branch policy prohibits the merge" +until both clear. I escalated rather than reaching for `--admin` myself; the +human's explicit ruling ("use admin here") came back and I merged with +`--admin` only after CI was green, so the bypass covered the review requirement +alone and never the checks. + +### CI flake, resolved + +Two `Tests` runs on this branch failed at 18:07:53 and 18:08:09 — +`send-integration.e2e.test.ts`, "Hook timed out in 10000ms", Tower Integration +Tests. I called it pre-existing flake on the evidence (file untouched by this +PR; same workflow failing intermittently on `bugfix-1264`, `bugfix-1077`, +`docs/arch-init-compaction`, `air-1239` and one `main` merge; same content +passing at 18:06:56 then failing twice minutes later). The final run confirmed +it: Tower Integration Tests passed in 1m23s on the same content. Nothing was +skipped or worked around. + +Worktree is clean and stays put — cleanup is the architect's call. From 61c57dbcc062fa7186e0629dbad008054b7fac84 Mon Sep 17 00:00:00 2001 From: M Waleed Kadous Date: Wed, 29 Jul 2026 04:27:18 -0700 Subject: [PATCH 2/2] chore(porch): bugfix-1279 protocol complete --- .../bugfix-1279-spir-spec-template-is-dead-cod/status.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codev/projects/bugfix-1279-spir-spec-template-is-dead-cod/status.yaml b/codev/projects/bugfix-1279-spir-spec-template-is-dead-cod/status.yaml index 2ac62d320..c5fa56482 100644 --- a/codev/projects/bugfix-1279-spir-spec-template-is-dead-cod/status.yaml +++ b/codev/projects/bugfix-1279-spir-spec-template-is-dead-cod/status.yaml @@ -1,7 +1,7 @@ id: bugfix-1279 title: spir-spec-template-is-dead-cod protocol: bugfix -phase: pr +phase: verified plan_phases: [] current_plan_phase: null gates: @@ -13,5 +13,5 @@ iteration: 1 build_complete: false history: [] started_at: '2026-07-28T17:44:57.015Z' -updated_at: '2026-07-29T02:22:18.545Z' +updated_at: '2026-07-29T11:27:18.708Z' pr_ready_for_human: false