@softeria/ms-365-mcp-server 0.131.1 → 0.131.2

package/dist/__tests__/graph-tools.test.js

@@ -93,6 +93,15 @@ function createMockServer() {
         tools.set(name, { description, schema, handler });
       }
     ),
+    registerTool: vi.fn(
+      (name, config, handler) => {
+        tools.set(name, {
+          description: config.description,
+          schema: config.inputSchema?.shape ?? config.inputSchema,
+          handler
+        });
+      }
+    ),
     tools
   };
 }

package/dist/graph-tools.js

@@ -395,6 +395,44 @@ function registerUtilityToolWithMcp(server, utility, ctx) {
     async (params) => utility.execute(params, ctx)
   );
 }
+function bodySchemaShape(schema) {
+  let current = schema;
+  for (let i = 0; i < 10 && current; i++) {
+    if (current instanceof z.ZodObject) {
+      return current.shape;
+    }
+    const def = current._def;
+    current = def?.innerType ?? def?.schema ?? def?.getter?.();
+  }
+  return null;
+}
+function lenientBodySchema(schema) {
+  if (schema instanceof z.ZodObject) {
+    return schema.passthrough();
+  }
+  if (schema instanceof z.ZodOptional) {
+    return lenientBodySchema(schema.unwrap()).optional();
+  }
+  if (schema instanceof z.ZodNullable) {
+    return lenientBodySchema(schema.unwrap()).nullable();
+  }
+  if (schema instanceof z.ZodLazy) {
+    return z.lazy(() => lenientBodySchema(schema.schema));
+  }
+  return schema;
+}
+const READ_ONLY_BODY_FIELDS = /* @__PURE__ */ new Set([
+  "id",
+  "createdDateTime",
+  "lastModifiedDateTime",
+  "changeKey"
+]);
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
 async function executeGraphTool(tool, config, graphClient, params, authManager) {
   logger.info(`Tool ${tool.alias} called with params: ${JSON.stringify(params)}`);
   if (isConfirmGateEnabled() && isDestructiveOperation(tool.method, config) && params.confirm !== true) {
@@ -451,6 +489,10 @@ async function executeGraphTool(tool, config, graphClient, params, authManager)
     const queryParams = {};
     const headers = {};
     let body = null;
+    const bodyShape = bodySchemaShape(
+      parameterDefinitions.find((p) => p.type === "Body")?.schema
+    );
+    const strayBodyFields = {};
     for (const [paramName, paramValue] of Object.entries(params)) {
       if ([
         "account",
@@ -529,6 +571,29 @@ async function executeGraphTool(tool, config, graphClient, params, authManager)
       } else if (isOdataParam) {
         queryParams[fixedParamName] = `${paramValue}`;
         logger.info(`OData param fallback: forwarded ${fixedParamName}=${paramValue}`);
+      } else if (bodyShape && (hasOwn(bodyShape, paramName) || hasOwn(bodyShape, camelCaseParamName)) && !READ_ONLY_BODY_FIELDS.has(hasOwn(bodyShape, paramName) ? paramName : camelCaseParamName)) {
+        const fieldName = hasOwn(bodyShape, paramName) ? paramName : camelCaseParamName;
+        strayBodyFields[fieldName] = paramValue;
+        logger.info(
+          `Body field fallback: merging top-level param '${fieldName}' into request body`
+        );
+      } else {
+        logger.warn(`Dropping unrecognized parameter '${paramName}' for tool ${tool.alias}`);
+      }
+    }
+    if (Object.keys(strayBodyFields).length > 0) {
+      if (isPlainObject(body)) {
+        const keys = Object.keys(body);
+        const bodyIsNestedField = bodyShape != null && hasOwn(bodyShape, "body") && keys.length > 0 && keys.every((k) => !hasOwn(bodyShape, k));
+        body = bodyIsNestedField ? { ...strayBodyFields, body } : { ...strayBodyFields, ...body };
+        logger.info(`Merged flattened body fields: ${Object.keys(strayBodyFields).join(", ")}`);
+      } else if (body == null) {
+        body = strayBodyFields;
+        logger.info(`Merged flattened body fields: ${Object.keys(strayBodyFields).join(", ")}`);
+      } else {
+        logger.warn(
+          `Cannot merge flattened body fields (${Object.keys(strayBodyFields).join(", ")}) into non-object request body; dropping them`
+        );
       }
     }
     if (TOP_UNSUPPORTED_DELTA_TOOLS.has(tool.alias)) {
@@ -792,7 +857,7 @@ function registerGraphTools(server, graphClient, readOnly = false, enabledToolsP
     const paramSchema = {};
     if (tool.parameters && tool.parameters.length > 0) {
       for (const param of tool.parameters) {
-        paramSchema[param.name] = param.schema || z.any();
+        paramSchema[param.name] = param.type === "Body" && param.schema ? lenientBodySchema(param.schema) : param.schema || z.any();
       }
     }
     const pathParamMatches = tool.path.matchAll(/:([a-zA-Z]+)/g);
@@ -880,16 +945,19 @@ function registerGraphTools(server, graphClient, readOnly = false, enabledToolsP
     }
     const isReadOnlyTool = tool.method.toUpperCase() === "GET" || endpointConfig?.readOnly === true;
     try {
-      server.tool(
+      server.registerTool(
         tool.alias,
-        toolDescription,
-        paramSchema,
         {
           title: tool.alias,
-          readOnlyHint: isReadOnlyTool,
-          destructiveHint: destructive,
-          openWorldHint: true
-          // All tools call Microsoft Graph API
+          description: toolDescription,
+          inputSchema: z.object(paramSchema).passthrough(),
+          annotations: {
+            title: tool.alias,
+            readOnlyHint: isReadOnlyTool,
+            destructiveHint: destructive,
+            openWorldHint: true
+            // All tools call Microsoft Graph API
+          }
         },
         async (params) => executeGraphTool(tool, endpointConfig, graphClient, params, authManager)
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.131.1",
+  "version": "0.131.2",
   "description": " A Model Context Protocol (MCP) server for interacting with Microsoft 365 and Office services through the Graph API",
   "type": "module",
   "main": "dist/index.js",