@mcpc-tech/cli 0.1.19 → 0.1.20

package/bin/mcpc.mjs

@@ -646,31 +646,6 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 
-// __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/registory.js
-function connectToSmitheryServer(smitheryConfig) {
-  const serverUrl = new URL(smitheryConfig.deploymentUrl);
-  serverUrl.searchParams.set("config", btoa(JSON.stringify(smitheryConfig.config)));
-  serverUrl.searchParams.set("api_key", smitheryConfig?.smitheryApiKey ?? smitheryConfig?.config?.smitheryApiKey);
-  return {
-    url: serverUrl.toString()
-  };
-}
-function smitheryToolNameCompatibale(name, scope) {
-  if (!name.startsWith("toolbox_")) {
-    return {
-      toolNameWithScope: `${scope}.${name}`,
-      toolName: name
-    };
-  }
-  const [, ...toolNames] = name.split("_");
-  const toolName = toolNames.join("_");
-  const toolNameWithScope = `${scope}.${toolName}`;
-  return {
-    toolNameWithScope,
-    toolName
-  };
-}
-
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/config.js
 import process3 from "node:process";
 var GEMINI_PREFERRED_FORMAT = process3.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
@@ -682,27 +657,38 @@ import { jsonrepair as jsonrepair2 } from "jsonrepair";
 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__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/mcp.js
@@ -849,7 +835,8 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
       allClients[serverId] = client;
       const { tools } = await client.listTools();
       tools.forEach((tool) => {
-        const { toolNameWithScope, toolName: internalToolName } = smitheryToolNameCompatibale(tool.name, name);
+        const toolNameWithScope = `${name}.${tool.name}`;
+        const internalToolName = tool.name;
         const rawToolId = `${serverId}_${internalToolName}`;
         const toolId = sanitizePropertyKey(rawToolId);
         if (filterIn && !filterIn({
@@ -1441,19 +1428,32 @@ ${JSON.stringify(steps, null, 2)}`;
 // __mcpc__cli_latest/node_modules/@jsr/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 {
@@ -1604,11 +1604,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 {
@@ -1658,8 +1664,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);
@@ -1700,16 +1706,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);
@@ -1937,7 +1942,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",
@@ -1945,7 +1953,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({});
@@ -1987,58 +1998,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 {
@@ -2055,7 +2025,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 }.`
+                }
+              }
             }
           };
         })
@@ -2071,7 +2046,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",
@@ -2094,6 +2072,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) {
@@ -2151,7 +2164,7 @@ function registerAgenticTool(server2, { description, name, allToolNames, depGrou
     type: "object",
     properties: {}
   };
-  server2.tool(name, description, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server2.tool(name, description, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     return await agenticExecutor.execute(args, schema);
   });
 }
@@ -2666,7 +2679,7 @@ function registerAgenticWorkflowTool(server2, { description, name, allToolNames,
   });
   const argsDef = createArgsDef.forTool();
   const toolDescription = createArgsDef.forToolDescription(baseDescription, workflowState);
-  server2.tool(name, toolDescription, jsonSchema(createGoogleCompatibleJSONSchema(argsDef)), async (args) => {
+  server2.tool(name, toolDescription, jsonSchema(createModelCompatibleJSONSchema(argsDef)), async (args) => {
     try {
       return await workflowExecutor.execute(args, workflowState);
     } catch (error) {
@@ -3188,7 +3201,7 @@ function registerAgenticSamplingTool(server2, { description, name, allToolNames,
     type: "object",
     properties: {}
   };
-  server2.tool(name, description, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server2.tool(name, description, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     return await samplingExecutor.executeSampling(args, schema);
   });
 }
@@ -3302,7 +3315,7 @@ function registerWorkflowSamplingTool(server2, { description, name, allToolNames
     type: "object",
     properties: {}
   };
-  server2.tool(name, baseDescription, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server2.tool(name, baseDescription, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     try {
       return await workflowSamplingExecutor.executeWorkflowSampling(args, schema, workflowState);
     } catch (error) {
@@ -4464,20 +4477,7 @@ if (isSCF()) {
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/set-up-mcp-compose.js
 function parseMcpcConfigs(conf) {
-  const mcpcConfigs = conf ?? [];
-  const newMcpcConfigs = [];
-  for (const mcpcConfig of mcpcConfigs) {
-    if (mcpcConfig?.deps?.mcpServers) {
-      for (const [name, config2] of Object.entries(mcpcConfig.deps.mcpServers)) {
-        if (config2.smitheryConfig) {
-          const streamConfig = connectToSmitheryServer(config2.smitheryConfig);
-          mcpcConfig.deps.mcpServers[name] = streamConfig;
-        }
-      }
-    }
-    newMcpcConfigs.push(mcpcConfig);
-  }
-  return newMcpcConfigs;
+  return conf ?? [];
 }
 async function mcpc(serverConf, composeConf, setupCallback) {
   const server2 = new ComposableMCPServer(...serverConf);
@@ -4826,7 +4826,7 @@ var createServer = async (config2) => {
         description: "",
         plugins: [
           createLargeResultPlugin({}),
-          codeExecutionPlugin()
+          codeExecutionPlugin
         ],
         options: {
           mode: "code_execution"

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@mcpc-tech/cli",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "homepage": "https://jsr.io/@mcpc/cli",
   "type": "module",
   "dependencies": {
     "@hono/zod-openapi": "^0.19.2",
-    "@mcpc-tech/plugin-code-execution": "^0.0.6",
+    "@mcpc-tech/plugin-code-execution": "^0.0.8",
     "@modelcontextprotocol/sdk": "^1.8.0",
     "zod": "^3.24.2",
     "@mcpc-tech/ripgrep-napi": "^0.0.4",
@@ -17,9 +17,9 @@
     "@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-to-zod": "^2.6.1",
     "json-schema-traverse": "^1.0.0",
     "jsonrepair": "^3.13.0"
   },