@access-mcp/announcements 0.3.0 → 0.5.0

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)
             {
@@ -65,12 +77,12 @@ export class AnnouncementsServer extends BaseAccessServer {
                 description: `Create a new ACCESS announcement (saved as draft for staff review).
 
 BEFORE CALLING:
-1. Call get_announcement_context first to get tags, check coordinator status, and tailor the conversation.
+1. Call get_announcement_context to check coordinator status.
 2. Gather information - either conversationally OR by parsing pasted content:
    - title (required): Clear, specific headline
    - body (required): Full content with details, dates, links. HTML supported.
    - summary (required): 1-2 sentence teaser for listings
-   - tags (recommended): 1-6 tags help users find it
+   - tags (required): Call suggest_tags with the body text to get tag suggestions, then include them
    - affiliation (optional): "ACCESS Collaboration" or "Community" (default)
    - external_link (if relevant): URL and link text for external references
 3. IF user is a coordinator (check get_announcement_context response):
@@ -81,19 +93,22 @@ WORKFLOW:
 If user pastes content (event description, draft text, etc.):
 1. Call get_announcement_context
 2. Parse the pasted content to extract title, body, dates, links, etc.
-3. Match content to available tags from context
-4. Ask only about missing/unclear fields
-5. If coordinator: ask about affinity group and where to share
-6. Show preview and get confirmation
-7. Create the announcement
+3. Call suggest_tags with the body text — include returned tag names in the tags parameter
+4. Call suggest_summary with the body text if no summary provided
+5. Ask only about missing/unclear fields
+6. If coordinator: ask about affinity group and where to share
+7. Show preview (including tags) and get confirmation
+8. Create the announcement with ALL fields including tags
 
 If user describes what they want conversationally:
 1. Call get_announcement_context
 2. Guide them through providing title, body, summary
-3. Suggest relevant tags from context
+3. Call suggest_tags with the body text — include returned tag names in the tags parameter
 4. If coordinator: ask about affinity group and where to share
-5. Show preview and get confirmation
-6. Create the announcement
+5. Show preview (including tags) and get confirmation
+6. Create the announcement with ALL fields including tags
+
+IMPORTANT: Always pass the tags parameter when creating. Tags from suggest_tags are tag names (strings) — pass them as the tags array.
 
 PREVIEW FORMAT (show before creating):
 ---
@@ -118,51 +133,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 as strings, e.g. ["ai", "machine-learning", "gpu"]. Get these from the "name" field in suggest_tags response.',
                         },
                         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 +196,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 +263,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,28 +290,59 @@ Use this to:
                         limit: {
                             type: "number",
                             description: "Max results (default: 25)",
-                            default: 25
-                        }
-                    }
-                }
+                            default: 25,
+                        },
+                    },
+                },
             },
             {
                 name: "get_announcement_context",
                 description: `Get user context and options BEFORE creating an announcement. Call this first.
 
 Returns:
-- tags: Available tags for announcements [{name, uuid}]
 - affinity_groups: Groups the user coordinates (empty if not a coordinator)
 - is_coordinator: Boolean - if true, ask about affinity_group and where_to_share
 - affiliations: Available affiliation options
 - where_to_share_options: Available sharing options (only relevant for coordinators)
 
-Use this to tailor the announcement creation conversation based on the user's role.`,
+Does NOT return tags — use suggest_tags after the user provides content.`,
                 inputSchema: {
                     type: "object",
-                    properties: {}
-                }
-            }
+                    properties: {},
+                },
+            },
+            {
+                name: "suggest_tags",
+                description: `Suggest relevant tags for announcement content. Call this AFTER the user provides their announcement body text. Returns {tags: [{tid, name, uuid}]}. Pass the "name" values as the tags array when calling create_announcement or update_announcement.`,
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        text: {
+                            type: "string",
+                            description: "The announcement body text to analyze for tag suggestions. Must be at least 100 characters.",
+                        },
+                        limit: {
+                            type: "number",
+                            description: "Maximum number of tags to suggest (default: 6)",
+                        },
+                    },
+                    required: ["text"],
+                },
+            },
+            {
+                name: "suggest_summary",
+                description: `Generate a concise summary for announcement content. Call this to auto-generate a summary from the announcement body. Returns a summary of up to 150 characters.`,
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        text: {
+                            type: "string",
+                            description: "The announcement body text to summarize. Must be at least 100 characters.",
+                        },
+                    },
+                    required: ["text"],
+                },
+            },
         ];
     }
     getResources() {
@@ -305,8 +351,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() {
@@ -349,9 +395,9 @@ Use this to tailor the announcement creation conversation based on the user's ro
                         role: "assistant",
                         content: {
                             type: "text",
-                            text: `I'll help you create an ACCESS announcement. Let me first check your available options and coordinator status.
+                            text: `I'll help you create an ACCESS announcement. Let me check your options first.
 
-First, I'll call \`get_announcement_context\` to see what tags are available and whether you coordinate any affinity groups.
+Once you provide the content, I'll suggest relevant tags and generate a summary automatically.
 
 **Required Information:**
 
@@ -449,6 +495,10 @@ Which would you like to do?`,
                 // Helper operations
                 case "get_announcement_context":
                     return await this.getAnnouncementContext();
+                case "suggest_tags":
+                    return await this.suggestTags(args);
+                case "suggest_summary":
+                    return await this.suggestSummary(args);
                 default:
                     return this.errorResponse(`Unknown tool: ${name}`);
             }
@@ -468,9 +518,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 +530,9 @@ Which would you like to do?`,
                         {
                             uri,
                             mimeType: "text/plain",
-                            text: `Error loading announcements: ${message}`
-                        }
-                    ]
+                            text: `Error loading announcements: ${message}`,
+                        },
+                    ],
                 };
             }
         }
@@ -514,7 +564,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 +585,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.");
+        throw new Error("Authentication required: No acting user specified.\n\n" +
+            "Please authenticate with your ACCESS-CI credentials to use this tool. " +
+            "If using Claude, add this server as an authenticated connector via Customize > Connectors.");
     }
     /**
      * 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 +660,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,20 +675,22 @@ 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;
         }
         // Look up tag UUIDs if tags provided
+        const unmatchedTags = [];
         if (args.tags && args.tags.length > 0) {
-            const tagUuids = await this.getTagUuidsByName(args.tags);
+            const { uuids: tagUuids, unmatched } = await this.resolveTagNames(args.tags);
+            unmatchedTags.push(...unmatched);
             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 +701,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 +713,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)
@@ -664,17 +721,23 @@ Which would you like to do?`,
             requestBody.data.attributes.field_choose_where_to_share_this = this.normalizeWhereToShare(args.where_to_share);
         }
         const result = await auth.post("/jsonapi/node/access_news", requestBody);
