@mcpc-tech/core 0.3.6 → 0.3.8

package/index.mjs

@@ -205,31 +205,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__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)));
-  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__core_latest/node_modules/@mcpc/core/src/utils/common/config.js
 import process2 from "node:process";
 var GEMINI_PREFERRED_FORMAT = process2.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
@@ -441,7 +416,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({
@@ -1188,7 +1164,21 @@ var AgenticExecutor = class {
       const useTool = args[this.USE_TOOL_KEY];
       const definitionsOf = args.definitionsOf || [];
       const hasDefinitions = args.hasDefinitions || [];
-      if (executeSpan && useTool) {
+      if (!useTool) {
+        if (executeSpan) {
+          executeSpan.setAttributes({
+            toolType: "none",
+            completion: true
+          });
+          endSpan(executeSpan);
+        }
+        const result2 = {
+          content: []
+        };
+        this.appendToolSchemas(result2, definitionsOf, hasDefinitions);
+        return result2;
+      }
+      if (executeSpan) {
         try {
           const safeTool = String(useTool).replace(/\s+/g, "_");
           if (typeof executeSpan.updateName === "function") {
@@ -1274,14 +1264,14 @@ var AgenticExecutor = class {
       if (executeSpan) {
         executeSpan.setAttributes({
           toolType: "not_found",
-          useTool: useTool || "unknown",
-          completion: true
+          useTool
         });
         endSpan(executeSpan);
       }
-      this.logger.debug({
-        message: "Tool not found, returning completion message",
-        useTool
+      this.logger.warning({
+        message: "Tool not found",
+        useTool,
+        availableTools: this.allToolNames
       });
       const result = {
         content: []
@@ -4059,20 +4049,7 @@ function convertToAISDKTools(server, helpers) {
 
 // __mcpc__core_latest/node_modules/@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, config] of Object.entries(mcpcConfig.deps.mcpServers)) {
-        if (config.smitheryConfig) {
-          const streamConfig = connectToSmitheryServer(config.smitheryConfig);
-          mcpcConfig.deps.mcpServers[name] = streamConfig;
-        }
-      }
-    }
-    newMcpcConfigs.push(mcpcConfig);
-  }
-  return newMcpcConfigs;
+  return conf ?? [];
 }
 async function mcpc(serverConf, composeConf, setupCallback) {
   const server = new ComposableMCPServer(...serverConf);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/core",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "homepage": "https://jsr.io/@mcpc/core",
   "type": "module",
   "dependencies": {
@@ -16,10 +16,8 @@
     "ajv": "^8.17.1",
     "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",
-    "zod": "^3.24.2"
+    "jsonrepair": "^3.13.0"
   },
   "exports": {
     ".": {

package/types/src/compose.d.ts

@@ -1,8 +1,7 @@
 import { type Implementation, type Tool } from "@modelcontextprotocol/sdk/types.js";
 import { type Schema } from "./utils/schema.js";
-import type { McpSettingsSchema } from "./service/tools.js";
+import type { MCPSetting } from "./service/tools.js";
 import { Server, type ServerOptions } from "@modelcontextprotocol/sdk/server/index.js";
-import type z from "zod";
 import type { ComposeDefinition } from "./set-up-mcp-compose.js";
 import type { JSONSchema, ToolCallback } from "./types.js";
 import type { ToolConfig, ToolPlugin } from "./plugin-types.js";
@@ -75,6 +74,6 @@ export declare class ComposableMCPServer extends Server {
   /**
    * Close the server and ensure all plugins are disposed
    */ override close(): Promise<void>;
-  compose(name: string | null, description: string, depsConfig?: z.infer<typeof McpSettingsSchema>, options?: ComposeDefinition["options"]): Promise<void>;
+  compose(name: string | null, description: string, depsConfig?: MCPSetting, options?: ComposeDefinition["options"]): Promise<void>;
 }
 //# sourceMappingURL=compose.d.ts.map

package/types/src/compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compose.d.ts","sources":["../../src/compose.ts"],"names":[],"mappings":"AAAA,SAGE,KAAK,cAAc,EAGnB,KAAK,IAAI,6CAC6C;AACxD,SAAwC,KAAK,MAAM,4BAA4B;AAC/E,cAAc,iBAAiB,6BAA6B;AAC5D,SACE,MAAM,EACN,KAAK,aAAa,oDAC2C;AAC/D,YAAY,aAAyB;AAGrC,cAAc,iBAAiB,kCAAkC;AACjE,cAAc,UAAU,EAAE,YAAY,qBAAqB;AAM3D,cAA4B,UAAU,EAAE,UAAU,4BAA4B;AAe9E,OAAO,cAAM,4BAA4B;EACvC,QAAQ,mBAA6B;EACrC,QAAQ,iBAAyB;EACjC,QAAQ,YAAsC;EAG9C,IAAI,mBAAmB,IAAI,MAAM,EAAE,MAAM;EAIzC,YAAY,aAAa,cAAc,EAAE,SAAS,aAAa;EAiB/D;;GAEC,GACD,AAAM,sBAAsB,QAAQ,IAAI;UAqB1B;UAsDN;EAIR,KAAK,GACH,MAAM,MAAM,EACZ,aAAa,MAAM,EACnB,cAAc,OAAO,KAAK,UAAU,EACpC,KAAK,MAAM,GAAG,QAAQ,OAAO,KAAK,OAAO,EACzC;IAAW,WAAW,OAAO;IAAE,UAAU;GAAmB;EA+D9D;;GAEC,GACD,gBAAgB,MAAM,MAAM,GAAG,eAAe,SAAS;EAIvD;;GAEC,GACD,eAAe,QAAQ,MAAM,GAAG,aAAa,SAAS;EAItD;;GAEC,GACD,AAAM,SAAS,MAAM,MAAM,EAAE,MAAM,OAAO,GAAG,QAAQ,OAAO;EAyB5D;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,kBAAkB;EAIlB;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,wBAAwB,MAAM;EAM9B;;GAEC,GACD,oBACE,MAAM,MAAM;IACT,aAAa,MAAM;IAAE,QAAQ;MAAe,SAAS;EAI1D;;GAEC,GACD,aAAa,MAAM,MAAM,GAAG,OAAO;EAInC;;GAEC,GACD,WAAW,UAAU,MAAM,EAAE,QAAQ,UAAU,GAAG,IAAI;EAItD;;GAEC,GACD,cAAc,UAAU,MAAM,GAAG,aAAa,SAAS;EAIvD;;GAEC,GACD,iBAAiB,UAAU,MAAM,GAAG,OAAO;EAI3C;;GAEC,GACD,AAAM,UAAU,QAAQ,UAAU,GAAG,QAAQ,IAAI;EAIjD;;GAEC,GACD,AAAM,mBACJ,YAAY,MAAM,EAClB;IAAW,QAAQ,OAAO;GAAoB,GAC7C,QAAQ,IAAI;UAOD;EAOd;;GAEC,GACD,AAAM,kBAAkB,QAAQ,IAAI;EAIpC;;GAEC,GACD,SAAe,SAAS,QAAQ,IAAI;EAK9B,QACJ,MAAM,MAAM,GAAG,IAAI,EACnB,aAAa,MAAM,EACnB,aAAY,EAAE,aAAa,kBAAuC,EAClE,UAAS,kBAAkB,UAAgC;AA2R/D"}
+{"version":3,"file":"compose.d.ts","sources":["../../src/compose.ts"],"names":[],"mappings":"AAAA,SAGE,KAAK,cAAc,EAGnB,KAAK,IAAI,6CAC6C;AACxD,SAAwC,KAAK,MAAM,4BAA4B;AAC/E,cAAc,UAAU,6BAA6B;AACrD,SACE,MAAM,EACN,KAAK,aAAa,oDAC2C;AAG/D,cAAc,iBAAiB,kCAAkC;AACjE,cAAc,UAAU,EAAE,YAAY,qBAAqB;AAM3D,cAA4B,UAAU,EAAE,UAAU,4BAA4B;AAe9E,OAAO,cAAM,4BAA4B;EACvC,QAAQ,mBAA6B;EACrC,QAAQ,iBAAyB;EACjC,QAAQ,YAAsC;EAG9C,IAAI,mBAAmB,IAAI,MAAM,EAAE,MAAM;EAIzC,YAAY,aAAa,cAAc,EAAE,SAAS,aAAa;EAiB/D;;GAEC,GACD,AAAM,sBAAsB,QAAQ,IAAI;UAqB1B;UAsDN;EAIR,KAAK,GACH,MAAM,MAAM,EACZ,aAAa,MAAM,EACnB,cAAc,OAAO,KAAK,UAAU,EACpC,KAAK,MAAM,GAAG,QAAQ,OAAO,KAAK,OAAO,EACzC;IAAW,WAAW,OAAO;IAAE,UAAU;GAAmB;EA+D9D;;GAEC,GACD,gBAAgB,MAAM,MAAM,GAAG,eAAe,SAAS;EAIvD;;GAEC,GACD,eAAe,QAAQ,MAAM,GAAG,aAAa,SAAS;EAItD;;GAEC,GACD,AAAM,SAAS,MAAM,MAAM,EAAE,MAAM,OAAO,GAAG,QAAQ,OAAO;EAyB5D;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,kBAAkB;EAIlB;;GAEC,GACD,sBAAsB,MAAM;EAI5B;;GAEC,GACD,wBAAwB,MAAM;EAM9B;;GAEC,GACD,oBACE,MAAM,MAAM;IACT,aAAa,MAAM;IAAE,QAAQ;MAAe,SAAS;EAI1D;;GAEC,GACD,aAAa,MAAM,MAAM,GAAG,OAAO;EAInC;;GAEC,GACD,WAAW,UAAU,MAAM,EAAE,QAAQ,UAAU,GAAG,IAAI;EAItD;;GAEC,GACD,cAAc,UAAU,MAAM,GAAG,aAAa,SAAS;EAIvD;;GAEC,GACD,iBAAiB,UAAU,MAAM,GAAG,OAAO;EAI3C;;GAEC,GACD,AAAM,UAAU,QAAQ,UAAU,GAAG,QAAQ,IAAI;EAIjD;;GAEC,GACD,AAAM,mBACJ,YAAY,MAAM,EAClB;IAAW,QAAQ,OAAO;GAAoB,GAC7C,QAAQ,IAAI;UAOD;EAOd;;GAEC,GACD,AAAM,kBAAkB,QAAQ,IAAI;EAIpC;;GAEC,GACD,SAAe,SAAS,QAAQ,IAAI;EAK9B,QACJ,MAAM,MAAM,GAAG,IAAI,EACnB,aAAa,MAAM,EACnB,aAAY,UAA+B,EAC3C,UAAS,kBAAkB,UAAgC;AA2R/D"}

package/types/src/service/tools.d.ts

@@ -1,4 +1,31 @@
-import { z } from "zod";
-export declare const McpSettingsSchema: z.ZodObject<Record<string, z.ZodTypeAny>>;
-export type MCPSetting = z.input<typeof McpSettingsSchema> | z.infer<typeof McpSettingsSchema>;
+interface BaseServerConfig {
+  autoApprove?: string[];
+  disabled?: boolean;
+  disabledReason?: string;
+  toolCallTimeout?: number;
+}
+export interface StdioServerConfig extends BaseServerConfig {
+  command: string;
+  args?: string[];
+  env?: Record<string, string>;
+  transportType?: "stdio";
+}
+export interface SseServerConfig extends BaseServerConfig {
+  url: string;
+  transportType?: "sse";
+  headers?: Record<string, string>;
+}
+export interface StreamableHTTPServerConfig extends BaseServerConfig {
+  url: string;
+  transportType?: "streamable-http";
+  headers?: Record<string, string>;
+}
+export interface InMemoryServerConfig extends BaseServerConfig {
+  transportType: "memory";
+  server: any;
+}
+export type McpServerConfig = StdioServerConfig | SseServerConfig | StreamableHTTPServerConfig | InMemoryServerConfig;
+export type MCPSetting = {
+  mcpServers: Record<string, McpServerConfig>;
+};
 //# sourceMappingURL=tools.d.ts.map

package/types/src/service/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sources":["../../../src/service/tools.ts"],"names":[],"mappings":"AAAA,SAAS,CAAC,cAA0B;AA+CpC,OAAO,cAAM,mBAAmB,EAAE,UAAU,OAAO,MAAM,EAAE,EAAE,aAGxD;AASL,YAAY,aACR,EAAE,aAAa,qBACf,EAAE,aAAa"}
+{"version":3,"file":"tools.d.ts","sources":["../../../src/service/tools.ts"],"names":[],"mappings":"UACU;EACR,cAAc,MAAM;EACpB,WAAW,OAAO;EAClB,iBAAiB,MAAM;EACvB,kBAAkB,MAAM;;AAG1B,iBAAiB,0BAA0B;EACzC,SAAS,MAAM;EACf,OAAO,MAAM;EACb,MAAM,OAAO,MAAM,EAAE,MAAM;EAC3B,gBAAgB;;AAGlB,iBAAiB,wBAAwB;EACvC,KAAK,MAAM;EACX,gBAAgB;EAChB,UAAU,OAAO,MAAM,EAAE,MAAM;;AAGjC,iBAAiB,mCAAmC;EAClD,KAAK,MAAM;EACX,gBAAgB;EAChB,UAAU,OAAO,MAAM,EAAE,MAAM;;AAGjC,iBAAiB,6BAA6B;EAC5C,eAAe;EACf,QAAQ,GAAG;;AAIb,YAAY,kBACR,oBACA,kBACA,6BACA;AAEJ,YAAY;EACV,YAAY,OAAO,MAAM,EAAE"}

package/types/src/set-up-mcp-compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-up-mcp-compose.d.ts","sources":["../../src/set-up-mcp-compose.ts"],"names":[],"mappings":"AAAA,SAAS,mBAAmB,oBAAoB;AAEhD,cAAc,QAAQ,2BAA2B;AACjD,cAAc,UAAU,6BAA6B;AACrD,cAAc,cAAc,qBAAqB;AACjD,cAAc,UAAU,4BAA4B;AACpD,cAAc,UAAU,qBAAqB;AAC7C,cAAc,aAAa,6BAA6B;AAExD,iBAAiB;EACf;;;GAGC,GACD,MAAM,MAAM,GAAG,IAAI;EACnB;;GAEC,GACD,cAAc,MAAM;EACpB,OAAO;EAEP;;;;;;;;;;;GAWC,GACD,WAAW,aAAa,MAAM;EAE9B;IACE;;;;;;;KAOC,GACD,OAAO;IAEP;;;KAGC,GACD,iBAAiB;IAEjB;;;;;KAKC,GACD,QAAQ;IAER;;;;;KAKC,GACD,oBAAoB,MAAM;IAE1B;;;;;KAKC,GACD;;;KAGC,GACD,OAAO,MAAM;;;AAMjB,iBAAiB;GACd,KAAK,MAAM,GAAG;;AAGjB,OAAO,iBAAS,iBACd,OAAO,mBAAmB,GACzB;AAuBH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DC,GACD,OAAO,iBAAe,KACpB,YAAY,6BAA6B,oBAAoB,EAC7D,cAAc,mBAAmB,EACjC,iBAAiB,QAAQ,wBAAwB,IAAI,GAAG,QAAQ,IAAI,CAAC,GACpE,QAAQ,oBAAoB"}
+{"version":3,"file":"set-up-mcp-compose.d.ts","sources":["../../src/set-up-mcp-compose.ts"],"names":[],"mappings":"AAAA,SAAS,mBAAmB,oBAAoB;AAChD,cAAc,QAAQ,2BAA2B;AACjD,cAAc,UAAU,6BAA6B;AACrD,cAAc,cAAc,qBAAqB;AACjD,cAAc,UAAU,4BAA4B;AACpD,cAAc,UAAU,qBAAqB;AAC7C,cAAc,aAAa,6BAA6B;AAExD,iBAAiB;EACf;;;GAGC,GACD,MAAM,MAAM,GAAG,IAAI;EACnB;;GAEC,GACD,cAAc,MAAM;EACpB,OAAO;EAEP;;;;;;;;;;;GAWC,GACD,WAAW,aAAa,MAAM;EAE9B;IACE;;;;;;;KAOC,GACD,OAAO;IAEP;;;KAGC,GACD,iBAAiB;IAEjB;;;;;KAKC,GACD,QAAQ;IAER;;;;;KAKC,GACD,oBAAoB,MAAM;IAE1B;;;;;KAKC,GACD;;;KAGC,GACD,OAAO,MAAM;;;AAMjB,iBAAiB;GACd,KAAK,MAAM,GAAG;;AAGjB,OAAO,iBAAS,iBACd,OAAO,mBAAmB,GACzB;AAIH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DC,GACD,OAAO,iBAAe,KACpB,YAAY,6BAA6B,oBAAoB,EAC7D,cAAc,mBAAmB,EACjC,iBAAiB,QAAQ,wBAAwB,IAAI,GAAG,QAAQ,IAAI,CAAC,GACpE,QAAQ,oBAAoB"}

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

@@ -1,6 +1,5 @@
-import type { McpSettingsSchema } from "../../service/tools.js";
-import type z from "zod";
-export declare function composeMcpDepTools(mcpConfig: z.input<typeof McpSettingsSchema> | z.infer<typeof McpSettingsSchema>, filterIn?: (params: {
+import type { MCPSetting } from "../../service/tools.js";
+export declare function composeMcpDepTools(mcpConfig: MCPSetting, filterIn?: (params: {
   action: string;
   tool: any;
   mcpName: string;

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":"AAKA,cACE,iBAAiB,iCAEa;AAChC,YAAY,aAAyB;AA4LrC,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":"AAKA,cAA+B,UAAU,iCAAiC;AAwL1E,OAAO,iBAAe,mBACpB,WAAW,UAAU,EACrB,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"}