code-coordinator 0.5.322__tar.gz → 0.5.323__tar.gz

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/PKG-INFO

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

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

@@ -403,6 +403,7 @@ tests/test_approve_dependency_busy_2804.py
 tests/test_approve_reject_plan.py
 tests/test_approve_usage_gate.py
 tests/test_approved_work_2532.py
+tests/test_approved_work_2996.py
 tests/test_assignment_already_recorded_daemon.py
 tests/test_audit_log.py
 tests/test_audit_outcome.py

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/code_coordinator.egg-info/scm_file_list.json

@@ -429,6 +429,7 @@
     "tests/test_approve_reject_plan.py",
     "tests/test_approve_usage_gate.py",
     "tests/test_approved_work_2532.py",
+    "tests/test_approved_work_2996.py",
     "tests/test_assignment_already_recorded_daemon.py",
     "tests/test_audit_log.py",
     "tests/test_audit_outcome.py",

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/code_coordinator.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.5.322",
+  "tag": "0.5.323",
   "distance": 0,
-  "node": "gc65d3bfc2f39f921d5d2df163c46505669a2a629",
+  "node": "g6d62d0b99d361f200c0329792182a2f8918b2864",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-08-31"

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/coord/approved_work.py

@@ -256,6 +256,47 @@ def approved_submission_ids() -> set[str]:
     return {sid for sid, verdict in _fold_signoff_verdicts().items() if verdict == "approved"}
 
 
+def is_pulled_status(status: str) -> bool:
+    """Whether *status* is one of :data:`_PULLED_STATUSES` — the public,
+    non-underscore way for another module (:mod:`coord.commands.portal`,
+    #2996) to ask "would pushing this status withdraw a submission from
+    :func:`approved_submissions`?" without reaching into this module's
+    private constant.
+    """
+    return status in _PULLED_STATUSES
+
+
+def disqualifying_status(submission_id: str) -> str | None:
+    """The ``last_status`` responsible for *submission_id* being missing
+    from :func:`approved_submissions` despite an ``approved`` sign-off
+    verdict on file — or ``None`` when that is not why it is missing (never
+    approved, no record at all, or genuinely not pulled) (#2996).
+
+    Reads local :mod:`coord.portal_store` directly, same as
+    :func:`approved_submissions` itself — so, like that function, this is
+    only meaningful when called on the daemon host (the caller is
+    responsible for that; see :func:`coord.commands.portal.
+    _refuse_if_thin_client` and :func:`coord.decomposition_chat.
+    resolve_approved_submission`'s own thin-client routing).
+
+    Exists so a "why isn't this on the queue" failure message
+    (:func:`coord.decomposition_chat.resolve_approved_submission`'s callers)
+    can name the actual cause — a status an operator pushed by hand, most
+    often via ``coord portal enqueue-status`` — instead of the generic
+    "is not a currently-approved portal submission", which names neither.
+    """
+    from coord import portal_store  # noqa: PLC0415 — avoid import cycle
+
+    record = portal_store.get_submission(submission_id)
+    if record is None:
+        return None
+    if record.submission_id not in approved_submission_ids():
+        return None
+    if record.last_status in _PULLED_STATUSES:
+        return record.last_status
+    return None
+
+
 def approved_submissions(config: "Config") -> list[dict[str, Any]]:
     """The ``/board`` ``approved_submissions`` payload, **oldest first**.
 

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/coord/commands/portal.py

@@ -612,6 +612,7 @@ def _run_decompose_chat_interactive(
     )
     from coord.decomposition_chat import (  # noqa: PLC0415
         build_decomposition_chat_briefing,
+        describe_unapproved_submission,
         fetch_running_context,
         render_running_context_section,
         repo_topology_context,
@@ -633,8 +634,7 @@ def _run_decompose_chat_interactive(
     submission = resolve_approved_submission(cfg, submission_id)
     if submission is None:
         click.secho(
-            f"error: submission {submission_id!r} is not a currently-approved "
-            "portal submission — nothing to decompose",
+            f"error: {describe_unapproved_submission(cfg, submission_id)}",
             fg="red",
         )
         raise SystemExit(1)
@@ -1343,11 +1343,48 @@ def portal_enqueue_status(submission_id: str, status: str) -> None:
     Unlike `push`, this allocates the revision for you and refuses a status
     that would summon the customer to an empty screen — `awaiting-signoff`
     with no design round queued, `needs-input` with no question (#835).
+
+    **#2996: warns, never refuses, before a `_PULLED_STATUSES` push that
+    would silently withdraw SUBMISSION_ID from decomposition.**
+    `coord.approved_work.approved_submissions` (the "Approved work items"
+    panel's data source) drops any submission whose `last_status` moves to
+    `planned` / `in-progress` / `quality-check` / `shipped` — those four
+    values are only ever supposed to mean "already pulled into a linked
+    milestone/issue and dispatch has begun". Pushing one of them here on a
+    submission with no `coord portal link` on file does that removal anyway,
+    with nothing to say so — the observed failure mode (#2996's own filing)
+    was a status pushed purely to update the customer-facing wording, which
+    happened to also empty the queue and only surfaced later as an unrelated
+    "not a currently-approved portal submission" error. This command still
+    sends the push regardless — there are legitimate reasons to set any of
+    these by hand (a correction, a re-sync, an out-of-band delivery) — it
+    only makes the consequence visible first.
     """
     _refuse_if_thin_client("enqueue-status")
 
