Merge pull request #647 from olaservo/parse-tool-arg

Parse tool args from CLI as JsonValue instead of just strings

Author: cliffhall

.gitignore

@@ -9,6 +9,7 @@ client/tsconfig.app.tsbuildinfo
 client/tsconfig.node.tsbuildinfo
 cli/build
 test-output
+tool-test-output
 # symlinked by `npm run link:sdk`:
 sdk
 client/playwright-report/

README.md

@@ -395,6 +395,9 @@ npx @modelcontextprotocol/inspector --cli node build/index.js --method tools/lis
 # Call a specific tool
 npx @modelcontextprotocol/inspector --cli node build/index.js --method tools/call --tool-name mytool --tool-arg key=value --tool-arg another=value2
 
+# Call a tool with JSON arguments
+npx @modelcontextprotocol/inspector --cli node build/index.js --method tools/call --tool-name mytool --tool-arg 'options={"format": "json", "max_tokens": 100}'
+
 # List available resources
 npx @modelcontextprotocol/inspector --cli node build/index.js --method resources/list
 

cli/package.json

@@ -17,7 +17,9 @@
   "scripts": {
     "build": "tsc",
     "postbuild": "node scripts/make-executable.js",
-    "test": "node scripts/cli-tests.js"
+    "test": "node scripts/cli-tests.js && node scripts/cli-tool-tests.js",
+    "test:cli": "node scripts/cli-tests.js",
+    "test:cli-tools": "node scripts/cli-tool-tests.js"
   },
   "devDependencies": {},
   "dependencies": {

cli/scripts/cli-tests.js

@@ -37,9 +37,6 @@ console.log(`${colors.BLUE}- Environment variables (-e)${colors.NC}`);
 console.log(`${colors.BLUE}- Config file (--config)${colors.NC}`);
 console.log(`${colors.BLUE}- Server selection (--server)${colors.NC}`);
 console.log(`${colors.BLUE}- Method selection (--method)${colors.NC}`);
-console.log(
-  `${colors.BLUE}- Tool-related options (--tool-name, --tool-arg)${colors.NC}`,
-);
 console.log(`${colors.BLUE}- Resource-related options (--uri)${colors.NC}`);
 console.log(
   `${colors.BLUE}- Prompt-related options (--prompt-name, --prompt-args)${colors.NC}`,
@@ -533,65 +530,6 @@ async function runTests() {
     "tools/list",
   );
 
-  console.log(
-    `\n${colors.YELLOW}=== Running Tool-Related Tests ===${colors.NC}`,
-  );
-
-  // Test 12: CLI mode with tool call
-  await runBasicTest(
-    "tool_call",
-    TEST_CMD,
-    ...TEST_ARGS,
-    "--cli",
-    "--method",
-    "tools/call",
-    "--tool-name",
-    "echo",
-    "--tool-arg",
-    "message=Hello",
-  );
-
-  // Test 13: CLI mode with tool call but missing tool name (should fail)
-  await runErrorTest(
-    "missing_tool_name",
-    TEST_CMD,
-    ...TEST_ARGS,
-    "--cli",
-    "--method",
-    "tools/call",
-    "--tool-arg",
-    "message=Hello",
-  );
-
-  // Test 14: CLI mode with tool call but invalid tool args format (should fail)
-  await runErrorTest(
-    "invalid_tool_args",
-    TEST_CMD,
-    ...TEST_ARGS,
-    "--cli",
-    "--method",
-    "tools/call",
-    "--tool-name",
-    "echo",
-    "--tool-arg",
-    "invalid_format",
-  );
-
-  // Test 15: CLI mode with multiple tool args
-  await runBasicTest(
-    "multiple_tool_args",
-    TEST_CMD,
-    ...TEST_ARGS,
-    "--cli",
-    "--method",
-    "tools/call",
-    "--tool-name",
-    "add",
-    "--tool-arg",
-    "a=1",
-    "b=2",
-  );
-
   console.log(
     `\n${colors.YELLOW}=== Running Resource-Related Tests ===${colors.NC}`,
   );