mcp-google-multi 6.0.0-alpha.2 → 6.0.0-alpha.21

package/dist/tools/generated/licensing.js

@@ -1,6 +1,5 @@
 // GENERATED by scripts/gen-tools.ts — do not edit. Regenerate: npm run gen:tools
 import { z } from 'zod';
-import { coerceJson } from '../_coerce.js';
 import { accountField, registerGeneratedTool } from './_shared.js';
 export function registerLicensingGeneratedTools(registry) {
     // Interned method scope sets (shared across tools; see scope-observability).
@@ -44,11 +43,12 @@ export function registerLicensingGeneratedTools(registry) {
         method: { id: "licensing.licenseAssignments.insert", httpMethod: "POST", path: "apps/licensing/v1/product/{productId}/sku/{skuId}/user", baseUrl: "https://licensing.googleapis.com/", requiredParams: ["productId", "skuId"], scopes: S_licensing_v1[0] },
         params: [{ "field": "productId", "api": "productId", "location": "path" }, { "field": "skuId", "api": "skuId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "userId", "api": "userId" }],
         shape: {
             account: accountField(),
             productId: z.string().describe("A product's unique identifier. For more information about products in this version of the API, see Products and SKUs."),
             skuId: z.string().describe("A product SKU's unique identifier. For more information about available SKUs in this version of the API, see Products and SKUs."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("LicenseAssignmentInsert JSON request body. Top-level fields: userId."),
+            userId: z.string().describe("Email id of the user"),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -92,12 +92,20 @@ export function registerLicensingGeneratedTools(registry) {
         method: { id: "licensing.licenseAssignments.patch", httpMethod: "PATCH", path: "apps/licensing/v1/product/{productId}/sku/{skuId}/user/{userId}", baseUrl: "https://licensing.googleapis.com/", requiredParams: ["productId", "skuId", "userId"], scopes: S_licensing_v1[0] },
         params: [{ "field": "productId", "api": "productId", "location": "path" }, { "field": "skuId", "api": "skuId", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "etags", "api": "etags" }, { "field": "kind", "api": "kind" }, { "field": "productId_", "api": "productId" }, { "field": "productName", "api": "productName" }, { "field": "selfLink", "api": "selfLink" }, { "field": "skuId_", "api": "skuId" }, { "field": "skuName", "api": "skuName" }, { "field": "userId_", "api": "userId" }],
         shape: {
             account: accountField(),
             productId: z.string().describe("A product's unique identifier. For more information about products in this version of the API, see Products and SKUs."),
             skuId: z.string().describe("A product SKU's unique identifier. For more information about available SKUs in this version of the API, see Products and SKUs."),
             userId: z.string().describe("The user's current primary email address. If the user's email address changes, use the new email address in your API requests. Since a `userId` is subject to change, do not use a `userId` value as a k"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("LicenseAssignment JSON request body. Top-level fields: etags, kind, productId, productName, selfLink, skuId, skuName, userId."),
+            etags: z.string().describe("ETag of the resource.").optional(),
+            kind: z.string().describe("Identifies the resource as a LicenseAssignment, which is `licensing#licenseAssignment`.").optional(),
+            productId_: z.string().describe("A product's unique identifier. For more information about products in this version of the API, see Product and SKU IDs.").optional(),
+            productName: z.string().describe("Display Name of the product.").optional(),
+            selfLink: z.string().describe("Link to this page.").optional(),
+            skuId_: z.string().describe("A product SKU's unique identifier. For more information about available SKUs in this version of the API, see Products and SKUs.").optional(),
+            skuName: z.string().describe("Display Name of the sku of the product.").optional(),
+            userId_: z.string().describe("The user's current primary email address. If the user's email address changes, use the new email address in your API requests. Since a `userId` is subject to change, do not use a `userId` value as a k").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -108,12 +116,20 @@ export function registerLicensingGeneratedTools(registry) {
         method: { id: "licensing.licenseAssignments.update", httpMethod: "PUT", path: "apps/licensing/v1/product/{productId}/sku/{skuId}/user/{userId}", baseUrl: "https://licensing.googleapis.com/", requiredParams: ["productId", "skuId", "userId"], scopes: S_licensing_v1[0] },
         params: [{ "field": "productId", "api": "productId", "location": "path" }, { "field": "skuId", "api": "skuId", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "productId_", "api": "productId" }, { "field": "skuId_", "api": "skuId" }, { "field": "userId_", "api": "userId" }, { "field": "etags", "api": "etags" }, { "field": "kind", "api": "kind" }, { "field": "productName", "api": "productName" }, { "field": "selfLink", "api": "selfLink" }, { "field": "skuName", "api": "skuName" }],
         shape: {
             account: accountField(),
             productId: z.string().describe("A product's unique identifier. For more information about products in this version of the API, see Products and SKUs."),
             skuId: z.string().describe("A product SKU's unique identifier. For more information about available SKUs in this version of the API, see Products and SKUs."),
             userId: z.string().describe("The user's current primary email address. If the user's email address changes, use the new email address in your API requests. Since a `userId` is subject to change, do not use a `userId` value as a k"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("LicenseAssignment JSON request body. Top-level fields: etags, kind, productId, productName, selfLink, skuId, skuName, userId."),
+            productId_: z.string().describe("A product's unique identifier. For more information about products in this version of the API, see Product and SKU IDs."),
+            skuId_: z.string().describe("A product SKU's unique identifier. For more information about available SKUs in this version of the API, see Products and SKUs."),
+            userId_: z.string().describe("The user's current primary email address. If the user's email address changes, use the new email address in your API requests. Since a `userId` is subject to change, do not use a `userId` value as a k"),
+            etags: z.string().describe("ETag of the resource.").optional(),
+            kind: z.string().describe("Identifies the resource as a LicenseAssignment, which is `licensing#licenseAssignment`.").optional(),
+            productName: z.string().describe("Display Name of the product.").optional(),
+            selfLink: z.string().describe("Link to this page.").optional(),
+            skuName: z.string().describe("Display Name of the sku of the product.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/meet.js

@@ -155,10 +155,10 @@ export function registerMeetGeneratedTools(registry) {
         method: { id: "meet.spaces.endActiveConference", httpMethod: "POST", path: "v2/{+name}:endActiveConference", baseUrl: "https://meet.googleapis.com/", requiredParams: ["name"], scopes: S_meet_v2[1] },
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [],
         shape: {
             account: accountField(),
             name: z.string().describe("Required. Resource name of the space. Format: `spaces/{space}`. `{space}` is the resource identifier for the space. It's a unique, server-generated ID and is case sensitive. For example, `jQCFfuBOdN5z"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("EndActiveConferenceRequest JSON request body."),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/reseller.js

@@ -137,11 +137,13 @@ export function registerResellerGeneratedTools(registry) {
         method: { id: "reseller.subscriptions.changeRenewalSettings", httpMethod: "POST", path: "apps/reseller/v1/customers/{customerId}/subscriptions/{subscriptionId}/changeRenewalSettings", baseUrl: "https://reseller.googleapis.com/", requiredParams: ["customerId", "subscriptionId"], scopes: S_reseller_v1[1] },
         params: [{ "field": "customerId", "api": "customerId", "location": "path" }, { "field": "subscriptionId", "api": "subscriptionId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "kind", "api": "kind" }, { "field": "renewalType", "api": "renewalType" }],
         shape: {
             account: accountField(),
             customerId: z.string().describe("This can be either the customer's primary domain name or the customer's unique identifier. If the domain name for a customer changes, the old domain name cannot be used to access the customer, but the"),
             subscriptionId: z.string().describe("This is a required property. The `subscriptionId` is the subscription identifier and is unique for each customer. Since a `subscriptionId` changes when a subscription is updated, we recommend to not u"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("RenewalSettings JSON request body. Top-level fields: kind, renewalType."),
+            kind: z.string().describe("Identifies the resource as a subscription renewal setting. Value: `subscriptions#renewalSettings`").optional(),
+            renewalType: z.string().describe("Renewal settings for the annual commitment plan. For more detailed information, see renewal options in the administrator help center. When renewing a subscription, the `renewalType` is a required prop").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -152,11 +154,15 @@ export function registerResellerGeneratedTools(registry) {
         method: { id: "reseller.subscriptions.changeSeats", httpMethod: "POST", path: "apps/reseller/v1/customers/{customerId}/subscriptions/{subscriptionId}/changeSeats", baseUrl: "https://reseller.googleapis.com/", requiredParams: ["customerId", "subscriptionId"], scopes: S_reseller_v1[1] },
         params: [{ "field": "customerId", "api": "customerId", "location": "path" }, { "field": "subscriptionId", "api": "subscriptionId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "kind", "api": "kind" }, { "field": "licensedNumberOfSeats", "api": "licensedNumberOfSeats" }, { "field": "maximumNumberOfSeats", "api": "maximumNumberOfSeats" }, { "field": "numberOfSeats", "api": "numberOfSeats" }],
         shape: {
             account: accountField(),
             customerId: z.string().describe("This can be either the customer's primary domain name or the customer's unique identifier. If the domain name for a customer changes, the old domain name cannot be used to access the customer, but the"),
             subscriptionId: z.string().describe("This is a required property. The `subscriptionId` is the subscription identifier and is unique for each customer. Since a `subscriptionId` changes when a subscription is updated, we recommend to not u"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("Seats JSON request body. Top-level fields: kind, licensedNumberOfSeats, maximumNumberOfSeats, numberOfSeats."),
+            kind: z.string().describe("Identifies the resource as a subscription seat setting. Value: `subscriptions#seats`").optional(),
+            licensedNumberOfSeats: z.number().describe("Read-only field containing the current number of users that are assigned a license for the product defined in `skuId`. This field's value is equivalent to the numerical count of users returned by the ").optional(),
+            maximumNumberOfSeats: z.number().describe("This is a required property and is exclusive to subscriptions with `FLEXIBLE` or `TRIAL` plans. This property sets the maximum number of licensed users allowed on a subscription. This quantity can be ").optional(),
+            numberOfSeats: z.number().describe("This is a required property and is exclusive to subscriptions with `ANNUAL_MONTHLY_PAY` and `ANNUAL_YEARLY_PAY` plans. This property sets the maximum number of licenses assignable to users on a subscr").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/script.js

@@ -65,9 +65,11 @@ export function registerScriptGeneratedTools(registry) {
         method: { id: "script.projects.create", httpMethod: "POST", path: "v1/projects", baseUrl: "https://script.googleapis.com/", requiredParams: [], scopes: S_script_v1[1] },
         params: [{ "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "parentId", "api": "parentId" }, { "field": "title", "api": "title" }],
         shape: {
             account: accountField(),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("CreateProjectRequest JSON request body. Top-level fields: parentId, title."),
+            parentId: z.string().describe("The Drive ID of a parent file that the created script project is bound to. This is usually the ID of a Google Doc, Google Sheet, Google Form, or Google Slides file. If not set, a standalone script pro").optional(),
+            title: z.string().describe("The title for the project.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -78,10 +80,14 @@ export function registerScriptGeneratedTools(registry) {
         method: { id: "script.projects.deployments.create", httpMethod: "POST", path: "v1/projects/{scriptId}/deployments", baseUrl: "https://script.googleapis.com/", requiredParams: ["scriptId"], scopes: S_script_v1[2] },
         params: [{ "field": "scriptId", "api": "scriptId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "description", "api": "description" }, { "field": "manifestFileName", "api": "manifestFileName" }, { "field": "scriptId_", "api": "scriptId" }, { "field": "versionNumber", "api": "versionNumber" }],
         shape: {
             account: accountField(),
             scriptId: z.string().describe("The script project's Drive ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("DeploymentConfig JSON request body. Top-level fields: description, manifestFileName, scriptId, versionNumber."),
+            description: z.string().describe("The description for this deployment.").optional(),
+            manifestFileName: z.string().describe("The manifest file name for this deployment.").optional(),
+            scriptId_: z.string().describe("The script project's Drive ID.").optional(),
+            versionNumber: z.number().describe("The version number on which this deployment is based.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -206,10 +212,14 @@ export function registerScriptGeneratedTools(registry) {
         method: { id: "script.projects.versions.create", httpMethod: "POST", path: "v1/projects/{scriptId}/versions", baseUrl: "https://script.googleapis.com/", requiredParams: ["scriptId"], scopes: S_script_v1[1] },
         params: [{ "field": "scriptId", "api": "scriptId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "createTime", "api": "createTime" }, { "field": "description", "api": "description" }, { "field": "scriptId_", "api": "scriptId" }, { "field": "versionNumber", "api": "versionNumber" }],
         shape: {
             account: accountField(),
             scriptId: z.string().describe("The script project's Drive ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("Version JSON request body. Top-level fields: createTime, description, scriptId, versionNumber."),
+            createTime: z.string().describe("When the version was created.").optional(),
+            description: z.string().describe("The description for this version.").optional(),
+            scriptId_: z.string().describe("The script project's Drive ID.").optional(),
+            versionNumber: z.number().describe("The incremental ID that is created by Apps Script when a version is created. This is system assigned number and is immutable once created.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/searchconsole.js

@@ -1,6 +1,6 @@
 // GENERATED by scripts/gen-tools.ts — do not edit. Regenerate: npm run gen:tools
 import { z } from 'zod';
-import { coerceJson } from '../_coerce.js';
+import { coerceBoolean } from '../_coerce.js';
 import { accountField, registerGeneratedTool } from './_shared.js';
 export function registerSearchconsoleGeneratedTools(registry) {
     registerGeneratedTool(registry, {
@@ -10,9 +10,11 @@ export function registerSearchconsoleGeneratedTools(registry) {
         method: { id: "searchconsole.urlTestingTools.mobileFriendlyTest.run", httpMethod: "POST", path: "v1/urlTestingTools/mobileFriendlyTest:run", baseUrl: "https://searchconsole.googleapis.com/", requiredParams: [] },
         params: [{ "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "requestScreenshot", "api": "requestScreenshot" }, { "field": "url", "api": "url" }],
         shape: {
             account: accountField(),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("RunMobileFriendlyTestRequest JSON request body. Top-level fields: requestScreenshot, url."),
+            requestScreenshot: coerceBoolean.describe("Whether or not screenshot is requested. Default is false.").optional(),
+            url: z.string().describe("URL for inspection.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/sheets.js

@@ -56,11 +56,12 @@ export function registerSheetsGeneratedTools(registry) {
         method: { id: "sheets.spreadsheets.sheets.copyTo", httpMethod: "POST", path: "v4/spreadsheets/{spreadsheetId}/sheets/{sheetId}:copyTo", baseUrl: "https://sheets.googleapis.com/", requiredParams: ["spreadsheetId", "sheetId"], scopes: S_sheets_v4[0] },
         params: [{ "field": "sheetId", "api": "sheetId", "location": "path" }, { "field": "spreadsheetId", "api": "spreadsheetId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "destinationSpreadsheetId", "api": "destinationSpreadsheetId" }],
         shape: {
             account: accountField(),
             sheetId: z.number().describe("The ID of the sheet to copy."),
             spreadsheetId: z.string().describe("The ID of the spreadsheet containing the sheet to copy."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("CopySheetToAnotherSpreadsheetRequest JSON request body. Top-level fields: destinationSpreadsheetId."),
+            destinationSpreadsheetId: z.string().describe("The ID of the spreadsheet to copy the sheet to.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/tasks.js

@@ -14,10 +14,16 @@ export function registerTasksGeneratedTools(registry) {
         method: { id: "tasks.tasklists.update", httpMethod: "PUT", path: "tasks/v1/users/@me/lists/{tasklist}", baseUrl: "https://tasks.googleapis.com/", requiredParams: ["tasklist"], scopes: S_tasks_v1[0] },
         params: [{ "field": "tasklist", "api": "tasklist", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "etag", "api": "etag" }, { "field": "id", "api": "id" }, { "field": "kind", "api": "kind" }, { "field": "selfLink", "api": "selfLink" }, { "field": "title", "api": "title" }, { "field": "updated", "api": "updated" }],
         shape: {
             account: accountField(),
             tasklist: z.string().describe("Task list identifier."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("TaskList JSON request body. Top-level fields: etag, id, kind, selfLink, title, updated."),
+            etag: z.string().describe("ETag of the resource.").optional(),
+            id: z.string().describe("Task list identifier.").optional(),
+            kind: z.string().describe("Output only. Type of the resource. This is always \"tasks#taskList\".").optional(),
+            selfLink: z.string().describe("Output only. URL pointing to this task list. Used to retrieve, update, or delete this task list.").optional(),
+            title: z.string().describe("Title of the task list. Maximum length allowed: 1024 characters.").optional(),
+            updated: z.string().describe("Output only. Last modification time of the task list (as a RFC 3339 timestamp).").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/vault.js

@@ -1,6 +1,6 @@
 // GENERATED by scripts/gen-tools.ts — do not edit. Regenerate: npm run gen:tools
 import { z } from 'zod';
-import { coerceBoolean, coerceJson } from '../_coerce.js';
+import { coerceArray, coerceBoolean, coerceJson } from '../_coerce.js';
 import { accountField, registerGeneratedTool } from './_shared.js';
 export function registerVaultGeneratedTools(registry) {
     // Interned method scope sets (shared across tools; see scope-observability).
@@ -29,10 +29,10 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.close", httpMethod: "POST", path: "v1/matters/{matterId}:close", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId"], scopes: S_vault_v1[0] },
         params: [{ "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [],
         shape: {
             account: accountField(),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("CloseMatterRequest JSON request body."),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -154,11 +154,16 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.holds.accounts.create", httpMethod: "POST", path: "v1/matters/{matterId}/holds/{holdId}/accounts", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId", "holdId"], scopes: S_vault_v1[0] },
         params: [{ "field": "holdId", "api": "holdId", "location": "path" }, { "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "accountId", "api": "accountId" }, { "field": "email", "api": "email" }, { "field": "firstName", "api": "firstName" }, { "field": "holdTime", "api": "holdTime" }, { "field": "lastName", "api": "lastName" }],
         shape: {
             account: accountField(),
             holdId: z.string().describe("The hold ID."),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("HeldAccount JSON request body. Top-level fields: accountId, email, firstName, holdTime, lastName."),
+            accountId: z.string().describe("The account ID, as provided by the [Admin SDK](https://developers.google.com/admin-sdk/).").optional(),
+            email: z.string().describe("The primary email address of the account. If used as an input, this takes precedence over **accountId**.").optional(),
+            firstName: z.string().describe("Output only. The first name of the account holder.").optional(),
+            holdTime: z.string().describe("Output only. When the account was put on hold.").optional(),
+            lastName: z.string().describe("Output only. The last name of the account holder.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -198,11 +203,13 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.holds.addHeldAccounts", httpMethod: "POST", path: "v1/matters/{matterId}/holds/{holdId}:addHeldAccounts", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId", "holdId"], scopes: S_vault_v1[0] },
         params: [{ "field": "holdId", "api": "holdId", "location": "path" }, { "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "accountIds", "api": "accountIds" }, { "field": "emails", "api": "emails" }],
         shape: {
             account: accountField(),
             holdId: z.string().describe("The hold ID."),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("AddHeldAccountsRequest JSON request body. Top-level fields: accountIds, emails."),
+            accountIds: coerceArray(z.string()).describe("A comma-separated list of the account IDs of the accounts to add to the hold. Specify either **emails** or **account_ids**, but not both.").optional(),
+            emails: coerceArray(z.string()).describe("A comma-separated list of the emails of the accounts to add to the hold. Specify either **emails** or **account_ids**, but not both.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -272,11 +279,12 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.holds.removeHeldAccounts", httpMethod: "POST", path: "v1/matters/{matterId}/holds/{holdId}:removeHeldAccounts", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId", "holdId"], scopes: S_vault_v1[0] },
         params: [{ "field": "holdId", "api": "holdId", "location": "path" }, { "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "accountIds", "api": "accountIds" }],
         shape: {
             account: accountField(),
             holdId: z.string().describe("The hold ID."),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("RemoveHeldAccountsRequest JSON request body. Top-level fields: accountIds."),
+            accountIds: coerceArray(z.string()).describe("The account IDs of the accounts to remove from the hold.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -318,10 +326,11 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.removePermissions", httpMethod: "POST", path: "v1/matters/{matterId}:removePermissions", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId"], scopes: S_vault_v1[0] },
         params: [{ "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "accountId", "api": "accountId" }],
         shape: {
             account: accountField(),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("RemoveMatterPermissionsRequest JSON request body. Top-level fields: accountId."),
+            accountId: z.string().describe("The account ID.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -332,10 +341,10 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.reopen", httpMethod: "POST", path: "v1/matters/{matterId}:reopen", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId"], scopes: S_vault_v1[0] },
         params: [{ "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [],
         shape: {
             account: accountField(),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("ReopenMatterRequest JSON request body."),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -403,10 +412,10 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.matters.undelete", httpMethod: "POST", path: "v1/matters/{matterId}:undelete", baseUrl: "https://vault.googleapis.com/", requiredParams: ["matterId"], scopes: S_vault_v1[0] },
         params: [{ "field": "matterId", "api": "matterId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [],
         shape: {
             account: accountField(),
             matterId: z.string().describe("The matter ID."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("UndeleteMatterRequest JSON request body."),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -431,10 +440,10 @@ export function registerVaultGeneratedTools(registry) {
         method: { id: "vault.operations.cancel", httpMethod: "POST", path: "v1/{+name}:cancel", baseUrl: "https://vault.googleapis.com/", requiredParams: ["name"], scopes: S_vault_v1[0] },
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [],
         shape: {
             account: accountField(),
             name: z.string().describe("The name of the operation resource to be cancelled."),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("CancelOperationRequest JSON request body."),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/generated/workspaceevents.js

@@ -115,10 +115,10 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         method: { id: "workspaceevents.subscriptions.reactivate", httpMethod: "POST", path: "v1/{+name}:reactivate", baseUrl: "https://workspaceevents.googleapis.com/", requiredParams: ["name"], scopes: S_workspaceevents_v1[1] },
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [],
         shape: {
             account: accountField(),
             name: z.string().describe("Required. Resource name of the subscription. Format: `subscriptions/{subscription}`"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("ReactivateSubscriptionRequest JSON request body."),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });
@@ -129,10 +129,11 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         method: { id: "workspaceevents.tasks.cancel", httpMethod: "POST", path: "v1/{+name}:cancel", baseUrl: "https://workspaceevents.googleapis.com/", requiredParams: ["name"] },
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
+        bodyParams: [{ "field": "tenant", "api": "tenant" }],
         shape: {
             account: accountField(),
             name: z.string().describe("The resource name of the task to cancel. Format: tasks/{task_id}"),
-            body: coerceJson(z.record(z.string(), z.unknown())).describe("CancelTaskRequest JSON request body. Top-level fields: tenant."),
+            tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
     });

package/dist/tools/gmail.js

@@ -5,6 +5,7 @@ import { accountAliasSchema } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError, mapGoogleError } from './_errors.js';
 import { buildReplyHeaders, composeRaw, renderMarkdown, htmlToMarkdown, HeaderInjectionError } from './gmail-mime.js';
+import { prepareLocalDest } from './_local-files.js';
 import addressparser from 'nodemailer/lib/addressparser/index.js';
 import { lookup as lookupMime } from 'mime-types';
 import { configDir } from '../config-file.js';
@@ -664,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 {
@@ -679,8 +680,7 @@ export function registerGmailTools(server) {
             if (!data)
                 throw new Error('No attachment data returned');
             const buffer = Buffer.from(data, 'base64url');
-            // Strip path components so callers can't escape savePath via "../".
-            const fullPath = path.join(savePath, path.basename(filename));
+            const fullPath = prepareLocalDest(savePath, filename);
             await fs.promises.writeFile(fullPath, buffer, { mode: 0o600 });
             return {
                 content: [{ type: 'text', text: `Saved to ${fullPath} (${buffer.length} bytes)` }],

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,8 +4,9 @@ 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';
+import { SUPPORTED_APIS, resolveApiAliases, cudFromMethod, loadMethodIndex, searchMethods, } from '../discovery-client.js';
 const accountEnum = accountAliasSchema.optional();
 // Policy/toolset namespace for each API alias must match the NAMED tools' service
 // names, or user deny globs and GOOGLE_TOOLSETS silently miss escape-hatch calls.
@@ -28,7 +29,20 @@ const SERVICE_FOR_ALIAS = {
     admin_reports: 'admin',
     admin_datatransfer: 'admin',
     groupssettings: 'groupssettings',
+    analyticsadmin: 'analytics',
+    analyticsdata: 'analytics',
 };
+/** 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,
@@ -47,7 +61,7 @@ export function registerEscapeTools(registry, policy, deps = {}) {
     const apiEnabled = (alias) => {
         return toolsetEnabled(toolsets, serviceForAlias(alias));
     };
-    const enabledApis = Object.keys(WORKSPACE_APIS).filter(apiEnabled);
+    const enabledApis = Object.keys(SUPPORTED_APIS).filter(apiEnabled);
     const apiList = enabledApis.join(', ');
     const toolsetDisabled = (alias) => jsonResult({
         error: 'toolset_disabled',
@@ -66,12 +80,20 @@ export function registerEscapeTools(registry, policy, deps = {}) {
         },
         annotations: { openWorldHint: true },
     }, async ({ query, api, maxResults }) => {
-        if (api && !WORKSPACE_APIS[api]) {
-            return jsonResult({ error: 'unknown_api', message: `Unknown api "${api}".`, hint: `Known APIs: ${apiList}`, retriable: false }, true);
+        // Alias resolution: "analytics" fans out to both GA4 Discovery APIs
+        // instead of dead-ending on unknown_api.
+        let requested = null;
+        if (api) {
+            requested = resolveApiAliases(api);
+            if (!requested) {
+                return jsonResult({ error: 'unknown_api', message: `Unknown api "${api}".`, hint: `Known APIs: ${apiList}`, retriable: false }, true);
+            }
+            const enabled = requested.filter(apiEnabled);
+            if (enabled.length === 0)
+                return toolsetDisabled(requested[0]);
+            requested = enabled;
         }
-        if (api && !apiEnabled(api))
-            return toolsetDisabled(api);
-        const apis = api ? [api] : enabledApis;
+        const apis = requested ?? enabledApis;
         const unavailable = [];
         const indexes = await Promise.all(apis.map(async (a) => {
             try {
@@ -84,6 +106,9 @@ export function registerEscapeTools(registry, policy, deps = {}) {
         }));
         const matches = searchMethods(indexes.flat(), query, maxResults ?? 10);
         return jsonResult({
+            // Teach the resolved keys whenever the input wasn't already one, so the
+            // follow-up google_api_call uses a real key.
+            ...(requested && (requested.length > 1 || requested[0] !== api) ? { resolvedApi: requested } : {}),
             methods: matches.map(describeMethod),
             ...(unavailable.length > 0 ? { unavailableApis: unavailable } : {}),
             next: 'Invoke with google_api_call({account, api, methodId, pathParams, queryParams, body}).',
@@ -115,30 +140,49 @@ export function registerEscapeTools(registry, policy, deps = {}) {
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: true },
         _meta: { 'anthropic/maxResultSizeChars': 100_000 },
     }, async ({ account, api, methodId, pathParams, queryParams, body }) => {
-        if (!WORKSPACE_APIS[api]) {
+        const resolved = resolveApiAliases(api);
+        if (!resolved) {
             return jsonResult({ error: 'unknown_api', message: `Unknown api "${api}".`, hint: `Known APIs: ${apiList}`, retriable: false, account }, true);
         }
-        if (!apiEnabled(api))
-            return toolsetDisabled(api);
+        if (resolved.length > 1) {
+            // A call targets exactly one Discovery doc; only search can fan out.
+            return jsonResult({ error: 'unknown_api', message: `"${api}" maps to ${resolved.length} APIs.`, hint: `Pass one of: ${resolved.join(', ')} (method ids differ per API; google_api_search({query, api: "${api}"}) finds the right one).`, retriable: false, account }, true);
+        }
+        const apiKey = resolved[0];
+        if (!apiEnabled(apiKey))
+            return toolsetDisabled(apiKey);
         let index;
         try {
-            index = await loadMethodIndex(api, deps);
+            index = await loadMethodIndex(apiKey, 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 === apiKey || 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.`,
+                message: `No method "${methodId}" in ${apiKey}.`,
+                hint: `${near.length ? `Did you mean: ${near.join(', ')}? ` : ''}` +
+                    `Use google_api_search({query: "...", api: "${apiKey}"}) to find the right method id.`,
                 retriable: false,
                 account,
             }, true);
         }
         const cud = cudFromMethod(method);
-        const policyService = serviceForAlias(api);
+        const policyService = serviceForAlias(apiKey);
         const lastSegment = method.id.split('.').pop() ?? method.id;
         const toolRef = { name: `${policyService}_${lastSegment}`, service: policyService, cud };
         if (cud !== 'read' && !isAllowed(toolRef, policy)) {