@modelcontextprotocol/inspector 2.10.0 → 2.11.0

package/clients/tui/build/index.js

@@ -2044,16 +2044,30 @@ function buildConfigFromOptions(options) {
   const target = options.target ?? [];
   const first = target[0];
   const rest = target.slice(1);
+  if (first && options.serverUrl) {
+    throw new Error(
+      `Cannot combine a positional target (${first}) with --server-url (${options.serverUrl}). Pass one or the other.`
+    );
+  }
   const urlFromTarget = first && (first.startsWith("http://") || first.startsWith("https://")) ? first : null;
   const url = urlFromTarget ?? options.serverUrl ?? null;
   if (url) {
-    if (rest.length > 0 && urlFromTarget) {
+    if (rest.length > 0) {
       throw new Error("Arguments cannot be passed to a URL-based MCP server.");
     }
+    if (options.transport === "stdio") {
+      throw new Error(
+        `stdio transport cannot be used with a URL (${url}). Use --transport http or --transport sse, or pass a local command instead.`
+      );
+    }
     let transportType;
     const t = options.transport === "http" ? "streamable-http" : options.transport;
     if (t === "sse" || t === "streamable-http") {
       transportType = t;
+    } else if (t) {
+      throw new Error(
+        `Invalid transport type: ${t}. Valid types are: sse, http, stdio`
+      );
     } else {
       const u = new URL(url);
       if (u.pathname.endsWith("/mcp")) {
@@ -4552,7 +4566,10 @@ function parseAuthChallengeFromResponse(response, context) {
   if (status !== 401 && status !== 403) {
     return void 0;
   }
-  const wwwAuthenticate = response.headers.get("WWW-Authenticate") ?? void 0;
+  const wwwAuthenticate = response.headers.get("WWW-Authenticate") || void 0;
+  if (status === 403 && !wwwAuthenticate) {
+    return void 0;
+  }
   const bearer = wwwAuthenticate ? parseWwwAuthenticateBearer(wwwAuthenticate) : {};
   const requiredScopes = parseScopeString(bearer.scope);
   return {
@@ -5249,6 +5266,34 @@ function buildRunnerClientAuthOptions(clientConfig, savedSettings, cliOverrides)
   };
 }
 
+// ../../core/node/version.ts
+import { readFileSync as readFileSync4 } from "fs";
+import { dirname as dirname5, join as join3, parse } from "path";
+import { fileURLToPath } from "url";
+var ROOT_PACKAGE_NAME = "@modelcontextprotocol/inspector";
+function readInspectorVersion(callerUrl) {
+  const startDir = dirname5(fileURLToPath(callerUrl));
+  const { root } = parse(startDir);
+  let dir = startDir;
+  for (; ; ) {
+    let manifest;
+    try {
+      manifest = JSON.parse(
+        readFileSync4(join3(dir, "package.json"), "utf-8")
+      );
+    } catch {
+    }
+    if (manifest?.name === ROOT_PACKAGE_NAME && manifest.version) {
+      return manifest.version;
+    }
+    if (dir === root) break;
+    dir = dirname5(dir);
+  }
+  throw new Error(
+    `Could not locate the ${ROOT_PACKAGE_NAME} root package.json above ${startDir}`
+  );
+}
+
 // ../../core/node/hostUrl.ts
 import { isIPv6 } from "net";
 function stripBrackets(host) {
@@ -6923,6 +6968,84 @@ function isJsonDocumentResponse(contentType) {
   const mediaType = contentType.split(";")[0].trim().toLowerCase();
   return mediaType === "application/json" || mediaType.endsWith("+json");
 }
+var SYNTHESIZED_METADATA_HEADER = "x-inspector-oauth-metadata-synthesized";
+var synthesizedResponses = /* @__PURE__ */ new WeakSet();
+function isSynthesizedMetadataResponse(response) {
+  return synthesizedResponses.has(response);
+}
+var OIDC_WELL_KNOWN = "/.well-known/openid-configuration";
+var RFC8414_WELL_KNOWN = "/.well-known/oauth-authorization-server";
+function continuesDiscovery(status) {
+  return status < 500 || status === 502;
+}
+function authorizationServerForFinalCandidate(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return void 0;
+  }
+  const { pathname } = parsed;
+  if (pathname === OIDC_WELL_KNOWN) return parsed.origin;
+  if (!pathname.endsWith(OIDC_WELL_KNOWN)) return void 0;
+  if (pathname.startsWith(`${RFC8414_WELL_KNOWN}/`) || pathname.startsWith(`${OIDC_WELL_KNOWN}/`)) {
+    return void 0;
+  }
+  return `${parsed.origin}${pathname.slice(0, -OIDC_WELL_KNOWN.length)}`;
+}
+function synthesizeAuthorizationServerMetadata(issuer, overrides) {
+  return {
+    issuer,
+    authorization_endpoint: overrides.authorizationUrl ?? new URL("/authorize", issuer).href,
+    token_endpoint: overrides.tokenUrl ?? new URL("/token", issuer).href,
+    registration_endpoint: new URL("/register", issuer).href,
+    response_types_supported: ["code"],
+    code_challenge_methods_supported: ["S256"]
+  };
+}
+function requestMethodOf(input, init) {
+  if (init?.method) return init.method.toUpperCase();
+  if (typeof input !== "string" && !(input instanceof URL)) {
+    return input.method.toUpperCase();
+  }
+  return "GET";
+}
+function acceptsJson(input, init) {
+  let accept = null;
+  if (init?.headers) {
+    accept = new Headers(init.headers).get("accept");
+  } else if (typeof input !== "string" && !(input instanceof URL)) {
+    accept = input.headers.get("accept");
+  }
+  if (!accept) return false;
+  const mediaTypes = accept.split(",").map((part) => part.split(";")[0].trim().toLowerCase());
+  return mediaTypes.includes("application/json") && !mediaTypes.includes("text/event-stream");
+}
+function synthesizedMetadataResponse(input, init, response, overrides) {
+  if (!continuesDiscovery(response.status)) return void 0;
+  if (requestMethodOf(input, init) !== "GET") return void 0;
+  if (!acceptsJson(input, init)) return void 0;
+  const issuer = authorizationServerForFinalCandidate(requestUrlOf(input));
+  if (!issuer) return void 0;
+  void response.body?.cancel().catch(() => {
+  });
+  console.warn(
+    `[oauth] ${issuer} publishes no authorization server metadata; using the configured endpoint override(s) in place of the SDK's /authorize and /token fallbacks.`
+  );
+  const synthesized = new Response(
+    JSON.stringify(synthesizeAuthorizationServerMetadata(issuer, overrides)),
+    {
+      status: 200,
+      statusText: "OK",
+      headers: {
+        "content-type": "application/json",
+        [SYNTHESIZED_METADATA_HEADER]: "endpoint-overrides"
+      }
+    }
+  );
+  synthesizedResponses.add(synthesized);
+  return synthesized;
+}
 function responseWithBody(response, body) {
   const headers = new Headers(response.headers);
   headers.delete("content-length");
@@ -6950,7 +7073,9 @@ function withOAuthEndpointOverrides(fetchFn, getOverrides) {
     const overrides = resolveOverrides();
     if (!overrides) return response;
     if (!isAuthorizationServerMetadataRequest(input)) return response;
-    if (!response.ok) return response;
+    if (!response.ok) {
+      return synthesizedMetadataResponse(input, init, response, overrides) ?? response;
+    }
     if (!isJsonDocumentResponse(response.headers.get("content-type")))
       return response;
     let parsed;
@@ -7126,8 +7251,8 @@ import {
   OAuthMetadataSchema,
   OpenIdProviderDiscoveryMetadataSchema
 } from "@modelcontextprotocol/core";
-var RFC8414_WELL_KNOWN = "/.well-known/oauth-authorization-server";
-var OIDC_WELL_KNOWN = "/.well-known/openid-configuration";
+var RFC8414_WELL_KNOWN2 = "/.well-known/oauth-authorization-server";
+var OIDC_WELL_KNOWN2 = "/.well-known/openid-configuration";
 var COMPAT_SOURCE_HEADER = "x-inspector-oauth-metadata-source";
 function oidcDiscoveryCandidates(rfc8414Url) {
   let url;
@@ -7136,16 +7261,16 @@ function oidcDiscoveryCandidates(rfc8414Url) {
   } catch {
     return [];
   }
-  if (!url.pathname.startsWith(RFC8414_WELL_KNOWN)) return [];
-  const path7 = url.pathname.slice(RFC8414_WELL_KNOWN.length);
+  if (!url.pathname.startsWith(RFC8414_WELL_KNOWN2)) return [];
+  const path7 = url.pathname.slice(RFC8414_WELL_KNOWN2.length);
   if (path7 !== "" && !path7.startsWith("/")) return [];
-  if (path7 === "") return [new URL(OIDC_WELL_KNOWN, url.origin).href];
+  if (path7 === "") return [new URL(OIDC_WELL_KNOWN2, url.origin).href];
   return [
-    new URL(`${OIDC_WELL_KNOWN}${path7}`, url.origin).href,
-    new URL(`${path7}${OIDC_WELL_KNOWN}`, url.origin).href
+    new URL(`${OIDC_WELL_KNOWN2}${path7}`, url.origin).href,
+    new URL(`${path7}${OIDC_WELL_KNOWN2}`, url.origin).href
   ];
 }
-function continuesDiscovery(status) {
+function continuesDiscovery2(status) {
   return status >= 400 && status < 500 || status === 502;
 }
 async function releaseBody(response) {
@@ -7171,7 +7296,7 @@ function discoveryHeaders(input, init) {
   }
   return new Headers();
 }
-function requestMethodOf(input, init) {
+function requestMethodOf2(input, init) {
   if (init?.method) return init.method.toUpperCase();
   if (typeof input !== "string" && !(input instanceof URL)) {
     return input.method.toUpperCase();
@@ -7182,8 +7307,8 @@ function withRfc8414OidcCompat(fetchFn) {
   return async (input, init) => {
     const response = await fetchFn(input, init);
     if (response.ok) return response;
-    if (!continuesDiscovery(response.status)) return response;
-    if (requestMethodOf(input, init) !== "GET") return response;
+    if (!continuesDiscovery2(response.status)) return response;
+    if (requestMethodOf2(input, init) !== "GET") return response;
     const candidates = oidcDiscoveryCandidates(requestUrlOf3(input));
     if (candidates.length === 0) return response;
     const headers = discoveryHeaders(input, init);
@@ -7213,7 +7338,7 @@ function withRfc8414OidcCompat(fetchFn) {
           releaseBodyDetached(response);
           throw callerSignal.reason;
         }
-        if (continuesDiscovery(probe.status)) continue;
+        if (continuesDiscovery2(probe.status)) continue;
         return response;
       }
       let parsed;
@@ -7233,6 +7358,16 @@ function withRfc8414OidcCompat(fetchFn) {
       }
       const source = probe.url || candidate;
       releaseBodyDetached(response);
+      if (isSynthesizedMetadataResponse(probe)) {
+        return new Response(body, {
+          status: 200,
+          statusText: "OK",
+          headers: {
+            "content-type": "application/json",
+            [SYNTHESIZED_METADATA_HEADER]: "endpoint-overrides"
+          }
+        });
+      }
       console.warn(
         `[oauth] ${source} returned RFC 8414 OAuth 2.0 authorization server metadata, not an OpenID provider document. The MCP TypeScript SDK validates that path as OpenID Connect Discovery and would reject it (modelcontextprotocol/typescript-sdk#2733), so the Inspector is handing it to discovery as the RFC 8414 document it is.`
       );
@@ -8213,10 +8348,10 @@ async function resolveIdpMetadata(issuer, storage, fetchFn) {
   }
   return discoverIdpMetadata(issuer, fetchFn);
 }
-var OIDC_WELL_KNOWN2 = "/.well-known/openid-configuration";
+var OIDC_WELL_KNOWN3 = "/.well-known/openid-configuration";
 async function fetchOpenIdConfiguration(issuer, issuerUrl, fetchFn) {
   const url = new URL(
-    `${issuerUrl.pathname.replace(/\/$/, "")}${OIDC_WELL_KNOWN2}`,
+    `${issuerUrl.pathname.replace(/\/$/, "")}${OIDC_WELL_KNOWN3}`,
     issuerUrl.origin
   );
   try {
@@ -9799,7 +9934,11 @@ var OAuthManager = class {
 };
 
 // ../../core/mcp/remote/remoteClientTransport.ts
-import { SdkError as SdkError5, SdkErrorCode as SdkErrorCode5 } from "@modelcontextprotocol/client";
+import {
+  SdkError as SdkError5,
+  SdkErrorCode as SdkErrorCode5,
+  SdkHttpError
+} from "@modelcontextprotocol/client";
 
 // ../../core/mcp/remote/types.ts
 function oauthTokensToRemoteAuthState(tokens) {
@@ -9854,6 +9993,17 @@ function isConnectAuthChallenge(json) {
 function isConnectTransportError(json) {
   return typeof json === "object" && json !== null && "ok" in json && json.ok === false && "kind" in json && json.kind === "transport_error";
 }
+var SDK_ERROR_CODES = new Set(
+  Object.values(SdkErrorCode5)
+);
+function toSdkHttpError(message, http) {
+  const code = SDK_ERROR_CODES.has(http.code) ? http.code : SdkErrorCode5.ClientHttpNotImplemented;
+  return new SdkHttpError(code, message, {
+    status: http.status,
+    ...http.statusText !== void 0 && { statusText: http.statusText },
+    ...http.text !== void 0 && { text: http.text }
+  });
+}
 function legacySessionId(json) {
   if (typeof json === "object" && json !== null && "sessionId" in json && typeof json.sessionId === "string" && !("ok" in json)) {
     return json.sessionId;
@@ -10354,6 +10504,9 @@ var RemoteClientTransport = class {
       });
       return;
     }
+    if (json.http) {
+      throw toSdkHttpError(json.error, json.http);
+    }
     throw new Error(json.error);
   }
   async requestSend(message, options) {
@@ -10426,8 +10579,9 @@ var corePackageJson = {
   version: "0.0.0"
 };
 var MAX_URL_ELICITATION_RETRIES = 5;
-function connectionTimeoutMessage(timeoutMs) {
-  return `Connection timed out after ${timeoutMs} ms. To accommodate a slower server, you may increase the timeout value in Server Settings.`;
+var WEB_CONNECTION_TIMEOUT_REMEDY = "To accommodate a slower server, you may increase the timeout value in Server Settings.";
+function connectionTimeoutMessage(timeoutMs, remedy = WEB_CONNECTION_TIMEOUT_REMEDY) {
+  return `Connection timed out after ${timeoutMs} ms. ${remedy}`;
 }
 function createPendingAbortError() {
   return new Error("Pending request aborted");
@@ -10518,6 +10672,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
   /** Dedupes concurrent ambient auth challenges (reason + scopes). */
   ambientAuthChallengeInFlight = /* @__PURE__ */ new Map();
   pipeStderr;
+  connectionTimeoutRemedy;
   initialLoggingLevel;
   // Modern-era per-request log level (#1629). On 2026-07-28 servers
   // `logging/setLevel` is gone; the client opts into logs per request via the
@@ -10755,6 +10910,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
     this.fetchFn = options.environment.fetch;
     this.logger = options.environment.logger ?? silentLogger;
     this.pipeStderr = options.pipeStderr ?? false;
+    this.connectionTimeoutRemedy = options.connectionTimeoutRemedy ?? WEB_CONNECTION_TIMEOUT_REMEDY;
     this.initialLoggingLevel = options.initialLoggingLevel;
     this.sample = options.sample ?? true;
     this.elicit = options.elicit ?? true;
@@ -11496,9 +11652,10 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
         // for that upstream gap and should be deleted with it.
         //
         // Known, accepted side effect of turning intercept on with no stored
-        // tokens: `parseAuthChallengeFromResponse` treats 403 as a challenge
-        // too, so a probe answered 403 for a *non-auth* reason (a gateway
-        // rejecting the unknown `server/discover` method, say) now starts OAuth
+        // tokens: `parseAuthChallengeFromResponse` treats a 403 carrying
+        // `WWW-Authenticate` as a challenge too, so a probe answered that way
+        // for a *non-auth* reason (a gateway rejecting the unknown
+        // `server/discover` method, say) now starts OAuth
         // discovery instead of letting "auto" fall back to the legacy
         // `initialize`. The outcome is a surfaced `oauthError`, not a hang, and
         // it goes away with this clause.
@@ -11565,7 +11722,14 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
           const timeoutPromise = new Promise((_, reject) => {
             timer = setTimeout(() => {
               connectTimedOut = true;
-              reject(new Error(connectionTimeoutMessage(connectTimeoutMs)));
+              reject(
+                new Error(
+                  connectionTimeoutMessage(
+                    connectTimeoutMs,
+                    this.connectionTimeoutRemedy
+                  )
+                )
+              );
             }, connectTimeoutMs);
           });
           try {
@@ -14843,6 +15007,11 @@ var ManagedListState = class extends TypedEventTarget {
   // rendered by the list panel instead of vanishing into an unhandled
   // rejection — which read as "this server has no tools" (#1953).
   error = null;
+  // Whether a fetch has committed a list this session. Until it has, the empty
+  // `items` mean "not loaded yet", not "the server has none" — a distinction a
+  // count of the list cannot make from `items` alone (#2607). Set and cleared
+  // just before the `*Change` dispatch, so a reader keyed on that event sees it.
+  loaded = false;
   config;
   // Debounce a burst of `list_changed` notifications into a single
   // refresh (or one indicator light) once it settles.
@@ -14878,6 +15047,7 @@ var ManagedListState = class extends TypedEventTarget {
           this.listChangedTimer = null;
         }
         this.items = [];
+        this.loaded = false;
         this.dispatchChange();
         this.setListChanged(false);
         this.setError(null);
@@ -14936,6 +15106,14 @@ var ManagedListState = class extends TypedEventTarget {
   getItems() {
     return [...this.items];
   }
+  /**
+   * Whether a fetch has committed a list since the last connect. False while
+   * the connect-time load is in flight, when it was deferred (paginated mode),
+   * and after a disconnect. Changes only alongside the `*Change` event (#2607).
+   */
+  isLoaded() {
+    return this.loaded;
+  }
   /** Whether a `list_changed` arrived since the last refresh (indicator on). */
   getListChanged() {
     return this.listChanged;
@@ -15029,6 +15207,7 @@ var ManagedListState = class extends TypedEventTarget {
   /** Commit a fetched list as the current one and notify subscribers. */
   applyItems(items) {
     this.items = items;
+    this.loaded = true;
     this.dispatchChange();
   }
   dispatchChange() {
@@ -15039,6 +15218,7 @@ var ManagedListState = class extends TypedEventTarget {
     this.unsubscribe?.();
     this.unsubscribe = null;
     this.items = [];
+    this.loaded = false;
   }
 };
 
@@ -16087,6 +16267,7 @@ function useListError(state) {
 var NO_TOOLS = [];
 var readTools = (state) => state.getTools();
 var readListChanged = (state) => state.getListChanged();
+var readLoaded = (state) => state.isLoaded();
 function useManagedTools(client, managedToolsState) {
   const tools = useStoreSnapshot(
     managedToolsState,
@@ -16100,6 +16281,12 @@ function useManagedTools(client, managedToolsState) {
     readListChanged,
     false
   );
+  const loaded = useStoreSnapshot(
+    managedToolsState,
+    "toolsChange",
+    readLoaded,
+    false
+  );
   const error = useListError(managedToolsState);
   const refresh = useCallback4(async () => {
     if (!managedToolsState || !client) return NO_TOOLS;
@@ -16109,7 +16296,7 @@ function useManagedTools(client, managedToolsState) {
   const clearListChanged = useCallback4(() => {
     managedToolsState?.clearListChanged();
   }, [managedToolsState]);
-  return { tools, error, listChanged, refresh, clearListChanged };
+  return { tools, error, listChanged, loaded, refresh, clearListChanged };
 }
 
 // ../../core/react/useManagedResources.ts
@@ -16117,6 +16304,7 @@ import { useCallback as useCallback5 } from "react";
 var NO_RESOURCES = [];
 var readResources = (state) => state.getResources();
 var readListChanged2 = (state) => state.getListChanged();
+var readLoaded2 = (state) => state.isLoaded();
 function useManagedResources(client, managedResourcesState) {
   const resources = useStoreSnapshot(
     managedResourcesState,
@@ -16130,6 +16318,12 @@ function useManagedResources(client, managedResourcesState) {
     readListChanged2,
     false
   );
+  const loaded = useStoreSnapshot(
+    managedResourcesState,
+    "resourcesChange",
+    readLoaded2,
+    false
+  );
   const error = useListError(managedResourcesState);
   const refresh = useCallback5(async () => {
     if (!managedResourcesState || !client) return NO_RESOURCES;
@@ -16139,7 +16333,7 @@ function useManagedResources(client, managedResourcesState) {
   const clearListChanged = useCallback5(() => {
     managedResourcesState?.clearListChanged();
   }, [managedResourcesState]);
-  return { resources, error, listChanged, refresh, clearListChanged };
+  return { resources, error, listChanged, loaded, refresh, clearListChanged };
 }
 
 // ../../core/react/useManagedResourceTemplates.ts
@@ -16168,6 +16362,7 @@ import { useCallback as useCallback7 } from "react";
 var NO_PROMPTS = [];
 var readPrompts = (state) => state.getPrompts();
 var readListChanged3 = (state) => state.getListChanged();
+var readLoaded3 = (state) => state.isLoaded();
 function useManagedPrompts(client, managedPromptsState) {
   const prompts = useStoreSnapshot(
     managedPromptsState,
@@ -16181,6 +16376,12 @@ function useManagedPrompts(client, managedPromptsState) {
     readListChanged3,
     false
   );
+  const loaded = useStoreSnapshot(
+    managedPromptsState,
+    "promptsChange",
+    readLoaded3,
+    false
+  );
   const error = useListError(managedPromptsState);
   const refresh = useCallback7(async () => {
     if (!managedPromptsState || !client) return NO_PROMPTS;
@@ -16190,7 +16391,7 @@ function useManagedPrompts(client, managedPromptsState) {
   const clearListChanged = useCallback7(() => {
     managedPromptsState?.clearListChanged();
   }, [managedPromptsState]);
-  return { prompts, error, listChanged, refresh, clearListChanged };
+  return { prompts, error, listChanged, loaded, refresh, clearListChanged };
 }
 
 // ../../core/react/useManagedSkills.ts
@@ -16367,34 +16568,6 @@ function classifyAuthorizationServerMismatch(err) {
   };
 }
 
-// ../../core/node/version.ts
-import { readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname5, join as join3, parse } from "path";
-import { fileURLToPath } from "url";
-var ROOT_PACKAGE_NAME = "@modelcontextprotocol/inspector";
-function readInspectorVersion(callerUrl) {
-  const startDir = dirname5(fileURLToPath(callerUrl));
-  const { root } = parse(startDir);
-  let dir = startDir;
-  for (; ; ) {
-    let manifest;
-    try {
-      manifest = JSON.parse(
-        readFileSync4(join3(dir, "package.json"), "utf-8")
-      );
-    } catch {
-    }
-    if (manifest?.name === ROOT_PACKAGE_NAME && manifest.version) {
-      return manifest.version;
-    }
-    if (dir === root) break;
-    dir = dirname5(dir);
-  }
-  throw new Error(
-    `Could not locate the ${ROOT_PACKAGE_NAME} root package.json above ${startDir}`
-  );
-}
-
 // ../../core/auth/oauth-storage.ts
 import {
   OAuthClientInformationSchema as OAuthClientInformationSchema2,
@@ -17300,6 +17473,17 @@ async function recordNamespaceKeys(stateFilePath, secretStore, namespace, server
     warnLedgerFailure("update", error);
   }
 }
+async function recordedNamespaces(stateFilePath) {
+  try {
+    const ledger = parseLedger(
+      await readStoreFile(namespaceLedgerPath(stateFilePath))
+    );
+    return [...ledger.keys()].reverse();
+  } catch (error) {
+    warnLedgerFailure("read", error);
+    return [];
+  }
+}
 async function purgeSupersededNamespaces(stateFilePath, secretStore, current) {
   let ledger;
   let location;
@@ -17463,24 +17647,13 @@ async function adoptSecretsNamespace(filePath, secretStore, locked) {
   if (raw !== null && snapshot === null) {
     throw new OAuthStateFileUnrecognizedError(filePath, "save");
   }
-  if (locked) {
-    await purgeSupersededNamespaces(filePath, secretStore, void 0);
-  }
   const namespace = newSecretsNamespace();
-  if (snapshot === null) return namespace;
-  const moves = [
-    ...Object.entries(snapshot.servers).map(([url, state]) => ({
-      legacyId: oauthSecretServerId(url),
-      scopedId: oauthSecretServerId(url, namespace),
-      fields: serverSecretFields(state)
-    })),
-    ...Object.keys(snapshot.idpSessions).map((issuer) => ({
-      legacyId: oauthIdpSecretServerId(issuer),
-      scopedId: oauthIdpSecretServerId(issuer, namespace),
-      fields: [IDP_SESSION_FIELD]
-    }))
-  ];
-  if (moves.length === 0) return namespace;
+  if (snapshot === null || Object.keys(snapshot.servers).length === 0 && Object.keys(snapshot.idpSessions).length === 0) {
+    if (locked) {
+      await purgeSupersededNamespaces(filePath, secretStore, void 0);
+    }
+    return namespace;
+  }
   if (!locked) {
     throw new SecretStoreUnavailableError(
       `Could not save OAuth state: ${filePath} predates per-state-file secret namespaces, and migrating its secret-store entries needs the file lock, which is unavailable here (see the lock warning above). Migrating without it could lose credentials if two processes migrate at once. Nothing was changed; make the lock directory writable and retry \u2014 or, if you cannot, clear this file's stored OAuth state and re-authorize (clearing does not migrate, and the fresh state file mints its namespace without the lock).`
@@ -17495,10 +17668,24 @@ async function adoptSecretsNamespace(filePath, secretStore, locked) {
   );
   const touched = [];
   try {
-    for (const { legacyId, scopedId, fields } of moves) {
-      for (const field of fields) {
-        const value = await secretStoreGetStrict(secretStore, legacyId, field);
-        if (value === null) continue;
+    const values = await readEntrySecrets(
+      snapshot,
+      secretStore,
+      void 0,
+      await recordedNamespaces(filePath)
+    );
+    const copies = [
+      ...[...values.servers].map(([url, secrets]) => ({
+        scopedId: oauthSecretServerId(url, namespace),
+        secrets
+      })),
+      ...[...values.idpSessions].map(([issuer, secrets]) => ({
+        scopedId: oauthIdpSecretServerId(issuer, namespace),
+        secrets
+      }))
+    ];
+    for (const { scopedId, secrets } of copies) {
+      for (const [field, value] of Object.entries(secrets)) {
         touched.push({ serverId: scopedId, field, value: null });
         await secretStore.set(scopedId, field, value);
       }
@@ -17508,7 +17695,14 @@ async function adoptSecretsNamespace(filePath, secretStore, locked) {
     await restoreSecretFields(secretStore, touched, warnRestoreFailure);
     throw error;
   }
-  for (const { legacyId } of moves) {
+  await purgeSupersededNamespaces(filePath, secretStore, namespace);
+  const legacyIds = [
+    ...Object.keys(snapshot.servers).map((url) => oauthSecretServerId(url)),
+    ...Object.keys(snapshot.idpSessions).map(
+      (issuer) => oauthIdpSecretServerId(issuer)
+    )
+  ];
+  for (const legacyId of legacyIds) {
     try {
       await secretStore.deleteAllForServer(legacyId);
     } catch (error) {
@@ -17561,6 +17755,14 @@ function preserveNonDurableSecrets(diskSecrets, secrets) {
   return keep;
 }
 async function writeOAuthSections(filePath, snapshot, sections, secretStore = defaultSecretStore()) {
+  await writeOAuthSectionsFrom(
+    filePath,
+    async () => snapshot,
+    sections,
+    secretStore
+  );
+}
+async function writeOAuthSectionsFrom(filePath, resolveSnapshot, sections, secretStore) {
   const policy = getPersistTokensPolicy();
   const durable = await secretStoreIsDurable(secretStore);
   await withOAuthStateLock(filePath, "save", async (locked) => {
@@ -17644,6 +17846,7 @@ async function writeOAuthSections(filePath, snapshot, sections, secretStore = de
           unconfirmed = null;
           namespace = diskNamespace;
         }
+        const snapshot = await resolveSnapshot(disk, namespace);
         const effective = sections ? {
           servers: sections.servers && [...new Set(sections.servers)],
           idpSessions: sections.idpSessions && [
@@ -17677,7 +17880,8 @@ async function writeOAuthSections(filePath, snapshot, sections, secretStore = de
           const candidates = [
             .../* @__PURE__ */ new Set([
               ...serverSecretFields(getOwnEntry(disk?.servers, url)),
-              ...serverSecretFields(next)
+              ...serverSecretFields(next),
+              ...[...restoreBaseline.values()].filter((prior) => prior.serverId === serverId).map(({ field }) => field)
             ])
           ];
           const entryPrior = await snapshotSecretFields(
@@ -17686,8 +17890,12 @@ async function writeOAuthSections(filePath, snapshot, sections, secretStore = de
             candidates
           );
           priorSecrets.push(...entryPrior);
+          const entryPriorValue = new Map(
+            entryPrior.map(({ field, value }) => [field, value])
+          );
           if (next === void 0) {
             for (const field of candidates) {
+              if (entryPriorValue.get(field) === null) continue;
               ourWrites.set(priorKey({ serverId, field }), null);
             }
             await secretStore.deleteAllForServer(serverId);
@@ -17702,10 +17910,9 @@ async function writeOAuthSections(filePath, snapshot, sections, secretStore = de
           }
           const { residue, secrets } = splitServerOAuthState(next, policy);
           for (const field of candidates) {
-            ourWrites.set(
-              priorKey({ serverId, field }),
-              secrets[field] ?? null
-            );
+            const value = secrets[field] ?? null;
+            if (value === entryPriorValue.get(field)) continue;
+            ourWrites.set(priorKey({ serverId, field }), value);
           }
           setOwnEntry(merged.servers, url, residue);
           if (!durable) {
@@ -17848,26 +18055,52 @@ function secretRequestsFor(snapshot, namespace) {
   }
   return requests;
 }
-async function joinSnapshot(snapshot, secretStore, namespace) {
-  const requests = secretRequestsFor(snapshot, namespace);
-  const values = requests.length > 0 ? await secretStoreGetManyStrict(secretStore, requests) : {};
+function fillMissingSecrets(target, source) {
+  for (const [field, value] of Object.entries(source ?? {})) {
+    if (!Object.hasOwn(target, field)) setOwnEntry(target, field, value);
+  }
+}
+async function readEntrySecrets(snapshot, secretStore, namespace, fallbacks) {
+  const servers = /* @__PURE__ */ new Map();
+  const idpSessions = /* @__PURE__ */ new Map();
+  for (const url of Object.keys(snapshot.servers)) servers.set(url, {});
+  for (const issuer of Object.keys(snapshot.idpSessions)) {
+    idpSessions.set(issuer, {});
+  }
+  for (const source of [namespace, ...fallbacks]) {
+    const requests = secretRequestsFor(snapshot, source);
+    if (requests.length === 0) break;
+    const values = await secretStoreGetManyStrict(secretStore, requests);
+    for (const [url, target] of servers) {
+      fillMissingSecrets(target, values[oauthSecretServerId(url, source)]);
+    }
+    for (const [issuer, target] of idpSessions) {
+      fillMissingSecrets(
+        target,
+        values[oauthIdpSecretServerId(issuer, source)]
+      );
+    }
+  }
+  return { servers, idpSessions };
+}
+async function joinSnapshot(snapshot, secretStore, namespace, fallbacks) {
+  const values = await readEntrySecrets(
+    snapshot,
+    secretStore,
+    namespace,
+    fallbacks
+  );
   return {
     servers: Object.fromEntries(
       Object.entries(snapshot.servers).map(([url, state]) => [
         url,
-        joinServerOAuthState(
-          state,
-          values[oauthSecretServerId(url, namespace)] ?? {}
-        )
+        joinServerOAuthState(state, values.servers.get(url) ?? {})
       ])
     ),
     idpSessions: Object.fromEntries(
       Object.entries(snapshot.idpSessions).map(([issuer, session]) => [
         issuer,
-        joinIdpSession(
-          session,
-          values[oauthIdpSecretServerId(issuer, namespace)] ?? {}
-        )
+        joinIdpSession(session, values.idpSessions.get(issuer) ?? {})
       ])
     )
   };
@@ -17934,7 +18167,9 @@ async function readOAuthStore(filePath, secretStore = defaultSecretStore()) {
         warnMigrationFailure(error);
       }
     }
-    return joinSnapshot(snapshot, secretStore, parseSecretsNamespace(raw));
+    const namespace = parseSecretsNamespace(raw);
+    const fallbacks = namespace === void 0 ? await recordedNamespaces(filePath) : [];
+    return joinSnapshot(snapshot, secretStore, namespace, fallbacks);
   });
 }
 async function removeOAuthStore(filePath, secretStore = defaultSecretStore()) {
@@ -19069,8 +19304,24 @@ function copyViaOsc52(text, sink) {
     large: payloadBytes > OSC52_LARGE_PAYLOAD_BYTES
   };
 }
+var copyDirs = /* @__PURE__ */ new Set();
+var exitCleanupRegistered = false;
+function removeCopyFiles() {
+  for (const dir of copyDirs) {
+    try {
+      fs5.rmSync(dir, { recursive: true, force: true });
+    } catch {
+    }
+    copyDirs.delete(dir);
+  }
+}
 function writeCopyFile(text, baseDir = os.tmpdir()) {
   const dir = fs5.mkdtempSync(path6.join(baseDir, "mcp-inspector-copy-"));
+  copyDirs.add(dir);
+  if (!exitCleanupRegistered) {
+    process.on("exit", removeCopyFiles);
+    exitCleanupRegistered = true;
+  }
   const file = path6.join(dir, "value.txt");
   fs5.writeFileSync(file, text, { encoding: "utf8", mode: 384 });
   return file;
@@ -19107,7 +19358,10 @@ function useCopyKeys(value, label) {
       if (key === SAVE_KEY) {
         try {
           const file = writeCopyFile(value);
-          setStatus({ tone: "success", message: `Saved ${label} to ${file}` });
+          setStatus({
+            tone: "success",
+            message: `Saved ${label} to ${file} (deleted when the TUI exits)`
+          });
         } catch (err) {
           setStatus({
             tone: "error",
@@ -19516,7 +19770,7 @@ import { useCallback as useCallback14, useEffect as useEffect4, useMemo, useStat
 function printable(input) {
   return input.replace(/[\u0000-\u001f\u007f]/g, "");
 }
-function useListFilter(items, fields, { enabled, onEditingChange }) {
+function useListFilter(items, fields, { enabled, onEditingChange, onEscapeClaimChange }) {
   const [query, setQuery] = useState7("");
   const [editingRequested, setEditingRequested] = useState7(false);
   const editing = editingRequested && enabled;
@@ -19525,6 +19779,13 @@ function useListFilter(items, fields, { enabled, onEditingChange }) {
     onEditingChange?.(true);
     return () => onEditingChange?.(false);
   }, [editing, onEditingChange]);
+  const active = query.trim() !== "";
+  const claimsEscape = enabled && active && !editingRequested;
+  useEffect4(() => {
+    if (!claimsEscape) return;
+    onEscapeClaimChange?.(true);
+    return () => onEscapeClaimChange?.(false);
+  }, [claimsEscape, onEscapeClaimChange]);
   const { filtered, indices } = useMemo(() => {
     const needle = query.trim().toLowerCase();
     const filtered2 = [];
@@ -19545,6 +19806,10 @@ function useListFilter(items, fields, { enabled, onEditingChange }) {
           setEditingRequested(true);
           return true;
         }
+        if (key.escape && query.trim() !== "") {
+          setQuery("");
+          return true;
+        }
         return false;
       }
       if (key.escape) {
@@ -19568,12 +19833,12 @@ function useListFilter(items, fields, { enabled, onEditingChange }) {
       if (text) setQuery((prev) => prev + text);
       return true;
     },
-    [enabled, editingRequested]
+    [enabled, editingRequested, query]
   );
   return {
     query,
     editing,
-    active: query.trim() !== "",
+    active,
     items: filtered,
     indices,
     handleInput
@@ -19593,7 +19858,7 @@ function ListFilterBar({ query, editing, focused }) {
   ] }) : query.trim() !== "" ? /* @__PURE__ */ jsxs5(Text5, { wrap: "truncate-end", children: [
     /* @__PURE__ */ jsx6(Text5, { color: "cyan", children: "/" }),
     query,
-    /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: " (/ to edit)" })
+    /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: focused ? " (/ edit \xB7 Esc clear)" : " (/ to edit)" })
   ] }) : focused ? /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: "/ to filter" }) : /* @__PURE__ */ jsx6(Text5, { children: " " }) });
 }
 function filterCount(active, shown, total) {
@@ -19618,7 +19883,8 @@ function ResourcesTab({
   onFetchTemplate,
   onAuthRecoveryRequired,
   modalOpen = false,
-  onFilterEditingChange
+  onFilterEditingChange,
+  onFilterEscapeClaimChange
 }) {
   const [error, setError] = useState8(null);
   const [resourceContent, setResourceContent] = useState8(null);
@@ -19641,7 +19907,8 @@ function ResourcesTab({
   const visibleCount = Math.max(1, height - 7 - LIST_FILTER_ROWS);
   const filter = useListFilter(allItems, resourceFilterFields, {
     enabled: !modalOpen && focusedPane === "list",
-    onEditingChange: onFilterEditingChange
+    onEditingChange: onFilterEditingChange,
+    onEscapeClaimChange: onFilterEscapeClaimChange
   });
   const shownItems = filter.items;
   const { selectedIndex, firstVisible, setSelection } = useSelectableList(
@@ -19914,12 +20181,14 @@ function PromptsTab({
   onFetchPrompt,
   onAuthRecoveryRequired,
   modalOpen = false,
-  onFilterEditingChange
+  onFilterEditingChange,
+  onFilterEscapeClaimChange
 }) {
   const visibleCount = Math.max(1, height - 7 - LIST_FILTER_ROWS);
   const filter = useListFilter(prompts, promptFilterFields, {
     enabled: !modalOpen && focusedPane === "list",
-    onEditingChange: onFilterEditingChange
+    onEditingChange: onFilterEditingChange,
+    onEscapeClaimChange: onFilterEscapeClaimChange
   });
   const shownPrompts = filter.items;
   const { selectedIndex, firstVisible, setSelection } = useSelectableList(
@@ -20137,6 +20406,10 @@ import {
 import { Box as Box9, Text as Text8, useInput as useInput5 } from "ink";
 
 // ../../core/mcp/skillsVerification.ts
+var DEFAULT_SKILL_BUDGET_HINT = {
+  raise: "with the server's skillCatalogMaxSkills / skillCatalogMaxBytes settings",
+  verifyOne: "by verifying this skill alone"
+};
 function reasonOf(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -20198,7 +20471,7 @@ function responseBytes(result) {
   }
   return total;
 }
-async function verifySkills(client, entries, metadata) {
+async function verifySkills(client, entries, metadata, budgetHint = DEFAULT_SKILL_BUDGET_HINT) {
   const collisions = checkSkillNameCollisions(entries);
   const reports = [];
   const budget = resolveSkillCatalogBudget(client.getServerSettings?.());
@@ -20210,7 +20483,7 @@ async function verifySkills(client, entries, metadata) {
     const files = [];
     const declared = entry.resources === DYNAMIC_RESOURCES ? [] : entry.resources;
     const manifest = withinBudget ? boundedManifest(declared) : [];
-    let incomplete = !withinBudget ? `Not read: this run already reached its catalog budget of ${budget.maxSkills} skills / ${budget.maxBytes} bytes (raise it in the server's Skills settings). Nothing about this skill's files has been checked \u2014 verify it on its own with \`--method skills/get --uri <uri> --verify\`, where <uri> is this report's uri, to get a verdict.` : manifest.length < declared.length ? `Only ${manifest.length} of ${declared.length} manifest entries were read: the skill exceeds the ${SKILL_MAX_RESOURCE_ENTRIES}-entry / ${SKILL_MAX_TOTAL_BYTES}-byte interoperability limits, so the rest were not fetched and cannot be reported on.` : void 0;
+    let incomplete = !withinBudget ? `Not read: this run already reached its catalog budget of ${budget.maxSkills} skills / ${budget.maxBytes} bytes (raise it ${budgetHint.raise}). Nothing about this skill's files has been checked \u2014 verify it on its own ${budgetHint.verifyOne} to get a verdict.` : manifest.length < declared.length ? `Only ${manifest.length} of ${declared.length} manifest entries were read: the skill exceeds the ${SKILL_MAX_RESOURCE_ENTRIES}-entry / ${SKILL_MAX_TOTAL_BYTES}-byte interoperability limits, so the rest were not fetched and cannot be reported on.` : void 0;
     let receivedBytes = 0;
     const entryIdentity = skillUriIdentity(entry.uri);
     let selfAttempted = false;
@@ -20365,6 +20638,10 @@ var FILE_COLOR = {
   error: "red",
   "read-error": "red"
 };
+var TUI_SKILL_BUDGET_HINT = {
+  raise: "with --skill-catalog-max-skills / --skill-catalog-max-bytes at launch",
+  verifyOne: "by selecting it and pressing Enter"
+};
 var VERIFY_STATUS = {
   verified: "[Verified \u2014 Enter to re-verify]",
   unverifiable: "[UNVERIFIABLE \u2014 Enter to re-verify]",
@@ -20425,12 +20702,14 @@ function SkillsTab({
   focusedPane = null,
   onAuthRecoveryRequired,
   modalOpen = false,
-  onFilterEditingChange
+  onFilterEditingChange,
+  onFilterEscapeClaimChange
 }) {
   const visibleCount = Math.max(1, height - 8 - LIST_FILTER_ROWS);
   const filter = useListFilter(skills, skillFilterFields, {
     enabled: !modalOpen && focusedPane === "list",
-    onEditingChange: onFilterEditingChange
+    onEditingChange: onFilterEditingChange,
+    onEscapeClaimChange: onFilterEscapeClaimChange
   });
   const shownSkills = filter.items;
   const { selectedIndex, firstVisible, setSelection } = useSelectableList(
@@ -20454,7 +20733,12 @@ function SkillsTab({
       setError(null);
       void (async () => {
         try {
-          const results = await verifySkills(inspectorClient, entries);
+          const results = await verifySkills(
+            inspectorClient,
+            entries,
+            void 0,
+            TUI_SKILL_BUDGET_HINT
+          );
           const live = new Set(skillsRef.current.map(skillEntryKey));
           setReports(
             (previous) => mergeReports(previous, entries, results, live)
@@ -21022,12 +21306,14 @@ function ToolsTab({
   onTestTool,
   onViewDetails,
   modalOpen = false,
-  onFilterEditingChange
+  onFilterEditingChange,
+  onFilterEscapeClaimChange
 }) {
   const visibleCount = Math.max(1, height - 7 - LIST_FILTER_ROWS);
   const filter = useListFilter(tools, toolFilterFields, {
     enabled: !modalOpen && focusedPane === "list",
-    onEditingChange: onFilterEditingChange
+    onEditingChange: onFilterEditingChange,
+    onEscapeClaimChange: onFilterEscapeClaimChange
   });
   const shownTools = filter.items;
   const { selectedIndex, firstVisible, setSelection } = useSelectableList(
@@ -24574,7 +24860,10 @@ function tabAcceleratorBinding(visible) {
 function globalBindings(visible = tabs) {
   return [
     { keys: "?", action: "Show or hide this help" },
-    { keys: "Esc / Ctrl+C", action: "Exit (Esc closes a dialog first)" },
+    {
+      keys: "Esc / Ctrl+C",
+      action: "Exit (Esc closes a dialog or clears a kept filter first)"
+    },
     {
       keys: "Tab / Shift+Tab",
       action: "Move focus: servers \u2192 tabs \u2192 list \u2192 details"
@@ -25451,6 +25740,7 @@ var APP_NAME = "MCP Inspector TUI";
 var APP_DESCRIPTION = "Terminal User Interface for the Model Context Protocol Inspector";
 var APP_VERSION = readInspectorVersion(import.meta.url);
 var TUI_CLIENT_NAME = "inspector-tui";
+var TUI_CONNECTION_TIMEOUT_REMEDY = "To accommodate a slower server, set connectionTimeout on the server's entry in a catalog (--catalog) or config (--config) file.";
 var NO_ROOTS = [];
 var readRoots = (client) => client.getRoots();
 function App({
@@ -25474,6 +25764,7 @@ function App({
   const [helpOpen, setHelpOpen] = useState22(false);
   const focus = helpOpen ? "help" : paneFocus;
   const [listFilterEditing, setListFilterEditing] = useState22(false);
+  const [listFilterClaimsEscape, setListFilterClaimsEscape] = useState22(false);
   const [tabCounts, setTabCounts] = useState22({});
   const [oauthStatus, setOauthStatus] = useState22("idle");
   const [oauthMessage, setOauthMessage] = useState22(null);
@@ -25569,6 +25860,7 @@ function App({
           environment,
           clientIdentity: { name: TUI_CLIENT_NAME, version: APP_VERSION },
           pipeStderr: true,
+          connectionTimeoutRemedy: TUI_CONNECTION_TIMEOUT_REMEDY,
           ...savedSettings && savedSettings.requestTimeout > 0 && {
             timeout: savedSettings.requestTimeout
           },
@@ -26452,6 +26744,7 @@ function App({
       return;
     }
     if (key.escape) {
+      if (listFilterClaimsEscape) return;
       exit();
     }
     const showAuthTab = !!selectedServer && !!selectedServerConfig && isOAuthCapableServerConfig(selectedServerConfig);
@@ -26553,7 +26846,7 @@ function App({
       }
     }
   });
-  const headerHeight = 1;
+  const headerHeight = 2;
   const serverListWidth = Math.floor(dimensions.width * 0.3);
   const contentWidth = dimensions.width - serverListWidth;
   const shownTabs = visibleTabs({
@@ -26612,17 +26905,18 @@ function App({
             justifyContent: "space-between",
             alignItems: "center",
             children: [
-              /* @__PURE__ */ jsxs23(Box35, { children: [
-                /* @__PURE__ */ jsx25(Text32, { bold: true, color: "cyan", children: APP_NAME }),
-                /* @__PURE__ */ jsxs23(Text32, { dimColor: true, children: [
-                  " - ",
+              /* @__PURE__ */ jsxs23(Box35, { flexShrink: 1, overflow: "hidden", children: [
+                /* @__PURE__ */ jsx25(Box35, { flexShrink: 0, children: /* @__PURE__ */ jsx25(Text32, { bold: true, color: "cyan", children: APP_NAME }) }),
+                /* @__PURE__ */ jsxs23(Text32, { dimColor: true, wrap: "truncate-end", children: [
+                  " ",
+                  "- ",
                   APP_DESCRIPTION
                 ] })
               ] }),
-              /* @__PURE__ */ jsxs23(Text32, { dimColor: true, children: [
+              /* @__PURE__ */ jsx25(Box35, { flexShrink: 0, marginLeft: 1, children: /* @__PURE__ */ jsxs23(Text32, { dimColor: true, children: [
                 "v",
                 APP_VERSION
-              ] })
+              ] }) })
             ]
           }
         ),
@@ -26884,6 +27178,7 @@ function App({
                             ResourcesTab,
                             {
                               onFilterEditingChange: setListFilterEditing,
+                              onFilterEscapeClaimChange: setListFilterClaimsEscape,
                               resources: currentServerState.resources,
                               resourceTemplates: currentServerState.resourceTemplates,
                               inspectorClient: selectedInspectorClient,
@@ -26948,6 +27243,7 @@ function App({
                             SkillsTab,
                             {
                               onFilterEditingChange: setListFilterEditing,
+                              onFilterEscapeClaimChange: setListFilterClaimsEscape,
                               skills: managedSkills,
                               pageCount: managedSkillsPageCount,
                               loadError: managedSkillsError,
@@ -26963,6 +27259,7 @@ function App({
                             PromptsTab,
                             {
                               onFilterEditingChange: setListFilterEditing,
+                              onFilterEscapeClaimChange: setListFilterClaimsEscape,
                               prompts: currentServerState.prompts,
                               inspectorClient: selectedInspectorClient,
                               width: contentWidth,
@@ -26988,6 +27285,7 @@ function App({
                             ToolsTab,
                             {
                               onFilterEditingChange: setListFilterEditing,
+                              onFilterEscapeClaimChange: setListFilterClaimsEscape,
                               tools: currentServerState.tools,
                               isConnected: inspectorStatus === "connected",
                               width: contentWidth,
@@ -27145,7 +27443,11 @@ var App_default = App;
 import { jsx as jsx26 } from "react/jsx-runtime";
 async function runTui(args) {
   const program = new Command();
-  program.name("mcp-inspector-tui").description("Terminal UI for MCP Inspector").option(
+  program.name("mcp-inspector-tui").description("Terminal UI for MCP Inspector").version(
+    readInspectorVersion(import.meta.url),
+    "-V, --version",
+    "Print the Inspector version"
+  ).option(
     "--catalog <path>",
     "Writable catalog file (created if missing; default: ~/.mcp-inspector/mcp.json, or MCP_CATALOG_PATH)"
   ).option(