mcp-google-multi 6.0.0-alpha.10 → 6.0.0-alpha.11

package/dist/arg-normalize.d.ts

@@ -1,13 +1,19 @@
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
 export declare function argNormalizationEnabled(env?: NodeJS.ProcessEnv): boolean;
-export declare function normalizeCallArguments(shapeKeys: ReadonlySet<string>, args: Record<string, unknown>): {
+/** Declared scalar kind per schema key; drives value coercion on RENAMED keys
+ * only. Clients string-encode values for keys absent from the advertised
+ * schema, so a renamed key almost always arrives as a string — without
+ * coercion the rename would just move the -32602 from the key to the value. */
+export type ArgKind = 'number' | 'boolean' | 'other';
+export type ArgShape = ReadonlyMap<string, ArgKind>;
+export declare function normalizeCallArguments(shape: ArgShape, args: Record<string, unknown>): {
     args: Record<string, unknown>;
     renamed: [string, string][];
 };
-export declare function normalizeMessage(msg: JSONRPCMessage, shapeFor: (tool: string) => ReadonlySet<string> | undefined, log?: (line: string) => void): JSONRPCMessage;
+export declare function normalizeMessage(msg: JSONRPCMessage, shapeFor: (tool: string) => ArgShape | undefined, log?: (line: string) => void): JSONRPCMessage;
 /** Wrap a server-side transport so tools/call argument keys are normalized
  * before the SDK validates them. The Protocol assigns `onmessage` during
  * connect(); the interceptor lives in that setter, so the wrapper works
  * identically for stdio and (per-request, stateless) HTTP transports. */
-export declare function withArgNormalization(transport: Transport, shapeFor: (tool: string) => ReadonlySet<string> | undefined, log?: (line: string) => void): Transport;
+export declare function withArgNormalization(transport: Transport, shapeFor: (tool: string) => ArgShape | undefined, log?: (line: string) => void): Transport;

package/dist/arg-normalize.js

@@ -10,16 +10,26 @@ export function argNormalizationEnabled(env = process.env) {
     return !/^(0|false|off|no)$/i.test((env.GOOGLE_ARG_NORMALIZE ?? '').trim());
 }
 const snakeToCamel = (key) => key.replace(/_([a-z0-9])/g, (_m, c) => c.toUpperCase());
-export function normalizeCallArguments(shapeKeys, args) {
+function coerceRenamedValue(value, kind) {
+    if (typeof value !== 'string')
+        return value;
+    const v = value.trim();
+    if (kind === 'number' && /^-?\d+(\.\d+)?$/.test(v))
+        return Number(v);
+    if (kind === 'boolean' && /^(true|false)$/i.test(v))
+        return v.toLowerCase() === 'true';
+    return value;
+}
+export function normalizeCallArguments(shape, args) {
     const renamed = [];
     let out;
     for (const key of Object.keys(args)) {
-        if (shapeKeys.has(key) || !key.includes('_'))
+        if (shape.has(key) || !key.includes('_'))
             continue;
         const camel = snakeToCamel(key);
-        if (camel !== key && shapeKeys.has(camel) && !(camel in args)) {
+        if (camel !== key && shape.has(camel) && !(camel in args)) {
             out ??= { ...args };
-            out[camel] = out[key];
+            out[camel] = coerceRenamedValue(out[key], shape.get(camel));
             delete out[key];
             renamed.push([key, camel]);
         }

package/dist/http-transport.d.ts

@@ -1,6 +1,7 @@
 import { type IncomingMessage, type ServerResponse } from 'node:http';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { HttpConfig } from './http-config.js';
+import { type ArgShape } from './arg-normalize.js';
 export type AuthOutcome = {
     ok: true;
 } | {
@@ -29,7 +30,7 @@ export interface HttpHostOptions {
      * shared lock instead of wedging the transport (default 120s). */
     dispatchTimeoutMs?: number;
     /** tools/call argument-key normalization lookup (arg-normalize.ts); absent = off. */
-    argShapeFor?: (tool: string) => ReadonlySet<string> | undefined;
+    argShapeFor?: (tool: string) => ArgShape | undefined;
 }
 export declare function parseOwnerEmails(env?: NodeJS.ProcessEnv): string[];
 /** Front guard: an Origin, if present, must be allowlisted; a Host must be

package/dist/registry.d.ts

@@ -1,6 +1,7 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 import { type Policy } from './write-control.js';
+import type { ArgShape } from './arg-normalize.js';
 export type Cud = 'read' | 'create' | 'update' | 'delete';
 export type DiscoveryMode = 'lazy' | 'curated' | 'eager';
 export declare function resolveDiscoveryMode(env?: NodeJS.ProcessEnv): DiscoveryMode;
@@ -49,8 +50,9 @@ export declare class ToolRegistry {
     constructor(server: McpServer, policy: Policy, mode?: DiscoveryMode);
     registerMeta: McpServer['registerTool'];
     services(): string[];
-    /** Declared input-schema keys for one tool (tools/call arg normalization). */
-    argShape(name: string): ReadonlySet<string> | undefined;
+    /** Declared input-schema keys + scalar kinds for one tool (tools/call arg
+     * normalization; the kind drives value coercion on renamed keys). */
+    argShape(name: string): ArgShape | undefined;
     catalog(service: string, query?: string): CatalogOperation[];
     reveal(service: string): boolean;
     /** discover_all: advertise the full curated set at once. Idempotent. */

package/dist/registry.js

@@ -38,6 +38,23 @@ const SERVICE_OVERRIDES = {
 };
 // read tools that write local files — same savePath fanned across accounts would clobber
 const FANOUT_EXCLUDE = new Set(['gmail_download_attachment', 'drive_download', 'drive_export']);
+/** Unwrap optional/default/nullable to the declared scalar kind (zod 4 defs). */
+function scalarKindOf(field) {
+    let cur = field;
+    for (let i = 0; i < 4 && cur?._zod?.def; i++) {
+        const def = cur._zod.def;
+        if (def.type === 'number')
+            return 'number';
+        if (def.type === 'boolean')
+            return 'boolean';
+        if (def.type === 'optional' || def.type === 'default' || def.type === 'nullable') {
+            cur = def.innerType;
+            continue;
+        }
+        return 'other';
+    }
+    return 'other';
+}
 function isAccountEnum(field) {
     const def = field?._zod?.def;
     if (!def)
@@ -193,7 +210,8 @@ export class ToolRegistry {
     services() {
         return [...new Set(this.tools.filter((t) => !t.meta).map((t) => t.service))];
     }
-    /** Declared input-schema keys for one tool (tools/call arg normalization). */
+    /** Declared input-schema keys + scalar kinds for one tool (tools/call arg
+     * normalization; the kind drives value coercion on renamed keys). */
     argShape(name) {
         const cached = this.argShapeCache.get(name);
         if (cached)
@@ -201,9 +219,11 @@ export class ToolRegistry {
         const entry = this.tools.find((t) => t.name === name);
         if (!entry)
             return undefined;
-        const keys = new Set(Object.keys(entry.inputShape));
-        this.argShapeCache.set(name, keys);
-        return keys;
+        const shape = new Map();
+        for (const [key, field] of Object.entries(entry.inputShape))
+            shape.set(key, scalarKindOf(field));
+        this.argShapeCache.set(name, shape);
+        return shape;
     }
     catalog(service, query) {
         const q = query?.trim().toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-google-multi",
-  "version": "6.0.0-alpha.10",
+  "version": "6.0.0-alpha.11",
   "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",