@modeltoolsprotocol/mtpcli 1.1.1 → 1.3.0

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,38 +6088,21 @@ 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(() => {
+// node_modules/@modeltoolsprotocol/sdk/src/schemas.ts
+var MTP_SPEC_VERSION = "2026-02-07", ExampleSchema, IODescriptorSchema, ArgDescriptorSchema, CommandAuthSchema, CommandDescriptorSchema, AuthProviderSchema, AuthConfigSchema, ToolSchemaSchema;
+var init_schemas = __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({
+  IODescriptorSchema = exports_external.object({
+    contentType: exports_external.string().optional(),
+    description: exports_external.string().optional(),
+    schema: exports_external.any().optional()
+  });
+  ArgDescriptorSchema = exports_external.object({
     name: exports_external.string(),
     type: exports_external.string(),
     description: exports_external.string().optional(),
@@ -6147,21 +6110,16 @@ var init_models = __esm(() => {
     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({
+  CommandDescriptorSchema = exports_external.object({
     name: exports_external.string(),
     description: exports_external.string(),
-    args: exports_external.array(ArgSchema).default([]),
-    stdin: IoDescriptorSchema.optional(),
-    stdout: IoDescriptorSchema.optional(),
+    args: exports_external.array(ArgDescriptorSchema).default([]),
+    stdin: IODescriptorSchema.optional(),
+    stdout: IODescriptorSchema.optional(),
     examples: exports_external.array(ExampleSchema).default([]),
     auth: CommandAuthSchema.optional()
   });
@@ -6182,45 +6140,148 @@ var init_models = __esm(() => {
     providers: exports_external.array(AuthProviderSchema)
   });
   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)
-  });
-  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()
+    commands: exports_external.array(CommandDescriptorSchema)
   });
 });
 
+// node_modules/@modeltoolsprotocol/sdk/src/introspect.ts
+function extractArgFromOption(option, typeOverrides) {
+  const name = option.long ?? option.short;
+  const overrideType = typeOverrides?.[option.attributeName()];
+  let type;
+  let values;
+  if (overrideType) {
+    type = overrideType;
+  } else if (option.argChoices) {
+    type = "enum";
+    values = [...option.argChoices];
+  } else if (option.variadic) {
+    type = "array";
+  } else if (option.isBoolean()) {
+    type = "boolean";
+  } else {
+    type = "string";
+  }
+  const arg = { name, type };
+  if (option.description)
+    arg.description = option.description;
+  if (values)
+    arg.values = values;
+  arg.required = option.mandatory;
+  if (option.defaultValue !== undefined) {
+    let def = option.defaultValue;
+    if ((type === "integer" || type === "number") && typeof def === "string" && !isNaN(Number(def))) {
+      def = Number(def);
+    }
+    arg.default = def;
+  }
+  return arg;
+}
+function extractArgFromArgument(argument, typeOverrides) {
+  const name = argument.name();
+  const overrideType = typeOverrides?.[name];
+  let type;
+  let values;
+  if (overrideType) {
+    type = overrideType;
+  } else if (argument.argChoices) {
+    type = "enum";
+    values = [...argument.argChoices];
+  } else if (argument.variadic) {
+    type = "array";
+  } else {
+    type = "string";
+  }
+  const arg = { name, type };
+  if (argument.description)
+    arg.description = argument.description;
+  if (values)
+    arg.values = values;
+  arg.required = argument.required;
+  if (argument.defaultValue !== undefined) {
+    let def = argument.defaultValue;
+    if ((type === "integer" || type === "number") && typeof def === "string" && !isNaN(Number(def))) {
+      def = Number(def);
+    }
+    arg.default = def;
+  }
+  return arg;
+}
+function isFilteredOption(option, cmd, describeOptionName) {
+  if (option.hidden)
+    return true;
+  const internals = cmd;
+  if (internals._helpOption && option === internals._helpOption)
+    return true;
+  if (internals._versionOptionName && option.attributeName() === internals._versionOptionName)
+    return true;
+  if (describeOptionName && option.attributeName() === describeOptionName)
+    return true;
+  return false;
+}
+function walkCommands(cmd, annotations, parentPath, describeOptionName) {
+  const internals = cmd;
+  const visibleSubcommands = cmd.commands.filter((sub) => !sub._hidden);
+  if (visibleSubcommands.length === 0) {
+    const name = parentPath || "_root";
+    return [buildCommand(cmd, name, annotations?.[name], describeOptionName)];
+  }
+  const results = [];
+  for (const sub of visibleSubcommands) {
+    const subName = parentPath ? `${parentPath} ${sub.name()}` : sub.name();
+    results.push(...walkCommands(sub, annotations, subName, describeOptionName));
+  }
+  return results;
+}
+function buildCommand(cmd, name, annotation, describeOptionName) {
+  const descriptor = {
+    name,
+    description: cmd.description() || ""
+  };
+  const args = [];
+  const typeOverrides = annotation?.argTypes;
+  for (const arg of cmd.registeredArguments) {
+    args.push(extractArgFromArgument(arg, typeOverrides));
+  }
+  for (const opt of cmd.options) {
+    if (isFilteredOption(opt, cmd, describeOptionName))
+      continue;
+    args.push(extractArgFromOption(opt, typeOverrides));
+  }
+  if (args.length > 0)
+    descriptor.args = args;
+  if (annotation?.stdin)
+    descriptor.stdin = annotation.stdin;
+  if (annotation?.stdout)
+    descriptor.stdout = annotation.stdout;
+  if (annotation?.examples && annotation.examples.length > 0)
+    descriptor.examples = annotation.examples;
+  if (annotation?.auth)
+    descriptor.auth = annotation.auth;
+  return descriptor;
+}
+function generateSchema(program2, options) {
+  const internals = program2;
+  const schema = {
+    specVersion: MTP_SPEC_VERSION,
+    name: program2.name(),
+    version: internals._version || "",
+    description: program2.description() || "",
+    commands: walkCommands(program2, options?.commands, undefined, "mtpDescribe")
+  };
+  if (options?.auth)
+    schema.auth = options.auth;
+  return schema;
+}
+var init_introspect = __esm(() => {
+  init_schemas();
+});
+
 // node_modules/jaro-winkler/index.js
 var require_jaro_winkler = __commonJS((exports, module) => {
   (function(root) {
@@ -6554,6 +6615,12 @@ var require_lib = __commonJS((exports, module) => {
   which.sync = whichSync;
 });
 
+// node_modules/@modeltoolsprotocol/sdk/src/index.ts
+var init_src = __esm(() => {
+  init_introspect();
+  init_schemas();
+});
+
 // src/models.ts
 function jsonRpcSuccess(id, result) {
   return { jsonrpc: "2.0", id, result };
@@ -6561,64 +6628,11 @@ 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 StoredTokenSchema, JsonRpcErrorSchema, JsonRpcRequestSchema, JsonRpcResponseSchema, McpToolDefSchema;
+var init_models = __esm(() => {
   init_zod();
-  ExampleSchema2 = exports_external.object({
-    description: exports_external.string().optional(),
-    command: exports_external.string(),
-    output: exports_external.string().optional()
-  });
-  ArgSchema2 = 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()
-  });
-  IoDescriptorSchema2 = exports_external.object({
-    contentType: exports_external.string().optional(),
-    description: exports_external.string().optional(),
-    schema: exports_external.any().optional()
-  });
-  CommandAuthSchema2 = exports_external.object({
-    required: exports_external.boolean().default(false),
-    scopes: exports_external.array(exports_external.string()).optional()
-  });
-  CommandSchema2 = exports_external.object({
-    name: exports_external.string(),
-    description: exports_external.string(),
-    args: exports_external.array(ArgSchema2).default([]),
-    stdin: IoDescriptorSchema2.optional(),
-    stdout: IoDescriptorSchema2.optional(),
-    examples: exports_external.array(ExampleSchema2).default([]),
-    auth: CommandAuthSchema2.optional()
-  });
-  AuthProviderSchema2 = 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()
-  });
-  AuthConfigSchema2 = exports_external.object({
-    required: exports_external.boolean().default(false),
-    envVar: exports_external.string(),
-    providers: exports_external.array(AuthProviderSchema2)
-  });
-  ToolSchemaSchema2 = exports_external.object({
-    name: exports_external.string(),
-    version: exports_external.string(),
-    description: exports_external.string(),
-    auth: AuthConfigSchema2.optional(),
-    commands: exports_external.array(CommandSchema2)
-  });
-  StoredTokenSchema2 = exports_external.object({
+  init_src();
+  StoredTokenSchema = exports_external.object({
     access_token: exports_external.string(),
     token_type: exports_external.string().optional(),
     refresh_token: exports_external.string().optional(),
@@ -6627,24 +6641,24 @@ var init_models2 = __esm(() => {
     provider_id: exports_external.string(),
     created_at: exports_external.string()
   });
-  JsonRpcErrorSchema2 = exports_external.object({
+  JsonRpcErrorSchema = exports_external.object({
     code: exports_external.number(),
     message: exports_external.string(),
     data: exports_external.any().optional()
   });
-  JsonRpcRequestSchema2 = exports_external.object({
+  JsonRpcRequestSchema = exports_external.object({
     jsonrpc: exports_external.string(),
     id: exports_external.any().optional(),
     method: exports_external.string(),
     params: exports_external.any().default({})
   });
-  JsonRpcResponseSchema2 = exports_external.object({
+  JsonRpcResponseSchema = exports_external.object({
     jsonrpc: exports_external.string(),
     id: exports_external.any().optional(),
     result: exports_external.any().optional(),
-    error: JsonRpcErrorSchema2.optional()
+    error: JsonRpcErrorSchema.optional()
   });
-  McpToolDefSchema2 = exports_external.object({
+  McpToolDefSchema = exports_external.object({
     name: exports_external.string(),
     description: exports_external.string(),
     inputSchema: exports_external.any()
@@ -6705,10 +6719,10 @@ 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()));
+    return ToolSchemaSchema.parse(JSON.parse(stdout.trim()));
   } catch {
     return null;
   }
@@ -6731,7 +6745,7 @@ function readAllCached() {
       continue;
     try {
       const data = readFileSync(join(dir, entry), "utf-8");
-      schemas.push(ToolSchemaSchema2.parse(JSON.parse(data)));
+      schemas.push(ToolSchemaSchema.parse(JSON.parse(data)));
     } catch {}
   }
   return schemas;
@@ -6803,7 +6817,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 +6825,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,17 +7471,17 @@ 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()));
+    return ToolSchemaSchema.parse(JSON.parse(stdout.trim()));
   } catch {
     return null;
   }
 }
 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);
@@ -8810,7 +8824,7 @@ function readResponse(rl) {
         rl.off("line", onLine);
         rl.off("close", onClose);
         try {
-          resolve(JsonRpcResponseSchema2.parse(msg));
+          resolve(JsonRpcResponseSchema.parse(msg));
         } catch (e) {
           reject(e);
         }
@@ -8825,9 +8839,12 @@ function readResponse(rl) {
   });
 }
 var init_mcp = __esm(() => {
-  init_models2();
+  init_models();
 });
 
+// src/version.ts
+var VERSION2 = "1.3.0";
+
 // src/serve.ts
 var exports_serve = {};
 __export(exports_serve, {
@@ -8886,12 +8903,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 +8967,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 +9037,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 +9079,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) {
@@ -9095,7 +9112,7 @@ async function run(toolNames) {
       continue;
     let req;
     try {
-      req = JsonRpcRequestSchema2.parse(JSON.parse(trimmed));
+      req = JsonRpcRequestSchema.parse(JSON.parse(trimmed));
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       process.stderr.write(`error reading request: ${msg}
@@ -9110,12 +9127,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 +9583,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 +9700,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 +9761,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 +9959,7 @@ async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [],
     const mcpTools = await client.listTools();
     const commands = mcpTools.map(mcpToolToCommand);
     const schema = {
+      specVersion: MTP_SPEC_VERSION,
       name: serverName,
       version: "0.1.0",
       description: `CLI wrapper for MCP server: ${serverName}`,
@@ -9966,9 +9983,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 +10004,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
@@ -10015,7 +10032,7 @@ function validateJson(raw) {
     });
     return diags;
   }
-  const result = ToolSchemaSchema2.safeParse(parsed);
+  const result = ToolSchemaSchema.safeParse(parsed);
   if (!result.success) {
     for (const issue of result.error.issues) {
       diags.push({
@@ -10080,7 +10097,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 +10111,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 +10120,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 +10141,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 +10149,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 +10157,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);
   }
@@ -10151,7 +10168,7 @@ async function validateTool(toolName, opts) {
       const { stdout: helpText } = await execFileAsync8(toolPath, ["--help"], {
         timeout: 5000
       });
-      const schema = ToolSchemaSchema2.parse(JSON.parse(describeOutput));
+      const schema = ToolSchemaSchema.parse(JSON.parse(describeOutput));
       diags.push(...crossReferenceHelp(schema, helpText));
     } catch {}
   }
@@ -10213,7 +10230,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 +10607,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,480 +10617,153 @@ var init_completions = __esm(() => {
   init_search2();
 });
 
-// src/index.ts
-function selfDescribe() {
-  const schema = {
-    name: "mtpcli",
-    version: VERSION,
-    description: "Unified CLI for discovering, authenticating, and bridging --describe-compatible tools",
-    commands: [
-      {
-        name: "search",
-        description: "Search across --describe-compatible tools for commands matching a query",
-        args: [
-          {
-            name: "query",
-            type: "string",
-            required: true,
-            description: "Search query"
-          },
-          {
-            name: "--json",
-            type: "boolean",
-            default: false,
-            description: "Output as JSON"
-          },
-          {
-            name: "--scan-path",
-            type: "boolean",
-            default: false,
-            description: "Scan PATH for tools"
-          },
-          {
-            name: "--jobs",
-            type: "integer",
-            default: 16,
-            description: "Parallel jobs for scan-path"
-          }
-        ],
-        examples: [
-          {
-            description: "Search specific tools",
-            command: 'mtpcli search "convert files" -- filetool mytool'
-          },
-          {
-            description: "Search cached tools",
-            command: 'mtpcli search "deploy"'
-          },
-          {
-            description: "Scan PATH and search",
-            command: 'mtpcli search --scan-path "git commit"'
-          }
-        ]
-      },
-      {
-        name: "auth login",
-        description: "Authenticate with a tool (OAuth2, API key, or bearer token)",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            description: "Tool name (required unless --url is used)"
-          },
-          {
-            name: "--provider",
-            type: "string",
-            description: "Specific auth provider ID"
-          },
-          {
-            name: "--token",
-            type: "string",
-            description: "API key or bearer token"
-          },
-          {
-            name: "--url",
-            type: "string",
-            description: "HTTP MCP server URL (triggers OAuth discovery and login)"
-          },
-          {
-            name: "--client-id",
-            type: "string",
-            description: "Pre-registered OAuth client ID (for --url)"
-          }
-        ],
-        examples: [
-          { description: "OAuth2 login", command: "mtpcli auth login gh-tool" },
-          {
-            description: "API key login",
-            command: "mtpcli auth login my-tool --token sk-xxx"
-          },
-          {
-            description: "Login to HTTP MCP server",
-            command: "mtpcli auth login --url https://mcp.example.com/v1/mcp"
-          }
-        ]
-      },
-      {
-        name: "auth logout",
-        description: "Remove stored tokens for a tool",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            description: "Tool name (required unless --url is used)"
-          },
-          {
-            name: "--url",
-            type: "string",
-            description: "HTTP MCP server URL"
-          }
-        ],
-        examples: [
-          { command: "mtpcli auth logout gh-tool" },
-          {
-            description: "Logout from HTTP MCP server",
-            command: "mtpcli auth logout --url https://mcp.example.com/v1/mcp"
-          }
-        ]
-      },
-      {
-        name: "auth status",
-        description: "Show authentication status for a tool",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            description: "Tool name (required unless --url is used)"
-          },
-          {
-            name: "--url",
-            type: "string",
-            description: "HTTP MCP server URL"
-          }
-        ],
-        examples: [
-          { command: "mtpcli auth status gh-tool" },
-          {
-            description: "Status for HTTP MCP server",
-            command: "mtpcli auth status --url https://mcp.example.com/v1/mcp"
-          }
-        ]
-      },
-      {
-        name: "auth token",
-        description: "Print the access token for a tool",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            description: "Tool name (required unless --url is used)"
-          },
-          {
-            name: "--url",
-            type: "string",
-            description: "HTTP MCP server URL"
-          }
-        ],
-        examples: [
-          { command: "mtpcli auth token gh-tool" },
-          {
-            description: "Token for HTTP MCP server",
-            command: "mtpcli auth token --url https://mcp.example.com/v1/mcp"
-          }
-        ]
-      },
-      {
-        name: "auth env",
-        description: "Print shell export statement for eval $(mtpcli auth env <tool>)",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            required: true,
-            description: "Tool name"
-          }
-        ],
-        examples: [{ command: "eval $(mtpcli auth env gh-tool)" }]
-      },
-      {
-        name: "auth refresh",
-        description: "Force-refresh the stored OAuth token for a tool",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            description: "Tool name (required unless --url is used)"
-          },
-          {
-            name: "--url",
-            type: "string",
-            description: "HTTP MCP server URL"
-          }
-        ],
-        examples: [
-          { command: "mtpcli auth refresh gh-tool" },
-          {
-            description: "Refresh token for HTTP MCP server",
-            command: "mtpcli auth refresh --url https://mcp.example.com/v1/mcp"
-          }
-        ]
-      },
-      {
-        name: "serve",
-        description: "Serve CLI tools as an MCP server over stdio. Not meant to be run directly; add to your MCP client config instead.",
-        args: [
-          {
-            name: "--tool",
-            type: "array",
-            required: true,
-            description: "Tool name(s) to serve (must support --describe)"
-          }
-        ],
-        examples: [
-          {
-            description: "Add to ~/.claude.json as an MCP server",
-            command: '{ "mcpServers": { "my-tools": { "type": "stdio", "command": "mtpcli", "args": ["serve", "--tool", "my-cli-tool"] } } }'
-          },
-          {
-            description: "Serve multiple tools in one MCP server",
-            command: '{ "mcpServers": { "my-tools": { "type": "stdio", "command": "mtpcli", "args": ["serve", "--tool", "tool1", "--tool", "tool2"] } } }'
-          }
-        ]
-      },
-      {
-        name: "wrap",
-        description: "Wrap an MCP server as a --describe-compatible CLI",
-        args: [
-          {
-            name: "--server",
-            type: "string",
-            description: "MCP server command (stdio transport)"
-          },
-          {
-            name: "--url",
-            type: "string",
-            description: "MCP server URL (Streamable HTTP transport). Mutually exclusive with --server."
-          },
-          {
-            name: "--header",
-            type: "array",
-            description: "HTTP header(s) for --url, e.g. 'Authorization: Bearer tok'. Repeatable."
-          },
-          {
-            name: "--client-id",
-            type: "string",
-            description: "Pre-registered OAuth client ID (for servers without dynamic registration)"
-          },
-          {
-            name: "--describe",
-            type: "boolean",
-            description: "Output --describe JSON"
-          },
-          {
-            name: "tool_name",
-            type: "string",
-            description: "Tool to invoke"
-          }
-        ],
-        examples: [
-          {
-            description: "Describe a stdio MCP server",
-            command: 'mtpcli wrap --server "npx @mcp/server-github" --describe'
-          },
-          {
-            description: "Call a tool on a stdio server",
-            command: 'mtpcli wrap --server "npx @mcp/server-github" search_repos -- --query mtpcli'
-          },
-          {
-            description: "Describe an HTTP MCP server",
-            command: "mtpcli wrap --url http://localhost:3000/mcp --describe"
-          },
-          {
-            description: "Call a tool on an HTTP server",
-            command: "mtpcli wrap --url http://localhost:3000/mcp search_repos -- --query mtpcli"
-          }
-        ]
-      },
-      {
-        name: "validate",
-        description: "Validate a tool's --describe output against the MTP spec",
-        args: [
-          {
-            name: "tool",
-            type: "string",
-            description: "Tool name to validate"
-          },
-          {
-            name: "--json",
-            type: "boolean",
-            default: false,
-            description: "Output as JSON"
-          },
-          {
-            name: "--stdin",
-            type: "boolean",
-            default: false,
-            description: "Read JSON from stdin instead of running tool"
-          },
-          {
-            name: "--skip-help",
-            type: "boolean",
-            default: false,
-            description: "Skip --help cross-reference check"
-          }
-        ],
-        examples: [
-          {
-            description: "Validate a tool",
-            command: "mtpcli validate mytool"
-          },
-          {
-            description: "Validate from stdin",
-            command: "cat describe.json | mtpcli validate --stdin"
-          },
-          {
-            description: "JSON output for CI",
-            command: "mtpcli validate mytool --json"
-          }
-        ]
-      },
-      {
-        name: "completions",
-        description: "Generate shell completions for a --describe-compatible tool",
-        args: [
-          {
-            name: "shell",
-            type: "enum",
-            required: true,
-            values: ["bash", "zsh", "fish"],
-            description: "Target shell"
-          },
-          {
-            name: "tool",
-            type: "string",
-            required: true,
-            description: "Tool name"
-          }
-        ],
-        examples: [
-          {
-            description: "Install bash completions",
-            command: "eval $(mtpcli completions bash mytool)"
-          },
-          {
-            description: "Install zsh completions",
-            command: "eval $(mtpcli completions zsh mytool)"
-          },
-          {
-            description: "Install fish completions",
-            command: "mtpcli completions fish mytool | source"
-          }
-        ]
-      }
-    ]
-  };
-  console.log(JSON.stringify(cleanJson(schema), null, 2));
-}
-var VERSION = "1.1.1", 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();
+// 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;
+
+// node_modules/@modeltoolsprotocol/sdk/src/index.ts
+init_introspect();
+init_schemas();
+function describe(program2, options) {
+  return generateSchema(program2, options);
+}
+function withDescribe(program2, options) {
+  program2.option("--mtp-describe", "Output machine-readable MTP JSON schema");
+  program2.on("option:mtp-describe", () => {
+    const schema = describe(program2, options);
+    const clean = JSON.parse(JSON.stringify(schema));
+    console.log(JSON.stringify(clean, null, 2));
+    process.exit(0);
   });
-  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"
+  return program2;
+}
+
+// src/version.ts
+var VERSION = "1.3.0";
+
+// src/index.ts
+var program2 = new Command().name("mtpcli").version(VERSION).description("Unified CLI for discovering, authenticating, and bridging --mtp-describe-compatible tools");
+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 +10777,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 +10797,128 @@ 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);
+});
+var describeOptions = {
+  commands: {
+    search: {
+      examples: [
+        { description: "Search specific tools", command: 'mtpcli search "convert files" -- filetool mytool' },
+        { description: "Search cached tools", command: 'mtpcli search "deploy"' },
+        { description: "Scan PATH and search", command: 'mtpcli search --scan-path "git commit"' }
+      ],
+      argTypes: { jobs: "integer" }
+    },
+    "auth login": {
+      examples: [
+        { description: "OAuth2 login", command: "mtpcli auth login gh-tool" },
+        { description: "API key login", command: "mtpcli auth login my-tool --token sk-xxx" },
+        { description: "Login to HTTP MCP server", command: "mtpcli auth login --url https://mcp.example.com/v1/mcp" }
+      ]
+    },
+    "auth logout": {
+      examples: [
+        { command: "mtpcli auth logout gh-tool" },
+        { description: "Logout from HTTP MCP server", command: "mtpcli auth logout --url https://mcp.example.com/v1/mcp" }
+      ]
+    },
+    "auth status": {
+      examples: [
+        { command: "mtpcli auth status gh-tool" },
+        { description: "Status for HTTP MCP server", command: "mtpcli auth status --url https://mcp.example.com/v1/mcp" }
+      ]
+    },
+    "auth token": {
+      examples: [
+        { command: "mtpcli auth token gh-tool" },
+        { description: "Token for HTTP MCP server", command: "mtpcli auth token --url https://mcp.example.com/v1/mcp" }
+      ]
+    },
+    "auth env": {
+      examples: [
+        { command: "eval $(mtpcli auth env gh-tool)" }
+      ]
+    },
+    "auth refresh": {
+      examples: [
+        { command: "mtpcli auth refresh gh-tool" },
+        { description: "Refresh token for HTTP MCP server", command: "mtpcli auth refresh --url https://mcp.example.com/v1/mcp" }
+      ]
+    },
+    serve: {
+      examples: [
+        { description: "Add to ~/.claude.json as an MCP server", command: '{ "mcpServers": { "my-tools": { "type": "stdio", "command": "mtpcli", "args": ["serve", "--tool", "my-cli-tool"] } } }' },
+        { description: "Serve multiple tools in one MCP server", command: '{ "mcpServers": { "my-tools": { "type": "stdio", "command": "mtpcli", "args": ["serve", "--tool", "tool1", "--tool", "tool2"] } } }' }
+      ]
+    },
+    wrap: {
+      examples: [
+        { description: "Describe a stdio MCP server", command: 'mtpcli wrap --server "npx @mcp/server-github" --mtp-describe' },
+        { description: "Call a tool on a stdio server", command: 'mtpcli wrap --server "npx @mcp/server-github" search_repos -- --query mtpcli' },
+        { description: "Describe an HTTP MCP server", command: "mtpcli wrap --url http://localhost:3000/mcp --mtp-describe" },
+        { description: "Call a tool on an HTTP server", command: "mtpcli wrap --url http://localhost:3000/mcp search_repos -- --query mtpcli" }
+      ]
+    },
+    validate: {
+      examples: [
+        { description: "Validate a tool", command: "mtpcli validate mytool" },
+        { description: "Validate from stdin", command: "cat describe.json | mtpcli validate --stdin" },
+        { description: "JSON output for CI", command: "mtpcli validate mytool --json" }
+      ]
+    },
+    completions: {
+      examples: [
+        { description: "Install bash completions", command: "eval $(mtpcli completions bash mytool)" },
+        { description: "Install zsh completions", command: "eval $(mtpcli completions zsh mytool)" },
+        { description: "Install fish completions", command: "mtpcli completions fish mytool | source" }
+      ]
+    }
+  }
 };
+withDescribe(program2, describeOptions);
+try {
+  await program2.parseAsync(process.argv);
+} catch (e) {
+  process.stderr.write(`error: ${e instanceof Error ? e.message : e}
+`);
+  process.exit(1);
+}