[sweep] lifecycle: 6 confirmed gaps fixed (cancel-ceo-gate, claim_pr_review gate, needs_team_match, valid_next_verbs narrowing, pr_reviewer unclaim, complete side_effect ordering)

tests/foundation/test_lifecycle_spec.py

@@ -354,12 +354,20 @@ def test_status_transitions_role_constraints_match_canon() -> None:
     assert by_pair[
         (spec.Status.AWAITING_CEO_APPROVAL, spec.Status.NEEDS_REVISION, "ceo_reject")
     ] == frozenset({spec.Role.CEO})
-    # Cancel: PM + CEO from any non-terminal status
+    # Cancel: PM + CEO from any non-terminal status EXCEPT the CEO approval
+    # queue — cancelling a task the CEO is reviewing is the CEO's call, so
+    # awaiting_ceo_approval -> cancelled is gated to CEO only (a PM cancelling
+    # it would bypass the human CEO gate).
     cancel_constraint = frozenset({spec.Role.CELL_PM, spec.Role.MAIN_PM, spec.Role.CEO})
     for src in spec.Status:
         if src in (spec.Status.COMPLETED, spec.Status.CANCELLED):
             continue
-        assert by_pair[(src, spec.Status.CANCELLED, "cancel")] == cancel_constraint, (
+        expected = (
+            frozenset({spec.Role.CEO})
+            if src is spec.Status.AWAITING_CEO_APPROVAL
+            else cancel_constraint
+        )
+        assert by_pair[(src, spec.Status.CANCELLED, "cancel")] == expected, (
             f"cancel from {src.value} has wrong role_constraint"
         )
 
@@ -962,3 +970,105 @@ def test_claim_allows_developer_claiming_code_from_pending() -> None:
     enforced at create/delegate + i_will_work_on, not the claim gate)."""
     t = _claim_task(status="pending", task_type="code")
     assert spec.can_invoke_action(spec.Role.DEVELOPER, "claim", t).allowed
+
+
+# ---------------------------------------------------------------------------
+# Edge cases — logical-gap element sweep (2026-06-30)
+# ---------------------------------------------------------------------------
+
+
+def test_claim_pr_review_rejected_on_gate_task_points_to_claim_gate_review() -> None:
+    """claim_pr_review is for an inbound external-PR task in PENDING only. An
+    awaiting_pr_review gate task must be rejected (and remediation must point
+    the reviewer at claim_gate_review), not silently accepted by the spec gate."""
+    d = spec.can_invoke_intent(
+        spec.Role.PR_REVIEWER,
+        "claim_pr_review",
+        _stub_task(status="awaiting_pr_review"),
+    )
+    assert d.allowed is False
+    assert d.rejection_kind == "invalid_state"
+    assert "claim_gate_review" in (d.remediate or "")
+
+
+def test_claim_pr_review_allowed_on_pending_external_review() -> None:
+    """Green path: a pending external-PR review task is claimable."""
+    d = spec.can_invoke_intent(
+        spec.Role.PR_REVIEWER,
+        "claim_pr_review",
+        _stub_task(status="pending"),
+    )
+    assert d.allowed is True
+
+
+def test_needs_team_match_rejects_cross_team_claim_when_agent_team_supplied() -> None:
+    """needs_team_match was a dead spec field; when the caller supplies the
+    agent's team via Context, the spec gate must enforce it (a backend dev
+    cannot claim a frontend task)."""
+    d = spec.can_invoke_action(
+        spec.Role.DEVELOPER,
+        "claim",
+        _stub_task(status="pending", team="frontend"),
+        context=spec.Context(agent_team="backend"),
+    )
+    assert d.allowed is False
+    assert d.rejection_kind == "not_authorized"
+
+
+def test_needs_team_match_allows_same_team_claim() -> None:
+    d = spec.can_invoke_action(
+        spec.Role.DEVELOPER,
+        "claim",
+        _stub_task(status="pending", team="backend"),
+        context=spec.Context(agent_team="backend"),
+    )
+    assert d.allowed is True
+
+
+def test_needs_team_match_defers_when_agent_team_absent() -> None:
+    """Backward compat: without agent_team in Context, the spec gate stays
+    permissive (the service layer still enforces team-match)."""
+    d = spec.can_invoke_action(
+        spec.Role.DEVELOPER,
+        "claim",
+        _stub_task(status="pending", team="frontend"),
+    )
+    assert d.allowed is True
+
+
+def test_valid_next_verbs_omits_claim_review_when_qa_not_in_awaiting_qa() -> None:
+    """valid_next_verbs must apply claim-rule narrowing for empty-compose
+    claim verbs; a QA reviewer on a COMPLETED task must not be told
+    claim_review is callable."""
+    verbs = spec.valid_next_verbs(spec.Role.QA, _stub_task(status="completed"))
+    assert "claim_review" not in verbs
+
+
+def test_valid_next_verbs_includes_claim_review_for_qa_in_awaiting_qa() -> None:
+    verbs = spec.valid_next_verbs(spec.Role.QA, _stub_task(status="awaiting_qa"))
+    assert "claim_review" in verbs
+
+
+def test_pr_reviewer_has_unclaim_release_verb() -> None:
+    """A PR reviewer who cannot finish a review must have a self-release
+    verb (unclaim), not wedge the lane until the stale-claim reaper."""
+    assert "unclaim" in spec.intents_for_role(spec.Role.PR_REVIEWER)
+
+
+def test_unclaim_allowed_for_pr_reviewer() -> None:
+    d = spec.can_invoke_intent(
+        spec.Role.PR_REVIEWER,
+        "unclaim",
+        _stub_task(status="awaiting_pr_review"),
+    )
+    assert d.allowed is True
+
+
+def test_complete_intent_declares_no_inverted_pr_merge_side_effect() -> None:
+    """complete's IntentSpec must not declare a trailing pr_merge side_effect:
+    TaskService.complete asserts the PR is already merged, so the merge runs
+    FIRST (choreographer verb body owns the ordering). The spec must match
+    reality, not lie about a complete-then-merge composition."""
+    iv = spec._INTENT_VERBS["complete"]
+    assert iv.composes == ("complete",)
+    assert iv.side_effects == ()

tests/unit/enforcement/test_task_lifecycle.py

@@ -200,3 +200,34 @@ def test_sla_seconds_for_unknown_pair() -> None:
 
 def test_sla_seconds_for_no_role() -> None:
     assert sla_seconds_for(None, "in_progress") is None
+
+
+# ---------------------------------------------------------------------------
+# Cancel from the CEO approval queue is the CEO's call, not a PM's
+# ---------------------------------------------------------------------------
+
+
+def test_cancel_from_awaiting_ceo_is_ceo_only() -> None:
+    """A PM must not cancel a task the CEO is reviewing — that bypasses the
+    human CEO-approval gate. Only the CEO can cancel from awaiting_ceo_approval."""
+    assert can_agent_transition("awaiting_ceo_approval", "cancelled", "ceo") is True
+    assert (
+        can_agent_transition("awaiting_ceo_approval", "cancelled", "cell_pm") is False
+    )
+    assert (
+        can_agent_transition("awaiting_ceo_approval", "cancelled", "main_pm") is False
+    )
+
+
+def test_cancel_from_other_non_terminal_remains_pm_plus_ceo() -> None:
+    """The CEO-only narrowing is scoped to the approval queue; elsewhere a PM
+    may still cancel (unchanged behavior)."""
+    assert can_agent_transition("in_progress", "cancelled", "cell_pm") is True
+    assert can_agent_transition("awaiting_qa", "cancelled", "main_pm") is True
+
+
+def test_validate_cancel_from_awaiting_ceo_raises_for_pm() -> None:
+    with pytest.raises(TaskLifecycleError):
+        validate_task_transition("awaiting_ceo_approval", "cancelled", "cell_pm")
+    # CEO is allowed — no raise.
+    assert validate_task_transition("awaiting_ceo_approval", "cancelled", "ceo") is True