Merge branch 'main' into main

2025-09-15 19:30:18 +05:30 · 2025-09-15 19:30:18 +05:30 · f36c649bb9
commit f36c649bb9
parent 743bb52d92 758d6f7913
8 changed files with 118 additions and 66 deletions
--- a/cli/package.json
+++ b/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@modelcontextprotocol/inspector-cli",
-  "version": "0.16.6",
+  "version": "0.16.7",
  "description": "CLI for the Model Context Protocol inspector",
  "license": "MIT",
  "author": "Anthropic, PBC (https://anthropic.com)",
@ -24,7 +24,7 @@
  },
  "devDependencies": {},
  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@modelcontextprotocol/sdk": "^1.18.0",
    "commander": "^13.1.0",
    "spawn-rx": "^5.1.2"
  }
--- a/client/package.json
+++ b/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@modelcontextprotocol/inspector-client",
-  "version": "0.16.6",
+  "version": "0.16.7",
  "description": "Client-side application for the Model Context Protocol inspector",
  "license": "MIT",
  "author": "Anthropic, PBC (https://anthropic.com)",
@ -25,7 +25,7 @@
    "cleanup:e2e": "node e2e/global-teardown.js"
  },
  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@modelcontextprotocol/sdk": "^1.18.0",
    "@radix-ui/react-checkbox": "^1.1.4",
    "@radix-ui/react-dialog": "^1.1.3",
    "@radix-ui/react-icons": "^1.3.0",
--- a/client/src/components/JsonView.tsx
+++ b/client/src/components/JsonView.tsx
@ -1,10 +1,11 @@
-import { useState, memo, useMemo, useCallback, useEffect } from "react";
+import { useState, memo, useMemo, useCallback } from "react";
 import type { JsonValue } from "@/utils/jsonUtils";
 import clsx from "clsx";
 import { Copy, CheckCheck } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { useToast } from "@/lib/hooks/useToast";
 import { getDataType, tryParseJson } from "@/utils/jsonUtils";
