@access-mcp/announcements 0.3.0 → 0.5.0

package/src/server.ts

@@ -1,5 +1,18 @@
-import { BaseAccessServer, Tool, Resource, CallToolResult, DrupalAuthProvider } from "@access-mcp/shared";
-import { CallToolRequest, ReadResourceRequest, ReadResourceResult, GetPromptResult, Prompt } from "@modelcontextprotocol/sdk/types.js";
+import {
+  BaseAccessServer,
+  Tool,
+  Resource,
+  CallToolResult,
+  DrupalAuthProvider,
+  getRequestContext,
+} from "@access-mcp/shared";
+import {
+  CallToolRequest,
+  ReadResourceRequest,
+  ReadResourceResult,
+  GetPromptResult,
+  Prompt,
+} from "@modelcontextprotocol/sdk/types.js";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const { version } = require("../package.json");
@@ -29,12 +42,12 @@ interface AnnouncementFilters {
 }
 
 interface Announcement {
-  uuid?: string;  // Added in API v2.2 update
+  uuid?: string; // Added in API v2.2 update
   title: string;
   body: string;
   published_date: string;
   affinity_group: string | string[];
-  tags: string | string[];  // API returns comma-separated string, we convert to array
+  tags: string | string[]; // API returns comma-separated string, we convert to array
   affiliation: string;
   summary?: string;
 }
@@ -72,6 +85,66 @@ interface GetMyAnnouncementsArgs {
   limit?: number;
 }
 
+// JSON:API request/response types for Drupal
+interface JsonApiRelationshipData {
+  type: string;
+  id: string;
+}
+
+interface JsonApiRelationship {
+  data: JsonApiRelationshipData | JsonApiRelationshipData[];
+}
+
+interface JsonApiBodyField {
+  value: string;
+  format?: string;
+  summary?: string;
+}
+
+interface JsonApiLinkField {
+  uri: string;
+  title?: string;
+}
+
+interface JsonApiRequestAttributes {
+  title?: string;
+  moderation_state?: string;
+  body?: JsonApiBodyField;
+  field_published_date?: string;
+  field_affiliation?: string;
+  field_news_external_link?: JsonApiLinkField;
+  field_where_to_share?: string[];
+  [key: string]: unknown; // Allow additional fields
+}
+
+interface JsonApiRequestBody {
+  data: {
+    type: string;
+    id?: string;
+    attributes: JsonApiRequestAttributes;
+    relationships?: Record<string, JsonApiRelationship>;
+  };
+}
+
+interface JsonApiResourceItem {
+  id: string;
+  type: string;
+  attributes?: {
+    drupal_internal__nid?: number;
+    title?: string;
+    status?: boolean;
+    created?: string;
+    name?: string;
+    field_published_date?: string;
+    field_group_id?: string;
+    field_affinity_group_category?: string;
+    body?: {
+      value?: string;
+      summary?: string;
+    };
+  };
+}
+
 // ============================================================================
 // Server
 // ============================================================================
@@ -83,12 +156,18 @@ export class AnnouncementsServer extends BaseAccessServer {
   private 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)
    */
   private getDrupalAuth(): DrupalAuthProvider {
     if (!this.drupalAuth) {
@@ -104,6 +183,14 @@ 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;
   }
 
@@ -112,30 +199,33 @@ export class AnnouncementsServer extends BaseAccessServer {
       // Read operations (existing)
       {
         name: "search_announcements",
-        description: "Search ACCESS announcements (news, updates, notifications). Read-only view of public announcements. For managing your own announcements (update/delete), use get_my_announcements which returns UUIDs. Returns {total, items: [{title, summary, body, published_date, tags, affiliation, affinity_group}]}.",
+        description:
+          "Search ACCESS announcements (news, updates, notifications). Read-only view of public announcements. For managing your own announcements (update/delete), use get_my_announcements which returns UUIDs. Returns {total, items: [{title, summary, body, published_date, tags, affiliation, affinity_group}]}.",
         inputSchema: {
           type: "object",
           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 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",
-              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"]
+              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"],
             },
             limit: {
               type: "number",
               description: "Max results (default: 25)",
-              default: 25
-            }
-          }
-        }
+              default: 25,
+            },
+          },
+        },
       },
       // CRUD operations (new)
       {
@@ -143,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):
@@ -159,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):
 ---
