code-coordinator 0.5.143__tar.gz → 0.5.146__tar.gz

code_coordinator-0.5.146/.github/workflows/acceptance-web.yml

@@ -0,0 +1,126 @@
+name: Acceptance (web)
+
+# #2389: split out of test.yml's `acceptance` job — it was running on EVERY
+# push/PR to this repo regardless of what changed, unconditionally installing
+# Node + a real Chromium (`npx playwright install chromium --with-deps`)
+# before running the web-playwright (ms-51) acceptance route. A pure `tui/`
+# Rust change (already covered by cargo-test.yml's own tui-tuidriver route,
+# `--for-path tui/src/main.rs`, gated on its own `paths:` filter) had no
+# business paying that cost on every review round — this job is genuinely
+# webapp-specific (`--for-path coord/dashboard/webapp/src/App.tsx`), so it
+# gets the same `paths:`-gated treatment cargo-test.yml already established
+# for the Rust side. Not in the branch-protection required-checks list
+# (only test (3.12)/(3.13), thin-client-strict, e2e, no-gh-on-path are), so
+# this staying un-triggered on an unrelated PR is not a merge blocker.
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'coord/dashboard/webapp/**'
+      - 'tests/acceptance/**'
+      - '.github/coord-ci-acceptance.yml'
+      # Self-trigger so edits to this workflow are exercised by their own PR.
+      - '.github/workflows/acceptance-web.yml'
+  pull_request:
+    branches: [main]
+    paths:
+      - 'coord/dashboard/webapp/**'
+      - 'tests/acceptance/**'
+      - '.github/coord-ci-acceptance.yml'
+      - '.github/workflows/acceptance-web.yml'
+  workflow_dispatch:
+
+jobs:
+  # #1950: the SEALED oracle-loop acceptance suite (tests/acceptance/ms-NN/,
+  # playwright.acceptance.config.ts) was run by no automatic gate anywhere —
+  # only `coord acceptance run/record`, invoked once while a milestone was
+  # being driven and never again. ms-51 went red at #1547 (the responsive
+  # shell removed the `<h1>coord</h1>` §1a pins) and stayed red through
+  # #1548/#1550/#1551/#1818 with nothing noticing. This job is the cheapest
+  # fix named in #1950: run the accumulated sealed suite whenever anything it
+  # covers changes, same shape as `e2e` (test.yml) (Python for the `coord`
+  # CLI on PATH — the acceptance config's `webServer` shells out to `coord
+  # web --fixture ... --dist dist`, see playwright.acceptance.config.ts's
+  # module docstring — plus Node + a real chromium).
+  #
+  # `npm run test:acceptance` with NO `{ms}` filter (unlike a single
+  # milestone's `-- ms-NN`) walks the whole `tests/acceptance/` tree — the
+  # accumulated suite across every closed milestone, i.e. exactly `coord
+  # acceptance run --all` (Gate C) would assemble, just invoked by CI's
+  # cadence instead of a milestone-close event.
+  #
+  # #2180: the `npm run test:acceptance` step now runs THROUGH `coord
+  # acceptance run --all --ci` (#2164) instead of calling Playwright
+  # directly. Same suite, same reporter under the hood — the wrapper's
+  # web-playwright driver shape appends `--reporter=json` and reads
+  # PLAYWRIGHT_JSON_OUTPUT_FILE itself (coord/acceptance_drivers.py) — but
+  # now a test-id listed in a manifest's `expected_red:` that fails does not
+  # redden this job (a sealed slice authored red before its fix exists,
+  # #2164's whole point), while one that unexpectedly PASSES does, loudly
+  # (#1965's vacuous-assertion case). Before this, ms-51 going red for any
+  # reason failed this job exactly the same as every other kind of red —
+  # there was no way to merge a red-by-design slice without `--force-merge`.
+  # .github/coord-ci-acceptance.yml's header explains why this points at a
+  # CI-local config instead of the fleet's real ~/.coord/coordinator.yml.
+  acceptance:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: coord/dashboard/webapp
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - working-directory: .
+        run: pip install -e ".[dev]"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - run: npm ci
+      # #2393: same fix as test.yml's `e2e` job — see that job's comment.
+      - name: Cache Playwright browsers
+        id: playwright-cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('coord/dashboard/webapp/package-lock.json') }}
+      - name: Install Playwright + OS deps (cache miss)
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        # #2393 follow-up: the Chromium download from Playwright's CDN has hung
+        # (not merely failed) multiple times in one day, past what caching alone
+        # can paper over on a cache-miss run (a version bump, or the very first
+        # run ever). A short per-attempt timeout + retry turns "hang for the
+        # whole 20-minute job budget" into "fail fast and try again" — transient
+        # CDN/mirror flakiness usually clears within a couple of attempts.
+        run: |
+          for attempt in 1 2 3; do
+            echo "Playwright install attempt $attempt/3..."
+            if timeout 300 npx playwright install chromium --with-deps; then
+              echo "Playwright install succeeded on attempt $attempt"
+              exit 0
+            fi
+            echo "Playwright install attempt $attempt failed or timed out after 5m"
+            sleep 10
+          done
+          echo "Playwright install failed after 3 attempts"
+          exit 1
+      - name: Install Playwright OS deps only (cache hit)
+        if: steps.playwright-cache.outputs.cache-hit == 'true'
+        run: npx playwright install-deps chromium
+      - name: coord acceptance run --all --ci (web-playwright route, ms-51)
+        working-directory: .
+        run: >-
+          coord acceptance run --repo claude-coordinator --all --ci
+          --for-path coord/dashboard/webapp/src/App.tsx
+          --config .github/coord-ci-acceptance.yml --path .
+      - name: A red result here is attributable, not a mystery
+        if: failure()
+        run: |
+          echo "::error::The sealed acceptance suite (tests/acceptance/ms-NN/) failed."
+          echo "The failing spec's path and 'describe' title name the milestone (ms-NN) and the issue that slice was authored for (see tests/acceptance/ms-NN/manifest.yml)."
+          echo "Two causes, and only one fix is right:"
+          echo "  1. The app regressed against an still-accurate contract -> fix the app."
+          echo "  2. Legitimate app evolution made the contract stale (e.g. #1547 vs ms-51) -> amend the contract: coord acceptance mock <repo> <tracking_issue> --amend '<what changed and why>'"
+          echo "Do not silence this job (continue-on-error, skip, etc.) instead of doing one of the above -- that is exactly how ms-51 rotted unnoticed through #1547-#1818 (#1950)."

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/.github/workflows/test.yml