+    from coord.approved_work import is_pulled_status  # noqa: PLC0415
     from coord.portal_sync import PortalSyncError, enqueue_status  # noqa: PLC0415
 
+    if is_pulled_status(status):
+        from coord import portal_store  # noqa: PLC0415
+
+        if portal_store.get_link_by_submission(submission_id) is None:
+            click.secho(
+                f"warning: {submission_id} has no linked milestone/issue on "
+                "file (no `coord portal link` recorded) and no decomposition "
+                f"on record — pushing status={status!r} will still be sent, "
+                "but coord treats that status as \"already pulled into "
+                f"decomposition and delivery\": {submission_id} will vanish "
+                "from the TUI's Approved work items panel, and `coord portal "
+                "decompose-chat` will refuse it as no longer approved. If "
+                "the work has not actually been decomposed yet and you just "
+                "want an honest \"we know what's next\" status for the "
+                f"customer, use `coord portal enqueue-status {submission_id} "
+                "in-design` instead — it stays on the queue and announces "
+                "nobody.",
+                fg="yellow",
+            )
+
     try:
         row = enqueue_status(submission_id, status)
     except PortalSyncError as exc:

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/coord/decomposition_chat.py

@@ -38,6 +38,7 @@ posture every other dispatcher in this file already uses.
 from __future__ import annotations
 
 import datetime
+import logging
 import time
 import uuid
 from typing import TYPE_CHECKING, Any
@@ -46,6 +47,8 @@ if TYPE_CHECKING:  # pragma: no cover - typing only
     from coord.config import Config
     from coord.models import Machine
 
+_log = logging.getLogger(__name__)
+
 #: Sentinel `issue_title` this module writes onto the dispatched assignment
 #: — mirrors `dispatch_new_issue_chat`'s own `"(new issue draft)"` sentinel
 #: for a chat type with no real GitHub issue yet. The TUI's own bind path
@@ -546,6 +549,71 @@ def resolve_approved_submission(config: "Config", submission_id: str) -> dict[st
     )
 
 
