code-coordinator 0.5.644__tar.gz → 0.5.646__tar.gz

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-coordinator
-Version: 0.5.644
+Version: 0.5.646
 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.644 → code_coordinator-0.5.646}/code_coordinator.egg-info/SOURCES.txt

@@ -545,6 +545,7 @@ tests/test_cli_gate_a.py
 tests/test_cli_inject_board_less.py
 tests/test_cli_install_drift.py
 tests/test_cli_install_skills.py
+tests/test_cli_issue_close_wrong_repo.py
 tests/test_cli_issue_comment.py
 tests/test_cli_issue_create_label.py
 tests/test_cli_issue_reopen.py

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/code_coordinator.egg-info/scm_file_list.json

@@ -572,6 +572,7 @@
     "tests/test_cli_inject_board_less.py",
     "tests/test_cli_install_drift.py",
     "tests/test_cli_install_skills.py",
+    "tests/test_cli_issue_close_wrong_repo.py",
     "tests/test_cli_issue_comment.py",
     "tests/test_cli_issue_create_label.py",
     "tests/test_cli_issue_reopen.py",

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/code_coordinator.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.5.644",
+  "tag": "0.5.646",
   "distance": 0,
-  "node": "g634dd923ef760cbdf3bb66239d0470e25f7af742",
+  "node": "ge59cc3a4876a427faa94ffa1298b1a0bab4b5852",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-10-16"

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/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.644 → code_coordinator-0.5.646}/coord/commands/issues.py