@@ -252,6 +252,12 @@ jobs:
 
   e2e:
     runs-on: ubuntu-latest
+    # #2389: this is the SAME `npx playwright install chromium --with-deps`
+    # step that hung 34+ minutes on `acceptance` with no automatic recovery
+    # (a job with no `timeout-minutes` defaults to GitHub's 360-minute
+    # ceiling) — required, so it stays in this file, but gets the same
+    # bounded timeout rather than the implicit 6-hour one.
+    timeout-minutes: 20
     defaults:
       run:
         working-directory: coord/dashboard/webapp
@@ -272,90 +278,58 @@ jobs:
         with:
           node-version: '20'
       - run: npm ci
-      - run: npx playwright install chromium --with-deps
-      - run: npm run test:e2e
-
-  # #1950: the SEALED oracle-loop acceptance suite (tests/acceptance/ms-NN/,
-  # playwright.acceptance.config.ts) was run by no automatic gate anywhere —
-  # only `coord acceptance run/record`, invoked once while a milestone was
-  # being driven and never again. ms-51 went red at #1547 (the responsive
-  # shell removed the `<h1>coord</h1>` §1a pins) and stayed red through
-  # #1548/#1550/#1551/#1818 with nothing noticing. This job is the cheapest
-  # fix named in #1950: run the accumulated sealed suite on every push/PR,
-  # same shape as `e2e` above (Python for the `coord` CLI on PATH — the
-  # acceptance config's `webServer` shells out to `coord web --fixture
-  # ... --dist dist`, see playwright.acceptance.config.ts's module
-  # docstring — plus Node + a real chromium).
-  #
-  # `npm run test:acceptance` with NO `{ms}` filter (unlike a single
-  # milestone's `-- ms-NN`) walks the whole `tests/acceptance/` tree — the
-  # accumulated suite across every closed milestone, i.e. exactly `coord
-  # acceptance run --all` (Gate C) would assemble, just invoked by CI's
-  # cadence instead of a milestone-close event.
-  #
-  # Deliberately NOT added to scripts/coord-test-runner.sh (the Test gate's
-  # engine, coordinator.yml's `test_command`): that script also runs as a
-  # systemd *user* unit on the daemon host (#1814's PATH problem) and would
-  # need node/npm/chromium provisioned there for every future
-  # coord/dashboard/webapp/** branch's Test stage, not just this
-  # already-`browser`-capability-gated CI runner. CI is the tighter, cheaper
-  # loop for this suite; revisit the Test-gate route if CI's cadence turns
-  # out not to be enough (#1950's own "decide deliberately").
-  #
-  # ATTRIBUTABILITY (#1950 item 2): a red result here names a spec file
-  # under `tests/acceptance/ms-NN/` and, by that suite's own convention
-  # (tests/acceptance/ms-51/manifest.yml), a `describe` block carrying the
-  # milestone's tracking issue — e.g. `ms-51/home-active.spec.ts › ms-51
-  # Home Active tab (#1544) › ...`. Playwright's `list` reporter prints that
-  # full path/title on failure, so the ms-NN + issue are already in the
-  # job's own output; the failure-hint step below just spells out the two
-  # possible causes so whoever triages it doesn't have to rediscover them.
-  #
-  # #2180: the `npm run test:acceptance` step now runs THROUGH `coord
-  # acceptance run --all --ci` (#2164) instead of calling Playwright
-  # directly. Same suite, same reporter under the hood — the wrapper's
-  # web-playwright driver shape appends `--reporter=json` and reads
-  # PLAYWRIGHT_JSON_OUTPUT_FILE itself (coord/acceptance_drivers.py) — but
-  # now a test-id listed in a manifest's `expected_red:` that fails does not
-  # redden this job (a sealed slice authored red before its fix exists,
-  # #2164's whole point), while one that unexpectedly PASSES does, loudly
-  # (#1965's vacuous-assertion case). Before this, ms-51 going red for any
-  # reason failed this job exactly the same as every other kind of red —
-  # there was no way to merge a red-by-design slice without `--force-merge`.
-  # .github/coord-ci-acceptance.yml's header explains why this points at a
-  # CI-local config instead of the fleet's real ~/.coord/coordinator.yml.
-  acceptance:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: coord/dashboard/webapp
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      # #2393: `npx playwright install chromium --with-deps` was the step
+      # that hung 30+ minutes with no automatic recovery (2026-08-18, this
+      # job and `acceptance`'s) — a fresh ~300MB Chromium download from
+      # Playwright's CDN on EVERY run, no caching, so every run was fully
+      # exposed to any network hiccup on that path. Caching the browser
+      # binary means most runs skip the download-heavy half entirely; only
+      # a cache miss (a `@playwright/test` version bump) pays the network
+      # cost. `install-deps` (apt-only, no download) still runs on a cache
+      # hit so a runner image without chromium's OS libs preinstalled
+      # doesn't break.
+      - name: Cache Playwright browsers
+        id: playwright-cache
+        uses: actions/cache@v4
         with:
