@mcpc-tech/core 0.2.3 → 0.2.5

package/README.md

@@ -1,5 +1,8 @@
 # @mcpc/core
 
+[![NPM Version](https://img.shields.io/npm/v/@mcpc-tech/core)](https://www.npmjs.com/package/@mcpc-tech/core)
+[![JSR](https://jsr.io/badges/@mcpc/core)](https://jsr.io/@mcpc/core)
+
 **Build agentic MCP servers by composing existing MCP tools.**
 
 The core SDK for creating agentic Model Context Protocol (MCP) servers. Compose

package/index.mjs

@@ -11,7 +11,7 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
 function jsonSchema(schema, options = {}) {
   if (isWrappedSchema(schema)) {
     return schema;
@@ -35,19 +35,102 @@ function extractJsonSchema(schema) {
 }
 var schemaSymbol, validatorSymbol;
 var init_schema = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js"() {
     schemaSymbol = Symbol.for("mcpc.schema");
     validatorSymbol = Symbol.for("mcpc.validator");
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/logger.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/config.js
+import process2 from "node:process";
+var GEMINI_PREFERRED_FORMAT;
+var init_config = __esm({
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/config.js"() {
+    GEMINI_PREFERRED_FORMAT = process2.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
+  }
+});
+
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/json.js
+import { jsonrepair as jsonrepair2 } from "jsonrepair";
+import { inspect } from "node:util";
+function parseJSON2(text, throwError) {
+  try {
+    return JSON.parse(text);
+  } catch (_error) {
+    try {
+      const repairedText = jsonrepair2(text);
+      console.warn(`Failed to parse JSON, attempting to repair, result: ${text}`);
+      if (throwError) {
+        throw _error;
+      }
+      return JSON.parse(repairedText);
+    } catch {
+      if (throwError) {
+        throw new Error("Failed to parse repaired JSON");
+      }
+      return null;
+    }
+  }
+}
+function truncateJSON(obj) {
+  return inspect(obj, {
+    depth: 3,
+    colors: false,
+    maxStringLength: 120
+  });
+}
+function optionalObject(obj, condition) {
+  if (condition) {
+    return obj;
+  }
+  return {};
+}
+var init_json = __esm({
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/json.js"() {
+  }
+});
+
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/provider.js
+function sanitizePropertyKey(name) {
+  return name.replace(/[^a-zA-Z0-9_-]/g, "_").substring(0, 64);
+}
+var createGoogleCompatibleJSONSchema;
+var init_provider = __esm({
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/provider.js"() {
+    init_config();
+    init_json();
+    createGoogleCompatibleJSONSchema = (schema) => {
+      if (!GEMINI_PREFERRED_FORMAT) {
+        return schema;
+      }
+      const { oneOf: _oneOf, allOf: _allOf, anyOf: _anyOf, ...cleanSchema } = schema;
+      const removeAdditionalProperties = (obj) => {
+        if (Array.isArray(obj)) {
+          return obj.map(removeAdditionalProperties);
+        }
+        if (obj && typeof obj === "object") {
+          const result = {};
+          for (const [key, value] of Object.entries(obj)) {
+            if (key !== "additionalProperties") {
+              result[key] = removeAdditionalProperties(value);
+            }
+          }
+          return result;
+        }
+        return obj;
+      };
+      return removeAdditionalProperties(cleanSchema);
+    };
+  }
+});
+
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/logger.js
 function createLogger(name, server) {
   return new MCPLogger(name, server);
 }
 var LOG_LEVELS, MCPLogger, logger;
 var init_logger = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/logger.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/logger.js"() {
     LOG_LEVELS = {
       debug: 0,
       info: 1,
@@ -90,16 +173,8 @@ var init_logger = __esm({
       }
       logToConsole(level, data) {
         const message = typeof data === "string" ? data : JSON.stringify(data);
-        const prefix = `[${this.loggerName}]`;
-        if (level === "debug") {
-          console.debug(prefix, message);
-        } else if (level === "info" || level === "notice") {
-          console.info(prefix, message);
-        } else if (level === "warning") {
-          console.warn(prefix, message);
-        } else {
-          console.error(prefix, message);
-        }
+        const prefix = `[${this.loggerName}:${level}]`;
+        console.error(prefix, message);
       }
       debug(data) {
         return this.log("debug", data);
@@ -135,10 +210,10 @@ var init_logger = __esm({
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/config-plugin.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/config-plugin.js
 var createConfigPlugin, config_plugin_default;
 var init_config_plugin = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/config-plugin.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/config-plugin.js"() {
     createConfigPlugin = () => ({
       name: "built-in-config",
       version: "1.0.0",
@@ -156,10 +231,10 @@ var init_config_plugin = __esm({
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/tool-name-mapping-plugin.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/tool-name-mapping-plugin.js
 var createToolNameMappingPlugin, tool_name_mapping_plugin_default;
 var init_tool_name_mapping_plugin = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/tool-name-mapping-plugin.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/tool-name-mapping-plugin.js"() {
     createToolNameMappingPlugin = () => ({
       name: "built-in-tool-name-mapping",
       version: "1.0.0",
@@ -167,15 +242,17 @@ var init_tool_name_mapping_plugin = __esm({
       transformTool: (tool, context2) => {
         const server = context2.server;
         const toolName = context2.toolName;
-        const dotNotation = toolName.replace(/_/g, ".");
-        const underscoreNotation = toolName.replace(/\./g, "_");
-        if (dotNotation !== toolName && server.toolNameMapping) {
+        const originalName = tool._originalName || toolName;
+        const dotNotation = originalName.replace(/_/g, ".");
+        const underscoreNotation = originalName.replace(/\./g, "_");
+        if (dotNotation !== originalName && server.toolNameMapping) {
           server.toolNameMapping.set(dotNotation, toolName);
-          server.toolNameMapping.set(toolName, dotNotation);
         }
-        if (underscoreNotation !== toolName && server.toolNameMapping) {
+        if (underscoreNotation !== originalName && server.toolNameMapping) {
           server.toolNameMapping.set(underscoreNotation, toolName);
-          server.toolNameMapping.set(toolName, underscoreNotation);
+        }
+        if (originalName !== toolName && server.toolNameMapping) {
+          server.toolNameMapping.set(originalName, toolName);
         }
         return tool;
       }
@@ -184,10 +261,10 @@ var init_tool_name_mapping_plugin = __esm({
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/logging-plugin.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/logging-plugin.js
 var createLoggingPlugin, logging_plugin_default;
 var init_logging_plugin = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/logging-plugin.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/logging-plugin.js"() {
     init_logger();
     createLoggingPlugin = (options = {}) => {
       const { enabled = true, verbose = false, compact: compact2 = true } = options;
@@ -226,7 +303,7 @@ var init_logging_plugin = __esm({
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/index.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/index.js
 var built_in_exports = {};
 __export(built_in_exports, {
   createConfigPlugin: () => createConfigPlugin,
@@ -242,7 +319,7 @@ function getBuiltInPlugins() {
   ];
 }
 var init_built_in = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/index.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/built-in/index.js"() {
     init_config_plugin();
     init_tool_name_mapping_plugin();
     init_logging_plugin();
@@ -252,7 +329,7 @@ var init_built_in = __esm({
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugin-utils.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugin-utils.js
 var plugin_utils_exports = {};
 __export(plugin_utils_exports, {
   checkCircularDependencies: () => checkCircularDependencies,
@@ -459,12 +536,12 @@ function validatePlugins(plugins) {
 }
 var pluginCache;
 var init_plugin_utils = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/plugin-utils.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/plugin-utils.js"() {
     pluginCache = /* @__PURE__ */ new Map();
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/schema.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/schema.js
 import traverse from "json-schema-traverse";
 function updateRefPaths(schema, wrapperPath) {
   if (!schema || typeof schema !== "object") {
@@ -496,11 +573,11 @@ function updateRefPaths(schema, wrapperPath) {
   return clonedSchema;
 }
 var init_schema2 = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/schema.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/schema.js"() {
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/compose-helpers.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/compose-helpers.js
 var compose_helpers_exports = {};
 __export(compose_helpers_exports, {
   buildDependencyGroups: () => buildDependencyGroups,
@@ -566,7 +643,8 @@ function buildDependencyGroups(toolNameToDetailList, hiddenToolNames, publicTool
     const baseProperties = baseSchema.type === "object" && baseSchema.properties ? baseSchema.properties : {};
     const baseRequired = baseSchema.type === "object" && Array.isArray(baseSchema.required) ? baseSchema.required : [];
     const updatedProperties = updateRefPaths(baseProperties, toolName);
-    depGroups[toolName] = {
+    const sanitizedKey = sanitizePropertyKey(toolName);
+    depGroups[sanitizedKey] = {
       type: "object",
       description: tool.description,
       properties: updatedProperties,
@@ -588,18 +666,19 @@ function registerGlobalTools(globalToolNames, tools, server) {
   });
 }
 var init_compose_helpers = __esm({
-  "../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/compose-helpers.js"() {
+  "__mcpc__core_latest/node_modules/@mcpc/core/src/utils/compose-helpers.js"() {
     init_schema2();
     init_schema();
+    init_provider();
   }
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
 init_schema();
 import { CallToolRequestSchema, ListToolsRequestSchema, SetLevelRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 
-// ../__mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/json.js
+// __mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/json.js
 import { jsonrepair } from "jsonrepair";
 function stripMarkdownAndText(text) {
   text = text.trim();
@@ -634,7 +713,7 @@ function parseJSON(text, throwError) {
   }
 }
 
-// ../__mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/ai.js
+// __mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/ai.js
 var p = (template, options = {}) => {
   const { missingVariableHandling = "warn" } = options;
   const names = /* @__PURE__ */ new Set();
@@ -670,7 +749,7 @@ var p = (template, options = {}) => {
   };
 };
 
-// ../__mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/tool-tags.js
+// __mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/tool-tags.js
 import { load } from "cheerio";
 function parseTags(htmlString, tags) {
   const $ = load(htmlString, {
@@ -689,10 +768,10 @@ function parseTags(htmlString, tags) {
   };
 }
 
-// ../__mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/transport/sse.js
+// __mcpc__core_latest/node_modules/@jsr/mcpc__utils/src/transport/sse.js
 import { JSONRPCMessageSchema } from "@modelcontextprotocol/sdk/types.js";
 
-// ../__mcpc__core_latest/node_modules/@jsr/std__http/server_sent_event_stream.js
+// __mcpc__core_latest/node_modules/@jsr/std__http/server_sent_event_stream.js
 var NEWLINE_REGEXP = /\r\n|\r|\n/;
 var encoder = new TextEncoder();
 function assertHasNoNewline(value, varName, errPrefix) {
@@ -730,13 +809,13 @@ var ServerSentEventStream = class extends TransformStream {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/mcp.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/mcp.js
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/registory.js
+// __mcpc__core_latest/node_modules/@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)));
@@ -761,9 +840,10 @@ function smitheryToolNameCompatibale(name, scope) {
   };
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/mcp.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/mcp.js
+init_provider();
 import { cwd } from "node:process";
-import process2 from "node:process";
+import process3 from "node:process";
 import { createHash } from "node:crypto";
 var mcpClientPool = /* @__PURE__ */ new Map();
 var mcpClientConnecting = /* @__PURE__ */ new Map();
@@ -809,7 +889,7 @@ async function getOrCreateMcpClient(defKey, def) {
       command: def.command,
       args: def.args,
       env: {
-        ...process2.env,
+        ...process3.env,
         ...def.env ?? {}
       },
       cwd: cwd()
@@ -863,11 +943,11 @@ var cleanupAllPooledClients = async () => {
     }
   }));
 };
-process2.once?.("exit", () => {
+process3.once?.("exit", () => {
   cleanupAllPooledClients();
 });
-process2.once?.("SIGINT", () => {
-  cleanupAllPooledClients().finally(() => process2.exit(0));
+process3.once?.("SIGINT", () => {
+  cleanupAllPooledClients().finally(() => process3.exit(0));
 });
 async function composeMcpDepTools(mcpConfig, filterIn) {
   const allTools = {};
@@ -885,7 +965,8 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
       const { tools } = await client.listTools();
       tools.forEach((tool) => {
         const { toolNameWithScope, toolName: internalToolName } = smitheryToolNameCompatibale(tool.name, name);
-        const toolId = `${serverId}_${internalToolName}`;
+        const rawToolId = `${serverId}_${internalToolName}`;
+        const toolId = sanitizePropertyKey(rawToolId);
         if (filterIn && !filterIn({
           action: internalToolName,
           tool,
@@ -904,7 +985,8 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
         });
         allTools[toolId] = {
           ...tool,
-          execute
+          execute,
+          _originalName: toolNameWithScope
         };
       });
     } catch (error) {
@@ -924,74 +1006,11 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
   };
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-tool-registrar.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-tool-registrar.js
 init_schema();
+init_provider();
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/config.js
-import process3 from "node:process";
-var GEMINI_PREFERRED_FORMAT = process3.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
-
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/json.js
-import { jsonrepair as jsonrepair2 } from "jsonrepair";
-import { inspect } from "node:util";
-function parseJSON2(text, throwError) {
-  try {
-    return JSON.parse(text);
-  } catch (_error) {
-    try {
-      const repairedText = jsonrepair2(text);
-      console.warn(`Failed to parse JSON, attempting to repair, result: ${text}`);
-      if (throwError) {
-        throw _error;
-      }
-      return JSON.parse(repairedText);
-    } catch {
-      if (throwError) {
-        throw new Error("Failed to parse repaired JSON");
-      }
-      return null;
-    }
-  }
-}
-function truncateJSON(obj) {
-  return inspect(obj, {
-    depth: 3,
-    colors: false,
-    maxStringLength: 120
-  });
-}
-function optionalObject(obj, condition) {
-  if (condition) {
-    return obj;
-  }
-  return {};
-}
-
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/provider.js
-var createGoogleCompatibleJSONSchema = (schema) => {
-  if (!GEMINI_PREFERRED_FORMAT) {
-    return schema;
-  }
-  const { oneOf: _oneOf, allOf: _allOf, anyOf: _anyOf, ...cleanSchema } = schema;
-  const removeAdditionalProperties = (obj) => {
-    if (Array.isArray(obj)) {
-      return obj.map(removeAdditionalProperties);
-    }
-    if (obj && typeof obj === "object") {
-      const result = {};
-      for (const [key, value] of Object.entries(obj)) {
-        if (key !== "additionalProperties") {
-          result[key] = removeAdditionalProperties(value);
-        }
-      }
-      return result;
-    }
-    return obj;
-  };
-  return removeAdditionalProperties(cleanSchema);
-};
-
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/prompts/index.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/prompts/index.js
 var SystemPrompts = {
   /**
    * Base system prompt for autonomous MCP execution
@@ -1333,13 +1352,13 @@ ${JSON.stringify(steps, null, 2)}`;
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-executor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-executor.js
 import { Ajv } from "ajv";
 import { AggregateAjvError } from "@segment/ajv-human-errors";
 import addFormats from "ajv-formats";
 init_logger();
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/tracing.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/tracing.js
 import { context, SpanStatusCode, trace } from "@opentelemetry/api";
 import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
 import { BatchSpanProcessor, ConsoleSpanExporter, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
@@ -1406,7 +1425,7 @@ function endSpan(span, error) {
   span.end();
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-executor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-executor.js
 import process4 from "node:process";
 var ajv = new Ajv({
   allErrors: true,
@@ -1661,7 +1680,7 @@ var AgenticExecutor = class {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/function/partial.js
+// __mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/function/partial.js
 function partial(func, ...partialArgs) {
   return partialImpl(func, placeholderSymbol, ...partialArgs);
 }
@@ -1680,7 +1699,7 @@ function partialImpl(func, placeholder, ...partialArgs) {
 var placeholderSymbol = Symbol("partial.placeholder");
 partial.placeholder = placeholderSymbol;
 
-// ../__mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/function/partialRight.js
+// __mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/function/partialRight.js
 function partialRight(func, ...partialArgs) {
   return partialRightImpl(func, placeholderSymbol2, ...partialArgs);
 }
@@ -1701,10 +1720,10 @@ function partialRightImpl(func, placeholder, ...partialArgs) {
 var placeholderSymbol2 = Symbol("partialRight.placeholder");
 partialRight.placeholder = placeholderSymbol2;
 
-// ../__mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/function/retry.js
+// __mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/function/retry.js
 var DEFAULT_RETRIES = Number.POSITIVE_INFINITY;
 
-// ../__mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/object/pick.js
+// __mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/object/pick.js
 function pick(obj, keys) {
   const result = {};
   for (let i = 0; i < keys.length; i++) {
@@ -1716,7 +1735,7 @@ function pick(obj, keys) {
   return result;
 }
 
-// ../__mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/string/deburr.js
+// __mcpc__core_latest/node_modules/@jsr/es-toolkit__es-toolkit/src/string/deburr.js
 var deburrMap = new Map(
   // eslint-disable-next-line no-restricted-syntax
   Object.entries({
@@ -1752,7 +1771,7 @@ var deburrMap = new Map(
   })
 );
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/factories/args-def-factory.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/factories/args-def-factory.js
 var DECISION_OPTIONS = {
   RETRY: "retry",
   PROCEED: "proceed",
@@ -1983,7 +2002,7 @@ NOTE: The \`steps\` has been predefined` : `**You MUST execute this tool with fo
   };
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/sampling/base-sampling-executor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/sampling/base-sampling-executor.js
 import { Ajv as Ajv2 } from "ajv";
 import { AggregateAjvError as AggregateAjvError2 } from "@segment/ajv-human-errors";
 import addFormats2 from "ajv-formats";
@@ -2351,7 +2370,7 @@ VALID: {"key":"value"}` }) {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/sampling/agentic-sampling-executor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/sampling/agentic-sampling-executor.js
 var SamplingExecutor = class extends BaseSamplingExecutor {
   agenticExecutor;
   constructor(name, description, allToolNames, toolNameToDetailList, server, config) {
@@ -2457,7 +2476,7 @@ When the task is complete, I should use "action": "complete".`;
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-tool-registrar.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/agentic/agentic-tool-registrar.js
 function registerAgenticTool(server, { description, name, allToolNames, depGroups, toolNameToDetailList, sampling = false }) {
   const createArgsDef = createArgsDefFactory(name, allToolNames, depGroups, void 0, void 0);
   const isSamplingMode = sampling === true || typeof sampling === "object";
@@ -2487,10 +2506,10 @@ function registerAgenticTool(server, { description, name, allToolNames, depGroup
   });
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-tool-registrar.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-tool-registrar.js
 init_schema();
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/state.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/state.js
 var WorkflowState = class {
   currentStepIndex = -1;
   steps = [];
@@ -2659,7 +2678,10 @@ var WorkflowState = class {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-executor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-tool-registrar.js
+init_provider();
+
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-executor.js
 import { Ajv as Ajv3 } from "ajv";
 import { AggregateAjvError as AggregateAjvError3 } from "@segment/ajv-human-errors";
 import addFormats3 from "ajv-formats";
@@ -2986,7 +3008,7 @@ ${this.formatProgress(state)}`
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/sampling/workflow-sampling-executor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/sampling/workflow-sampling-executor.js
 var WorkflowSamplingExecutor = class extends BaseSamplingExecutor {
   createArgsDef;
   predefinedSteps;
@@ -3060,7 +3082,7 @@ Current Task: <user_request>${args.userRequest}</user_request>${contextInfo}`;
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-tool-registrar.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/executors/workflow/workflow-tool-registrar.js
 function registerAgenticWorkflowTool(server, { description, name, allToolNames, depGroups, toolNameToDetailList, predefinedSteps, sampling = false, ensureStepActions, toolNameToIdMapping }) {
   const createArgsDef = createArgsDefFactory(name, allToolNames, depGroups, predefinedSteps, ensureStepActions);
   const isSamplingMode = sampling === true || typeof sampling === "object";
@@ -3102,7 +3124,7 @@ function registerAgenticWorkflowTool(server, { description, name, allToolNames,
   });
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/tool-tag-processor.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/tool-tag-processor.js
 var ALL_TOOLS_PLACEHOLDER = "__ALL__";
 function findToolId(toolName, tools, toolNameMapping) {
   const mappedId = toolNameMapping?.get(toolName);
@@ -3130,18 +3152,20 @@ function processToolTags({ description, tagToResults, $, tools, toolOverrides, t
       const toolId = findToolId(toolName, tools, toolNameMapping);
       if (toolId) {
         $(toolEl).replaceWith(`<action action="${toolId}"/>`);
+      } else {
+        $(toolEl).remove();
       }
     }
   });
   return $.root().html() ?? description;
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
 init_built_in();
 init_logger();
 init_plugin_utils();
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/plugin-manager.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/plugin-manager.js
 init_plugin_utils();
 init_logger();
 var PluginManager = class {
@@ -3309,7 +3333,7 @@ var PluginManager = class {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/tool-manager.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/tool-manager.js
 var ToolManager = class {
   toolRegistry = /* @__PURE__ */ new Map();
   toolConfigs = /* @__PURE__ */ new Map();
@@ -3496,7 +3520,7 @@ var ToolManager = class {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
 init_compose_helpers();
 var ALL_TOOLS_PLACEHOLDER2 = "__ALL__";
 var ComposableMCPServer = class extends Server {
@@ -3878,7 +3902,7 @@ var ComposableMCPServer = class extends Server {
   }
 };
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/env.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/common/env.js
 import process6 from "node:process";
 var isProdEnv = () => process6.env.NODE_ENV === "production";
 var isSCF = () => Boolean(process6.env.SCF_RUNTIME || process6.env.PROD_SCF);
@@ -3889,17 +3913,22 @@ if (isSCF()) {
   });
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/mod.js
+// __mcpc__core_latest/node_modules/@mcpc/core/mod.ts
+init_json();
+
+// __mcpc__core_latest/node_modules/@mcpc/core/mod.js
+init_json();
 init_schema();
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/ai-sdk-adapter.js
-function convertToAISDKTools(server, tool, jsonSchema2) {
+// __mcpc__core_latest/node_modules/@mcpc/core/src/ai-sdk-adapter.js
+function convertToAISDKTools(server, helpers) {
+  const { tool, jsonSchema: jsonSchema2 } = helpers;
   const mcpcTools = server.getPublicTools();
   return Object.fromEntries(mcpcTools.map((mcpcTool) => [
     mcpcTool.name,
     tool({
       description: mcpcTool.description || "No description",
-      parameters: jsonSchema2(mcpcTool.inputSchema),
+      inputSchema: jsonSchema2(mcpcTool.inputSchema),
       execute: async (input) => {
         return await server.callTool(mcpcTool.name, input);
       }
@@ -3907,7 +3936,7 @@ function convertToAISDKTools(server, tool, jsonSchema2) {
   ]));
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/set-up-mcp-compose.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/set-up-mcp-compose.js
 function parseMcpcConfigs(conf) {
   const mcpcConfigs = conf ?? [];
   const newMcpcConfigs = [];
@@ -3948,7 +3977,7 @@ async function mcpc(serverConf, composeConf, setupCallback) {
   return server;
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/mod.ts
+// __mcpc__core_latest/node_modules/@mcpc/core/mod.ts
 init_schema();
 export {
   ComposableMCPServer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/core",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "homepage": "https://jsr.io/@mcpc/core",
   "type": "module",
   "dependencies": {

package/plugins/large-result.mjs

@@ -2,16 +2,16 @@
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/large-result.ts
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/large-result.ts
 import { mkdtemp, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir as tmpdir2 } from "node:os";
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
 import rg from "@mcpc-tech/ripgrep-napi";
 import { tmpdir } from "node:os";
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
 var schemaSymbol = Symbol.for("mcpc.schema");
 var validatorSymbol = Symbol.for("mcpc.validator");
 function jsonSchema(schema, options = {}) {
@@ -30,7 +30,7 @@ function isWrappedSchema(value) {
   return typeof value === "object" && value !== null && schemaSymbol in value && value[schemaSymbol] === true;
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
 import { resolve } from "node:path";
 import { relative } from "node:path";
 function createSearchPlugin(options = {}) {
@@ -255,7 +255,7 @@ var defaultSearchPlugin = createSearchPlugin({
   timeoutMs: 3e4
 });
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/large-result.ts
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/large-result.ts
 function createLargeResultPlugin(options = {}) {
   const maxSize = options.maxSize || 8e3;
   const previewSize = options.previewSize || 4e3;

package/plugins/search.mjs

@@ -2,11 +2,11 @@
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.ts
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.ts
 import rg from "@mcpc-tech/ripgrep-napi";
 import { tmpdir } from "node:os";
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
 var schemaSymbol = Symbol.for("mcpc.schema");
 var validatorSymbol = Symbol.for("mcpc.validator");
 function jsonSchema(schema, options = {}) {
@@ -25,7 +25,7 @@ function isWrappedSchema(value) {
   return typeof value === "object" && value !== null && schemaSymbol in value && value[schemaSymbol] === true;
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.ts
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.ts
 import { resolve } from "node:path";
 import { relative } from "node:path";
 function createSearchPlugin(options = {}) {

package/plugins.mjs

@@ -2,11 +2,11 @@
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
 import rg from "@mcpc-tech/ripgrep-napi";
 import { tmpdir } from "node:os";
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/utils/schema.js
 var schemaSymbol = Symbol.for("mcpc.schema");
 var validatorSymbol = Symbol.for("mcpc.validator");
 function jsonSchema(schema, options = {}) {
@@ -25,7 +25,7 @@ function isWrappedSchema(value) {
   return typeof value === "object" && value !== null && schemaSymbol in value && value[schemaSymbol] === true;
 }
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/search-tool.js
 import { resolve } from "node:path";
 import { relative } from "node:path";
 function createSearchPlugin(options = {}) {
@@ -251,7 +251,7 @@ var defaultSearchPlugin = createSearchPlugin({
 });
 var search_tool_default = defaultSearchPlugin;
 
-// ../__mcpc__core_latest/node_modules/@mcpc/core/src/plugins/large-result.js
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/large-result.js
 import { mkdtemp, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir as tmpdir2 } from "node:os";

package/types/src/ai-sdk-adapter.d.ts

@@ -9,23 +9,23 @@
 /**
  * Converts MCPC server tools to AI SDK compatible tools format.
  *
- * This function takes a MCPC server instance and returns an object mapping
- * tool names to AI SDK tool definitions. The returned tools can be directly
- * used with AI SDK's `generateText` or `streamText` functions.
+ * This function takes a MCPC server instance and AI SDK helpers, returning
+ * an object mapping tool names to AI SDK tool definitions.
  *
  * @param server - The MCPC server instance
- * @param tool - The AI SDK tool() helper function from "ai" package
- * @param jsonSchema - The AI SDK jsonSchema() helper function from "ai" package
+ * @param helpers - Object containing AI SDK helper functions
+ * @param helpers.tool - The AI SDK tool() helper function from "ai" package
+ * @param helpers.jsonSchema - The AI SDK jsonSchema() helper function from "ai" package
  * @returns Object mapping tool names to AI SDK compatible tools
  *
  * @example
  * ```typescript
- * import { tool, jsonSchema } from "ai";
+ * import { tool, jsonSchema, generateText } from "ai";
  * import { mcpc } from "@mcpc/core";
  * import { convertToAISDKTools } from "@mcpc/core/ai-sdk-adapter";
  *
  * const server = await mcpc([...], [...]);
- * const tools = convertToAISDKTools(server, tool, jsonSchema);
+ * const tools = convertToAISDKTools(server, { tool, jsonSchema });
  *
  * const result = await generateText({
  *   model: openai("gpt-4"),
@@ -33,21 +33,15 @@
  *   prompt: "Your prompt here"
  * });
  * ```
- */ export declare function convertToAISDKTools(server: ComposableMCPServer, tool: ToolHelper, jsonSchema: JsonSchemaHelper): Record<string, unknown>;
+ */ export declare function convertToAISDKTools(server: ComposableMCPServer, helpers: {
+  tool: ToolHelper;
+  jsonSchema: JsonSchemaHelper;
+}): Record<string, any>;
 /**
  * Type definition for AI SDK's tool() helper function.
- * This matches the signature from the "ai" package.
- */ export interface ToolHelper {
-  (options: {
-    description: string;
-    parameters: any;
-    execute: (input: any) => Promise<any>;
-  }) : unknown;
-}
+ * Using a generic function type to accept any compatible tool helper.
+ */ export type ToolHelper = (...args: any[]) => any;
 /**
  * Type definition for AI SDK's jsonSchema() helper function.
- * This matches the signature from the "ai" package.
- */ export interface JsonSchemaHelper {
-  (schema: any) : unknown;
-}
+ */ export type JsonSchemaHelper = (...args: any[]) => any;
 //# sourceMappingURL=ai-sdk-adapter.d.ts.map

package/types/src/ai-sdk-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-adapter.d.ts","sources":["../../src/ai-sdk-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;CAOC,GAED,cAAc,mBAAmB,uBAAuB;AAGxD;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BC,GACD,OAAO,iBAAS,oBACd,QAAQ,mBAAmB,EAC3B,MAAM,UAAU,EAChB,YAAY,gBAAgB,GAC3B,OAAO,MAAM,EAAE,OAAO;AAoBzB;;;CAGC,GACD,iBAAiB;GACd;IACC,aAAa,MAAM;IACnB,YAAY,GAAG;IACf,UAAU,OAAO,GAAG,KAAK,QAAQ,GAAG;OAClC,OAAO;;AAGb;;;CAGC,GACD,iBAAiB;GACd,QAAQ,GAAG,IAAG,OAAO"}
+{"version":3,"file":"ai-sdk-adapter.d.ts","sources":["../../src/ai-sdk-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;CAOC,GAED,cAAc,mBAAmB,uBAAuB;AAGxD;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BC,GACD,OAAO,iBAAS,oBACd,QAAQ,mBAAmB,EAC3B;EACE,MAAM;EACN,YAAY;CACb,GACA,OAAO,MAAM,EAAE,GAAG;AAkBrB;;;CAGC,GACD,YAAY,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG;AAEhD;;CAEC,GACD,YAAY,oBAAoB,GAAG,MAAM,GAAG,OAAO,GAAG"}

package/types/src/utils/common/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sources":["../../../../src/utils/common/mcp.ts"],"names":[],"mappings":"AAIA,cACE,iBAAiB,iCAEa;AAChC,YAAY,aAAyB;AA2IrC,OAAO,iBAAe,mBACpB,WACI,EAAE,aAAa,qBACf,EAAE,aAAa,kBAAkB,EACrC,YAAY;EACV,QAAQ,MAAM;EACd,MAAM,GAAG;EACT,SAAS,MAAM;EACf,mBAAmB,MAAM;EACzB,kBAAkB,MAAM;EACxB,QAAQ,MAAM;MACV,OAAO,GACZ,QAAQ,OAAO,MAAM,EAAE,GAAG"}
+{"version":3,"file":"mcp.d.ts","sources":["../../../../src/utils/common/mcp.ts"],"names":[],"mappings":"AAIA,cACE,iBAAiB,iCAEa;AAChC,YAAY,aAAyB;AA4IrC,OAAO,iBAAe,mBACpB,WACI,EAAE,aAAa,qBACf,EAAE,aAAa,kBAAkB,EACrC,YAAY;EACV,QAAQ,MAAM;EACd,MAAM,GAAG;EACT,SAAS,MAAM;EACf,mBAAmB,MAAM;EACzB,kBAAkB,MAAM;EACxB,QAAQ,MAAM;MACV,OAAO,GACZ,QAAQ,OAAO,MAAM,EAAE,GAAG"}