@access-mcp/announcements 0.3.1 → 0.5.0

package/dist/server.d.ts

@@ -57,19 +57,32 @@ export declare class AnnouncementsServer extends BaseAccessServer {
      */
     private deleteAnnouncement;
     /**
-     * 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.
      */
     private getMyAnnouncements;
     /**
-     * Get a user's UUID by their ACCESS ID (e.g., "user@access-ci.org").
+     * Get announcement context - tags, affinity groups, and options for creating announcements.
      *
-     * The Drupal username should match the full ACCESS ID.
+     * 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.
      */
-    private getUserUuidByAccessId;
+    private getAnnouncementContext;
     /**
-     * Get announcement context - tags, affinity groups, and options for creating announcements
+     * Suggest tags for announcement content using Drupal's AI tag suggestion service.
      */
-    private getAnnouncementContext;
+    private static readonly JSON_HEADERS;
+    private suggestTags;
+    /**
+     * Generate a summary for announcement content using Drupal's AI summary service.
+     */
+    private suggestSummary;
     /**
      * Look up affinity group UUID by ID or name
      */
@@ -90,5 +103,5 @@ export declare class AnnouncementsServer extends BaseAccessServer {
     /**
      * Get tag UUIDs by their names (with caching)
      */
-    private getTagUuidsByName;
+    private resolveTagNames;
 }

package/dist/server.js

@@ -77,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):
@@ -93,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):
 ---
@@ -147,7 +150,7 @@ ALWAYS display the edit_url to the user so they can review their draft in Drupal
                         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",
@@ -297,18 +300,49 @@ Use this to:
                 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: {},
                 },
             },