@@ -196,51 +289,55 @@ 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",
@@ -259,50 +356,51 @@ 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",
@@ -326,15 +424,16 @@ 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",
@@ -353,28 +452,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"],
+        },
+      },
     ];
   }
 
@@ -384,8 +514,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",
+      },
     ];
   }
 
@@ -397,7 +527,8 @@ Use this to tailor the announcement creation conversation based on the user's ro
         arguments: [
           {
             name: "topic",
-            description: "Brief description of what the announcement is about (optional, helps tailor guidance)",
+            description:
+              "Brief description of what the announcement is about (optional, helps tailor guidance)",
             required: false,
           },
         ],
@@ -410,7 +541,9 @@ Use this to tailor the announcement creation conversation based on the user's ro
     ];
   }
 
-  protected async handleGetPrompt(request: { params: { name: string; arguments?: Record<string, string> } }): Promise<GetPromptResult> {
+  protected async handleGetPrompt(request: {
+    params: { name: string; arguments?: Record<string, string> };
+  }): Promise<GetPromptResult> {
     const { name, arguments: args = {} } = request.params;
 
     if (name === "create_announcement_guide") {
@@ -432,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:**
 
@@ -538,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}`);
@@ -559,9 +696,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) {
         const message = error instanceof Error ? error.message : String(error);
@@ -570,9 +707,9 @@ Which would you like to do?`,
             {
               uri,
               mimeType: "text/plain",
-              text: `Error loading announcements: ${message}`
-            }
-          ]
+              text: `Error loading announcements: ${message}`,
+            },
+          ],
         };
       }
     }
@@ -604,11 +741,11 @@ Which would you like to do?`,
       params.append("tags", filters.tags);
     }
 
-    const dateMap: Record<string, {start: string, end?: string}> = {
-      today: {start: "today"},
-      this_week: {start: "-1 week", end: "now"},
-      this_month: {start: "-1 month", end: "now"},
-      past: {start: "-1 year", end: "now"}
+    const dateMap: Record<string, { start: string; end?: string }> = {
+      today: { start: "today" },
+      this_week: { start: "-1 week", end: "now" },
+      this_month: { start: "-1 month", end: "now" },
+      past: { start: "-1 year", end: "now" },
     };
 
     if (filters.date && dateMap[filters.date]) {
@@ -635,15 +772,19 @@ Which would you like to do?`,
   }
 
   private enhanceAnnouncements(rawAnnouncements: Announcement[]): Announcement[] {
-    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: string) => 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: string) => t.trim())
+          : [],
+      summary:
+        announcement.summary ||
+        (announcement.body
+          ? announcement.body.replace(/<[^>]*>/g, "").substring(0, 200) + "..."
+          : ""),
     }));
   }
 
@@ -652,13 +793,15 @@ Which would you like to do?`,
     const limited = filters.limit ? announcements.slice(0, filters.limit) : announcements;
 
     return {
-      content: [{
-        type: "text" as const,
-        text: JSON.stringify({
-          total: announcements.length,
-          items: limited
-        })
-      }]
+      content: [
+        {
+          type: "text" as const,
+          text: JSON.stringify({
+            total: announcements.length,
+            items: limited,
+          }),
+        },
+      ],
     };
   }
 
@@ -667,41 +810,47 @@ Which would you like to do?`,
   // ============================================================================
 
   /**
-   * 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")
    */
