@access-mcp/announcements 0.3.0 → 0.3.1

package/dist/server.js

@@ -1,4 +1,4 @@
-import { BaseAccessServer, DrupalAuthProvider } from "@access-mcp/shared";
+import { BaseAccessServer, DrupalAuthProvider, getRequestContext, } from "@access-mcp/shared";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const { version } = require("../package.json");
@@ -11,11 +11,17 @@ export class AnnouncementsServer extends BaseAccessServer {
     tagCacheExpiry;
     static TAG_CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
     constructor() {
-        super("access-announcements", version, "https://support.access-ci.org");
+        super("access-announcements", version, "https://support.access-ci.org", {
+            requireApiKey: true,
+        });
     }
     /**
      * Get or create the Drupal auth provider for JSON:API write operations.
      * Requires DRUPAL_API_URL, DRUPAL_USERNAME, and DRUPAL_PASSWORD env vars.
+     *
+     * Acting user is determined in priority order:
+     * 1. X-Acting-User header (from request context)
+     * 2. ACTING_USER environment variable (fallback)
      */
     getDrupalAuth() {
         if (!this.drupalAuth) {
@@ -27,6 +33,12 @@ export class AnnouncementsServer extends BaseAccessServer {
             }
             this.drupalAuth = new DrupalAuthProvider(baseUrl, username, password);
         }
+        // Update acting user from request context (takes priority) or env var (fallback)
+        const context = getRequestContext();
+        const actingUser = context?.actingUser || process.env.ACTING_USER;
+        if (actingUser) {
+            this.drupalAuth.setActingUser(actingUser);
+        }
         return this.drupalAuth;
     }
     getTools() {
@@ -40,24 +52,24 @@ export class AnnouncementsServer extends BaseAccessServer {
                     properties: {
                         query: {
                             type: "string",
-                            description: "Full-text search across title, body, and summary"
+                            description: "Full-text search across title, body, and summary",
                         },
                         tags: {
                             type: "string",
-                            description: "Filter by topics: gpu, ml, hpc"
+                            description: "Filter by topics: gpu, ml, hpc",
                         },
                         date: {
                             type: "string",
                             description: "Time period filter: today, this_week (last 7 days), this_month (last 30 days), past (last year)",
-                            enum: ["today", "this_week", "this_month", "past"]
+                            enum: ["today", "this_week", "this_month", "past"],
                         },
                         limit: {
                             type: "number",
                             description: "Max results (default: 25)",
-                            default: 25
-                        }
-                    }
-                }
+                            default: 25,
+                        },
+                    },
+                },
             },
             // CRUD operations (new)
             {
@@ -118,51 +130,51 @@ ALWAYS display the edit_url to the user so they can review their draft in Drupal
                     properties: {
                         title: {
                             type: "string",
-                            description: "Announcement title - clear and specific, under 100 characters"
+                            description: "Announcement title - clear and specific, under 100 characters",
                         },
                         body: {
                             type: "string",
-                            description: "Full announcement content. HTML allowed (basic_html format: <p>, <a>, <strong>, <em>, <ul>, <li>)"
+                            description: "Full announcement content. HTML allowed (basic_html format: <p>, <a>, <strong>, <em>, <ul>, <li>)",
                         },
                         summary: {
                             type: "string",
-                            description: "Brief teaser (1-2 sentences) shown in announcement listings. Required."
+                            description: "Brief teaser (1-2 sentences) shown in announcement listings. Required.",
                         },
                         published_date: {
                             type: "string",
-                            description: "When to display (YYYY-MM-DD). Defaults to today."
+                            description: "When to display (YYYY-MM-DD). Defaults to today.",
                         },
                         tags: {
                             type: "array",
                             items: { type: "string" },
-                            description: "Tag names (1-6 required for publication). Use list_available_tags to find valid tags."
+                            description: "Tag names (1-6 required for publication). Use list_available_tags to find valid tags.",
                         },
                         affiliation: {
                             type: "string",
                             description: "Source of announcement",
-                            enum: ["ACCESS Collaboration", "Community"]
+                            enum: ["ACCESS Collaboration", "Community"],
                         },
                         affinity_group: {
                             type: "string",
-                            description: "Affinity group name or UUID. User must be coordinator of the group. Use list_affinity_groups to find valid groups."
+                            description: "Affinity group name or UUID. User must be coordinator of the group. Use list_affinity_groups to find valid groups.",
                         },
                         external_link: {
                             type: "object",
                             description: "External link related to this announcement",
                             properties: {
                                 uri: { type: "string", description: "URL (must include https://)" },
-                                title: { type: "string", description: "Link text to display" }
+                                title: { type: "string", description: "Link text to display" },
                             },
-                            required: ["uri"]
+                            required: ["uri"],
                         },
                         where_to_share: {
                             type: "array",
                             items: { type: "string" },
-                            description: "Where to share the announcement. Defaults to 'Announcements page' + 'Bi-Weekly Digest'. Options: 'Announcements page', 'Bi-Weekly Digest', 'Affinity Group page', 'Email to Affinity Group'"
-                        }
+                            description: "Where to share the announcement. Defaults to 'Announcements page' + 'Bi-Weekly Digest'. Options: 'Announcements page', 'Bi-Weekly Digest', 'Affinity Group page', 'Email to Affinity Group'",
+                        },
                     },
