@tronsfey/ucli 0.5.0 → 0.5.2

package/dist/{runner-GVYIJNHN.js → runner-ROLDMGH3.js}

@@ -5248,9 +5248,9 @@ var require_lib = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@tronsfey+mcp2cli@1.0.1_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/cache.js
+// ../../node_modules/.pnpm/@tronsfey+mcp2cli@1.3.0_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/cache.js
 var require_cache = __commonJS({
-  "../../node_modules/.pnpm/@tronsfey+mcp2cli@1.0.1_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/cache.js"(exports) {
+  "../../node_modules/.pnpm/@tronsfey+mcp2cli@1.3.0_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/cache.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -5301,8 +5301,25 @@ var require_cache = __commonJS({
       return path.join(os.homedir(), ".mcp2cli", "cache");
     }
     function getCacheKey(config) {
-      const key = config.type === "http" ? config.url : config.command;
-      return crypto.createHash("md5").update(key).digest("hex");
+      const parts = [];
+      if (config.type === "http") {
+        parts.push(config.url);
+        if (config.headers && Object.keys(config.headers).length > 0) {
+          const sorted = Object.keys(config.headers).sort();
+          for (const k of sorted) {
+            parts.push(`${k}=${config.headers[k]}`);
+          }
+        }
+      } else {
+        parts.push(config.command);
+        if (config.env && Object.keys(config.env).length > 0) {
+          const sorted = Object.keys(config.env).sort();
+          for (const k of sorted) {
+            parts.push(`${k}=${config.env[k]}`);
+          }
+        }
+      }
+      return crypto.createHash("sha256").update(parts.join("\0")).digest("hex");
     }
     function getCachePath(config) {
       return path.join(getCacheDir(), `${getCacheKey(config)}.json`);
@@ -5315,7 +5332,10 @@ var require_cache = __commonJS({
         if (age < ttl) {
           return entry.tools;
         }
-      } catch {
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          console.warn(`Warning: could not read tool cache: ${err.message}`);
+        }
       }
       return null;
     }
@@ -5334,9 +5354,24 @@ var require_cache = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@tronsfey+mcp2cli@1.0.1_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/runner/index.js
+// ../../node_modules/.pnpm/@tronsfey+mcp2cli@1.3.0_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/types/index.js
+var require_types = __commonJS({
+  "../../node_modules/.pnpm/@tronsfey+mcp2cli@1.3.0_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/types/index.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.EXIT_TOOL_EXECUTION = exports.EXIT_INVALID_ARGS = exports.EXIT_TOOL_NOT_FOUND = exports.EXIT_CONNECTION = exports.EXIT_GENERAL = exports.EXIT_OK = void 0;
+    exports.EXIT_OK = 0;
+    exports.EXIT_GENERAL = 1;
+    exports.EXIT_CONNECTION = 2;
+    exports.EXIT_TOOL_NOT_FOUND = 3;
+    exports.EXIT_INVALID_ARGS = 4;
+    exports.EXIT_TOOL_EXECUTION = 5;
+  }
+});
+
+// ../../node_modules/.pnpm/@tronsfey+mcp2cli@1.3.0_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/runner/index.js
 var require_runner = __commonJS({
-  "../../node_modules/.pnpm/@tronsfey+mcp2cli@1.0.1_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/runner/index.js"(exports) {
+  "../../node_modules/.pnpm/@tronsfey+mcp2cli@1.3.0_zod@4.3.6/node_modules/@tronsfey/mcp2cli/dist/runner/index.js"(exports) {
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
@@ -5345,11 +5380,18 @@ var require_runner = __commonJS({
     exports.schemaToParams = schemaToParams;
     exports.getTools = getTools;
     exports.printToolList = printToolList;
+    exports.describeTool = describeTool;
+    exports.printToolListJson = printToolListJson;
+    exports.describeToolJson = describeToolJson;
+    exports.emitJsonError = emitJsonError;
+    exports.parseInputJson = parseInputJson;
+    exports.coerceValue = coerceValue;
     exports.runTool = runTool;
     var commander_1 = __require("commander");
     var chalk_1 = __importDefault(require_source());
     var jmespath_1 = __importDefault(require_jmespath());
     var cache_1 = require_cache();
+    var index_1 = require_types();
     var DEFAULT_CACHE_TTL = 3600;
     function toKebabCase(name) {
       return name.replace(/_/g, "-").replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
@@ -5371,7 +5413,7 @@ var require_runner = __commonJS({
       const required = new Set(schema.required ?? []);
       return Object.entries(properties).map(([name, prop]) => {
         const type = resolveType(prop);
-        return {
+        const param = {
           name,
           cliFlag: toKebabCase(name),
           type,
@@ -5380,14 +5422,26 @@ var require_runner = __commonJS({
           defaultValue: prop.default,
           enumValues: prop.enum
         };
+        if (type === "array" && prop.items) {
+          param.itemsType = resolveType(prop.items);
+        }
+        return param;
       });
     }
     async function getTools(client, config, options) {
       const ttl = options.cacheTtl ?? DEFAULT_CACHE_TTL;
+      const debug = !!options.debug;
       if (!options.noCache) {
         const cached = await (0, cache_1.getCachedTools)(config, ttl);
-        if (cached)
+        if (cached) {
+          if (debug) {
+            console.error(chalk_1.default.gray(`[debug] Loaded ${cached.length} tool(s) from cache (TTL: ${ttl}s)`));
+          }
           return cached;
+        }
+      }
+      if (debug) {
+        console.error(chalk_1.default.gray(`[debug] Fetching tool list from server\u2026`));
       }
       const allTools = [];
       let cursor;
@@ -5396,11 +5450,27 @@ var require_runner = __commonJS({
         allTools.push(...result.tools);
         cursor = result.nextCursor;
       } while (cursor);
+      if (debug) {
+        console.error(chalk_1.default.gray(`[debug] Fetched ${allTools.length} tool(s): ${allTools.map((t) => t.name).join(", ")}`));
+      }
       if (!options.noCache) {
         await (0, cache_1.setCachedTools)(config, allTools, ttl);
       }
       return allTools;
     }
+    function formatParamLine(p) {
+      const flag = p.required ? chalk_1.default.yellow(`--${p.cliFlag}`) : `--${p.cliFlag}`;
+      const typeBadge = chalk_1.default.magenta(`<${p.type}>`);
+      const reqBadge = p.required ? chalk_1.default.red("[required]") : chalk_1.default.gray("[optional]");
+      const parts = [`      ${flag} ${typeBadge} ${reqBadge}`];
+      if (p.description)
+        parts[0] += `  ${p.description}`;
+      if (p.defaultValue !== void 0)
+        parts[0] += chalk_1.default.gray(` (default: ${JSON.stringify(p.defaultValue)})`);
+      if (p.enumValues)
+        parts[0] += chalk_1.default.gray(` (choices: ${p.enumValues.join(", ")})`);
+      return parts[0];
+    }
     function printToolList(tools) {
       if (tools.length === 0) {
         console.log(chalk_1.default.yellow("No tools available."));
@@ -5416,22 +5486,118 @@ Available tools (${tools.length}):
         }
         const params = schemaToParams(tool);
         if (params.length > 0) {
-          const paramStr = params.map((p) => p.required ? chalk_1.default.yellow(`--${p.cliFlag}`) : `--${p.cliFlag}`).join("  ");
-          console.log(`    ${paramStr}`);
+          console.log(`    ${chalk_1.default.bold("Parameters:")}`);
+          for (const p of params) {
+            console.log(formatParamLine(p));
+          }
         }
         console.log();
       }
     }
+    function describeTool(tool) {
+      console.log(chalk_1.default.bold(`
+Tool: ${chalk_1.default.cyan(tool.name)}
+`));
+      if (tool.description) {
+        console.log(`  ${tool.description}
+`);
+      }
+      const params = schemaToParams(tool);
+      if (params.length === 0) {
+        console.log(chalk_1.default.gray("  No parameters.\n"));
+        return;
+      }
+      console.log(chalk_1.default.bold("  Parameters:\n"));
+      for (const p of params) {
+        console.log(formatParamLine(p));
+      }
+      console.log();
+    }
+    function printToolListJson(tools) {
+      const items = tools.map((tool) => {
+        const params = schemaToParams(tool);
+        return {
+          name: tool.name,
+          description: tool.description ?? "",
+          parameters: params.map((p) => ({
+            name: p.name,
+            cliFlag: `--${p.cliFlag}`,
+            type: p.type,
+            required: p.required,
+            description: p.description,
+            ...p.defaultValue !== void 0 ? { default: p.defaultValue } : {},
+            ...p.enumValues ? { enum: p.enumValues } : {},
+            ...p.itemsType ? { itemsType: p.itemsType } : {}
+          })),
+          inputSchema: tool.inputSchema
+        };
+      });
+      const envelope = {
+        ok: true,
+        result: { tools: items, count: items.length }
+      };
+      console.log(JSON.stringify(envelope));
+    }
+    function describeToolJson(tool) {
+      const params = schemaToParams(tool);
+      const envelope = {
+        ok: true,
+        result: {
+          name: tool.name,
+          description: tool.description ?? "",
+          parameters: params.map((p) => ({
+            name: p.name,
+            cliFlag: `--${p.cliFlag}`,
+            type: p.type,
+            required: p.required,
+            description: p.description,
+            ...p.defaultValue !== void 0 ? { default: p.defaultValue } : {},
+            ...p.enumValues ? { enum: p.enumValues } : {},
+            ...p.itemsType ? { itemsType: p.itemsType } : {}
+          })),
+          inputSchema: tool.inputSchema
+        }
+      };
+      console.log(JSON.stringify(envelope));
+    }
+    function emitJsonError(code, message, exitCode, suggestions) {
+      const envelope = {
+        ok: false,
+        error: { code, message, exitCode, ...suggestions?.length ? { suggestions } : {} }
+      };
+      process.stderr.write(JSON.stringify(envelope) + "\n");
+    }
+    function parseInputJson(jsonStr) {
+      let parsed;
+      try {
+        parsed = JSON.parse(jsonStr);
+      } catch {
+        throw new Error(`Invalid JSON in --input-json: ${jsonStr}`);
+      }
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error('--input-json must be a JSON object (e.g. {"key": "value"})');
+      }
+      return parsed;
+    }
     function formatResult(result, options) {
       let data = result;
       if (options.jq) {
         try {
           data = jmespath_1.default.search(data, options.jq);
         } catch (err) {
-          console.error(chalk_1.default.red(`JMESPath error: ${err.message}`));
-          process.exit(1);
+          if (options.json) {
+            emitJsonError("JMESPATH_ERROR", `JMESPath error in "${options.jq}": ${err.message}`, index_1.EXIT_INVALID_ARGS);
+            process.exit(index_1.EXIT_INVALID_ARGS);
+          }
+          console.error(chalk_1.default.red(`JMESPath error in "${options.jq}": ${err.message}`));
+          process.exit(index_1.EXIT_INVALID_ARGS);
         }
       }
+      if (options.json) {
+        const envelope = { ok: true, result: data };
+        console.log(JSON.stringify(envelope));
+        return;
+      }
       if (options.raw) {
         console.log(JSON.stringify(data, null, 2));
         return;
@@ -5466,8 +5632,10 @@ Available tools (${tools.length}):
         }
         return num;
       }
-      if (type === "boolean")
-        return value !== "false" && value !== "0";
+      if (type === "boolean") {
+        const falsy = ["false", "0", "no", "off", ""];
+        return !falsy.includes(value.toLowerCase());
+      }
       if (type === "array") {
         try {
           const parsed = JSON.parse(value);
@@ -5480,58 +5648,96 @@ Available tools (${tools.length}):
       return value;
     }
     async function runTool(client, tool, rawArgs, options) {
-      const params = schemaToParams(tool);
-      const sub = new commander_1.Command(tool.name);
-      if (tool.description)
-        sub.description(tool.description);
-      for (const param of params) {
-        let flagStr;
-        if (param.type === "boolean") {
-          flagStr = `--${param.cliFlag}`;
-        } else if (param.type === "array") {
-          flagStr = `--${param.cliFlag} <values...>`;
-        } else {
-          flagStr = `--${param.cliFlag} <value>`;
+      let toolArgs;
+      if (options.inputJson) {
+        try {
+          toolArgs = parseInputJson(options.inputJson);
+        } catch (err) {
+          if (options.json) {
+            emitJsonError("INVALID_INPUT_JSON", err.message, index_1.EXIT_INVALID_ARGS);
+            process.exit(index_1.EXIT_INVALID_ARGS);
+          }
+          console.error(chalk_1.default.red(`Error: ${err.message}`));
+          process.exit(index_1.EXIT_INVALID_ARGS);
         }
-        const opt = new commander_1.Option(flagStr, param.description);
-        if (param.required)
-          opt.makeOptionMandatory(true);
-        if (param.defaultValue !== void 0)
-          opt.default(param.defaultValue);
-        if (param.enumValues)
-          opt.choices(param.enumValues);
-        sub.addOption(opt);
-      }
-      sub.allowUnknownOption(false);
-      sub.exitOverride();
-      sub.configureOutput({
-        writeErr: (str) => process.stderr.write(str)
-      });
+      } else {
+        const params = schemaToParams(tool);
+        const sub = new commander_1.Command(tool.name);
+        if (tool.description)
+          sub.description(tool.description);
+        for (const param of params) {
+          let flagStr;
+          if (param.type === "boolean") {
+            flagStr = `--${param.cliFlag}`;
+          } else if (param.type === "array") {
+            flagStr = `--${param.cliFlag} <values...>`;
+          } else {
+            flagStr = `--${param.cliFlag} <value>`;
+          }
+          const opt = new commander_1.Option(flagStr, param.description);
+          if (param.required)
+            opt.makeOptionMandatory(true);
+          if (param.defaultValue !== void 0)
+            opt.default(param.defaultValue);
+          if (param.enumValues)
+            opt.choices(param.enumValues);
+          sub.addOption(opt);
+        }
+        sub.allowUnknownOption(false);
+        sub.exitOverride();
+        sub.configureOutput({
+          writeErr: (str) => {
+            process.stderr.write(str);
+          }
+        });
+        try {
+          sub.parse(["node", tool.name, ...rawArgs]);
+        } catch (err) {
+          const e = err;
+          if (e.code === "commander.missingMandatoryOptionValue" || e.code === "commander.optionMissingArgument") {
+            if (options.json) {
+              emitJsonError("MISSING_OPTION", e.message ?? "Missing required option", index_1.EXIT_INVALID_ARGS);
+              process.exit(index_1.EXIT_INVALID_ARGS);
+            }
+            process.stderr.write(`${e.message ?? "Missing required option"}
+`);
+            process.exit(index_1.EXIT_INVALID_ARGS);
+          }
+          throw err;
+        }
+        const opts = sub.opts();
+        toolArgs = {};
+        try {
+          for (const param of params) {
+            const cliKey = param.cliFlag.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+            const rawVal = opts[cliKey];
+            if (rawVal === void 0)
+              continue;
+            const itemType = param.itemsType ?? "string";
+            const coerced = param.type === "array" && Array.isArray(rawVal) ? rawVal.map((v) => coerceValue(v, itemType)) : typeof rawVal === "string" ? coerceValue(rawVal, param.type) : rawVal;
+            toolArgs[param.name] = coerced;
+          }
+        } catch (err) {
+          if (options.json) {
+            emitJsonError("INVALID_ARGS", err.message, index_1.EXIT_INVALID_ARGS);
+            process.exit(index_1.EXIT_INVALID_ARGS);
+          }
+          console.error(chalk_1.default.red(`Error: ${err.message}`));
+          process.exit(index_1.EXIT_INVALID_ARGS);
+        }
+      }
       try {
-        sub.parse(["node", tool.name, ...rawArgs]);
+        const result = await client.callTool({ name: tool.name, arguments: toolArgs });
+        formatResult(result, options);
       } catch (err) {
-        const e = err;
-        if (e.code === "commander.missingMandatoryOptionValue" || e.code === "commander.optionMissingArgument") {
-          process.stderr.write(`${e.message ?? "Missing required option"}
-`);
-          process.exit(1);
+        if (options.json) {
+          emitJsonError("TOOL_EXECUTION_ERROR", err.message, index_1.EXIT_TOOL_EXECUTION);
+          process.exit(index_1.EXIT_TOOL_EXECUTION);
         }
         throw err;
       }
-      const opts = sub.opts();
-      const toolArgs = {};
-      for (const param of params) {
-        const cliKey = param.cliFlag.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
-        const rawVal = opts[cliKey];
-        if (rawVal === void 0)
-          continue;
-        const coerced = param.type === "array" && Array.isArray(rawVal) ? rawVal.map((v) => coerceValue(v, "string")) : typeof rawVal === "string" ? coerceValue(rawVal, param.type) : rawVal;
-        toolArgs[param.name] = coerced;
-      }
-      const result = await client.callTool({ name: tool.name, arguments: toolArgs });
-      formatResult(result, options);
     }
   }
 });
 export default require_runner();
-//# sourceMappingURL=runner-GVYIJNHN.js.map
+//# sourceMappingURL=runner-ROLDMGH3.js.map