+import useCopy from "@/lib/hooks/useCopy";

 interface JsonViewProps {
  data: unknown;
@ -25,21 +26,7 @@ const JsonView = memo(
    isError = false,
  }: JsonViewProps) => {
    const { toast } = useToast();
-    const [copied, setCopied] = useState(false);
-
-    useEffect(() => {
-      let timeoutId: NodeJS.Timeout;
-      if (copied) {
-        timeoutId = setTimeout(() => {
-          setCopied(false);
-        }, 500);
-      }
-      return () => {
-        if (timeoutId) {
-          clearTimeout(timeoutId);
-        }
-      };
-    }, [copied]);
+    const { copied, setCopied } = useCopy();

    const normalizedData = useMemo(() => {
      return typeof data === "string"
--- a/client/src/components/ToolsTab.tsx
+++ b/client/src/components/ToolsTab.tsx
@ -17,11 +17,20 @@ import {
  ListToolsResult,
  Tool,
 } from "@modelcontextprotocol/sdk/types.js";
-import { Loader2, Send, ChevronDown, ChevronUp } from "lucide-react";
+import {
+  Loader2,
+  Send,
+  ChevronDown,
+  ChevronUp,
+  Copy,
+  CheckCheck,
+} from "lucide-react";
 import { useEffect, useState } from "react";
 import ListPane from "./ListPane";
 import JsonView from "./JsonView";
 import ToolResults from "./ToolResults";
+import { useToast } from "@/lib/hooks/useToast";
+import useCopy from "@/lib/hooks/useCopy";

 // Type guard to safely detect the optional _meta field without using `any`
 const hasMeta = (tool: Tool): tool is Tool & { _meta: unknown } =>
@ -55,6 +64,8 @@ const ToolsTab = ({
  const [isToolRunning, setIsToolRunning] = useState(false);
  const [isOutputSchemaExpanded, setIsOutputSchemaExpanded] = useState(false);
  const [isMetaExpanded, setIsMetaExpanded] = useState(false);
+  const { toast } = useToast();
+  const { copied, setCopied } = useCopy();

  useEffect(() => {
    const params = Object.entries(
@ -291,29 +302,54 @@ const ToolsTab = ({
                      </div>
                    </div>
                  )}
-                <Button
-                  onClick={async () => {
-                    try {
-                      setIsToolRunning(true);
-                      await callTool(selectedTool.name, params);
-                    } finally {
-                      setIsToolRunning(false);
-                    }
-                  }}
-                  disabled={isToolRunning}
-                >
-                  {isToolRunning ? (
-                    <>
-                      <Loader2 className="w-4 h-4 mr-2 animate-spin" />
-                      Running...
-                    </>
-                  ) : (
-                    <>
-                      <Send className="w-4 h-4 mr-2" />
-                      Run Tool
-                    </>
-                  )}
-                </Button>
+                <div className="flex gap-2">
+                  <Button
+                    onClick={async () => {
+                      try {
+                        setIsToolRunning(true);
+                        await callTool(selectedTool.name, params);
+                      } finally {
+                        setIsToolRunning(false);
+                      }
+                    }}
+                    disabled={isToolRunning}
+                  >
+                    {isToolRunning ? (
+                      <>
+                        <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                        Running...
+                      </>
+                    ) : (
+                      <>
+                        <Send className="w-4 h-4 mr-2" />
+                        Run Tool
+                      </>
+                    )}
+                  </Button>
+                  <Button
+                    onClick={async () => {
+                      try {
+                        navigator.clipboard.writeText(
+                          JSON.stringify(params, null, 2),
+                        );
+                        setCopied(true);
+                      } catch (error) {
+                        toast({
+                          title: "Error",
+                          description: `There was an error copying input to the clipboard: ${error instanceof Error ? error.message : String(error)}`,
+                          variant: "destructive",
+                        });
+                      }
+                    }}
+                  >
+                    {copied ? (
+                      <CheckCheck className="h-4 w-4 mr-2 dark:text-green-700 text-green-600" />
+                    ) : (
+                      <Copy className="h-4 w-4 mr-2" />
+                    )}
+                    Copy Input
+                  </Button>
+                </div>
                <ToolResults
                  toolResult={toolResult}
                  selectedTool={selectedTool}
--- a/client/src/lib/hooks/useCopy.ts
+++ b/client/src/lib/hooks/useCopy.ts
@ -0,0 +1,29 @@
+"use client";
+
+import { useEffect, useState } from "react";
+
+type UseCopyProps = {
+  timeout?: number;
+};
+
+function useCopy({ timeout = 500 }: UseCopyProps = {}) {
+  const [copied, setCopied] = useState(false);
+
+  useEffect(() => {
+    let timeoutId: NodeJS.Timeout;
+    if (copied) {
+      timeoutId = setTimeout(() => {
+        setCopied(false);
+      }, timeout);
+    }
+    return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  }, [copied]);
+
+  return { copied, setCopied };
+}
+
+export default useCopy;
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "@modelcontextprotocol/inspector",
-  "version": "0.16.6",
+  "version": "0.16.7",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@modelcontextprotocol/inspector",
-      "version": "0.16.6",
+      "version": "0.16.7",
      "license": "MIT",
      "workspaces": [
        "client",
@ -14,10 +14,10 @@
        "cli"
      ],
      "dependencies": {
-        "@modelcontextprotocol/inspector-cli": "^0.16.6",
-        "@modelcontextprotocol/inspector-client": "^0.16.6",
-        "@modelcontextprotocol/inspector-server": "^0.16.6",
-        "@modelcontextprotocol/sdk": "^1.17.5",
+        "@modelcontextprotocol/inspector-cli": "^0.16.7",
+        "@modelcontextprotocol/inspector-client": "^0.16.7",
+        "@modelcontextprotocol/inspector-server": "^0.16.7",
+        "@modelcontextprotocol/sdk": "^1.18.0",
        "concurrently": "^9.2.0",
        "open": "^10.2.0",
        "shell-quote": "^1.8.3",
@ -46,10 +46,10 @@
    },
    "cli": {
      "name": "@modelcontextprotocol/inspector-cli",
-      "version": "0.16.6",
+      "version": "0.16.7",
      "license": "MIT",
      "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.17.5",
+        "@modelcontextprotocol/sdk": "^1.18.0",
        "commander": "^13.1.0",
        "spawn-rx": "^5.1.2"
      },
@ -69,10 +69,10 @@
    },
    "client": {
      "name": "@modelcontextprotocol/inspector-client",
-      "version": "0.16.6",
+      "version": "0.16.7",
      "license": "MIT",
      "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.17.5",
+        "@modelcontextprotocol/sdk": "^1.18.0",
        "@radix-ui/react-checkbox": "^1.1.4",
        "@radix-ui/react-dialog": "^1.1.3",
        "@radix-ui/react-icons": "^1.3.0",
@ -2013,9 +2013,9 @@
      "link": true
    },
    "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.17.5.tgz",
-      "integrity": "sha512-QakrKIGniGuRVfWBdMsDea/dx1PNE739QJ7gCM41s9q+qaCYTHCdsIBXQVVXry3mfWAiaM9kT22Hyz53Uw8mfg==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.18.0.tgz",
+      "integrity": "sha512-JvKyB6YwS3quM+88JPR0axeRgvdDu3Pv6mdZUy+w4qVkCzGgumb9bXG/TmtDRQv+671yaofVfXSQmFLlWU5qPQ==",
      "license": "MIT",
      "dependencies": {
        "ajv": "^6.12.6",
@ -11783,10 +11783,10 @@
    },
    "server": {
      "name": "@modelcontextprotocol/inspector-server",
-      "version": "0.16.6",
+      "version": "0.16.7",
      "license": "MIT",
      "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.17.5",
+        "@modelcontextprotocol/sdk": "^1.18.0",
        "cors": "^2.8.5",
        "express": "^5.1.0",
        "shell-quote": "^1.8.3",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@modelcontextprotocol/inspector",
-  "version": "0.16.6",
+  "version": "0.16.7",
  "description": "Model Context Protocol inspector",
  "license": "MIT",
  "author": "Anthropic, PBC (https://anthropic.com)",
@ -47,10 +47,10 @@
    "check-version": "node scripts/check-version-consistency.js"
  },
  "dependencies": {
-    "@modelcontextprotocol/inspector-cli": "^0.16.6",
-    "@modelcontextprotocol/inspector-client": "^0.16.6",
-    "@modelcontextprotocol/inspector-server": "^0.16.6",
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@modelcontextprotocol/inspector-cli": "^0.16.7",
+    "@modelcontextprotocol/inspector-client": "^0.16.7",
+    "@modelcontextprotocol/inspector-server": "^0.16.7",
+    "@modelcontextprotocol/sdk": "^1.18.0",
    "concurrently": "^9.2.0",
    "open": "^10.2.0",
    "shell-quote": "^1.8.3",
--- a/server/package.json
+++ b/server/package.json
@ -1,6 +1,6 @@
 {
  "name": "@modelcontextprotocol/inspector-server",
-  "version": "0.16.6",
+  "version": "0.16.7",
  "description": "Server-side application for the Model Context Protocol inspector",
  "license": "MIT",
  "author": "Anthropic, PBC (https://anthropic.com)",
@ -28,7 +28,7 @@
    "typescript": "^5.6.2"
  },
  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@modelcontextprotocol/sdk": "^1.18.0",
    "cors": "^2.8.5",
    "express": "^5.1.0",
    "shell-quote": "^1.8.3",