google-calendar-workspace-mcp-server 0.0.11 → 0.0.13

package/build/index.integration-with-mock.js

@@ -194,6 +194,9 @@ class MockCalendarClient {
             ],
         };
     }
+    async getAccountEmail() {
+        return 'me@example.com';
+    }
     async queryFreebusy(request) {
         return {
             kind: 'calendar#freeBusy',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-calendar-workspace-mcp-server",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "MCP server for Google Calendar integration with service account support",
   "mcpName": "com.pulsemcp/google-calendar",
   "main": "build/index.js",
@@ -32,11 +32,11 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
     "google-auth-library": "^10.5.0",
-    "zod": "^3.24.1"
+    "zod": "^3.25.76"
   },
   "devDependencies": {
     "@types/node": "^22.10.6",
-    "tsx": "^4.19.4",
+    "tsx": "^4.22.4",
     "typescript": "^5.7.3"
   },
   "keywords": [

package/shared/server.d.ts

@@ -52,6 +52,15 @@ export interface ICalendarClient {
      * Query free/busy information
      */
     queryFreebusy(request: FreeBusyRequest): Promise<FreeBusyResponse>;
+    /**
+     * Get the email address of the Google account this client reads from.
+     * Used to append `&authuser=<email>` to event URLs so they open against
+     * the correct account in multi-account browsers (the reader's default
+     * Google account may not be the calendar owner). Returns an empty string
+     * if the account email cannot be resolved — callers should treat empty
+     * as "skip authuser" and fall back to the bare `?eid=` form.
+     */
+    getAccountEmail(): Promise<string>;
 }
 /**
  * Service account credentials structure
@@ -72,6 +81,7 @@ export interface ServiceAccountCredentials {
  * Google Calendar API client implementation using service account with domain-wide delegation
  */
 export declare class ServiceAccountCalendarClient implements ICalendarClient {
+    private impersonateEmail;
     private baseUrl;
     private jwtClient;
     private cachedToken;
@@ -105,6 +115,7 @@ export declare class ServiceAccountCalendarClient implements ICalendarClient {
         pageToken?: string;
     }): Promise<CalendarList>;
     queryFreebusy(request: FreeBusyRequest): Promise<FreeBusyResponse>;
+    getAccountEmail(): Promise<string>;
 }
 export type ClientFactory = () => ICalendarClient;
 /**

package/shared/server.js

@@ -5,12 +5,14 @@ import { createRegisterTools, parseEnabledToolGroups } from './tools.js';
  * Google Calendar API client implementation using service account with domain-wide delegation
  */
 export class ServiceAccountCalendarClient {
+    impersonateEmail;
     baseUrl = 'https://www.googleapis.com/calendar/v3';
     jwtClient;
     cachedToken = null;
     tokenExpiry = 0;
     refreshPromise = null;
     constructor(credentials, impersonateEmail) {
+        this.impersonateEmail = impersonateEmail;
         this.jwtClient = new JWT({
             email: credentials.client_email,
             key: credentials.private_key,
@@ -82,6 +84,9 @@ export class ServiceAccountCalendarClient {
         const { queryFreebusy } = await import('./calendar-client/lib/query-freebusy.js');
         return queryFreebusy(this.baseUrl, headers, request);
     }
+    async getAccountEmail() {
+        return this.impersonateEmail;
+    }
 }
 /**
  * Creates the default Google Calendar client based on environment variables.

package/shared/tools/create-event.js

@@ -167,7 +167,10 @@ export function createEventTool(server, clientFactory) {
                 }
                 // Determine if we need supportsAttachments parameter
                 const hasAttachments = parsed.attachments && parsed.attachments.length > 0;
-                const result = await client.createEvent(parsed.calendar_id, event, hasAttachments ? { supportsAttachments: true } : undefined);
+                const [result, accountEmail] = await Promise.all([
+                    client.createEvent(parsed.calendar_id, event, hasAttachments ? { supportsAttachments: true } : undefined),
+                    client.getAccountEmail(),
+                ]);
                 let output = `# Event Created Successfully\n\n`;
                 output += `## ${result.summary || '(No title)'}\n\n`;
                 output += `**Event ID:** ${result.id}\n`;
@@ -215,8 +218,8 @@ export function createEventTool(server, clientFactory) {
                         output += `  - ${attachment.title || attachment.fileUrl}\n`;
                     }
                 }
-                // Link — universal calendar.google.com form (eid embeds calendar context).
-                const eventUrl = buildCalendarEventUrl(result.htmlLink);
+                // Link — `?eid=&authuser=<email>` form so multi-account readers don't 404.
+                const eventUrl = buildCalendarEventUrl(result.htmlLink, accountEmail);
                 if (eventUrl) {
                     output += `\n**Event Link:** ${eventUrl}\n`;
                 }

package/shared/tools/get-event.js

@@ -33,7 +33,10 @@ export function getEventTool(server, clientFactory) {
             try {
                 const parsed = GetEventSchema.parse(args);
                 const client = clientFactory();
-                const event = await client.getEvent(parsed.calendar_id, parsed.event_id);
+                const [event, accountEmail] = await Promise.all([
+                    client.getEvent(parsed.calendar_id, parsed.event_id),
+                    client.getAccountEmail(),
+                ]);
                 let output = `# Event Details\n\n`;
                 output += `## ${event.summary || '(No title)'}\n\n`;
                 output += `**Event ID:** ${event.id}\n`;
@@ -129,8 +132,8 @@ export function getEventTool(server, clientFactory) {
                 if (event.updated) {
                     output += `**Updated:** ${new Date(event.updated).toLocaleString()}\n`;
                 }
-                // Link — universal calendar.google.com form (eid embeds calendar context).
-                const eventUrl = buildCalendarEventUrl(event.htmlLink);
+                // Link — `?eid=&authuser=<email>` form so multi-account readers don't 404.
+                const eventUrl = buildCalendarEventUrl(event.htmlLink, accountEmail);
                 if (eventUrl) {
                     output += `\n**Event Link:** ${eventUrl}\n`;
                 }

package/shared/tools/list-events.js

@@ -78,14 +78,17 @@ export function listEventsTool(server, clientFactory) {
             try {
                 const parsed = ListEventsSchema.parse(args);
                 const client = clientFactory();
-                const result = await client.listEvents(parsed.calendar_id, {
-                    timeMin: parsed.time_min,
-                    timeMax: parsed.time_max,
-                    maxResults: parsed.max_results,
-                    q: parsed.query,
-                    singleEvents: parsed.single_events,
-                    orderBy: parsed.order_by,
-                });
+                const [result, accountEmail] = await Promise.all([
+                    client.listEvents(parsed.calendar_id, {
+                        timeMin: parsed.time_min,
+                        timeMax: parsed.time_max,
+                        maxResults: parsed.max_results,
+                        q: parsed.query,
+                        singleEvents: parsed.single_events,
+                        orderBy: parsed.order_by,
+                    }),
+                    client.getAccountEmail(),
+                ]);
                 const events = result.items || [];
                 if (events.length === 0) {
                     return {
@@ -157,8 +160,8 @@ export function listEventsTool(server, clientFactory) {
                             : event.description;
                         output += `**Description:** ${truncated}\n`;
                     }
-                    // Link — universal calendar.google.com form (eid embeds calendar context).
-                    const eventUrl = buildCalendarEventUrl(event.htmlLink);
+                    // Link — `?eid=&authuser=<email>` form so multi-account readers don't 404.
+                    const eventUrl = buildCalendarEventUrl(event.htmlLink, accountEmail);
                     if (eventUrl) {
                         output += `**Link:** ${eventUrl}\n`;
                     }

package/shared/tools/update-event.js

@@ -191,7 +191,10 @@ export function updateEventTool(server, clientFactory) {
                 if (hasAttachments) {
                     options.supportsAttachments = true;
                 }
-                const result = await client.updateEvent(parsed.calendar_id, parsed.event_id, eventUpdate, Object.keys(options).length > 0 ? options : undefined);
+                const [result, accountEmail] = await Promise.all([
+                    client.updateEvent(parsed.calendar_id, parsed.event_id, eventUpdate, Object.keys(options).length > 0 ? options : undefined),
+                    client.getAccountEmail(),
+                ]);
                 let output = `# Event Updated Successfully\n\n`;
                 output += `## ${result.summary || '(No title)'}\n\n`;
                 output += `**Event ID:** ${result.id}\n`;
@@ -239,8 +242,8 @@ export function updateEventTool(server, clientFactory) {
                         output += `  - ${attachment.title || attachment.fileUrl}\n`;
                     }
                 }
-                // Link — universal calendar.google.com form (eid embeds calendar context).
-                const eventUrl = buildCalendarEventUrl(result.htmlLink);
+                // Link — `?eid=&authuser=<email>` form so multi-account readers don't 404.
+                const eventUrl = buildCalendarEventUrl(result.htmlLink, accountEmail);
                 if (eventUrl) {
                     output += `\n**Event Link:** ${eventUrl}\n`;
                 }

package/shared/utils/calendar-helpers.d.ts

@@ -1,18 +1,23 @@
 /**
- * Builds a universal Google Calendar event URL on `calendar.google.com`.
+ * Builds a multi-account-robust Google Calendar event URL on `calendar.google.com`.
  *
- * The eid embedded in `htmlLink` already encodes the calendar context — it
- * base64-decodes to `<event-id> <calendar-id>`, so `calendar.google.com`
- * can route the click to the correct calendar regardless of which Google
- * accounts the reader is signed into.
+ * Emits `https://calendar.google.com/calendar/event?eid=<eid>&authuser=<accountEmail>`
+ * when `accountEmail` is non-empty. The `authuser` query parameter forces Google
+ * Calendar to evaluate the link against the named account regardless of which
+ * Google account is the reader's browser default — without it, multi-account
+ * readers whose default account isn't the calendar owner get a 404.
  *
- * The raw `htmlLink` from Google's API uses `www.google.com` and redirects
- * through Google's general router, which can guess wrong when the reader
- * is signed into multiple accounts. Pointing directly at `calendar.google.com`
- * with the same eid bypasses that redirect.
+ * Falls back to `https://calendar.google.com/calendar/event?eid=<eid>` (bare form)
+ * when `accountEmail` is empty/undefined. The bare form works for single-account
+ * readers, and the eid itself base64-decodes to `<event-id> <calendar-id>` so the
+ * calendar context still travels with the URL.
  *
- * Falls back to the original `htmlLink` if it cannot be parsed (e.g. the
- * API response omitted `htmlLink` or it lacks an `eid` parameter), and
- * returns `undefined` if `htmlLink` is missing entirely.
+ * NEVER emits the `/calendar/u/<email>/r/eventedit/<eid>` path form — that
+ * reader-side path-based account selector 404s for any reader not currently
+ * signed in as `<email>` (shipped and reverted as v0.0.9; see PR #3670 follow-up).
+ *
+ * Falls back to the original `htmlLink` if it cannot be parsed (e.g. the API
+ * response omitted `htmlLink` or it lacks an `eid` parameter), and returns
+ * `undefined` if `htmlLink` is missing entirely.
  */
-export declare function buildCalendarEventUrl(htmlLink: string | undefined): string | undefined;
+export declare function buildCalendarEventUrl(htmlLink: string | undefined, accountEmail?: string): string | undefined;

package/shared/utils/calendar-helpers.js

@@ -1,21 +1,26 @@
 /**
- * Builds a universal Google Calendar event URL on `calendar.google.com`.
+ * Builds a multi-account-robust Google Calendar event URL on `calendar.google.com`.
  *
- * The eid embedded in `htmlLink` already encodes the calendar context — it
- * base64-decodes to `<event-id> <calendar-id>`, so `calendar.google.com`
- * can route the click to the correct calendar regardless of which Google
- * accounts the reader is signed into.
+ * Emits `https://calendar.google.com/calendar/event?eid=<eid>&authuser=<accountEmail>`
+ * when `accountEmail` is non-empty. The `authuser` query parameter forces Google
+ * Calendar to evaluate the link against the named account regardless of which
+ * Google account is the reader's browser default — without it, multi-account
+ * readers whose default account isn't the calendar owner get a 404.
  *
- * The raw `htmlLink` from Google's API uses `www.google.com` and redirects
- * through Google's general router, which can guess wrong when the reader
- * is signed into multiple accounts. Pointing directly at `calendar.google.com`
- * with the same eid bypasses that redirect.
+ * Falls back to `https://calendar.google.com/calendar/event?eid=<eid>` (bare form)
+ * when `accountEmail` is empty/undefined. The bare form works for single-account
+ * readers, and the eid itself base64-decodes to `<event-id> <calendar-id>` so the
+ * calendar context still travels with the URL.
  *
- * Falls back to the original `htmlLink` if it cannot be parsed (e.g. the
- * API response omitted `htmlLink` or it lacks an `eid` parameter), and
- * returns `undefined` if `htmlLink` is missing entirely.
+ * NEVER emits the `/calendar/u/<email>/r/eventedit/<eid>` path form — that
+ * reader-side path-based account selector 404s for any reader not currently
+ * signed in as `<email>` (shipped and reverted as v0.0.9; see PR #3670 follow-up).
+ *
+ * Falls back to the original `htmlLink` if it cannot be parsed (e.g. the API
+ * response omitted `htmlLink` or it lacks an `eid` parameter), and returns
+ * `undefined` if `htmlLink` is missing entirely.
  */
-export function buildCalendarEventUrl(htmlLink) {
+export function buildCalendarEventUrl(htmlLink, accountEmail) {
     if (!htmlLink) {
         return undefined;
     }
@@ -23,7 +28,11 @@ export function buildCalendarEventUrl(htmlLink) {
     if (!eid) {
         return htmlLink;
     }
-    return `https://calendar.google.com/calendar/event?eid=${eid}`;
+    const base = `https://calendar.google.com/calendar/event?eid=${eid}`;
+    if (accountEmail && accountEmail.length > 0) {
+        return `${base}&authuser=${encodeURIComponent(accountEmail)}`;
+    }
+    return base;
 }
 function extractEid(htmlLink) {
     try {