google-calendar-workspace-mcp-server 0.0.7 → 0.0.9

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

@@ -33,7 +33,7 @@ class MockCalendarClient {
                     timeZone: 'America/New_York',
                 },
                 status: 'confirmed',
-                htmlLink: 'https://calendar.google.com/event?eid=event1',
+                htmlLink: 'https://www.google.com/calendar/event?eid=ZXZlbnQxX2VpZA',
                 attendees: [
                     {
                         email: 'user1@example.com',
@@ -55,7 +55,7 @@ class MockCalendarClient {
                     date: '2024-01-17',
                 },
                 status: 'confirmed',
-                htmlLink: 'https://calendar.google.com/event?eid=event2',
+                htmlLink: 'https://www.google.com/calendar/event?eid=ZXZlbnQyX2VpZA',
             },
         ];
         const filteredEvents = options?.q
@@ -87,7 +87,7 @@ class MockCalendarClient {
                     timeZone: 'America/New_York',
                 },
                 status: 'confirmed',
-                htmlLink: 'https://calendar.google.com/event?eid=event1',
+                htmlLink: 'https://www.google.com/calendar/event?eid=ZXZlbnQxX2VpZA',
                 created: '2024-01-01T00:00:00Z',
                 updated: '2024-01-01T00:00:00Z',
                 creator: {
@@ -132,7 +132,7 @@ class MockCalendarClient {
             start: event.start || { dateTime: '2024-01-20T10:00:00-05:00' },
             end: event.end || { dateTime: '2024-01-20T11:00:00-05:00' },
             status: 'confirmed',
-            htmlLink: 'https://calendar.google.com/event?eid=new-event-id',
+            htmlLink: 'https://www.google.com/calendar/event?eid=bmV3X2V2ZW50X2VpZA',
             created: new Date().toISOString(),
             updated: new Date().toISOString(),
             attendees: event.attendees,
@@ -150,7 +150,7 @@ class MockCalendarClient {
             start: event.start || { dateTime: '2024-01-20T10:00:00-05:00' },
             end: event.end || { dateTime: '2024-01-20T11:00:00-05:00' },
             status: 'confirmed',
-            htmlLink: `https://calendar.google.com/event?eid=${eventId}`,
+            htmlLink: `https://www.google.com/calendar/event?eid=dXBkYXRlZF8${eventId}`,
             created: '2024-01-01T00:00:00Z',
             updated: new Date().toISOString(),
             attendees: event.attendees,
@@ -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.7",
+  "version": "0.0.9",
   "description": "MCP server for Google Calendar integration with service account support",
   "main": "build/index.js",
   "type": "module",
@@ -29,7 +29,7 @@
     "stage-publish": "npm version"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.19.1",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "google-auth-library": "^10.5.0",
     "zod": "^3.24.1"
   },

package/shared/server.d.ts

@@ -52,6 +52,13 @@ 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 construct account-scoped Calendar web URLs so that event links
+     * open in the correct account regardless of which accounts the reader
+     * happens to be signed into in their browser.
+     */
+    getAccountEmail(): Promise<string>;
 }
 /**
  * Service account credentials structure
@@ -106,6 +113,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

@@ -84,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

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { logError } from '../logging.js';
+import { buildCalendarEventUrl } from '../utils/calendar-helpers.js';
 export const CreateEventSchema = z.object({
     calendar_id: z
         .string()
@@ -166,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`;
@@ -214,9 +218,10 @@ export function createEventTool(server, clientFactory) {
                         output += `  - ${attachment.title || attachment.fileUrl}\n`;
                     }
                 }
-                // Link
-                if (result.htmlLink) {
-                    output += `\n**Event Link:** ${result.htmlLink}\n`;
+                // Link — account-scoped so it opens in the correct mailbox/calendar.
+                const eventUrl = buildCalendarEventUrl(accountEmail, result.htmlLink);
+                if (eventUrl) {
+                    output += `\n**Event Link:** ${eventUrl}\n`;
                 }
                 return {
                     content: [

package/shared/tools/get-event.js

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { logError } from '../logging.js';
+import { buildCalendarEventUrl } from '../utils/calendar-helpers.js';
 export const GetEventSchema = z.object({
     calendar_id: z
         .string()
@@ -32,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`;
@@ -128,9 +132,10 @@ export function getEventTool(server, clientFactory) {
                 if (event.updated) {
                     output += `**Updated:** ${new Date(event.updated).toLocaleString()}\n`;
                 }
-                // Link
-                if (event.htmlLink) {
-                    output += `\n**Event Link:** ${event.htmlLink}\n`;
+                // Link — account-scoped so it opens in the correct mailbox/calendar.
+                const eventUrl = buildCalendarEventUrl(accountEmail, event.htmlLink);
+                if (eventUrl) {
+                    output += `\n**Event Link:** ${eventUrl}\n`;
                 }
                 return {
                     content: [

package/shared/tools/list-events.js

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { logError } from '../logging.js';
+import { buildCalendarEventUrl } from '../utils/calendar-helpers.js';
 export const ListEventsSchema = z.object({
     calendar_id: z
         .string()
@@ -77,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 {
@@ -156,9 +160,10 @@ export function listEventsTool(server, clientFactory) {
                             : event.description;
                         output += `**Description:** ${truncated}\n`;
                     }
-                    // Link
-                    if (event.htmlLink) {
-                        output += `**Link:** ${event.htmlLink}\n`;
+                    // Link — account-scoped so it opens in the correct mailbox/calendar.
+                    const eventUrl = buildCalendarEventUrl(accountEmail, event.htmlLink);
+                    if (eventUrl) {
+                        output += `**Link:** ${eventUrl}\n`;
                     }
                     output += '\n---\n\n';
                 }

package/shared/tools/update-event.js

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { logError } from '../logging.js';
+import { buildCalendarEventUrl } from '../utils/calendar-helpers.js';
 export const UpdateEventSchema = z.object({
     event_id: z.string().min(1).describe('The ID of the event to update.'),
     calendar_id: z
@@ -190,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`;
@@ -238,9 +242,10 @@ export function updateEventTool(server, clientFactory) {
                         output += `  - ${attachment.title || attachment.fileUrl}\n`;
                     }
                 }
-                // Link
-                if (result.htmlLink) {
-                    output += `\n**Event Link:** ${result.htmlLink}\n`;
+                // Link — account-scoped so it opens in the correct mailbox/calendar.
+                const eventUrl = buildCalendarEventUrl(accountEmail, result.htmlLink);
+                if (eventUrl) {
+                    output += `\n**Event Link:** ${eventUrl}\n`;
                 }
                 return {
                     content: [

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

@@ -0,0 +1,18 @@
+/**
+ * Builds an account-scoped Google Calendar event URL.
+ *
+ * Uses the `/calendar/u/<account-email>/r/eventedit/<eid>` path form so the
+ * link opens in the correct account regardless of which Google accounts the
+ * reader is signed into in their browser. The default `htmlLink` returned by
+ * the Calendar API (`https://www.google.com/calendar/event?eid=...`) carries
+ * no account context, so Google's web UI guesses based on the reader's
+ * browser session and 404s when the guess is wrong.
+ *
+ * The `<eid>` segment is the opaque base64-style identifier from the
+ * `?eid=...` query parameter on `htmlLink` — NOT the raw `event.id`. Using
+ * the raw event id (e.g. `p1qvrkvfpl6d3a4rr6careb3bk`) yields a 500 page.
+ *
+ * Falls back to the original `htmlLink` if the input cannot be parsed (e.g.
+ * the API response omitted `htmlLink` or it lacks an `eid` parameter).
+ */
+export declare function buildCalendarEventUrl(accountEmail: string, htmlLink: string | undefined): string | undefined;

package/shared/utils/calendar-helpers.js

@@ -0,0 +1,36 @@
+/**
+ * Builds an account-scoped Google Calendar event URL.
+ *
+ * Uses the `/calendar/u/<account-email>/r/eventedit/<eid>` path form so the
+ * link opens in the correct account regardless of which Google accounts the
+ * reader is signed into in their browser. The default `htmlLink` returned by
+ * the Calendar API (`https://www.google.com/calendar/event?eid=...`) carries
+ * no account context, so Google's web UI guesses based on the reader's
+ * browser session and 404s when the guess is wrong.
+ *
+ * The `<eid>` segment is the opaque base64-style identifier from the
+ * `?eid=...` query parameter on `htmlLink` — NOT the raw `event.id`. Using
+ * the raw event id (e.g. `p1qvrkvfpl6d3a4rr6careb3bk`) yields a 500 page.
+ *
+ * Falls back to the original `htmlLink` if the input cannot be parsed (e.g.
+ * the API response omitted `htmlLink` or it lacks an `eid` parameter).
+ */
+export function buildCalendarEventUrl(accountEmail, htmlLink) {
+    if (!htmlLink) {
+        return undefined;
+    }
+    const eid = extractEid(htmlLink);
+    if (!eid) {
+        return htmlLink;
+    }
+    return `https://calendar.google.com/calendar/u/${encodeURIComponent(accountEmail)}/r/eventedit/${eid}`;
+}
+function extractEid(htmlLink) {
+    try {
+        const url = new URL(htmlLink);
+        return url.searchParams.get('eid') ?? undefined;
+    }
+    catch {
+        return undefined;
+    }
+}