-          python-version: "3.12"
-      - working-directory: .
-        run: pip install -e ".[dev]"
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-      - run: npm ci
-      - run: npx playwright install chromium --with-deps
-      - name: coord acceptance run --all --ci (web-playwright route, ms-51)
-        working-directory: .
-        run: >-
-          coord acceptance run --repo claude-coordinator --all --ci
-          --for-path coord/dashboard/webapp/src/App.tsx
-          --config .github/coord-ci-acceptance.yml --path .
-      - name: A red result here is attributable, not a mystery
-        if: failure()
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('coord/dashboard/webapp/package-lock.json') }}
+      - name: Install Playwright + OS deps (cache miss)
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        # #2393 follow-up: the Chromium download from Playwright's CDN has hung
+        # (not merely failed) multiple times in one day, past what caching alone
+        # can paper over on a cache-miss run (a version bump, or the very first
+        # run ever). A short per-attempt timeout + retry turns "hang for the
+        # whole 20-minute job budget" into "fail fast and try again" — transient
+        # CDN/mirror flakiness usually clears within a couple of attempts.
         run: |
-          echo "::error::The sealed acceptance suite (tests/acceptance/ms-NN/) failed."
-          echo "The failing spec's path and 'describe' title name the milestone (ms-NN) and the issue that slice was authored for (see tests/acceptance/ms-NN/manifest.yml)."
-          echo "Two causes, and only one fix is right:"
-          echo "  1. The app regressed against an still-accurate contract -> fix the app."
-          echo "  2. Legitimate app evolution made the contract stale (e.g. #1547 vs ms-51) -> amend the contract: coord acceptance mock <repo> <tracking_issue> --amend '<what changed and why>'"
-          echo "Do not silence this job (continue-on-error, skip, etc.) instead of doing one of the above -- that is exactly how ms-51 rotted unnoticed through #1547-#1818 (#1950)."
+          for attempt in 1 2 3; do
+            echo "Playwright install attempt $attempt/3..."
+            if timeout 300 npx playwright install chromium --with-deps; then
+              echo "Playwright install succeeded on attempt $attempt"
+              exit 0
+            fi
+            echo "Playwright install attempt $attempt failed or timed out after 5m"
+            sleep 10
+          done
+          echo "Playwright install failed after 3 attempts"
+          exit 1
+      - name: Install Playwright OS deps only (cache hit)
+        if: steps.playwright-cache.outputs.cache-hit == 'true'
+        run: npx playwright install-deps chromium
+      - run: npm run test:e2e
+
+  # #2389: the SEALED web-playwright acceptance suite (ms-51) moved to its
+  # own workflow, acceptance-web.yml, with a `paths:` filter scoped to
+  # `coord/dashboard/webapp/**`/`tests/acceptance/**` — mirroring how
+  # cargo-test.yml already gates the tui-tuidriver route on `tui/**`. This
+  # job was unconditionally installing Node + a real Chromium on every
+  # push/PR to this repo regardless of what changed, including pure-Rust
+  # `tui/` diffs that have nothing to do with the webapp (#1950's original
+  # "cheapest fix" traded diff-scoping for coverage-by-default; #2389
+  # restores diff-scoping now that the Rust side has its own equivalent
+  # gate). Not in this repo's required-checks list, so this move changes
+  # nothing about what blocks a merge.
 
   # #1550: `coord/dashboard/webapp/src/api/generated.ts` is produced by
   # `scripts/codegen.py` from the dashboard's OpenAPI spec

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-coordinator
-Version: 0.5.143
+Version: 0.5.146
 Summary: Coordinate Claude Code workers across multiple machines and repos.
 Author-email: John Donaghy <johnfdonaghy@gmail.com>
 License-Expression: LicenseRef-FSL-1.1-MIT

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/code_coordinator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-coordinator
-Version: 0.5.143
+Version: 0.5.146
 Summary: Coordinate Claude Code workers across multiple machines and repos.
 Author-email: John Donaghy <johnfdonaghy@gmail.com>
 License-Expression: LicenseRef-FSL-1.1-MIT

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/code_coordinator.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ pyproject.toml
 .githooks/post-merge
 .github/coord-ci-acceptance.yml
 .github/ISSUE_TEMPLATE/bug_report.md