+def describe_unapproved_submission(config: "Config", submission_id: str) -> str:
+    """Human-readable reason :func:`resolve_approved_submission` returned
+    ``None`` for *submission_id* (#2996).
+
+    Names the disqualifying ``last_status`` when that is actually why — most
+    often an operator's own ``coord portal enqueue-status`` push to a
+    :data:`coord.approved_work._PULLED_STATUSES` value on a submission that
+    had not, in fact, been decomposed yet — instead of the generic "is not a
+    currently-approved portal submission", which names neither the cause nor
+    the status that caused it (the whole complaint in #2996's issue body).
+
+    Best-effort: the disqualifying-status lookup
+    (:func:`coord.approved_work.disqualifying_status`) needs to read the
+    daemon's own local :mod:`coord.portal_store` directly, so it is skipped
+    (falling back to the plain generic message) when this machine is a thin
+    client — the same constraint :func:`resolve_approved_submission` itself
+    already works around by routing through the daemon's ``/board`` instead
+    of reading the wrong box's empty tables.
+
+    **This function must never raise.** It exists only to phrase a failure
+    its callers have already decided on — ``dispatch_decomposition_chat``
+    raises ``RuntimeError(describe_unapproved_submission(...))`` and
+    ``_run_decompose_chat_interactive`` prints it — so an exception escaping
+    the *enrichment* lookup would replace a clear, actionable error with a
+    traceback about a completely different subsystem. The store read is
+    therefore best-effort: any failure (an unreadable/locked portal store, a
+    schema older than :func:`coord.approved_work.disqualifying_status`
+    expects, a thin client that slipped past the ``board_service`` check)
+    degrades to the plain generic message, which is exactly the pre-#2996
+    behaviour and still correct — just less specific.
+    """
+    base = f"submission {submission_id!r} is not a currently-approved portal submission"
+
+    reason: str | None = None
+    try:
+        from coord import board_service  # noqa: PLC0415
+
+        if board_service.resolve() is None:
+            from coord.approved_work import disqualifying_status  # noqa: PLC0415
+
+            reason = disqualifying_status(submission_id)
+    except Exception:  # noqa: BLE001 — best-effort enrichment, never break the message
+        _log.debug(
+            "describe_unapproved_submission: disqualifying-status lookup failed "
+            "for %s; falling back to the generic message",
+            submission_id,
+            exc_info=True,
+        )
+        reason = None
+
+    if reason:
+        return (
+            f"{base} — its last_status is {reason!r}, which coord already treats "
+            "as pulled into decomposition/delivery (coord.approved_work."
+            "_PULLED_STATUSES), so it no longer shows up in the TUI's Approved "
+            "work items panel and this command refuses it. If it was pushed to "
+            f"that status before decomposition actually happened, `coord portal "
+            f"enqueue-status {submission_id} in-design` puts it back on the "
+            "queue without re-mailing the customer. Nothing to decompose."
+        )
+    return (
+        f"{base} (coord.approved_work.approved_submissions) — nothing to decompose"
+    )
+
+
 def dispatch_decomposition_chat(
     submission_id: str,
     config: "Config",
@@ -576,10 +644,7 @@ def dispatch_decomposition_chat(
     """
     submission = resolve_approved_submission(config, submission_id)
     if submission is None:
-        raise RuntimeError(
-            f"submission {submission_id!r} is not a currently-approved portal "
-            "submission (coord.approved_work.approved_submissions) — nothing to decompose"
-        )
+        raise RuntimeError(describe_unapproved_submission(config, submission_id))
 
     repos: list[str] = submission.get("repos") or []
     if not repos:

code_coordinator-0.5.323/tests/test_approved_work_2996.py

@@ -0,0 +1,163 @@
+"""#2996: `enqueue-status planned` silently withdraws a submission from
+decomposition, with no warning and an unhelpful error later.
+
+Covers the two new, non-underscore seams `coord.approved_work` gained so
+callers elsewhere (`coord.commands.portal`, `coord.decomposition_chat`) can
+reason about `_PULLED_STATUSES` without reaching into a private constant:
+
+* :func:`coord.approved_work.is_pulled_status` — the public "would this
+  status withdraw a submission?" predicate `enqueue-status` warns on.
+* :func:`coord.approved_work.disqualifying_status` — "why is this submission
+  missing from `approved_submissions`", used to make `resolve_approved_
+  submission`'s failure message name the actual cause instead of the
+  generic, unhelpful "is not a currently-approved portal submission".
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from coord.approved_work import disqualifying_status, is_pulled_status
+
+
+def _signoff(event_id: str, submission_id: str, verdict: str) -> dict:
+    return {
+        "id": event_id,
+        "submission_id": submission_id,
+        "type": f"signoff.{verdict}",
+    }
+
+
+def _approve(submission_id: str, *, now: float = 100.0) -> None:
+    from coord import portal_store
+
+    portal_store.record_events(
+        [_signoff(f"ev-{submission_id}", submission_id, "approved")], now=now
+    )
+
+
+def _set_last_status(submission_id: str, status: str, *, now: float) -> None:
+    """Confirm *status* as the submission's `last_status`, bypassing the real
+    push round-trip — mirrors `tests/test_approved_work_2532.py`'s own
+    helper of the same name/shape."""
+    from coord import portal_store
+
+    row = portal_store.enqueue(submission_id, "status", {"status": status}, now=now)
+    portal_store.mark_applied(row, now=now)
+
+
+class TestIsPulledStatus:
+    @pytest.mark.parametrize(
+        "status", ["planned", "in-progress", "quality-check", "shipped"]
+    )
+    def test_true_for_every_pulled_status(self, status: str) -> None:
+        assert is_pulled_status(status) is True
+
+    @pytest.mark.parametrize(
+        "status",
+        ["", "describing", "in-design", "awaiting-signoff", "needs-input", "on-hold"],
+    )
+    def test_false_for_every_pre_decomposition_or_interrupt_status(
+        self, status: str
+    ) -> None:
+        assert is_pulled_status(status) is False
+
+
+class TestDisqualifyingStatus:
+    def test_none_for_a_submission_never_seen_at_all(self, coord_db) -> None:
+        assert disqualifying_status("sub_never_seen") is None
+
+    def test_none_when_the_submission_was_never_approved(self, coord_db) -> None:
+        """`last_status` alone is never enough — only an approved sign-off
+        that has ALSO moved to a pulled status is disqualified for that
+        reason. A submission that just happens to carry `planned` with no
+        signoff at all was never a candidate for the panel in the first
+        place, so this must not misreport `planned` as the cause."""
+        _set_last_status("sub_unapproved", "planned", now=1.0)
+        assert disqualifying_status("sub_unapproved") is None
+
+    def test_none_when_approved_and_not_pulled(self, coord_db) -> None:
+        _approve("sub_waiting")
+        _set_last_status("sub_waiting", "in-design", now=2.0)
+        assert disqualifying_status("sub_waiting") is None
+
+    @pytest.mark.parametrize(
+        "status", ["planned", "in-progress", "quality-check", "shipped"]
+    )
+    def test_names_the_pulled_status_when_that_is_the_cause(
+        self, status: str, coord_db
+    ) -> None:
+        _approve("sub_pulled")
+        _set_last_status("sub_pulled", status, now=2.0)
+        assert disqualifying_status("sub_pulled") == status
+
+    def test_a_walked_back_approval_is_not_reported_as_disqualified(
+        self, coord_db
+    ) -> None:
+        """A `changes_requested` verdict after an earlier `approved` one
+        means the LATEST verdict is not `approved` at all — this function's
+        job is narrower than "was ever approved", so it must not report a
+        `_PULLED_STATUSES` value here as the reason (there is a more
+        fundamental one: it was never approved to begin with)."""
+        from coord import portal_store
+
+        portal_store.record_events(
+            [_signoff("e1", "sub_walked_back", "approved")], now=1.0
+        )
+        portal_store.record_events(
+            [_signoff("e2", "sub_walked_back", "changes_requested")], now=2.0
+        )
+        _set_last_status("sub_walked_back", "planned", now=3.0)
+        assert disqualifying_status("sub_walked_back") is None
+
+
+class TestDescribeUnapprovedSubmissionNeverRaises:
+    """`describe_unapproved_submission` only *phrases* a failure its callers
+    have already decided on, so an exception escaping its best-effort
+    enrichment lookup would replace a clear, actionable error with a
+    traceback about an unrelated subsystem (an unreadable/locked portal
+    store, a schema older than `disqualifying_status` expects). It must
+    degrade to the plain generic message instead."""
+
+    def test_falls_back_to_the_generic_message_when_the_store_read_raises(
+        self, coord_db, monkeypatch
+    ) -> None:
+        from coord import approved_work, decomposition_chat
+
+        def _boom(_submission_id: str) -> str | None:
+            raise RuntimeError("portal store unreadable")
+
+        monkeypatch.setattr(approved_work, "disqualifying_status", _boom)
+
+        msg = decomposition_chat.describe_unapproved_submission(None, "sub_boom")
+
+        assert "is not a currently-approved portal submission" in msg
+        assert "its last_status is" not in msg
+        assert "portal store unreadable" not in msg
+
+    def test_falls_back_when_board_service_resolution_itself_raises(
+        self, coord_db, monkeypatch
+    ) -> None:
+        from coord import board_service, decomposition_chat
+
+        def _boom():
+            raise RuntimeError("client.toml is corrupt")
+
+        monkeypatch.setattr(board_service, "resolve", _boom)
+
+        msg = decomposition_chat.describe_unapproved_submission(None, "sub_boom")
+
+        assert "is not a currently-approved portal submission" in msg
+        assert "client.toml is corrupt" not in msg
+
+    def test_still_names_the_status_on_the_happy_path(self, coord_db) -> None:
+        """The fallback must not have swallowed the enrichment itself."""
+        from coord import decomposition_chat
+
+        _approve("sub_enriched")
+        _set_last_status("sub_enriched", "planned", now=2.0)
+
+        msg = decomposition_chat.describe_unapproved_submission(None, "sub_enriched")
+
+        assert "its last_status is 'planned'" in msg
+        assert "in-design" in msg

{code_coordinator-0.5.322 → code_coordinator-0.5.323}/tests/test_cli_portal.py

@@ -414,6 +414,44 @@ def test_decompose_chat_reports_a_dispatch_failure_cleanly(config_path):
     assert "no single machine claims every repo" in result.output
 
 
+def test_decompose_chat_names_the_pulled_status_that_disqualified_it(config_path):
+    """#2996: the generic "is not a currently-approved portal submission"
+    error named neither the cause nor the status that caused it. When the
+    real cause is a `_PULLED_STATUSES` push on a submission with an
+    `approved` sign-off — e.g. an operator's own `enqueue-status planned`
+    pushed before the submission was actually decomposed — the failure now
+    names that status and the `in-design` recovery, with no mock standing in
+    for `dispatch_decomposition_chat` this time."""
+    from coord import portal_store
+
+    portal_store.record_events(
+        [{"id": "e1", "submission_id": "sub_2f6a1c", "type": "signoff.approved"}],
+        now=1.0,
+    )
+    row = portal_store.enqueue("sub_2f6a1c", "status", {"status": "planned"}, now=2.0)
+    portal_store.mark_applied(row, now=2.0)
+
+    result = run("portal", "decompose-chat", "--config", config_path, "sub_2f6a1c")
+    assert result.exit_code != 0
+    assert "'planned'" in result.output
+    assert "in-design" in result.output
+
+
+def test_decompose_chat_generic_message_when_never_approved_at_all(config_path):
+    """No disqualifying status to name here — the submission simply has no
+    approved sign-off on record, so the generic message stays generic.
+
+    Matches the enrichment clause's own wording rather than the bare token
+    "last_status" for the same reason as `WITHDRAWAL_WARNING` below: click
+    `Result.output` interleaves stderr, so a loose token can be satisfied by
+    unrelated CLI chatter that only appears in some environments.
+    """
+    result = run("portal", "decompose-chat", "--config", config_path, "sub_never_seen")
+    assert result.exit_code != 0
+    assert "is not a currently-approved portal submission" in result.output
+    assert "its last_status is" not in result.output
+
+
 # ── #2743: --wait blocks and prints the closing summary ────────────────────
 #
 # A CLI-dispatched decomposition-chat is issue_number=0 — no GitHub thread to
@@ -713,6 +751,76 @@ def test_enqueue_preview_rejects_an_empty_url():
     assert "non-empty" in result.output
 
 
+# ── #2996: `enqueue-status` warns before a `_PULLED_STATUSES` push that ────
+# would silently withdraw a submission from decomposition, on a submission
+# with no linked milestone/issue and (so, by construction here) no
+# decomposition on record. It must never refuse — only warn.
+
+#: The #2996 warning's own distinctive opening clause.
+#:
+#: Assertions below match on THIS rather than on the bare token "warning",
+#: because under click >= 8.2 ``Result.output`` is no longer a proxy for
+#: stdout — it is an interleaved stdout+stderr stream (see
+#: ``click.testing.Result.output``). A bare ``"warning" not in
+#: result.output.lower()`` therefore also asserts the absence of every
+#: *unrelated* advisory the CLI may write to stderr in some other
+#: environment: ``coord/cli.py``'s "warning: coord CLI is running from a
+#: non-editable install …" banner, ``coord/commands/portal.py``'s "warning:
+#: backstop failed to record intake-session exit", a best-effort store
+#: failure line, and so on. None of those are under test here, and none of
+#: them fire on a developer box while several can fire on a CI runner — so
+#: the loose form is green locally and red in CI for no product reason.
+#: Matching the specific clause keeps the assertion about the behaviour the
+#: test names.
+WITHDRAWAL_WARNING = "has no linked milestone/issue on file"
+
+
+@pytest.mark.parametrize("status", ["planned", "in-progress", "shipped"])
+def test_enqueue_status_warns_before_withdrawing_an_unlinked_submission(status):
+    result = run("portal", "enqueue-status", "sub_1", status)
+    assert result.exit_code == 0, result.output
+    assert WITHDRAWAL_WARNING in result.output
+    assert "warning:" in result.output
+    # Names the consequence in operator terms, not just the constant's name.
+    assert "Approved work items" in result.output
+    assert "decompose-chat" in result.output
+    # Names the alternative for the "not started yet" case.
+    assert "in-design" in result.output
+    # And the push still went through.
+    assert "queued:" in result.output
+
+
+def test_enqueue_status_does_not_warn_for_a_non_pulled_status():
+    result = run("portal", "enqueue-status", "sub_1", "in-design")
+    assert result.exit_code == 0, result.output
+    assert WITHDRAWAL_WARNING not in result.output
+
+
+def test_enqueue_status_does_not_warn_once_a_link_is_on_file(config_path):
+    """A linked submission has actually been pulled into decomposition — the
+    #2996 warning exists for the case where it has NOT, so it must not fire
+    once `coord portal link` is on record."""
+    from coord import portal_store
+
+    portal_store.link_milestone(
+        repo_name="coord", milestone_number=1, submission_id="sub_linked", actor="tester"
+    )
+    result = run("portal", "enqueue-status", "sub_linked", "planned")
+    assert result.exit_code == 0, result.output
+    assert WITHDRAWAL_WARNING not in result.output
+
+
+def test_enqueue_status_still_warns_even_when_the_push_itself_is_refused():
+    """The warning is about the *consequence of applying* the status, which
+    is independent of the #835 ordering guard's own separate refusal
+    (`quality-check` with no preview queued yet) — both fire together
+    rather than the ordering guard's exit code swallowing the warning."""
+    result = run("portal", "enqueue-status", "sub_1", "quality-check")
+    assert result.exit_code != 0
+    assert WITHDRAWAL_WARNING in result.output
+    assert "preview" in result.output
+
+
 def test_outbox_is_empty_by_default():
     result = run("portal", "outbox")
     assert result.exit_code == 0