Merge branch 'main' into command-line-args-to-ui-tests

Author: felixweinberger

cli/src/client/connection.ts

@@ -18,6 +18,12 @@ export async function connect(
 ): Promise<void> {
   try {
     await client.connect(transport);
+
+    if (client.getServerCapabilities()?.logging) {
+      // default logging level is undefined in the spec, but the user of the
+      // inspector most likely wants debug.
+      await client.setLoggingLevel("debug");
+    }
   } catch (error) {
     throw new Error(
       `Failed to connect to MCP server: ${error instanceof Error ? error.message : String(error)}`,

client/bin/start.js

@@ -91,10 +91,10 @@ async function startProdServer(serverOptions) {
     "node",
     [
       inspectorServerPath,
-      command ? `--command=${command}` : "",
-      mcpServerArgs && mcpServerArgs.length > 0
-        ? `--args=${mcpServerArgs.join(" ")}`
-        : "",
+      ...(command ? [`--command=${command}`] : []),
+      ...(mcpServerArgs && mcpServerArgs.length > 0
+        ? [`--args=${mcpServerArgs.join(" ")}`]
+        : []),
     ],
     {
       env: {

client/package.json

@@ -51,19 +51,19 @@
     "serve-handler": "^6.1.6",
     "tailwind-merge": "^2.5.3",
     "tailwindcss-animate": "^1.0.7",
-    "zod": "^3.23.8"
+    "zod": "^3.25.76"
   },
   "devDependencies": {
     "@eslint/js": "^9.11.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.7.5",
+    "@types/node": "^22.17.0",
     "@types/prismjs": "^1.26.5",
-    "@types/react": "^18.3.10",
+    "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.0",
     "@types/serve-handler": "^6.1.4",
-    "@vitejs/plugin-react": "^4.3.2",
+    "@vitejs/plugin-react": "^4.7.0",
     "autoprefixer": "^10.4.20",
     "co": "^4.6.0",
     "eslint": "^9.11.1",
@@ -72,11 +72,11 @@
     "globals": "^15.9.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "postcss": "^8.4.47",
+    "postcss": "^8.5.6",
     "tailwindcss": "^3.4.13",
-    "ts-jest": "^29.2.6",
+    "ts-jest": "^29.4.0",
     "typescript": "^5.5.3",
-    "typescript-eslint": "^8.7.0",
-    "vite": "^6.3.0"
+    "typescript-eslint": "^8.38.0",
+    "vite": "^6.3.5"
   }
 }

client/src/App.tsx

@@ -260,6 +260,7 @@ const App = () => {
       window.location.hash = "elicitations";
     },
     getRoots: () => rootsRef.current,
+    defaultLoggingLevel: logLevel,
   });
 
   useEffect(() => {

client/src/lib/hooks/useConnection.ts

@@ -28,6 +28,7 @@ import {
   ToolListChangedNotificationSchema,
   PromptListChangedNotificationSchema,
   Progress,
+  LoggingLevel,
   ElicitRequestSchema,
 } from "@modelcontextprotocol/sdk/types.js";
 import { RequestOptions } from "@modelcontextprotocol/sdk/shared/protocol.js";
@@ -72,6 +73,7 @@ interface UseConnectionOptions {
   onElicitationRequest?: (request: any, resolve: any) => void;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getRoots?: () => any[];
+  defaultLoggingLevel?: LoggingLevel;
 }
 
 export function useConnection({
@@ -90,6 +92,7 @@ export function useConnection({
   onPendingRequest,
   onElicitationRequest,
   getRoots,
+  defaultLoggingLevel,
 }: UseConnectionOptions) {
   const [connectionStatus, setConnectionStatus] =
     useState<ConnectionStatus>("disconnected");
@@ -560,6 +563,10 @@ export function useConnection({
         });
       }
 
+      if (capabilities?.logging && defaultLoggingLevel) {
+        await client.setLoggingLevel(defaultLoggingLevel);
+      }
+
       if (onElicitationRequest) {
         client.setRequestHandler(ElicitRequestSchema, async (request) => {
           return new Promise((resolve) => {

client/src/lib/oauth-state-machine.ts

@@ -113,13 +113,21 @@ export const oauthTransitions: Record<OAuthStep, StateTransition> = {
         scope = metadata.scopes_supported.join(" ");
       }
 
+      // Generate a random state
+      const array = new Uint8Array(32);
+      crypto.getRandomValues(array);
+      const state = Array.from(array, (byte) =>
+        byte.toString(16).padStart(2, "0"),
+      ).join("");
+
       const { authorizationUrl, codeVerifier } = await startAuthorization(
         context.serverUrl,
         {
           metadata,
           clientInformation,
           redirectUrl: context.provider.redirectUrl,
           scope,
+          state: state,
           resource: context.state.resource ?? undefined,
         },
       );