+        const response = {
+            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`,
+        };
+        if (unmatchedTags.length > 0) {
+            response.warning = `These tags were not found and were skipped: ${unmatchedTags.join(", ")}. Use suggest_tags to get valid tag names.`;
+        }
         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`
-                    })
-                }]
+                    text: JSON.stringify(response),
+                },
+            ],
         };
     }
     /**
@@ -686,8 +749,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 +765,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
@@ -710,17 +773,19 @@ Which would you like to do?`,
             requestBody.data.attributes.field_published_date = args.published_date;
         }
         // Update tags if provided
+        const unmatchedTags = [];
         if (args.tags && args.tags.length > 0) {
-            const tagUuids = await this.getTagUuidsByName(args.tags);
+            const { uuids: tagUuids, unmatched } = await this.resolveTagNames(args.tags);
+            unmatchedTags.push(...unmatched);
             if (tagUuids.length > 0) {
                 if (!requestBody.data.relationships) {
                     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 +799,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 +811,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
@@ -756,17 +821,23 @@ Which would you like to do?`,
         const result = await auth.patch(`/jsonapi/node/access_news/${args.uuid}`, requestBody);
         const nid = result.data?.attributes?.drupal_internal__nid;
         const baseUrl = process.env.DRUPAL_API_URL;
+        const response = {
+            success: true,
+            message: "Announcement updated",
+            uuid: result.data?.id,
+            title: result.data?.attributes?.title,
+            edit_url: nid ? `${baseUrl}/node/${nid}/edit` : null,
+        };
+        if (unmatchedTags.length > 0) {
+            response.warning = `These tags were not found and were skipped: ${unmatchedTags.join(", ")}. Use suggest_tags to get valid tag names.`;
+        }
         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
-                    })
-                }]
+                    text: JSON.stringify(response),
+                },
+            ],
         };
     }
     /**
@@ -776,41 +847,46 @@ 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,
+                    }),
+                },
+            ],
         };
     }
     /**
-     * Get announcements created by the acting user
+     * Get announcements created by the acting user.
+     *
+     * Uses a Drupal Views page display exposed via jsonapi_views at
+     * /jsonapi/views/mcp_my_announcements/page_1.
+     * The JsonApiViewsUserParameterSubscriber resolves X-Acting-User header to uid
+     * and injects it as the contextual filter argument, so no user UUID lookup is needed.
      */
     async getMyAnnouncements(args) {
         const auth = this.getDrupalAuth();
-        // Get the acting user's UUID
-        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.`);
-        }
+        // Ensure acting user is set (will throw if not available)
+        this.getActingUserAccessId();
         const limit = args.limit || 25;
-        const result = await auth.get(`/jsonapi/node/access_news?filter[uid.id]=${userUuid}&page[limit]=${limit}&sort=-created`);
+        const result = await auth.get(`/jsonapi/views/mcp_my_announcements/page_1?page[limit]=${limit}`);
         const baseUrl = process.env.DRUPAL_API_URL;
         const announcements = (result.data || []).map((item) => {
             const nid = item.attributes?.drupal_internal__nid;
@@ -822,83 +898,129 @@ 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)
-     */
-    async getUserUuidByUid(uid) {
-        const auth = this.getDrupalAuth();
-        const result = await auth.get(`/jsonapi/user/user?filter[drupal_internal__uid]=${uid}`);
-        if (!result.data || result.data.length === 0) {
-            return null;
-        }
-        return result.data[0].id;
-    }
-    /**
-     * Get announcement context - tags, affinity groups, and options for creating announcements
+     * Get announcement context - tags, affinity groups, and options for creating announcements.
+     *
+     * Uses a Drupal Views page display exposed via jsonapi_views at
+     * /jsonapi/views/mcp_my_affinity_groups/page_1 for affinity groups lookup.
+     * The JsonApiViewsUserParameterSubscriber resolves X-Acting-User header to uid,
+     * so no user UUID lookup is needed.
      */
     async getAnnouncementContext() {
         const auth = this.getDrupalAuth();
-        // Get the acting user's UUID
-        const actingUserUid = this.getActingUserUid();
-        const userUuid = await this.getUserUuidByUid(actingUserUid);
-        if (!userUuid) {
-            throw new Error(`Could not find user with UID ${actingUserUid}`);
-        }
-        // 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`)
-        ]);
-        const tags = (tagsResult.data || []).map((item) => ({
-            name: item.attributes?.name,
-            uuid: item.id
-        }));
+        // Ensure acting user is set (will throw if not available)
+        this.getActingUserAccessId();
+        // Fetch affinity groups the user coordinates.
+        // Tags are NOT fetched here — use suggest_tags tool after the user provides content.
+        const groupsResult = await auth.get("/jsonapi/views/mcp_my_affinity_groups/page_1");
         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,
                         affinity_groups: affinityGroups,
                         is_coordinator: isCoordinator,
                         affiliations: ["ACCESS Collaboration", "Community"],
                         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.",
