code-coordinator 0.5.643__tar.gz → 0.5.645__tar.gz

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-coordinator
-Version: 0.5.643
+Version: 0.5.645
 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.645/code_coordinator.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.5.645",
+  "distance": 0,
+  "node": "g15abbe1973b83d94c7e71918d1d28760a3177d6e",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-16"
+}

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/commands/drive_queue.py

@@ -5979,6 +5979,7 @@ def _fetch_merge_only_ready(
     entries: list,
     live_ci_gate: Mapping[str, bool],
     live_blocked_gate: Mapping[str, bool],
+    config_path: Path | None = None,
 ) -> dict[str, bool]:
     """``{entry_key: True}`` for #2350's Merge-only fast path: every entry
     THIS tick's live gate re-check just found clear — a `parked` entry with
@@ -6003,9 +6004,11 @@ def _fetch_merge_only_ready(
     else here, so it is not unsafe — just not the zero-I/O read the rest of
     this docstring describes.
 
-    Takes no *config_path*, unlike both siblings: neither board-only read
-    needs a :class:`~coord.config.Config` (no ``ci_store``, no live gate
-    re-derivation), so there is nothing to load here.
+    Takes *config_path* only to resolve #3707's ancillary-rebase exemption
+    inside ``has_approved_review`` consistently with every other merge-gate
+    surface (#2096) — unlike both siblings, neither read otherwise needs a
+    ``ci_store`` or live gate re-derivation, so that's the only reason a
+    :class:`~coord.config.Config` is loaded here at all.
 
     Same fail-open-per-entry, fail-closed-overall contract as its siblings:
     a key ABSENT from the result (no queue row, an unreadable board or
@@ -6028,9 +6031,11 @@ def _fetch_merge_only_ready(
     try:
         from coord import github_ops as _gh_ops  # noqa: PLC0415
         from coord import merge_queue as _mq  # noqa: PLC0415
+        from coord.commands._common import _load_config  # noqa: PLC0415
         from coord.state import load_board as _load_board  # noqa: PLC0415
 
         board = _load_board()
+        cfg = _load_config(config_path)
         queue_by_key = {
             entry_key(q.repo_name, q.issue_number): q for q in _mq.load_queue()
         }
@@ -6044,7 +6049,7 @@ def _fetch_merge_only_ready(
             continue
         try:
             ready[e.key] = _mq.has_approved_review(
-                q, board, _gh_ops
+                q, board, _gh_ops, config=cfg
             ) and _mq.has_passed_test(q, board)
         except Exception:  # noqa: BLE001 — leave this one entry to the ordinary path
             continue
@@ -7361,7 +7366,7 @@ def drive_queue_tick(
         # `plan_tick` can attempt it directly this tick instead of spending
         # a relaunch. See `_fetch_merge_only_ready`'s docstring.
         merge_only_ready = _fetch_merge_only_ready(
-            entries, live_ci_gate, live_blocked_gate
+            entries, live_ci_gate, live_blocked_gate, config_path
         )
 
         # #2602: a live re-check for every `after=` pre-req the cached board

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/commands/review.py

@@ -1387,7 +1387,7 @@ def review_reaffirm(
         sys.exit(1)
     entry.branch_patch_id = None  # force a fresh backfill below, never trust a stale value
 
-    if mq.has_approved_review(entry, board, github_ops):
+    if mq.has_approved_review(entry, board, github_ops, config=cfg):
         click.echo(
             "nothing to reaffirm — an approved review already covers the "
             "branch's current head (either fresh, or a content-identical "
@@ -1395,7 +1395,7 @@ def review_reaffirm(
         )
         return
 
-    prior_review = mq.find_scoped_review_candidate(entry, board, github_ops)
+    prior_review = mq.find_scoped_review_candidate(entry, board, github_ops, config=cfg)
     if prior_review is None:
         click.echo(
             "error: no reaffirmable approval found — either this branch was "

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/config.py

@@ -3327,6 +3327,7 @@ _KNOWN_REPO_KEYS = frozenset(
         "reference_repos",
         "new_issue_guidance",
         "artifact_paths",
+        "ancillary_files",
         "provider",
         "uat_preview",
         "uat_live_preview",
@@ -3581,6 +3582,20 @@ def _parse_repos(raw: Any) -> tuple[list[Repo], list[str]]:
                 )
         artifact_paths: list[str] = list(artifact_paths_raw)
 
+        # ancillary_files — filenames whose conflict resolution is always
+        # mechanical (e.g. CHANGELOG.md, README.md), so a rebase delta
+        # confined to them skips the scoped re-review.
+        ancillary_files_raw = entry.get("ancillary_files", []) or []
+        if not isinstance(ancillary_files_raw, list):
+            raise ConfigError(f"repos[{i}].ancillary_files must be a list of strings")
+        for j, p in enumerate(ancillary_files_raw):
+            if not isinstance(p, str):
+                raise ConfigError(
+                    f"repos[{i}].ancillary_files[{j}] must be a string, "
+                    f"got {type(p).__name__}"
+                )
+        ancillary_files: list[str] = list(ancillary_files_raw)
+
         # #323: optional per-repo provider override.
         repo_provider = entry.get("provider")
         if repo_provider is not None and not isinstance(repo_provider, str):
@@ -3667,6 +3682,7 @@ def _parse_repos(raw: Any) -> tuple[list[Repo], list[str]]:
                 reference_repos=reference_repos,
                 new_issue_guidance=new_issue_guidance,
                 artifact_paths=artifact_paths,
+                ancillary_files=ancillary_files,
                 provider=repo_provider,
                 uat_preview=uat_preview,
                 uat_live_preview=uat_live_preview_raw,

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/diagnose.py

@@ -1441,10 +1441,19 @@ def _recover_test(
             from coord.reconcile import (  # noqa: PLC0415
                 propagate_smoke_terminal_failure,
             )
-
+            from coord.state import load_assignment_exit_code  # noqa: PLC0415
+
+            # #3705: the board projection carries no `exit_code`, so read the
+            # smoke child's recorded exit status directly — without it every
+            # reason-less failure would reclassify as a silent #1605 death and
+            # earn a bounded retry instead of a work failure.  A `cancelled`
+            # row is the operator's own `coord stop`, whose exit status is the
+            # kill signal rather than a verdict on the code under test.
             propagate_smoke_terminal_failure(
                 parent_assignment_id=latest.assignment_id,
                 failure_reason=smoke.failure_reason,
+                operator_cancelled=(smoke.status or "") == "cancelled",
+                exit_code=load_assignment_exit_code(smoke.assignment_id),
             )
             res.actions_taken.append(
                 f"resolved stuck test_state='running' from smoke child "

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/failure_class.py

@@ -98,6 +98,11 @@ KIND_NETWORK = "network"
 #: diagnosis of a lost Test-stage leg, never a verdict about the code
 #: under test.
 KIND_INFRA = "infra"
+#: #3705: a Test-stage worker died with literally no `failure_reason` to
+#: classify — not "classified as work because the text didn't match any
+#: environmental pattern" (that case has real diagnostic text and stays
+#: `KIND_WORK`), but zero evidence at all. See :func:`silent_test_death`.
+KIND_SILENT = "silent"
 KIND_WORK = "work"
 
 #: HTTP statuses from the Claude API that mean "the provider, not the work".
@@ -353,6 +358,40 @@ def _usage_limit(reset_at_raw: str | None, signal: str) -> FailureClassification
     )
 
 
+def silent_test_death() -> FailureClassification:
+    """#3705: classification for a Test-stage worker that died reporting
+    literally nothing — no usage-limit/API/network/infra signal and no
+    ``failure_reason`` text at all for :func:`classify_failure` to have
+    scanned in the first place (a dead agent, a killed process group, a
+    terminal API error with the summary itself lost — the #1605 class).
+
+    Deliberately **not** a branch inside :func:`classify_failure`: that
+    function's "everything else is WORK, including no evidence" rule is
+    correct for a failure that has *some* terminal text which simply didn't
+    match an environmental pattern (that IS a real, if unrecognized, work
+    failure with diagnostic content worth handing a fix worker). This is
+    the narrower case of *zero* content — nothing to classify, let alone
+    hand to a fix worker — which only
+    :func:`coord.reconcile.propagate_smoke_terminal_failure` can tell apart
+    from the ordinary case (it alone sees whether ``failure_reason`` itself
+    was ever populated). Classified ``ENVIRONMENTAL`` so it gets the same
+    bounded clear-and-retry-then-park treatment as a usage limit or network
+    drop — a silent death is no more evidence of a code defect than either
+    of those, and parking (never a blind ``coord fix``) is the correct
+    escalation once the shared retry budget is exhausted.
+    """
+    return FailureClassification(
+        failure_class=ENVIRONMENTAL,
+        kind=KIND_SILENT,
+        reason=(
+            "environmental (silent #1605 death): the Test-stage worker "
+            "died without recording any reason — no usage-limit, API, "
+            "network, or infra signal, and no terminal output at all"
+        ),
+        signal=None,
+    )
+
+
 def _reset_at_from_reason(reason: str | None) -> str | None:
     """Pull the raw reset string back out of a stamped ``failure_reason``."""
     if not is_usage_limit_reason(reason):

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/gate_snapshot.py

@@ -191,6 +191,16 @@ class GateSnapshot:
     # lookup that found nothing: same fail-open *caching* convention as
     # `branch_shas` above.
     deployment_urls: dict[tuple[str, str], str | None] = field(default_factory=dict)
+    # #3707: (repo, base, head) -> unified diff text for the ancillary-only
+    # rebase-delta check (`merge_queue._review_delta_is_ancillary_only`).
+    # Keyed on (repo, base_ref_or_sha, head_sha) — the same triple
+    # `github_ops.get_compare_diff` takes.  A key that is absent (never
+    # refreshed) yields None, which `_fetch_compare_diff` already treats as
+    # "can't compare → not ancillary-only" (fail-closed), same convention
+    # as `branch_shas`/`branch_patch_ids` above.
+    compare_diffs: dict[tuple[str, str, str], str | None] = field(
+        default_factory=dict
+    )
     # #1904: repo -> whether the inner CiStore believes this repo declares
     # CI at all — the signal `expects_checks` below needs to tell "no CI
     # configured" apart from "CI exists but never reported for this PR"
@@ -262,6 +272,11 @@ class GateSnapshot:
     def get_branch_commit_timestamp(self, repo: str, branch: str) -> float | None:
         return self.branch_commit_timestamps.get((repo, branch))
 
+    # ── github_ops view consumed by the #3707 ancillary-only rebase check ──
+    # (merge_queue._review_delta_is_ancillary_only → _fetch_compare_diff)
+    def get_compare_diff(self, repo: str, base: str, head: str) -> str | None:
+        return self.compare_diffs.get((repo, base, head))
+
     # ── github_ops view consumed by the #2948 UAT preview-URL lookup ───────
     # (#3216 — merge_queue._resolve_uat_preview_url)
     def get_pr_deployment_url(self, repo: str, branch: str) -> str | None:

{code_coordinator-0.5.643 → code_coordinator-0.5.645}/coord/gates.py

@@ -759,7 +759,13 @@ def build_gate_report(
     review_reason: str | None = None
     review_verdict_unparseable = False
     if review_required:
-        review_scan = mq.scan_approved_reviews(entry, board, gh_ops)
+        review_scan = mq.scan_approved_reviews(
+            entry,
+            board,
+            gh_ops,
+            ancillary_files=repo_cfg.ancillary_files,
+            ancillary_gh_ops=gh_ops,
+        )
         review_ok = review_scan.approved
         if not review_ok:
             # #2704: `unknown_head` means the branch head could not be