+.github/workflows/acceptance-web.yml
 .github/workflows/auto-release.yml
 .github/workflows/cargo-test.yml
 .github/workflows/publish.yml

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/code_coordinator.egg-info/scm_file_list.json

@@ -9,6 +9,7 @@
     ".githooks/post-merge",
     ".github/ISSUE_TEMPLATE/bug_report.md",
     ".github/coord-ci-acceptance.yml",
+    ".github/workflows/acceptance-web.yml",
     ".github/workflows/auto-release.yml",
     ".github/workflows/cargo-test.yml",
     ".github/workflows/publish.yml",

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/code_coordinator.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.5.143",
+  "tag": "0.5.146",
   "distance": 0,
-  "node": "g5b8b819c6ba27f432a333e8d026cb66272211710",
+  "node": "geabea71cd1e375065c4baa33f806f7f473662f82",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-08-18"

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/coord/ci_github.py

@@ -129,6 +129,13 @@ class GitHubCi:
     _jobs_cache: dict[tuple[str, str], tuple[float, list[JobRun]]] = field(
         default_factory=dict
     )
+    # #2388: repo -> (fetched_at, required context names or None). Keyed by
+    # repo alone, same reasoning as `_workflow_cache` — required contexts are
+    # a branch-protection property of the repo's default branch, not of any
+    # particular PR.
+    _required_contexts_cache: dict[str, tuple[float, frozenset[str] | None]] = field(
+        default_factory=dict
+    )
 
     @property
     def is_available(self) -> bool:
