mcp-google-multi 6.0.0-alpha.14 → 6.0.0-alpha.16

package/dist/discovery-client.js

@@ -126,20 +126,34 @@ export async function loadMethodIndex(api, deps = {}) {
     if (cacheFresh())
         doc = readCache();
     if (!doc) {
-        const url = `https://www.googleapis.com/discovery/v1/apis/${spec.id}/${spec.version}/rest`;
-        try {
-            const res = await fetchFn(url);
-            if (!res.ok)
-                throw new Error(`HTTP ${res.status}`);
-            doc = (await res.json());
-            fs.mkdirSync(cacheDir, { recursive: true });
-            fs.writeFileSync(cacheFile, JSON.stringify(doc), { mode: 0o600 });
+        // Newer APIs (analyticsadmin/analyticsdata) are absent from the central
+        // discovery directory (404); each service's own $discovery endpoint is
+        // authoritative, so try both — same fallback as scripts/fetch-discovery.
+        const urls = [
+            `https://www.googleapis.com/discovery/v1/apis/${spec.id}/${spec.version}/rest`,
+            `https://${spec.id}.googleapis.com/$discovery/rest?version=${spec.version}`,
+        ];
+        let fetchError;
+        for (const url of urls) {
+            try {
+                const res = await fetchFn(url);
+                if (!res.ok)
+                    throw new Error(`HTTP ${res.status}`);
+                doc = (await res.json());
+                fs.mkdirSync(cacheDir, { recursive: true });
+                fs.writeFileSync(cacheFile, JSON.stringify(doc), { mode: 0o600 });
+                break;
+            }
+            catch (err) {
+                fetchError = err;
+                doc = undefined;
+            }
         }
-        catch (err) {
+        if (!doc) {
             doc = readCache();
             staleFallback = true;
             if (!doc) {
-                throw new Error(`Could not fetch the Google API Discovery document for "${api}" and no local cache exists (${err.message}). Retry when online.`, { cause: err });
+                throw new Error(`Could not fetch the Google API Discovery document for "${api}" and no local cache exists (${fetchError?.message ?? 'fetch failed'}). Retry when online.`, { cause: fetchError });
             }
         }
     }

package/dist/scope-catalog.js

@@ -108,13 +108,22 @@ export const BUNDLE_CATALOG = {
         description: 'Read Gmail Postmaster Tools deliverability data.',
         risk: 'low',
     },
-    // Read-only by design: GA4 admin writes need analytics.edit, which ships as
-    // a separate opt-in bundle only if real demand appears (plan 6.0.0 GA-1).
     analytics: {
         scopes: ['https://www.googleapis.com/auth/analytics.readonly'],
         description: 'Read Google Analytics (GA4): run reports and inspect accounts, properties and their configuration.',
         risk: 'low',
     },
+    // Includes readonly so it is self-sufficient: analytics.edit alone does not
+    // authorize Data API reads. The smaller `analytics` bundle stays the hint
+    // target for read scopes (scope-observability sorts bundles by size).
+    analytics_write: {
+        scopes: [
+            'https://www.googleapis.com/auth/analytics.readonly',
+            'https://www.googleapis.com/auth/analytics.edit',
+        ],
+        description: 'Edit Google Analytics (GA4) configuration: properties, data streams, key events, custom dimensions and metrics. Includes read access.',
+        risk: 'medium',
+    },
     groupssettings: {
         scopes: ['https://www.googleapis.com/auth/apps.groups.settings'],
         description: 'Change Google Groups settings for the domain.',

package/dist/services.js

@@ -26,7 +26,7 @@ export const SERVICES = [
     { name: 'slides', register: registerSlidesTools, enabled: () => new Set(getOptionalBundles()).has('slides') },
     { name: 'forms', register: registerFormsTools, enabled: () => new Set(getOptionalBundles()).has('forms') },
     { name: 'chat', register: registerChatTools, enabled: () => new Set(getOptionalBundles()).has('chat') },
-    { name: 'analytics', register: registerAnalyticsTools, enabled: () => new Set(getOptionalBundles()).has('analytics') },
+    { name: 'analytics', register: registerAnalyticsTools, enabled: () => { const b = new Set(getOptionalBundles()); return b.has('analytics') || b.has('analytics_write'); } },
     { name: 'admin', register: registerAdminTools, enabled: () => getAdminAccounts().length > 0 },
 ];
 // Generated-only services with opt-in scopes; admin/forms/chat/analytics reuse their curated gate in buildRegistry,

package/dist/tools/generated/_shared.d.ts

@@ -13,6 +13,12 @@ export interface GeneratedToolDef {
     method: ApiMethodRef;
     params: GeneratedParam[];
     hasBody: boolean;
+    /** Typed-body tier: these top-level args assemble into the request body
+     * (flat schemas only; deep schemas keep the single opaque `body` arg). */
+    bodyParams?: Array<{
+        field: string;
+        api: string;
+    }>;
     shape: z.ZodRawShape;
 }
 export declare function accountField(): z.ZodOptional<z.ZodType<string, unknown, z.core.$ZodTypeInternals<string, unknown>>>;

package/dist/tools/generated/_shared.js

@@ -25,11 +25,21 @@ export function registerGeneratedTool(registry, def, deps = {}) {
             else
                 queryParams[p.api] = value;
         }
+        let body = def.hasBody ? args.body : undefined;
+        if (def.bodyParams) {
+            const assembled = {};
+            for (const bp of def.bodyParams) {
+                const value = args[bp.field];
+                if (value !== undefined)
+                    assembled[bp.api] = value;
+            }
+            body = assembled;
+        }
         return executeApiMethod(def.method, {
             account: args.account,
             pathParams,
             queryParams,
-            body: def.hasBody ? args.body : undefined,
+            body,
         }, deps);
     });
 }