code-coordinator 0.5.226__tar.gz → 0.5.227__tar.gz

{code_coordinator-0.5.226 → code_coordinator-0.5.227}/CLAUDE.md

@@ -201,6 +201,18 @@ The operator-side counterparts to these rules (dispatch economics, what to send
 versus keep in the coordinator session) are in
 [`docs/COST_DISCIPLINE.md`](docs/COST_DISCIPLINE.md).
 
+## Rules for the coordinator session
+
+- **Prefer `coord issue` / `coord repo` / `coord milestone` over raw `gh`.** Workers can't reach
+  `gh` at all (deny-listed, above); an interactive coordinator session technically can, but should
+  still route issue/PR/milestone reads and writes through the `coord` seam wherever a subcommand
+  covers it — that's what keeps the backend-agnostic forge seam
+  ([`docs/FORGE_MIGRATION.md`](docs/FORGE_MIGRATION.md)) actually exercised instead of quietly
+  bypassed by the one class of session most likely to reach for `gh` out of habit. Where no `coord`
+  subcommand covers what's needed — a real gap as of 2026-08 (e.g. #2484: `coord issue` has no
+  `list`/`view`) — falling back to `gh` for that one read is fine, but say so and treat it as a gap
+  to flag or file, not a silent workaround.
+
 ## Testing — black-box coverage is the acceptance bar
 
 **Every PR that changes user-visible behavior must ship a black-box test** that drives the *running app* and asserts on its rendered output — not just unit tests on internal functions. The adversarial reviewer reads this file and **rejects behavior-changing PRs that lack one** (pure refactors / internal-only changes are exempt — say so in the PR if that applies). Build the **harness once per repo**; add **tests incrementally, one (or a few) per behavior-changing issue** — do *not* big-bang a full suite. Coverage then grows with churn and ratchets up (PRs add coverage, never remove it). Keep a thin **core smoke set** over the few most-trafficked screens so critical flows stay guarded even by unrelated changes.

{code_coordinator-0.5.226 → code_coordinator-0.5.227}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-coordinator
-Version: 0.5.226
+Version: 0.5.227
 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.226 → code_coordinator-0.5.227}/code_coordinator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-coordinator
-Version: 0.5.226
+Version: 0.5.227
 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.226 → code_coordinator-0.5.227}/code_coordinator.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.5.226",
+  "tag": "0.5.227",
   "distance": 0,
-  "node": "g5d9d29d644034da774ad69d43b80e31f9a89bcfc",
+  "node": "g4d72834d6806b7c52ef9e25a887a4ddd33fc5427",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-08-22"

{code_coordinator-0.5.226 → code_coordinator-0.5.227}/coord/test_author.py

