mcp-google-multi 5.3.0 → 5.4.0-beta.1

package/dist/tools/gmail-mime.d.ts

@@ -1,38 +1,18 @@
-/**
- * RFC 2047 encoded-word (`=?utf-8?B?...?=`) for non-ASCII header text.
- * Long values are split into multiple <=75-char encoded-words separated
- * by `\r\n ` (CRLF SPACE) per the RFC's folding rule.
- */
+/** RFC 2047 encoded-word (`=?utf-8?B?...?=`) for non-ASCII header text; long values fold into <=75-char chunks joined by CRLF SPACE per the RFC. */
 export declare function encodeHeaderValue(value: string): string;
-/**
- * Encode an address-list header (To/Cc/Bcc/From). RFC 2047 forbids
- * encoded-words inside the addr-spec, so only the display name is encoded.
- */
+/** Address-list headers (To/Cc/Bcc/From): RFC 2047 forbids encoded-words in the addr-spec, so only display names are encoded. */
 export declare function encodeAddressHeader(value: string): string;
-/**
- * RFC 5322 §2.3: CR and LF MUST only occur together as CRLF in bodies.
- * Normalize bare `\n` or `\r` to CRLF.
- */
+/** RFC 5322 §2.3 forbids bare CR or LF in bodies; normalize everything to CRLF. */
 export declare function normalizeBodyLineEndings(body: string): string;
-/**
- * Best-effort HTML→plain-text for reading HTML-only emails. Regex-based on
- * purpose — no HTML parser dependency, and mail HTML is flat enough for it.
- */
+/** Best-effort HTML→plain-text for HTML-only emails; regex on purpose (avoids an HTML-parser dep, mail HTML is flat enough). */
 export declare function htmlToText(html: string): string;
-/**
- * RFC 5322 threading: In-Reply-To/References must carry the parent's real
- * Message-ID header, not the Gmail API id. Falls back to the API id when the
- * header is missing so replies still thread inside Gmail.
- */
+/** In-Reply-To/References need the parent's real RFC 5322 Message-ID header, not the Gmail API id;
+ * falls back to the API id so replies still thread inside Gmail. */
 export declare function buildReplyHeaders(fallbackId: string, parentMessageIdHeader: string, parentReferences: string): {
     inReplyTo: string;
     references: string;
 };
