@mcpc-tech/core 0.3.5 → 0.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.mjs +36 -7
- package/package.json +1 -1
- package/types/src/compose.d.ts.map +1 -1
package/index.mjs
CHANGED
|
@@ -1188,7 +1188,21 @@ var AgenticExecutor = class {
|
|
|
1188
1188
|
const useTool = args[this.USE_TOOL_KEY];
|
|
1189
1189
|
const definitionsOf = args.definitionsOf || [];
|
|
1190
1190
|
const hasDefinitions = args.hasDefinitions || [];
|
|
1191
|
-
if (
|
|
1191
|
+
if (!useTool) {
|
|
1192
|
+
if (executeSpan) {
|
|
1193
|
+
executeSpan.setAttributes({
|
|
1194
|
+
toolType: "none",
|
|
1195
|
+
completion: true
|
|
1196
|
+
});
|
|
1197
|
+
endSpan(executeSpan);
|
|
1198
|
+
}
|
|
1199
|
+
const result2 = {
|
|
1200
|
+
content: []
|
|
1201
|
+
};
|
|
1202
|
+
this.appendToolSchemas(result2, definitionsOf, hasDefinitions);
|
|
1203
|
+
return result2;
|
|
1204
|
+
}
|
|
1205
|
+
if (executeSpan) {
|
|
1192
1206
|
try {
|
|
1193
1207
|
const safeTool = String(useTool).replace(/\s+/g, "_");
|
|
1194
1208
|
if (typeof executeSpan.updateName === "function") {
|
|
@@ -1274,14 +1288,14 @@ var AgenticExecutor = class {
|
|
|
1274
1288
|
if (executeSpan) {
|
|
1275
1289
|
executeSpan.setAttributes({
|
|
1276
1290
|
toolType: "not_found",
|
|
1277
|
-
useTool
|
|
1278
|
-
completion: true
|
|
1291
|
+
useTool
|
|
1279
1292
|
});
|
|
1280
1293
|
endSpan(executeSpan);
|
|
1281
1294
|
}
|
|
1282
|
-
this.logger.
|
|
1283
|
-
message: "Tool not found
|
|
1284
|
-
useTool
|
|
1295
|
+
this.logger.warning({
|
|
1296
|
+
message: "Tool not found",
|
|
1297
|
+
useTool,
|
|
1298
|
+
availableTools: this.allToolNames
|
|
1285
1299
|
});
|
|
1286
1300
|
const result = {
|
|
1287
1301
|
content: []
|
|
@@ -3884,9 +3898,16 @@ var ComposableMCPServer = class extends Server {
|
|
|
3884
3898
|
const toolNameToIdMapping = /* @__PURE__ */ new Map();
|
|
3885
3899
|
const requestedToolNames = /* @__PURE__ */ new Set();
|
|
3886
3900
|
const availableToolNames = /* @__PURE__ */ new Set();
|
|
3901
|
+
const allPlaceholderUsages = [];
|
|
3887
3902
|
tagToResults.tool.forEach((tool) => {
|
|
3888
3903
|
if (tool.attribs.name) {
|
|
3889
|
-
|
|
3904
|
+
const originalName = tool.attribs.name;
|
|
3905
|
+
const toolName = sanitizePropertyKey(originalName);
|
|
3906
|
+
if (toolName.endsWith(`_${ALL_TOOLS_PLACEHOLDER2}`) || toolName === ALL_TOOLS_PLACEHOLDER2) {
|
|
3907
|
+
allPlaceholderUsages.push(originalName);
|
|
3908
|
+
} else {
|
|
3909
|
+
requestedToolNames.add(toolName);
|
|
3910
|
+
}
|
|
3890
3911
|
}
|
|
3891
3912
|
});
|
|
3892
3913
|
const { tools, cleanupClients } = await composeMcpDepTools(depsConfig, ({ mcpName, toolNameWithScope, toolId }) => {
|
|
@@ -3927,6 +3948,14 @@ var ComposableMCPServer = class extends Server {
|
|
|
3927
3948
|
}
|
|
3928
3949
|
availableToolNames.add(toolName);
|
|
3929
3950
|
});
|
|
3951
|
+
if (allPlaceholderUsages.length > 0) {
|
|
3952
|
+
await this.logger.warning(`Found ${allPlaceholderUsages.length} __ALL__ placeholder(s) for agent "${name}":`);
|
|
3953
|
+
allPlaceholderUsages.forEach((usage) => {
|
|
3954
|
+
this.logger.warning(` \u2022 "${usage}" - consider using specific tool names`);
|
|
3955
|
+
});
|
|
3956
|
+
const available = Array.from(availableToolNames).sort().join(", ");
|
|
3957
|
+
await this.logger.warning(` Available tools: ${available}`);
|
|
3958
|
+
}
|
|
3930
3959
|
const unmatchedTools = Array.from(requestedToolNames).filter((toolName) => !allTools[toolName]);
|
|
3931
3960
|
if (unmatchedTools.length > 0) {
|
|
3932
3961
|
await this.logger.warning(`Tool matching warnings for agent "${name}":`);
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.d.ts","sources":["../../src/compose.ts"],"names":[],"mappings":"AAAA,SAGE,KAAK,cAAc,EAGnB,KAAK,IAAI,6CAC6C;AACxD,SAAwC,KAAK,MAAM,4BAA4B;AAC/E,cAAc,iBAAiB,6BAA6B;AAC5D,SACE,MAAM,EACN,KAAK,aAAa,oDAC2C;AAC/D,YAAY,aAAyB;AAGrC,cAAc,iBAAiB,kCAAkC;AACjE,cAAc,UAAU,EAAE,YAAY,qBAAqB;AAM3D,cAA4B,UAAU,EAAE,UAAU,4BAA4B;AAe9E,OAAO,cAAM,4BAA4B;EACvC,QAAQ,mBAA6B;EACrC,QAAQ,iBAAyB;EACjC,QAAQ,YAAsC;EAG9C,IAAI,mBAAmB,IAAI,MAAM,EAAE,MAAM;EAIzC,YAAY,aAAa,cAAc,EAAE,SAAS,aAAa;EAiB/D;;GAEC,GACD,AAAM,sBAAsB,QAAQ,IAAI;UAqB1B;UAsDN;EAIR,KAAK,GACH,MAAM,MAAM,EACZ,aAAa,MAAM,EACnB,cAAc,OAAO,KAAK,UAAU,EACpC,KAAK,MAAM,GAAG,QAAQ,OAAO,KAAK,OAAO,EACzC;IAAW,WAAW,OAAO;IAAE,UAAU;GAAmB;EA+D9D;;GAEC,GACD,gBAAgB,MAAM,MAAM,GAAG,eAAe,SAAS;EAIvD;;GAEC,GACD,eAAe,QAAQ,MAAM,GAAG,aAAa,SAAS;EAItD;;GAEC,GACD,AAAM,SAAS,MAAM,MAAM,EAAE,MAAM,OAAO,GAAG,QAAQ,OAAO;EAyB5D;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,kBAAkB;EAIlB;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,wBAAwB,MAAM;EAM9B;;GAEC,GACD,oBACE,MAAM,MAAM;IACT,aAAa,MAAM;IAAE,QAAQ;MAAe,SAAS;EAI1D;;GAEC,GACD,aAAa,MAAM,MAAM,GAAG,OAAO;EAInC;;GAEC,GACD,WAAW,UAAU,MAAM,EAAE,QAAQ,UAAU,GAAG,IAAI;EAItD;;GAEC,GACD,cAAc,UAAU,MAAM,GAAG,aAAa,SAAS;EAIvD;;GAEC,GACD,iBAAiB,UAAU,MAAM,GAAG,OAAO;EAI3C;;GAEC,GACD,AAAM,UAAU,QAAQ,UAAU,GAAG,QAAQ,IAAI;EAIjD;;GAEC,GACD,AAAM,mBACJ,YAAY,MAAM,EAClB;IAAW,QAAQ,OAAO;GAAoB,GAC7C,QAAQ,IAAI;UAOD;EAOd;;GAEC,GACD,AAAM,kBAAkB,QAAQ,IAAI;EAIpC;;GAEC,GACD,SAAe,SAAS,QAAQ,IAAI;EAK9B,QACJ,MAAM,MAAM,GAAG,IAAI,EACnB,aAAa,MAAM,EACnB,aAAY,EAAE,aAAa,kBAAuC,EAClE,UAAS,kBAAkB,UAAgC;
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sources":["../../src/compose.ts"],"names":[],"mappings":"AAAA,SAGE,KAAK,cAAc,EAGnB,KAAK,IAAI,6CAC6C;AACxD,SAAwC,KAAK,MAAM,4BAA4B;AAC/E,cAAc,iBAAiB,6BAA6B;AAC5D,SACE,MAAM,EACN,KAAK,aAAa,oDAC2C;AAC/D,YAAY,aAAyB;AAGrC,cAAc,iBAAiB,kCAAkC;AACjE,cAAc,UAAU,EAAE,YAAY,qBAAqB;AAM3D,cAA4B,UAAU,EAAE,UAAU,4BAA4B;AAe9E,OAAO,cAAM,4BAA4B;EACvC,QAAQ,mBAA6B;EACrC,QAAQ,iBAAyB;EACjC,QAAQ,YAAsC;EAG9C,IAAI,mBAAmB,IAAI,MAAM,EAAE,MAAM;EAIzC,YAAY,aAAa,cAAc,EAAE,SAAS,aAAa;EAiB/D;;GAEC,GACD,AAAM,sBAAsB,QAAQ,IAAI;UAqB1B;UAsDN;EAIR,KAAK,GACH,MAAM,MAAM,EACZ,aAAa,MAAM,EACnB,cAAc,OAAO,KAAK,UAAU,EACpC,KAAK,MAAM,GAAG,QAAQ,OAAO,KAAK,OAAO,EACzC;IAAW,WAAW,OAAO;IAAE,UAAU;GAAmB;EA+D9D;;GAEC,GACD,gBAAgB,MAAM,MAAM,GAAG,eAAe,SAAS;EAIvD;;GAEC,GACD,eAAe,QAAQ,MAAM,GAAG,aAAa,SAAS;EAItD;;GAEC,GACD,AAAM,SAAS,MAAM,MAAM,EAAE,MAAM,OAAO,GAAG,QAAQ,OAAO;EAyB5D;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,kBAAkB;EAIlB;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,wBAAwB,MAAM;EAM9B;;GAEC,GACD,oBACE,MAAM,MAAM;IACT,aAAa,MAAM;IAAE,QAAQ;MAAe,SAAS;EAI1D;;GAEC,GACD,aAAa,MAAM,MAAM,GAAG,OAAO;EAInC;;GAEC,GACD,WAAW,UAAU,MAAM,EAAE,QAAQ,UAAU,GAAG,IAAI;EAItD;;GAEC,GACD,cAAc,UAAU,MAAM,GAAG,aAAa,SAAS;EAIvD;;GAEC,GACD,iBAAiB,UAAU,MAAM,GAAG,OAAO;EAI3C;;GAEC,GACD,AAAM,UAAU,QAAQ,UAAU,GAAG,QAAQ,IAAI;EAIjD;;GAEC,GACD,AAAM,mBACJ,YAAY,MAAM,EAClB;IAAW,QAAQ,OAAO;GAAoB,GAC7C,QAAQ,IAAI;UAOD;EAOd;;GAEC,GACD,AAAM,kBAAkB,QAAQ,IAAI;EAIpC;;GAEC,GACD,SAAe,SAAS,QAAQ,IAAI;EAK9B,QACJ,MAAM,MAAM,GAAG,IAAI,EACnB,aAAa,MAAM,EACnB,aAAY,EAAE,aAAa,kBAAuC,EAClE,UAAS,kBAAkB,UAAgC;AA2R/D"}
|