Merge branch 'main' into add-mcp-docs-server-to-claude

Author: cliffhall

.github/ISSUE_TEMPLATE/bug_report.md

@@ -37,4 +37,4 @@ Add any other context about the problem here.
 
 **Version Consideration**
 
-Inspector V2 is under development to address architectural and UX improvements. See [CONTRIBUTING.md](CONTRIBUTING.md) for information about V2 development.
+Inspector V2 is under development to address architectural and UX improvements. During this time, V1 contributions should focus on **bug fixes and MCP spec compliance**. See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.

.github/pull_request_template.md

@@ -2,7 +2,7 @@
 
 <!-- Provide a brief description of what this PR does -->
 
-> **Note:** Inspector V2 is under development to address architectural and UX improvements. See [CONTRIBUTING.md](CONTRIBUTING.md) for information about V2 development.
+> **Note:** Inspector V2 is under development to address architectural and UX improvements. During this time, V1 contributions should focus on **bug fixes and MCP spec compliance**. See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
 
 ## Type of Change
 

AGENTS.md

@@ -1,6 +1,6 @@
 # MCP Inspector Development Guide
 
-> **Note:** Inspector V2 is under development to address architectural and UX improvements. These guidelines apply to the current version (V1). See [CONTRIBUTING.md](CONTRIBUTING.md) for information about V2 development.
+> **Note:** Inspector V2 is under development to address architectural and UX improvements. During this time, V1 contributions should focus on **bug fixes and MCP spec compliance**. See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
 
 ## Build Commands
 

CONTRIBUTING.md

@@ -15,8 +15,7 @@ We're actively developing **Inspector V2** to address architectural and UX impro
 
 **Current version (V1) contribution scope:**
 
-- Critical issues are actively maintained
-- Small UX improvements are welcome
+- Bug fixes and MCP spec compliance are actively maintained
 - Documentation updates are always appreciated
 - Major changes will be directed to V2 development
 

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/inspector-cli",
-  "version": "0.17.4",
+  "version": "0.17.5",
   "description": "CLI for the Model Context Protocol inspector",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/inspector-client",
-  "version": "0.17.4",
+  "version": "0.17.5",
   "description": "Client-side application for the Model Context Protocol inspector",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",

client/src/App.tsx

@@ -18,6 +18,10 @@ import {
   LoggingLevel,
 } from "@modelcontextprotocol/sdk/types.js";
 import { OAuthTokensSchema } from "@modelcontextprotocol/sdk/shared/auth.js";
