@mcpc-tech/core 0.3.8 → 0.3.9

package/index.mjs

@@ -249,27 +249,38 @@ function optionalObject(obj, condition) {
 function sanitizePropertyKey(name) {
   return name.replace(/[@.,/\\:;!?#$%^&*()[\]{}]/g, "_").substring(0, 64);
 }
-var createGoogleCompatibleJSONSchema = (schema) => {
-  if (!GEMINI_PREFERRED_FORMAT) {
-    return schema;
-  }
-  const { oneOf: _oneOf, allOf: _allOf, anyOf: _anyOf, ...cleanSchema } = schema;
-  const removeAdditionalProperties = (obj) => {
+var createModelCompatibleJSONSchema = (schema) => {
+  const validatorOnlyKeys = [
+    "errorMessage"
+  ];
+  const geminiRestrictedKeys = GEMINI_PREFERRED_FORMAT ? [
+    "additionalProperties"
+  ] : [];
+  const keysToRemove = /* @__PURE__ */ new Set([
+    ...validatorOnlyKeys,
+    ...geminiRestrictedKeys
+  ]);
+  let cleanSchema = schema;
+  if (GEMINI_PREFERRED_FORMAT) {
+    const { oneOf: _oneOf, allOf: _allOf, anyOf: _anyOf, ...rest2 } = schema;
+    cleanSchema = rest2;
+  }
+  const cleanRecursively = (obj) => {
     if (Array.isArray(obj)) {
-      return obj.map(removeAdditionalProperties);
+      return obj.map(cleanRecursively);
     }
     if (obj && typeof obj === "object") {
       const result = {};
       for (const [key, value] of Object.entries(obj)) {
-        if (key !== "additionalProperties") {
-          result[key] = removeAdditionalProperties(value);
+        if (!keysToRemove.has(key)) {
+          result[key] = cleanRecursively(value);
         }
       }
       return result;
     }
     return obj;
   };
-  return removeAdditionalProperties(cleanSchema);
+  return cleanRecursively(cleanSchema);
 };
 
 // __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/mcp.js
@@ -1009,19 +1020,32 @@ ${JSON.stringify(steps, null, 2)}`;
 // __mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema-validator.js
 import { Ajv } from "ajv";
 import addFormats from "ajv-formats";
+import ajvErrors from "ajv-errors";
 import { AggregateAjvError } from "@segment/ajv-human-errors";
 var ajv = new Ajv({
   allErrors: true,
   verbose: true
 });
 addFormats.default(ajv);
+ajvErrors.default(ajv);
 function validateSchema(args, schema) {
   const validate = ajv.compile(schema);
   if (!validate(args)) {
-    const errors = new AggregateAjvError(validate.errors);
+    const errors = validate.errors;
+    const customErrors = errors.filter((err) => err.keyword === "errorMessage");
+    if (customErrors.length > 0) {
+      const messages = [
+        ...new Set(customErrors.map((err) => err.message))
+      ];
+      return {
+        valid: false,
+        error: messages.join("; ")
+      };
+    }
+    const aggregateError = new AggregateAjvError(errors);
     return {
       valid: false,
-      error: errors.message
+      error: aggregateError.message
     };
   }
   return {
@@ -1172,11 +1196,17 @@ var AgenticExecutor = class {
           });
           endSpan(executeSpan);
         }
-        const result2 = {
+        const result = {
           content: []
         };
-        this.appendToolSchemas(result2, definitionsOf, hasDefinitions);
-        return result2;
+        this.appendToolSchemas(result, definitionsOf, hasDefinitions);
+        if (result.content.length === 0 && definitionsOf.length > 0) {
+          result.content.push({
+            type: "text",
+            text: `All requested tool schemas are already in hasDefinitions. You can now call a tool using "${this.USE_TOOL_KEY}".`
+          });
+        }
+        return result;
       }
       if (executeSpan) {
         try {
@@ -1226,8 +1256,8 @@ var AgenticExecutor = class {
           selectTool: useTool
         });
         try {
-          const result2 = await this.server.callTool(useTool, args[useTool]);
-          const callToolResult = result2 ?? {
+          const result = await this.server.callTool(useTool, args[useTool]);
+          const callToolResult = result ?? {
             content: []
           };
           this.appendToolSchemas(callToolResult, definitionsOf, hasDefinitions);
@@ -1268,16 +1298,15 @@ var AgenticExecutor = class {
         });
         endSpan(executeSpan);
       }
-      this.logger.warning({
-        message: "Tool not found",
-        useTool,
-        availableTools: this.allToolNames
-      });
-      const result = {
-        content: []
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Tool "${useTool}" not found. Available tools: ${this.allToolNames.join(", ")}.`
+          }
+        ],
+        isError: true
       };
-      this.appendToolSchemas(result, definitionsOf, hasDefinitions);
-      return result;
     } catch (error) {
       if (executeSpan) {
         endSpan(executeSpan, error);
@@ -1505,7 +1534,10 @@ Workflow step definitions - provide ONLY on initial call.
     decision: () => ({
       type: "string",
       enum: Object.values(DECISION_OPTIONS),
-      description: `**Step control: \`${DECISION_OPTIONS.PROCEED}\` = next step, \`${DECISION_OPTIONS.RETRY}\` = retry/repeat current, \`${DECISION_OPTIONS.COMPLETE}\` = finish workflow**`
+      description: `**Step control: \`${DECISION_OPTIONS.PROCEED}\` = next step, \`${DECISION_OPTIONS.RETRY}\` = retry/repeat current, \`${DECISION_OPTIONS.COMPLETE}\` = finish workflow**`,
+      errorMessage: {
+        enum: `Invalid decision. Must be one of: ${Object.values(DECISION_OPTIONS).join(", ")}.`
+      }
     }),
     action: () => ({
       type: "string",
@@ -1513,7 +1545,10 @@ Workflow step definitions - provide ONLY on initial call.
       enum: allToolNames,
       required: [
         "action"
-      ]
+      ],
+      errorMessage: {
+        enum: `Invalid action. Must be one of: ${allToolNames.join(", ")}.`
+      }
     }),
     forTool: function() {
       return this.common({});
@@ -1555,58 +1590,17 @@ Workflow step definitions - provide ONLY on initial call.
         required: [
           "userRequest",
           "context"
-        ]
+        ],
+        errorMessage: {
+          required: {
+            userRequest: "Missing required field 'userRequest'. Please provide a clear task description.",
+            context: "Missing required field 'context'. Please provide relevant context (e.g., current working directory)."
+          }
+        }
       };
     },
     forAgentic: function(toolNameToDetailList, _sampling = false, USE_TOOL_KEY = "useTool") {
       const allOf = [
-        // When hasDefinitions is empty, definitionsOf must be provided
-        {
-          if: {
-            properties: {
-              hasDefinitions: {
-                type: "array",
-                maxItems: 0
-              }
-            },
-            required: [
-              "hasDefinitions"
-            ]
-          },
-          then: {
-            required: [
-              "definitionsOf"
-            ]
-          }
-        },
-        // When useTool is present, hasDefinitions must contain that tool
-        ...toolNameToDetailList.map(([toolName, _toolDetail]) => {
-          return {
-            if: {
-              properties: {
-                [USE_TOOL_KEY]: {
-                  const: toolName
-                }
-              },
-              required: [
-                USE_TOOL_KEY
-              ]
-            },
-            then: {
-              properties: {
-                hasDefinitions: {
-                  type: "array",
-                  contains: {
-                    const: toolName
-                  }
-                }
-              },
-              required: [
-                "hasDefinitions"
-              ]
-            }
-          };
-        }),
         // When a specific tool is selected, its parameters must be provided
         ...toolNameToDetailList.map(([toolName, _toolDetail]) => {
           return {
@@ -1623,7 +1617,12 @@ Workflow step definitions - provide ONLY on initial call.
             then: {
               required: [
                 toolName
-              ]
+              ],
+              errorMessage: {
+                required: {
+                  [toolName]: `Tool "${toolName}" is selected but its parameters are missing. Please provide "${toolName}": { ...parameters }.`
+                }
+              }
             }
           };
         })
@@ -1639,7 +1638,10 @@ Workflow step definitions - provide ONLY on initial call.
         [USE_TOOL_KEY]: {
           type: "string",
           enum: allToolNames,
-          description: useToolDescription
+          description: useToolDescription,
+          errorMessage: {
+            enum: `Invalid tool name. Available tools: ${allToolNames.join(", ")}.`
+          }
         },
         hasDefinitions: {
           type: "array",
@@ -1662,6 +1664,41 @@ Workflow step definitions - provide ONLY on initial call.
       if (allOf.length > 0) {
         schema.allOf = allOf;
       }
+      if (allToolNames.length > 0) {
+        const thenClause = {
+          required: [
+            USE_TOOL_KEY
+          ],
+          errorMessage: {
+            required: {
+              [USE_TOOL_KEY]: `No tool selected. Please specify "${USE_TOOL_KEY}" to select one of: ${allToolNames.join(", ")}. Or use "definitionsOf" with tool names to get their schemas first.`
+            }
+          }
+        };
+        Object.assign(schema, {
+          if: {
+            // definitionsOf is not provided OR is empty array
+            anyOf: [
+              {
+                not: {
+                  required: [
+                    "definitionsOf"
+                  ]
+                }
+              },
+              {
+                properties: {
+                  definitionsOf: {
+                    type: "array",
+                    maxItems: 0
+                  }
+                }
+              }
+            ]
+          },
+          then: thenClause
+        });
+      }
       return schema;
     },
     forNextState: function(state) {
@@ -1719,7 +1756,7 @@ function registerAgenticTool(server, { description, name, allToolNames, depGroup
     type: "object",
     properties: {}
   };
-  server.tool(name, description, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server.tool(name, description, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     return await agenticExecutor.execute(args, schema);
   });
 }
@@ -2234,7 +2271,7 @@ function registerAgenticWorkflowTool(server, { description, name, allToolNames,
   });
   const argsDef = createArgsDef.forTool();
   const toolDescription = createArgsDef.forToolDescription(baseDescription, workflowState);
-  server.tool(name, toolDescription, jsonSchema(createGoogleCompatibleJSONSchema(argsDef)), async (args) => {
+  server.tool(name, toolDescription, jsonSchema(createModelCompatibleJSONSchema(argsDef)), async (args) => {
     try {
       return await workflowExecutor.execute(args, workflowState);
     } catch (error) {
@@ -2756,7 +2793,7 @@ function registerAgenticSamplingTool(server, { description, name, allToolNames,
     type: "object",
     properties: {}
   };
-  server.tool(name, description, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server.tool(name, description, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     return await samplingExecutor.executeSampling(args, schema);
   });
 }
@@ -2870,7 +2907,7 @@ function registerWorkflowSamplingTool(server, { description, name, allToolNames,
     type: "object",
     properties: {}
   };
-  server.tool(name, baseDescription, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server.tool(name, baseDescription, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     try {
       return await workflowSamplingExecutor.executeWorkflowSampling(args, schema, workflowState);
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/core",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "homepage": "https://jsr.io/@mcpc/core",
   "type": "module",
   "dependencies": {
@@ -14,6 +14,7 @@
     "@opentelemetry/semantic-conventions": "^1.29.0",
     "@segment/ajv-human-errors": "^2.15.0",
     "ajv": "^8.17.1",
+    "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",
     "cheerio": "^1.0.0",
     "json-schema-traverse": "^1.0.0",