You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by ar...@apache.org on 2026/05/28 16:35:04 UTC

(tooling-trusted-releases) branch arm updated (bd688aa9 -> e45b956d)

This is an automated email from the ASF dual-hosted git repository.

alitheg pushed a change to branch arm
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git


 discard bd688aa9 #1259 - add default email settings to project policy, pull defaults from policy when showing to user, and allow extra CC/BCC when resolving vote.
     new e45b956d #1259 - add default email settings to project policy, pull defaults from policy when showing to user, and allow extra CC/BCC when resolving vote.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bd688aa9)
            \
             N -- N -- N   refs/heads/arm (e45b956d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tests/unit/test_archived_project_writer_guards.py | 2 --
 1 file changed, 2 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org


(tooling-trusted-releases) 01/01: #1259 - add default email settings to project policy, pull defaults from policy when showing to user, and allow extra CC/BCC when resolving vote.

Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

alitheg pushed a commit to branch arm
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git

commit e45b956dd440f8622adf7839eb4cbe6a3999ef0c
Author: Alastair McFarlane <ar...@apache.org>
AuthorDate: Thu May 28 16:59:55 2026 +0100

    #1259 - add default email settings to project policy, pull defaults from policy when showing to user, and allow extra CC/BCC when resolving vote.
---
 atr/api/__init__.py                               |   7 +-
 atr/db/__init__.py                                |   3 -
 atr/get/announce.py                               |  17 ++-
 atr/get/projects.py                               |  51 ++++++--
 atr/get/resolve.py                                |  45 ++++---
 atr/get/voting.py                                 |  17 ++-
 atr/models/api.py                                 |  14 ++-
 atr/models/sql.py                                 |  35 ++++--
 atr/post/resolve.py                               |  10 +-
 atr/render.py                                     |  50 ++++++--
 atr/shared/projects.py                            |  19 ++-
 atr/shared/resolve.py                             |  47 ++++----
 atr/storage/writers/policy.py                     |  43 ++++++-
 atr/storage/writers/vote.py                       | 139 ++++++++++++----------
 atr/util.py                                       |  33 ++++-
 migrations/versions/0089_2026.05.28_c1b6a816.py   |  29 +++++
 tests/unit/test_archived_project_writer_guards.py |   2 -
 tests/unit/test_policy_update_args.py             |  12 +-
 tests/unit/test_vote_recipients.py                |   1 -
 tests/unit/test_vote_resolution.py                |   1 -
 20 files changed, 398 insertions(+), 177 deletions(-)

diff --git a/atr/api/__init__.py b/atr/api/__init__.py
index 05a42187..bb346fee 100644
--- a/atr/api/__init__.py
+++ b/atr/api/__init__.py
@@ -818,6 +818,8 @@ async def policy_get(
         project = await data.project(key=str(project_key), _release_policy=True, _committee=True).demand(
             exceptions.NotFound()
         )
+    vote_to, vote_cc, vote_bcc = project.policy_recipients(models.sql.RecipientAction.VOTE)
+    announce_to, announce_cc, announce_bcc = project.policy_recipients(models.sql.RecipientAction.ANNOUNCE)
     return models.api.PolicyGetResults(
         endpoint="/policy/get",
         project_key=project.safe_key,
@@ -830,7 +832,10 @@ async def policy_get(
         policy_github_repository_name=project.policy_github_repository_name,
         policy_github_vote_workflow_path=project.policy_github_vote_workflow_path,
         policy_license_check_mode=project.policy_license_check_mode,
-        policy_mailto_addresses=project.policy_mailto_addresses,
+        policy_vote_recipients=models.api.RecipientDefaults(to=vote_to or None, cc=vote_cc, bcc=vote_bcc),
+        policy_announce_recipients=models.api.RecipientDefaults(
+            to=announce_to or None, cc=announce_cc, bcc=announce_bcc
+        ),
         policy_manual_vote=project.policy_manual_vote,
         policy_min_hours=project.policy_min_hours,
         policy_vote_mode=project.policy_vote_mode,
diff --git a/atr/db/__init__.py b/atr/db/__init__.py
index 4303d9ce..3da06ebf 100644
--- a/atr/db/__init__.py
+++ b/atr/db/__init__.py
@@ -771,7 +771,6 @@ class Session(sqlalchemy.ext.asyncio.AsyncSession):
     def release_policy(
         self,
         id: Opt[int] = NOT_SET,
-        mailto_addresses: Opt[list[str]] = NOT_SET,
         vote_mode: Opt[sql.VoteMode] = NOT_SET,
         min_hours: Opt[int] = NOT_SET,
         release_checklist: Opt[str] = NOT_SET,
@@ -789,8 +788,6 @@ class Session(sqlalchemy.ext.asyncio.AsyncSession):
 
         if is_defined(id):
             query = query.where(sql.ReleasePolicy.id == id)
-        if is_defined(mailto_addresses):
-            query = query.where(sql.ReleasePolicy.mailto_addresses == mailto_addresses)
         if is_defined(vote_mode):
             query = query.where(sql.ReleasePolicy.vote_mode == vote_mode)
         if is_defined(min_hours):
diff --git a/atr/get/announce.py b/atr/get/announce.py
index 5a7d80e0..92c4e0b5 100644
--- a/atr/get/announce.py
+++ b/atr/get/announce.py
@@ -172,8 +172,12 @@ async def _render_announce_form(
     custom_subject_widget = _render_subject_field(default_subject, release.project.key)
     custom_body_widget = _render_body_field(default_body, release.project.key)
     download_path_widget = _render_download_path_field(default_download_path_value, download_path_description)
-    default_to = permitted_recipients[0] if permitted_recipients else None
-    to_radios = htm.div[
+    policy_to, policy_cc, policy_bcc = release.project.policy_recipients(sql.RecipientAction.ANNOUNCE)
+    permitted_set = set(permitted_recipients)
+    fallback_to = permitted_recipients[0] if permitted_recipients else None
+    default_to = policy_to if (policy_to in permitted_set) else fallback_to
+    settings_url = util.as_url(projects.view, project_key=release.project.key) + "?tab=finish#email_to"
+    recipient_radios = htm.div[
         render.html_recipients_to_radios(
             permitted_recipients,
             default_to=default_to,
@@ -181,8 +185,13 @@ async def _render_announce_form(
         ),
         htpy.details(".mt-2")[
             htpy.summary["Select CC and BCC recipients"],
-            render.html_recipients_cc_bcc_table(permitted_recipients),
+            render.html_recipients_cc_bcc_table(
+                permitted_recipients,
+                selected_cc={address for address in policy_cc if (address in permitted_set)},
+                selected_bcc={address for address in policy_bcc if (address in permitted_set)},
+            ),
         ],
+        render.html_recipients_defaults_note(settings_url),
     ]
 
     prior_release_version = ""
@@ -210,7 +219,7 @@ async def _render_announce_form(
         submit_label="Publish & announce",
         defaults=defaults_dict,
         custom={
-            "email_to": to_radios,
+            "email_to": recipient_radios,
             "subject": custom_subject_widget,
             "body": custom_body_widget,
             "download_path_suffix": download_path_widget,
diff --git a/atr/get/projects.py b/atr/get/projects.py
index 850e12ed..16737dab 100644
--- a/atr/get/projects.py
+++ b/atr/get/projects.py
@@ -628,8 +628,9 @@ async def _render_finish_form(project: sql.Project) -> htm.Element:
             custom={
                 "announce_release_subject": announce_release_subject_widget,
                 "announce_release_template": announce_release_template_widget,
+                "email_to": _recipient_grid_widget(project, sql.RecipientAction.ANNOUNCE),
             },
-            skip=["archive_prior_release"] if not project.cycle_match else [],
+            skip=["email_cc", "email_bcc", *(["archive_prior_release"] if not project.cycle_match else [])],
         )
     return card.collect()
 
@@ -794,16 +795,17 @@ def _render_policy_readonly(project: sql.Project) -> htm.Element:
     card = htm.Block(htm.div, classes=".card.mb-4")
     card.div(".card-header.bg-light")[htm.h3(".mb-2")["Release policy"]]
 
-    email_content = (
-        htm.a(href=f"mailto:{project.policy_mailto_addresses[0]}")[project.policy_mailto_addresses[0]]
-        if project.policy_mailto_addresses
-        else "Not set"
-    )
+    vote_to, vote_cc, vote_bcc = project.policy_recipients(sql.RecipientAction.VOTE)
+    announce_to, announce_cc, announce_bcc = project.policy_recipients(sql.RecipientAction.ANNOUNCE)
 
     tbody = htm.tbody[
         htm.tr[
-            htm.th(".border-0.w-25")["Email"],
-            htm.td(".text-break.border-0")[email_content],
+            htm.th(".border-0.w-25")["Vote email"],
+            htm.td(".text-break.border-0")[_recipient_summary(vote_to, vote_cc, vote_bcc)],
+        ],
+        htm.tr[
+            htm.th(".border-0")["Announce email"],
+            htm.td(".text-break.border-0")[_recipient_summary(announce_to, announce_cc, announce_bcc)],
         ],
         htm.tr[
             htm.th(".border-0")["Vote mode"],
@@ -1042,9 +1044,6 @@ async def _render_vote_form(project: sql.Project) -> htm.Element:
 
     defaults_dict = {
         "project_key": str(project.key),
-        "mailto_addresses": project.policy_mailto_addresses[0]
-        if project.policy_mailto_addresses
-        else f"dev@{project.key}.apache.org",
         "vote_mode": project.policy_vote_mode,
         "min_hours": project.policy_min_hours,
         "release_checklist": project.policy_release_checklist or "",
@@ -1097,16 +1096,46 @@ async def _render_vote_form(project: sql.Project) -> htm.Element:
             # wider_widgets=True,
             textarea_rows=10,
             custom={
+                "email_to": _recipient_grid_widget(project, sql.RecipientAction.VOTE),
                 "release_checklist": release_checklist_widget,
                 "start_vote_subject": start_vote_subject_widget,
                 "start_vote_template": start_vote_template_widget,
                 "finish_vote_template": finish_vote_template_widget,
                 "vote_mode": vote_mode_widget,
             },
+            skip=["email_cc", "email_bcc"],
         )
     return card.collect()
 
 
+def _recipient_summary(to: str, cc: list[str], bcc: list[str]) -> htm.Element | str:
+    if not to:
+        return "Not set"
+    extras = []
+    if cc:
+        extras.append(f"{len(cc)} CC")
+    if bcc:
+        extras.append(f"{len(bcc)} BCC")
+    suffix = f" (+{', '.join(extras)})" if extras else ""
+    return htm.span[htm.a(href=f"mailto:{to}")[to], suffix]
+
+
+def _recipient_grid_widget(project: sql.Project, action: sql.RecipientAction) -> htm.Element:
+    committee = project.committee
+    committee_key = committee.key if (committee is not None) else str(project.key)
+    is_podling = bool(committee is not None and committee.is_podling)
+    options = util.configurable_recipients(action, committee_key, is_podling=is_podling)
+    stored_to, stored_cc, stored_bcc = project.policy_recipients(action)
+    default_to = stored_to if (stored_to in options) else (options[0] if options else None)
+    return htm.div("#email_to")[
+        render.html_recipients_to_radios(options, default_to=default_to),
+        htpy.details(".mt-2")[
+            htpy.summary["Select CC and BCC recipients"],
+            render.html_recipients_cc_bcc_table(options, selected_cc=set(stored_cc), selected_bcc=set(stored_bcc)),
+        ],
+    ]
+
+
 def _textarea_with_variables(
     field_name: str,
     default_value: str,
diff --git a/atr/get/resolve.py b/atr/get/resolve.py
index d476481a..e7bcc5e6 100644
--- a/atr/get/resolve.py
+++ b/atr/get/resolve.py
@@ -31,6 +31,7 @@ import atr.models as models
 import atr.models.safe as safe
 import atr.models.sql as sql
 import atr.post as post
+import atr.render as render
 import atr.shared as shared
 import atr.storage as storage
 import atr.tabulate as tabulate
@@ -291,26 +292,34 @@ async def selected(  # noqa: C901
         skip.append("automatic_resolve_when_finished")
         skip.append("notify_when_finished")
 
+    # Show the To for reference and offer a grid
+    # to add further cc/bcc with inherited recipients locked.
+    defaults["result_email_to"] = vote_recipient or "the original vote thread recipients"
+    permitted_recipients = (
+        util.permitted_voting_recipients(session.uid, release.committee.key) if (release.committee is not None) else []
+    )
+    original_cc = list(latest_vote_task.task_args.get("email_cc", [])) if (latest_vote_task is not None) else []
+    original_bcc = list(latest_vote_task.task_args.get("email_bcc", [])) if (latest_vote_task is not None) else []
+    # The To is shown separately and always included, so don't offer it as an
+    # addable cc/bcc - that keeps the grid free of duplicate choices.
+    grid_options = [address for address in permitted_recipients if (address != vote_recipient)]
+    for address in [*original_cc, *original_bcc]:
+        if address not in grid_options:
+            grid_options.append(address)
+    custom["email_cc"] = htm.div[
+        render.html_recipients_cc_bcc_table(
+            grid_options,
+            locked_cc=set(original_cc),
+            locked_bcc=set(original_bcc),
+        ),
+        htm.div(".form-text.text-muted.mt-1")[
+            "The original recipients are included and cannot be removed. Tick others to add them.",
+        ],
+    ]
+    skip.append("email_bcc")
+
     if form_cls is shared.resolve.SubmitForm:
-        # The result reuses whatever list the vote ran on; show it for reference
-        defaults["result_email_to"] = vote_recipient or "the original vote thread recipients"
         defaults["result_subject"] = tabulate.vote_result_subject(release, "<resolution>")
-        if release.committee is not None:
-            private_list_address = f"private@{release.committee.key}.apache.org"
-            custom["bcc_private_list"] = htm.div[
-                htpy.input(
-                    type="checkbox",
-                    name="bcc_private_list",
-                    id="bcc_private_list",
-                    value="on",
-                    class_="form-check-input",
-                ),
-                htm.div(".form-text.text-muted.mt-1")[
-                    f"If set, ATR will also send a blind copy of the result to {private_list_address}.",
-                ],
-            ]
-        else:
-            skip.append("bcc_private_list")
 
     pre_submit: htm.Element | None = None
     if (not binding_sufficient) and (pass_fail_allowed or bypass_active):
diff --git a/atr/get/voting.py b/atr/get/voting.py
index ff0ba1fb..cb152d3b 100644
--- a/atr/get/voting.py
+++ b/atr/get/voting.py
@@ -282,8 +282,12 @@ async def _render_page(
 
     custom_subject_widget = _render_subject_field(default_subject, release.project.key)
     custom_body_widget = _render_body_field(default_body, release.project.key)
-    default_to = permitted_recipients[0] if permitted_recipients else None
-    to_radios = htm.div[
+    policy_to, policy_cc, policy_bcc = release.project.policy_recipients(sql.RecipientAction.VOTE)
+    permitted_set = set(permitted_recipients)
+    fallback_to = permitted_recipients[0] if permitted_recipients else None
+    default_to = policy_to if (policy_to in permitted_set) else fallback_to
+    settings_url = util.as_url(projects.view, project_key=release.project.key) + "?tab=vote#email_to"
+    recipient_radios = htm.div[
         render.html_recipients_to_radios(
             permitted_recipients,
             default_to=default_to,
@@ -298,12 +302,17 @@ async def _render_page(
         ),
         htpy.details(".mt-2")[
             htpy.summary["Select CC and BCC recipients"],
-            render.html_recipients_cc_bcc_table(permitted_recipients),
+            render.html_recipients_cc_bcc_table(
+                permitted_recipients,
+                selected_cc={address for address in policy_cc if (address in permitted_set)},
+                selected_bcc={address for address in policy_bcc if (address in permitted_set)},
+            ),
         ],
+        render.html_recipients_defaults_note(settings_url),
     ]
 
     custom: dict[str, htm.Element | htm.VoidElement] = {
-        "email_to": to_radios,
+        "email_to": recipient_radios,
         "subject": custom_subject_widget,
         "body": custom_body_widget,
     }
diff --git a/atr/models/api.py b/atr/models/api.py
index 29d2f532..83e17359 100644
--- a/atr/models/api.py
+++ b/atr/models/api.py
@@ -293,6 +293,14 @@ class ProjectGetResults(schema.Strict):
     project: sql.Project
 
 
+class RecipientDefaults(schema.Strict):
+    # Default email recipients for one action. A whole block replaces the
+    # stored defaults for that action, so an absent cc/bcc clears them.
+    to: pydantic.EmailStr | None = None
+    cc: list[pydantic.EmailStr] = schema.factory(list)
+    bcc: list[pydantic.EmailStr] = schema.factory(list)
+
+
 class PolicyGetResults(schema.Strict):
     # quart_schema.validate_response runs the response dict (produced by
     # model_dump(mode="json")) back through this model. mode="json" serialises
@@ -317,7 +325,8 @@ class PolicyGetResults(schema.Strict):
     policy_github_repository_name: str
     policy_github_vote_workflow_path: list[str]
     policy_license_check_mode: sql.LicenseCheckMode
-    policy_mailto_addresses: list[str]
+    policy_vote_recipients: RecipientDefaults
+    policy_announce_recipients: RecipientDefaults
     policy_manual_vote: bool
     policy_min_hours: int
     policy_vote_mode: sql.VoteMode = schema.example(sql.VoteMode.EMAIL)
@@ -345,7 +354,8 @@ class PolicyArgsBase(schema.Strict):
     github_repository_name: str | None = None
     github_vote_workflow_path: list[str] | None = None
     license_check_mode: sql.LicenseCheckMode | None = None
-    mailto_addresses: list[pydantic.EmailStr] | None = None
+    vote_recipients: RecipientDefaults | None = None
+    announce_recipients: RecipientDefaults | None = None
     manual_vote: bool | None = None
     min_hours: int | None = None
     preserve_download_files: bool | None = None
diff --git a/atr/models/sql.py b/atr/models/sql.py
index e46d2e93..b84a1e9e 100644
--- a/atr/models/sql.py
+++ b/atr/models/sql.py
@@ -21,6 +21,7 @@
 # https://github.com/fastapi/sqlmodel/issues/196
 # https://github.com/fastapi/sqlmodel/pull/778/files
 
+import copy
 import dataclasses
 import datetime
 import enum
@@ -332,6 +333,12 @@ class VoteChoice(enum.StrEnum):
     NO = "-1"
 
 
+class RecipientAction(enum.StrEnum):
+    # Keys under ReleasePolicy.recipient_defaults
+    VOTE = "vote"
+    ANNOUNCE = "announce"
+
+
 class LifecycleEventType(enum.StrEnum):
     RELEASE = "release"
     ARCHIVE = "archive"
@@ -991,15 +998,16 @@ Sincerely,
             return self.policy_announce_release_default
         return policy.announce_release_template
 
-    @property
-    def policy_mailto_addresses(self) -> list[str]:
-        if ((policy := self.release_policy) is None) or (not policy.mailto_addresses):
-            if self.committee is not None:
-                return [f"dev@{self.committee.key}.apache.org", f"private@{self.committee.key}.apache.org"]
-            else:
-                # TODO: Or raise an error?
-                return [f"dev@{self.key}.apache.org", f"private@{self.key}.apache.org"]
-        return policy.mailto_addresses
+    def policy_recipients(self, action: RecipientAction) -> tuple[str, list[str], list[str]]:
+        # Raw stored defaults for an action; empty when nothing has been set.
+        policy = self.release_policy
+        entry: dict[str, Any] = {}
+        if policy is not None:
+            entry = policy.recipient_defaults.get(action.value) or {}
+        to = entry.get("to") or ""
+        cc = [str(address) for address in (entry.get("cc") or [])]
+        bcc = [str(address) for address in (entry.get("bcc") or [])]
+        return to, cc, bcc
 
     @property
     def policy_manual_vote(self) -> bool:
@@ -1797,8 +1805,11 @@ class Artifact(sqlmodel.SQLModel, table=True):
 # ReleasePolicy: Project
 class ReleasePolicy(sqlmodel.SQLModel, table=True):
     id: int = sqlmodel.Field(default=None, primary_key=True)
-    mailto_addresses: list[str] = sqlmodel.Field(
-        default_factory=list, sa_column=sqlalchemy.Column(sqlalchemy.JSON, nullable=False)
+    # Default email recipients per action, keyed by action ("vote", "announce").
+    # Each entry is {"to": str, "cc": list[str], "bcc": list[str]}. Stored values
+    # are advisory: any address that isn't permitted at send time is dropped.
+    recipient_defaults: dict[str, Any] = sqlmodel.Field(
+        default_factory=dict, sa_column=sqlalchemy.Column(sqlalchemy.JSON, nullable=False)
     )
     vote_mode: VoteMode = sqlmodel.Field(default=VoteMode.EMAIL)
     min_hours: int | None = sqlmodel.Field(default=None)
@@ -1846,7 +1857,7 @@ class ReleasePolicy(sqlmodel.SQLModel, table=True):
     def duplicate(self) -> "ReleasePolicy":
         # Cannot call this .copy because that's an existing BaseModel method
         return ReleasePolicy(
-            mailto_addresses=list(self.mailto_addresses),
+            recipient_defaults=copy.deepcopy(self.recipient_defaults),
             vote_mode=self.vote_mode,
             min_hours=self.min_hours,
             release_checklist=self.release_checklist,
diff --git a/atr/post/resolve.py b/atr/post/resolve.py
index 014807a0..43fa030e 100644
--- a/atr/post/resolve.py
+++ b/atr/post/resolve.py
@@ -54,7 +54,6 @@ async def selected(
 
     automatic_resolve_when_finished = _read_auto_resolve_flag(submit_form)
     notify_when_finished = _read_notify_flag(submit_form)
-    bcc_private_list = _read_bcc_private_flag(submit_form)
 
     try:
         async with storage.write_as_project_release_manager(project_key) as warm:
@@ -68,7 +67,8 @@ async def selected(
                 expected_vote_mode=submit_form.vote_mode,
                 automatic_resolve_when_finished=automatic_resolve_when_finished,
                 notify_when_finished=notify_when_finished,
-                bcc_private_list=bcc_private_list,
+                additional_cc=submit_form.email_cc,
+                additional_bcc=submit_form.email_bcc,
             )
     except storage.AccessError as e:
         return await session.redirect(
@@ -102,12 +102,6 @@ def _read_auto_resolve_flag(submit_form: shared.resolve.ResolveForm) -> bool:
     return False
 
 
-def _read_bcc_private_flag(submit_form: shared.resolve.ResolveForm) -> bool:
-    if isinstance(submit_form, shared.resolve.SubmitForm):
-        return bool(submit_form.bcc_private_list)
-    return False
-
-
 def _read_notify_flag(submit_form: shared.resolve.ResolveForm) -> bool:
     if isinstance(submit_form, shared.resolve.SubmitForm):
         return bool(submit_form.notify_when_finished)
diff --git a/atr/render.py b/atr/render.py
index 6a7cff26..b6d7942c 100644
--- a/atr/render.py
+++ b/atr/render.py
@@ -196,7 +196,19 @@ def html_nav_phase(block: htm.Block, project: str, version: str, staging: bool)
     )
 
 
-def html_recipients_cc_bcc_table(recipients: list[str]) -> htm.Element:
+def html_recipients_cc_bcc_table(
+    recipients: list[str],
+    selected_cc: set[str] | None = None,
+    selected_bcc: set[str] | None = None,
+    locked_cc: set[str] | None = None,
+    locked_bcc: set[str] | None = None,
+) -> htm.Element:
+    # Locked entries render checked and disabled; disabled checkboxes don't
+    # submit, so callers reconstruct those recipients server-side.
+    selected_cc = selected_cc or set()
+    selected_bcc = selected_bcc or set()
+    locked_cc = locked_cc or set()
+    locked_bcc = locked_bcc or set()
     header = htpy.thead[
         htpy.tr[
             htpy.th(".text-center.atr-checkbox-col")["CC"],
@@ -206,20 +218,44 @@ def html_recipients_cc_bcc_table(recipients: list[str]) -> htm.Element:
     ]
     rows = []
     for recipient in recipients:
+        cc_attrs: dict[str, str] = {
+            "type": "checkbox",
+            "name": "email_cc",
+            "value": recipient,
+            "class_": "form-check-input",
+        }
+        if (recipient in selected_cc) or (recipient in locked_cc):
+            cc_attrs["checked"] = ""
+        if recipient in locked_cc:
+            cc_attrs["disabled"] = ""
+        bcc_attrs: dict[str, str] = {
+            "type": "checkbox",
+            "name": "email_bcc",
+            "value": recipient,
+            "class_": "form-check-input",
+        }
+        if (recipient in selected_bcc) or (recipient in locked_bcc):
+            bcc_attrs["checked"] = ""
+        if recipient in locked_bcc:
+            bcc_attrs["disabled"] = ""
         rows.append(
             htpy.tr[
-                htpy.td(".text-center.atr-checkbox-col")[
-                    htpy.input(type="checkbox", name="email_cc", value=recipient, class_="form-check-input")
-                ],
-                htpy.td(".text-center.atr-checkbox-col")[
-                    htpy.input(type="checkbox", name="email_bcc", value=recipient, class_="form-check-input")
-                ],
+                htpy.td(".text-center.atr-checkbox-col")[htpy.input(**cc_attrs)],
+                htpy.td(".text-center.atr-checkbox-col")[htpy.input(**bcc_attrs)],
                 htpy.td[recipient],
             ]
         )
     return htpy.table(".table.table-bordered.mb-0")[header, htpy.tbody[rows]]
 
 
+def html_recipients_defaults_note(settings_url: str) -> htm.Element:
+    return htm.div(".form-text.text-muted.mt-2")[
+        "To edit the default recipients, go to the ",
+        htm.a(href=settings_url)["project settings"],
+        ".",
+    ]
+
+
 def html_recipients_to_radios(
     recipients: list[str],
     default_to: str | None = None,
diff --git a/atr/shared/projects.py b/atr/shared/projects.py
index 04f18745..a2eca483 100644
--- a/atr/shared/projects.py
+++ b/atr/shared/projects.py
@@ -169,11 +169,14 @@ class ComposePolicyForm(form.Form):
 class VotePolicyForm(form.Form):
     variant: VOTE = form.value(VOTE)
     project_key: safe.ProjectKey = form.label("Project name", widget=form.Widget.HIDDEN)
-    mailto_addresses: form.Email = form.label(
-        "Email",
-        f"The mailing list where vote emails are sent. This is usually your dev list. "
-        f"ATR will currently only send test announcement emails to {util.USER_TESTS_ADDRESS}.",
+    email_to: str = form.label(
+        "Default vote recipient",
+        "The mailing list vote emails default to. Release managers can still override this when starting a vote.",
+        widget=form.Widget.CUSTOM,
+        default="",
     )
+    email_cc: form.StrList = form.label("Default CC")
+    email_bcc: form.StrList = form.label("Default BCC")
     vote_mode: sql.VoteMode = form.label(
         "Vote mode",
         widget=form.Widget.CUSTOM,
@@ -351,6 +354,14 @@ class FinishPolicyForm(form.Form):
         "Announce release template",
         widget=form.Widget.CUSTOM,
     )
+    email_to: str = form.label(
+        "Default announce recipient",
+        "The mailing list announcements default to. Release managers can still override this when announcing.",
+        widget=form.Widget.CUSTOM,
+        default="",
+    )
+    email_cc: form.StrList = form.label("Default CC")
+    email_bcc: form.StrList = form.label("Default BCC")
     preserve_download_files: form.Bool = form.label(
         "Preserve download files",
         "If enabled, existing download files will not be overwritten.",
diff --git a/atr/shared/resolve.py b/atr/shared/resolve.py
index a929c98d..dd0d6c83 100644
--- a/atr/shared/resolve.py
+++ b/atr/shared/resolve.py
@@ -15,25 +15,22 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Annotated, Literal
+from typing import Annotated, Literal, Self
 
 import pydantic
 
 import atr.form as form
 import atr.models.sql as sql
+import atr.util as util
 
 type CANCEL_SUBMIT = Literal["cancel_submit"]
 type SUBMIT = Literal["submit"]
 
 
-class CancelSubmitForm(form.Form):
-    variant: CANCEL_SUBMIT = form.value(CANCEL_SUBMIT)
-    email_body: str = form.label("Email body", widget=form.Widget.TEXTAREA, max_length=100_000)
-    confirm_cancel: Literal["CONFIRM"] = form.label(
-        "Confirm",
-        "Type CONFIRM (in capitals) to cancel this vote.",
-    )
-    vote_result: Literal["Cancelled"] = form.label("Vote result", default="Cancelled", widget=form.Widget.HIDDEN)
+class ResolveFormBase(form.Form):
+    result_email_to: str = form.label("To", widget=form.Widget.STATIC, default="")
+    email_cc: form.StrList = form.label("Additional recipients", widget=form.Widget.CUSTOM)
+    email_bcc: form.StrList = form.label("BCC")
     vote_mode: sql.VoteMode | None = form.label("Vote mode", default=None, widget=form.Widget.HIDDEN)
     vote_seq: int | None = form.label("Vote serial", default=None, widget=form.Widget.HIDDEN)
 
@@ -44,15 +41,24 @@ class CancelSubmitForm(form.Form):
             return None
         return value
 
+    @pydantic.model_validator(mode="after")
+    def _validate_recipients(self) -> Self:
+        util.validate_no_duplicate_recipients([*self.email_cc, *self.email_bcc])
+        return self
 
-class SubmitForm(form.Form):
-    variant: SUBMIT = form.value(SUBMIT)
-    result_email_to: str = form.label("To", widget=form.Widget.STATIC, default="")
-    bcc_private_list: form.Bool = form.label(
-        "BCC private@",
-        widget=form.Widget.CUSTOM,
-        default=False,
+
+class CancelSubmitForm(ResolveFormBase):
+    variant: CANCEL_SUBMIT = form.value(CANCEL_SUBMIT)
+    email_body: str = form.label("Email body", widget=form.Widget.TEXTAREA, max_length=100_000)
+    confirm_cancel: Literal["CONFIRM"] = form.label(
+        "Confirm",
+        "Type CONFIRM (in capitals) to cancel this vote.",
     )
+    vote_result: Literal["Cancelled"] = form.label("Vote result", default="Cancelled", widget=form.Widget.HIDDEN)
+
+
+class SubmitForm(ResolveFormBase):
+    variant: SUBMIT = form.value(SUBMIT)
     result_subject: str = form.label("Subject", widget=form.Widget.STATIC, default="")
     email_body: str = form.label("Body", widget=form.Widget.TEXTAREA, max_length=100_000)
     vote_result: Literal["Passed", "Failed", "Cancelled"] = form.label("Vote result", widget=form.Widget.RADIO)
@@ -66,15 +72,6 @@ class SubmitForm(form.Form):
         widget=form.Widget.CUSTOM,
         default=False,
     )
-    vote_mode: sql.VoteMode | None = form.label("Vote mode", default=None, widget=form.Widget.HIDDEN)
-    vote_seq: int | None = form.label("Vote serial", default=None, widget=form.Widget.HIDDEN)
-
-    @pydantic.field_validator("vote_mode", "vote_seq", mode="before")
-    @classmethod
-    def empty_hidden_value(cls, value: object) -> object:
-        if value == "":
-            return None
-        return value
 
 
 type ResolveForm = Annotated[
diff --git a/atr/storage/writers/policy.py b/atr/storage/writers/policy.py
index 52191996..82ae4216 100644
--- a/atr/storage/writers/policy.py
+++ b/atr/storage/writers/policy.py
@@ -37,6 +37,10 @@ if TYPE_CHECKING:
     import atr.shared as shared
 
 _NULLABLE_POLICY_FIELDS: Final = frozenset({"min_hours"})
+_RECIPIENT_API_FIELDS: Final[dict[str, models.sql.RecipientAction]] = {
+    "vote_recipients": models.sql.RecipientAction.VOTE,
+    "announce_recipients": models.sql.RecipientAction.ANNOUNCE,
+}
 _TRUSTED_PUBLISHING_PATH_FIELDS: Final = frozenset(
     {
         "github_compose_workflow_path",
@@ -232,11 +236,26 @@ class CommitteeMember(CommitteeParticipant):
     ) -> None:
         # TODO: Ideally we would centralise the validation in this method
         project, release_policy = await self.__get_or_create_policy(project_key)
-        fields_to_update = update.model_fields_set - {"manual_vote", "project", "vote_mode"}
+        excluded_fields = {"manual_vote", "project", "vote_mode"} | set(_RECIPIENT_API_FIELDS)
+        fields_to_update = update.model_fields_set - excluded_fields
         normalised_values: dict[str, Any] = {}
 
         self.__set_policy_vote_mode_from_api(project, release_policy, update)
 
+        for field, action in _RECIPIENT_API_FIELDS.items():
+            if field in update.model_fields_set:
+                recipients = getattr(update, field)
+                if recipients is None:
+                    _set_recipient_defaults(release_policy, action, "", [], [])
+                else:
+                    _set_recipient_defaults(
+                        release_policy,
+                        action,
+                        str(recipients.to) if recipients.to else "",
+                        [str(address) for address in recipients.cc],
+                        [str(address) for address in recipients.bcc],
+                    )
+
         for field in fields_to_update:
             value = getattr(update, field)
             if (value is None) and (field not in _NULLABLE_POLICY_FIELDS):
@@ -261,6 +280,9 @@ class CommitteeMember(CommitteeParticipant):
 
         self.__set_announce_release_subject(form.announce_release_subject or "", project, release_policy)
         self.__set_announce_release_template(form.announce_release_template or "", project, release_policy)
+        _set_recipient_defaults(
+            release_policy, models.sql.RecipientAction.ANNOUNCE, form.email_to, form.email_cc, form.email_bcc
+        )
         release_policy.preserve_download_files = form.preserve_download_files
         release_policy.auto_archive_prior_release = form.archive_prior_release
 
@@ -324,7 +346,9 @@ class CommitteeMember(CommitteeParticipant):
         release_policy.vote_mode = vote_mode
 
         if release_policy.vote_mode in {models.sql.VoteMode.EMAIL, models.sql.VoteMode.TRUSTED}:
-            release_policy.mailto_addresses = [form.mailto_addresses]
+            _set_recipient_defaults(
+                release_policy, models.sql.RecipientAction.VOTE, form.email_to, form.email_cc, form.email_bcc
+            )
             self.__set_min_hours(form.min_hours, project, release_policy)
             release_policy.release_checklist = form.release_checklist or ""
             release_policy.vote_comment_template = form.vote_comment_template or ""
@@ -517,6 +541,21 @@ def _normalise_trusted_publishing_update(
     return normalised_values
 
 
+def _set_recipient_defaults(
+    release_policy: models.sql.ReleasePolicy,
+    action: models.sql.RecipientAction,
+    to: str,
+    cc: list[str],
+    bcc: list[str],
+) -> None:
+    defaults = dict(release_policy.recipient_defaults)
+    if (not to) and (not cc) and (not bcc):
+        defaults.pop(action.value, None)
+    else:
+        defaults[action.value] = {"to": to, "cc": list(cc), "bcc": list(bcc)}
+    release_policy.recipient_defaults = defaults
+
+
 def _split_lines(text: str) -> list[str]:
     return [line.strip() for line in text.split("\n") if line.strip()]
 
diff --git a/atr/storage/writers/vote.py b/atr/storage/writers/vote.py
index 17c708b9..b13dbc07 100644
--- a/atr/storage/writers/vote.py
+++ b/atr/storage/writers/vote.py
@@ -499,7 +499,8 @@ class ReleaseManager(CommitteeParticipant):
         expected_vote_mode: sql.VoteMode | None = None,
         automatic_resolve_when_finished: bool = False,
         notify_when_finished: bool = False,
-        bcc_private_list: bool = False,
+        additional_cc: list[str] | None = None,
+        additional_bcc: list[str] | None = None,
     ) -> tuple[sql.Release, int | None, str, str | None]:
         release = await self.__data.release(
             key=sql.release_key(str(project_key), str(version_key)),
@@ -510,6 +511,12 @@ class ReleaseManager(CommitteeParticipant):
             _project_release_policy=True,
         ).demand(storage.AccessError("Release not found", status=404))
         storage.ensure_project_active(release.project)
+        additions = (additional_cc or []) + (additional_bcc or [])
+        if (release.committee is not None) and additions:
+            permitted = set(util.permitted_voting_recipients(self.__asf_uid, release.committee.key))
+            for address in additions:
+                if address not in permitted:
+                    raise storage.AccessError(f"Invalid recipient selection: {address}", status=400)
         if (expected_vote_mode is not None) and (release.effective_vote_mode != expected_vote_mode):
             raise storage.AccessError("The resolve form is stale, please refresh and try again", status=409)
         if release.effective_vote_mode == sql.VoteMode.MANUAL:
@@ -541,7 +548,8 @@ class ReleaseManager(CommitteeParticipant):
                 podling_round_one_thread_id,
                 automatic_resolve_when_finished=automatic_resolve_when_finished,
                 notify_when_finished=notify_when_finished,
-                bcc_private_list=bcc_private_list,
+                additional_cc=additional_cc,
+                additional_bcc=additional_bcc,
             )
         if (
             (expected_vote_seq is not None)
@@ -585,7 +593,8 @@ class ReleaseManager(CommitteeParticipant):
             resolution_body,
             automatic_resolve_when_finished=automatic_resolve_when_finished,
             notify_when_finished=notify_when_finished,
-            bcc_private_list=bcc_private_list,
+            additional_cc=additional_cc,
+            additional_bcc=additional_bcc,
         )
 
     async def resolve_manually(
@@ -670,7 +679,8 @@ class ReleaseManager(CommitteeParticipant):
         resolution_body: str,
         automatic_resolve_when_finished: bool = False,
         notify_when_finished: bool = False,
-        bcc_private_list: bool = False,
+        additional_cc: list[str] | None = None,
+        additional_bcc: list[str] | None = None,
     ) -> tuple[sql.Release, int | None, str, str | None]:
         if (voting_round == 1) and (vote_result == "passed"):
             await self.__data.commit()
@@ -825,10 +835,10 @@ class ReleaseManager(CommitteeParticipant):
             release,
             vote_result,
             resolution_body,
-            asf_fullname,
             latest_vote_task,
             extra_destination=extra_destination,
-            bcc_private_list=bcc_private_list,
+            additional_cc=additional_cc,
+            additional_bcc=additional_bcc,
         )
         if publish_enqueue_error is not None:
             if error_message is None:
@@ -859,86 +869,83 @@ class ReleaseManager(CommitteeParticipant):
             )
         return release, voting_round, success_message, error_message
 
+    def __queue_send(
+        self,
+        release: sql.Release,
+        *,
+        email_to: str,
+        subject: str,
+        body: str,
+        in_reply_to: str,
+        email_cc: list[str] | None = None,
+        email_bcc: list[str] | None = None,
+    ) -> sql.Task:
+        return sql.Task(
+            status=sql.TaskStatus.QUEUED,
+            task_type=sql.TaskType.MESSAGE_SEND,
+            task_args=args.Send(
+                email_sender=f"{self.__asf_uid}@apache.org",
+                email_to=email_to,
+                subject=subject,
+                body=body,
+                in_reply_to=in_reply_to,
+                email_cc=email_cc or [],
+                email_bcc=email_bcc or [],
+                footer_category=mail.MailFooterCategory.USER,
+            ).as_task_args(),
+            asf_uid=self.__asf_uid,
+            project_key=release.project.key,
+            version_key=release.version,
+        )
+
     async def __send_resolution(
         self,
         release: sql.Release,
         resolution: str,
         body: str,
-        asf_fullname: str,
         latest_vote_task: sql.Task,
         extra_destination: tuple[str, str] | None = None,
-        bcc_private_list: bool = False,
+        additional_cc: list[str] | None = None,
+        additional_bcc: list[str] | None = None,
     ) -> str | None:
         storage.ensure_project_active(release.project)
-        # Get the email thread
         vote_thread_mid = interaction.task_mid_get(latest_vote_task)
         if vote_thread_mid is None:
             return "No vote thread found, unable to send resolution message."
 
-        # Construct the reply email
-        # original_subject = latest_vote_task.task_args["subject"]
-
-        # Arguments for the task to cast a vote
+        # Reply into the original vote thread, reusing the recipients it went to
+        # and merging in the resolver's additions (deduped case-insensitively).
         email_to: str = latest_vote_task.task_args["email_to"]
         email_cc: list[str] = latest_vote_task.task_args.get("email_cc", [])
         email_bcc: list[str] = latest_vote_task.task_args.get("email_bcc", [])
-        # The send task rejects duplicate recipients case-insensitively, so guard before adding
-        if bcc_private_list and (release.committee is not None):
-            private_list_address = f"private@{release.committee.key}.apache.org"
-            existing = {addr.lower() for addr in [email_to, *email_cc, *email_bcc]}
-            if private_list_address.lower() not in existing:
-                email_bcc = [*email_bcc, private_list_address]
-        email_sender = f"{self.__asf_uid}@apache.org"
-        subject = tabulate.vote_result_subject(release, resolution)
-        # TODO: This duplicates atr/tabulate.py code
-        # There are arguments for using this code instead:
-        # - It enforces a consistent style
-        # - It can't be edited by the user
-        # - It could be made conditional based on user input
-        # But users might not know whether to use a signature or not
-        # And they may not use a standard format that can be detected
-        # Therefore we don't add a signature here
-        # signature = f"-- \n{asf_fullname} ({asf_uid})"
-        # if asf_fullname == asf_uid:
-        #     signature = f"-- \n{asf_fullname}"
-        # body = f"{body}\n\n{signature}"
-        in_reply_to = vote_thread_mid
+        seen = {addr.lower() for addr in [email_to, *email_cc, *email_bcc]}
+        email_cc = _extend_unique(email_cc, additional_cc, seen)
+        email_bcc = _extend_unique(email_bcc, additional_bcc, seen)
 
-        task = sql.Task(
-            status=sql.TaskStatus.QUEUED,
-            task_type=sql.TaskType.MESSAGE_SEND,
-            task_args=args.Send(
-                email_sender=email_sender,
+        subject = tabulate.vote_result_subject(release, resolution)
+        tasks = [
+            self.__queue_send(
+                release,
                 email_to=email_to,
                 subject=subject,
                 body=body,
-                in_reply_to=in_reply_to,
+                in_reply_to=vote_thread_mid,
                 email_cc=email_cc,
                 email_bcc=email_bcc,
-                footer_category=mail.MailFooterCategory.USER,
-            ).as_task_args(),
-            asf_uid=self.__asf_uid,
-            project_key=release.project.key,
-            version_key=release.version,
-        )
-        tasks = [task]
+            )
+        ]
+        # A passed podling second round is also replied into the round-one thread,
+        # to its list only - we don't re-copy the second round's cc/bcc there.
         if extra_destination is not None:
-            task = sql.Task(
-                status=sql.TaskStatus.QUEUED,
-                task_type=sql.TaskType.MESSAGE_SEND,
-                task_args=args.Send(
-                    email_sender=email_sender,
+            tasks.append(
+                self.__queue_send(
+                    release,
                     email_to=extra_destination[0],
                     subject=subject,
                     body=body,
                     in_reply_to=extra_destination[1],
-                    footer_category=mail.MailFooterCategory.USER,
-                ).as_task_args(),
-                asf_uid=self.__asf_uid,
-                project_key=release.project.key,
-                version_key=release.version,
+                )
             )
-            tasks.append(task)
         self.__data.add_all(tasks)
         await self.__data.flush()
         await self.__data.commit()
@@ -957,7 +964,8 @@ class ReleaseManager(CommitteeParticipant):
         *,
         automatic_resolve_when_finished: bool = False,
         notify_when_finished: bool = False,
-        bcc_private_list: bool = False,
+        additional_cc: list[str] | None = None,
+        additional_bcc: list[str] | None = None,
     ) -> tuple[sql.Release, int | None, str, str | None]:
         latest_vote_task: sql.Task | None = None
         second_round_vote_mode: sql.VoteMode | None = None
@@ -1150,10 +1158,10 @@ class ReleaseManager(CommitteeParticipant):
                 release,
                 vote_result,
                 resolution_body,
-                asf_fullname,
                 latest_vote_task,
                 extra_destination=extra_destination,
-                bcc_private_list=bcc_private_list,
+                additional_cc=additional_cc,
+                additional_bcc=additional_bcc,
             )
         if publish_enqueue_error is not None:
             if error_message is None:
@@ -1347,6 +1355,15 @@ def format_vote_email_body(
     return "\n\n".join(body)
 
 
+def _extend_unique(addresses: list[str], additions: list[str] | None, seen: set[str]) -> list[str]:
+    result = list(addresses)
+    for address in additions or []:
+        if address.lower() not in seen:
+            result.append(address)
+            seen.add(address.lower())
+    return result
+
+
 def _vote_potency_label(release: sql.Release, is_binding: bool) -> str | None:
     vote_round = None
     if (release.committee is not None) and release.committee.is_podling:
diff --git a/atr/util.py b/atr/util.py
index 9082a760..7ddc566e 100644
--- a/atr/util.py
+++ b/atr/util.py
@@ -361,6 +361,23 @@ def concern_groups(info: "types.PathInfo | None") -> list[ConcernGroup]:
     ]
 
 
+def configurable_recipients(action: sql.RecipientAction, committee_key: str, *, is_podling: bool) -> list[str]:
+    # Stable, committee-derived recipients a project can persist as defaults.
+    # These don't depend on the sender or on ALPHA test addresses, so a stored
+    # default stays valid for whoever later sends the email.
+    if action == sql.RecipientAction.ANNOUNCE:
+        return [
+            "announce@apache.org",
+            f"announce@{committee_key}.apache.org",
+            f"dev@{committee_key}.apache.org",
+            f"user@{committee_key}.apache.org",
+            f"private@{committee_key}.apache.org",
+        ]
+    if is_podling:
+        return [f"dev@{committee_key}.apache.org"]
+    return [f"dev@{committee_key}.apache.org", f"private@{committee_key}.apache.org"]
+
+
 def conjunction(items: Sequence[str], empty: str | None = None) -> str:
     match len(items):
         case 0:
@@ -1294,18 +1311,22 @@ def validate_distribution_owner_namespace(platform: sql.DistributionPlatform, na
 def validate_email_recipients(recipients: EmailRecipients) -> None:
     if not recipients.email_to:
         raise ValueError("At least one To recipient is required")
-    seen: set[str] = set()
-    for addr in [recipients.email_to, *recipients.email_cc, *recipients.email_bcc]:
-        lower = addr.lower()
-        if lower in seen:
-            raise ValueError(f"Duplicate recipient: {addr}")
-        seen.add(lower)
+    validate_no_duplicate_recipients([recipients.email_to, *recipients.email_cc, *recipients.email_bcc])
 
 
 def validate_filename(filename: str) -> str:
     return validate_path_segment(filename, "Filename")
 
 
+def validate_no_duplicate_recipients(addresses: list[str]) -> None:
+    seen: set[str] = set()
+    for address in addresses:
+        lower = address.lower()
+        if lower in seen:
+            raise ValueError(f"Duplicate recipient: {address}")
+        seen.add(lower)
+
+
 def validate_path(path: pathlib.Path) -> pathlib.Path:
     for segment in path.parts:
         validate_path_segment(segment)
diff --git a/migrations/versions/0089_2026.05.28_c1b6a816.py b/migrations/versions/0089_2026.05.28_c1b6a816.py
new file mode 100644
index 00000000..f6337ae7
--- /dev/null
+++ b/migrations/versions/0089_2026.05.28_c1b6a816.py
@@ -0,0 +1,29 @@
+"""Replace release policy mailto_addresses with recipient_defaults
+
+Revision ID: 0089_2026.05.28_c1b6a816
+Revises: 0088_2026.05.27_449e0006
+Create Date: 2026-05-28 09:00:18.337802+00:00
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+# Revision identifiers, used by Alembic
+revision: str = "0089_2026.05.28_c1b6a816"
+down_revision: str | None = "0088_2026.05.27_449e0006"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("releasepolicy", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("recipient_defaults", sa.JSON(), nullable=False, server_default="{}"))
+        batch_op.drop_column("mailto_addresses")
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("releasepolicy", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("mailto_addresses", sa.JSON(), nullable=False, server_default="[]"))
+        batch_op.drop_column("recipient_defaults")
diff --git a/tests/unit/test_archived_project_writer_guards.py b/tests/unit/test_archived_project_writer_guards.py
index 3064ca72..735b87e7 100644
--- a/tests/unit/test_archived_project_writer_guards.py
+++ b/tests/unit/test_archived_project_writer_guards.py
@@ -299,7 +299,5 @@ async def test_vote_send_resolution_blocks_retired() -> None:
             rel,
             "passed",
             "body",
-            "tester",
-            "Chair",
             SimpleNamespace(),
         )
diff --git a/tests/unit/test_policy_update_args.py b/tests/unit/test_policy_update_args.py
index 0b87278f..810ffcaf 100644
--- a/tests/unit/test_policy_update_args.py
+++ b/tests/unit/test_policy_update_args.py
@@ -68,12 +68,14 @@ def test_policy_update_args_validates_normalised_workflow_paths() -> None:
     assert args.github_vote_workflow_path == [" .github/workflows/vote.yml ", "  "]
 
 
-def test_policy_update_args_validates_mailto_addresses() -> None:
-    args = _policy_update(mailto_addresses=[" test@example.org "])
+def test_policy_update_args_validates_recipient_addresses() -> None:
+    args = _policy_update(vote_recipients={"to": " test@example.org ", "cc": ["cc@example.org"]})
 
-    assert args.mailto_addresses == ["test@example.org"]
+    assert args.vote_recipients is not None
+    assert args.vote_recipients.to == "test@example.org"
+    assert args.vote_recipients.cc == ["cc@example.org"]
 
 
-def test_policy_update_args_rejects_malformed_mailto_addresses() -> None:
+def test_policy_update_args_rejects_malformed_recipient_addresses() -> None:
     with pytest.raises(pydantic.ValidationError, match="valid email address"):
-        _policy_update(mailto_addresses=["not-an-email"])
+        _policy_update(vote_recipients={"to": "not-an-email"})
diff --git a/tests/unit/test_vote_recipients.py b/tests/unit/test_vote_recipients.py
index b077b1f5..921c54a9 100644
--- a/tests/unit/test_vote_recipients.py
+++ b/tests/unit/test_vote_recipients.py
@@ -125,7 +125,6 @@ async def test_send_resolution_reuses_original_vote_recipients() -> None:
         release,
         "passed",
         "Resolution body",
-        "Project Chair",
         latest_vote_task,
     )
 
diff --git a/tests/unit/test_vote_resolution.py b/tests/unit/test_vote_resolution.py
index 92a677f6..b31ee7a6 100644
--- a/tests/unit/test_vote_resolution.py
+++ b/tests/unit/test_vote_resolution.py
@@ -810,7 +810,6 @@ async def test_send_resolution_cancelled_builds_cancelled_subject() -> None:
         release,
         "cancelled",
         "The vote has been cancelled.",
-        "Project Chair",
         latest_vote_task,
     )
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org