mcp-caller 0.0.3 → 0.0.5

package/README.md

@@ -48,6 +48,24 @@ Read JSON from files instead of inline values:
 npx -y mcp-caller --server-file server.json --call-file call.json
 ```
 
+Short call form:
+
+```bash
+npx -y mcp-caller --server-file server.json --tool say_hello --params-json '{"name":"world"}'
+```
+
+List callable tools:
+
+```bash
+npx -y mcp-caller --server-file server.json --list-tools
+```
+
+Inspect tools, prompts, and resources:
+
+```bash
+npx -y mcp-caller --server-file server.json --inspect --pretty
+```
+
 ## JSON Shapes
 
 Server JSON:

package/index.js

@@ -7,6 +7,9 @@ import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/
 
 function printUsage() {
   console.error(`Usage:
+  mcp-caller --server-json <json> --list-tools
+  mcp-caller --server-json <json> --inspect
+  mcp-caller --server-json <json> --tool <name> [--params-json <json>]
   mcp-caller --server-json <json> --call-json <json>
   mcp-caller --server-file <path> --call-file <path>
 
@@ -57,6 +60,16 @@ function readSource(options, jsonKey, fileKey, label) {
   throw new Error(`Missing ${label}`);
 }
 
+function readParams(options) {
+  if (options.paramsFile) {
+    return parseJson(readFileSync(options.paramsFile, "utf8"), "--params-json/--params-file");
+  }
+  if (options.paramsJson) {
+    return parseJson(options.paramsJson, "--params-json/--params-file");
+  }
+  return {};
+}
+
 function parseArgs(argv) {
   const options = {};
   for (let i = 0; i < argv.length; i += 1) {
@@ -81,6 +94,26 @@ function parseArgs(argv) {
       options.callFile = argv[++i];
       continue;
     }
+    if (token === "--tool") {
+      options.tool = argv[++i];
+      continue;
+    }
+    if (token === "--params-json") {
+      options.paramsJson = argv[++i];
+      continue;
+    }
+    if (token === "--params-file") {
+      options.paramsFile = argv[++i];
+      continue;
+    }
+    if (token === "--list-tools") {
+      options.listTools = true;
+      continue;
+    }
+    if (token === "--inspect") {
+      options.inspect = true;
+      continue;
+    }
     if (token === "--server-name") {
       options.serverName = argv[++i];
       continue;
@@ -153,6 +186,31 @@ function extractText(result) {
   return pieces.join("\n");
 }
 
+function printTools(tools) {
+  for (const tool of tools) {
+    console.log(`- ${tool.name}${tool.description ? `: ${tool.description}` : ""}`);
+  }
+}
+
+function formatInspect(serverName, tools, prompts, resources) {
+  return {
+    server: serverName,
+    tools: tools.map((tool) => ({
+      name: tool.name,
+      description: tool.description ?? ""
+    })),
+    prompts: prompts.map((prompt) => ({
+      name: prompt.name,
+      description: prompt.description ?? ""
+    })),
+    resources: resources.map((resource) => ({
+      uri: resource.uri,
+      name: resource.name ?? "",
+      description: resource.description ?? ""
+    }))
+  };
+}
+
 async function main() {
   const options = parseArgs(process.argv.slice(2));
   if (options.help) {
@@ -161,13 +219,30 @@ async function main() {
   }
 
   const serverSource = readSource(options, "serverJson", "serverFile", "--server-json/--server-file");
-  const callSource = readSource(options, "callJson", "callFile", "--call-json/--call-file");
-
-  if (!callSource || typeof callSource !== "object") {
-    throw new Error("Call JSON must be an object");
+  if (options.tool && (options.callJson || options.callFile)) {
+    throw new Error("Use either --tool/--params-json or --call-json/--call-file, not both");
   }
-  if (typeof callSource.tool !== "string" || !callSource.tool) {
-    throw new Error('Call JSON must include a non-empty "tool" string');
+  if (options.tool && options.tool.trim().length === 0) {
+    throw new Error('Option "--tool" must be a non-empty string');
+  }
+
+  const shorthandCall = options.tool
+    ? {
+        tool: options.tool,
+        params: readParams(options)
+      }
+    : null;
+  const callSource = options.listTools || options.inspect
+    ? null
+    : shorthandCall ?? readSource(options, "callJson", "callFile", "--call-json/--call-file");
+
+  if (callSource) {
+    if (typeof callSource !== "object") {
+      throw new Error("Call JSON must be an object");
+    }
+    if (typeof callSource.tool !== "string" || !callSource.tool) {
+      throw new Error('Call JSON must include a non-empty "tool" string');
+    }
   }
 
   const { server } = resolveServerDefinition(serverSource, options.serverName);
@@ -177,18 +252,49 @@ async function main() {
   try {
     await client.connect(transport);
 
-    const result = await client.callTool({
-      name: callSource.tool,
-      arguments: callSource.params ?? callSource.arguments ?? {}
-    });
+    if (options.listTools || options.inspect) {
+      const [toolsResult, promptsResult, resourcesResult] = await Promise.all([
+        client.listTools(),
+        options.inspect ? client.listPrompts() : Promise.resolve({ prompts: [] }),
+        options.inspect ? client.listResources() : Promise.resolve({ resources: [] })
+      ]);
 
-    const text = extractText(result);
-    if (text) {
-      console.log(text);
+      if (options.listTools) {
+        printTools(toolsResult.tools ?? []);
+        return;
+      }
+
+      console.log(JSON.stringify(
+        formatInspect(
+          options.serverName ?? (serverSource?.mcpServers ? Object.keys(serverSource.mcpServers)[0] : "server"),
+          toolsResult.tools ?? [],
+          promptsResult.prompts ?? [],
+          resourcesResult.resources ?? []
+        ),
+        null,
+        options.pretty ? 2 : 0
+      ));
       return;
     }
 
-    console.log(JSON.stringify(result, null, options.pretty ? 2 : 0));
+    if (!options.listTools && !options.inspect && !callSource) {
+      throw new Error("Missing --call-json/--call-file, or use --list-tools / --inspect");
+    }
+
+    if (callSource) {
+      const result = await client.callTool({
+        name: callSource.tool,
+        arguments: callSource.params ?? callSource.arguments ?? {}
+      });
+
+      const text = extractText(result);
+      if (text) {
+        console.log(text);
+        return;
+      }
+
+      console.log(JSON.stringify(result, null, options.pretty ? 2 : 0));
+    }
   } finally {
     await client.close().catch(() => {});
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-caller",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A small MCP client CLI that can start a server and call a tool from JSON input.",
   "type": "module",
   "main": "index.js",