code-coordinator 0.5.279__tar.gz → 0.5.281__tar.gz

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/PKG-INFO

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

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

@@ -1,7 +1,7 @@
 {
-  "tag": "0.5.279",
+  "tag": "0.5.281",
   "distance": 0,
-  "node": "gf2877e7edfb86e0b3534e2057b35ccf50bac3307",
+  "node": "g62c2200a45c988353a9ede462609c649a368b11d",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-08-29"

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/coord/agent.py

@@ -4067,7 +4067,11 @@ composer on the client's side pauses on the most recent question only, so \
 a scattershot list gets a partial answer at best. Then:
 
     coord portal enqueue-question <submission_id> "<question>"
-    coord portal enqueue-status <submission_id> needs-input
+
+   This one command queues the question AND announces it to the customer \
+(#2901) — `enqueue-question` queues its own `needs-input` status right \
+behind the question, so there is no separate announcement step to remember \
+or forget.
 
    and STOP — end your final turn summarizing the question and why, and run \
 nothing else this iteration (no filing, no decisions). IL-3's consumer \

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/coord/commands/portal.py

@@ -1351,18 +1351,30 @@ def portal_enqueue_preview(submission_id: str, preview_url: str) -> None:
 @click.argument("submission_id")
 @click.argument("question")
 def portal_enqueue_question(submission_id: str, question: str) -> None:
-    """Queue an open question for SUBMISSION_ID (sent on the next sync)."""
+    """Queue an open question for SUBMISSION_ID (sent on the next sync).
+
+    Also queues the `needs-input` status that announces it (#2901) — a
+    question with no status row behind it sends no email, so this command
+    always queues both rows in one call rather than leaving the second one
+    to a caller who might forget it.
+    """
     _refuse_if_thin_client("enqueue-question")
 
     from coord.portal_sync import PortalSyncError, enqueue_question  # noqa: PLC0415
 
     try:
-        row = enqueue_question(submission_id, question)
+        question_row, status_row = enqueue_question(submission_id, question)
     except PortalSyncError as exc:
         click.secho(str(exc), fg="red")
         raise SystemExit(1) from exc
     click.secho(
-        f"queued: {row.submission_id} seq={row.seq} rev={row.revision} question",
+        f"queued: {question_row.submission_id} seq={question_row.seq} "
+        f"rev={question_row.revision} question",
+        fg="green",
+    )
+    click.secho(
+        f"queued: {status_row.submission_id} seq={status_row.seq} "
+        f"rev={status_row.revision} status=needs-input",
         fg="green",
     )
 

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/coord/decomposition_chat.py

@@ -68,17 +68,104 @@ NOT_CAPTURED_SENTINEL = "Not captured at first contact"
 
 def _field_missing(value: Any) -> bool:
     """True when *value* carries no real content — absent, blank, or the
-    portal's own "not captured at first contact" placeholder (#2750)."""
+    portal's own "not captured at first contact" placeholder (#2750).
+
+    #2864: the portal never sends the bare sentinel — it's the leading
+    clause of a longer sentence (e.g. ``"Not captured at first contact —
+    this came in through the contact form, so it still needs to be agreed
+    with the customer."``, em dash and all), so this matches the sentinel
+    as a **prefix**, casefolded and whitespace-normalised, rather than by
+    exact equality. A prefix match still leaves real content that merely
+    *mentions* the phrase mid-sentence reading as present, since the
+    sentinel then isn't at the start.
+    """
     if not isinstance(value, str):
         return True
-    text = value.strip()
-    return not text or text == NOT_CAPTURED_SENTINEL
+    text = " ".join(value.split())
+    if not text:
+        return True
+    sentinel = " ".join(NOT_CAPTURED_SENTINEL.split())
+    return text.casefold().startswith(sentinel.casefold())
+
+
+#: Files `coord repo create` seeds into a brand-new repo as its first
+#: commit(s) (#2747): `README.md` from `create_repo`'s own `--add-readme`,
+#: plus `CLAUDE.md`, a CI workflow, and the ported `.githooks/*` from its
+#: own seed commit (`coord.commands.repo._seed_files`). Kept here rather
+#: than imported from `coord.commands.repo` — this module's briefing scopes
+#: it to `coord/decomposition_chat.py` alone, and the set is small and
+#: unlikely to drift silently (a drift only ever costs one extra spurious
+#: DISCUSS round, never a false FILE).
+_SEEDED_ROOT_FILES = frozenset({"README.md", "CLAUDE.md"})
+_SEEDED_ROOT_DIRS = frozenset({".github", ".githooks"})
+_SEEDED_GITHUB_WORKFLOW_FILES = frozenset({"ci.yml"})
+_SEEDED_GITHOOKS_FILES = frozenset(
+    {"_lib.sh", "post-checkout", "post-commit", "post-merge"}
+)
+
+
+def _dir_entries(repo: str, path: str, branch: str) -> tuple[list[str], list[str]]:
+    """``(files, dirs)`` directly under *path* on *branch* — ``([], [])``
+    when *path* doesn't exist there at all (e.g. a repo that never got
+    `.githooks/` seeded) rather than raising, mirroring `github_ops.
+    repo_file_exists`'s own not-found handling. Any failure that isn't a
+    clean 404 propagates, same reasoning: a caller here must not read
+    "couldn't check" as "empty directory".
+    """
+    from coord import github_ops  # noqa: PLC0415
+
+    try:
+        files = github_ops.list_repo_dir(repo, path, branch)
+        dirs = github_ops.list_repo_subdirs(repo, path, branch)
+    except RuntimeError as exc:
+        msg = str(exc).lower()
+        if "not found" in msg or "404" in msg:
+            return [], []
+        raise
+    return files, dirs
+
+
+def _repo_has_only_seeded_files(repo: str, branch: str) -> bool:
+    """True when every tracked file on *branch* of *repo* is one that
+    `coord repo create` itself seeds (#2864 bug 2) — walks the small, fixed
+    set of directories seeding can ever touch (root, `.github/`,
+    `.github/workflows/`, `.githooks/`); any file or directory outside that
+    set is real product history.
+    """
+    files, dirs = _dir_entries(repo, "", branch)
+    if not set(files) <= _SEEDED_ROOT_FILES:
+        return False
+    if not set(dirs) <= _SEEDED_ROOT_DIRS:
+        return False
+
+    if ".github" in dirs:
+        gh_files, gh_dirs = _dir_entries(repo, ".github", branch)
+        if gh_files or set(gh_dirs) - {"workflows"}:
+            return False
+        if "workflows" in gh_dirs:
+            wf_files, wf_dirs = _dir_entries(repo, ".github/workflows", branch)
+            if not set(wf_files) <= _SEEDED_GITHUB_WORKFLOW_FILES or wf_dirs:
+                return False
+
+    if ".githooks" in dirs:
+        hook_files, hook_dirs = _dir_entries(repo, ".githooks", branch)
+        if not set(hook_files) <= _SEEDED_GITHOOKS_FILES or hook_dirs:
+            return False
+
+    return True
 
 
 def _repo_is_greenfield(cfg: "Config", repo_name: str) -> bool:
     """Mechanical "nothing to decompose against yet" signal for *repo_name*
     (#2750's second mode-selection trigger): no commits on its default
-    branch, or no `CLAUDE.md` there.
+    branch, or every tracked file there is one `coord repo create` itself
+    seeds (:func:`_repo_has_only_seeded_files`).
+
+    #2864: used to be "no `CLAUDE.md` there", which `coord repo create`
+    (#2747) broke — it seeds `CLAUDE.md` as part of a brand-new repo's
+    first commit, so a repo created through the intake lane's own genesis
+    command could never be detected as greenfield by the intake lane's own
+    mode selector.
 
     Fails safe toward ``True`` (i.e. toward MODE: DISCUSS) on an unmapped
     repo or any lookup failure — a false positive here costs one extra
@@ -98,7 +185,10 @@ def _repo_is_greenfield(cfg: "Config", repo_name: str) -> bool:
     sha = github_ops.get_branch_sha(repo_cfg.github, branch)
     if sha is None:
         return True
-    return not github_ops.repo_file_exists(repo_cfg.github, "CLAUDE.md", branch)
+    try:
+        return _repo_has_only_seeded_files(repo_cfg.github, branch)
+    except RuntimeError:
+        return True
 
 
 def select_discuss_mode(
@@ -117,8 +207,9 @@ def select_discuss_mode(
 
     * `done_definition` / `audience` missing, blank, or the portal's own
       "not captured at first contact" sentinel;
-    * any mapped repo with no commits on its default branch or no
-      `CLAUDE.md` there (:func:`_repo_is_greenfield`).
+    * any mapped repo with no commits on its default branch, or whose
+      tracked files are only what `coord repo create` itself seeds
+      (:func:`_repo_is_greenfield`).
 
     Returns ``(discuss, reason)`` — *reason* is always non-empty and is
     meant to be the first thing the operator reads (#2750: "a session that
@@ -140,8 +231,8 @@ def select_discuss_mode(
     greenfield = [r for r in repos if _repo_is_greenfield(cfg, r)]
     if greenfield:
         reasons.append(
-            f"mapped repo(s) {', '.join(greenfield)} have no commits or no "
-            "CLAUDE.md yet — nothing to decompose against"
+            f"mapped repo(s) {', '.join(greenfield)} have no commits or only "
+            "coord repo create's seed files — nothing to decompose against yet"
         )
 
     if reasons:

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/coord/portal_sync.py

@@ -356,13 +356,36 @@ def enqueue_preview(
 
 def enqueue_question(
     submission_id: str, question: str, *, now: float | None = None
-) -> portal_store.OutboxRow:
-    """Queue an open question for the customer."""
+) -> tuple[portal_store.OutboxRow, portal_store.OutboxRow]:
+    """Queue an open question for the customer, plus the announcement of it.
+
+    Queuing the question alone sends no email — the portal only mails the
+    customer off a push that actually names ``status``
+    (coord-portal's `src/bridge/updates.ts`) — so a caller that asked a
+    question and forgot the follow-up `enqueue_status(..., "needs-input")`
+    left the customer never told (#2901, SUB-1EA1D3: exactly this happened
+    to a real submission). Folding the announcement in here, in the same
+    call, immediately after the question row, makes that omission
+    impossible rather than merely documented: the existing
+    `ANNOUNCING_STATUSES`/`ordering_block_reason` guard then holds the
+    status row until this question is confirmed applied, for free, because
+    it is seq N+1 behind the question's seq N.
+
+    A second question on a submission already at `needs-input` still gets
+    its own status row here — coord-portal deliberately does not coalesce
+    a repeat `needs-input` (`src/notifications.ts`), on the grounds that a
+    second question is plausibly real news, so re-announcing is intended,
+    not churn to suppress.
+
+    Returns ``(question_row, status_row)`` in that seq order.
+    """
     if not question or not question.strip():
         raise PortalSyncError("question must be non-empty")
-    return portal_store.enqueue(
+    question_row = portal_store.enqueue(
         submission_id, KIND_QUESTION, {"question": question}, now=now
     )
+    status_row = enqueue_status(submission_id, "needs-input", now=now)
+    return question_row, status_row
 
 
 def enqueue_status(

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/tests/test_decomposition_chat.py

@@ -27,14 +27,19 @@ def _stub_external_io(monkeypatch):
     ledger (`fetch_running_context`, a real local `coord.db` read). Neither
     is hermetic, and neither is what most of the tests below are
     exercising — stub the low-level `github_ops` calls to a fixed "repo has
-    history and a CLAUDE.md" answer (so `_repo_is_greenfield` itself still
-    runs its real logic, just network-free) and the ledger fetch to "no
-    ledger yet", so most tests stay fast and deterministic. Tests that
-    specifically exercise `_repo_is_greenfield`/`select_discuss_mode`/the
-    ledger render override these locally.
+    real product history beyond what `coord repo create` seeds" answer (so
+    `_repo_is_greenfield` itself still runs its real logic, just
+    network-free) and the ledger fetch to "no ledger yet", so most tests
+    stay fast and deterministic. Tests that specifically exercise
+    `_repo_is_greenfield`/`select_discuss_mode`/the ledger render override
+    these locally.
     """
     monkeypatch.setattr("coord.github_ops.get_branch_sha", lambda repo, branch: "deadbeef")
-    monkeypatch.setattr("coord.github_ops.repo_file_exists", lambda repo, path, branch: True)
+    monkeypatch.setattr(
+        "coord.github_ops.list_repo_dir",
+        lambda repo, path, branch: ["README.md", "CLAUDE.md", "app.py"] if path == "" else [],
+    )
+    monkeypatch.setattr("coord.github_ops.list_repo_subdirs", lambda repo, path, branch: [])
     monkeypatch.setattr(decomposition_chat, "fetch_running_context", lambda submission_id: {})
 
 
@@ -201,10 +206,37 @@ def test_field_missing_true_for_none_empty_and_sentinel():
     assert decomposition_chat._field_missing(f"  {decomposition_chat.NOT_CAPTURED_SENTINEL}  ") is True
 
 
+def test_field_missing_true_for_portal_real_full_sentinel_string():
+    """#2864 bug 1: the portal never sends the bare sentinel — it's the
+    leading clause of a longer sentence, em dash and all. This is the
+    verbatim string the live portal sent for SUB-1EA1D3's `done_definition`
+    and `audience`."""
+    real = (
+        "Not captured at first contact — this came in through the contact "
+        "form, so it still needs to be agreed with the customer."
+    )
+    assert decomposition_chat._field_missing(real) is True
+
+
+def test_field_missing_true_for_case_and_whitespace_variants():
+    assert decomposition_chat._field_missing("  not   CAPTURED at First Contact  ") is True
+    assert decomposition_chat._field_missing("NOT CAPTURED AT FIRST CONTACT — extra tail") is True
+
+
 def test_field_missing_false_for_real_content():
     assert decomposition_chat._field_missing("Existing subscription customers") is False
 
 
+def test_field_missing_false_when_sentinel_only_mentioned_mid_sentence():
+    """A prefix match must not fire when the phrase merely appears somewhere
+    inside otherwise-real content — only a leading match means "missing"."""
+    mid_sentence = (
+        "The client said this was Not captured at first contact previously, "
+        "but confirmed today: existing subscription customers only."
+    )
+    assert decomposition_chat._field_missing(mid_sentence) is False
+
+
 def test_repo_is_greenfield_true_when_unmapped():
     cfg = Config(repos=[], machines=[])
     assert decomposition_chat._repo_is_greenfield(cfg, "nope") is True
@@ -219,16 +251,45 @@ def test_repo_is_greenfield_true_when_no_commits():
 def test_repo_is_greenfield_true_when_commits_but_no_claude_md():
     cfg = Config(repos=[_repo("api")], machines=[])
     with patch("coord.github_ops.get_branch_sha", return_value="deadbeef"), patch(
-        "coord.github_ops.repo_file_exists", return_value=False
-    ):
+        "coord.github_ops.list_repo_dir", return_value=["README.md"]
+    ), patch("coord.github_ops.list_repo_subdirs", return_value=[]):
+        assert decomposition_chat._repo_is_greenfield(cfg, "api") is True
+
+
+def test_repo_is_greenfield_true_when_only_seeded_files():
+    """#2864 bug 2: a repo whose default branch contains only what `coord
+    repo create` itself seeds (README.md, CLAUDE.md, the CI workflow,
+    .githooks/*) must still read as greenfield — `coord repo create`'s own
+    genesis commit must never defeat the mode selector it's supposed to
+    feed into."""
+    cfg = Config(repos=[_repo("api")], machines=[])
+
+    def _list_dir(repo, path, branch):
+        return {
+            "": ["README.md", "CLAUDE.md"],
+            ".github": [],
+            ".github/workflows": ["ci.yml"],
+            ".githooks": ["_lib.sh", "post-checkout", "post-commit", "post-merge"],
+        }.get(path, [])
+
+    def _list_subdirs(repo, path, branch):
+        return {
+            "": [".github", ".githooks"],
+            ".github": ["workflows"],
+        }.get(path, [])
+
+    with patch("coord.github_ops.get_branch_sha", return_value="deadbeef"), patch(
+        "coord.github_ops.list_repo_dir", side_effect=_list_dir
+    ), patch("coord.github_ops.list_repo_subdirs", side_effect=_list_subdirs):
         assert decomposition_chat._repo_is_greenfield(cfg, "api") is True
 
 
 def test_repo_is_greenfield_false_when_commits_and_claude_md():
     cfg = Config(repos=[_repo("api")], machines=[])
     with patch("coord.github_ops.get_branch_sha", return_value="deadbeef"), patch(
-        "coord.github_ops.repo_file_exists", return_value=True
-    ):
+        "coord.github_ops.list_repo_dir",
+        return_value=["README.md", "CLAUDE.md", "app.py"],
+    ), patch("coord.github_ops.list_repo_subdirs", return_value=[]):
         assert decomposition_chat._repo_is_greenfield(cfg, "api") is False
 
 
@@ -279,7 +340,7 @@ def test_select_discuss_mode_auto_true_when_repo_greenfield(monkeypatch):
     discuss, reason = decomposition_chat.select_discuss_mode(cfg, SUBMISSION)
     assert discuss is True
     assert "api" in reason
-    assert "no commits or no CLAUDE.md" in reason
+    assert "coord repo create's seed files" in reason
 
 
 def test_select_discuss_mode_auto_false_when_well_specified(monkeypatch):
@@ -290,6 +351,55 @@ def test_select_discuss_mode_auto_false_when_well_specified(monkeypatch):
     assert "captured" in reason
 
 
+def test_select_discuss_mode_true_for_sub_1ea1d3_live_payload(monkeypatch):
+    """Regression test for #2864: SUB-1EA1D3, the greenfield grocery-list
+    submission #2746 was written around, verbatim as captured off the live
+    fleet on 2026-08-28. Before the fix both mechanical triggers failed
+    independently (the sentinel matched by equality, not prefix; the
+    seeded-only `grocery-list` repo read as non-greenfield because
+    `coord repo create` had itself seeded `CLAUDE.md`) and the session
+    picked MODE: FILE. Both must now fire, and the reason must name at
+    least one of them.
+    """
+    live_sentinel_tail = (
+        "Not captured at first contact — this came in through the contact "
+        "form, so it still needs to be agreed with the customer."
+    )
+    sub_1ea1d3 = {
+        "submission_id": "SUB-1EA1D3",
+        "client": "grocery-list customer",
+        "outcome": "A working grocery-list app for the customer's household.",
+        "audience": live_sentinel_tail,
+        "done_definition": live_sentinel_tail,
+        "constraints": "",
+        "repos": ["grocery-list"],
+        "signoff_status": "approved",
+    }
+
+    def _list_dir(repo, path, branch):
+        return {
+            "": ["README.md", "CLAUDE.md"],
+            ".github": [],
+            ".github/workflows": ["ci.yml"],
+            ".githooks": ["_lib.sh", "post-checkout", "post-commit", "post-merge"],
+        }.get(path, [])
+
+    def _list_subdirs(repo, path, branch):
+        return {
+            "": [".github", ".githooks"],
+            ".github": ["workflows"],
+        }.get(path, [])
+
+    cfg = Config(repos=[_repo("grocery-list")], machines=[])
+    with patch("coord.github_ops.get_branch_sha", return_value="deadbeef"), patch(
+        "coord.github_ops.list_repo_dir", side_effect=_list_dir
+    ), patch("coord.github_ops.list_repo_subdirs", side_effect=_list_subdirs):
+        discuss, reason = decomposition_chat.select_discuss_mode(cfg, sub_1ea1d3)
+
+    assert discuss is True
+    assert "done_definition" in reason or "audience" in reason or "grocery-list" in reason
+
+
 # ── #2750 (IL-4): render_running_context_section ────────────────────────────
 
 
@@ -579,10 +689,18 @@ def test_system_prompt_describes_both_modes():
     assert "MODE: FILE" in DECOMPOSITION_CHAT_SYSTEM_PROMPT
 
 
-def test_system_prompt_ask_terminal_move_uses_enqueue_commands():
+def test_system_prompt_ask_terminal_move_uses_enqueue_question_only():
+    """#2901: `enqueue_question` now queues its own `needs-input`
+    announcement, so the ASK move's own step list must not tell the session
+    to run a second `enqueue-status` command — that was the exact
+    forgettable two-step sequence #2901 folded away (SUB-1EA1D3)."""
     assert "coord portal enqueue-question" in DECOMPOSITION_CHAT_SYSTEM_PROMPT
-    assert "coord portal enqueue-status" in DECOMPOSITION_CHAT_SYSTEM_PROMPT
     assert "needs-input" in DECOMPOSITION_CHAT_SYSTEM_PROMPT
+    ask_section = DECOMPOSITION_CHAT_SYSTEM_PROMPT.split("1. ASK")[1].split(
+        "2. PROPOSE"
+    )[0]
+    assert "enqueue-status" not in ask_section
+    assert "queues its own" in ask_section
 
 
 def test_system_prompt_propose_terminal_move_uses_decision_commands():

{code_coordinator-0.5.279 → code_coordinator-0.5.281}/tests/test_portal_sync.py

@@ -21,6 +21,7 @@ from coord.portal_sync import (
     enqueue_preview,
     enqueue_question,
     enqueue_status,
+    ordering_block_reason,
     sync_tick,
 )
 
@@ -222,12 +223,12 @@ def test_reallocation_converges_and_then_the_announcement_goes():
 
 
 def test_second_question_cannot_ride_on_the_first_questions_confirmation():
+    # enqueue_question (#2901) queues its own needs-input status right
+    # behind the question — no separate enqueue_status call needed here.
     enqueue_question(SUB, "which colour?")
-    enqueue_status(SUB, "needs-input")
     sync_tick(client=FakeClient())  # round 1 lands cleanly
 
     enqueue_question(SUB, "which font?")
-    enqueue_status(SUB, "needs-input")
     # The second question fails to send; its announcement must not overtake it.
     client = FakeClient(push_error=PortalBridgeError("boom"))
     sync_tick(client=client)
@@ -238,6 +239,46 @@ def test_second_question_cannot_ride_on_the_first_questions_confirmation():
     assert client2.pushed_kinds == ["question", "status"]
 
 
+def test_enqueue_question_queues_its_own_announcement():
+    """#2901: a question pushed without a status row behind it sends no
+    email (coord-portal's own rule — a push only mails the customer when it
+    actually names ``status``). `enqueue_question` must queue that status
+    itself, in the same call, so the announcement cannot be forgotten."""
+    question_row, status_row = enqueue_question(SUB, "which colour?")
+
+    assert question_row.kind == portal_sync.KIND_QUESTION
+    assert status_row.kind == portal_sync.KIND_STATUS
+    assert status_row.announces == "needs-input"
+    assert status_row.requires_kind == portal_sync.KIND_QUESTION
+    # The announcement is seq N+1 right behind its question — the ordering
+    # guard (`ANNOUNCING_STATUSES`/`ordering_block_reason`) keys off exactly
+    # this adjacency.
+    assert status_row.seq == question_row.seq + 1
+
+
+def test_enqueue_question_reproduces_sub_1ea1d3_second_question_also_announced():
+    """Regression for #2901 / SUB-1EA1D3: question (applied) -> status
+    (applied) -> a second question with NO status row behind it — the real
+    outbox shape that shipped with no email. With the fold, the second
+    `enqueue_question` call must also queue its own status, so the drain
+    sends question -> status -> question -> status in order, never a bare
+    trailing question."""
+    enqueue_question(SUB, "Two things to help us scope...")
+    sync_tick(client=FakeClient())  # first question + its announcement land
+
+    enqueue_question(SUB, "Thanks -- that covers who...")
+    client = FakeClient()
+    sync_tick(client=client)
+
+    assert client.pushed_kinds == ["question", "status"]
+    rows = portal_store.outbox_for_submission(SUB)
+    assert [r.kind for r in rows] == ["question", "status", "question", "status"]
+    assert [r.state for r in rows] == [portal_store.STATE_APPLIED] * 4
+    # The second question's announcement never sent ahead of its own
+    # question being confirmed applied.
+    assert ordering_block_reason(rows[3]) is None
+
+
 def test_a_stalled_submission_does_not_stall_another_customers():
     enqueue_design_round(SUB, _design())
     enqueue_status(SUB, "awaiting-signoff")
@@ -1875,9 +1916,9 @@ def _push_and_apply_question(question: str = "Offline-first, yes or no?"):
     path `mark_applied`'s `kind == "question"` branch runs for real once
     `_push` gets a 200 back, which is what writes the `question_pushed`
     ledger entry `_consume_questions` later pairs an answer against."""
-    row = enqueue_question(SUB, question)
-    portal_store.mark_applied(row)
-    return row
+    question_row, _status_row = enqueue_question(SUB, question)
+    portal_store.mark_applied(question_row)
+    return question_row
 
 
 class TestQuestionAnswerFields: