google-calendar-workspace-mcp-server 0.0.8 → 0.0.10

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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-calendar-workspace-mcp-server",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "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

@@ -72,7 +72,6 @@ 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;

package/shared/server.js

@@ -5,14 +5,12 @@ 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,

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()
@@ -214,9 +215,10 @@ export function createEventTool(server, clientFactory) {
                         output += `  - ${attachment.title || attachment.fileUrl}\n`;
                     }
                 }
-                // Link
-                if (result.htmlLink) {
-                    output += `\n**Event Link:** ${result.htmlLink}\n`;
+                // Link — universal calendar.google.com form (eid embeds calendar context).
+                const eventUrl = buildCalendarEventUrl(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()
@@ -128,9 +129,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 — universal calendar.google.com form (eid embeds calendar context).
+                const eventUrl = buildCalendarEventUrl(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()
@@ -156,9 +157,10 @@ export function listEventsTool(server, clientFactory) {
                             : event.description;
                         output += `**Description:** ${truncated}\n`;
                     }
-                    // Link
-                    if (event.htmlLink) {
-                        output += `**Link:** ${event.htmlLink}\n`;
+                    // Link — universal calendar.google.com form (eid embeds calendar context).
+                    const eventUrl = buildCalendarEventUrl(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
@@ -238,9 +239,10 @@ export function updateEventTool(server, clientFactory) {
                         output += `  - ${attachment.title || attachment.fileUrl}\n`;
                     }
                 }
-                // Link
-                if (result.htmlLink) {
-                    output += `\n**Event Link:** ${result.htmlLink}\n`;
+                // Link — universal calendar.google.com form (eid embeds calendar context).
+                const eventUrl = buildCalendarEventUrl(result.htmlLink);
+                if (eventUrl) {
+                    output += `\n**Event Link:** ${eventUrl}\n`;
                 }
                 return {
                     content: [

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

@@ -0,0 +1,18 @@
+/**
+ * Builds a universal 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.
+ *
+ * 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 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;

package/shared/utils/calendar-helpers.js

@@ -0,0 +1,36 @@
+/**
+ * Builds a universal 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.
+ *
+ * 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 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) {
+    if (!htmlLink) {
+        return undefined;
+    }
+    const eid = extractEid(htmlLink);
+    if (!eid) {
+        return htmlLink;
+    }
+    return `https://calendar.google.com/calendar/event?eid=${eid}`;
+}
+function extractEid(htmlLink) {
+    try {
+        const url = new URL(htmlLink);
+        return url.searchParams.get('eid') ?? undefined;
+    }
+    catch {
+        return undefined;
+    }
+}