mcp-google-multi 6.0.0-alpha.4 → 6.0.0-alpha.6

package/dist/scope-catalog.d.ts

@@ -17,3 +17,4 @@ export declare const BUNDLE_ALIASES: Record<string, string>;
 export declare function resolveBundleAliases(bundles: string[]): string[];
 /** Closest catalog key for E_UNKNOWN_BUNDLE remediation (edit distance <= 2). */
 export declare function closestBundle(name: string): string | undefined;
+export declare function editDistance(a: string, b: string): number;

package/dist/scope-catalog.js

@@ -169,7 +169,7 @@ export function closestBundle(name) {
     }
     return best;
 }
-function editDistance(a, b) {
+export function editDistance(a, b) {
     const dp = Array.from({ length: a.length + 1 }, (_, i) => [i, ...Array(b.length).fill(0)]);
     for (let j = 1; j <= b.length; j++)
         dp[0][j] = j;

package/dist/tools/drive.d.ts

@@ -1,4 +1,6 @@
 import type { ToolRegistry } from '../registry.js';
+export declare function isTextualMime(mimeType: string): boolean;
+export declare function resolveConvertTarget(convertTo: string | undefined): string | undefined;
 export declare const DRIVE_QUERY_HINT: string;
 export declare function normalizeDriveQuery(raw: string): string;
 export declare function isDriveInvalidQuery(error: any): boolean;

package/dist/tools/drive.js

@@ -25,6 +25,52 @@ const GOOGLE_WORKSPACE_TYPES = new Set([
     'application/vnd.google-apps.presentation',
     'application/vnd.google-apps.drawing',
 ]);
+// drive_read inlines only textual content. Beyond text/*, RFC 6839 structured-
+// syntax suffixes (+json/+xml/...) and a few bare application/* types are text
+// in practice — image/svg+xml was the motivating false "binary" refusal.
+const TEXTUAL_EXACT = new Set([
+    'application/json',
+    'application/xml',
+    'application/javascript',
+    'application/x-ndjson',
+    'application/yaml',
+    'application/x-yaml',
+    'application/sql',
+    'application/x-sh',
+    'application/csv',
+]);
+export function isTextualMime(mimeType) {
+    const bare = mimeType.split(';')[0].trim().toLowerCase();
+    if (bare.startsWith('text/'))
+        return true;
+    if (/\+(json|xml|yaml|toml|csv)$/.test(bare))
+        return true;
+    return TEXTUAL_EXACT.has(bare);
+}
+const BINARY_READ_HINT = 'Binary content cannot be inlined. Use drive_download to save the file to disk, or drive_export for Google Workspace files.';
+// Accepted alongside the full application/vnd.google-apps.* ids so the obvious
+// short spelling ("document") works; the enum advertises both.
+const CONVERT_SHORTHANDS = {
+    document: 'application/vnd.google-apps.document',
+    spreadsheet: 'application/vnd.google-apps.spreadsheet',
+    presentation: 'application/vnd.google-apps.presentation',
+    drawing: 'application/vnd.google-apps.drawing',
+};
+export function resolveConvertTarget(convertTo) {
+    if (!convertTo)
+        return undefined;
+    return CONVERT_SHORTHANDS[convertTo] ?? convertTo;
+}
+const CONVERT_TO_VALUES = [
+    'document',
+    'spreadsheet',
+    'presentation',
+    'drawing',
+    'application/vnd.google-apps.document',
+    'application/vnd.google-apps.spreadsheet',
+    'application/vnd.google-apps.presentation',
+    'application/vnd.google-apps.drawing',
+];
 // Comment/Reply fields list — Drive API requires explicit `fields` on every call.
 const COMMENT_BASE_FIELDS = 'id,kind,content,htmlContent,createdTime,modifiedTime,resolved,anchor,author,deleted,quotedFileContent';
 const REPLY_SUBFIELDS = 'id,content,action,createdTime,modifiedTime,author,deleted';
@@ -126,7 +172,7 @@ export function registerDriveTools(server) {
     });
     server.registerTool('drive_read', {
         _meta: { 'anthropic/maxResultSizeChars': 100_000 },
-        description: 'Read the content of a Google Drive file (returns up to maxChars characters per call; non-Google-native files over 2MB return too_large)',
+        description: 'Read the content of a Google Drive file: Workspace docs and textual types (text/*, JSON/XML/SVG and similar) inline; other binaries return error:binary (returns up to maxChars characters per call; non-Google-native files over 2MB return too_large)',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
             fileId: z.string().describe('Google Drive file ID'),
@@ -179,6 +225,7 @@ export function registerDriveTools(server) {
                                 name,
                                 mimeType,
                                 error: 'binary',
+                                hint: BINARY_READ_HINT,
                                 webViewLink,
                             }, null, 2),
                         }],