@@ -360,7 +367,7 @@ class GitHubCi:
             return [_unreadable_check(repo, number, str(e))]
         if not isinstance(raw, list):
             return [_unreadable_check(repo, number, "gh pr checks returned non-list JSON")]
-        return [
+        checks = [
             CheckRun(
                 name=str(entry.get("name", "")),
                 status=_status_from_bucket(str(entry.get("bucket", ""))),
@@ -373,6 +380,32 @@ class GitHubCi:
             for entry in raw
             if isinstance(entry, dict)
         ]
+        # #2388: narrow to what branch protection actually REQUIRES, when
+        # that's determinable — a repo can report far more `gh pr checks`
+        # entries than GitHub's own required list (this repo: 9 reported, 5
+        # required), and every merge-gate predicate downstream of this
+        # method (`failed_checks`, `in_flight_checks`, `checks_are_stale`)
+        # otherwise waits on advisory jobs GitHub itself doesn't. A hung
+        # advisory job (e.g. an unconditional Playwright/Chromium install
+        # with no timeout) would then block `coord merge` indefinitely even
+        # though the PR is already `MERGEABLE`. `_required_contexts` returns
+        # `None` (never filters) when it can't determine the required list
+        # — #1525's bias: unknown reads as "wait on everything reported",
+        # not as a free pass to stop waiting on something that might matter.
+        required = self._required_contexts(repo)
+        if required:
+            checks = [c for c in checks if c.name in required]
+        return checks
+
+    def _required_contexts(self, repo: str) -> frozenset[str] | None:
+        now = time.time()
+        cached = self._required_contexts_cache.get(repo)
+        if cached is not None and (now - cached[0]) < self.cache_ttl:
+            return cached[1]
+        contexts = github_ops.get_required_status_check_contexts(repo)
+        result = frozenset(contexts) if contexts else None
+        self._required_contexts_cache[repo] = (now, result)
+        return result
 
 
 def _unreadable_check(repo: str, number: int, detail: str) -> CheckRun:

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/coord/config.py

@@ -946,7 +946,7 @@ class PipelineConfig:
     worker that gives up on a **semantic** conflict (it emits the
     ``coord:conflict=semantic`` marker on its ``STUCK:`` line) gets ONE
     second attempt from a stronger model
-    (``semantic_conflict_model``, default ``"fable"``) before the merge
+    (``semantic_conflict_model``, default ``"opus"``) before the merge
     entry is parked ``HUMAN_REQUIRED``.  **Defaults to ``False``** — this
     ships dark until it earns trust on real conflicts.  The escalated
     attempt consumes the existing one-per-entry conflict-fix retry cap, so
@@ -986,7 +986,7 @@ class PipelineConfig:
     escalate_fix_model: bool = True
     # #1291 — DEFAULT OFF. See the class docstring.
     escalate_semantic_conflicts: bool = False
-    semantic_conflict_model: str = "fable"
+    semantic_conflict_model: str = "opus"
     # #1478 — DEFAULT OFF. See the class docstring.
     auto_dispatch_stalled: bool = False
     attention_thresholds: dict[str, float] = field(

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/coord/github_ops.py

@@ -1540,6 +1540,46 @@ def get_repo_workflow_count(repo: str) -> int:
     return data["total_count"]
 
 
+def get_required_status_check_contexts(repo: str) -> list[str] | None:
+    """Required status-check context names for *repo*'s default branch (#2388).
+
+    Backs the merge gate's "don't wait on an advisory check" filter — a repo
+    can report many more `gh pr checks` entries than GitHub's own branch
+    protection actually requires (this repo: 9 reported, 5 required), and a
+    slow/hung advisory job (an unconditional Playwright/Chromium install
+    step, say) has no business blocking `coord merge` when GitHub itself
+    already considers the PR mergeable.
+
+    Returns ``None`` — never an empty list treated as "nothing required" —
+    when the default branch has no protection configured, or any read
+    step fails (auth, rate-limit, malformed response, `gh` missing). #1525's
+    bias applies here too: "couldn't determine what's required" must read as
+    "don't filter, wait on everything reported", not as a free pass to stop
+    waiting on checks that might in fact be required. Only an actually
+    non-empty ``required_status_checks.contexts`` list narrows the gate.
+    """
+    try:
+        repo_data = _gh_json("api", f"repos/{repo}", default=None)
+        if not isinstance(repo_data, dict):
+            return None
+        default_branch = repo_data.get("default_branch")
+        if not isinstance(default_branch, str) or not default_branch:
+            return None
+        protection = _gh_json(
+            "api", f"repos/{repo}/branches/{default_branch}/protection",
+            default=None,
+        )
+    except (FileNotFoundError, subprocess.TimeoutExpired, RuntimeError):
+        return None
+    if not isinstance(protection, dict):
+        return None
+    contexts = protection.get("required_status_checks", {})
+    contexts = contexts.get("contexts") if isinstance(contexts, dict) else None
+    if not isinstance(contexts, list) or not contexts:
+        return None
+    return [str(c) for c in contexts]
+
+
 def get_pr_checks(repo: str, number: int) -> list[dict]:
     """Return ``gh pr checks``' raw check-run list for PR *number*.
 

{code_coordinator-0.5.143 → code_coordinator-0.5.146}/coord/test_author.py

@@ -60,6 +60,13 @@ TEST_AUTHOR_DENY_COMMANDS: list[str] = [
     "Bash(gh *)",
 ]
 
+# #1172 follow-up: how many versioned forks (`-v2`, `-v3`, ...) to probe
+# before giving up on finding a JIT slice's next re-authoring branch. Kept
+# small and finite — a real loop here means something is genuinely wrong
+# (not a legitimate string of re-authoring dispatches), and #1172's own
+# guard should surface that as a loud, readable error rather than spin.
+MAX_REAUTHOR_BRANCH_ATTEMPTS = 20
+
 TEST_AUTHOR_SYSTEM_PROMPT = """\
 You are an INDEPENDENT acceptance-test author dispatched by the coordinator.
 
@@ -538,20 +545,39 @@ def dispatch_test_author(
     branch = target_branch or f"issue-{tracking_issue}-{_slugify(assignment_title)}"
 
     if github_ops.pr_is_merged(repo_cfg.github, branch):
-        raise RuntimeError(
-            f"branch {branch!r} already has a merged PR — dispatching would "
-            "push new commits onto a dead branch with nothing left to open "
-            "a PR against them (#1172). "
-            + (
-                f"Issue #{issue_number}'s JIT slice already landed; if it "
-                "needs more tests, this needs a fresh branch (not "
-                "auto-forked yet) — do not retry as-is."
-                if issue_number is not None else
-                "The milestone's Gate-A suite PR already merged; if the "
-                "suite needs more work, open a fresh branch by hand — do "
-                "not retry as-is."
+        if issue_number is not None:
+            # #1172's own stated fix scope was "refuse (or fork a fresh
+            # branch)" — only the refuse half shipped. This is the other
+            # half: a genuine re-authoring dispatch (e.g. a Gate-A contract
+            # `--amend`, docs/ORACLE_LOOP.md's "amend the contract -> the
+            # test-author updates the affected slice") has nowhere else to
+            # push once the slice's own PR has merged, so fork onto the next
+            # unmerged versioned branch instead of failing outright.
+            base_branch = branch
+            for suffix in range(2, MAX_REAUTHOR_BRANCH_ATTEMPTS + 1):
+                candidate = f"{base_branch}-v{suffix}"
+                if not github_ops.pr_is_merged(repo_cfg.github, candidate):
+                    branch = candidate
+                    target_branch = candidate
+                    break
+            else:
+                raise RuntimeError(
+                    f"branch {base_branch!r} and its next "
+                    f"{MAX_REAUTHOR_BRANCH_ATTEMPTS - 1} versioned forks "
+                    "(-v2..-v"
+                    f"{MAX_REAUTHOR_BRANCH_ATTEMPTS}) all already have "
+                    "merged PRs (#1172) — that many re-authoring rounds on "
+                    "one slice is not a normal amend/re-sync cycle; open a "
+                    "fresh branch by hand and investigate."
+                )
+        else:
+            raise RuntimeError(
+                f"branch {branch!r} already has a merged PR — dispatching "
+                "would push new commits onto a dead branch with nothing "
+                "left to open a PR against them (#1172). The milestone's "
+                "Gate-A suite PR already merged; if the suite needs more "
+                "work, open a fresh branch by hand — do not retry as-is."
             )
-        )
 
     deny_commands = test_author_deny_commands(config, repo_name)