@modeltoolsprotocol/mtpcli 0.3.1 → 0.3.3

package/README.md

@@ -20,7 +20,7 @@ LLM agents need to discover and use tools. Right now there are two worlds:
 | **Scriptable without an LLM** | Yes, that's the whole point of CLIs | Not really, designed for LLM interaction |
 | **Adoption cost** | One flag/decorator | New protocol, server scaffolding, SDK |
 
-The gap is discovery. `mtpcli` fills it.
+The gap for CLIs is discovery. `mtpcli` fills it.
 
 ## Install
 

package/dist/index.js

@@ -27,6 +27,7 @@ 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
@@ -2122,6 +2123,25 @@ 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;
@@ -6088,6 +6108,119 @@ var init_zod = __esm(() => {
   init_external();
 });
 
+// src/models.ts
+function cleanJson(obj) {
+  if (obj === null || obj === undefined)
+    return;
+  if (Array.isArray(obj)) {
+    return obj.map(cleanJson);
+  }
+  if (typeof obj === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(obj)) {
+      if (v === undefined)
+        continue;
+      if (Array.isArray(v) && v.length === 0)
+        continue;
+      const cleaned = cleanJson(v);
+      if (cleaned !== undefined) {
+        out[k] = cleaned;
+      }
+    }
+    return out;
+  }
+  return obj;
+}
+var ExampleSchema, ArgSchema, IoDescriptorSchema, CommandAuthSchema, CommandSchema, AuthProviderSchema, AuthConfigSchema, ToolSchemaSchema, StoredTokenSchema, JsonRpcErrorSchema, JsonRpcRequestSchema, JsonRpcResponseSchema, McpToolDefSchema;
+var init_models = __esm(() => {
+  init_zod();
+  ExampleSchema = exports_external.object({
+    description: exports_external.string().optional(),
+    command: exports_external.string(),
+    output: exports_external.string().optional()
+  });
+  ArgSchema = exports_external.object({
+    name: exports_external.string(),
+    type: exports_external.string(),
+    description: exports_external.string().optional(),
+    required: exports_external.boolean().default(false),
+    default: exports_external.any().optional(),
+    values: exports_external.array(exports_external.string()).optional()
+  });
+  IoDescriptorSchema = exports_external.object({
+    contentType: exports_external.string().optional(),
+    description: exports_external.string().optional(),
+    schema: exports_external.any().optional()
+  });
+  CommandAuthSchema = exports_external.object({
+    required: exports_external.boolean().default(false),
+    scopes: exports_external.array(exports_external.string()).optional()
+  });
+  CommandSchema = exports_external.object({
+    name: exports_external.string(),
+    description: exports_external.string(),
+    args: exports_external.array(ArgSchema).default([]),
+    stdin: IoDescriptorSchema.optional(),
+    stdout: IoDescriptorSchema.optional(),
+    examples: exports_external.array(ExampleSchema).default([]),
+    auth: CommandAuthSchema.optional()
+  });
+  AuthProviderSchema = exports_external.object({
+    id: exports_external.string(),
+    type: exports_external.string(),
+    displayName: exports_external.string().optional(),
+    authorizationUrl: exports_external.string().optional(),
+    tokenUrl: exports_external.string().optional(),
+    scopes: exports_external.array(exports_external.string()).optional(),
+    clientId: exports_external.string().optional(),
+    registrationUrl: exports_external.string().optional(),
+    instructions: exports_external.string().optional()
+  });
+  AuthConfigSchema = exports_external.object({
+    required: exports_external.boolean().default(false),
+    envVar: exports_external.string(),
+    providers: exports_external.array(AuthProviderSchema)
+  });
+  ToolSchemaSchema = exports_external.object({
+    name: exports_external.string(),
+    version: exports_external.string(),
+    description: exports_external.string(),
+    auth: AuthConfigSchema.optional(),
+    commands: exports_external.array(CommandSchema)
+  });
+  StoredTokenSchema = exports_external.object({
+    access_token: exports_external.string(),
+    token_type: exports_external.string().optional(),
+    refresh_token: exports_external.string().optional(),
+    expires_at: exports_external.string().optional(),
+    scopes: exports_external.array(exports_external.string()).optional(),
+    provider_id: exports_external.string(),
+    created_at: exports_external.string()
+  });
+  JsonRpcErrorSchema = exports_external.object({
+    code: exports_external.number(),
+    message: exports_external.string(),
+    data: exports_external.any().optional()
+  });
+  JsonRpcRequestSchema = exports_external.object({
+    jsonrpc: exports_external.string(),
+    id: exports_external.any().optional(),
+    method: exports_external.string(),
+    params: exports_external.any().default({})
+  });
+  JsonRpcResponseSchema = exports_external.object({
+    jsonrpc: exports_external.string(),
+    id: exports_external.any().optional(),
+    result: exports_external.any().optional(),
+    error: JsonRpcErrorSchema.optional()
+  });
+  McpToolDefSchema = exports_external.object({
+    name: exports_external.string(),
+    description: exports_external.string(),
+    inputSchema: exports_external.any()
+  });
+});
+
 // node_modules/jaro-winkler/index.js
 var require_jaro_winkler = __commonJS((exports, module) => {
   (function(root) {
@@ -6429,7 +6562,7 @@ 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_models = __esm(() => {
+var init_models2 = __esm(() => {
   init_zod();
   ExampleSchema2 = exports_external.object({
     description: exports_external.string().optional(),
@@ -6678,7 +6811,7 @@ async function loadSchemas(toolNames) {
 }
 var import_jaro_winkler, import_which, execFileAsync;
 var init_search = __esm(() => {
-  init_models();
+  init_models2();
   import_jaro_winkler = __toESM(require_jaro_winkler(), 1);
   import_which = __toESM(require_lib(), 1);
   execFileAsync = promisify(execFile);
@@ -7334,7 +7467,7 @@ async function getToolSchema2(toolName) {
 }
 var import_jaro_winkler2, import_which2, execFileAsync6;
 var init_search2 = __esm(() => {
-  init_models();
+  init_models2();
   import_jaro_winkler2 = __toESM(require_jaro_winkler(), 1);
   import_which2 = __toESM(require_lib(), 1);
   execFileAsync6 = promisify8(execFile8);
@@ -8692,7 +8825,7 @@ function readResponse(rl) {
   });
 }
 var init_mcp = __esm(() => {
-  init_models();
+  init_models2();
 });
 
 // src/serve.ts
@@ -8738,7 +8871,7 @@ function argToJsonSchema(arg) {
   return schema;
 }
 function commandToMcpTool(toolName, cmd) {
-  const mcpName = cmd.name === "_root" ? toolName : `${toolName}__${cmd.name}`;
+  const mcpName = cmd.name === "_root" ? toolName : `${toolName}__${cmd.name.replace(/ /g, "_")}`;
   const properties = {};
   const required = [];
   for (const arg of cmd.args) {
@@ -8772,7 +8905,7 @@ function commandToMcpTool(toolName, cmd) {
 function buildCliCommand(toolName, commandName, arguments_, commandSchema) {
   const cmd = [toolName];
   if (commandName !== "_root")
-    cmd.push(commandName);
+    cmd.push(...commandName.split(" "));
   const argSchemas = new Map;
   for (const a of commandSchema.args) {
     argSchemas.set(a.name.replace(/^-+/, ""), a);
@@ -8826,29 +8959,57 @@ function invokeCliTool(toolName, commandName, arguments_, commandSchema, authEnv
       stdio: [stdinStr !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
       env: { ...process.env, ...authEnv }
     });
+    const timer = setTimeout(() => {
+      child.kill();
+      resolve({
+        content: [{ type: "text", text: `Error: tool timed out after ${TOOL_TIMEOUT_MS / 1000}s` }],
+        isError: true
+      });
+    }, TOOL_TIMEOUT_MS);
     if (stdinStr !== undefined && child.stdin) {
       child.stdin.write(stdinStr);
       child.stdin.end();
     }
     let stdout = "";
     let stderr = "";
-    child.stdout?.on("data", (d) => stdout += d);
-    child.stderr?.on("data", (d) => stderr += d);
+    let stdoutBytes = 0;
+    let stderrBytes = 0;
+    let truncated = false;
+    child.stdout?.on("data", (d) => {
+      stdoutBytes += d.length;
+      if (stdoutBytes <= MAX_OUTPUT_BYTES) {
+        stdout += d;
+      } else if (!truncated) {
+        truncated = true;
+        child.kill();
+      }
+    });
+    child.stderr?.on("data", (d) => {
+      stderrBytes += d.length;
+      if (stderrBytes <= MAX_OUTPUT_BYTES) {
+        stderr += d;
+      }
+    });
     child.on("error", (e) => {
+      clearTimeout(timer);
       resolve({
         content: [{ type: "text", text: `Error: ${e.message}` }],
         isError: true
       });
     });
     child.on("close", (code) => {
+      clearTimeout(timer);
       const content = [];
+      if (truncated) {
+        content.push({ type: "text", text: `[truncated: output exceeded ${MAX_OUTPUT_BYTES / 1024 / 1024}MB]` });
+      }
       if (stdout.trim())
         content.push({ type: "text", text: stdout.trim() });
       if (stderr.trim())
         content.push({ type: "text", text: `[stderr] ${stderr.trim()}` });
       if (content.length === 0)
         content.push({ type: "text", text: "(no output)" });
-      resolve({ content, isError: code !== 0 });
+      resolve({ content, isError: code !== 0 || truncated });
     });
   });
 }
@@ -8948,13 +9109,15 @@ async function run(toolNames) {
     }
   }
 }
-var execFileAsync7, VERSION = "0.1.0";
-var init_serve = __esm(() => {
+var execFileAsync7, TOOL_TIMEOUT_MS = 60000, MAX_OUTPUT_BYTES;
+var init_serve = __esm(async () => {
   init_auth();
   init_mcp();
-  init_models();
+  init_models2();
   init_search2();
+  await init_src();
   execFileAsync7 = promisify9(execFile9);
+  MAX_OUTPUT_BYTES = 1024 * 1024 * 1024;
 });
 
 // src/mcp-oauth.ts
@@ -9521,7 +9684,7 @@ class McpClient {
     client.sendRequest("initialize", {
       protocolVersion: "2024-11-05",
       capabilities: {},
-      clientInfo: { name: "mtpcli-wrap", version: VERSION2 }
+      clientInfo: { name: "mtpcli-wrap", version: VERSION }
     });
     await client.readResponse();
     client.sendNotification("notifications/initialized", {});
@@ -9582,7 +9745,7 @@ class HttpMcpClient {
     const initResult = await client.sendRequest("initialize", {
       protocolVersion: "2025-11-25",
       capabilities: {},
-      clientInfo: { name: "mtpcli-wrap", version: VERSION2 }
+      clientInfo: { name: "mtpcli-wrap", version: VERSION }
     });
     client.protocolVersion = initResult.protocolVersion ?? "2025-11-25";
     await client.sendNotification("notifications/initialized", {});
@@ -9824,9 +9987,9 @@ async function run2(serverCmd, serverUrl, describeMode, toolName, toolArgs = [],
     client.stop();
   }
 }
-var VERSION2 = "0.1.0";
-var init_wrap = __esm(() => {
+var init_wrap = __esm(async () => {
   init_mcp();
+  await init_src();
 });
 
 // src/validate.ts
@@ -10050,7 +10213,7 @@ function printHuman(result) {
 }
 var import_which3, execFileAsync8, VALID_ARG_TYPES;
 var init_validate = __esm(() => {
-  init_models();
+  init_models2();
   import_which3 = __toESM(require_lib(), 1);
   execFileAsync8 = promisify10(execFile10);
   VALID_ARG_TYPES = new Set([
@@ -10437,138 +10600,11 @@ var init_completions = __esm(() => {
   init_search2();
 });
 
-// node_modules/commander/esm.mjs
-var import__ = __toESM(require_commander(), 1);
-var {
-  program,
-  createCommand,
-  createArgument,
-  createOption,
-  CommanderError,
-  InvalidArgumentError,
-  InvalidOptionArgumentError,
-  Command,
-  Argument,
-  Option,
-  Help
-} = import__.default;
-
-// src/models.ts
-init_zod();
-var ExampleSchema = exports_external.object({
-  description: exports_external.string().optional(),
-  command: exports_external.string(),
-  output: exports_external.string().optional()
-});
-var ArgSchema = exports_external.object({
-  name: exports_external.string(),
-  type: exports_external.string(),
-  description: exports_external.string().optional(),
-  required: exports_external.boolean().default(false),
-  default: exports_external.any().optional(),
-  values: exports_external.array(exports_external.string()).optional()
-});
-var IoDescriptorSchema = exports_external.object({
-  contentType: exports_external.string().optional(),
-  description: exports_external.string().optional(),
-  schema: exports_external.any().optional()
-});
-var CommandAuthSchema = exports_external.object({
-  required: exports_external.boolean().default(false),
-  scopes: exports_external.array(exports_external.string()).optional()
-});
-var CommandSchema = exports_external.object({
-  name: exports_external.string(),
-  description: exports_external.string(),
-  args: exports_external.array(ArgSchema).default([]),
-  stdin: IoDescriptorSchema.optional(),
-  stdout: IoDescriptorSchema.optional(),
-  examples: exports_external.array(ExampleSchema).default([]),
-  auth: CommandAuthSchema.optional()
-});
-var AuthProviderSchema = exports_external.object({
-  id: exports_external.string(),
-  type: exports_external.string(),
-  displayName: exports_external.string().optional(),
-  authorizationUrl: exports_external.string().optional(),
-  tokenUrl: exports_external.string().optional(),
-  scopes: exports_external.array(exports_external.string()).optional(),
-  clientId: exports_external.string().optional(),
-  registrationUrl: exports_external.string().optional(),
-  instructions: exports_external.string().optional()
-});
-var AuthConfigSchema = exports_external.object({
-  required: exports_external.boolean().default(false),
-  envVar: exports_external.string(),
-  providers: exports_external.array(AuthProviderSchema)
-});
-var ToolSchemaSchema = exports_external.object({
-  name: exports_external.string(),
-  version: exports_external.string(),
-  description: exports_external.string(),
-  auth: AuthConfigSchema.optional(),
-  commands: exports_external.array(CommandSchema)
-});
-var StoredTokenSchema = exports_external.object({
-  access_token: exports_external.string(),
-  token_type: exports_external.string().optional(),
-  refresh_token: exports_external.string().optional(),
-  expires_at: exports_external.string().optional(),
-  scopes: exports_external.array(exports_external.string()).optional(),
-  provider_id: exports_external.string(),
-  created_at: exports_external.string()
-});
-var JsonRpcErrorSchema = exports_external.object({
-  code: exports_external.number(),
-  message: exports_external.string(),
-  data: exports_external.any().optional()
-});
-var JsonRpcRequestSchema = exports_external.object({
-  jsonrpc: exports_external.string(),
-  id: exports_external.any().optional(),
-  method: exports_external.string(),
-  params: exports_external.any().default({})
-});
-var JsonRpcResponseSchema = exports_external.object({
-  jsonrpc: exports_external.string(),
-  id: exports_external.any().optional(),
-  result: exports_external.any().optional(),
-  error: JsonRpcErrorSchema.optional()
-});
-var McpToolDefSchema = exports_external.object({
-  name: exports_external.string(),
-  description: exports_external.string(),
-  inputSchema: exports_external.any()
-});
-function cleanJson(obj) {
-  if (obj === null || obj === undefined)
-    return;
-  if (Array.isArray(obj)) {
-    return obj.map(cleanJson);
-  }
-  if (typeof obj === "object") {
-    const out = {};
-    for (const [k, v] of Object.entries(obj)) {
-      if (v === undefined)
-        continue;
-      if (Array.isArray(v) && v.length === 0)
-        continue;
-      const cleaned = cleanJson(v);
-      if (cleaned !== undefined) {
-        out[k] = cleaned;
-      }
-    }
-    return out;
-  }
-  return obj;
-}
-
 // src/index.ts
-var VERSION3 = "0.3.1";
 function selfDescribe() {
   const schema = {
     name: "mtpcli",
-    version: VERSION3,
+    version: VERSION,
     description: "Unified CLI for discovering, authenticating, and bridging --describe-compatible tools",
     commands: [
       {
@@ -10918,122 +10954,126 @@ function selfDescribe() {
   };
   console.log(JSON.stringify(cleanJson(schema), null, 2));
 }
-var program2 = new Command().name("mtpcli").version(VERSION3).description("Unified CLI for discovering, authenticating, and bridging --describe-compatible tools").option("--describe", "Print self-describing JSON (mtpcli spec)").action(async (opts) => {
-  if (opts.describe) {
-    selfDescribe();
-    return;
-  }
-  program2.help();
-});
-program2.command("search").description("Search across --describe-compatible tools").argument("<query>", "Search query").option("--json", "Output as JSON", false).option("--scan-path", "Scan PATH for --describe-compatible tools", false).option("--jobs <n>", "Number of parallel jobs for --scan-path", "16").argument("[tools...]", "Tool names to search (after --)").action(async (query, tools, opts) => {
-  const { search: search2, loadSchemas: loadSchemas2, scanPath: scanPath2 } = await Promise.resolve().then(() => (init_search(), exports_search));
-  const schemas = opts.scanPath ? await scanPath2(parseInt(opts.jobs, 10)) : await loadSchemas2(tools);
-  if (schemas.length === 0) {
-    process.stderr.write(`no tools found. Try: mtpcli search --scan-path "query"
+var VERSION = "0.3.3", program2, authCmd;
+var init_src = __esm(async () => {
+  init_esm();
+  init_models();
+  program2 = new Command().name("mtpcli").version(VERSION).description("Unified CLI for discovering, authenticating, and bridging --describe-compatible tools").option("--describe", "Print self-describing JSON (mtpcli spec)").action(async (opts) => {
+    if (opts.describe) {
+      selfDescribe();
+      return;
+    }
+    program2.help();
+  });
+  program2.command("search").description("Search across --describe-compatible tools").argument("<query>", "Search query").option("--json", "Output as JSON", false).option("--scan-path", "Scan PATH for --describe-compatible tools", false).option("--jobs <n>", "Number of parallel jobs for --scan-path", "16").argument("[tools...]", "Tool names to search (after --)").action(async (query, tools, opts) => {
+    const { search: search2, loadSchemas: loadSchemas2, scanPath: scanPath2 } = await Promise.resolve().then(() => (init_search(), exports_search));
+    const schemas = opts.scanPath ? await scanPath2(parseInt(opts.jobs, 10)) : await loadSchemas2(tools);
+    if (schemas.length === 0) {
+      process.stderr.write(`no tools found. Try: mtpcli search --scan-path "query"
 `);
-    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}`);
+      return;
     }
-  }
-});
-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)
+    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;
+    }
+    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;
     }
-    return;
-  }
-  if (!tool) {
-    process.stderr.write(`error: tool name is required (or use --url)
+    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):
 
@@ -11051,8 +11091,8 @@ Any CLI tool on your PATH that supports --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:
 
 ` + `  {
@@ -11067,51 +11107,57 @@ Multiple tools can be combined into a single MCP server:
 
 ` + `Run 'mtpcli serve --help' for more details.
 `);
-    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("--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);
+    }
+    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);
+    }
+    if (!opts.server && !opts.url) {
+      process.stderr.write(`error: one of --server or --url is required
 `);
-    process.exit(1);
-  }
-  if (opts.header && !opts.url) {
-    process.stderr.write(`error: --header requires --url
+      process.exit(1);
+    }
+    if (opts.header && !opts.url) {
+      process.stderr.write(`error: --header requires --url
 `);
-    process.exit(1);
-  }
-  if (opts.clientId && !opts.url) {
-    process.stderr.write(`error: --client-id requires --url
+      process.exit(1);
+    }
+    if (opts.clientId && !opts.url) {
+      process.stderr.write(`error: --client-id 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);
   }
-  const { run: run5 } = await Promise.resolve().then(() => (init_wrap(), 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);
-}
+await init_src();
+
+export {
+  VERSION
+};

package/package.json

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