-  private getActingUserUid(): number {
-    const envUid = process.env.ACTING_USER_UID;
-    if (envUid) {
-      const parsed = parseInt(envUid, 10);
-      if (!isNaN(parsed)) {
-        return parsed;
-      }
+  private getActingUserAccessId(): string {
+    // 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."
+      "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.
    */
   private async createAnnouncement(args: CreateAnnouncementArgs): Promise<CallToolResult> {
     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
-    const requestBody: any = {
+    // 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: JsonApiRequestBody = {
       data: {
         type: "node--access_news",
         attributes: {
@@ -709,22 +858,15 @@ 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;
     }
 
@@ -732,7 +874,7 @@ Which would you like to do?`,
       requestBody.data.attributes.field_published_date = args.published_date;
     } 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) {
@@ -740,14 +882,16 @@ 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 => ({
+        requestBody.data.relationships!.field_tags = {
+          data: tagUuids.map((uuid) => ({
             type: "taxonomy_term--tags",
-            id: uuid
-          }))
+            id: uuid,
+          })),
         };
       }
     }
@@ -756,14 +900,16 @@ Which would you like to do?`,
     if (args.affinity_group) {
       const groupUuid = await this.getAffinityGroupUuid(args.affinity_group);
       if (groupUuid) {
-        requestBody.data.relationships.field_affinity_group_node = {
+        requestBody.data.relationships!.field_affinity_group_node = {
           data: {
             type: "node--affinity_group",
-            id: groupUuid
-          }
+            id: groupUuid,
+          },
         };
       } else {
-        throw new Error(`Affinity group not found: ${args.affinity_group}. Use list_affinity_groups to see groups you coordinate.`);
+        throw new Error(
+          `Affinity group not found: ${args.affinity_group}. Use list_affinity_groups to see groups you coordinate.`
+        );
       }
     }
 
@@ -771,28 +917,38 @@ 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)
     if (args.where_to_share && args.where_to_share.length > 0) {
-      requestBody.data.attributes.field_choose_where_to_share_this = this.normalizeWhereToShare(args.where_to_share);
+      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: 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`
-        })
-      }]
+      content: [
+        {
+          type: "text" as const,
+          text: JSON.stringify(response),
+        },
+      ],
     };
   }
 
@@ -802,12 +958,12 @@ Which would you like to do?`,
   private async updateAnnouncement(args: UpdateAnnouncementArgs): Promise<CallToolResult> {
     const auth = this.getDrupalAuth();
 
-    const requestBody: any = {
+    const requestBody: JsonApiRequestBody = {
       data: {
         type: "node--access_news",
         id: args.uuid,
-        attributes: {}
-      }
+        attributes: {},
+      },
     };
 
     // Add fields to update
@@ -825,7 +981,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
@@ -835,17 +991,19 @@ 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 = {};
         }
         requestBody.data.relationships.field_tags = {
-          data: tagUuids.map(uuid => ({
+          data: tagUuids.map((uuid) => ({
             type: "taxonomy_term--tags",
-            id: uuid
-          }))
+            id: uuid,
+          })),
         };
       }
     }
@@ -860,11 +1018,13 @@ Which would you like to do?`,
         requestBody.data.relationships.field_affinity_group_node = {
           data: {
             type: "node--affinity_group",
-            id: groupUuid
-          }
+            id: groupUuid,
+          },
         };
       } else {
-        throw new Error(`Affinity group not found: ${args.affinity_group}. Use list_affinity_groups to see groups you coordinate.`);
+        throw new Error(
+          `Affinity group not found: ${args.affinity_group}. Use list_affinity_groups to see groups you coordinate.`
+        );
       }
     }
 
@@ -872,30 +1032,40 @@ 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
     if (args.where_to_share && args.where_to_share.length > 0) {
-      requestBody.data.attributes.field_choose_where_to_share_this = this.normalizeWhereToShare(args.where_to_share);
+      requestBody.data.attributes.field_choose_where_to_share_this = this.normalizeWhereToShare(
+        args.where_to_share
+      );
     }
 
     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: 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
-        })
-      }]
+      content: [
+        {
+          type: "text" as const,
+          text: JSON.stringify(response),
+        },
+      ],
     };
   }
 
@@ -906,13 +1076,16 @@ Which would you like to do?`,
     // Enforce confirmation parameter
     if (!args.confirmed) {
       return {
-        content: [{
-          type: "text" as const,
-          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
-          })
-        }]
+        content: [
+          {
+            type: "text" as const,
+            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,
+            }),
+          },
+        ],
       };
     }
 
@@ -921,38 +1094,40 @@ Which would you like to do?`,
     await auth.delete(`/jsonapi/node/access_news/${args.uuid}`);
 
     return {
-      content: [{
-        type: "text" as const,
-        text: JSON.stringify({
-          success: true,
-          message: "Announcement deleted",
-          uuid: args.uuid
-        })
-      }]
+      content: [
+        {
+          type: "text" as const,
+          text: JSON.stringify({
+            success: true,
+            message: "Announcement deleted",
+            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.
    */
   private async getMyAnnouncements(args: GetMyAnnouncementsArgs): Promise<CallToolResult> {
     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`
