@mcpc-tech/cli 0.1.5 → 0.1.7

package/bin/mcpc.mjs

@@ -41,6 +41,56 @@ var init_schema = __esm({
   }
 });
 
+// __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/config.js
+import process2 from "node:process";
+var GEMINI_PREFERRED_FORMAT;
+var init_config = __esm({
+  "__mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/config.js"() {
+    GEMINI_PREFERRED_FORMAT = process2.env.GEMINI_PREFERRED_FORMAT === "0" ? false : true;
+  }
+});
+
+// __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/json.js
+import { jsonrepair as jsonrepair2 } from "jsonrepair";
+var init_json = __esm({
+  "__mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/json.js"() {
+  }
+});
+
+// __mcpc__cli_latest/node_modules/@jsr/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__cli_latest/node_modules/@jsr/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__cli_latest/node_modules/@jsr/mcpc__core/src/utils/logger.js
 function createLogger(name, server2) {
   return new MCPLogger(name, server2);
@@ -90,16 +140,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);
@@ -167,15 +209,17 @@ var init_tool_name_mapping_plugin = __esm({
       transformTool: (tool, context2) => {
         const server2 = context2.server;
         const toolName = context2.toolName;
-        const dotNotation = toolName.replace(/_/g, ".");
-        const underscoreNotation = toolName.replace(/\./g, "_");
-        if (dotNotation !== toolName && server2.toolNameMapping) {
+        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);
-          server2.toolNameMapping.set(toolName, dotNotation);
         }
-        if (underscoreNotation !== toolName && server2.toolNameMapping) {
+        if (underscoreNotation !== originalName && server2.toolNameMapping) {
           server2.toolNameMapping.set(underscoreNotation, toolName);
-          server2.toolNameMapping.set(toolName, underscoreNotation);
+        }
+        if (originalName !== toolName && server2.toolNameMapping) {
+          server2.toolNameMapping.set(originalName, toolName);
         }
         return tool;
       }
@@ -566,7 +610,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,
@@ -591,6 +636,7 @@ var init_compose_helpers = __esm({
   "__mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/compose-helpers.js"() {
     init_schema2();
     init_schema();
+    init_provider();
   }
 });
 
@@ -660,9 +706,42 @@ function stripMarkdownAndText(text) {
   text = text.replace(/^```(?:json)?\s*\n?/i, "");
   text = text.replace(/\n?```\s*$/, "");
   text = text.replace(/^(?:here is|here's|response|result|output|json):\s*/i, "");
-  const jsonMatch = text.match(/(\{[\s\S]*\}|\[[\s\S]*\])/);
-  if (jsonMatch) {
-    text = jsonMatch[1];
+  const firstJsonIndex = text.search(/[\{\[]/);
+  if (firstJsonIndex >= 0) {
+    text = text.slice(firstJsonIndex);
+    let depth = 0;
+    let inString = false;
+    let escapeNext = false;
+    const startChar = text[0];
+    const endChar = startChar === "{" ? "}" : "]";
+    for (let i = 0; i < text.length; i++) {
+      const char = text[i];
+      if (escapeNext) {
+        escapeNext = false;
+        continue;
+      }
+      if (char === "\\") {
+        escapeNext = true;
+        continue;
+      }
+      if (char === '"' && !inString) {
+        inString = true;
+        continue;
+      }
+      if (char === '"' && inString) {
+        inString = false;
+        continue;
+      }
+      if (inString) continue;
+      if (char === startChar) {
+        depth++;
+      } else if (char === endChar) {
+        depth--;
+        if (depth === 0) {
+          return text.slice(0, i + 1);
+        }
+      }
+    }
   }
   return text.trim();
 }
@@ -775,8 +854,9 @@ function smitheryToolNameCompatibale(name, scope) {
 }
 
 // __mcpc__cli_latest/node_modules/@jsr/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();
@@ -822,7 +902,7 @@ async function getOrCreateMcpClient(defKey, def) {
       command: def.command,
       args: def.args,
       env: {
-        ...process2.env,
+        ...process3.env,
         ...def.env ?? {}
       },
       cwd: cwd()
@@ -876,11 +956,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 = {};
@@ -898,7 +978,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,
@@ -917,7 +998,8 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
         });
         allTools[toolId] = {
           ...tool,
-          execute
+          execute,
+          _originalName: toolNameWithScope
         };
       });
     } catch (error) {
@@ -939,37 +1021,7 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/agentic/agentic-tool-registrar.js
 init_schema();
-
-// __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;
-
-// __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/utils/common/json.js
-import { jsonrepair as jsonrepair2 } from "jsonrepair";
-
-// __mcpc__cli_latest/node_modules/@jsr/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);
-};
+init_provider();
 
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/prompts/index.js
 var SystemPrompts = {
@@ -2025,7 +2077,7 @@ var BaseSamplingExecutor = class {
         role: "user",
         content: {
           type: "text",
-          text: 'Return ONLY raw JSON (no code fences or explanations). The JSON MUST include action and decision. Example: {"action":"<tool>","decision":"proceed|complete","<tool>":{}}'
+          text: 'Return ONE AND ONLY ONE raw JSON object (no code fences, explanations, or multiple objects). The JSON MUST include action and decision. Example: {"action":"<tool>","decision":"proceed|complete","<tool>":{}}'
         }
       }
     ];
@@ -2061,15 +2113,13 @@ var BaseSamplingExecutor = class {
             if (iterationSpan) endSpan(iterationSpan);
             continue;
           }
-          if (parsedData) {
-            this.conversationHistory.push({
-              role: "assistant",
-              content: {
-                type: "text",
-                text: JSON.stringify(parsedData, null, 2)
-              }
-            });
-          }
+          this.conversationHistory.push({
+            role: "assistant",
+            content: {
+              type: "text",
+              text: JSON.stringify(parsedData, null, 2)
+            }
+          });
           const action = parsedData["action"];
           const actionStr = action && typeof action === "string" ? String(action) : "unknown_action";
           const spanName = `mcpc.sampling_iteration.${actionStr}`;
@@ -2147,23 +2197,15 @@ var BaseSamplingExecutor = class {
       return await this.createExecutionError(error, loopSpan);
     }
   }
-  addParsingErrorToHistory(responseText, parseError) {
-    this.conversationHistory.push({
-      role: "assistant",
-      content: {
-        type: "text",
-        text: `JSON parsing failed. Response was: ${responseText}`
-      }
-    });
+  addParsingErrorToHistory(_responseText, parseError) {
+    const errorMsg = parseError instanceof Error ? parseError.message : String(parseError);
     this.conversationHistory.push({
       role: "user",
       content: {
         type: "text",
-        text: CompiledPrompts.errorResponse({
-          errorMessage: `JSON parsing failed: ${parseError instanceof Error ? parseError.message : String(parseError)}
+        text: `Invalid JSON: ${errorMsg}
 
-Please respond with valid JSON.`
-        })
+Respond with valid JSON.`
       }
     });
   }
@@ -2301,11 +2343,11 @@ ${msg.content.text}`;
     });
   }
   injectJsonInstruction({ prompt, schema, schemaPrefix = "JSON schema:", schemaSuffix = `STRICT REQUIREMENTS:
-1. Return ONLY raw JSON that passes JSON.parse() - no markdown, code blocks, explanatory text, or extra characters
+1. Return ONE AND ONLY ONE raw JSON object that passes JSON.parse() - no markdown, code blocks, explanatory text, or multiple JSON objects
 2. Include ALL required fields with correct data types and satisfy ALL schema constraints (anyOf, oneOf, allOf, not, enum, pattern, min/max, conditionals)
-3. Your response must be the JSON object itself, nothing else
+3. Your response must be a single JSON object, nothing else
 
-INVALID: \`\`\`json{"key":"value"}\`\`\` or "Here is: {"key":"value"}"
+INVALID: \`\`\`json{"key":"value"}\`\`\` or "Here is: {"key":"value"}" or {"key":"value"}{"key":"value"}
 VALID: {"key":"value"}` }) {
     return [
       prompt != null && prompt.length > 0 ? prompt : void 0,
@@ -2426,10 +2468,10 @@ ${JSON.stringify(context2, null, 2)}`;
     const taskPrompt = `
 
 ## Current Task
-I will now use agentic sampling to complete the following task: "${userRequest}"${contextInfo}
+You will now use agentic sampling to complete the following task: "${userRequest}"${contextInfo}
 
-When I need to use a tool, I should specify the tool name in 'action' and provide tool-specific parameters as additional properties.
-When the task is complete, I should use "action": "complete".`;
+When you need to use a tool, specify the tool name in 'action' and provide tool-specific parameters as additional properties.
+When the task is complete, use "action": "complete".`;
     return this.injectJsonInstruction({
       prompt: basePrompt + taskPrompt,
       schema: agenticSchema
@@ -2639,6 +2681,9 @@ var WorkflowState = class {
   }
 };
 
+// __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/workflow/workflow-tool-registrar.js
+init_provider();
+
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/executors/workflow/workflow-executor.js
 import { Ajv as Ajv3 } from "ajv";
 import { AggregateAjvError as AggregateAjvError3 } from "@segment/ajv-human-errors";
@@ -3110,6 +3155,8 @@ function processToolTags({ description, tagToResults, $, tools, toolOverrides, t
       const toolId = findToolId(toolName, tools, toolNameMapping);
       if (toolId) {
         $(toolEl).replaceWith(`<action action="${toolId}"/>`);
+      } else {
+        $(toolEl).remove();
       }
     }
   });
@@ -3868,6 +3915,9 @@ if (isSCF()) {
   });
 }
 
+// __mcpc__cli_latest/node_modules/@jsr/mcpc__core/mod.js
+init_json();
+
 // __mcpc__cli_latest/node_modules/@jsr/mcpc__core/src/set-up-mcp-compose.js
 function parseMcpcConfigs(conf) {
   const mcpcConfigs = conf ?? [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "homepage": "https://jsr.io/@mcpc/cli",
   "type": "module",
   "dependencies": {

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

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,SAAS,WAAW,4BAAwC;AAI5D,cAAc,mBAAmB,0BAA0D;AAC3F,cAAc,UAAU,6BAA6B;AAErD,OAAO,cAAM,eACX,SAAS,eACR,QAAQ,qBA8BT;AAEF,OAAO,cAAM,iBAAgB,YAO3B"}
+{"version":3,"file":"app.d.ts","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,SAAS,WAAW,4BAAwC;AAI5D,cAAc,mBAAmB,0BAAmD;AACpF,cAAc,UAAU,6BAA6B;AAErD,OAAO,cAAM,eACX,SAAS,eACR,QAAQ,qBA8BT;AAEF,OAAO,cAAM,iBAAgB,YAO3B"}

package/types/src/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sources":["../../../src/config/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CC,GAED,cAAc,iBAAiB,0BAAuC;AAKtE,iBAAiB;EACf;;GAEC,GACD,OAAO,MAAM;EACb;;GAEC,GACD,UAAU,MAAM;EAChB;;GAEC,GACD;IACE,QAAQ,OAAO,MAAM,EAAE,OAAO;IAC9B,WAAW,OAAO,MAAM,EAAE,OAAO;;EAEnC;;GAEC,GACD,QAAQ;;AAwHV;;;CAGC,GACD,OAAO,iBAAe,cAAc,QAAQ,aAAa,IAAI;AAoK7D;;CAEC,GACD,OAAO,iBAAS,eAAe,QAAQ,UAAU,GAAG,IAAI"}
+{"version":3,"file":"loader.d.ts","sources":["../../../src/config/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CC,GAED,cAAc,iBAAiB,0BAAgC;AAK/D,iBAAiB;EACf;;GAEC,GACD,OAAO,MAAM;EACb;;GAEC,GACD,UAAU,MAAM;EAChB;;GAEC,GACD;IACE,QAAQ,OAAO,MAAM,EAAE,OAAO;IAC9B,WAAW,OAAO,MAAM,EAAE,OAAO;;EAEnC;;GAEC,GACD,QAAQ;;AAwHV;;;CAGC,GACD,OAAO,iBAAe,cAAc,QAAQ,aAAa,IAAI;AAoK7D;;CAEC,GACD,OAAO,iBAAS,eAAe,QAAQ,UAAU,GAAG,IAAI"}