+                    }),
+                },
+            ],
         };
     }
+    /**
+     * Suggest tags for announcement content using Drupal's AI tag suggestion service.
+     */
+    static JSON_HEADERS = {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+    };
+    async suggestTags(args) {
+        if (!args.text || args.text.length < 100) {
+            return this.errorResponse("Text must be at least 100 characters for tag suggestions.");
+        }
+        const auth = this.getDrupalAuth();
+        const limit = args.limit || 6;
+        const result = await auth.post("/api/suggest-tags", {
+            text: args.text,
+            limit,
+        }, AnnouncementsServer.JSON_HEADERS);
+        if (result.tags) {
+            const tags = result.tags.slice(0, limit);
+            return {
+                content: [{
+                        type: "text",
+                        text: JSON.stringify({
+                            suggested_tags: tags.map((t) => t.name),
+                            tag_details: tags,
+                        }),
+                    }],
+            };
+        }
+        return this.errorResponse(result.error || "Tag suggestion failed");
+    }
+    /**
+     * Generate a summary for announcement content using Drupal's AI summary service.
+     */
+    async suggestSummary(args) {
+        if (!args.text || args.text.length < 100) {
+            return this.errorResponse("Text must be at least 100 characters for summary generation.");
+        }
+        const auth = this.getDrupalAuth();
+        const result = await auth.post("/api/suggest-summary", {
+            text: args.text,
+        }, AnnouncementsServer.JSON_HEADERS);
+        if (result.summary) {
+            return {
+                content: [{
+                        type: "text",
+                        text: JSON.stringify({ summary: result.summary }),
+                    }],
+            };
+        }
+        return this.errorResponse(result.error || "Summary generation failed");
+    }
     /**
      * Look up affinity group UUID by ID or name
      */