+      `/jsonapi/views/mcp_my_announcements/page_1?page[limit]=${limit}`
     );
 
     const baseUrl = process.env.DRUPAL_API_URL;
-    const announcements = (result.data || []).map((item: any) => {
+    const announcements = (result.data || []).map((item: JsonApiResourceItem) => {
       const nid = item.attributes?.drupal_internal__nid;
       return {
         uuid: item.id,
@@ -961,21 +1136,25 @@ Which would you like to do?`,
         status: item.attributes?.status ? "published" : "draft",
         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
+        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,
       };
     });
 
     return {
-      content: [{
-        type: "text" as const,
-        text: JSON.stringify({
-          total: announcements.length,
-          items: announcements
-        })
-      }]
+      content: [
+        {
+          type: "text" as const,
+          text: JSON.stringify({
+            total: announcements.length,
+            items: announcements,
+          }),
+        },
+      ],
     };
   }
 
@@ -984,73 +1163,120 @@ Which would you like to do?`,
   // ============================================================================
 
   /**
-   * Get a user's UUID by their Drupal user ID (internal helper)
+   * 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.
    */
-  private async getUserUuidByUid(uid: number): Promise<string | null> {
+  private async getAnnouncementContext(): Promise<CallToolResult> {
     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;
-    }
+    // 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: JsonApiResourceItem) => ({
+      id: item.attributes?.field_group_id,
+      uuid: item.id,
+      name: item.attributes?.title,
+      category: item.attributes?.field_affinity_group_category,
+    }));
+
+    const isCoordinator = affinityGroups.length > 0;
 
-    return result.data[0].id;
+    return {
+      content: [
+        {
+          type: "text" as const,
+          text: JSON.stringify({
+            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)",
+              },
+            ],
+            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.",
+          }),
+        },
+      ],
+    };
   }
 
   /**
-   * Get announcement context - tags, affinity groups, and options for creating announcements
+   * Suggest tags for announcement content using Drupal's AI tag suggestion service.
    */
-  private async getAnnouncementContext(): Promise<CallToolResult> {
-    const auth = this.getDrupalAuth();
+  private static readonly JSON_HEADERS = {
+    "Content-Type": "application/json",
+    Accept: "application/json",
+  };
 
-    // Get the acting user's UUID
-    const actingUserUid = this.getActingUserUid();
-    const userUuid = await this.getUserUuidByUid(actingUserUid);
+  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.");
+    }
 
-    if (!userUuid) {
-      throw new Error(`Could not find user with UID ${actingUserUid}`);
+    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,
+          }),
+        }],
+      };
     }
 
-    // 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`)
-    ]);
+    return this.errorResponse(result.error || "Tag suggestion failed");
+  }
 
-    const tags = (tagsResult.data || []).map((item: any) => ({
-      name: item.attributes?.name,
-      uuid: item.id
-    }));
+  /**
+   * 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 affinityGroups = (groupsResult.data || []).map((item: any) => ({
-      id: item.attributes?.field_group_id,
-      uuid: item.id,
-      name: item.attributes?.title,
-      category: item.attributes?.field_affinity_group_category
-    }));
+    const auth = this.getDrupalAuth();
+    const result = await auth.post("/api/suggest-summary", {
+      text: args.text,
+    }, AnnouncementsServer.JSON_HEADERS);
 
-    const isCoordinator = affinityGroups.length > 0;
+    if (result.summary) {
+      return {
+        content: [{
+          type: "text" as const,
+          text: JSON.stringify({ summary: result.summary }),
+        }],
+      };
+    }
 
-    return {
-      content: [{
-        type: "text" as const,
-        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)" }
-          ],
-          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."
-        })
-      }]
-    };
+    return this.errorResponse(result.error || "Summary generation failed");
   }
 
   /**
@@ -1098,19 +1324,19 @@ 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",
   };
 
   private normalizeWhereToShare(values: string[]): string[] {
-    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}". ` +
-          `Valid options: 'Announcements page', 'Bi-Weekly Digest', 'Affinity Group page', 'Email to Affinity Group'`
+            `Valid options: 'Announcements page', 'Bi-Weekly Digest', 'Affinity Group page', 'Email to Affinity Group'`
         );
       }
       return normalized;
@@ -1129,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 };
   }
 }