-                    required: ["title", "body", "summary"]
-                }
+                    required: ["title", "body", "summary"],
+                },
             },
             {
                 name: "update_announcement",
@@ -181,50 +193,50 @@ ALWAYS display the edit_url to the user so they can review changes in Drupal.`,
                     properties: {
                         uuid: {
                             type: "string",
-                            description: "UUID of the announcement (get from get_my_announcements)"
+                            description: "UUID of the announcement (get from get_my_announcements)",
                         },
                         title: {
                             type: "string",
-                            description: "New title (only if changing)"
+                            description: "New title (only if changing)",
                         },
                         body: {
                             type: "string",
-                            description: "New body content (only if changing)"
+                            description: "New body content (only if changing)",
                         },
                         summary: {
                             type: "string",
-                            description: "New summary (only if changing)"
+                            description: "New summary (only if changing)",
                         },
                         published_date: {
                             type: "string",
-                            description: "New publication date YYYY-MM-DD (only if changing)"
+                            description: "New publication date YYYY-MM-DD (only if changing)",
                         },
                         tags: {
                             type: "array",
                             items: { type: "string" },
-                            description: "New tags - replaces ALL existing tags (only if changing)"
+                            description: "New tags - replaces ALL existing tags (only if changing)",
                         },
                         affinity_group: {
                             type: "string",
-                            description: "Affinity group name or UUID. User must be coordinator."
+                            description: "Affinity group name or UUID. User must be coordinator.",
                         },
                         external_link: {
                             type: "object",
                             description: "External link related to this announcement",
                             properties: {
                                 uri: { type: "string", description: "URL (must include https://)" },
-                                title: { type: "string", description: "Link text to display" }
+                                title: { type: "string", description: "Link text to display" },
                             },
-                            required: ["uri"]
+                            required: ["uri"],
                         },
                         where_to_share: {
                             type: "array",
                             items: { type: "string" },
-                            description: "Where to share the announcement. Options: 'Announcements page', 'Bi-Weekly Digest', 'Affinity Group page', 'Email to Affinity Group'"
-                        }
+                            description: "Where to share the announcement. Options: 'Announcements page', 'Bi-Weekly Digest', 'Affinity Group page', 'Email to Affinity Group'",
+                        },
                     },
-                    required: ["uuid"]
-                }
+                    required: ["uuid"],
+                },
             },
             {
                 name: "delete_announcement",
@@ -248,15 +260,15 @@ Returns: {success, uuid}`,
                     properties: {
                         uuid: {
                             type: "string",
-                            description: "UUID of the announcement to delete"
+                            description: "UUID of the announcement to delete",
                         },
                         confirmed: {
                             type: "boolean",
-                            description: "Set to true only after user has explicitly confirmed deletion of THIS specific announcement. Required."
-                        }
+                            description: "Set to true only after user has explicitly confirmed deletion of THIS specific announcement. Required.",
+                        },
                     },