@@ -933,13 +1055,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}". ` +
@@ -959,31 +1081,63 @@ Which would you like to do?`,
      */
     async populateTagCache() {
         const auth = this.getDrupalAuth();
-        const result = await auth.get("/jsonapi/taxonomy_term/tags?page[limit]=500");
-        this.tagCache.clear();
-        for (const item of result.data || []) {
-            const name = item.attributes?.name?.toLowerCase();
-            if (name && item.id) {
-                this.tagCache.set(name, item.id);
+        try {
+            this.tagCache.clear();
+            let url = "/jsonapi/taxonomy_term/tags?page[limit]=50";
+            let pageCount = 0;
+            const MAX_PAGES = 100;
+            while (url && pageCount < MAX_PAGES) {
+                pageCount++;
+                const result = await auth.get(url);
+                for (const item of result.data || []) {
+                    const name = item.attributes?.name?.toLowerCase();
+                    if (name && item.id) {
+                        this.tagCache.set(name, item.id);
+                    }
+                }
+                // Follow pagination links
+                const nextHref = result.links?.next?.href;
+                if (nextHref) {
+                    try {
+                        const parsed = new URL(nextHref);
+                        url = parsed.pathname + parsed.search;
+                    }
+                    catch {
+                        url = nextHref; // Already a relative path
+                    }
+                }
+                else {
+                    url = null;
+                }
             }
+            this.logger.info("Tag cache populated", { count: this.tagCache.size });
+            this.tagCacheExpiry = new Date(Date.now() + AnnouncementsServer.TAG_CACHE_TTL_MS);
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            this.logger.error("Failed to populate tag cache", { error: msg });
+            this.tagCache.clear(); // Don't leave partial data
         }
-        this.tagCacheExpiry = new Date(Date.now() + AnnouncementsServer.TAG_CACHE_TTL_MS);
     }
     /**
      * Get tag UUIDs by their names (with caching)
      */
-    async getTagUuidsByName(tagNames) {
+    async resolveTagNames(tagNames) {
         // Ensure cache is populated
         if (!this.isTagCacheValid()) {
             await this.populateTagCache();
         }
         const uuids = [];
+        const unmatched = [];
         for (const name of tagNames) {
             const uuid = this.tagCache.get(name.toLowerCase());
             if (uuid) {
                 uuids.push(uuid);
             }
+            else {
+                unmatched.push(name);
+            }
         }
-        return uuids;
+        return { uuids, unmatched };
     }
 }