@mcpc-tech/cli 0.1.19 → 0.1.21

package/bin/mcpc.mjs

@@ -80,7 +80,7 @@ function getUserConfigDir() {
 function getUserConfigPath() {
   return join(getUserConfigDir(), "config.json");
 }
-async function saveUserConfig(config2, newAgentName) {
+async function saveUserConfig(config, newAgentName) {
   const configPath = getUserConfigPath();
   const configDir = dirname(configPath);
   try {
@@ -99,7 +99,7 @@ async function saveUserConfig(config2, newAgentName) {
 `);
         return;
       }
-      existingConfig.agents.push(...config2.agents);
+      existingConfig.agents.push(...config.agents);
       await writeFile(configPath, JSON.stringify(existingConfig, null, 2), "utf-8");
       console.error(`
 \u2713 Added agent "${newAgentName}" (total: ${existingConfig.agents.length})
@@ -111,7 +111,7 @@ async function saveUserConfig(config2, newAgentName) {
     await mkdir(configDir, {
       recursive: true
     });
-    await writeFile(configPath, JSON.stringify(config2, null, 2), "utf-8");
+    await writeFile(configPath, JSON.stringify(config, null, 2), "utf-8");
     console.error(`
 \u2713 Configuration saved to: ${configPath}
   Run: mcpc
@@ -142,7 +142,7 @@ async function createWrapConfig(args) {
   Command: ${spec.command} ${spec.args.join(" ")}`);
   }
   const agentName = args.name || `${serverNames.join("__")}--orchestrator`;
-  const config2 = {
+  const config = {
     name: "mcpc-wrap-config",
     version: "0.1.0",
     capabilities: {
@@ -168,9 +168,9 @@ Mode: ${args.mode}` : "";
   console.error(`
 Created configuration for ${serverNames.length} MCP server(s)${modeInfo}`);
   if (args.saveConfig) {
-    await saveUserConfig(config2, agentName);
+    await saveUserConfig(config, agentName);
   }
-  return config2;
+  return config;
 }
 function printHelp() {
   console.log(`
@@ -447,25 +447,25 @@ function replaceEnvVarsInConfig(obj) {
   }
   return obj;
 }
-function applyModeOverride(config2, mode) {
-  if (!mode) return config2;
-  config2.agents.forEach((agent) => {
+function applyModeOverride(config, mode) {
+  if (!mode) return config;
+  config.agents.forEach((agent) => {
     if (!agent.options) agent.options = {};
     agent.options.mode = mode;
   });
-  return config2;
+  return config;
 }
-function normalizeConfig(config2) {
-  config2 = replaceEnvVarsInConfig(config2);
-  if (Array.isArray(config2)) {
+function normalizeConfig(config) {
+  config = replaceEnvVarsInConfig(config);
+  if (Array.isArray(config)) {
     return {
       name: "mcpc-server",
       version: "0.1.0",
-      agents: normalizeAgents(config2)
+      agents: normalizeAgents(config)
     };
   }
-  if (config2 && typeof config2 === "object") {
-    const cfg = config2;
+  if (config && typeof config === "object") {
+    const cfg = config;
     return {
       name: cfg.name || "mcpc-server",
       version: cfg.version || "0.1.0",
@@ -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
@@ -781,13 +767,13 @@ async function getOrCreateMcpClient(defKey, def) {
     if (entry) entry.refCount += 1;
     return client;
   }
-  const transport2 = createTransport(def);
+  const transport = createTransport(def);
   const connecting = (async () => {
     const client = new Client({
       name: `mcp_${shortHash(defSignature(def))}`,
       version: "1.0.0"
     });
-    await client.connect(transport2, {
+    await client.connect(transport, {
       timeout: 6e4 * 10
     });
     return client;
@@ -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({
@@ -933,10 +920,10 @@ var createConfigPlugin = () => ({
   version: "1.0.0",
   enforce: "pre",
   transformTool: (tool, context2) => {
-    const server2 = context2.server;
-    const config2 = server2.findToolConfig?.(context2.toolName);
-    if (config2?.description) {
-      tool.description = config2.description;
+    const server = context2.server;
+    const config = server.findToolConfig?.(context2.toolName);
+    if (config?.description) {
+      tool.description = config.description;
     }
     return tool;
   }
@@ -949,19 +936,19 @@ var createToolNameMappingPlugin = () => ({
   version: "1.0.0",
   enforce: "pre",
   transformTool: (tool, context2) => {
-    const server2 = context2.server;
+    const server = context2.server;
     const toolName = context2.toolName;
     const originalName = tool._originalName || toolName;
     const dotNotation = originalName.replace(/_/g, ".");
     const underscoreNotation = originalName.replace(/\./g, "_");
-    if (dotNotation !== originalName && server2.toolNameMapping) {
-      server2.toolNameMapping.set(dotNotation, toolName);
+    if (dotNotation !== originalName && server.toolNameMapping) {
+      server.toolNameMapping.set(dotNotation, toolName);
     }
-    if (underscoreNotation !== originalName && server2.toolNameMapping) {
-      server2.toolNameMapping.set(underscoreNotation, toolName);
+    if (underscoreNotation !== originalName && server.toolNameMapping) {
+      server.toolNameMapping.set(underscoreNotation, toolName);
     }
-    if (originalName !== toolName && server2.toolNameMapping) {
-      server2.toolNameMapping.set(originalName, toolName);
+    if (originalName !== toolName && server.toolNameMapping) {
+      server.toolNameMapping.set(originalName, toolName);
     }
     return tool;
   }
@@ -983,12 +970,12 @@ var MCPLogger = class _MCPLogger {
   server;
   loggerName;
   minLevel = "debug";
-  constructor(loggerName = "mcpc", server2) {
+  constructor(loggerName = "mcpc", server) {
     this.loggerName = loggerName;
-    this.server = server2;
+    this.server = server;
   }
-  setServer(server2) {
-    this.server = server2;
+  setServer(server) {
+    this.server = server;
   }
   setLevel(level) {
     this.minLevel = level;
@@ -1045,8 +1032,8 @@ var MCPLogger = class _MCPLogger {
   }
 };
 var logger = new MCPLogger("mcpc");
-function createLogger(name, server2) {
-  return new MCPLogger(name, server2);
+function createLogger(name, server) {
+  return new MCPLogger(name, server);
 }
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/plugins/built-in/logging-plugin.js
@@ -1066,10 +1053,10 @@ var createLoggingPlugin = (options = {}) => {
         await logger2.info(`[${context2.toolName}] Composition complete`);
         await logger2.info(`   \u251C\u2500 Plugins: ${context2.pluginNames.join(", ")}`);
         const { stats } = context2;
-        const server2 = context2.server;
-        const publicTools = Array.from(new Set(server2.getPublicToolNames().map(String)));
-        const internalTools = Array.from(new Set(server2.getInternalToolNames().map(String)));
-        const hiddenTools = Array.from(new Set(server2.getHiddenToolNames().map(String)));
+        const server = context2.server;
+        const publicTools = Array.from(new Set(server.getPublicToolNames().map(String)));
+        const internalTools = Array.from(new Set(server.getInternalToolNames().map(String)));
+        const hiddenTools = Array.from(new Set(server.getHiddenToolNames().map(String)));
         const normalInternal = internalTools.filter((name) => !hiddenTools.includes(name));
         if (publicTools.length > 0) {
           await logger2.info(`   \u251C\u2500 Public: ${publicTools.join(", ")}`);
@@ -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 {
@@ -1471,11 +1471,11 @@ import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from "@opentelemetry/semantic
 var tracerProvider = null;
 var tracer = null;
 var isInitialized = false;
-function initializeTracing(config2 = {}) {
+function initializeTracing(config = {}) {
   if (isInitialized) {
     return;
   }
-  const { enabled = true, serviceName = "mcpc-sampling", serviceVersion = "0.2.0", exportTo = "console", otlpEndpoint = "http://localhost:4318/v1/traces", otlpHeaders = {} } = config2;
+  const { enabled = true, serviceName = "mcpc-sampling", serviceVersion = "0.2.0", exportTo = "console", otlpEndpoint = "http://localhost:4318/v1/traces", otlpHeaders = {} } = config;
   if (!enabled) {
     isInitialized = true;
     return;
@@ -1538,14 +1538,14 @@ var AgenticExecutor = class {
   USE_TOOL_KEY;
   logger;
   tracingEnabled;
-  constructor(name, allToolNames, toolNameToDetailList, server2, USE_TOOL_KEY = "useTool") {
+  constructor(name, allToolNames, toolNameToDetailList, server, USE_TOOL_KEY = "useTool") {
     this.name = name;
     this.allToolNames = allToolNames;
     this.toolNameToDetailList = toolNameToDetailList;
-    this.server = server2;
+    this.server = server;
     this.USE_TOOL_KEY = USE_TOOL_KEY;
     this.tracingEnabled = false;
-    this.logger = createLogger(`mcpc.agentic.${name}`, server2);
+    this.logger = createLogger(`mcpc.agentic.${name}`, server);
     try {
       this.tracingEnabled = process5.env.MCPC_TRACING_ENABLED === "true";
       if (this.tracingEnabled) {
@@ -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) {
@@ -2138,9 +2151,9 @@ NOTE: The \`steps\` has been predefined` : `**You MUST execute this tool with fo
 }
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/agentic/agentic-tool-registrar.js
-function registerAgenticTool(server2, { description, name, allToolNames, depGroups, toolNameToDetailList }) {
+function registerAgenticTool(server, { description, name, allToolNames, depGroups, toolNameToDetailList }) {
   const createArgsDef = createArgsDefFactory(name, allToolNames, depGroups, void 0, void 0);
-  const agenticExecutor = new AgenticExecutor(name, allToolNames, toolNameToDetailList, server2);
+  const agenticExecutor = new AgenticExecutor(name, allToolNames, toolNameToDetailList, server);
   description = CompiledPrompts.autonomousExecution({
     toolName: name,
     description
@@ -2151,7 +2164,7 @@ function registerAgenticTool(server2, { description, name, allToolNames, depGrou
     type: "object",
     properties: {}
   };
-  server2.tool(name, description, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server.tool(name, description, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     return await agenticExecutor.execute(args, schema);
   });
 }
@@ -2354,12 +2367,12 @@ var WorkflowExecutor = class {
   predefinedSteps;
   ensureStepActions;
   toolNameToIdMapping;
-  constructor(name, allToolNames, toolNameToDetailList, createArgsDef, server2, predefinedSteps, ensureStepActions, toolNameToIdMapping) {
+  constructor(name, allToolNames, toolNameToDetailList, createArgsDef, server, predefinedSteps, ensureStepActions, toolNameToIdMapping) {
     this.name = name;
     this.allToolNames = allToolNames;
     this.toolNameToDetailList = toolNameToDetailList;
     this.createArgsDef = createArgsDef;
-    this.server = server2;
+    this.server = server;
     this.predefinedSteps = predefinedSteps;
     this.ensureStepActions = ensureStepActions;
     this.toolNameToIdMapping = toolNameToIdMapping;
@@ -2654,9 +2667,9 @@ ${this.formatProgress(state)}`
 };
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/workflow/workflow-tool-registrar.js
-function registerAgenticWorkflowTool(server2, { description, name, allToolNames, depGroups, toolNameToDetailList, predefinedSteps, ensureStepActions, toolNameToIdMapping }) {
+function registerAgenticWorkflowTool(server, { description, name, allToolNames, depGroups, toolNameToDetailList, predefinedSteps, ensureStepActions, toolNameToIdMapping }) {
   const createArgsDef = createArgsDefFactory(name, allToolNames, depGroups, predefinedSteps, ensureStepActions);
-  const workflowExecutor = new WorkflowExecutor(name, allToolNames, toolNameToDetailList, createArgsDef, server2, predefinedSteps, ensureStepActions, toolNameToIdMapping);
+  const workflowExecutor = new WorkflowExecutor(name, allToolNames, toolNameToDetailList, createArgsDef, server, predefinedSteps, ensureStepActions, toolNameToIdMapping);
   const workflowState = new WorkflowState();
   const planningInstructions = predefinedSteps ? "- Set `init: true` (steps are predefined)" : "- Set `init: true` and define complete `steps` array";
   const baseDescription = CompiledPrompts.workflowExecution({
@@ -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) => {
+  server.tool(name, toolDescription, jsonSchema(createModelCompatibleJSONSchema(argsDef)), async (args) => {
     try {
       return await workflowExecutor.execute(args, workflowState);
     } catch (error) {
@@ -2720,24 +2733,24 @@ var BaseSamplingExecutor = class {
   logger;
   tracingEnabled;
   summarize;
-  constructor(name, description, allToolNames, toolNameToDetailList, server2, config2) {
+  constructor(name, description, allToolNames, toolNameToDetailList, server, config) {
     this.name = name;
     this.description = description;
     this.allToolNames = allToolNames;
     this.toolNameToDetailList = toolNameToDetailList;
-    this.server = server2;
+    this.server = server;
     this.conversationHistory = [];
     this.maxIterations = 55;
     this.currentIteration = 0;
     this.tracingEnabled = false;
     this.summarize = true;
-    if (config2?.maxIterations) {
-      this.maxIterations = config2.maxIterations;
+    if (config?.maxIterations) {
+      this.maxIterations = config.maxIterations;
     }
-    if (config2?.summarize !== void 0) {
-      this.summarize = config2.summarize;
+    if (config?.summarize !== void 0) {
+      this.summarize = config.summarize;
     }
-    this.logger = createLogger(`mcpc.sampling.${name}`, server2);
+    this.logger = createLogger(`mcpc.sampling.${name}`, server);
     try {
       const tracingConfig = {
         enabled: process6.env.MCPC_TRACING_ENABLED === "true",
@@ -3072,9 +3085,9 @@ VALID: {"key":"value"}` }) {
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/sampling/agentic-sampling-executor.js
 var SamplingExecutor = class extends BaseSamplingExecutor {
   agenticExecutor;
-  constructor(name, description, allToolNames, toolNameToDetailList, server2, config2) {
-    super(name, description, allToolNames, toolNameToDetailList, server2, config2);
-    this.agenticExecutor = new AgenticExecutor(name, allToolNames, toolNameToDetailList, server2);
+  constructor(name, description, allToolNames, toolNameToDetailList, server, config) {
+    super(name, description, allToolNames, toolNameToDetailList, server, config);
+    this.agenticExecutor = new AgenticExecutor(name, allToolNames, toolNameToDetailList, server);
   }
   buildDepGroups() {
     const depGroups = {};
@@ -3175,9 +3188,9 @@ When you need to use a tool, specify the tool name in 'action' and provide tool-
 };
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/agentic/agentic-sampling-registrar.js
-function registerAgenticSamplingTool(server2, { description, name, allToolNames, depGroups, toolNameToDetailList, samplingConfig }) {
+function registerAgenticSamplingTool(server, { description, name, allToolNames, depGroups, toolNameToDetailList, samplingConfig }) {
   const createArgsDef = createArgsDefFactory(name, allToolNames, depGroups, void 0, void 0);
-  const samplingExecutor = new SamplingExecutor(name, description, allToolNames, toolNameToDetailList, server2, samplingConfig);
+  const samplingExecutor = new SamplingExecutor(name, description, allToolNames, toolNameToDetailList, server, samplingConfig);
   description = CompiledPrompts.samplingExecution({
     toolName: name,
     description,
@@ -3188,7 +3201,7 @@ function registerAgenticSamplingTool(server2, { description, name, allToolNames,
     type: "object",
     properties: {}
   };
-  server2.tool(name, description, jsonSchema(createGoogleCompatibleJSONSchema(schema)), async (args) => {
+  server.tool(name, description, jsonSchema(createModelCompatibleJSONSchema(schema)), async (args) => {
     return await samplingExecutor.executeSampling(args, schema);
   });
 }
@@ -3218,9 +3231,9 @@ var WorkflowSamplingExecutor = class extends BaseSamplingExecutor {
   createArgsDef;
   predefinedSteps;
   workflowExecutor;
-  constructor(name, description, allToolNames, toolNameToDetailList, createArgsDef, server2, predefinedSteps, config2) {
-    super(name, description, allToolNames, toolNameToDetailList, server2, config2), this.createArgsDef = createArgsDef, this.predefinedSteps = predefinedSteps;
-    this.workflowExecutor = new WorkflowExecutor(name, allToolNames, toolNameToDetailList, createArgsDef, server2, predefinedSteps);
+  constructor(name, description, allToolNames, toolNameToDetailList, createArgsDef, server, predefinedSteps, config) {
+    super(name, description, allToolNames, toolNameToDetailList, server, config), this.createArgsDef = createArgsDef, this.predefinedSteps = predefinedSteps;
+    this.workflowExecutor = new WorkflowExecutor(name, allToolNames, toolNameToDetailList, createArgsDef, server, predefinedSteps);
   }
   async executeWorkflowSampling(args, schema, state) {
     const validationResult = validateSchema(args, schema);
@@ -3288,9 +3301,9 @@ Current Task: <user_request>${args.userRequest}</user_request>${contextInfo}`;
 };
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/workflow/workflow-sampling-registrar.js
-function registerWorkflowSamplingTool(server2, { description, name, allToolNames, depGroups, toolNameToDetailList, predefinedSteps, samplingConfig, ensureStepActions, toolNameToIdMapping: _toolNameToIdMapping }) {
+function registerWorkflowSamplingTool(server, { description, name, allToolNames, depGroups, toolNameToDetailList, predefinedSteps, samplingConfig, ensureStepActions, toolNameToIdMapping: _toolNameToIdMapping }) {
   const createArgsDef = createArgsDefFactory(name, allToolNames, depGroups, predefinedSteps, ensureStepActions);
-  const workflowSamplingExecutor = new WorkflowSamplingExecutor(name, description, allToolNames, toolNameToDetailList, createArgsDef, server2, predefinedSteps, samplingConfig);
+  const workflowSamplingExecutor = new WorkflowSamplingExecutor(name, description, allToolNames, toolNameToDetailList, createArgsDef, server, predefinedSteps, samplingConfig);
   const workflowState = new WorkflowState();
   const baseDescription = CompiledPrompts.samplingExecution({
     toolName: name,
@@ -3302,7 +3315,7 @@ function registerWorkflowSamplingTool(server2, { description, name, allToolNames
     type: "object",
     properties: {}
   };
-  server2.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) {
@@ -3552,11 +3565,11 @@ var PluginManager = class {
   server;
   plugins;
   logger;
-  constructor(server2) {
-    this.server = server2;
+  constructor(server) {
+    this.server = server;
     this.plugins = [];
     this.logger = createLogger("mcpc.plugin-manager");
-    this.logger.setServer(server2);
+    this.logger.setServer(server);
   }
   /**
    * Get all registered plugins
@@ -3782,27 +3795,27 @@ var ToolManager = class {
    * Check if a tool is public (exposed to MCP clients)
    */
   isPublic(name) {
-    const config2 = this.toolConfigs.get(name);
-    return config2?.visibility?.public === true;
+    const config = this.toolConfigs.get(name);
+    return config?.visibility?.public === true;
   }
   /**
    * Check if a tool is hidden from agent context
    */
   isHidden(name) {
-    const config2 = this.toolConfigs.get(name);
-    return config2?.visibility?.hidden === true;
+    const config = this.toolConfigs.get(name);
+    return config?.visibility?.hidden === true;
   }
   /**
    * Get all public tool names (exposed to MCP clients)
    */
   getPublicToolNames() {
-    return Array.from(this.toolConfigs.entries()).filter(([_name, config2]) => config2.visibility?.public === true).map(([name]) => this.resolveToolName(name) ?? name);
+    return Array.from(this.toolConfigs.entries()).filter(([_name, config]) => config.visibility?.public === true).map(([name]) => this.resolveToolName(name) ?? name);
   }
   /**
    * Get all hidden tool names
    */
   getHiddenToolNames() {
-    return Array.from(this.toolConfigs.entries()).filter(([_name, config2]) => config2.visibility?.hidden === true).map(([name]) => this.resolveToolName(name) ?? name);
+    return Array.from(this.toolConfigs.entries()).filter(([_name, config]) => config.visibility?.hidden === true).map(([name]) => this.resolveToolName(name) ?? name);
   }
   /**
    * Get all public tools
@@ -3854,8 +3867,8 @@ var ToolManager = class {
   /**
    * Configure tool behavior
    */
-  configTool(toolName, config2) {
-    this.toolConfigs.set(toolName, config2);
+  configTool(toolName, config) {
+    this.toolConfigs.set(toolName, config);
   }
   /**
    * Get tool configuration
@@ -3894,8 +3907,8 @@ var ToolManager = class {
    */
   getHiddenToolSchema(name) {
     const tool = this.toolRegistry.get(name);
-    const config2 = this.toolConfigs.get(name);
-    if (tool && config2?.visibility?.hidden && tool.schema) {
+    const config = this.toolConfigs.get(name);
+    if (tool && config?.visibility?.hidden && tool.schema) {
       return {
         description: tool.description,
         schema: tool.schema
@@ -3978,9 +3991,9 @@ function updateRefPaths(schema, wrapperPath) {
 }
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/compose-helpers.js
-async function processToolsWithPlugins(server2, _externalTools, mode) {
-  const toolManager = server2.toolManager;
-  const pluginManager = server2.pluginManager;
+async function processToolsWithPlugins(server, _externalTools, mode) {
+  const toolManager = server.toolManager;
+  const pluginManager = server.pluginManager;
   for (const [toolId, toolData] of toolManager.getToolEntries()) {
     const defaultSchema = {
       type: "object",
@@ -3995,7 +4008,7 @@ async function processToolsWithPlugins(server2, _externalTools, mode) {
     };
     const processedTool = await pluginManager.applyTransformToolHooks(tempTool, {
       toolName: toolId,
-      server: server2,
+      server,
       mode,
       originalTool: {
         ...tempTool
@@ -4005,9 +4018,9 @@ async function processToolsWithPlugins(server2, _externalTools, mode) {
     toolManager.registerTool(toolId, processedTool.description || toolData.description, processedTool.inputSchema, processedTool.execute);
   }
 }
-function buildDependencyGroups(toolNameToDetailList, hiddenToolNames, publicToolNames, server2) {
+function buildDependencyGroups(toolNameToDetailList, hiddenToolNames, publicToolNames, server) {
   const depGroups = {};
-  const toolManager = server2.toolManager;
+  const toolManager = server.toolManager;
   toolNameToDetailList.forEach(([toolName, tool]) => {
     const resolvedName = toolManager.resolveToolName(toolName);
     if (hiddenToolNames.includes(resolvedName ?? "") || publicToolNames.includes(resolvedName ?? "")) {
@@ -4223,8 +4236,8 @@ var ComposableMCPServer = class extends Server {
   /**
    * Configure tool behavior
    */
-  configTool(toolName, config2) {
-    this.toolManager.configTool(toolName, config2);
+  configTool(toolName, config) {
+    this.toolManager.configTool(toolName, config);
   }
   /**
    * Get tool configuration
@@ -4464,43 +4477,30 @@ 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);
+  const server = new ComposableMCPServer(...serverConf);
   const parsed = parseMcpcConfigs(composeConf);
-  await server2.initBuiltInPlugins();
+  await server.initBuiltInPlugins();
   for (const mcpcConfig of parsed) {
     if (mcpcConfig.plugins) {
       for (const plugin of mcpcConfig.plugins) {
         if (typeof plugin === "string") {
-          await server2.loadPluginFromPath(plugin);
+          await server.loadPluginFromPath(plugin);
         } else {
-          await server2.addPlugin(plugin);
+          await server.addPlugin(plugin);
         }
       }
     }
   }
   if (setupCallback) {
-    await setupCallback(server2);
+    await setupCallback(server);
   }
   for (const mcpcConfig of parsed) {
-    await server2.compose(mcpcConfig.name, mcpcConfig.description ?? "", mcpcConfig.deps, mcpcConfig.options);
+    await server.compose(mcpcConfig.name, mcpcConfig.description ?? "", mcpcConfig.deps, mcpcConfig.options);
   }
-  return server2;
+  return server;
 }
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/plugins/large-result.js
@@ -4523,8 +4523,8 @@ function createSearchPlugin(options = {}) {
   return {
     name: "plugin-search",
     version: "1.0.0",
-    configureServer: (server2) => {
-      server2.tool("search-tool-result", `Search for text patterns in files and directories. Use this to find specific content, code, or information within files. Provide a simple literal string or a regular expression. If your pattern is a regex, ensure it's valid; otherwise use quotes or escape special characters to treat it as a literal string.
+    configureServer: (server) => {
+      server.tool("search-tool-result", `Search for text patterns in files and directories. Use this to find specific content, code, or information within files. Provide a simple literal string or a regular expression. If your pattern is a regex, ensure it's valid; otherwise use quotes or escape special characters to treat it as a literal string.
 Only search within the allowed directory: ${allowedSearchDir}`, jsonSchema({
         type: "object",
         properties: {
@@ -4750,11 +4750,11 @@ function createLargeResultPlugin(options = {}) {
     name: "plugin-large-result-handler",
     version: "1.0.0",
     dependencies: [],
-    configureServer: async (server2) => {
-      if (!configuredServers.has(server2)) {
+    configureServer: async (server) => {
+      if (!configuredServers.has(server)) {
         const searchPlugin = createSearchPlugin(searchConfig);
-        await server2.addPlugin(searchPlugin);
-        configuredServers.set(server2, true);
+        await server.addPlugin(searchPlugin);
+        configuredServers.set(server, true);
       }
     },
     transformTool: (tool, context2) => {
@@ -4816,8 +4816,8 @@ var defaultLargeResultPlugin = createLargeResultPlugin({
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/app.js
 import { codeExecutionPlugin } from "@mcpc-tech/plugin-code-execution";
-var createServer = async (config2) => {
-  const serverConfig = config2 || {
+var createServer = async (config) => {
+  const serverConfig = config || {
     name: "mcpc-server",
     version: "0.1.0",
     agents: [
@@ -4826,7 +4826,7 @@ var createServer = async (config2) => {
         description: "",
         plugins: [
           createLargeResultPlugin({}),
-          codeExecutionPlugin()
+          codeExecutionPlugin
         ],
         options: {
           mode: "code_execution"
@@ -4851,24 +4851,28 @@ var createServer = async (config2) => {
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/bin.ts
 import { createCodeExecutionPlugin } from "@mcpc-tech/plugin-code-execution";
-var config = await loadConfig();
-config?.agents.forEach((agent) => {
-  if (agent.plugins?.length ?? true) {
-    agent.plugins = [];
-  }
-  agent.plugins?.push(
-    createCodeExecutionPlugin({
-      sandbox: {
-        timeout: 3e5
-      }
-    })
-  );
-});
-if (config) {
-  console.error(`Loaded configuration with ${config.agents.length} agent(s)`);
-} else {
-  console.error("No configuration found, using default example configuration");
-}
-var server = await createServer(config || void 0);
-var transport = new StdioServerTransport();
-await server.connect(transport);
+(async () => {
+  const config = await loadConfig();
+  config?.agents.forEach((agent) => {
+    if (agent.plugins?.length ?? true) {
+      agent.plugins = [];
+    }
+    agent.plugins?.push(
+      createCodeExecutionPlugin({
+        sandbox: {
+          timeout: 3e5
+        }
+      })
+    );
+  });
+  if (config) {
+    console.error(`Loaded configuration with ${config.agents.length} agent(s)`);
+  } else {
+    console.error(
+      "No configuration found, using default example configuration"
+    );
+  }
+  const server = await createServer(config || void 0);
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+})();