@@ -247,6 +247,7 @@ def build_test_author_briefing(
     issue_body: str | None,
     driver_entrypoint: str = "",
     driver_mock: str = "",
+    default_branch: str = "main",
 ) -> str:
     """Compose the test-author's briefing (its first/only user message).
 
@@ -255,6 +256,16 @@ def build_test_author_briefing(
     None) authors the full initial suite from the contract; *JIT mode*
     (`issue_number` set) extends just that issue's slice.
 
+    *default_branch* (#2539) is the repo's merge target (``repo_cfg.
+    default_branch or "main"`` at both call sites, the same value already
+    sent as the dispatch payload's ``branch`` field). JIT mode uses it to
+    tell the author to check this branch's mergeability before finishing —
+    a re-dispatch onto an already-authored slice branch (see the #2552
+    RESUMING note appended by `dispatch_test_author`) previously had no
+    instruction to look at `default_branch` at all, so a slice that had
+    gone stale behind a sibling slice's merge would report done with an
+    unresolved conflict still sitting on the PR (coord-portal#132).
+
     *driver_entrypoint* (#1552) is the driver's declared ``entrypoint:`` —
     the crate root a slice must be registered in before the run command can
     see it, for a framework that links tests through an entry point rather
@@ -346,6 +357,43 @@ def build_test_author_briefing(
         parts.append("")
         parts.append(f"ISSUE #{issue_number}: {issue_title or '(no title)'}")
         parts.append(issue_body.strip() if issue_body and issue_body.strip() else "(no body)")
+        parts.append("")
+        parts.append(
+            f"MERGEABILITY (#2539): before you finish — after step 4b's "
+            f"manifest update, before step 6's commit/push — fetch "
+            f"`{default_branch}` (`git fetch origin {default_branch}`) and "
+            f"check whether this branch still merges onto it cleanly (e.g. "
+            f"`git merge --no-commit --no-ff origin/{default_branch}`, then "
+            "`git merge --abort` once you've seen the result — never leave "
+            "the worktree mid-merge). This branch may already carry commits "
+            "from a prior dispatch (see any note above about resuming "
+            "unfinished work), and a sibling slice's PR may have merged "
+            f"into `{default_branch}` since this one was authored. If it "
+            "merges clean, proceed to commit/push as normal. If it "
+            "conflicts:\n"
+            f"  - Confined to `{ACCEPTANCE_DIRNAME}/{ms_dir}/**` (the sealed "
+            "suite YOU already have authoring rights over) AND a clean "
+            "additive collision — the common case is two slices each "
+            "appending their own block to the shared "
+            "`manifest.(yml|json)` (that file documents its own "
+            "convention: later slices MERGE into it) — resolve it "
+            f"yourself: rebase onto `origin/{default_branch}` and keep BOTH "
+            "sides' additions, never dropping the other slice's entries to "
+            "make yours resolve. Re-run step 4's red-check afterward — a "
+            "rebase can shift what the tests see underneath them.\n"
+            "  - Anything else — a conflict that reaches outside "
+            f"`{ACCEPTANCE_DIRNAME}/{ms_dir}/**`, or isn't a clean additive "
+            "collision — do NOT guess a resolution. Abort the merge/rebase, "
+            "leave the branch as it was, and STOP with:\n"
+            f"      STUCK: merge conflict against {default_branch} in "
+            "<file(s)> — outside sealed-authoring scope or not a clean "
+            "additive merge\n"
+            "(same posture a `conflict-fix` session takes for a "
+            "non-rebaseable conflict — you are simply the only dispatch "
+            f"type structurally allowed to touch `{ACCEPTANCE_DIRNAME}/` "
+            "at all, so a conflict confined there is yours to resolve, not "
+            "conflict-fix's)."
+        )
 
     parts.append("")
     parts.append("---")
@@ -499,6 +547,7 @@ def dispatch_test_author(
         issue_number=issue_number,
         issue_title=issue_title,
         issue_body=issue_body,
+        default_branch=repo_cfg.default_branch or "main",
     )
 
     # #1171: milestone-mode dispatches (issue_number is None) keep a single
@@ -889,6 +938,7 @@ def dispatch_test_author_interactive(
         issue_number=issue_number,
         issue_title=issue_title,
         issue_body=issue_body,
+        default_branch=repo_cfg.default_branch or "main",
     )
 
     # Same FIXED title as the headless dispatch (see dispatch_test_author's

{code_coordinator-0.5.226 → code_coordinator-0.5.227}/tests/test_test_author.py

@@ -49,11 +49,13 @@ def _config(
     driver: AcceptanceDriverConfig | None = None,
     worker_permissions: WorkerPermissionsConfig | None = None,
     models: ModelsConfig | None = None,
+    default_branch: str | None = None,
 ) -> Config:
     repo = Repo(
         name=repo_name,
         github="acme/coord-tui",
         worker_permissions=worker_permissions,
+        **({"default_branch": default_branch} if default_branch else {}),
     )
     acceptance = AcceptanceConfig(drivers={repo_name: driver} if driver else {})
     return Config(
@@ -160,6 +162,55 @@ class TestBuildBriefing:
         assert "Add foo" in briefing
         assert "Body text" in briefing
 
+    # ── #2539: mergeability check + sealed-path conflict resolution ────────
+
+    def test_jit_mode_includes_mergeability_check_against_default_branch(self) -> None:
+        """A re-dispatch onto an already-authored slice branch previously had
+        no instruction to look at the target branch at all — it could
+        report done with a conflict still sitting on the PR
+        (coord-portal#132). JIT mode must tell the author to check."""
+        briefing = build_test_author_briefing(**self._kwargs(
+            issue_number=101, issue_title="Add foo", issue_body="Body text",
+            default_branch="develop",
+        ))
+        assert "MERGEABILITY" in briefing
+        assert "git fetch origin develop" in briefing
+        assert "origin/develop" in briefing
+
+    def test_jit_mode_mergeability_defaults_to_main(self) -> None:
+        briefing = build_test_author_briefing(**self._kwargs(
+            issue_number=101, issue_title="Add foo", issue_body="Body text",
+        ))
+        assert "git fetch origin main" in briefing
+
+    def test_jit_mode_mergeability_instructs_sealed_path_resolution(self) -> None:
+        """The common case — two slices additively appending to the shared
+        manifest — is a mechanical rebase + keep-both, and must be spelled
+        out as something the author resolves itself, not escalates."""
+        briefing = build_test_author_briefing(**self._kwargs(
+            issue_number=101, issue_title="Add foo", issue_body="Body text",
+        ))
+        assert "tests/acceptance/ms-25/**" in briefing
+        assert "manifest.(yml|json)" in briefing
+        assert "keep BOTH" in briefing
+        assert "rebase onto `origin/main`" in briefing
+
+    def test_jit_mode_mergeability_refuses_conflicts_outside_sealed_scope(self) -> None:
+        """A conflict reaching outside tests/acceptance/** (or one that isn't
+        a clean additive collision) must be surfaced, not guessed at — same
+        posture conflict-fix already takes for a non-rebaseable conflict."""
+        briefing = build_test_author_briefing(**self._kwargs(
+            issue_number=101, issue_title="Add foo", issue_body="Body text",
+        ))
+        assert "do NOT guess a resolution" in briefing
+        assert "STUCK: merge conflict against main" in briefing
+
+    def test_milestone_mode_has_no_mergeability_section(self) -> None:
+        """Milestone mode's shared Gate-A branch isn't the re-dispatch path
+        #2539 is about — the mergeability instruction is JIT-only."""
+        briefing = build_test_author_briefing(**self._kwargs())
+        assert "MERGEABILITY" not in briefing
+
     # ── #1552: the driver's crate-root entry point ─────────────────────────
 
     def test_entrypoint_is_named_and_authorised(self) -> None:
@@ -490,6 +541,37 @@ class TestDispatchTestAuthor:
         assert "Add foo" in payload["briefing"]
         assert "Body text" in payload["briefing"]
 
+    def test_jit_dispatch_threads_repo_default_branch_into_mergeability_check(
+        self,
+    ) -> None:
+        """#2539: the mergeability instruction must check the REPO's actual
+        merge target, not a hardcoded 'main' — a repo on the `develop`
+        integration-branch convention (models.py's `default_branch`) needs
+        the author fetching/rebasing onto `develop`, not a branch that
+        doesn't exist."""
+        cfg = _config(
+            [_machine("laptop", ["coord-tui"])], driver=self._driver(),
+            default_branch="develop",
+        )
+        fake_client = MagicMock()
+        fake_resp = MagicMock()
+        fake_resp.json.return_value = {"id": "xyz789"}
+        fake_client.post.return_value = fake_resp
+
+        with patch("coord.test_author.fetch_milestone_context", return_value=self._ctx()), \
+             patch(
+                 "coord.test_author.github_ops.get_issue",
+                 return_value={"title": "Add foo", "body": "Body text"},
+             ), \
+             patch("coord.state.record_dispatched_assignment"):
+            dispatch_test_author(
+                "coord-tui", 947, cfg, issue_number=101, http_client=fake_client,
+            )
+
+        payload = fake_client.post.call_args.kwargs["json"]
+        assert "git fetch origin develop" in payload["briefing"]
+        assert "origin/develop" in payload["briefing"]
+
     def test_jit_slice_gets_its_own_branch_outside_issue_namespace(self) -> None:
         """#1171: a JIT slice must NOT collapse onto the milestone's shared
         `issue-{tracking_issue}-*` branch — the previous behavior meant a