@@ -199,7 +246,7 @@ export function registerDriveTools(server) {
                         }],
                 };
             }
-            if (mimeType?.startsWith('text/')) {
+            if (mimeType && isTextualMime(mimeType)) {
                 const downloaded = await drive.files.get({ fileId, alt: 'media', supportsAllDrives: true }, { responseType: 'text' });
                 return respond(String(downloaded.data));
             }
@@ -211,6 +258,7 @@ export function registerDriveTools(server) {
                             name,
                             mimeType,
                             error: 'binary',
+                            hint: BINARY_READ_HINT,
                             webViewLink,
                         }, null, 2),
                     }],
@@ -254,15 +302,10 @@ export function registerDriveTools(server) {
         description: 'Upload a local file to Google Drive. Pass `convertTo` to import it as a native, editable Google Doc/Sheet/Slides/Drawing instead of storing the raw bytes.',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
-            localPath: z.string().describe('Absolute path to file on disk'),
+            localPath: z.string().describe('Absolute path of the SOURCE file on disk to upload (on the machine running the server; this is not savePath)'),
             filename: z.string().describe('Name as it appears in Drive'),
             mimeType: z.string().optional().describe('Source MIME type of the local file (inferred from extension if omitted). With `convertTo`, this is the format Drive imports from.'),
-            convertTo: z.enum([
-                'application/vnd.google-apps.document',
-                'application/vnd.google-apps.spreadsheet',
-                'application/vnd.google-apps.presentation',
-                'application/vnd.google-apps.drawing',
-            ]).optional().describe('Convert the upload into this native Google Workspace type on import (e.g. upload .md/.html/.docx/.txt with convertTo=...google-apps.document to get a real Google Doc). Source must be an importable format. Omit to store the file as-is.'),
+            convertTo: z.enum(CONVERT_TO_VALUES).optional().describe('Convert the upload into this native Google Workspace type on import: "document" | "spreadsheet" | "presentation" | "drawing" (full application/vnd.google-apps.* ids also accepted). E.g. upload .md/.html/.docx/.txt with convertTo=document to get a real Google Doc. Source must be an importable format. Omit to store the file as-is.'),
             parentFolderId: z.string().optional().describe('Parent folder ID (defaults to My Drive root)'),
         },
     }, async ({ account, localPath, filename, mimeType: mimeTypeArg, convertTo, parentFolderId }) => {
@@ -276,7 +319,7 @@ export function registerDriveTools(server) {
                     name: filename,
                     parents: parentFolderId ? [parentFolderId] : undefined,
                     // Setting a google-apps target type makes Drive convert the media on import.
-                    ...(convertTo ? { mimeType: convertTo } : {}),
+                    ...(convertTo ? { mimeType: resolveConvertTarget(convertTo) } : {}),
                 },
                 media: {
                     mimeType: resolvedMime,
@@ -298,14 +341,17 @@ export function registerDriveTools(server) {
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
             fileId: z.string().describe('Google Drive file ID'),
-            savePath: z.string().describe('Absolute directory path to save into'),
-            filename: z.string().describe('Filename to save as'),
+            savePath: z.string().describe('Absolute DIRECTORY path to save into (created if missing, on the machine running the server); the file name comes from `filename`'),
+            filename: z.string().optional().describe('Filename to save as (defaults to the file name in Drive)'),
         },
     }, async ({ account, fileId, savePath, filename }) => {
         try {
             const auth = await getClient(account);
             const drive = driveClient({ version: 'v3', auth });
-            const dest = prepareLocalDest(savePath, filename);
+            const name = filename
+                ?? (await drive.files.get({ fileId, fields: 'name', supportsAllDrives: true })).data.name
+                ?? fileId;
+            const dest = prepareLocalDest(savePath, name);
             const res = await drive.files.get({ fileId, alt: 'media', supportsAllDrives: true }, { responseType: 'stream' });
             // pipeline destroys both streams on source/sink error; raw .pipe leaks the partial file.
             await pipeline(res.data, fs.createWriteStream(dest, { mode: 0o600 }));
@@ -324,14 +370,20 @@ export function registerDriveTools(server) {
             account: accountEnum.describe('Google account alias'),
             fileId: z.string().describe('Google Drive file ID'),
             mimeType: z.string().describe('Target export MIME type (e.g. "application/pdf", "text/markdown", "application/vnd.openxmlformats-officedocument.wordprocessingml.document")'),
-            savePath: z.string().describe('Absolute directory path to save into'),
-            filename: z.string().describe('Filename to save as'),
+            savePath: z.string().describe('Absolute DIRECTORY path to save into (created if missing, on the machine running the server); the file name comes from `filename`'),
+            filename: z.string().optional().describe('Filename to save as (defaults to the Drive name plus the extension implied by mimeType)'),
         },
     }, async ({ account, fileId, mimeType: exportMime, savePath, filename }) => {
         try {
             const auth = await getClient(account);
             const drive = driveClient({ version: 'v3', auth });
-            const dest = prepareLocalDest(savePath, filename);
+            let name = filename;
+            if (!name) {
+                const meta = await drive.files.get({ fileId, fields: 'name', supportsAllDrives: true });
+                const ext = mime.extension(exportMime);
+                name = `${meta.data.name ?? fileId}${ext ? `.${ext}` : ''}`;
+            }
+            const dest = prepareLocalDest(savePath, name);
             const res = await drive.files.export({ fileId, mimeType: exportMime }, { responseType: 'stream' });
             // pipeline destroys both streams on source/sink error; raw .pipe leaks the partial file.
             await pipeline(res.data, fs.createWriteStream(dest, { mode: 0o600 }));
@@ -379,14 +431,9 @@ export function registerDriveTools(server) {
             fileId: z.string().describe('Google Drive file ID'),
             newName: z.string().optional().describe('New filename'),
             newParentFolderId: z.string().optional().describe('Move to this folder'),
-            localPath: z.string().optional().describe('Replace file content with this local file'),
+            localPath: z.string().optional().describe('Replace file content with this local file (path on the machine running the server)'),
             mimeType: z.string().optional().describe('MIME type of the replacement file (required if localPath is provided)'),
-            convertTo: z.enum([
-                'application/vnd.google-apps.document',
-                'application/vnd.google-apps.spreadsheet',
-                'application/vnd.google-apps.presentation',
-                'application/vnd.google-apps.drawing',
-            ]).optional().describe('When replacing content via localPath, convert the new content into this native Google Workspace type on import (e.g. replace a Google Doc body from a local .docx). Source must be an importable format.'),
+            convertTo: z.enum(CONVERT_TO_VALUES).optional().describe('When replacing content via localPath, convert the new content into this native Google Workspace type on import: "document" | "spreadsheet" | "presentation" | "drawing" (full application/vnd.google-apps.* ids also accepted).'),
         },
     }, async ({ account, fileId, newName, newParentFolderId, localPath: localPathArg, mimeType: mimeTypeArg, convertTo }) => {
         try {
@@ -412,7 +459,7 @@ export function registerDriveTools(server) {
                     body: await openLocalReadStream(localPathArg),
                 };
                 if (convertTo)
-                    requestBody.mimeType = convertTo;
+                    requestBody.mimeType = resolveConvertTarget(convertTo);
             }
             const res = await drive.files.update(params);
             return {

package/dist/tools/gmail.js

@@ -665,7 +665,7 @@ export function registerGmailTools(server) {
             messageId: z.string().describe('The Gmail message ID'),
             attachmentId: z.string().describe('The attachment ID from gmail_read response'),
             filename: z.string().describe('Filename to save as (e.g. report.xlsx)'),
-            savePath: z.string().describe('Absolute directory path to save into, e.g. /home/user/Downloads'),
+            savePath: z.string().describe('Absolute DIRECTORY path to save into (created if missing, on the machine running the server), e.g. /home/user/Downloads; the file name comes from `filename`'),
         },
     }, async ({ account, messageId, attachmentId, filename, savePath }) => {
         try {

package/dist/tools/google-api.d.ts

@@ -2,9 +2,12 @@ import type { ToolRegistry } from '../registry.js';
 import { type Policy } from '../write-control.js';
 import { getClient } from '../client.js';
 import { type Toolsets } from '../toolsets.js';
-import { type DiscoveryDeps } from '../discovery-client.js';
+import { type DiscoveryDeps, type DiscoveryMethod } from '../discovery-client.js';
 export interface EscapeDeps extends DiscoveryDeps {
     getClientFn?: typeof getClient;
     toolsets?: Toolsets;
 }
+/** Up to three closest known ids for the unknown_method did-you-mean hint;
+ * bounded distance so unrelated ids never masquerade as suggestions. */
+export declare function nearestMethodIds(methodId: string, index: DiscoveryMethod[]): string[];
 export declare function registerEscapeTools(registry: ToolRegistry, policy: Policy, deps?: EscapeDeps): void;

package/dist/tools/google-api.js

@@ -4,6 +4,7 @@ import { accountAliasSchema } from '../accounts.js';
 import { getClient } from '../client.js';
 import { coerceJson } from './_coerce.js';
 import { getToolsets, toolsetEnabled } from '../toolsets.js';
+import { editDistance } from '../scope-catalog.js';
 import { executeApiMethod, jsonResult } from '../executor.js';
 import { WORKSPACE_APIS, cudFromMethod, loadMethodIndex, searchMethods, } from '../discovery-client.js';
 const accountEnum = accountAliasSchema.optional();
@@ -29,6 +30,17 @@ const SERVICE_FOR_ALIAS = {
     admin_datatransfer: 'admin',
     groupssettings: 'groupssettings',
 };
+/** Up to three closest known ids for the unknown_method did-you-mean hint;
+ * bounded distance so unrelated ids never masquerade as suggestions. */
+export function nearestMethodIds(methodId, index) {
+    const maxDist = Math.max(3, Math.floor(methodId.length / 3));
+    return index
+        .map((m) => ({ id: m.id, d: editDistance(methodId.toLowerCase(), m.id.toLowerCase()) }))
+        .filter((x) => x.d <= maxDist)
+        .sort((a, b) => a.d - b.d)
+        .slice(0, 3)
+        .map((x) => x.id);
+}
 function describeMethod(m) {
     return {
         api: m.api,
@@ -127,12 +139,25 @@ export function registerEscapeTools(registry, policy, deps = {}) {
         catch (err) {
             return jsonResult({ error: 'discovery_unavailable', message: err.message, retriable: true, account }, true);
         }
-        const method = index.find((m) => m.id === methodId);
+        let method = index.find((m) => m.id === methodId);
+        if (!method) {
+            // Some discovery docs keep a legacy id prefix (the searchconsole doc's
+            // methods are webmasters.*): when the caller prefixed with our api
+            // alias, retry under the doc's own prefix before failing.
+            const docPrefix = index[0]?.id.split('.')[0];
+            const [head, ...rest] = String(methodId).split('.');
+            if (docPrefix && head === api && head !== docPrefix && rest.length > 0) {
+                const swapped = [docPrefix, ...rest].join('.');
+                method = index.find((m) => m.id === swapped);
+            }
+        }
         if (!method) {
+            const near = nearestMethodIds(String(methodId), index);
             return jsonResult({
                 error: 'unknown_method',
                 message: `No method "${methodId}" in ${api}.`,
-                hint: `Use google_api_search({query: "...", api: "${api}"}) to find the right method id.`,
+                hint: `${near.length ? `Did you mean: ${near.join(', ')}? ` : ''}` +
+                    `Use google_api_search({query: "...", api: "${api}"}) to find the right method id.`,
                 retriable: false,
                 account,
             }, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-google-multi",
-  "version": "6.0.0-alpha.4",
+  "version": "6.0.0-alpha.6",
   "description": "Local MCP server for Google Workspace (Gmail, Drive, Calendar, Sheets, Docs, Contacts, Tasks, Meet, Search Console, +Forms/Chat/Admin) across multiple accounts — OAuth-only, encrypted token storage, deny-by-default writes.",
   "type": "module",
   "license": "MIT",