@mcpc-tech/core 0.2.10 → 0.2.12

package/index.mjs

@@ -92,7 +92,7 @@ var init_json = __esm({
 
 // __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);
+  return name.replace(/[@.,/\\:;!?#$%^&*()[\]{}]/g, "_").substring(0, 64);
 }
 var createGoogleCompatibleJSONSchema;
 var init_provider = __esm({
@@ -284,12 +284,21 @@ var init_logging_plugin = __esm({
             const { stats } = context2;
             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(", ")}`);
             }
-            if (hiddenTools.length > 0) {
-              await logger2.info(`   \u251C\u2500 Hidden: ${hiddenTools.join(", ")}`);
+            if (internalTools.length > 0) {
+              const parts = [];
+              if (normalInternal.length > 0) {
+                parts.push(normalInternal.join(", "));
+              }
+              if (hiddenTools.length > 0) {
+                parts.push(`(${hiddenTools.join(", ")})`);
+              }
+              await logger2.info(`   \u251C\u2500 Internal: ${parts.join(", ")}`);
             }
             await logger2.info(`   \u2514\u2500 Total: ${stats.totalTools} tools`);
           }
@@ -3397,6 +3406,7 @@ var PluginManager = class {
 };
 
 // __mcpc__core_latest/node_modules/@mcpc/core/src/utils/tool-manager.js
+init_schema();
 var ToolManager = class {
   toolRegistry = /* @__PURE__ */ new Map();
   toolConfigs = /* @__PURE__ */ new Map();
@@ -3581,6 +3591,25 @@ var ToolManager = class {
   getToolRegistry() {
     return this.toolRegistry;
   }
+  /**
+   * Get all registered tools as ComposedTool objects
+   * This includes tools registered via server.tool() in setup hooks
+   */
+  getRegisteredToolsAsComposed() {
+    const composedTools = {};
+    for (const [name, tool] of this.toolRegistry.entries()) {
+      composedTools[name] = {
+        name,
+        description: tool.description,
+        inputSchema: jsonSchema(tool.schema || {
+          type: "object",
+          properties: {}
+        }),
+        execute: tool.callback
+      };
+    }
+    return composedTools;
+  }
 };
 
 // __mcpc__core_latest/node_modules/@mcpc/core/src/compose.js
@@ -3743,6 +3772,14 @@ var ComposableMCPServer = class extends Server {
   getHiddenToolNames() {
     return this.toolManager.getHiddenToolNames();
   }
+  /**
+   * Get all internal tool names (tools that are not public)
+   */
+  getInternalToolNames() {
+    const allToolNames = Array.from(this.toolManager.getToolRegistry().keys());
+    const publicToolNames = this.getPublicToolNames();
+    return allToolNames.filter((name) => !publicToolNames.includes(name));
+  }
   /**
    * Get hidden tool schema by name (for internal access)
    */
@@ -3845,7 +3882,6 @@ var ComposableMCPServer = class extends Server {
       availableToolNames.add(toolNameWithScope);
       availableToolNames.add(toolId);
       availableToolNames.add(`${mcpName}.${ALL_TOOLS_PLACEHOLDER2}`);
-      availableToolNames.add(mcpName);
       this.toolManager.setToolNameMapping(toolNameWithScope, toolId);
       const internalName = toolNameWithScope.includes(".") ? toolNameWithScope.split(".").slice(1).join(".") : toolNameWithScope;
       if (!this.toolNameMapping.has(internalName)) {
@@ -3876,14 +3912,23 @@ var ComposableMCPServer = class extends Server {
       await this.logger.warning(`   Available tools: ${Array.from(availableToolNames).sort().join(", ")}`);
     }
     Object.entries(tools).forEach(([toolId, tool]) => {
-      this.toolManager.registerTool(toolId, tool.description || "No description available", tool.inputSchema, tool.execute);
+      this.toolManager.registerTool(toolId, tool.description || "", tool.inputSchema, tool.execute);
     });
-    await this.processToolsWithPlugins(tools, options.mode ?? "agentic");
-    await this.pluginManager.triggerFinalizeComposition(tools, {
+    const registeredTools = this.toolManager.getRegisteredToolsAsComposed();
+    const allTools = {
+      ...tools
+    };
+    for (const [toolName, tool] of Object.entries(registeredTools)) {
+      if (!allTools[toolName]) {
+        allTools[toolName] = tool;
+      }
+    }
+    await this.processToolsWithPlugins(allTools, options.mode ?? "agentic");
+    await this.pluginManager.triggerFinalizeComposition(allTools, {
       serverName: name ?? "anonymous",
       mode: options.mode ?? "agentic",
       server: this,
-      toolNames: Object.keys(tools)
+      toolNames: Object.keys(allTools)
     });
     this.onclose = async () => {
       await cleanupClients();
@@ -3896,16 +3941,16 @@ var ComposableMCPServer = class extends Server {
       await this.disposePlugins();
       await this.logger.info(`[${name}] Action: cleaned up dependent clients and plugins`);
     };
-    const toolNameToDetailList = Object.entries(tools);
+    const toolNameToDetailList = Object.entries(allTools);
     const publicToolNames = this.getPublicToolNames();
     const hiddenToolNames = this.getHiddenToolNames();
     const contextToolNames = toolNameToDetailList.map(([name2]) => name2).filter((n) => !hiddenToolNames.includes(n));
     publicToolNames.forEach((toolId) => {
-      const tool = tools[toolId];
+      const tool = allTools[toolId];
       if (!tool) {
-        throw new Error(`Public tool ${toolId} not found in registry, available: ${Object.keys(tools).join(", ")}`);
+        throw new Error(`Public tool ${toolId} not found in registry, available: ${Object.keys(allTools).join(", ")}`);
       }
-      this.tool(toolId, tool.description || "No description available", jsonSchema(tool.inputSchema), tool.execute, {
+      this.tool(toolId, tool.description || "", jsonSchema(tool.inputSchema), tool.execute, {
         internal: false
       });
     });
@@ -3930,7 +3975,7 @@ var ComposableMCPServer = class extends Server {
     description = processToolTags({
       ...desTags,
       description,
-      tools,
+      tools: allTools,
       toolOverrides: /* @__PURE__ */ new Map(),
       toolNameMapping: toolNameToIdMapping
     });

package/package.json

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

package/types/src/compose.d.ts

@@ -39,6 +39,9 @@ export declare class ComposableMCPServer extends Server {
   /**
    * Get all hidden tool names
    */ getHiddenToolNames(): string[];
+  /**
+   * Get all internal tool names (tools that are not public)
+   */ getInternalToolNames(): string[];
   /**
    * Get hidden tool schema by name (for internal access)
    */ getHiddenToolSchema(name: string): {

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;AAQ3D,cAA4B,UAAU,EAAE,UAAU,4BAA4B;AAU9E,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;UAwDN;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;EAqE9D;;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,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;EAUd;;GAEC,GACD,AAAM,kBAAkB,QAAQ,IAAI;EAI9B,QACJ,MAAM,MAAM,GAAG,IAAI,EACnB,aAAa,MAAM,EACnB,aAAY,EAAE,aAAa,kBAAuC,EAClE,UAAS,kBAAkB,UAAgC;AA+P/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,iBAAiB,6BAA6B;AAC5D,SACE,MAAM,EACN,KAAK,aAAa,oDAC2C;AAC/D,YAAY,aAAyB;AAGrC,cAAc,iBAAiB,kCAAkC;AACjE,cAAc,UAAU,EAAE,YAAY,qBAAqB;AAQ3D,cAA4B,UAAU,EAAE,UAAU,4BAA4B;AAU9E,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;UAwDN;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;EAqE9D;;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;EAQ9B;;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;EAUd;;GAEC,GACD,AAAM,kBAAkB,QAAQ,IAAI;EAI9B,QACJ,MAAM,MAAM,GAAG,IAAI,EACnB,aAAa,MAAM,EACnB,aAAY,EAAE,aAAa,kBAAuC,EAClE,UAAS,kBAAkB,UAAgC;AA0Q/D"}