+import type {
+  AnySchema,
+  SchemaOutput,
+} from "@modelcontextprotocol/sdk/server/zod-compat.js";
 import { SESSION_KEYS, getServerSpecificKey } from "./lib/constants";
 import {
   hasValidMetaName,
@@ -296,6 +300,7 @@ const App = () => {
   const {
     connectionStatus,
     serverCapabilities,
+    serverImplementation,
     mcpClient,
     requestHistory,
     clearRequestHistory,
@@ -687,11 +692,11 @@ const App = () => {
     setErrors((prev) => ({ ...prev, [tabKey]: null }));
   };
 
-  const sendMCPRequest = async <T extends z.ZodType>(
+  const sendMCPRequest = async <T extends AnySchema>(
     request: ClientRequest,
     schema: T,
     tabKey?: keyof typeof errors,
-  ) => {
+  ): Promise<SchemaOutput<T>> => {
     try {
       const response = await makeRequest(request, schema);
       if (tabKey !== undefined) {
@@ -978,6 +983,7 @@ const App = () => {
           loggingSupported={!!serverCapabilities?.logging || false}
           connectionType={connectionType}
           setConnectionType={setConnectionType}
+          serverImplementation={serverImplementation}
         />
         <div
           onMouseDown={handleSidebarDragStart}

client/src/__tests__/App.routing.test.tsx

@@ -49,6 +49,7 @@ const disconnectedConnectionState = {
   completionsSupported: false,
   connect: jest.fn(),
   disconnect: jest.fn(),
+  serverImplementation: null,
 };
 
 // Connected state for tests that need an active connection

client/src/components/IconDisplay.tsx

@@ -0,0 +1,57 @@
+// Define Icon type locally since it might not be exported yet
+interface Icon {
+  src: string;
+  mimeType?: string;
+  sizes?: string[];
+}
+
+// Helper type for objects that may have icons
+export interface WithIcons {
+  icons?: Icon[];
+}
+
+interface IconDisplayProps {
+  icons?: Icon[];
+  className?: string;
+  size?: "sm" | "md" | "lg";
+}
+
+const IconDisplay = ({
+  icons,
+  className = "",
+  size = "md",
+}: IconDisplayProps) => {
+  if (!icons || icons.length === 0) {
+    return null;
+  }
+
+  const sizeClasses = {
+    sm: "w-4 h-4",
+    md: "w-6 h-6",
+    lg: "w-8 h-8",
+  };
+
+  const sizeClass = sizeClasses[size];
+
+  return (
+    <div className={`flex gap-1 ${className}`}>
+      {icons.map((icon, index) => (
+        <img
+          key={index}
+          src={icon.src}
+          alt=""
+          className={`${sizeClass} object-contain flex-shrink-0`}
+          style={{
+            imageRendering: "auto",
+          }}
+          onError={(e) => {
+            // Hide broken images
+            e.currentTarget.style.display = "none";
+          }}
+        />
+      ))}
+    </div>
+  );
+};
+
+export default IconDisplay;

client/src/components/PromptsTab.tsx

@@ -9,11 +9,12 @@ import {
   PromptReference,
   ResourceReference,
 } from "@modelcontextprotocol/sdk/types.js";
-import { AlertCircle } from "lucide-react";
+import { AlertCircle, ChevronRight } from "lucide-react";
 import { useEffect, useState } from "react";
 import ListPane from "./ListPane";
 import { useCompletionState } from "@/lib/hooks/useCompletionState";
 import JsonView from "./JsonView";
+import IconDisplay, { WithIcons } from "./IconDisplay";
 
 export type Prompt = {
   name: string;
@@ -23,6 +24,7 @@ export type Prompt = {
     description?: string;
     required?: boolean;
   }[];
+  icons?: { src: string; mimeType?: string; sizes?: string[] }[];
 };
 
 const PromptsTab = ({
@@ -108,11 +110,17 @@ const PromptsTab = ({
             setPromptArgs({});
           }}
           renderItem={(prompt) => (
-            <div className="flex flex-col items-start">
-              <span className="flex-1">{prompt.name}</span>
-              <span className="text-sm text-gray-500 text-left">
-                {prompt.description}
-              </span>
+            <div className="flex items-start w-full gap-2">
+              <div className="flex-shrink-0 mt-1">
+                <IconDisplay icons={prompt.icons} size="sm" />
+              </div>
+              <div className="flex flex-col flex-1 min-w-0">
+                <span className="truncate">{prompt.name}</span>
+                <span className="text-sm text-gray-500 text-left line-clamp-2">
+                  {prompt.description}
+                </span>
+              </div>
+              <ChevronRight className="w-4 h-4 flex-shrink-0 text-gray-400 mt-1" />
             </div>
           )}
           title="Prompts"
@@ -122,9 +130,17 @@ const PromptsTab = ({
 
         <div className="bg-card border border-border rounded-lg shadow">
           <div className="p-4 border-b border-gray-200 dark:border-border">
-            <h3 className="font-semibold">
-              {selectedPrompt ? selectedPrompt.name : "Select a prompt"}
-            </h3>
+            <div className="flex items-center gap-2">
+              {selectedPrompt && (
+                <IconDisplay
+                  icons={(selectedPrompt as WithIcons).icons}
+                  size="md"
+                />
+              )}
+              <h3 className="font-semibold">
+                {selectedPrompt ? selectedPrompt.name : "Select a prompt"}
+              </h3>
+            </div>
           </div>
           <div className="p-4">
             {error ? (