gmcp 0.5.2 → 0.6.0

package/dist/auth-cli.js

@@ -6,7 +6,7 @@ import {
   getTokensFromCode,
   loadCredentials,
   saveTokens
-} from "./shared/chunk-0d6s6z48.js";
+} from "./shared/chunk-tv10xf39.js";
 import"./shared/chunk-3s189drz.js";
 
 // src/auth-cli.ts

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   createAuthenticatedClient,
   getEnvConfig,
   getHeader
-} from "./shared/chunk-0d6s6z48.js";
+} from "./shared/chunk-tv10xf39.js";
 import"./shared/chunk-3s189drz.js";
 
 // src/index.ts
@@ -15,17 +15,17 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
 // src/calendar.ts
-import { google } from "googleapis";
-function parseCalendar(calendar) {
+import { calendar } from "@googleapis/calendar";
+function parseCalendar(calendarEntry) {
   return {
-    id: calendar.id || "",
-    summary: calendar.summary || "",
-    description: calendar.description ?? undefined,
-    timeZone: calendar.timeZone ?? undefined,
-    primary: calendar.primary ?? undefined,
-    backgroundColor: calendar.backgroundColor ?? undefined,
-    foregroundColor: calendar.foregroundColor ?? undefined,
-    accessRole: calendar.accessRole ?? undefined
+    id: calendarEntry.id || "",
+    summary: calendarEntry.summary || "",
+    description: calendarEntry.description ?? undefined,
+    timeZone: calendarEntry.timeZone ?? undefined,
+    primary: calendarEntry.primary ?? undefined,
+    backgroundColor: calendarEntry.backgroundColor ?? undefined,
+    foregroundColor: calendarEntry.foregroundColor ?? undefined,
+    accessRole: calendarEntry.accessRole ?? undefined
   };
 }
 var ALL_DAY_DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
@@ -82,13 +82,13 @@ function parseEvent(event) {
   };
 }
 function createCalendarClient(auth, logger) {
-  const calendar = google.calendar({ version: "v3", auth });
+  const calendarClient = calendar({ version: "v3", auth });
   return {
     async listCalendars(showHidden = false) {
       const startTime = Date.now();
       logger?.debug({ showHidden }, "listCalendars start");
       try {
-        const response = await calendar.calendarList.list({
+        const response = await calendarClient.calendarList.list({
           showHidden
         });
         const calendars = response.data.items || [];
@@ -107,7 +107,7 @@ function createCalendarClient(auth, logger) {
       const startTime = Date.now();
       logger?.debug({ calendarId, timeMin, timeMax, maxResults, query }, "listEvents start");
       try {
-        const response = await calendar.events.list({
+        const response = await calendarClient.events.list({
           calendarId,
           timeMin,
           timeMax,
@@ -137,7 +137,7 @@ function createCalendarClient(auth, logger) {
       const startTime = Date.now();
       logger?.debug({ calendarId, eventId }, "getEvent start");
       try {
-        const response = await calendar.events.get({
+        const response = await calendarClient.events.get({
           calendarId,
           eventId
         });
@@ -176,7 +176,7 @@ function createCalendarClient(auth, logger) {
             }
           };
         }
-        const response = await calendar.events.insert({
+        const response = await calendarClient.events.insert({
           calendarId,
           requestBody: eventResource,
           conferenceDataVersion: addMeet ? 1 : undefined
@@ -203,7 +203,7 @@ function createCalendarClient(auth, logger) {
 }
 
 // src/gmail.ts
-import { google as google2 } from "googleapis";
+import { gmail } from "@googleapis/gmail";
 
 // src/constants.ts
 var EMAIL_FETCH_BATCH_SIZE = 10;
@@ -332,13 +332,13 @@ function parseLabel(label) {
   };
 }
 function createGmailClient(auth, logger) {
-  const gmail = google2.gmail({ version: "v1", auth });
+  const gmailClient = gmail({ version: "v1", auth });
   return {
     async searchEmails(query, maxResults = 10, includeBody = false, pageToken) {
       const startTime = Date.now();
       logger?.debug({ query, maxResults, includeBody, pageToken }, "searchEmails start");
       try {
-        const listResponse = await gmail.users.messages.list({
+        const listResponse = await gmailClient.users.messages.list({
           userId: "me",
           q: query,
           maxResults,
@@ -354,7 +354,7 @@ function createGmailClient(auth, logger) {
           const batch = validMessages.slice(i, i + EMAIL_FETCH_BATCH_SIZE);
           const batchEmails = await Promise.all(batch.map(async (message) => {
             const messageId = message.id ?? "";
-            const details = await gmail.users.messages.get({
+            const details = await gmailClient.users.messages.get({
               userId: "me",
               id: messageId,
               format: includeBody ? "full" : "metadata",
@@ -389,7 +389,7 @@ function createGmailClient(auth, logger) {
       const startTime = Date.now();
       logger?.debug({ messageId, includeBody }, "getMessage start");
       try {
-        const response = await gmail.users.messages.get({
+        const response = await gmailClient.users.messages.get({
           userId: "me",
           id: messageId,
           format: includeBody ? "full" : "metadata",
@@ -409,7 +409,7 @@ function createGmailClient(auth, logger) {
     },
     async getThread(threadId, includeBody = false) {
       try {
-        const response = await gmail.users.threads.get({
+        const response = await gmailClient.users.threads.get({
           userId: "me",
           id: threadId,
           format: includeBody ? "full" : "metadata",
@@ -423,7 +423,7 @@ function createGmailClient(auth, logger) {
     },
     async listAttachments(messageId) {
       try {
-        const response = await gmail.users.messages.get({
+        const response = await gmailClient.users.messages.get({
           userId: "me",
           id: messageId,
           format: "full"
@@ -454,7 +454,7 @@ function createGmailClient(auth, logger) {
     },
     async getAttachment(messageId, attachmentId) {
       try {
-        const response = await gmail.users.messages.attachments.get({
+        const response = await gmailClient.users.messages.attachments.get({
           userId: "me",
           messageId,
           id: attachmentId
@@ -472,7 +472,7 @@ function createGmailClient(auth, logger) {
     },
     async modifyLabels(messageId, addLabelIds, removeLabelIds) {
       try {
-        const response = await gmail.users.messages.modify({
+        const response = await gmailClient.users.messages.modify({
           userId: "me",
           id: messageId,
           requestBody: {
@@ -493,7 +493,7 @@ function createGmailClient(auth, logger) {
         removeLabelCount: removeLabelIds?.length || 0
       }, "batchModifyLabels start");
       try {
-        await gmail.users.messages.batchModify({
+        await gmailClient.users.messages.batchModify({
           userId: "me",
           requestBody: {
             ids: messageIds,
@@ -527,7 +527,7 @@ function createGmailClient(auth, logger) {
           bcc
         });
         const encodedMessage = encodeMessage(mimeMessage);
-        const response = await gmail.users.messages.send({
+        const response = await gmailClient.users.messages.send({
           userId: "me",
           requestBody: {
             raw: encodedMessage
@@ -568,7 +568,7 @@ function createGmailClient(auth, logger) {
           references: `<${messageId}>`
         });
         const encodedMessage = encodeMessage(mimeMessage);
-        const response = await gmail.users.messages.send({
+        const response = await gmailClient.users.messages.send({
           userId: "me",
           requestBody: {
             raw: encodedMessage,
@@ -595,7 +595,7 @@ function createGmailClient(auth, logger) {
           bcc
         });
         const encodedMessage = encodeMessage(mimeMessage);
-        const response = await gmail.users.drafts.create({
+        const response = await gmailClient.users.drafts.create({
           userId: "me",
           requestBody: {
             message: {
@@ -616,7 +616,7 @@ function createGmailClient(auth, logger) {
     },
     async listLabels() {
       try {
-        const response = await gmail.users.labels.list({
+        const response = await gmailClient.users.labels.list({
           userId: "me"
         });
         const labels = response.data.labels || [];
@@ -627,7 +627,7 @@ function createGmailClient(auth, logger) {
     },
     async getLabel(labelId) {
       try {
-        const response = await gmail.users.labels.get({
+        const response = await gmailClient.users.labels.get({
           userId: "me",
           id: labelId
         });
@@ -638,7 +638,7 @@ function createGmailClient(auth, logger) {
     },
     async createLabel(name, messageListVisibility, labelListVisibility, backgroundColor, textColor) {
       try {
-        const response = await gmail.users.labels.create({
+        const response = await gmailClient.users.labels.create({
           userId: "me",
           requestBody: {
             name,
@@ -654,7 +654,7 @@ function createGmailClient(auth, logger) {
     },
     async updateLabel(labelId, name, messageListVisibility, labelListVisibility, backgroundColor, textColor) {
       try {
-        const response = await gmail.users.labels.update({
+        const response = await gmailClient.users.labels.update({
           userId: "me",
           id: labelId,
           requestBody: {
@@ -672,7 +672,7 @@ function createGmailClient(auth, logger) {
     },
     async deleteLabel(labelId) {
       try {
-        await gmail.users.labels.delete({
+        await gmailClient.users.labels.delete({
           userId: "me",
           id: labelId
         });
@@ -682,7 +682,7 @@ function createGmailClient(auth, logger) {
     },
     async deleteEmail(messageId) {
       try {
-        await gmail.users.messages.delete({
+        await gmailClient.users.messages.delete({
           userId: "me",
           id: messageId
         });
@@ -1079,18 +1079,18 @@ function calendarListToMarkdown(data) {
   if (data.calendars.length === 0) {
     sections.push({ p: "No calendars found." });
   } else {
-    for (const calendar of data.calendars) {
-      sections.push({ h2: calendar.summary });
+    for (const calendar2 of data.calendars) {
+      sections.push({ h2: calendar2.summary });
       const details = [
-        `**ID:** ${calendar.id}`,
-        `**Timezone:** ${calendar.timezone || "Not set"}`,
-        `**Access Role:** ${calendar.access_role || "Unknown"}`
+        `**ID:** ${calendar2.id}`,
+        `**Timezone:** ${calendar2.timezone || "Not set"}`,
+        `**Access Role:** ${calendar2.access_role || "Unknown"}`
       ];
-      if (calendar.primary) {
+      if (calendar2.primary) {
         details.push("**Primary:** Yes");
       }
-      if (calendar.description) {
-        details.push(`**Description:** ${calendar.description}`);
+      if (calendar2.description) {
+        details.push(`**Description:** ${calendar2.description}`);
       }
       sections.push({ ul: details });
     }

package/dist/shared/{chunk-0d6s6z48.js → chunk-tv10xf39.js}

@@ -1,5 +1,5 @@
 // src/auth.ts
-import { google } from "googleapis";
+import { OAuth2Client } from "google-auth-library";
 
 // src/errors.ts
 class GmcpError extends Error {
@@ -143,7 +143,7 @@ async function saveTokens(path, tokens) {
 }
 function createOAuth2Client(credentials) {
   const { client_id, client_secret, redirect_uris } = credentials.installed;
-  return new google.auth.OAuth2(client_id, client_secret, redirect_uris[0]);
+  return new OAuth2Client(client_id, client_secret, redirect_uris[0]);
 }
 function getAuthUrl(oauth2Client, scopes) {
   return oauth2Client.generateAuthUrl({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gmcp",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "GMCP Server for Google Workspace with OAuth2 authentication",
   "module": "src/index.ts",
   "main": "dist/index.js",
@@ -51,7 +51,9 @@
     "@inquirer/prompts": "^8.2.0",
     "@modelcontextprotocol/sdk": "^1.25.3",
     "@stricli/core": "^1.2.5",
-    "googleapis": "^170.1.0",
+    "@googleapis/calendar": "^14.2.0",
+    "@googleapis/gmail": "^15.0.0",
+    "google-auth-library": "^10.2.0",
     "json2md": "^2.0.3",
     "kleur": "^4.1.5",
     "pino": "^10.3.0",
@@ -64,7 +66,7 @@
     "@changesets/cli": "^2.29.8",
     "@types/bun": "latest",
     "@types/json2md": "^1.5.4",
-    "bunup": "^0.16.20",
+    "bunup": "^0.16.21",
     "lefthook": "^2.0.16",
     "msw": "^2.12.7",
     "ultracite": "7.1.1",