-                    required: ["uuid", "confirmed"]
-                }
+                    required: ["uuid", "confirmed"],
+                },
             },
             {
                 name: "get_my_announcements",
@@ -275,10 +287,10 @@ Use this to:
                         limit: {
                             type: "number",
                             description: "Max results (default: 25)",
-                            default: 25
-                        }
-                    }
-                }
+                            default: 25,
+                        },
+                    },
+                },
             },
             {
                 name: "get_announcement_context",
@@ -294,9 +306,9 @@ Returns:
 Use this to tailor the announcement creation conversation based on the user's role.`,
                 inputSchema: {
                     type: "object",
-                    properties: {}
-                }
-            }
+                    properties: {},
+                },
+            },
         ];
     }
     getResources() {
@@ -305,8 +317,8 @@ Use this to tailor the announcement creation conversation based on the user's ro
                 uri: "accessci://announcements",
                 name: "ACCESS Support Announcements",
                 description: "Recent announcements and notifications from ACCESS support",
-                mimeType: "application/json"
-            }
+                mimeType: "application/json",
+            },
         ];
     }
     getPrompts() {
@@ -468,9 +480,9 @@ Which would you like to do?`,
                         {
                             uri,
                             mimeType: "application/json",
-                            text: JSON.stringify(announcements, null, 2)
-                        }
-                    ]
+                            text: JSON.stringify(announcements, null, 2),
+                        },
+                    ],
                 };
             }
             catch (error) {
@@ -480,9 +492,9 @@ Which would you like to do?`,
                         {
                             uri,
                             mimeType: "text/plain",
-                            text: `Error loading announcements: ${message}`
-                        }
-                    ]
+                            text: `Error loading announcements: ${message}`,
+                        },
+                    ],
                 };
             }
         }
@@ -514,7 +526,7 @@ Which would you like to do?`,
             today: { start: "today" },
             this_week: { start: "-1 week", end: "now" },
             this_month: { start: "-1 month", end: "now" },
-            past: { start: "-1 year", end: "now" }
+            past: { start: "-1 year", end: "now" },
         };
         if (filters.date && dateMap[filters.date]) {
             const dateRange = dateMap[filters.date];
@@ -535,61 +547,73 @@ Which would you like to do?`,
         return this.enhanceAnnouncements(announcements);
     }
     enhanceAnnouncements(rawAnnouncements) {
-        return rawAnnouncements.map(announcement => ({
+        return rawAnnouncements.map((announcement) => ({
             ...announcement,
             // Tags come as comma-separated string from public API, convert to array
             tags: Array.isArray(announcement.tags)
                 ? announcement.tags
-                : (typeof announcement.tags === 'string' && announcement.tags.trim()
-                    ? announcement.tags.split(',').map((t) => t.trim())
-                    : []),
-            summary: announcement.summary || (announcement.body ? announcement.body.replace(/<[^>]*>/g, '').substring(0, 200) + '...' : '')
+                : typeof announcement.tags === "string" && announcement.tags.trim()
+                    ? announcement.tags.split(",").map((t) => t.trim())
+                    : [],
+            summary: announcement.summary ||
+                (announcement.body
+                    ? announcement.body.replace(/<[^>]*>/g, "").substring(0, 200) + "..."
+                    : ""),
         }));
     }
     async searchAnnouncements(filters) {
         const announcements = await this.fetchAnnouncements(filters);
         const limited = filters.limit ? announcements.slice(0, filters.limit) : announcements;
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         total: announcements.length,
-                        items: limited
-                    })
-                }]
+                        items: limited,
+                    }),
+                },
+            ],
         };
     }
     // ============================================================================
     // CRUD Operations (new)
     // ============================================================================
     /**
-     * Get the acting user's UID from environment variable.
-     * This identifies who the announcement should be attributed to.
+     * Get the acting user's ACCESS ID for content attribution.
+     *
+     * Priority order:
+     * 1. X-Acting-User header (from request context)
+     * 2. ACTING_USER environment variable (fallback)
+     *
+     * Returns the ACCESS ID (e.g., "username@access-ci.org")
      */