@@ -572,6 +572,221 @@ def issue_create_cmd(
         click.echo(f"#{result['number']} ({slug}) assigned to milestone {ms_label}")
 
 
+@issue_group.command(
+    "close-wrong-repo",
+    help=(
+        "Close an issue that turns out to belong in a different repo, "
+        "filing the replacement there in the same step (#3711). REPO/ISSUE "
+        "are the issue being closed; --target is the repo (coordinator.yml "
+        "name or owner/repo slug) the fix actually belongs in.\n\n"
+        "A worker that reaches this conclusion should run this instead of "
+        "just saying so in its final message — closing REPO#ISSUE with a "
+        "`coord:event=wrong_repo` marker comment pointing at the new issue "
+        "is what stops further dispatch against it; a final message alone "
+        "does not.\n\n"
+        "--title/--body (or --body-file) seed the new issue — pass along "
+        "the root-cause analysis from the investigation so it isn't lost. "
+        "--reason is an optional one-line note on *why* it belongs in "
+        "--target, appended to REPO#ISSUE's closing comment. --label and "
+        "--milestone behave exactly as on `coord issue create`. A --body "
+        "without a `## Files` heading is accepted but warned about — "
+        "without it `coord drive-queue add`'s overlap prediction has "
+        "nothing to compare in-flight branches against.\n\n"
+        "Auto-queueing the new issue (`coord drive-queue add`) is left to "
+        "the operator/coordinator — this only files and links it."
+    ),
+)
+@click.argument("repo")
+@click.argument("issue", type=int)
+@click.option(
+    "--target", required=True,
+    help="Repo (coordinator.yml name or owner/repo slug) the fix belongs in.",
+)
+@click.option("--title", required=True, help="Title for the new issue in --target.")
+@click.option("--body", default=None, help="Body for the new issue in --target (markdown).")
+@click.option(
+    "--body-file",
+    type=click.Path(path_type=Path),
+    default=None,
+    help="Read the new issue's body from a file. '-' = stdin.",
+)
+@click.option(
+    "--reason", default=None,
+    help="One-line note on why this belongs in --target (appended to the close comment).",
+)
+@click.option(
+    "--label",
+    "labels",
+    multiple=True,
+    help="Label to apply to the new issue (repeatable).",
+)
+@click.option(
+    "--milestone", default=None,
+    help="Milestone (number or title) to attach the new issue to, resolved against --target.",
+)
+@click.option(
+    "--force", is_flag=True, default=False,
+    help="Close REPO#ISSUE even if it has open children (#1196).",
+)
+@_CONFIG_OPTION
+def issue_close_wrong_repo_cmd(
+    repo: str,
+    issue: int,
+    target: str,
+    title: str,
+    body: str | None,
+    body_file: Path | None,
+    reason: str | None,
+    labels: tuple[str, ...],
+    milestone: str | None,
+    force: bool,
+    config_path: Path,
+) -> None:
+    if body is not None and body_file is not None:
+        click.echo("error: --body and --body-file are mutually exclusive", err=True)
+        sys.exit(2)
+    if body_file is not None:
+        body = sys.stdin.read() if str(body_file) == "-" else Path(body_file).read_text()
+    if not body:
+        click.echo("error: provide --body or --body-file", err=True)
+        sys.exit(2)
+    if "## Files" not in body:
+        click.echo(
+            "warning: --body has no `## Files` heading — "
+            "`coord drive-queue add`'s overlap prediction won't have "
+            "anything to compare in-flight branches against for the new issue",
+            err=True,
+        )
+
+    cfg = _load_config(config_path)
+    source_slug = _resolve_repo_slug(cfg, repo)
+    source_entry = cfg.repo(repo)
+    source_name = source_entry.name if source_entry is not None else repo
+    target_slug = _resolve_repo_slug(cfg, target)
+    target_entry = cfg.repo(target)
+    target_name = target_entry.name if target_entry is not None else target
+
+    # Resolve --milestone *before* creating the issue (#3432) — creating the
+    # issue and then failing to attach it would silently reproduce the bug
+    # this closes (an issue that looks healthy but is unreachable from
+    # `coord.plans.aggregate_repo_plans`, which keys on milestone
+    # membership).
+    milestone_number: int | None = None
+    milestone_title: str | None = None
+    if milestone is not None:
+        from coord.commands.milestone import (  # noqa: PLC0415
+            MilestoneResolutionError,
+            resolve_milestone_ref,
+        )
+
+        try:
+            milestone_number, milestone_title = resolve_milestone_ref(target_slug, milestone)
+        except MilestoneResolutionError as e:
+            click.echo(f"error: {e}", err=True)
+            sys.exit(1)
+
+    # #3711: check for open children *before* filing in --target, not just
+    # at close time. `close_issue` below already refuses on open children,
+    # but by then the replacement issue would already exist — a refusal at
+    # that point followed by a natural `--force` retry would file a SECOND
+    # duplicate issue in --target rather than reusing the first. Checking
+    # here means a blocked close never creates anything in the first place.
+    if not force:
+        from coord.github_ops import has_open_children  # noqa: PLC0415
+
+        if has_open_children(source_slug, issue):
+            click.echo(
+                f"error: refusing to close {source_slug}#{issue}: it has "
+                "open children (#1196) — resolve them first, or re-run "
+                "with --force. Checked before filing in --target so a "
+                "blocked close here never leaves an orphan issue behind.",
+                err=True,
+            )
+            sys.exit(1)
+
+    from coord.comments import EVENT_WRONG_REPO  # noqa: PLC0415
+    from coord.state import add_issue_context_entry, close_issue, create_issue  # noqa: PLC0415
+
+    try:
+        result = create_issue(
+            target_name, title, body, labels=list(labels), repo_github=target_slug,
+        )
+    except Exception as e:  # noqa: BLE001
+        click.echo(f"error: filing issue in {target_slug} failed: {e}", err=True)
+        sys.exit(1)
+    new_number = result["number"]
+    click.echo(f"#{new_number} ({target_slug}) created")
+
+    if milestone_number is not None:
+        from coord.state import assign_issue_milestone  # noqa: PLC0415
+
+        try:
+            assign_issue_milestone(
+                target_name,
+                new_number,
+                milestone_number,
+                milestone_title=milestone_title,
+                repo_github=target_slug,
+            )
+        except Exception as e:  # noqa: BLE001
+            click.echo(
+                f"error: #{new_number} ({target_slug}) created but "
+                f"milestone assign failed: {e}",
+                err=True,
+            )
+            sys.exit(1)
+
+    marker = f"<!-- coord:event={EVENT_WRONG_REPO} target={target_slug} issue={new_number} -->"
+    reason_line = f"\n\n{reason}" if reason else ""
+    close_comment = (
+        f"Closing — this belongs in `{target_slug}`, filed as "
+        f"{target_slug}#{new_number}.{reason_line}\n\n{marker}"
+    )
+    try:
+        close_issue(
+            source_name, issue, comment=close_comment, repo_github=source_slug, force=force,
+        )
+    except Exception as e:  # noqa: BLE001
+        click.echo(
+            f"error: #{new_number} ({target_slug}) created but closing "
+            f"#{issue} ({source_slug}) failed: {e}\n"
+            f"Do not re-run this command to retry — it would file a "
+            f"second, duplicate issue in {target_slug}. Instead close "
+            f"{source_slug}#{issue} directly (`coord issue close {repo} "
+            f"{issue}`), referencing {target_slug}#{new_number}.",
+            err=True,
+        )
+        sys.exit(1)
+    click.echo(f"#{issue} ({source_slug}) closed as wrong-repo")
+
+    # Pinned context entries link the two issues in both directions without
+    # requiring a comment re-scrape — same hygiene as upstream_gaps._file_one.
+    # Both writes that actually matter (the new issue, the close) already
+    # landed by this point, so a daemon hiccup here must not surface as a
+    # raw traceback on an otherwise-successful command (model:
+    # coord/upstream_gaps.py's own context-entry writes).
+    try:
+        add_issue_context_entry(
+            source_name, issue,
+            f"Closed as wrong-repo — filed in {target_slug}#{new_number}.",
+            pinned=True,
+            source="wrong-repo",
+        )
+        add_issue_context_entry(
+            target_name, new_number,
+            f"Filed from {source_slug}#{issue} (closed as wrong-repo).",
+            pinned=True,
+            source="wrong-repo",
+        )
+    except Exception as e:  # noqa: BLE001
+        click.echo(
+            f"warning: {source_slug}#{issue} closed and {target_slug}#"
+            f"{new_number} filed, but recording the cross-link context "
+            f"entry failed: {e}",
+            err=True,
+        )
+
+
 @issue_group.command(
     "label",
     help=(

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/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.644 → code_coordinator-0.5.646}/coord/comments.py

@@ -98,6 +98,14 @@ EVENT_STUCK_TEST_STATE_HEALED = "stuck_test_state_healed"
 # landing a second branch) UPDATES this comment in place
 # (`coord.state.upsert_issue_comment`) rather than appending a duplicate.
 EVENT_VERIFICATION = "verification"
+# #3711: `coord issue close-wrong-repo` closes an issue whose fix belongs in
+# a different repo, filing the replacement there and linking the two with
+# this marker on the closing comment. Distinct from every event above: those
+# all narrate pipeline/worker conditions on a SINGLE issue; this one records
+# a cross-repo, cross-issue relationship (closed-here, refiled-there) so a
+# future parser can resolve `target=`/`issue=` back to the new issue without
+# re-scraping comment text.
+EVENT_WRONG_REPO = "wrong_repo"
 
 
 @dataclass

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/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.644 → code_coordinator-0.5.646}/coord/dispatch.py

@@ -332,6 +332,32 @@ gap leaves this issue unresolved, also declare `ISSUE_RESOLUTION: partial — \
 blocked on upstream (BLOCKED_ON_UPSTREAM above)`.
 """
 
+# #3711: appended to every `type="work"` briefing, alongside
+# UPSTREAM_GAP_BRIEFING_NOTE above — the worker-facing half of the
+# wrong-repo close+refile capability. `coord issue close-wrong-repo`
+# (`coord/commands/issues.py`) is the command half; without this note a
+# worker has no way to discover it (`CLAUDE.md` tells every worker the only
+# `coord` command it runs is `coord acceptance run`), so it would keep
+# reporting a wrong-repo conclusion in its final message and stopping —
+# exactly the quadraui#1554 shape (3 legs, 0 commits) this exists to end.
+WRONG_REPO_BRIEFING_NOTE = """
+
+## Wrong-repo issues — `coord issue close-wrong-repo` (#3711)
+
+If you conclude mid-investigation that this issue's fix belongs in a
+DIFFERENT repo entirely (not just a missing upstream capability — the whole
+issue is mis-targeted), don't just say so in your final message and stop:
+
+    coord issue close-wrong-repo <this-repo> <this-issue> \\
+        --target <other-repo> --title "<title>" --body "<root-cause analysis>"
+
+This closes the current issue with a `coord:event=wrong_repo` marker comment
+and files the replacement in `<other-repo>` in one step, carrying your root-
+cause analysis forward so it isn't lost — closing reads as terminal to the
+drive queue, so it also stops further dispatch against this issue. Still
+commit and push whatever is genuinely done first if you made any progress.
+"""
+
 # #3132: the addendum appended to a ``type="epic-decompose"`` dispatch's
 # briefing — see ``epic_decompose_briefing`` below. Kept as a module-level
 # constant (not inlined in the function) so a test can assert against the
@@ -1211,6 +1237,7 @@ def dispatch(
             briefing_text
             + sibling_lessons_block(proposal.repo_name, proposal.issue_number)
             + UPSTREAM_GAP_BRIEFING_NOTE
+            + WRONG_REPO_BRIEFING_NOTE
         )
     elif proposal.type == EPIC_DECOMPOSE_TYPE and proposal.issue_number:
         # #3132 review: an epic-decompose worker gets a real worktree + branch

{code_coordinator-0.5.644 → code_coordinator-0.5.646}/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.644 → code_coordinator-0.5.646}/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