@modeltoolsprotocol/mtpcli 1.2.0 → 1.3.1

package/dist/index.js

@@ -6088,6 +6088,200 @@ var init_zod = __esm(() => {
   init_external();
 });
 
+// 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()
+  });
+  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(),
+    required: exports_external.boolean().default(false),
+    default: exports_external.any().optional(),
+    values: exports_external.array(exports_external.string()).optional()
+  });
+  CommandAuthSchema = exports_external.object({
+    required: exports_external.boolean().default(false),
+    scopes: exports_external.array(exports_external.string()).optional()
+  });
+  CommandDescriptorSchema = exports_external.object({
+    name: exports_external.string(),
+    description: exports_external.string(),
+    args: exports_external.array(ArgDescriptorSchema).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({
+    specVersion: exports_external.string(),
+    name: exports_external.string(),
+    version: exports_external.string(),
+    description: exports_external.string(),
+    auth: AuthConfigSchema.optional(),
+    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) {
@@ -6421,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 };
@@ -6428,65 +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, MTP_SPEC_VERSION2 = "2026-02-07", ToolSchemaSchema2, StoredTokenSchema2, JsonRpcErrorSchema2, JsonRpcRequestSchema2, JsonRpcResponseSchema2, McpToolDefSchema2;
+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({
-    specVersion: exports_external.string(),
-    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(),
@@ -6495,24 +6641,24 @@ var init_models = __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()
@@ -6576,7 +6722,7 @@ async function getToolSchema(toolName) {
     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;
   }
@@ -6599,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;
@@ -7328,7 +7474,7 @@ async function getToolSchema2(toolName) {
     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;
   }
@@ -8678,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);
         }
@@ -8697,7 +8843,7 @@ var init_mcp = __esm(() => {
 });
 
 // src/version.ts
-var VERSION2 = "1.2.0";
+var VERSION2 = "1.3.1";
 
 // src/serve.ts
 var exports_serve = {};
@@ -8966,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}
@@ -9794,7 +9940,7 @@ function parseHeaders(raw) {
   }
   return headers;
 }
-async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [], rawHeaders = [], clientId) {
+async function run2(serverCmd, serverUrl, toolName, toolArgs = [], rawHeaders = [], clientId) {
   let client;
   let serverName;
   if (serverUrl) {
@@ -9813,13 +9959,13 @@ async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [],
     const mcpTools = await client.listTools();
     const commands = mcpTools.map(mcpToolToCommand);
     const schema = {
-      specVersion: MTP_SPEC_VERSION2,
+      specVersion: MTP_SPEC_VERSION,
       name: serverName,
       version: "0.1.0",
       description: `CLI wrapper for MCP server: ${serverName}`,
       commands
     };
-    if (describeMode || !toolName) {
+    if (!toolName) {
       console.log(JSON.stringify(schema, null, 2));
       return;
     }
@@ -9886,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({
@@ -10022,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 {}
   }
@@ -10487,483 +10633,28 @@ var {
   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;
+// 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);
+  });
+  return program2;
 }
 
 // src/version.ts
-var VERSION = "1.2.0";
+var VERSION = "1.3.1";
 
 // src/index.ts
-function selfDescribe() {
-  const schema = {
-    specVersion: MTP_SPEC_VERSION,
-    name: "mtpcli",
-    version: VERSION,
-    description: "Unified CLI for discovering, authenticating, and bridging --mtp-describe-compatible tools",
-    commands: [
-      {
-        name: "search",
-        description: "Search across --mtp-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 --mtp-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 --mtp-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: "--mtp-describe",
-            type: "boolean",
-            description: "Output --mtp-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" --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"
-          }
-        ]
-      },
-      {
-        name: "validate",
-        description: "Validate a tool's --mtp-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 --mtp-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 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();
-});
+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);
@@ -11111,7 +10802,7 @@ Multiple tools can be combined into a single MCP server:
   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) => {
+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)").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
 `);
@@ -11133,7 +10824,7 @@ program2.command("wrap").description("Wrap an MCP server as a CLI tool (mcp2cli
     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 run5(opts.server, opts.url, toolName, args, opts.header ?? [], opts.clientId);
 });
 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));
@@ -11147,6 +10838,83 @@ program2.command("completions").description("Generate shell completions from --m
   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"' },
+        { 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" },
+        { 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modeltoolsprotocol/mtpcli",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {
@@ -17,6 +17,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "@modeltoolsprotocol/sdk": "^0.4.0",
     "commander": "^14.0.0",
     "jaro-winkler": "^0.2.8",
     "open": "^11.0.0",