@bryan-thompson/inspector-assessment-cli 1.4.0 → 1.5.0

package/build/client/prompts.js

@@ -1,7 +1,8 @@
 // List available prompts
-export async function listPrompts(client) {
+export async function listPrompts(client, metadata) {
     try {
-        const response = await client.listPrompts();
+        const params = metadata && Object.keys(metadata).length > 0 ? { _meta: metadata } : {};
+        const response = await client.listPrompts(params);
         return response;
     }
     catch (error) {
@@ -9,7 +10,7 @@ export async function listPrompts(client) {
     }
 }
 // Get a prompt
-export async function getPrompt(client, name, args) {
+export async function getPrompt(client, name, args, metadata) {
     try {
         // Convert all arguments to strings for prompt arguments
         const stringArgs = {};
@@ -26,10 +27,14 @@ export async function getPrompt(client, name, args) {
                 }
             }
         }
-        const response = await client.getPrompt({
+        const params = {
             name,
             arguments: stringArgs,
-        });
+        };
+        if (metadata && Object.keys(metadata).length > 0) {
+            params._meta = metadata;
+        }
+        const response = await client.getPrompt(params);
         return response;
     }
     catch (error) {

package/build/client/resources.js

@@ -1,7 +1,8 @@
 // List available resources
-export async function listResources(client) {
+export async function listResources(client, metadata) {
     try {
-        const response = await client.listResources();
+        const params = metadata && Object.keys(metadata).length > 0 ? { _meta: metadata } : {};
+        const response = await client.listResources(params);
         return response;
     }
     catch (error) {
@@ -9,9 +10,13 @@ export async function listResources(client) {
     }
 }
 // Read a resource
-export async function readResource(client, uri) {
+export async function readResource(client, uri, metadata) {
     try {
-        const response = await client.readResource({ uri });
+        const params = { uri };
+        if (metadata && Object.keys(metadata).length > 0) {
+            params._meta = metadata;
+        }
+        const response = await client.readResource(params);
         return response;
     }
     catch (error) {
@@ -19,9 +24,10 @@ export async function readResource(client, uri) {
     }
 }
 // List resource templates
-export async function listResourceTemplates(client) {
+export async function listResourceTemplates(client, metadata) {
     try {
-        const response = await client.listResourceTemplates();
+        const params = metadata && Object.keys(metadata).length > 0 ? { _meta: metadata } : {};
+        const response = await client.listResourceTemplates(params);
         return response;
     }
     catch (error) {

package/build/client/tools.js

@@ -1,6 +1,7 @@
-export async function listTools(client) {
+export async function listTools(client, metadata) {
     try {
-        const response = await client.listTools();
+        const params = metadata && Object.keys(metadata).length > 0 ? { _meta: metadata } : {};
+        const response = await client.listTools(params);
         return response;
     }
     catch (error) {
@@ -42,9 +43,9 @@ function convertParameters(tool, params) {
     }
     return result;
 }
-export async function callTool(client, name, args) {
+export async function callTool(client, name, args, generalMetadata, toolSpecificMetadata) {
     try {
-        const toolsResponse = await listTools(client);
+        const toolsResponse = await listTools(client, generalMetadata);
         const tools = toolsResponse.tools;
         const tool = tools.find((t) => t.name === name);
         let convertedArgs = args;
@@ -62,9 +63,21 @@ export async function callTool(client, name, args) {
                 convertedArgs = { ...args, ...convertedStringArgs };
             }
         }
+        // Merge general metadata with tool-specific metadata
+        // Tool-specific metadata takes precedence over general metadata
+        let mergedMetadata;
+        if (generalMetadata || toolSpecificMetadata) {
+            mergedMetadata = {
+                ...(generalMetadata || {}),
+                ...(toolSpecificMetadata || {}),
+            };
+        }
         const response = await client.callTool({
             name: name,
             arguments: convertedArgs,
+            _meta: mergedMetadata && Object.keys(mergedMetadata).length > 0
+                ? mergedMetadata
+                : undefined,
         });
         return response;
     }

package/build/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
+import * as fs from "fs";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { Command } from "commander";
 import { callTool, connect, disconnect, getPrompt, listPrompts, listResources, listResourceTemplates, listTools, readResource, setLoggingLevel, validLogLevels, } from "./client/index.js";
 import { handleError } from "./error-handler.js";
 import { createTransport } from "./transport.js";
 import { awaitableLog } from "./utils/awaitable-log.js";
-import packageJson from "../package.json" with { type: "json" };
 function createTransportOptions(target, transport, headers) {
     if (target.length === 0) {
         throw new Error("Target is required. Specify a URL or a command to execute.");
@@ -52,6 +52,14 @@ function createTransportOptions(target, transport, headers) {
     };
 }
 async function callMethod(args) {
+    // Read package.json to get name and version for client identity
+    const pathA = "../package.json"; // We're in package @modelcontextprotocol/inspector-cli
+    const pathB = "../../package.json"; // We're in package @modelcontextprotocol/inspector
+    let packageJson;
+    let packageJsonData = await import(fs.existsSync(pathA) ? pathA : pathB, {
+        with: { type: "json" },
+    });
+    packageJson = packageJsonData.default;
     const transportOptions = createTransportOptions(args.target, args.transport, args.headers);
     const transport = createTransport(transportOptions);
     const [, name = packageJson.name] = packageJson.name.split("/");
@@ -63,36 +71,36 @@ async function callMethod(args) {
         let result;
         // Tools methods
         if (args.method === "tools/list") {
-            result = await listTools(client);
+            result = await listTools(client, args.metadata);
         }
         else if (args.method === "tools/call") {
             if (!args.toolName) {
                 throw new Error("Tool name is required for tools/call method. Use --tool-name to specify the tool name.");
             }
-            result = await callTool(client, args.toolName, args.toolArg || {});
+            result = await callTool(client, args.toolName, args.toolArg || {}, args.metadata, args.toolMeta);
         }
         // Resources methods
         else if (args.method === "resources/list") {
-            result = await listResources(client);
+            result = await listResources(client, args.metadata);
         }
         else if (args.method === "resources/read") {
             if (!args.uri) {
                 throw new Error("URI is required for resources/read method. Use --uri to specify the resource URI.");
             }
-            result = await readResource(client, args.uri);
+            result = await readResource(client, args.uri, args.metadata);
         }
         else if (args.method === "resources/templates/list") {
-            result = await listResourceTemplates(client);
+            result = await listResourceTemplates(client, args.metadata);
         }
         // Prompts methods
         else if (args.method === "prompts/list") {
-            result = await listPrompts(client);
+            result = await listPrompts(client, args.metadata);
         }
         else if (args.method === "prompts/get") {
             if (!args.promptName) {
                 throw new Error("Prompt name is required for prompts/get method. Use --prompt-name to specify the prompt name.");
             }
-            result = await getPrompt(client, args.promptName, args.promptArgs || {});
+            result = await getPrompt(client, args.promptName, args.promptArgs || {}, args.metadata);
         }
         // Logging methods
         else if (args.method === "logging/setLevel") {
@@ -199,7 +207,12 @@ function parseArgs() {
         //
         // HTTP headers
         //
-        .option("--header <headers...>", 'HTTP headers as "HeaderName: Value" pairs (for HTTP/SSE transports)', parseHeaderPair, {});
+        .option("--header <headers...>", 'HTTP headers as "HeaderName: Value" pairs (for HTTP/SSE transports)', parseHeaderPair, {})
+        //
+        // Metadata options
+        //
+        .option("--metadata <pairs...>", "General metadata as key=value pairs (applied to all methods)", parseKeyValuePair, {})
+        .option("--tool-metadata <pairs...>", "Tool-specific metadata as key=value pairs (for tools/call method only)", parseKeyValuePair, {});
     // Parse only the arguments before --
     program.parse(preArgs);
     const options = program.opts();
@@ -213,6 +226,18 @@ function parseArgs() {
         target: finalArgs,
         ...options,
         headers: options.header, // commander.js uses 'header' field, map to 'headers'
+        metadata: options.metadata
+            ? Object.fromEntries(Object.entries(options.metadata).map(([key, value]) => [
+                key,
+                String(value),
+            ]))
+            : undefined,
+        toolMeta: options.toolMetadata
+            ? Object.fromEntries(Object.entries(options.toolMetadata).map(([key, value]) => [
+                key,
+                String(value),
+            ]))
+            : undefined,
     };
 }
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bryan-thompson/inspector-assessment-cli",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "CLI for the Enhanced MCP Inspector with assessment capabilities",
   "license": "MIT",
   "author": "Bryan Thompson <bryan@triepod.ai>",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.18.0",
+    "@modelcontextprotocol/sdk": "^1.23.0",
     "commander": "^13.1.0",
     "spawn-rx": "^5.1.2"
   }