houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ai): improve mcp metadata logic (#13991)

Browse Source 
Fix #13801
This commit is contained in:
Antoine Moreaux
2025-08-20 12:06:13 +02:00
committed by GitHub
parent 69649e97d4
commit dcdf675000
10 changed files with 101 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/api/mcp/services/mcp-metadata.service.ts
+11 -62
View File
@@ -49,7 +49,7 @@ export class MCPMetadataService {
}
}
handleInitialize(requestId: string | number | null) {
handleInitialize(requestId: string | number) {
return wrapJsonRpcResponse(requestId, {
result: {
capabilities: {
@@ -61,63 +61,6 @@ export class MCPMetadataService {
});
}
get commonProperties() {
return {
fields: {
type: 'array',
items: {
type: 'string',
description:
'Names of field properties to include in the response for field entities. ',
examples: [
'type',
'name',
'label',
'description',
'icon',
'isCustom',
'isActive',
'isSystem',
'isNullable',
'createdAt',
'updatedAt',
'defaultValue',
'options',
'relation',
],
},
description:
'List of field names to select in the query for field entity. Strongly recommended to limit token usage and reduce response size. Use this to include only the properties you need.',
},
objects: {
type: 'array',
items: {
type: 'string',
description:
'Object property names to include in the response for object entities.',
examples: [
'dataSourceId',
'nameSingular',
'namePlural',
'labelSingular',
'labelPlural',
'description',
'icon',
'isCustom',
'isActive',
'isSystem',
'createdAt',
'updatedAt',
'labelIdentifierFieldMetadataId',
'imageIdentifierFieldMetadataId',
],
},
description:
'List of object properties to select in the query for object entities. Strongly recommended to limit token usage and reduce response size. Specify only the necessary properties to optimize your request.',
},
};
}
get tools() {
return [
...this.createToolsService.tools,
@@ -146,13 +89,14 @@ export class MCPMetadataService {
});
return { result };
} catch {
} catch (err) {
await this.metricsService.incrementCounter({
key: MetricsKeys.AIToolExecutionFailed,
attributes: {
tool: request.body.params.name,
},
});
throw err;
}
}
@@ -170,7 +114,6 @@ export class MCPMetadataService {
capabilities: {
tools: { listChanged: false },
},
commonProperties: this.commonProperties,
tools: Object.values(this.tools),
},
});
@@ -206,9 +149,15 @@ export class MCPMetadataService {
);
}
return this.listTools(request);
if (request.body.method === 'tools/list') {
return this.listTools(request);
}
return wrapJsonRpcResponse(request.body.id ?? crypto.randomUUID(), {
result: {},
});
} catch (error) {
return wrapJsonRpcResponse(request.body.id, {
return wrapJsonRpcResponse(request.body.id ?? crypto.randomUUID(), {
error: {
code: error.status || HttpStatus.INTERNAL_SERVER_ERROR,
message:
packages/twenty-server/src/engine/api/mcp/services/tools/mcp-metadata-tools.service.ts
+48 -2
View File
@@ -25,10 +25,56 @@ export class MCPMetadataToolsService {
properties: {
...schema.properties,
fields: {
$ref: '#/result/commonProperties/fields',
type: 'array',
items: {
type: 'string',
description:
'Names of field properties to include in the response for field entities.',
examples: [
'type',
'name',
'label',
'description',
'icon',
'isCustom',
'isActive',
'isSystem',
'isNullable',
'createdAt',
'updatedAt',
'defaultValue',
'options',
'relation',
],
},
description:
'List of field names to select in the query for field entity. Strongly recommended to limit token usage and reduce response size. Use this to include only the properties you need.',
},
objects: {
$ref: '#/result/commonProperties/objects',
type: 'array',
items: {
type: 'string',
description:
'Object property names to include in the response for object entities.',
examples: [
'dataSourceId',
'nameSingular',
'namePlural',
'labelSingular',
'labelPlural',
'description',
'icon',
'isCustom',
'isActive',
'isSystem',
'createdAt',
'updatedAt',
'labelIdentifierFieldMetadataId',
'imageIdentifierFieldMetadataId',
],
},
description:
'List of object properties to select in the query for object entities. Strongly recommended to limit token usage and reduce response size. Specify only the necessary properties to optimize your request.',
},
},
};
packages/twenty-server/src/engine/api/mcp/services/tools/update.tools.service.ts
+33 -14
View File
@@ -24,17 +24,26 @@ export class UpdateToolsService {
inputSchema:
this.mCPMetadataToolsService.mergeSchemaWithCommonProperties({
...validationSchemaManager.getSchemas().UpdateOneFieldMetadataInput,
properties: omit(
validationSchemaManager.getSchemas().FieldMetadataDTO.properties,
[
'id',
'type',
'createdAt',
'updatedAt',
'isCustom',
'standardOverrides',
],
),
required: ['id'],
properties: {
...omit(
validationSchemaManager.getSchemas().UpdateOneFieldMetadataInput
.properties,
['update'],
),
...omit(
validationSchemaManager.getSchemas().FieldMetadataDTO
.properties,
[
'id',
'type',
'createdAt',
'updatedAt',
'isCustom',
'standardOverrides',
],
),
},
}),
execute: (request: Request) => this.execute(request, 'fields'),
},
@@ -42,9 +51,19 @@ export class UpdateToolsService {
name: 'update-object-metadata',
description: 'Update an object metadata',
inputSchema:
this.mCPMetadataToolsService.mergeSchemaWithCommonProperties(
validationSchemaManager.getSchemas().UpdateOneObjectInput,
),
this.mCPMetadataToolsService.mergeSchemaWithCommonProperties({
...validationSchemaManager.getSchemas().UpdateOneObjectInput,
required: ['id'],
properties: {
...omit(
validationSchemaManager.getSchemas().UpdateOneObjectInput
.properties,
['update'],
),
...validationSchemaManager.getSchemas().UpdateObjectPayload
.properties,
},
}),
execute: (request: Request) => this.execute(request, 'objects'),
},
];
packages/twenty-server/src/engine/api/rest/metadata/query-builder/utils/fetch-metadata-fields.utils.ts
-1
View File
@@ -52,7 +52,6 @@ export const fetchMetadataFields = (
const objectsSelection =
selector?.objects?.join('\n') ??
`
dataSourceId
nameSingular
namePlural
labelSingular