-    getActingUserUid() {
-        const envUid = process.env.ACTING_USER_UID;
-        if (envUid) {
-            const parsed = parseInt(envUid, 10);
-            if (!isNaN(parsed)) {
-                return parsed;
-            }
+    getActingUserAccessId() {
+        // Try request context first
+        const context = getRequestContext();
+        if (context?.actingUser) {
+            return context.actingUser;
+        }
+        // Fall back to environment variable
+        const envUser = process.env.ACTING_USER;
+        if (envUser) {
+            return envUser;
         }
         throw new Error("Cannot create announcement: No acting user specified.\n\n" +
-            "The ACTING_USER_UID environment variable must be set to the Drupal user ID " +
-            "of the person creating the announcement. This should be configured by the chat system.");
+            "Either set the X-Acting-User header or the ACTING_USER environment variable " +
+            "to the ACCESS ID (e.g., username@access-ci.org) of the person creating the announcement.");
     }
     /**
      * Create a new announcement via Drupal JSON:API
+     *
+     * The X-Acting-User header (set by DrupalAuthProvider) tells Drupal which
+     * ACCESS user is creating the content. Drupal handles user resolution.
      */
     async createAnnouncement(args) {
         const auth = this.getDrupalAuth();
-        // Get the acting user - required for proper attribution
-        const actingUserUid = this.getActingUserUid();
-        const userUuid = await this.getUserUuidByUid(actingUserUid);
-        if (!userUuid) {
-            throw new Error(`Could not find user with UID ${actingUserUid}. Verify the ACTING_USER_UID is correct.`);
-        }
         // Build the JSON:API request body
+        // Note: We don't set the uid relationship - Drupal handles author attribution
+        // based on the X-Acting-User header sent with the request
         const requestBody = {
             data: {
                 type: "node--access_news",
@@ -598,21 +622,14 @@ Which would you like to do?`,
                     moderation_state: "draft", // Use content moderation workflow
                     body: {
                         value: args.body,
-                        format: "basic_html"
-                    }
+                        format: "basic_html",
+                    },
                 },
-                relationships: {
-                    uid: {
-                        data: {
-                            type: "user--user",
-                            id: userUuid
-                        }
-                    }
-                }
-            }
+                relationships: {},
+            },
         };
         // Add optional fields
-        if (args.summary) {
+        if (args.summary && requestBody.data.attributes.body) {
             requestBody.data.attributes.body.summary = args.summary;
         }
         if (args.published_date) {
@@ -620,7 +637,7 @@ Which would you like to do?`,
         }
         else {
             // Default to today
-            requestBody.data.attributes.field_published_date = new Date().toISOString().split('T')[0];
+            requestBody.data.attributes.field_published_date = new Date().toISOString().split("T")[0];
         }
         if (args.affiliation) {
             requestBody.data.attributes.field_affiliation = args.affiliation;
@@ -630,10 +647,10 @@ Which would you like to do?`,
             const tagUuids = await this.getTagUuidsByName(args.tags);
             if (tagUuids.length > 0) {
                 requestBody.data.relationships.field_tags = {
-                    data: tagUuids.map(uuid => ({
+                    data: tagUuids.map((uuid) => ({
                         type: "taxonomy_term--tags",
-                        id: uuid
-                    }))
+                        id: uuid,
+                    })),
                 };
             }
         }
@@ -644,8 +661,8 @@ Which would you like to do?`,
                 requestBody.data.relationships.field_affinity_group_node = {
                     data: {
                         type: "node--affinity_group",
-                        id: groupUuid
-                    }
+                        id: groupUuid,
+                    },
                 };
             }
             else {
@@ -656,7 +673,7 @@ Which would you like to do?`,
         if (args.external_link) {
             requestBody.data.attributes.field_news_external_link = {
                 uri: args.external_link.uri,
-                title: args.external_link.title || ""
+                title: args.external_link.title || "",
             };
         }
         // Add where to share (defaults handled by Drupal if not provided)
@@ -665,16 +682,18 @@ Which would you like to do?`,
         }
         const result = await auth.post("/jsonapi/node/access_news", requestBody);
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         success: true,
                         message: "Announcement created (draft status)",
                         uuid: result.data?.id,
                         title: result.data?.attributes?.title,
-                        edit_url: `${process.env.DRUPAL_API_URL}/node/${result.data?.attributes?.drupal_internal__nid}/edit`
-                    })
-                }]
+                        edit_url: `${process.env.DRUPAL_API_URL}/node/${result.data?.attributes?.drupal_internal__nid}/edit`,
+                    }),
+                },
+            ],
         };
     }
     /**
@@ -686,8 +705,8 @@ Which would you like to do?`,
             data: {
                 type: "node--access_news",
                 id: args.uuid,
-                attributes: {}
-            }
+                attributes: {},
+            },
         };
         // Add fields to update
         if (args.title) {
@@ -702,7 +721,7 @@ Which would you like to do?`,
             requestBody.data.attributes.body = {
                 value: args.body || existingBody,
                 format: "basic_html",
-                summary: args.summary !== undefined ? args.summary : existingSummary
+                summary: args.summary !== undefined ? args.summary : existingSummary,
             };
         }
         // If neither body nor summary provided, don't include body in request at all
@@ -717,10 +736,10 @@ Which would you like to do?`,
                     requestBody.data.relationships = {};
                 }
                 requestBody.data.relationships.field_tags = {
-                    data: tagUuids.map(uuid => ({
+                    data: tagUuids.map((uuid) => ({
                         type: "taxonomy_term--tags",
-                        id: uuid
-                    }))
+                        id: uuid,
+                    })),
                 };
             }
         }
@@ -734,8 +753,8 @@ Which would you like to do?`,
                 requestBody.data.relationships.field_affinity_group_node = {
                     data: {
                         type: "node--affinity_group",
-                        id: groupUuid
-                    }
+                        id: groupUuid,
+                    },
                 };
             }
             else {
@@ -746,7 +765,7 @@ Which would you like to do?`,
         if (args.external_link) {
             requestBody.data.attributes.field_news_external_link = {
                 uri: args.external_link.uri,
-                title: args.external_link.title || ""
+                title: args.external_link.title || "",
             };
         }
         // Update where to share if provided
@@ -757,16 +776,18 @@ Which would you like to do?`,
         const nid = result.data?.attributes?.drupal_internal__nid;
         const baseUrl = process.env.DRUPAL_API_URL;
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         success: true,
                         message: "Announcement updated",
                         uuid: result.data?.id,
                         title: result.data?.attributes?.title,
-                        edit_url: nid ? `${baseUrl}/node/${nid}/edit` : null
-                    })
-                }]
+                        edit_url: nid ? `${baseUrl}/node/${nid}/edit` : null,
+                    }),
+                },
+            ],
         };
     }
     /**
@@ -776,26 +797,30 @@ Which would you like to do?`,
         // Enforce confirmation parameter
         if (!args.confirmed) {
             return {
-                content: [{
+                content: [
+                    {
                         type: "text",
                         text: JSON.stringify({
                             error: "Deletion requires explicit confirmation. You must show the announcement title and status to the user and get explicit confirmation before setting confirmed=true.",
-                            uuid: args.uuid
-                        })
-                    }]
+                            uuid: args.uuid,
+                        }),
+                    },
+                ],
             };
         }
         const auth = this.getDrupalAuth();
         await auth.delete(`/jsonapi/node/access_news/${args.uuid}`);
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         success: true,
                         message: "Announcement deleted",
-                        uuid: args.uuid
-                    })
-                }]
+                        uuid: args.uuid,
+                    }),
+                },
+            ],
         };
     }
     /**
@@ -803,11 +828,12 @@ Which would you like to do?`,
      */
     async getMyAnnouncements(args) {
         const auth = this.getDrupalAuth();
-        // Get the acting user's UUID
-        const actingUserUid = this.getActingUserUid();
-        const userUuid = await this.getUserUuidByUid(actingUserUid);
+        // Get the acting user's UUID by looking up their ACCESS ID
+        const actingUserAccessId = this.getActingUserAccessId();
+        const userUuid = await this.getUserUuidByAccessId(actingUserAccessId);
         if (!userUuid) {
-            throw new Error(`Could not find user with UID ${actingUserUid}. Verify the ACTING_USER_UID is correct.`);
+            throw new Error(`Could not find Drupal user for ACCESS ID "${actingUserAccessId}". ` +
+                `Verify the user exists in Drupal.`);
         }
         const limit = args.limit || 25;
         const result = await auth.get(`/jsonapi/node/access_news?filter[uid.id]=${userUuid}&page[limit]=${limit}&sort=-created`);
@@ -822,30 +848,35 @@ Which would you like to do?`,
                 created: item.attributes?.created,
                 published_date: item.attributes?.field_published_date,
                 summary: item.attributes?.body?.summary ||
-                    (item.attributes?.body?.value ?
-                        item.attributes.body.value.replace(/<[^>]*>/g, '').substring(0, 200) + '...' : ''),
-                edit_url: nid ? `${baseUrl}/node/${nid}/edit` : null
+                    (item.attributes?.body?.value
+                        ? item.attributes.body.value.replace(/<[^>]*>/g, "").substring(0, 200) + "..."
+                        : ""),
+                edit_url: nid ? `${baseUrl}/node/${nid}/edit` : null,
             };
         });
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         total: announcements.length,
-                        items: announcements
-                    })
-                }]
+                        items: announcements,
+                    }),
+                },
+            ],
         };
     }
     // ============================================================================
     // Helper Methods
     // ============================================================================
     /**
-     * Get a user's UUID by their Drupal user ID (internal helper)
+     * Get a user's UUID by their ACCESS ID (e.g., "user@access-ci.org").
+     *
+     * The Drupal username should match the full ACCESS ID.
      */
-    async getUserUuidByUid(uid) {
+    async getUserUuidByAccessId(accessId) {
         const auth = this.getDrupalAuth();
-        const result = await auth.get(`/jsonapi/user/user?filter[drupal_internal__uid]=${uid}`);
+        const result = await auth.get(`/jsonapi/user/user?filter[name]=${encodeURIComponent(accessId)}`);
         if (!result.data || result.data.length === 0) {
             return null;
         }
@@ -856,30 +887,32 @@ Which would you like to do?`,
      */
     async getAnnouncementContext() {
         const auth = this.getDrupalAuth();
-        // Get the acting user's UUID
-        const actingUserUid = this.getActingUserUid();
-        const userUuid = await this.getUserUuidByUid(actingUserUid);
+        // Get the acting user's UUID by looking up their ACCESS ID
+        const actingUserAccessId = this.getActingUserAccessId();
+        const userUuid = await this.getUserUuidByAccessId(actingUserAccessId);
         if (!userUuid) {
-            throw new Error(`Could not find user with UID ${actingUserUid}`);
+            throw new Error(`Could not find Drupal user for ACCESS ID "${actingUserAccessId}". ` +
+                `Verify the user exists in Drupal.`);
         }
         // Fetch tags and affinity groups in parallel
         const [tagsResult, groupsResult] = await Promise.all([
             auth.get("/jsonapi/taxonomy_term/tags?page[limit]=100"),
-            auth.get(`/jsonapi/node/affinity_group?filter[field_coordinator.id]=${userUuid}&filter[status]=1&page[limit]=100`)
+            auth.get(`/jsonapi/node/affinity_group?filter[field_coordinator.id]=${userUuid}&filter[status]=1&page[limit]=100`),
         ]);
         const tags = (tagsResult.data || []).map((item) => ({
             name: item.attributes?.name,
-            uuid: item.id
+            uuid: item.id,
         }));
         const affinityGroups = (groupsResult.data || []).map((item) => ({
             id: item.attributes?.field_group_id,
             uuid: item.id,
             name: item.attributes?.title,
-            category: item.attributes?.field_affinity_group_category
+            category: item.attributes?.field_affinity_group_category,
         }));
         const isCoordinator = affinityGroups.length > 0;
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         tags: tags,
@@ -889,14 +922,21 @@ Which would you like to do?`,
                         where_to_share_options: [
                             { value: "Announcements page", description: "Public announcements listing" },
                             { value: "Bi-Weekly Digest", description: "ACCESS Support bi-weekly email digest" },
-                            { value: "Affinity Group page", description: "Your affinity group's page (coordinators only)" },
-                            { value: "Email to Affinity Group", description: "Direct email to affinity group members (coordinators only)" }
+                            {
+                                value: "Affinity Group page",
+                                description: "Your affinity group's page (coordinators only)",
+                            },
+                            {
+                                value: "Email to Affinity Group",
+                                description: "Direct email to affinity group members (coordinators only)",
+                            },
                         ],
                         guidance: isCoordinator
                             ? "User is an affinity group coordinator. Ask about affinity_group association and where_to_share preferences."
-                            : "User is not a coordinator. Standard announcement fields apply."
-                    })
-                }]
+                            : "User is not a coordinator. Standard announcement fields apply.",
+                    }),
+                },
+            ],
         };
     }
     /**
@@ -933,13 +973,13 @@ Which would you like to do?`,
         "email to affinity group": "email_to_your_affinity_group",
         "email to your affinity group": "email_to_your_affinity_group",
         // Also accept the raw values
-        "on_the_announcements_page": "on_the_announcements_page",
-        "in_the_access_support_bi_weekly_digest": "in_the_access_support_bi_weekly_digest",
-        "on_your_affinity_group_page": "on_your_affinity_group_page",
-        "email_to_your_affinity_group": "email_to_your_affinity_group",
+        on_the_announcements_page: "on_the_announcements_page",
+        in_the_access_support_bi_weekly_digest: "in_the_access_support_bi_weekly_digest",
+        on_your_affinity_group_page: "on_your_affinity_group_page",
+        email_to_your_affinity_group: "email_to_your_affinity_group",
     };
     normalizeWhereToShare(values) {
-        return values.map(v => {
+        return values.map((v) => {
             const normalized = AnnouncementsServer.WHERE_TO_SHARE_MAP[v.toLowerCase()];
             if (!normalized) {
                 throw new Error(`Invalid where_to_share value: "${v}". ` +