@modeltoolsprotocol/mtpcli 1.1.0 → 1.2.0

package/README.md

@@ -1,8 +1,8 @@
 # mtpcli
 
-The command-line interface for the [Model Tools Protocol](https://github.com/modeltoolsprotocol/modeltoolsprotocol) (MTP). Discover, authenticate, and bridge tools that implement the `--describe` convention.
+The command-line interface for the [Model Tools Protocol](https://github.com/modeltoolsprotocol/modeltoolsprotocol) (MTP). Discover, authenticate, and bridge tools that implement the `--mtp-describe` convention.
 
-CLI tools are composable but not LLM-discoverable. MCP tools are discoverable but not composable. MTP bridges the gap with a single `--describe` flag. See the [protocol README](https://github.com/modeltoolsprotocol/modeltoolsprotocol) for the full rationale.
+CLI tools are composable but not LLM-discoverable. MCP tools are discoverable but not composable. MTP bridges the gap with a single `--mtp-describe` flag. **mtpcli** turns any `--mtp-describe` CLI into an MCP server, turns any MCP server into a composable CLI, and handles discovery, auth, and validation along the way. See the [protocol README](https://github.com/modeltoolsprotocol/modeltoolsprotocol) for the full rationale.
 
 ## Install
 
@@ -10,15 +10,11 @@ CLI tools are composable but not LLM-discoverable. MCP tools are discoverable bu
 npm install -g @modeltoolsprotocol/mtpcli
 ```
 
-## What it does
-
-**mtpcli** bridges the gap between CLI tools and MCP servers. It turns any `--describe` CLI into an MCP server, turns any MCP server into a composable CLI, and handles discovery, auth, and validation along the way.
-
 ## Usage
 
 ### Serve CLI tools over MCP
 
-Any CLI that supports `--describe` becomes an MCP server:
+Any CLI that supports `--mtp-describe` becomes an MCP server:
 
 ```bash
 $ mtpcli serve --tool atlasctl --tool mytool
@@ -31,7 +27,7 @@ mtpcli serve: serving 6 tool(s) from 2 CLI tool(s)
   ...
 ```
 
-Drop it into your Claude Desktop config and it works like any other MCP server. The bridge reads `--describe`, translates commands to MCP tools, and shells out to the real CLI when the host calls a tool.
+Drop it into your Claude Desktop config and it works like any other MCP server. The bridge reads `--mtp-describe`, translates commands to MCP tools, and shells out to the real CLI when the host calls a tool.
 
 ### Wrap an MCP server as a CLI
 
@@ -39,7 +35,7 @@ Atlassian ships an MCP server at `mcp.atlassian.com`. With `mtpcli wrap`, it's a
 
 ```bash
 # Discover what tools the server offers
-$ mtpcli wrap --url "https://mcp.atlassian.com/v1/mcp" --describe
+$ mtpcli wrap --url "https://mcp.atlassian.com/v1/mcp" --mtp-describe
 
 # Fetch a Confluence page
 $ mtpcli wrap --url "https://mcp.atlassian.com/v1/mcp" \
@@ -51,7 +47,7 @@ $ mtpcli wrap --url "https://mcp.atlassian.com/v1/mcp" \
     | jq -r '.body'
 
 # Works with stdio servers too
-$ mtpcli wrap --server "npx @mcp/server-github" --describe
+$ mtpcli wrap --server "npx @mcp/server-github" --mtp-describe
 ```
 
 The 2,500+ MCP servers people have built? They're all CLI tools now. Pipe their output, use them in scripts, compose them with other tools.
@@ -90,7 +86,7 @@ mtpcli auth logout mytool
 
 See [AUTH.md](AUTH.md) for details on token storage, usage patterns, and bridge integration.
 
-### Validate a tool's --describe output
+### Validate a tool's --mtp-describe output
 
 ```bash
 # Validate a tool against the MTP spec
@@ -120,7 +116,7 @@ mtpcli completions fish mytool | source
 
 ```bash
 # mtpcli is itself an MTP-compliant tool
-mtpcli --describe
+mtpcli --mtp-describe
 ```
 
 ## Development

package/dist/index.js

@@ -27,7 +27,6 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __promiseAll = (args) => Promise.all(args);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // node_modules/commander/lib/error.js
@@ -2123,25 +2122,6 @@ var require_commander = __commonJS((exports) => {
   exports.InvalidOptionArgumentError = InvalidArgumentError;
 });
 
-// node_modules/commander/esm.mjs
-var import__, program, createCommand, createArgument, createOption, CommanderError, InvalidArgumentError, InvalidOptionArgumentError, Command, Argument, Option, Help;
-var init_esm = __esm(() => {
-  import__ = __toESM(require_commander(), 1);
-  ({
-    program,
-    createCommand,
-    createArgument,
-    createOption,
-    CommanderError,
-    InvalidArgumentError,
-    InvalidOptionArgumentError,
-    Command,
-    Argument,
-    Option,
-    Help
-  } = import__.default);
-});
-
 // node_modules/zod/v3/helpers/util.js
 var util, objectUtil, ZodParsedType, getParsedType = (data) => {
   const t = typeof data;
@@ -6108,119 +6088,6 @@ var init_zod = __esm(() => {
   init_external();
 });
 
-// src/models.ts
-function cleanJson(obj) {
-  if (obj === null || obj === undefined)
-    return;
-  if (Array.isArray(obj)) {
-    return obj.map(cleanJson);
-  }
-  if (typeof obj === "object") {
-    const out = {};
-    for (const [k, v] of Object.entries(obj)) {
-      if (v === undefined)
-        continue;
-      if (Array.isArray(v) && v.length === 0)
-        continue;
-      const cleaned = cleanJson(v);
-      if (cleaned !== undefined) {
-        out[k] = cleaned;
-      }
-    }
-    return out;
-  }
-  return obj;
-}
-var ExampleSchema, ArgSchema, IoDescriptorSchema, CommandAuthSchema, CommandSchema, AuthProviderSchema, AuthConfigSchema, ToolSchemaSchema, StoredTokenSchema, JsonRpcErrorSchema, JsonRpcRequestSchema, JsonRpcResponseSchema, McpToolDefSchema;
-var init_models = __esm(() => {
-  init_zod();
-  ExampleSchema = exports_external.object({
-    description: exports_external.string().optional(),
-    command: exports_external.string(),
-    output: exports_external.string().optional()
-  });
-  ArgSchema = exports_external.object({
-    name: exports_external.string(),
-    type: exports_external.string(),
-    description: exports_external.string().optional(),
-    required: exports_external.boolean().default(false),
-    default: exports_external.any().optional(),
-    values: exports_external.array(exports_external.string()).optional()
-  });
-  IoDescriptorSchema = exports_external.object({
-    contentType: exports_external.string().optional(),
-    description: exports_external.string().optional(),
-    schema: exports_external.any().optional()
-  });
-  CommandAuthSchema = exports_external.object({
-    required: exports_external.boolean().default(false),
-    scopes: exports_external.array(exports_external.string()).optional()
-  });
-  CommandSchema = exports_external.object({
-    name: exports_external.string(),
-    description: exports_external.string(),
-    args: exports_external.array(ArgSchema).default([]),
-    stdin: IoDescriptorSchema.optional(),
-    stdout: IoDescriptorSchema.optional(),
-    examples: exports_external.array(ExampleSchema).default([]),
-    auth: CommandAuthSchema.optional()
-  });
-  AuthProviderSchema = exports_external.object({
-    id: exports_external.string(),
-    type: exports_external.string(),
-    displayName: exports_external.string().optional(),
-    authorizationUrl: exports_external.string().optional(),
-    tokenUrl: exports_external.string().optional(),
-    scopes: exports_external.array(exports_external.string()).optional(),
-    clientId: exports_external.string().optional(),
-    registrationUrl: exports_external.string().optional(),
-    instructions: exports_external.string().optional()
-  });
-  AuthConfigSchema = exports_external.object({
-    required: exports_external.boolean().default(false),
-    envVar: exports_external.string(),
-    providers: exports_external.array(AuthProviderSchema)
-  });
-  ToolSchemaSchema = exports_external.object({
-    name: exports_external.string(),
-    version: exports_external.string(),
-    description: exports_external.string(),
-    auth: AuthConfigSchema.optional(),
-    commands: exports_external.array(CommandSchema)
-  });
-  StoredTokenSchema = exports_external.object({
-    access_token: exports_external.string(),
-    token_type: exports_external.string().optional(),
-    refresh_token: exports_external.string().optional(),
-    expires_at: exports_external.string().optional(),
-    scopes: exports_external.array(exports_external.string()).optional(),
-    provider_id: exports_external.string(),
-    created_at: exports_external.string()
-  });
-  JsonRpcErrorSchema = exports_external.object({
-    code: exports_external.number(),
-    message: exports_external.string(),
-    data: exports_external.any().optional()
-  });
-  JsonRpcRequestSchema = exports_external.object({
-    jsonrpc: exports_external.string(),
-    id: exports_external.any().optional(),
-    method: exports_external.string(),
-    params: exports_external.any().default({})
-  });
-  JsonRpcResponseSchema = exports_external.object({
-    jsonrpc: exports_external.string(),
-    id: exports_external.any().optional(),
-    result: exports_external.any().optional(),
-    error: JsonRpcErrorSchema.optional()
-  });
-  McpToolDefSchema = exports_external.object({
-    name: exports_external.string(),
-    description: exports_external.string(),
-    inputSchema: exports_external.any()
-  });
-});
-
 // node_modules/jaro-winkler/index.js
 var require_jaro_winkler = __commonJS((exports, module) => {
   (function(root) {
@@ -6561,8 +6428,8 @@ function jsonRpcSuccess(id, result) {
 function jsonRpcError(id, code, message) {
   return { jsonrpc: "2.0", id, error: { code, message } };
 }
-var ExampleSchema2, ArgSchema2, IoDescriptorSchema2, CommandAuthSchema2, CommandSchema2, AuthProviderSchema2, AuthConfigSchema2, ToolSchemaSchema2, StoredTokenSchema2, JsonRpcErrorSchema2, JsonRpcRequestSchema2, JsonRpcResponseSchema2, McpToolDefSchema2;
-var init_models2 = __esm(() => {
+var ExampleSchema2, ArgSchema2, IoDescriptorSchema2, CommandAuthSchema2, CommandSchema2, AuthProviderSchema2, AuthConfigSchema2, MTP_SPEC_VERSION2 = "2026-02-07", ToolSchemaSchema2, StoredTokenSchema2, JsonRpcErrorSchema2, JsonRpcRequestSchema2, JsonRpcResponseSchema2, McpToolDefSchema2;
+var init_models = __esm(() => {
   init_zod();
   ExampleSchema2 = exports_external.object({
     description: exports_external.string().optional(),
@@ -6612,6 +6479,7 @@ var init_models2 = __esm(() => {
     providers: exports_external.array(AuthProviderSchema2)
   });
   ToolSchemaSchema2 = exports_external.object({
+    specVersion: exports_external.string(),
     name: exports_external.string(),
     version: exports_external.string(),
     description: exports_external.string(),
@@ -6705,7 +6573,7 @@ async function getToolSchema(toolName) {
     return null;
   }
   try {
-    const { stdout } = await execFileAsync(toolPath, ["--describe"], {
+    const { stdout } = await execFileAsync(toolPath, ["--mtp-describe"], {
       timeout: 5000
     });
     return ToolSchemaSchema2.parse(JSON.parse(stdout.trim()));
@@ -6803,7 +6671,7 @@ async function loadSchemas(toolNames) {
       writeCache(schema.name, schema);
       schemas.push(schema);
     } else {
-      process.stderr.write(`warning: could not get --describe from '${name}'
+      process.stderr.write(`warning: could not get --mtp-describe from '${name}'
 `);
     }
   }
@@ -6811,7 +6679,7 @@ async function loadSchemas(toolNames) {
 }
 var import_jaro_winkler, import_which, execFileAsync;
 var init_search = __esm(() => {
-  init_models2();
+  init_models();
   import_jaro_winkler = __toESM(require_jaro_winkler(), 1);
   import_which = __toESM(require_lib(), 1);
   execFileAsync = promisify(execFile);
@@ -7457,7 +7325,7 @@ async function getToolSchema2(toolName) {
     return null;
   }
   try {
-    const { stdout } = await execFileAsync6(toolPath, ["--describe"], {
+    const { stdout } = await execFileAsync6(toolPath, ["--mtp-describe"], {
       timeout: 5000
     });
     return ToolSchemaSchema2.parse(JSON.parse(stdout.trim()));
@@ -7467,7 +7335,7 @@ async function getToolSchema2(toolName) {
 }
 var import_jaro_winkler2, import_which2, execFileAsync6;
 var init_search2 = __esm(() => {
-  init_models2();
+  init_models();
   import_jaro_winkler2 = __toESM(require_jaro_winkler(), 1);
   import_which2 = __toESM(require_lib(), 1);
   execFileAsync6 = promisify8(execFile8);
@@ -8825,9 +8693,12 @@ function readResponse(rl) {
   });
 }
 var init_mcp = __esm(() => {
-  init_models2();
+  init_models();
 });
 
+// src/version.ts
+var VERSION2 = "1.2.0";
+
 // src/serve.ts
 var exports_serve = {};
 __export(exports_serve, {
@@ -8886,12 +8757,12 @@ function commandToMcpTool(toolName, cmd) {
       if (cmd.stdin.description && typeof prop === "object" && prop !== null) {
         prop.description = cmd.stdin.description;
       }
-      properties._stdin = prop;
+      properties["mtp:stdin"] = prop;
     } else {
       const prop = { type: "string" };
       if (cmd.stdin.description)
         prop.description = cmd.stdin.description;
-      properties._stdin = prop;
+      properties["mtp:stdin"] = prop;
     }
   }
   const inputSchema = {
@@ -8950,8 +8821,8 @@ function buildCliCommand(toolName, commandName, arguments_, commandSchema) {
 }
 function invokeCliTool(toolName, commandName, arguments_, commandSchema, authEnv) {
   const argsForCli = { ...arguments_ };
-  const stdinData = argsForCli._stdin;
-  delete argsForCli._stdin;
+  const stdinData = argsForCli["mtp:stdin"];
+  delete argsForCli["mtp:stdin"];
   const stdinStr = stdinData !== undefined ? typeof stdinData === "string" ? stdinData : JSON.stringify(stdinData) : undefined;
   const cmd = buildCliCommand(toolName, commandName, argsForCli, commandSchema);
   return new Promise((resolve) => {
@@ -9020,7 +8891,7 @@ async function handleRequest(state, req) {
       return jsonRpcSuccess(id, {
         protocolVersion: "2024-11-05",
         capabilities: { tools: {} },
-        serverInfo: { name: "mtpcli-serve", version: VERSION }
+        serverInfo: { name: "mtpcli-serve", version: VERSION2 }
       });
     case "notifications/initialized":
       return null;
@@ -9062,7 +8933,7 @@ async function run(toolNames) {
   for (const name of toolNames) {
     const schema = await getToolSchema2(name);
     if (!schema)
-      throw new Error(`could not get --describe from '${name}'`);
+      throw new Error(`could not get --mtp-describe from '${name}'`);
     if (schema.auth)
       allAuth.set(name, schema.auth);
     for (const cmd of schema.commands) {
@@ -9110,12 +8981,11 @@ async function run(toolNames) {
   }
 }
 var execFileAsync7, TOOL_TIMEOUT_MS = 60000, MAX_OUTPUT_BYTES;
-var init_serve = __esm(async () => {
+var init_serve = __esm(() => {
   init_auth();
   init_mcp();
-  init_models2();
+  init_models();
   init_search2();
-  await init_src();
   execFileAsync7 = promisify9(execFile9);
   MAX_OUTPUT_BYTES = 1024 * 1024 * 1024;
 });
@@ -9567,8 +9437,8 @@ function mcpToolToCommand(tool) {
     ...inputSchema.properties ?? {}
   };
   const requiredFields = (inputSchema.required ?? []).filter((v) => typeof v === "string");
-  const stdinProp = allProperties._stdin;
-  delete allProperties._stdin;
+  const stdinProp = allProperties["mtp:stdin"];
+  delete allProperties["mtp:stdin"];
   let stdin;
   if (stdinProp) {
     const propType = stdinProp.type;
@@ -9684,7 +9554,7 @@ class McpClient {
     client.sendRequest("initialize", {
       protocolVersion: "2024-11-05",
       capabilities: {},
-      clientInfo: { name: "mtpcli-wrap", version: VERSION }
+      clientInfo: { name: "mtpcli-wrap", version: VERSION2 }
     });
     await client.readResponse();
     client.sendNotification("notifications/initialized", {});
@@ -9745,7 +9615,7 @@ class HttpMcpClient {
     const initResult = await client.sendRequest("initialize", {
       protocolVersion: "2025-11-25",
       capabilities: {},
-      clientInfo: { name: "mtpcli-wrap", version: VERSION }
+      clientInfo: { name: "mtpcli-wrap", version: VERSION2 }
     });
     client.protocolVersion = initResult.protocolVersion ?? "2025-11-25";
     await client.sendNotification("notifications/initialized", {});
@@ -9943,6 +9813,7 @@ async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [],
     const mcpTools = await client.listTools();
     const commands = mcpTools.map(mcpToolToCommand);
     const schema = {
+      specVersion: MTP_SPEC_VERSION2,
       name: serverName,
       version: "0.1.0",
       description: `CLI wrapper for MCP server: ${serverName}`,
@@ -9966,9 +9837,9 @@ async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [],
       const stdinData = Buffer.concat(chunks).toString("utf-8");
       if (stdinData) {
         try {
-          parsed._stdin = JSON.parse(stdinData);
+          parsed["mtp:stdin"] = JSON.parse(stdinData);
         } catch {
-          parsed._stdin = stdinData;
+          parsed["mtp:stdin"] = stdinData;
         }
       }
     }
@@ -9987,9 +9858,9 @@ async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [],
     client.stop();
   }
 }
-var init_wrap = __esm(async () => {
+var init_wrap = __esm(() => {
   init_mcp();
-  await init_src();
+  init_models();
 });
 
 // src/validate.ts
@@ -10080,7 +9951,7 @@ function crossReferenceHelp(schema, helpText) {
   }
   helpFlags.delete("--help");
   helpFlags.delete("--version");
-  helpFlags.delete("--describe");
+  helpFlags.delete("--mtp-describe");
   const declaredFlags = new Set;
   for (const cmd of schema.commands) {
     for (const arg of cmd.args) {
@@ -10094,7 +9965,7 @@ function crossReferenceHelp(schema, helpText) {
       diags.push({
         level: "info",
         code: "HELP_ARG_MISMATCH",
-        message: `Flag "${flag}" in --describe but not found in --help`
+        message: `Flag "${flag}" in --mtp-describe but not found in --help`
       });
     }
   }
@@ -10103,7 +9974,7 @@ function crossReferenceHelp(schema, helpText) {
       diags.push({
         level: "info",
         code: "HELP_ARG_MISMATCH",
-        message: `Flag "${flag}" in --help but not found in --describe`
+        message: `Flag "${flag}" in --help but not found in --mtp-describe`
       });
     }
   }
@@ -10124,7 +9995,7 @@ async function validateTool(toolName, opts) {
   }
   let describeOutput;
   try {
-    const { stdout } = await execFileAsync8(toolPath, ["--describe"], {
+    const { stdout } = await execFileAsync8(toolPath, ["--mtp-describe"], {
       timeout: 1e4
     });
     describeOutput = stdout.trim();
@@ -10132,7 +10003,7 @@ async function validateTool(toolName, opts) {
       diags.push({
         level: "error",
         code: "DESCRIBE_FAILED",
-        message: `"${toolName} --describe" produced empty output`
+        message: `"${toolName} --mtp-describe" produced empty output`
       });
       return buildResult(toolName, diags);
     }
@@ -10140,7 +10011,7 @@ async function validateTool(toolName, opts) {
     diags.push({
       level: "error",
       code: "DESCRIBE_FAILED",
-      message: `"${toolName} --describe" failed: ${e instanceof Error ? e.message : e}`
+      message: `"${toolName} --mtp-describe" failed: ${e instanceof Error ? e.message : e}`
     });
     return buildResult(toolName, diags);
   }
@@ -10213,7 +10084,7 @@ function printHuman(result) {
 }
 var import_which3, execFileAsync8, VALID_ARG_TYPES;
 var init_validate = __esm(() => {
-  init_models2();
+  init_models();
   import_which3 = __toESM(require_lib(), 1);
   execFileAsync8 = promisify10(execFile10);
   VALID_ARG_TYPES = new Set([
@@ -10590,7 +10461,7 @@ async function run4(shell, toolName) {
   }
   const schema = await getToolSchema2(toolName);
   if (!schema) {
-    process.stderr.write(`error: could not get --describe from "${toolName}"
+    process.stderr.write(`error: could not get --mtp-describe from "${toolName}"
 `);
     process.exit(1);
   }
@@ -10600,16 +10471,148 @@ var init_completions = __esm(() => {
   init_search2();
 });
 
+// node_modules/commander/esm.mjs
+var import__ = __toESM(require_commander(), 1);
+var {
+  program,
+  createCommand,
+  createArgument,
+  createOption,
+  CommanderError,
+  InvalidArgumentError,
+  InvalidOptionArgumentError,
+  Command,
+  Argument,
+  Option,
+  Help
+} = import__.default;
+
+// src/models.ts
+init_zod();
+var ExampleSchema = exports_external.object({
+  description: exports_external.string().optional(),
+  command: exports_external.string(),
+  output: exports_external.string().optional()
+});
+var ArgSchema = exports_external.object({
+  name: exports_external.string(),
+  type: exports_external.string(),
+  description: exports_external.string().optional(),
+  required: exports_external.boolean().default(false),
+  default: exports_external.any().optional(),
+  values: exports_external.array(exports_external.string()).optional()
+});
+var IoDescriptorSchema = exports_external.object({
+  contentType: exports_external.string().optional(),
+  description: exports_external.string().optional(),
+  schema: exports_external.any().optional()
+});
+var CommandAuthSchema = exports_external.object({
+  required: exports_external.boolean().default(false),
+  scopes: exports_external.array(exports_external.string()).optional()
+});
+var CommandSchema = exports_external.object({
+  name: exports_external.string(),
+  description: exports_external.string(),
+  args: exports_external.array(ArgSchema).default([]),
+  stdin: IoDescriptorSchema.optional(),
+  stdout: IoDescriptorSchema.optional(),
+  examples: exports_external.array(ExampleSchema).default([]),
+  auth: CommandAuthSchema.optional()
+});
+var AuthProviderSchema = exports_external.object({
+  id: exports_external.string(),
+  type: exports_external.string(),
+  displayName: exports_external.string().optional(),
+  authorizationUrl: exports_external.string().optional(),
+  tokenUrl: exports_external.string().optional(),
+  scopes: exports_external.array(exports_external.string()).optional(),
+  clientId: exports_external.string().optional(),
+  registrationUrl: exports_external.string().optional(),
+  instructions: exports_external.string().optional()
+});
+var AuthConfigSchema = exports_external.object({
+  required: exports_external.boolean().default(false),
+  envVar: exports_external.string(),
+  providers: exports_external.array(AuthProviderSchema)
+});
+var MTP_SPEC_VERSION = "2026-02-07";
+var ToolSchemaSchema = exports_external.object({
+  specVersion: exports_external.string(),
+  name: exports_external.string(),
+  version: exports_external.string(),
+  description: exports_external.string(),
+  auth: AuthConfigSchema.optional(),
+  commands: exports_external.array(CommandSchema)
+});
+var StoredTokenSchema = exports_external.object({
+  access_token: exports_external.string(),
+  token_type: exports_external.string().optional(),
+  refresh_token: exports_external.string().optional(),
+  expires_at: exports_external.string().optional(),
+  scopes: exports_external.array(exports_external.string()).optional(),
+  provider_id: exports_external.string(),
+  created_at: exports_external.string()
+});
+var JsonRpcErrorSchema = exports_external.object({
+  code: exports_external.number(),
+  message: exports_external.string(),
+  data: exports_external.any().optional()
+});
+var JsonRpcRequestSchema = exports_external.object({
+  jsonrpc: exports_external.string(),
+  id: exports_external.any().optional(),
+  method: exports_external.string(),
+  params: exports_external.any().default({})
+});
+var JsonRpcResponseSchema = exports_external.object({
+  jsonrpc: exports_external.string(),
+  id: exports_external.any().optional(),
+  result: exports_external.any().optional(),
+  error: JsonRpcErrorSchema.optional()
+});
+var McpToolDefSchema = exports_external.object({
+  name: exports_external.string(),
+  description: exports_external.string(),
+  inputSchema: exports_external.any()
+});
+function cleanJson(obj) {
+  if (obj === null || obj === undefined)
+    return;
+  if (Array.isArray(obj)) {
+    return obj.map(cleanJson);
+  }
+  if (typeof obj === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(obj)) {
+      if (v === undefined)
+        continue;
+      if (Array.isArray(v) && v.length === 0)
+        continue;
+      const cleaned = cleanJson(v);
+      if (cleaned !== undefined) {
+        out[k] = cleaned;
+      }
+    }
+    return out;
+  }
+  return obj;
+}
+
+// src/version.ts
+var VERSION = "1.2.0";
+
 // src/index.ts
 function selfDescribe() {
   const schema = {
+    specVersion: MTP_SPEC_VERSION,
     name: "mtpcli",
     version: VERSION,
-    description: "Unified CLI for discovering, authenticating, and bridging --describe-compatible tools",
+    description: "Unified CLI for discovering, authenticating, and bridging --mtp-describe-compatible tools",
     commands: [
       {
         name: "search",
-        description: "Search across --describe-compatible tools for commands matching a query",
+        description: "Search across --mtp-describe-compatible tools for commands matching a query",
         args: [
           {
             name: "query",
@@ -10806,7 +10809,7 @@ function selfDescribe() {
             name: "--tool",
             type: "array",
             required: true,
-            description: "Tool name(s) to serve (must support --describe)"
+            description: "Tool name(s) to serve (must support --mtp-describe)"
           }
         ],
         examples: [
@@ -10822,7 +10825,7 @@ function selfDescribe() {
       },
       {
         name: "wrap",
-        description: "Wrap an MCP server as a --describe-compatible CLI",
+        description: "Wrap an MCP server as a --mtp-describe-compatible CLI",
         args: [
           {
             name: "--server",
@@ -10845,9 +10848,9 @@ function selfDescribe() {
             description: "Pre-registered OAuth client ID (for servers without dynamic registration)"
           },
           {
-            name: "--describe",
+            name: "--mtp-describe",
             type: "boolean",
-            description: "Output --describe JSON"
+            description: "Output --mtp-describe JSON"
           },
           {
             name: "tool_name",
@@ -10858,7 +10861,7 @@ function selfDescribe() {
         examples: [
           {
             description: "Describe a stdio MCP server",
-            command: 'mtpcli wrap --server "npx @mcp/server-github" --describe'
+            command: 'mtpcli wrap --server "npx @mcp/server-github" --mtp-describe'
           },
           {
             description: "Call a tool on a stdio server",
@@ -10866,7 +10869,7 @@ function selfDescribe() {
           },
           {
             description: "Describe an HTTP MCP server",
-            command: "mtpcli wrap --url http://localhost:3000/mcp --describe"
+            command: "mtpcli wrap --url http://localhost:3000/mcp --mtp-describe"
           },
           {
             description: "Call a tool on an HTTP server",
@@ -10876,7 +10879,7 @@ function selfDescribe() {
       },
       {
         name: "validate",
-        description: "Validate a tool's --describe output against the MTP spec",
+        description: "Validate a tool's --mtp-describe output against the MTP spec",
         args: [
           {
             name: "tool",
@@ -10919,7 +10922,7 @@ function selfDescribe() {
       },
       {
         name: "completions",
-        description: "Generate shell completions for a --describe-compatible tool",
+        description: "Generate shell completions for a --mtp-describe-compatible tool",
         args: [
           {
             name: "shell",
@@ -10954,126 +10957,122 @@ function selfDescribe() {
   };
   console.log(JSON.stringify(cleanJson(schema), null, 2));
 }
-var VERSION = "1.1.0", program2, authCmd;
-var init_src = __esm(async () => {
-  init_esm();
-  init_models();
-  program2 = new Command().name("mtpcli").version(VERSION).description("Unified CLI for discovering, authenticating, and bridging --describe-compatible tools").option("--describe", "Print self-describing JSON (mtpcli spec)").action(async (opts) => {
-    if (opts.describe) {
-      selfDescribe();
-      return;
-    }
-    program2.help();
-  });
-  program2.command("search").description("Search across --describe-compatible tools").argument("<query>", "Search query").option("--json", "Output as JSON", false).option("--scan-path", "Scan PATH for --describe-compatible tools", false).option("--jobs <n>", "Number of parallel jobs for --scan-path", "16").argument("[tools...]", "Tool names to search (after --)").action(async (query, tools, opts) => {
-    const { search: search2, loadSchemas: loadSchemas2, scanPath: scanPath2 } = await Promise.resolve().then(() => (init_search(), exports_search));
-    const schemas = opts.scanPath ? await scanPath2(parseInt(opts.jobs, 10)) : await loadSchemas2(tools);
-    if (schemas.length === 0) {
-      process.stderr.write(`no tools found. Try: mtpcli search --scan-path "query"
+var program2 = new Command().name("mtpcli").version(VERSION).description("Unified CLI for discovering, authenticating, and bridging --mtp-describe-compatible tools").option("--mtp-describe", "Print self-describing JSON (MTP spec)").action(async (opts) => {
+  if (opts.mtpDescribe) {
+    selfDescribe();
+    return;
+  }
+  program2.help();
+});
+program2.command("search").description("Search across --mtp-describe-compatible tools").argument("<query>", "Search query").option("--json", "Output as JSON", false).option("--scan-path", "Scan PATH for --mtp-describe-compatible tools", false).option("--jobs <n>", "Number of parallel jobs for --scan-path", "16").argument("[tools...]", "Tool names to search (after --)").action(async (query, tools, opts) => {
+  const { search: search2, loadSchemas: loadSchemas2, scanPath: scanPath2 } = await Promise.resolve().then(() => (init_search(), exports_search));
+  const schemas = opts.scanPath ? await scanPath2(parseInt(opts.jobs, 10)) : await loadSchemas2(tools);
+  if (schemas.length === 0) {
+    process.stderr.write(`no tools found. Try: mtpcli search --scan-path "query"
 `);
-      return;
-    }
-    const results = search2(query, schemas);
-    if (results.length === 0) {
-      process.stderr.write(`no results for "${query}"
+    return;
+  }
+  const results = search2(query, schemas);
+  if (results.length === 0) {
+    process.stderr.write(`no results for "${query}"
 `);
-      return;
-    }
-    if (opts.json) {
-      console.log(JSON.stringify(results, null, 2));
-    } else {
-      for (const r of results) {
-        console.log(`${r.score.toFixed(1).padStart(6)}  ${r.tool}  ${r.command}  ${r.description}`);
-      }
-    }
-  });
-  authCmd = program2.command("auth").description("Manage authentication for tools");
-  authCmd.command("login").description("Log in to a tool").argument("[tool]", "Tool name").option("--provider <id>", "Specific provider ID").option("--token <value>", "API key / bearer token (skip OAuth flow)").option("--url <url>", "HTTP MCP server URL (triggers OAuth discovery)").option("--client-id <id>", "Pre-registered OAuth client ID (for --url)").action(async (tool, opts) => {
-    if (opts.url) {
-      const { mcpOAuthFlow: mcpOAuthFlow3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
-      await mcpOAuthFlow3(opts.url, "", opts.clientId);
-      return;
+    return;
+  }
+  if (opts.json) {
+    console.log(JSON.stringify(results, null, 2));
+  } else {
+    for (const r of results) {
+      console.log(`${r.score.toFixed(1).padStart(6)}  ${r.tool}  ${r.command}  ${r.description}`);
     }
-    if (!tool) {
-      process.stderr.write(`error: tool name is required (or use --url)
+  }
+});
+var authCmd = program2.command("auth").description("Manage authentication for tools");
+authCmd.command("login").description("Log in to a tool").argument("[tool]", "Tool name").option("--provider <id>", "Specific provider ID").option("--token <value>", "API key / bearer token (skip OAuth flow)").option("--url <url>", "HTTP MCP server URL (triggers OAuth discovery)").option("--client-id <id>", "Pre-registered OAuth client ID (for --url)").action(async (tool, opts) => {
+  if (opts.url) {
+    const { mcpOAuthFlow: mcpOAuthFlow3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
+    await mcpOAuthFlow3(opts.url, "", opts.clientId);
+    return;
+  }
+  if (!tool) {
+    process.stderr.write(`error: tool name is required (or use --url)
 `);
-      process.exit(1);
-    }
-    const { runLogin: runLogin3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
-    await runLogin3(tool, opts.provider, opts.token);
-  });
-  authCmd.command("logout").description("Log out from a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
-    if (opts.url) {
-      const { mcpAuthLogout: mcpAuthLogout3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
-      const deleted = mcpAuthLogout3(opts.url);
-      if (deleted) {
-        process.stderr.write(`Logged out from ${opts.url}
+    process.exit(1);
+  }
+  const { runLogin: runLogin3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
+  await runLogin3(tool, opts.provider, opts.token);
+});
+authCmd.command("logout").description("Log out from a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
+  if (opts.url) {
+    const { mcpAuthLogout: mcpAuthLogout3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
+    const deleted = mcpAuthLogout3(opts.url);
+    if (deleted) {
+      process.stderr.write(`Logged out from ${opts.url}
 `);
-      } else {
-        process.stderr.write(`No tokens found for ${opts.url}
+    } else {
+      process.stderr.write(`No tokens found for ${opts.url}
 `);
-      }
-      return;
     }
-    if (!tool) {
-      process.stderr.write(`error: tool name is required (or use --url)
+    return;
+  }
+  if (!tool) {
+    process.stderr.write(`error: tool name is required (or use --url)
 `);
-      process.exit(1);
-    }
-    const { runLogout: runLogout3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
-    await runLogout3(tool);
-  });
-  authCmd.command("status").description("Show auth status for a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
-    if (opts.url) {
-      const { mcpAuthStatus: mcpAuthStatus3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
-      console.log(JSON.stringify(mcpAuthStatus3(opts.url), null, 2));
-      return;
-    }
-    if (!tool) {
-      process.stderr.write(`error: tool name is required (or use --url)
+    process.exit(1);
+  }
+  const { runLogout: runLogout3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
+  await runLogout3(tool);
+});
+authCmd.command("status").description("Show auth status for a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
+  if (opts.url) {
+    const { mcpAuthStatus: mcpAuthStatus3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
+    console.log(JSON.stringify(mcpAuthStatus3(opts.url), null, 2));
+    return;
+  }
+  if (!tool) {
+    process.stderr.write(`error: tool name is required (or use --url)
 `);
-      process.exit(1);
-    }
-    const { runStatus: runStatus3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
-    await runStatus3(tool);
-  });
-  authCmd.command("token").description("Print the access token for a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
-    if (opts.url) {
-      const { mcpAuthToken: mcpAuthToken3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
-      const t = await mcpAuthToken3(opts.url);
-      if (!t) {
-        throw new Error(`no valid token for '${opts.url}'. Run: mtpcli auth login --url ${opts.url}`);
-      }
-      console.log(t);
-      return;
-    }
-    if (!tool) {
-      process.stderr.write(`error: tool name is required (or use --url)
+    process.exit(1);
+  }
+  const { runStatus: runStatus3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
+  await runStatus3(tool);
+});
+authCmd.command("token").description("Print the access token for a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
+  if (opts.url) {
+    const { mcpAuthToken: mcpAuthToken3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
+    const t = await mcpAuthToken3(opts.url);
+    if (!t) {
+      throw new Error(`no valid token for '${opts.url}'. Run: mtpcli auth login --url ${opts.url}`);
+    }
+    console.log(t);
+    return;
+  }
+  if (!tool) {
+    process.stderr.write(`error: tool name is required (or use --url)
 `);
-      process.exit(1);
-    }
-    const { runToken: runToken3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
-    await runToken3(tool);
-  });
-  authCmd.command("env").description("Print shell export statement for eval").argument("<tool>", "Tool name").action(async (tool) => {
-    const { runEnv: runEnv3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
-    await runEnv3(tool);
-  });
-  authCmd.command("refresh").description("Force-refresh the stored OAuth token for a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
-    if (opts.url) {
-      const { mcpAuthRefresh: mcpAuthRefresh3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
-      await mcpAuthRefresh3(opts.url);
-      return;
-    }
-    if (!tool) {
-      process.stderr.write(`error: tool name is required (or use --url)
+    process.exit(1);
+  }
+  const { runToken: runToken3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
+  await runToken3(tool);
+});
+authCmd.command("env").description("Print shell export statement for eval").argument("<tool>", "Tool name").action(async (tool) => {
+  const { runEnv: runEnv3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
+  await runEnv3(tool);
+});
+authCmd.command("refresh").description("Force-refresh the stored OAuth token for a tool").argument("[tool]", "Tool name").option("--url <url>", "HTTP MCP server URL").action(async (tool, opts) => {
+  if (opts.url) {
+    const { mcpAuthRefresh: mcpAuthRefresh3 } = await Promise.resolve().then(() => (init_mcp_oauth(), exports_mcp_oauth));
+    await mcpAuthRefresh3(opts.url);
+    return;
+  }
+  if (!tool) {
+    process.stderr.write(`error: tool name is required (or use --url)
 `);
-      process.exit(1);
-    }
-    const { runRefresh: runRefresh3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
-    await runRefresh3(tool);
-  });
-  program2.command("serve").description("Serve CLI tools as an MCP server (cli2mcp bridge)").requiredOption("--tool <names...>", "Tool(s) to serve").addHelpText("after", `
+    process.exit(1);
+  }
+  const { runRefresh: runRefresh3 } = await Promise.resolve().then(() => (init_auth2(), exports_auth2));
+  await runRefresh3(tool);
+});
+program2.command("serve").description("Serve CLI tools as an MCP server (cli2mcp bridge)").requiredOption("--tool <names...>", "Tool(s) to serve").addHelpText("after", `
 This command is meant to be used as an MCP server, not run directly.
 Add it to your MCP client config (e.g. ~/.claude.json):
 
@@ -11087,12 +11086,12 @@ Add it to your MCP client config (e.g. ~/.claude.json):
     }
   }
 
-Any CLI tool on your PATH that supports --describe can be served.
+Any CLI tool on your PATH that supports --mtp-describe can be served.
 Multiple tools can be combined into a single MCP server:
 
   mtpcli serve --tool tool1 --tool tool2`).action(async (opts) => {
-    if (process.stdin.isTTY) {
-      process.stderr.write(`Error: 'mtpcli serve' is an MCP server and should not be run directly.
+  if (process.stdin.isTTY) {
+    process.stderr.write(`Error: 'mtpcli serve' is an MCP server and should not be run directly.
 ` + `Add it to your MCP client config instead. For example, in ~/.claude.json:
 
 ` + `  {
@@ -11107,57 +11106,51 @@ Multiple tools can be combined into a single MCP server:
 
 ` + `Run 'mtpcli serve --help' for more details.
 `);
-      process.exit(1);
-    }
-    const { run: run5 } = await init_serve().then(() => exports_serve);
-    await run5(opts.tool);
-  });
-  program2.command("wrap").description("Wrap an MCP server as a CLI tool (mcp2cli bridge)").option("--server <cmd>", "MCP server command to run (stdio transport)").option("--url <url>", "MCP server URL (Streamable HTTP / SSE transport)").option("-H, --header <header...>", "HTTP header(s) for --url (e.g. 'Authorization: Bearer tok')").option("--client-id <id>", "Pre-registered OAuth client ID (for --url)").option("--describe", "Output --describe JSON instead of invoking", false).argument("[tool_name]", "Tool name to invoke").argument("[args...]", "Arguments for the tool (after --)").action(async (toolName, args, opts) => {
-    if (opts.server && opts.url) {
-      process.stderr.write(`error: --server and --url are mutually exclusive
-`);
-      process.exit(1);
-    }
-    if (!opts.server && !opts.url) {
-      process.stderr.write(`error: one of --server or --url is required
+    process.exit(1);
+  }
+  const { run: run5 } = await Promise.resolve().then(() => (init_serve(), exports_serve));
+  await run5(opts.tool);
+});
+program2.command("wrap").description("Wrap an MCP server as a CLI tool (mcp2cli bridge)").option("--server <cmd>", "MCP server command to run (stdio transport)").option("--url <url>", "MCP server URL (Streamable HTTP / SSE transport)").option("-H, --header <header...>", "HTTP header(s) for --url (e.g. 'Authorization: Bearer tok')").option("--client-id <id>", "Pre-registered OAuth client ID (for --url)").option("--mtp-describe", "Output --mtp-describe JSON instead of invoking", false).argument("[tool_name]", "Tool name to invoke").argument("[args...]", "Arguments for the tool (after --)").action(async (toolName, args, opts) => {
+  if (opts.server && opts.url) {
+    process.stderr.write(`error: --server and --url are mutually exclusive
 `);
-      process.exit(1);
-    }
-    if (opts.header && !opts.url) {
-      process.stderr.write(`error: --header requires --url
+    process.exit(1);
+  }
+  if (!opts.server && !opts.url) {
+    process.stderr.write(`error: one of --server or --url is required
 `);
-      process.exit(1);
-    }
-    if (opts.clientId && !opts.url) {
-      process.stderr.write(`error: --client-id requires --url
+    process.exit(1);
+  }
+  if (opts.header && !opts.url) {
+    process.stderr.write(`error: --header requires --url
 `);
-      process.exit(1);
-    }
-    const { run: run5 } = await init_wrap().then(() => exports_wrap);
-    await run5(opts.server, opts.url, opts.describe, toolName, args, opts.header ?? [], opts.clientId);
-  });
-  program2.command("validate").description("Validate a tool's --describe output against the MTP spec").argument("[tool]", "Tool name to validate").option("--json", "Output as JSON", false).option("--stdin", "Read JSON from stdin", false).option("--skip-help", "Skip --help cross-reference", false).action(async (tool, opts) => {
-    const { run: run5 } = await Promise.resolve().then(() => (init_validate(), exports_validate));
-    await run5(tool, {
-      json: opts.json,
-      stdin: opts.stdin,
-      skipHelp: opts.skipHelp
-    });
-  });
-  program2.command("completions").description("Generate shell completions from --describe output").argument("<shell>", "Shell type (bash, zsh, fish)").argument("<tool>", "Tool name").action(async (shell, tool) => {
-    const { run: run5 } = await Promise.resolve().then(() => (init_completions(), exports_completions));
-    await run5(shell, tool);
-  });
-  try {
-    await program2.parseAsync(process.argv);
-  } catch (e) {
-    process.stderr.write(`error: ${e instanceof Error ? e.message : e}
+    process.exit(1);
+  }
+  if (opts.clientId && !opts.url) {
+    process.stderr.write(`error: --client-id requires --url
 `);
     process.exit(1);
   }
+  const { run: run5 } = await Promise.resolve().then(() => (init_wrap(), exports_wrap));
+  await run5(opts.server, opts.url, opts.mtpDescribe, toolName, args, opts.header ?? [], opts.clientId);
 });
-await init_src();
-
-export {
-  VERSION
-};
+program2.command("validate").description("Validate a tool's --mtp-describe output against the MTP spec").argument("[tool]", "Tool name to validate").option("--json", "Output as JSON", false).option("--stdin", "Read JSON from stdin", false).option("--skip-help", "Skip --help cross-reference", false).action(async (tool, opts) => {
+  const { run: run5 } = await Promise.resolve().then(() => (init_validate(), exports_validate));
+  await run5(tool, {
+    json: opts.json,
+    stdin: opts.stdin,
+    skipHelp: opts.skipHelp
+  });
+});
+program2.command("completions").description("Generate shell completions from --mtp-describe output").argument("<shell>", "Shell type (bash, zsh, fish)").argument("<tool>", "Tool name").action(async (shell, tool) => {
+  const { run: run5 } = await Promise.resolve().then(() => (init_completions(), exports_completions));
+  await run5(shell, tool);
+});
+try {
+  await program2.parseAsync(process.argv);
+} catch (e) {
+  process.stderr.write(`error: ${e instanceof Error ? e.message : e}
+`);
+  process.exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modeltoolsprotocol/mtpcli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {