From 620f70de8d4578d7612e9c04d9cc9e8447422e06 Mon Sep 17 00:00:00 2001 From: Danathar Date: Sat, 31 Oct 2026 13:50:28 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=96=20docs(v6):=20serialized=20merge?= =?UTF-8?q?=20lane=20readiness=20row=20passes=20at=20ba77df2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The serialized merge lane row moves from Partial to passing. All seven runbook steps passed on one build, ba77df2; step 4 (hold at the front), which failed at dd406b3, now leaves the front at once. The row links the evidence comment on #7563 and the two lane fixes the re-run produced. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0113KwWU4TkJ8wfy3XjusyGo Signed-off-by: Danathar --- src/docs/v6-readiness.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/docs/v6-readiness.md b/src/docs/v6-readiness.md index 1f084ed38b..29b81517b6 100644 --- a/src/docs/v6-readiness.md +++ b/src/docs/v6-readiness.md @@ -15,8 +15,8 @@ track named on the line epic ([#7563](https://github.com/hivecommons/hive/issues/7563)) has merged code, but **merged is not exercised** — only the surfaces with a ✅ or partial evidence row in section 3 have run against a live hive (so far passing -runs-via-chat, dashboard chat, GitHub @-mention and operator admin MCP -exercises, and a partial exercise of the serialized merge lane). +runs-via-chat, dashboard chat, GitHub @-mention, operator admin MCP and +serialized merge lane exercises). This bar is what turns one into the other. ## 1. Channel binding @@ -119,7 +119,7 @@ not a unit test: | Runs via chat | One live run reaches a human gate and is approved from the chat spine; the next runs snapshot shows it advancing. | ✅ Live exercise passed with `just runs-e2e-v6` against `clubanderson/hive-runs-e2e#11`; evidence on [#8466](https://github.com/hivecommons/hive/issues/8466#issuecomment-5805851875) and tracker row checked in the [#7563 v6 readiness bar section](https://github.com/hivecommons/hive/issues/7563). | | Email | One HUMAN DECISION NEEDED escalation delivered; one allowlisted inbound reply acted on (or reply-to-act explicitly deferred here). | ⬜ | | Push / on-call | One `requires_human` verdict pages a real device via at least one provider. | ⬜ | -| Serialized merge lane (`merge_strategy: hive-serialized`, [#10884](https://github.com/hivecommons/hive/issues/10884)) | On a personal-account repo with no GitHub merge queue, following the [runbook](v6-readiness-runbook.md#evidence-template) evidence template: (1) strategy switch and ACMM Eval credit ("satisfied by Hive serialized merge lane"); (2) a single merge; (3) two PRs at once (ordering, and the behind PR is updated); (4) a hold refused at the front; (5) a failed required check at the front; (6) the front timeout; (7) a fork PR. | 🟨 Partial. A self-hosted v6 hive at `dd406b3` re-ran all seven steps against one build, which includes #11031 ([evidence](https://github.com/hivecommons/hive/issues/7563#issuecomment-6470375751)). **Done:** (1) ACMM credit; (2) single merge; (3) two at once, with the behind PR updated by a merge of the tip; (5) red at the front left on the first sweep after the check failed, and the next PR was promoted in the same transaction; (6) front timeout; (7) up-to-date fork merges, and a behind fork with `base_sync` off leaves the front at once with one comment, then rejoins and merges after the author merges the tip. **Failed:** (4) a `hold` on the front PR never released the front, which waited out the 60m timeout ([#14934](https://github.com/hivecommons/hive/issues/14934)). **Also found:** contributor-lane merges bypass the lane ([#14935](https://github.com/hivecommons/hive/issues/14935)); a 4xx on the lane's merge call wedges the front until the timeout ([#14936](https://github.com/hivecommons/hive/issues/14936)). **Not yet done:** `front-extend` at a short `merge_front_timeout`; the `base_sync`-on fork leg. Row stays unchecked until step 4 passes. An earlier partial run at `f55b5fe66` produced [#10984](https://github.com/hivecommons/hive/issues/10984) (fixed by [#10985](https://github.com/hivecommons/hive/pull/10985)) and [#11023](https://github.com/hivecommons/hive/issues/11023) (fixed by [#11031](https://github.com/hivecommons/hive/pull/11031)). | +| Serialized merge lane (`merge_strategy: hive-serialized`, [#10884](https://github.com/hivecommons/hive/issues/10884)) | On a personal-account repo with no GitHub merge queue, following the [runbook](v6-readiness-runbook.md#evidence-template) evidence template: (1) strategy switch and ACMM Eval credit ("satisfied by Hive serialized merge lane"); (2) a single merge; (3) two PRs at once (ordering, and the behind PR is updated); (4) a hold refused at the front; (5) a failed required check at the front; (6) the front timeout; (7) a fork PR. | ✅ Live exercise passed on a self-hosted v6 edge hive at `ba77df2`, all seven steps on one build ([evidence](https://github.com/hivecommons/hive/issues/7563#issuecomment-6547007887); tracker row in the [#7563 v6 readiness bar section](https://github.com/hivecommons/hive/issues/7563)): (1) ACMM credit; (2) single merge; (3) two at once, with the behind PR updated by a merge of the tip; (4) a `hold` on the front PR left the front 1s later with "a hold label is present" and the next PR was promoted in the same second (failed at `dd406b3` as [#14934](https://github.com/hivecommons/hive/issues/14934)); (5) red at the front left on the first round after the check failed, and the next PR was promoted in the same second; (6) front timeout after 60m with the next PR promoted in the same transaction (natural timeouts; timeout code unchanged since `dd406b3`); (7) up-to-date fork merges, and a behind fork with `base_sync` off leaves the front at once with one comment, then rejoins and merges after the author merges the tip. **Not exercised:** `front-extend` at a short `merge_front_timeout`; the `base_sync`-on fork leg. **Found on the way:** a closed front PR holds the front until its timeout ([#16056](https://github.com/hivecommons/hive/pull/16056)); a front whose writes are contained holds it for the full timeout ([#16059](https://github.com/hivecommons/hive/pull/16059)). The `dd406b3` run ([evidence](https://github.com/hivecommons/hive/issues/7563#issuecomment-6470375751)) produced [#14934](https://github.com/hivecommons/hive/issues/14934)–[#14938](https://github.com/hivecommons/hive/issues/14938), all fixed in `ba77df2`; an earlier partial run at `f55b5fe66` produced [#10984](https://github.com/hivecommons/hive/issues/10984) (fixed by [#10985](https://github.com/hivecommons/hive/pull/10985)) and [#11023](https://github.com/hivecommons/hive/issues/11023) (fixed by [#11031](https://github.com/hivecommons/hive/pull/11031)). | ## Admin MCP readiness evidence