-/**
- * Build a multipart/alternative body so HTML-capable clients render the rich
- * version and plain clients fall back. Returns the header value AND the body.
- * Caller composes the full message: headers (including this Content-Type) + CRLF + body.
- */
+/** multipart/alternative (plain fallback + HTML); caller composes the message: headers (incl. returned Content-Type) + CRLF + body. */
 export declare function buildMultipartAlternative(plainBody: string, htmlBody: string): {
     contentType: string;
     body: string;

package/dist/tools/gmail-mime.js

@@ -1,12 +1,7 @@
 import { randomBytes } from 'node:crypto';
-/**
- * RFC 2047 encoded-word (`=?utf-8?B?...?=`) for non-ASCII header text.
- * Long values are split into multiple <=75-char encoded-words separated
- * by `\r\n ` (CRLF SPACE) per the RFC's folding rule.
- */
+/** RFC 2047 encoded-word (`=?utf-8?B?...?=`) for non-ASCII header text; long values fold into <=75-char chunks joined by CRLF SPACE per the RFC. */
 export function encodeHeaderValue(value) {
-    // Span includes control chars on purpose — testing for "is this entire
-    // string ASCII?", not "is it printable?".
+    // Control chars in the span are intentional: testing "entirely ASCII", not "printable".
     // eslint-disable-next-line no-control-regex
     if (value === '' || /^[\x00-\x7F]*$/.test(value))
         return value;
@@ -16,9 +11,7 @@ export function encodeHeaderValue(value) {
     // base64 emits 4 output chars per 3 input bytes (always padded to a
     // multiple of 4). Round maxInner DOWN to a multiple of 4 first.
     const maxBytesPerChunk = Math.floor(maxInner / 4) * 3;
-    // Iterate by codepoint so each chunk's bytes form a complete UTF-8
-    // sequence — many MUAs decode encoded-words individually before joining,
-    // so a mid-byte split would surface as U+FFFD in those clients.
+    // Chunk on codepoint boundaries: many MUAs decode each encoded-word separately, so a mid-UTF-8-sequence split renders U+FFFD.
     const chunks = [];
     let buffered = [];
     for (const char of value) {
@@ -34,10 +27,7 @@ export function encodeHeaderValue(value) {
     }
     return chunks.join('\r\n ');
 }
-/**
- * Encode an address-list header (To/Cc/Bcc/From). RFC 2047 forbids
- * encoded-words inside the addr-spec, so only the display name is encoded.
- */
+/** Address-list headers (To/Cc/Bcc/From): RFC 2047 forbids encoded-words in the addr-spec, so only display names are encoded. */
 export function encodeAddressHeader(value) {
     if (value === '')
         return '';
@@ -56,10 +46,7 @@ export function encodeAddressHeader(value) {
         return trimmed;
     }).filter(Boolean).join(', ');
 }
-/**
- * RFC 5322 §2.3: CR and LF MUST only occur together as CRLF in bodies.
- * Normalize bare `\n` or `\r` to CRLF.
- */
+/** RFC 5322 §2.3 forbids bare CR or LF in bodies; normalize everything to CRLF. */
 export function normalizeBodyLineEndings(body) {
     return body.replace(/\r\n|\r|\n/g, '\r\n');
 }
@@ -95,10 +82,7 @@ function stripTags(input, replacement = '') {
     }
     return out;
 }
-/**
- * Best-effort HTML→plain-text for reading HTML-only emails. Regex-based on
- * purpose — no HTML parser dependency, and mail HTML is flat enough for it.
- */
+/** Best-effort HTML→plain-text for HTML-only emails; regex on purpose (avoids an HTML-parser dep, mail HTML is flat enough). */
 export function htmlToText(html) {
     // Repeat until stable: single-pass removal can leave behind sequences
     // reassembled from the removed span's edges (<scr<script>ipt>).
@@ -137,11 +121,8 @@ export function htmlToText(html) {
         .replace(/\n{3,}/g, '\n\n')
         .trim();
 }
-/**
- * RFC 5322 threading: In-Reply-To/References must carry the parent's real
- * Message-ID header, not the Gmail API id. Falls back to the API id when the
- * header is missing so replies still thread inside Gmail.
- */
+/** In-Reply-To/References need the parent's real RFC 5322 Message-ID header, not the Gmail API id;
+ * falls back to the API id so replies still thread inside Gmail. */
 export function buildReplyHeaders(fallbackId, parentMessageIdHeader, parentReferences) {
     const parentId = parentMessageIdHeader.trim();
     if (parentId === '')
@@ -152,19 +133,12 @@ export function buildReplyHeaders(fallbackId, parentMessageIdHeader, parentRefer
         references: refs === '' ? parentId : `${refs} ${parentId}`,
     };
 }
-/**
- * RFC 2046 §5.1.1 boundary token: 1-70 chars from a restricted set, no trailing space.
- * randomBytes hex output is only [0-9a-f], all of which are bcharsnospace.
- */
+/** RFC 2046 §5.1.1 boundary token: hex output is all bcharsnospace, length well under the 70-char cap. */
 function generateMimeBoundary() {
     // 5-char prefix + 32 hex chars = 37 chars, well under the 70-char limit.
     return `=_gm_${randomBytes(16).toString('hex')}`;
 }
-/**
- * Build a multipart/alternative body so HTML-capable clients render the rich
- * version and plain clients fall back. Returns the header value AND the body.
- * Caller composes the full message: headers (including this Content-Type) + CRLF + body.
- */
+/** multipart/alternative (plain fallback + HTML); caller composes the message: headers (incl. returned Content-Type) + CRLF + body. */
 export function buildMultipartAlternative(plainBody, htmlBody) {
     const boundary = generateMimeBoundary();
     const parts = [

package/dist/tools/gmail.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { coerceArray, coerceBoolean } from './_coerce.js';
-import { google } from 'googleapis';
+import { gmail as gmailClient } from '@googleapis/gmail';
 import { ACCOUNTS } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
@@ -120,7 +120,7 @@ export function registerGmailTools(server) {
     }, async ({ account, query, maxResults }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const listRes = await gmail.users.messages.list({
                 userId: 'me',
                 q: query,
@@ -171,7 +171,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageId, full, rawHtml }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.get({
                 userId: 'me',
                 id: messageId,
@@ -200,7 +200,7 @@ export function registerGmailTools(server) {
     }, async ({ account, threadId, full, rawHtml, mode }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             if (mode === 'summary') {
                 const res = await gmail.users.threads.get({
                     userId: 'me',
@@ -253,7 +253,7 @@ export function registerGmailTools(server) {
     }, async ({ account, to, subject, body, htmlBody, cc, replyToMessageId, replyToThreadId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const config = (await import('../accounts.js')).ACCOUNT_CONFIG[account];
             const headers = [
                 `From: ${encodeAddressHeader(config.email)}`,
@@ -312,7 +312,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageId, attachmentId, filename, savePath }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.attachments.get({
                 userId: 'me',
                 messageId,
@@ -351,7 +351,7 @@ export function registerGmailTools(server) {
     }, async ({ account, to, subject, body, htmlBody, cc, replyToMessageId, replyToThreadId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const config = (await import('../accounts.js')).ACCOUNT_CONFIG[account];
             const headers = [
                 `From: ${encodeAddressHeader(config.email)}`,
@@ -411,7 +411,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageId, addLabelIds, removeLabelIds }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.modify({
                 userId: 'me',
                 id: messageId,
@@ -437,7 +437,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.trash({ userId: 'me', id: messageId });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data, null, 2) }],
@@ -456,7 +456,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.messages.delete({ userId: 'me', id: messageId });
             return {
                 content: [{ type: 'text', text: JSON.stringify({ deleted: true, messageId }, null, 2) }],
@@ -477,7 +477,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageIds, addLabelIds, removeLabelIds }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.messages.batchModify({
                 userId: 'me',
                 requestBody: {
@@ -503,7 +503,7 @@ export function registerGmailTools(server) {
     }, async ({ account, messageIds }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.messages.batchDelete({
                 userId: 'me',
                 requestBody: { ids: messageIds },
@@ -527,7 +527,7 @@ export function registerGmailTools(server) {
     }, async ({ account, maxResults, query }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.drafts.list({
                 userId: 'me',
                 maxResults: maxResults ?? 20,
@@ -550,7 +550,7 @@ export function registerGmailTools(server) {
     }, async ({ account, draftId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.drafts.get({
                 userId: 'me',
                 id: draftId,
@@ -573,7 +573,7 @@ export function registerGmailTools(server) {
     }, async ({ account, draftId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.drafts.send({
                 userId: 'me',
                 requestBody: { id: draftId },
@@ -594,7 +594,7 @@ export function registerGmailTools(server) {
     }, async ({ account }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.labels.list({ userId: 'me' });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data.labels ?? [], null, 2) }],
@@ -617,7 +617,7 @@ export function registerGmailTools(server) {
     }, async ({ account, name, messageListVisibility, labelListVisibility }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.labels.create({
                 userId: 'me',
                 requestBody: {
@@ -643,7 +643,7 @@ export function registerGmailTools(server) {
     }, async ({ account, labelId }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.labels.delete({ userId: 'me', id: labelId });
             return {
                 content: [{ type: 'text', text: JSON.stringify({ deleted: true, labelId }, null, 2) }],
@@ -661,7 +661,7 @@ export function registerGmailTools(server) {
     }, async ({ account }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.getProfile({ userId: 'me' });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data, null, 2) }],
@@ -684,7 +684,7 @@ export function registerGmailTools(server) {
     }, async ({ account, startHistoryId, maxResults, historyTypes }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.history.list({
                 userId: 'me',
                 startHistoryId,
@@ -707,7 +707,7 @@ export function registerGmailTools(server) {
     }, async ({ account }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.settings.getVacation({ userId: 'me' });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data, null, 2) }],
@@ -732,7 +732,7 @@ export function registerGmailTools(server) {
     }, async ({ account, enableAutoReply, responseSubject, responseBodyPlainText, startTime, endTime, restrictToContacts, restrictToDomain }) => {
         try {
             const auth = await getClient(account);
-            const gmail = google.gmail({ version: 'v1', auth });
+            const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.settings.updateVacation({
                 userId: 'me',
                 requestBody: {

package/dist/tools/meet.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { google } from 'googleapis';
+import { meet as meetClient } from '@googleapis/meet';
 import { ACCOUNTS } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
@@ -17,7 +17,7 @@ export function registerMeetTools(server) {
     }, async ({ account, pageSize, pageToken, filter }) => {
         try {
             const auth = await getClient(account);
-            const meet = google.meet({ version: 'v2', auth });
+            const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.list({
                 pageSize: pageSize ?? 20,
                 pageToken,
@@ -40,7 +40,7 @@ export function registerMeetTools(server) {
     }, async ({ account, name }) => {
         try {
             const auth = await getClient(account);
-            const meet = google.meet({ version: 'v2', auth });
+            const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.get({ name });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data, null, 2) }],
@@ -62,7 +62,7 @@ export function registerMeetTools(server) {
     }, async ({ account, parent, pageSize, pageToken }) => {
         try {
             const auth = await getClient(account);
-            const meet = google.meet({ version: 'v2', auth });
+            const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.recordings.list({
                 parent,
                 pageSize: pageSize ?? 20,
@@ -88,7 +88,7 @@ export function registerMeetTools(server) {
     }, async ({ account, parent, pageSize, pageToken }) => {
         try {
             const auth = await getClient(account);
-            const meet = google.meet({ version: 'v2', auth });
+            const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.transcripts.list({
                 parent,
                 pageSize: pageSize ?? 20,
@@ -113,7 +113,7 @@ export function registerMeetTools(server) {
     }, async ({ account, parent, pageSize, pageToken }) => {
         try {
             const auth = await getClient(account);
-            const meet = google.meet({ version: 'v2', auth });
+            const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.transcripts.entries.list({
                 parent,
                 pageSize: pageSize ?? 200,

package/dist/tools/searchconsole.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { coerceArray, coerceJson } from './_coerce.js';
-import { google } from 'googleapis';
+import { searchconsole as searchconsoleClient } from '@googleapis/searchconsole';
+import { webmasters as webmastersClient } from '@googleapis/webmasters';
 import { ACCOUNTS } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
@@ -15,7 +16,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sites.list();
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data.siteEntry ?? [], null, 2) }],
@@ -34,7 +35,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sites.get({ siteUrl });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data, null, 2) }],
@@ -53,7 +54,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             await wm.sites.add({ siteUrl });
             return {
                 content: [{ type: 'text', text: JSON.stringify({ success: true, siteUrl }, null, 2) }],
@@ -72,7 +73,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             await wm.sites.delete({ siteUrl });
             return {
                 content: [{ type: 'text', text: JSON.stringify({ success: true, deleted: siteUrl }, null, 2) }],
@@ -92,7 +93,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sitemaps.list({ siteUrl });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data.sitemap ?? [], null, 2) }],
@@ -112,7 +113,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl, feedpath }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sitemaps.get({ siteUrl, feedpath });
             return {
                 content: [{ type: 'text', text: JSON.stringify(res.data, null, 2) }],
@@ -132,7 +133,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl, feedpath }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             await wm.sitemaps.submit({ siteUrl, feedpath });
             return {
                 content: [{ type: 'text', text: JSON.stringify({ success: true, siteUrl, feedpath }, null, 2) }],
@@ -152,7 +153,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl, feedpath }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             await wm.sitemaps.delete({ siteUrl, feedpath });
             return {
                 content: [{ type: 'text', text: JSON.stringify({ success: true, deleted: feedpath }, null, 2) }],
@@ -195,7 +196,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl, startDate, endDate, dimensions, type, dimensionFilterGroups, rowLimit, startRow, aggregationType, dataState }) => {
         try {
             const auth = await getClient(account);
-            const wm = google.webmasters({ version: 'v3', auth });
+            const wm = webmastersClient({ version: 'v3', auth });
             const requestBody = { startDate, endDate };
             if (dimensions)
                 requestBody.dimensions = dimensions;
@@ -237,7 +238,7 @@ export function registerSearchConsoleTools(server) {
     }, async ({ account, siteUrl, inspectionUrl, languageCode }) => {
         try {
             const auth = await getClient(account);
-            const searchconsole = google.searchconsole({ version: 'v1', auth });
+            const searchconsole = searchconsoleClient({ version: 'v1', auth });
             const res = await searchconsole.urlInspection.index.inspect({
                 requestBody: {
                     inspectionUrl,