+            {
+                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() {
@@ -361,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:**
 
@@ -461,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}`);
             }
@@ -599,9 +637,9 @@ Which would you like to do?`,
         if (envUser) {
             return envUser;
         }
-        throw new Error("Cannot create announcement: No acting user specified.\n\n" +
-            "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.");
+        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
@@ -643,8 +681,10 @@ Which would you like to do?`,
             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) => ({
@@ -681,17 +721,21 @@ 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: [
                 {
                     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),
                 },
             ],
         };
@@ -729,8 +773,10 @@ 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 = {};
@@ -775,17 +821,21 @@ 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: [
                 {
                     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),
                 },
             ],
         };
@@ -824,19 +874,19 @@ Which would you like to do?`,
         };
     }
     /**
-     * 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 by looking up their ACCESS ID
-        const actingUserAccessId = this.getActingUserAccessId();
-        const userUuid = await this.getUserUuidByAccessId(actingUserAccessId);
-        if (!userUuid) {
-            throw new Error(`Could not find Drupal user for ACCESS ID "${actingUserAccessId}". ` +
-                `Verify the user exists in Drupal.`);
-        }
+        // 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;
@@ -870,39 +920,20 @@ Which would you like to do?`,
     // Helper Methods
     // ============================================================================
     /**
-     * Get a user's UUID by their ACCESS ID (e.g., "user@access-ci.org").
+     * Get announcement context - tags, affinity groups, and options for creating announcements.
      *
-     * The Drupal username should match the full ACCESS ID.
-     */
-    async getUserUuidByAccessId(accessId) {
-        const auth = this.getDrupalAuth();
-        const result = await auth.get(`/jsonapi/user/user?filter[name]=${encodeURIComponent(accessId)}`);
-        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
+     * 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 by looking up their ACCESS ID
-        const actingUserAccessId = this.getActingUserAccessId();
-        const userUuid = await this.getUserUuidByAccessId(actingUserAccessId);
-        if (!userUuid) {
-            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`),
-        ]);
-        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,
@@ -915,7 +946,6 @@ Which would you like to do?`,
                 {
                     type: "text",
                     text: JSON.stringify({
-                        tags: tags,
                         affinity_groups: affinityGroups,
                         is_coordinator: isCoordinator,
                         affiliations: ["ACCESS Collaboration", "Community"],
@@ -939,6 +969,58 @@ Which would you like to do?`,
             ],
         };
     }
+    /**
+     * 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
      */
@@ -999,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 };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@access-mcp/announcements",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "description": "MCP server for ACCESS Support Announcements API",
   "type": "module",
   "main": "dist/index.js",
@@ -26,8 +26,8 @@
   "author": "ACCESS-CI",
   "license": "MIT",
   "dependencies": {
-    "@access-mcp/shared": "*",
-    "@modelcontextprotocol/sdk": "^0.5.0",
+    "@access-mcp/shared": "^0.9.0",
+    "@modelcontextprotocol/sdk": "^1.28.0",
     "axios": "^1.7.0"
   },
   "devDependencies": {

package/src/server.test.ts

@@ -61,6 +61,7 @@ describe("AnnouncementsServer", () => {
               author: "ACCESS Support",
               tags: ["maintenance", "scheduled"],
               affinity_group: ["123", "456"],
+              url: "https://support.access-ci.org/announcements/scheduled-maintenance",
             },
             {
               title: "New GPU Nodes Available",
@@ -69,6 +70,7 @@ describe("AnnouncementsServer", () => {
               author: "Resource Team",
               tags: ["gpu", "hardware"],
               affinity_group: ["789"],
+              url: "https://support.access-ci.org/announcements/new-gpu-nodes-available",
             },
           ],
         };
@@ -195,6 +197,7 @@ describe("AnnouncementsServer", () => {
               author: "Support",
               tags: ["gpu", "maintenance"],
               affinity_group: [],
+              url: "https://support.access-ci.org/announcements/gpu-maintenance",
             },
           ],
         };
@@ -232,6 +235,7 @@ describe("AnnouncementsServer", () => {
               published_date: "2024-03-14",
               tags: ["ai"],
               affinity_group: [],
+              url: "https://support.access-ci.org/announcements/update-1",
             },
           ],
         };
@@ -268,6 +272,7 @@ describe("AnnouncementsServer", () => {
               author: "Admin",
               tags: ["urgent"],
               affinity_group: [],
+              url: "https://support.access-ci.org/announcements/todays-update",
             },
           ],
         };
@@ -367,6 +372,7 @@ describe("AnnouncementsServer", () => {
             published_date: "2024-03-15",
             tags: ["tag1", "tag2", "tag3"],
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/test",
           },
         ],
       };
@@ -394,6 +400,7 @@ describe("AnnouncementsServer", () => {
             published_date: "2024-03-15",
             tags: "gpu, machine-learning, hpc",
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/test",
           },
         ],
       };
@@ -421,6 +428,7 @@ describe("AnnouncementsServer", () => {
             published_date: "2024-03-15",
             tags: "",
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/test",
           },
         ],
       };
@@ -448,20 +456,23 @@ describe("AnnouncementsServer", () => {
             published_date: "2024-03-15",
             tags: ["gpu", "maintenance"],
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/1",
           },
           {
             title: "2",
             published_date: "2024-03-14",
             tags: ["gpu", "network"],
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/2",
           },
           {
             title: "3",
             published_date: "2024-03-13",
             tags: ["gpu", "storage"],
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/3",
           },
-          { title: "4", published_date: "2024-03-12", tags: ["maintenance"], affinity_group: [] },
+          { title: "4", published_date: "2024-03-12", tags: ["maintenance"], affinity_group: [], url: "https://support.access-ci.org/announcements/4" },
         ],
       };
 
@@ -489,6 +500,7 @@ describe("AnnouncementsServer", () => {
             published_date: "2024-03-15",
             tags: [],
             affinity_group: [],
+            url: "https://support.access-ci.org/announcements/test",
           },
         ],
       };
@@ -604,6 +616,7 @@ describe("AnnouncementsServer", () => {
             { id: "tag-uuid-2", attributes: { name: "maintenance" } },
             { id: "tag-uuid-3", attributes: { name: "hpc" } },
           ],
+          links: {},
         });
 
         mockDrupalAuth.post.mockResolvedValue({
@@ -627,7 +640,7 @@ describe("AnnouncementsServer", () => {
         });
 
         expect(mockDrupalAuth.get).toHaveBeenCalledWith(
-          "/jsonapi/taxonomy_term/tags?page[limit]=500"
+          "/jsonapi/taxonomy_term/tags?page[limit]=50"
         );
 
         expect(mockDrupalAuth.post).toHaveBeenCalledWith(
@@ -1265,14 +1278,7 @@ describe("AnnouncementsServer", () => {
     });
 
     describe("get_announcement_context", () => {
-      it("should fetch tags and affinity groups without user UUID lookup", async () => {
-        // Two parallel calls only — no user UUID lookup
-        mockDrupalAuth.get.mockResolvedValueOnce({
-          data: [
-            { id: "tag-1", attributes: { name: "gpu" } },
-            { id: "tag-2", attributes: { name: "hpc" } },
-          ],
-        });
+      it("should fetch affinity groups without tags", async () => {
         mockDrupalAuth.get.mockResolvedValueOnce({
           data: [
             {
@@ -1294,24 +1300,17 @@ describe("AnnouncementsServer", () => {
           },
         });
 
-        // Exactly 2 calls — tags + views affinity groups, no user lookup
-        expect(mockDrupalAuth.get).toHaveBeenCalledTimes(2);
-        expect(mockDrupalAuth.get).toHaveBeenCalledWith(
-          "/jsonapi/taxonomy_term/tags?page[limit]=100"
-        );
+        // Only 1 call — affinity groups view, no tags fetch
+        expect(mockDrupalAuth.get).toHaveBeenCalledTimes(1);
         expect(mockDrupalAuth.get).toHaveBeenCalledWith(
           "/jsonapi/views/mcp_my_affinity_groups/page_1"
         );
 
         const responseData = JSON.parse((result.content[0] as TextContent).text);
-        expect(responseData.tags).toHaveLength(2);
-        expect(responseData.tags[0].name).toBe("gpu");
-        expect(responseData.tags[1].name).toBe("hpc");
+        // Should NOT return tags
+        expect(responseData).not.toHaveProperty("tags");
         expect(responseData.affinity_groups).toHaveLength(1);
         expect(responseData.affinity_groups[0].name).toBe("Test Group");
-        expect(responseData.affinity_groups[0].id).toBe(123);
-        expect(responseData.affinity_groups[0].uuid).toBe("group-uuid-1");
-        expect(responseData.affinity_groups[0].category).toBe("Research");
         expect(responseData.is_coordinator).toBe(true);
         expect(responseData.affiliations).toContain("ACCESS Collaboration");
         expect(responseData.affiliations).toContain("Community");
@@ -1320,9 +1319,6 @@ describe("AnnouncementsServer", () => {
       });
 
       it("should indicate non-coordinator when views returns no affinity groups", async () => {
-        mockDrupalAuth.get.mockResolvedValueOnce({
-          data: [{ id: "tag-1", attributes: { name: "gpu" } }],
-        });
         mockDrupalAuth.get.mockResolvedValueOnce({
           data: [],
         });
@@ -1354,14 +1350,12 @@ describe("AnnouncementsServer", () => {
 
         const responseData = JSON.parse((result.content[0] as TextContent).text);
         expect(responseData.error).toContain("No acting user specified");
-        // Should not have made any API calls
         expect(mockDrupalAuth.get).not.toHaveBeenCalled();
       });
 
       it("should use acting user from request context", async () => {
         delete process.env.ACTING_USER;
 
-        mockDrupalAuth.get.mockResolvedValueOnce({ data: [] });
         mockDrupalAuth.get.mockResolvedValueOnce({ data: [] });
 
         const context: RequestContext = {
@@ -1378,11 +1372,116 @@ describe("AnnouncementsServer", () => {
           });
         });
 
-        // Should succeed — acting user from request context
         const responseData = JSON.parse((result.content[0] as TextContent).text);
-        expect(responseData.tags).toHaveLength(0);
+        expect(responseData).not.toHaveProperty("tags");
         expect(responseData.is_coordinator).toBe(false);
-        expect(mockDrupalAuth.get).toHaveBeenCalledTimes(2);
+        expect(mockDrupalAuth.get).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe("suggest_tags", () => {
+      it("should return error when text is too short", async () => {
+        const result = await server["handleToolCall"]({
+          method: "tools/call",
+          params: {
+            name: "suggest_tags",
+            arguments: { text: "Short text" },
+          },
+        });
+
+        const responseData = JSON.parse((result.content[0] as TextContent).text);
+        expect(responseData.error).toContain("at least 100 characters");
+      });
+
+      it("should return error when text is empty", async () => {
+        const result = await server["handleToolCall"]({
+          method: "tools/call",
+          params: {
+            name: "suggest_tags",
+            arguments: { text: "" },
+          },
+        });
+
+        const responseData = JSON.parse((result.content[0] as TextContent).text);
+        expect(responseData.error).toContain("at least 100 characters");
+      });
+
+      it("should return suggested tags on success", async () => {
+        const longText = "A".repeat(150);
+        mockDrupalAuth.post.mockResolvedValueOnce({
+          tags: [
+            { tid: 1, name: "ai", uuid: "uuid-1" },
+            { tid: 2, name: "hpc", uuid: "uuid-2" },
+          ],
+        });
+
+        const result = await server["handleToolCall"]({
+          method: "tools/call",
+          params: {
+            name: "suggest_tags",
+            arguments: { text: longText },
+          },
+        });
+
+        const responseData = JSON.parse((result.content[0] as TextContent).text);
+        expect(responseData.suggested_tags).toEqual(["ai", "hpc"]);
+        expect(responseData.tag_details).toHaveLength(2);
+      });
+
+      it("should truncate results to the specified limit", async () => {
+        const longText = "A".repeat(150);
+        mockDrupalAuth.post.mockResolvedValueOnce({
+          tags: [
+            { tid: 1, name: "ai", uuid: "uuid-1" },
+            { tid: 2, name: "hpc", uuid: "uuid-2" },
+            { tid: 3, name: "gpu", uuid: "uuid-3" },
+          ],
+        });
+
+        const result = await server["handleToolCall"]({
+          method: "tools/call",
+          params: {
+            name: "suggest_tags",
+            arguments: { text: longText, limit: 2 },
+          },
+        });
+
+        const responseData = JSON.parse((result.content[0] as TextContent).text);
+        expect(responseData.suggested_tags).toHaveLength(2);
+        expect(responseData.tag_details).toHaveLength(2);
+      });
+    });
+
+    describe("suggest_summary", () => {
+      it("should return error when text is too short", async () => {
+        const result = await server["handleToolCall"]({
+          method: "tools/call",
+          params: {
+            name: "suggest_summary",
+            arguments: { text: "Short text" },
+          },
+        });
+
+        const responseData = JSON.parse((result.content[0] as TextContent).text);
+        expect(responseData.error).toContain("at least 100 characters");
+      });
+
+      it("should return summary on success", async () => {
+        const longText = "A".repeat(150);
+        mockDrupalAuth.post.mockResolvedValueOnce({
+          summary: "A test summary of the content.",
+        });
+
+        const result = await server["handleToolCall"]({
+          method: "tools/call",
+          params: {
+            name: "suggest_summary",
+            arguments: { text: longText },
+          },
+        });
+
+        const responseData = JSON.parse((result.content[0] as TextContent).text);
+        expect(responseData.summary).toBe("A test summary of the content.");
       });
     });
   });

package/src/server.ts

@@ -210,7 +210,8 @@ export class AnnouncementsServer extends BaseAccessServer {
             },
             tags: {
               type: "string",
-              description: "Filter by topics: gpu, ml, hpc",
+              description:
+                "Filter by tag name. Examples: gpu, ml, hpc, open-ondemand, ACCESS-allocations, ACCESS-account, ai, pegasus. Use suggest_tags to discover tags from announcement content.",
             },
             date: {
               type: "string",
@@ -232,12 +233,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):
@@ -248,19 +249,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):
 ---
@@ -304,7 +308,7 @@ ALWAYS display the edit_url to the user so they can review their draft in Drupal
               type: "array",
               items: { type: "string" },
               description:
-                "Tag names (1-6 required for publication). Use list_available_tags to find valid tags.",
+                'Tag names as strings, e.g. ["ai", "machine-learning", "gpu"]. Get these from the "name" field in suggest_tags response.',
             },
             affiliation: {
               type: "string",
@@ -458,18 +462,49 @@ Use this to:
         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: {},
         },
       },
+      {
+        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"],
+        },
+      },
     ];
   }
 
@@ -530,9 +565,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:**
 
@@ -636,6 +671,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 as { text: string; limit?: number });
+        case "suggest_summary":
+          return await this.suggestSummary(args as { text: string });
 
         default:
           return this.errorResponse(`Unknown tool: ${name}`);
@@ -793,9 +832,9 @@ Which would you like to do?`,
     }
 
     throw new Error(
-      "Cannot create announcement: No acting user specified.\n\n" +
-        "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."
+      "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."
     );
   }
 
@@ -843,8 +882,10 @@ Which would you like to do?`,
     }
 
     // Look up tag UUIDs if tags provided
+    const unmatchedTags: string[] = [];
     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) => ({
@@ -889,17 +930,23 @@ Which would you like to do?`,
 
     const result = await auth.post("/jsonapi/node/access_news", requestBody);
 
+    const response: Record<string, unknown> = {
+      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: [
         {
           type: "text" as const,
-          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),
         },
       ],
     };
@@ -944,8 +991,10 @@ Which would you like to do?`,
     }
 
     // Update tags if provided
+    const unmatchedTags: string[] = [];
     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 = {};
@@ -998,17 +1047,23 @@ Which would you like to do?`,
     const nid = result.data?.attributes?.drupal_internal__nid;
     const baseUrl = process.env.DRUPAL_API_URL;
 
+    const response: Record<string, unknown> = {
+      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: [
         {
           type: "text" as const,
-          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),
         },
       ],
     };
@@ -1121,18 +1176,9 @@ Which would you like to do?`,
     // Ensure acting user is set (will throw if not available)
     this.getActingUserAccessId();
 
-    // Fetch tags and affinity groups in parallel
-    // Tags use standard JSON:API; affinity groups use a views endpoint
-    // that resolves X-Acting-User to the coordinator filter automatically
-    const [tagsResult, groupsResult] = await Promise.all([
-      auth.get("/jsonapi/taxonomy_term/tags?page[limit]=100"),
-      auth.get("/jsonapi/views/mcp_my_affinity_groups/page_1"),
-    ]);
-
-    const tags = (tagsResult.data || []).map((item: JsonApiResourceItem) => ({
-      name: item.attributes?.name,
-      uuid: item.id,
-    }));
+    // 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: JsonApiResourceItem) => ({
       id: item.attributes?.field_group_id,
@@ -1148,7 +1194,6 @@ Which would you like to do?`,
         {
           type: "text" as const,
           text: JSON.stringify({
-            tags: tags,
             affinity_groups: affinityGroups,
             is_coordinator: isCoordinator,
             affiliations: ["ACCESS Collaboration", "Community"],
@@ -1173,6 +1218,67 @@ Which would you like to do?`,
     };
   }
 
+  /**
+   * Suggest tags for announcement content using Drupal's AI tag suggestion service.
+   */
+  private static readonly JSON_HEADERS = {
+    "Content-Type": "application/json",
+    Accept: "application/json",
+  };
+
+  private async suggestTags(args: { text: string; limit?: number }): Promise<CallToolResult> {
+    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" as const,
+          text: JSON.stringify({
+            suggested_tags: tags.map((t: { name: string; uuid: string }) => 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.
+   */
+  private async suggestSummary(args: { text: string }): Promise<CallToolResult> {
+    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" as const,
+          text: JSON.stringify({ summary: result.summary }),
+        }],
+      };
+    }
+
+    return this.errorResponse(result.error || "Summary generation failed");
+  }
+
   /**
    * Look up affinity group UUID by ID or name
    */
@@ -1249,36 +1355,64 @@ Which would you like to do?`,
    */
   private async populateTagCache(): Promise<void> {
     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: string | null = "/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.tagCacheExpiry = new Date(Date.now() + AnnouncementsServer.TAG_CACHE_TTL_MS);
+      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
+    }
   }
 
   /**
    * Get tag UUIDs by their names (with caching)
    */
-  private async getTagUuidsByName(tagNames: string[]): Promise<string[]> {
+  private async resolveTagNames(tagNames: string[]): Promise<{ uuids: string[]; unmatched: string[] }> {
     // Ensure cache is populated
     if (!this.isTagCacheValid()) {
       await this.populateTagCache();
     }
 
     const uuids: string[] = [];
+    const unmatched: string[] = [];
     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 };
   }
 }