@modelcontextprotocol/inspector 2.7.0 → 2.9.0

package/clients/tui/build/index.js

@@ -165,6 +165,10 @@ var ModernListSkillsResultSchema = ListSkillsResultSchema.extend({
 var GetSkillEnvelopeSchema = z.looseObject({
   skill: SkillEntrySchema
 });
+var ModernGetSkillEnvelopeSchema = GetSkillEnvelopeSchema.extend({
+  ttlMs: z.int().min(0),
+  cacheScope: z.enum(["public", "private"])
+});
 var GetSkillResultSchema = GetSkillEnvelopeSchema.transform(
   (result) => result.skill
 );
@@ -788,6 +792,176 @@ var SECRET_FIELD_OAUTH_CLIENT_SECRET = "oauth-client-secret";
 var SECRET_FIELD_IDP_CLIENT_SECRET = "idp-client-secret";
 var envSecretField = (envKey) => `env:${envKey}`;
 
+// ../../core/json/localRefs.ts
+var SUBSCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
+  "items",
+  "contains",
+  "not",
+  "propertyNames",
+  "if",
+  "then",
+  "else",
+  "additionalProperties",
+  "unevaluatedProperties",
+  "additionalItems",
+  "unevaluatedItems",
+  "contentSchema"
+]);
+var SUBSCHEMA_ARRAY_KEYWORDS = /* @__PURE__ */ new Set([
+  "allOf",
+  "anyOf",
+  "oneOf",
+  "prefixItems"
+]);
+var SUBSCHEMA_MAP_KEYWORDS = /* @__PURE__ */ new Set([
+  "properties",
+  "patternProperties",
+  "dependentSchemas",
+  // Pre-2019 spelling of `dependentSchemas`; its array values are property
+  // name lists, which are not schemas and pass through untouched.
+  "dependencies",
+  "$defs",
+  "definitions"
+]);
+var NON_CONSTRAINT_SIBLINGS = /* @__PURE__ */ new Set([
+  "title",
+  "description",
+  "default",
+  "examples",
+  "deprecated",
+  "readOnly",
+  "writeOnly",
+  // Non-standard labels for `enum` values, read by both form builders.
+  "enumNames",
+  "$comment",
+  "$schema",
+  "$id",
+  "$defs",
+  "definitions"
+]);
+var EXPANSION_BUDGET = 1e4;
+var MAX_DEPTH = 64;
+var Bail = class extends Error {
+};
+function spend(traversal) {
+  traversal.remaining -= 1;
+  if (traversal.remaining < 0) throw new Bail();
+}
+function mapSubschemas(node, visit) {
+  const result = {};
+  for (const [key, value] of Object.entries(node)) {
+    let next = value;
+    if (SUBSCHEMA_KEYWORDS.has(key)) {
+      next = Array.isArray(value) ? value.map(visit) : visit(value);
+    } else if (SUBSCHEMA_ARRAY_KEYWORDS.has(key) && Array.isArray(value)) {
+      next = value.map(visit);
+    } else if (SUBSCHEMA_MAP_KEYWORDS.has(key) && isRecord(value)) {
+      next = mapNames(value, visit);
+    }
+    define(result, key, next);
+  }
+  return result;
+}
+function mapNames(map, visit) {
+  const result = {};
+  for (const [name, value] of Object.entries(map)) {
+    define(result, name, Array.isArray(value) ? value : visit(value));
+  }
+  return result;
+}
+function define(target, key, value) {
+  Object.defineProperty(target, key, {
+    value,
+    writable: true,
+    enumerable: true,
+    configurable: true
+  });
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function resolvePointer(root, ref) {
+  if (!ref.startsWith("#")) return void 0;
+  let pointer;
+  try {
+    pointer = decodeURIComponent(ref.slice(1));
+  } catch {
+    return void 0;
+  }
+  if (pointer === "") return root;
+  if (!pointer.startsWith("/")) return void 0;
+  let current = root;
+  for (const token of pointer.slice(1).split("/")) {
+    if (/~(?![01])/.test(token)) return void 0;
+    const segment = token.replace(/~1/g, "/").replace(/~0/g, "~");
+    if (Array.isArray(current)) {
+      const index = Number(segment);
+      if (!/^(0|[1-9]\d*)$/.test(segment) || index >= current.length) {
+        return void 0;
+      }
+      current = current[index];
+    } else if (isRecord(current) && Object.hasOwn(current, segment)) {
+      current = current[segment];
+    } else {
+      return void 0;
+    }
+  }
+  return current;
+}
+function containsRef(node, depth) {
+  if (depth > MAX_DEPTH) throw new Bail();
+  if (!isRecord(node)) return false;
+  if (typeof node.$ref === "string") return true;
+  let found = false;
+  mapSubschemas(node, (child) => {
+    found ||= containsRef(child, depth + 1);
+    return child;
+  });
+  return found;
+}
+function inline(node, traversal, depth) {
+  if (depth > MAX_DEPTH) throw new Bail();
+  if (!isRecord(node)) return node;
+  if (node !== traversal.root && typeof node.$id === "string") return node;
+  spend(traversal);
+  const visit = (child) => inline(child, traversal, depth + 1);
+  const ref = node.$ref;
+  const siblingsConstrain = Object.keys(node).some(
+    (key) => key !== "$ref" && !NON_CONSTRAINT_SIBLINGS.has(key)
+  );
+  if (typeof ref === "string" && !siblingsConstrain && !traversal.active.has(ref)) {
+    const target = resolvePointer(traversal.root, ref);
+    if (isRecord(target)) {
+      traversal.active.add(ref);
+      const resolved2 = visit(target);
+      traversal.active.delete(ref);
+      const siblings = { ...node };
+      delete siblings.$ref;
+      return { ...resolved2, ...mapSubschemas(siblings, visit) };
+    }
+  }
+  return mapSubschemas(node, visit);
+}
+var cache = /* @__PURE__ */ new WeakMap();
+function inlineLocalRefs(schema) {
+  if (!isRecord(schema)) return schema;
+  const cached = cache.get(schema);
+  if (cached !== void 0) return cached;
+  let resolved2;
+  try {
+    resolved2 = containsRef(schema, 0) ? inline(
+      schema,
+      { root: schema, active: /* @__PURE__ */ new Set(), remaining: EXPANSION_BUDGET },
+      0
+    ) : schema;
+  } catch (error) {
+    if (!(error instanceof Bail)) throw error;
+    resolved2 = schema;
+  }
+  cache.set(schema, resolved2);
+  return resolved2;
+}
+
 // ../../core/json/nullableUnion.ts
 var RENDERABLE_TYPES = [
   "string",
@@ -1386,7 +1560,7 @@ function convertToolParameters(tool, params) {
 function convertParametersForSchema(inputSchema, params) {
   const result = {};
   const { base, branches } = resolveRootUnion(
-    inputSchema ?? {}
+    inlineLocalRefs(inputSchema ?? {})
   );
   const properties = coercionProperties(base, branches, params);
   for (const [key, value] of Object.entries(params)) {
@@ -1578,7 +1752,7 @@ function oauthEndpointOverridesFromSettings(settings) {
   };
 }
 function storedFieldsToInspectorSettings(stored) {
-  const hasAny = stored.headers !== void 0 || stored.metadata !== void 0 || stored.connectionTimeout !== void 0 || stored.requestTimeout !== void 0 || stored.taskTtl !== void 0 || stored.autoRefreshOnListChanged !== void 0 || stored.paginatedLists !== void 0 || stored.advertisedExtensions !== void 0 || stored.maxFetchRequests !== void 0 || stored.skillCatalogMaxSkills !== void 0 || stored.skillCatalogMaxBytes !== void 0 || stored.oauth !== void 0 || stored.roots !== void 0 || stored.protocolEra !== void 0 || stored.modernLogLevel !== void 0 || stored.env !== void 0 || stored.cwd !== void 0;
+  const hasAny = stored.headers !== void 0 || stored.metadata !== void 0 || stored.connectionTimeout !== void 0 || stored.requestTimeout !== void 0 || stored.taskTtl !== void 0 || stored.autoRefreshOnListChanged !== void 0 || stored.paginatedLists !== void 0 || stored.suppressNotificationStream !== void 0 || stored.advertisedExtensions !== void 0 || stored.maxFetchRequests !== void 0 || stored.skillCatalogMaxSkills !== void 0 || stored.skillCatalogMaxBytes !== void 0 || stored.oauth !== void 0 || stored.roots !== void 0 || stored.protocolEra !== void 0 || stored.modernLogLevel !== void 0 || stored.env !== void 0 || stored.cwd !== void 0;
   if (!hasAny) return void 0;
   const headersPairs = stored.headers ? Object.entries(stored.headers).map(([key, value]) => ({ key, value })) : [];
   const settings = {
@@ -1610,6 +1784,9 @@ function storedFieldsToInspectorSettings(stored) {
   if (isSkillCatalogLimit(stored.skillCatalogMaxBytes)) {
     settings.skillCatalogMaxBytes = stored.skillCatalogMaxBytes;
   }
+  if (stored.suppressNotificationStream === true) {
+    settings.suppressNotificationStream = true;
+  }
   if (isProtocolEra(stored.protocolEra)) {
     settings.protocolEra = stored.protocolEra;
   }
@@ -1661,6 +1838,7 @@ var INSPECTOR_FIELD_KEY_MAP = {
   taskTtl: true,
   autoRefreshOnListChanged: true,
   paginatedLists: true,
+  suppressNotificationStream: true,
   advertisedExtensions: true,
   maxFetchRequests: true,
   skillCatalogMaxSkills: true,
@@ -2015,7 +2193,7 @@ function secretStorageCaveat(info) {
     return `The secrets file could not be read (${info.encryptionUnknown}). Saving a secret will fail rather than overwrite it.`;
   }
   if (info.plaintext) {
-    return info.pendingEncryption ? "Existing secrets in this file are still unencrypted (file mode 0600). They are re-encrypted the next time a secret is saved." : "Secrets are stored unencrypted (file mode 0600). Set MCP_INSPECTOR_SECRET_KEY to encrypt them.";
+    return info.pendingEncryption ? "Existing secrets in this file are still unencrypted (file mode 0600). They are re-encrypted the next time a secret is saved." : "Secrets are stored unencrypted (file mode 0600). Set MCP_INSPECTOR_SECRET_KEY or MCP_INSPECTOR_SECRET_KEY_FILE to encrypt them.";
   }
   return void 0;
 }
@@ -2030,9 +2208,23 @@ function secretStorageSummary(info) {
 
 // ../../core/auth/node/file-secret-store.ts
 import * as crypto2 from "crypto";
+import { readFileSync as readFileSync2, statSync as statSync2 } from "fs";
 import * as fs3 from "fs/promises";
 import * as path3 from "path";
 
+// ../../core/storage/own-entry.ts
+function setOwnEntry(map, key, value) {
+  Object.defineProperty(map, key, {
+    value,
+    enumerable: true,
+    writable: true,
+    configurable: true
+  });
+}
+function getOwnEntry(map, key) {
+  return map !== void 0 && Object.hasOwn(map, key) ? map[key] : void 0;
+}
+
 // ../../core/auth/node/file-lock.ts
 import nodeFs, { statSync, rmdirSync } from "fs";
 import * as fs2 from "fs/promises";
@@ -2091,6 +2283,12 @@ var SecretStoreUnavailableError = class extends Error {
     this.name = "SecretStoreUnavailableError";
   }
 };
+var SecretFileLockHeldError = class extends SecretStoreUnavailableError {
+  constructor(message, options) {
+    super(message, options);
+    this.name = "SecretFileLockHeldError";
+  }
+};
 var KeychainUnavailableError = class extends SecretStoreUnavailableError {
   constructor(cause) {
     const message = cause instanceof Error ? cause.message : String(cause);
@@ -2121,6 +2319,7 @@ async function probeKeyringAvailable() {
   try {
     const entry = new keyring.mod.AsyncEntry(SERVICE_NAME, PROBE_ACCOUNT);
     await entry.getPassword();
+    await keyring.mod.findCredentialsAsync(SERVICE_NAME);
     return { available: true };
   } catch (err) {
     return {
@@ -2130,6 +2329,7 @@ async function probeKeyringAvailable() {
   }
 }
 var PROBE_ACCOUNT = "__inspector:probe";
+var isNoEntryError = (err) => err instanceof Error && /no (matching )?entry/i.test(err.message);
 var KeyringSecretStore = class {
   /**
    * The intolerant read. Same lookup as {@link get}, minus the catch — a
@@ -2181,23 +2381,27 @@ var KeyringSecretStore = class {
   async delete(serverId, field) {
     try {
       const keyring = await loadKeyring();
-      if (!keyring.ok) return;
+      if (!keyring.ok) throw new KeychainUnavailableError(keyring.err);
       const entry = new keyring.mod.AsyncEntry(
         SERVICE_NAME,
         buildAccount(serverId, field)
       );
       await entry.deleteCredential();
-    } catch {
+    } catch (err) {
+      if (isNoEntryError(err)) return;
+      if (err instanceof KeychainUnavailableError) throw err;
+      throw new KeychainUnavailableError(err);
     }
   }
   async deleteAllForServer(serverId) {
     let creds;
     try {
       const keyring = await loadKeyring();
-      if (!keyring.ok) return;
+      if (!keyring.ok) throw new KeychainUnavailableError(keyring.err);
       creds = await keyring.mod.findCredentialsAsync(SERVICE_NAME);
-    } catch {
-      return;
+    } catch (err) {
+      if (err instanceof KeychainUnavailableError) throw err;
+      throw new KeychainUnavailableError(err);
     }
     const prefix = `${serverId}:`;
     for (const c of creds) {
@@ -2211,6 +2415,25 @@ var KeyringSecretStore = class {
 async function secretStoreGetStrict(store, serverId, field) {
   return store.getStrict ? store.getStrict(serverId, field) : store.get(serverId, field);
 }
+async function snapshotSecretFields(store, serverId, fields) {
+  return Promise.all(
+    fields.map(async (field) => ({
+      serverId,
+      field,
+      value: await secretStoreGetStrict(store, serverId, field)
+    }))
+  );
+}
+async function restoreSecretFields(store, snapshot, onRestoreFailure) {
+  for (const { serverId, field, value } of snapshot) {
+    try {
+      if (value === null) await store.delete(serverId, field);
+      else await store.set(serverId, field, value);
+    } catch (error) {
+      onRestoreFailure(error);
+    }
+  }
+}
 async function secretStoreGetMany(store, requests) {
   if (store.getMany) return store.getMany(requests);
   const out = {};
@@ -2223,16 +2446,44 @@ async function secretStoreGetMany(store, requests) {
       );
       const found = {};
       for (const [field, value] of entries) {
-        if (value !== null) found[field] = value;
+        if (value !== null) setOwnEntry(found, field, value);
+      }
+      setOwnEntry(out, serverId, found);
+    })
+  );
+  return out;
+}
+async function secretStoreGetManyStrict(store, requests) {
+  if (store.getManyStrict) return store.getManyStrict(requests);
+  const out = {};
+  await Promise.all(
+    requests.map(async ({ serverId, fields }) => {
+      const entries = await Promise.all(
+        fields.map(
+          async (field) => [
+            field,
+            await secretStoreGetStrict(store, serverId, field)
+          ]
+        )
+      );
+      const found = {};
+      for (const [field, value] of entries) {
+        if (value !== null) setOwnEntry(found, field, value);
       }
-      out[serverId] = found;
+      setOwnEntry(out, serverId, found);
     })
   );
   return out;
 }
+async function settleStoreMutations(mutations) {
+  const results = await Promise.allSettled(mutations);
+  for (const result of results) {
+    if (result.status === "rejected") throw result.reason;
+  }
+}
 async function secretStoreSetMany(store, serverId, values) {
   if (store.setMany) return store.setMany(serverId, values);
-  await Promise.all(
+  await settleStoreMutations(
     Object.entries(values).map(
       ([field, value]) => store.set(serverId, field, value)
     )
@@ -2401,7 +2652,7 @@ async function openSecretFileLock(filePath) {
     });
   } catch (err) {
     if (isStuckOrHeld(err, lockPathOf(target))) {
-      throw new SecretStoreUnavailableError(
+      throw new SecretFileLockHeldError(
         `Could not save to the secrets file at ${target}: its lock (${lockPathOf(target)}) was still held after the ${Math.round(RETRY_BUDGET_MS / 1e3)} seconds this save waited. Its secrets are intact; the value you just entered was not saved. If no other Inspector is running, remove that lock and try again.`
       );
     }
@@ -2460,7 +2711,63 @@ var SCRYPT_N = 16384;
 var SCRYPT_R = 8;
 var SCRYPT_P = 1;
 var SECRET_KEY_ENV = "MCP_INSPECTOR_SECRET_KEY";
+var SECRET_KEY_FILE_ENV = "MCP_INSPECTOR_SECRET_KEY_FILE";
+function isSameFile(a, b) {
+  if (path3.resolve(a) === path3.resolve(b)) return true;
+  try {
+    const sa = statSync2(a);
+    const sb = statSync2(b);
+    return sa.dev === sb.dev && sa.ino === sb.ino;
+  } catch {
+    return false;
+  }
+}
+function resolveSecretPassphrase(env2 = process.env, secretFilePath) {
+  const direct = env2[SECRET_KEY_ENV];
+  const hasDirect = direct !== void 0 && direct.trim() !== "";
+  const rawKeyFile = env2[SECRET_KEY_FILE_ENV];
+  const wantsKeyFile = rawKeyFile !== void 0;
+  const keyFile = rawKeyFile?.trim();
+  if (hasDirect && wantsKeyFile) {
+    return {
+      problem: `both ${SECRET_KEY_ENV} and ${SECRET_KEY_FILE_ENV} are set; set only one`
+    };
+  }
+  if (hasDirect) return { passphrase: direct };
+  if (!wantsKeyFile) return {};
+  if (!keyFile) {
+    return { problem: `${SECRET_KEY_FILE_ENV} is set but empty` };
+  }
+  const resolved2 = path3.resolve(keyFile);
+  if (secretFilePath !== void 0 && isSameFile(resolved2, secretFilePath)) {
+    return {
+      problem: `${SECRET_KEY_FILE_ENV} (${resolved2}) is the secrets file itself; point it at a separate key file`
+    };
+  }
+  let contents;
+  try {
+    contents = readFileSync2(resolved2, "utf-8");
+  } catch (err) {
+    return {
+      // `String(err)` rather than `.message`: `readFileSync` only ever throws
+      // an `Error`, so an `instanceof` guard would be a branch no test can take.
+      problem: `${SECRET_KEY_FILE_ENV} (${resolved2}) could not be read: ${String(err)}`
+    };
+  }
+  const passphrase = contents.replace(/[\r\n]+$/, "");
+  if (passphrase.trim() === "") {
+    return { problem: `${SECRET_KEY_FILE_ENV} (${resolved2}) is empty` };
+  }
+  return { passphrase };
+}
 var buildAccount2 = (serverId, field) => `${serverId}:${field}`;
+function assertSecretString(field, value) {
+  if (typeof value !== "string") {
+    throw new TypeError(
+      `Refusing to store a non-string secret value (${typeof value}) for "${field}": the secrets file holds only strings, and writing this would make the whole file unreadable.`
+    );
+  }
+}
 function asSecretMap(value, filePath) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     throw new SecretStoreUnavailableError(
@@ -2479,7 +2786,7 @@ function asSecretMap(value, filePath) {
 var SecretFileKeyMismatchError = class extends SecretStoreUnavailableError {
   constructor(filePath, hasKey) {
     super(
-      hasKey ? `The secrets file at ${filePath} could not be decrypted with the current ${SECRET_KEY_ENV}. Refusing to write, which would overwrite the existing secrets. Restore the original passphrase, or delete the file to start over.` : `The secrets file at ${filePath} is encrypted but ${SECRET_KEY_ENV} is not set. Refusing to write, which would overwrite the existing secrets. Set the passphrase this file was written with, or delete the file to start over.`
+      hasKey ? `The secrets file at ${filePath} could not be decrypted with the current ${SECRET_KEY_ENV} (or ${SECRET_KEY_FILE_ENV}). Refusing to write, which would overwrite the existing secrets. Restore the original passphrase, or delete the file to start over.` : `The secrets file at ${filePath} is encrypted but ${SECRET_KEY_ENV} is not set (nor ${SECRET_KEY_FILE_ENV}). Refusing to write, which would overwrite the existing secrets. Set the passphrase this file was written with, or delete the file to start over.`
     );
     this.name = "SecretFileKeyMismatchError";
   }
@@ -2537,10 +2844,17 @@ function encryptedEnvelopeProblem(parsed) {
 var FileSecretStore = class {
   filePath;
   passphrase;
+  /**
+   * Why a configured key could not be obtained. While set, every read throws
+   * and every write refuses — see {@link SecretPassphrase}.
+   */
+  keyProblem;
   constructor(options) {
     this.filePath = options.filePath;
-    const raw = options.passphrase ?? process.env[SECRET_KEY_ENV];
+    const resolved2 = options.passphrase !== void 0 ? { passphrase: options.passphrase } : resolveSecretPassphrase(process.env, this.filePath);
+    const raw = resolved2.passphrase;
     this.passphrase = raw && raw.trim() ? raw : void 0;
+    this.keyProblem = resolved2.problem;
   }
   /**
    * True when the *next write* will encrypt. This is the configured policy,
@@ -2555,7 +2869,8 @@ var FileSecretStore = class {
    * no file yet, or when it cannot be read or parsed.
    *
    * Separate from {@link encrypted} because the two genuinely disagree for a
-   * whole session: adding `MCP_INSPECTOR_SECRET_KEY` to an install that
+   * whole session: adding a passphrase (`MCP_INSPECTOR_SECRET_KEY` or
+   * `MCP_INSPECTOR_SECRET_KEY_FILE`) to an install that
    * already has a plaintext file flips `encrypted` to true immediately,
    * while the bytes stay readable until the next `set`. A descriptor built
    * from the policy would tell that user "File (encrypted)" while their
@@ -2579,6 +2894,9 @@ var FileSecretStore = class {
    * `set` is in fact about to refuse.
    */
   async readOnDiskEncryption() {
+    if (this.keyProblem !== void 0) {
+      return { state: "unreadable", detail: this.keyProblem };
+    }
     let raw;
     try {
       raw = await readStoreFile(this.filePath);
@@ -2616,7 +2934,7 @@ var FileSecretStore = class {
         } catch (err) {
           return {
             state: "unreadable",
-            detail: err instanceof SecretFileKeyMismatchError ? `it cannot be decrypted with the current ${SECRET_KEY_ENV}` : err instanceof Error ? err.message : String(err)
+            detail: err instanceof SecretFileKeyMismatchError ? `it cannot be decrypted with the current ${SECRET_KEY_ENV} (or ${SECRET_KEY_FILE_ENV})` : err instanceof Error ? err.message : String(err)
           };
         }
         return { state: "encrypted" };
@@ -2667,6 +2985,11 @@ var FileSecretStore = class {
     return this.serialize(() => this.readMap());
   }
   async readMap() {
+    if (this.keyProblem !== void 0) {
+      throw new SecretStoreUnavailableError(
+        `The secrets file at ${this.filePath} cannot be used: ${this.keyProblem}. Refusing to read or write it rather than store secrets unencrypted.`
+      );
+    }
     const raw = await readStoreFile(this.filePath);
     if (raw === null) return null;
     let parsed;
@@ -2703,7 +3026,9 @@ var FileSecretStore = class {
     let plain;
     try {
       const key = await this.deriveKey(parsed.kdf);
-      const decipher = crypto2.createDecipheriv(CIPHER, key, parts.iv);
+      const decipher = crypto2.createDecipheriv(CIPHER, key, parts.iv, {
+        authTagLength: GCM_TAG_BYTES
+      });
       decipher.setAuthTag(parts.tag);
       plain = Buffer.concat([
         decipher.update(parts.body),
@@ -2737,7 +3062,9 @@ var FileSecretStore = class {
       };
       const key = await this.deriveKey(kdf);
       const iv = crypto2.randomBytes(IV_BYTES);
-      const cipher = crypto2.createCipheriv(CIPHER, key, iv);
+      const cipher = crypto2.createCipheriv(CIPHER, key, iv, {
+        authTagLength: GCM_TAG_BYTES
+      });
       const body = Buffer.concat([
         cipher.update(JSON.stringify(map), "utf-8"),
         cipher.final()
@@ -2902,9 +3229,36 @@ var FileSecretStore = class {
       const found = {};
       for (const field of fields) {
         const value = map?.[buildAccount2(serverId, field)];
-        if (value !== void 0) found[field] = value;
+        if (value !== void 0) setOwnEntry(found, field, value);
       }
-      out[serverId] = found;
+      setOwnEntry(out, serverId, found);
+    }
+    return out;
+  }
+  /**
+   * Bulk twin of {@link getStrict}: the same single-pass read as
+   * {@link getMany}, but an unreadable store throws (with the typed advice
+   * {@link getStrict} attaches) instead of yielding no fields — required by
+   * OAuth read hydration, whose result later drives store deletions.
+   */
+  async getManyStrict(requests) {
+    let map;
+    try {
+      map = await this.serialize(() => this.readMap());
+    } catch (err) {
+      if (err instanceof SecretStoreUnavailableError) throw err;
+      throw new SecretStoreUnavailableError(
+        `Could not read the secrets file at ${this.filePath}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+    const out = {};
+    for (const { serverId, fields } of requests) {
+      const found = {};
+      for (const field of fields) {
+        const value = map?.[buildAccount2(serverId, field)];
+        if (value !== void 0) setOwnEntry(found, field, value);
+      }
+      setOwnEntry(out, serverId, found);
     }
     return out;
   }
@@ -2948,6 +3302,9 @@ var FileSecretStore = class {
    */
   async setMany(serverId, values) {
     if (Object.keys(values).length === 0) return;
+    for (const [field, value] of Object.entries(values)) {
+      assertSecretString(field, value);
+    }
     await this.serialize(
       () => this.mutate((map) => {
         const next = { ...map };
@@ -2959,6 +3316,7 @@ var FileSecretStore = class {
     );
   }
   async set(serverId, field, value) {
+    assertSecretString(field, value);
     await this.serialize(
       () => this.mutate((map) => ({
         ...map,
@@ -2974,9 +3332,11 @@ var FileSecretStore = class {
     await this.deleteWhere((key) => key.startsWith(prefix));
   }
   /**
-   * Shared delete body. Silent on every failure, matching the keyring store:
-   * every reason a delete can fail collapses to "the entry isn't there
-   * anymore", and `set` is the operation that reports a broken store.
+   * Shared delete body. Same confirmed-delete contract as the keyring
+   * store: a deletion that cannot be confirmed (unreadable file, failed
+   * decrypt, failed write) must escape, because reporting success would
+   * let a caller commit state that assumes the entry is gone — once the
+   * file becomes readable again, a later read would resurrect it.
    */
   async deleteWhere(match) {
     try {
@@ -2989,7 +3349,12 @@ var FileSecretStore = class {
           return next;
         })
       );
-    } catch {
+    } catch (err) {
+      if (err instanceof SecretStoreUnavailableError) throw err;
+      throw new SecretStoreUnavailableError(
+        `Could not delete from the secrets file: ${err instanceof Error ? err.message : String(err)}`,
+        { cause: err }
+      );
     }
   }
 };
@@ -3022,6 +3387,7 @@ async function readSecretFilePermissions(filePath) {
 var SECRET_STORE_ENV = "MCP_INSPECTOR_SECRET_STORE";
 var SECRET_FILE_ENV = "MCP_INSPECTOR_SECRET_FILE";
 var STORAGE_DIR_ENV = "MCP_STORAGE_DIR";
+var SECRET_STORAGE_DOCS_URL = "https://github.com/modelcontextprotocol/inspector/blob/main/docs/secret-storage.md";
 var KINDS = ["keyring", "file", "memory"];
 function parseSecretStoreEnv(raw) {
   const value = raw?.trim().toLowerCase();
@@ -3164,6 +3530,11 @@ function warnAboutSecretStorage(info) {
   }
   const caveat = secretStorageCaveat(info);
   if (caveat) console.warn(`[mcp-inspector] ${caveat}`);
+  if (info.reason === "fallback" || caveat) {
+    console.warn(
+      `[mcp-inspector] How the secret store is chosen, and how to secure it: ${SECRET_STORAGE_DOCS_URL}`
+    );
+  }
 }
 var resolved;
 function resolveSecretStore() {
@@ -3359,6 +3730,9 @@ var DeferredSecretStore = class {
   async getMany(requests) {
     return secretStoreGetMany(await this.target(), requests);
   }
+  async getManyStrict(requests) {
+    return secretStoreGetManyStrict(await this.target(), requests);
+  }
   async get(serverId, field) {
     return (await this.target()).get(serverId, field);
   }
@@ -3576,12 +3950,31 @@ function redactJsonValue(value) {
   }
   return value;
 }
+function joinSensitiveContinuations(body) {
+  const out = [];
+  let sensitiveAt = -1;
+  for (const pair of body.split("&")) {
+    const eq = pair.indexOf("=");
+    if (eq === -1) {
+      if (sensitiveAt !== -1 && pair.length > 0) {
+        out[sensitiveAt] += `%26${pair}`;
+      } else {
+        out.push(pair);
+      }
+      continue;
+    }
+    const [key] = new URLSearchParams(pair).keys();
+    sensitiveAt = isSensitiveField(key) && eq < pair.length - 1 ? out.length : -1;
+    out.push(pair);
+  }
+  return out.join("&");
+}
 function redactBody(body, contentType) {
   if (!body) return body;
   const type = (contentType ?? "").toLowerCase();
   if (type.includes("application/x-www-form-urlencoded")) {
     try {
-      const params = new URLSearchParams(body);
+      const params = new URLSearchParams(joinSensitiveContinuations(body));
       let changed = false;
       for (const key of new Set(params.keys())) {
         if (isSensitiveField(key)) {
@@ -4305,6 +4698,73 @@ function createProxyFetch() {
   };
 }
 
+// ../../core/mcp/node/notificationHeadersFetch.ts
+import { PROTOCOL_VERSION_META_KEY } from "@modelcontextprotocol/client";
+function createNotificationHeadersFetch(baseFetch) {
+  return (input, init) => {
+    const method = modernNotificationMethod(init);
+    if (method === void 0) return baseFetch(input, init);
+    const headers = new Headers(init?.headers);
+    headers.set("mcp-protocol-version", method.version);
+    headers.set("mcp-method", method.method);
+    return baseFetch(input, { ...init, headers });
+  };
+}
+function modernNotificationMethod(init) {
+  if (init?.method?.toUpperCase() !== "POST") return void 0;
+  if (typeof init.body !== "string") return void 0;
+  let message;
+  try {
+    message = JSON.parse(init.body);
+  } catch {
+    return void 0;
+  }
+  if (!isRecord2(message) || "id" in message) return void 0;
+  if (typeof message.method !== "string") return void 0;
+  const meta = isRecord2(message.params) ? message.params._meta : void 0;
+  const version = isRecord2(meta) ? meta[PROTOCOL_VERSION_META_KEY] : void 0;
+  if (typeof version !== "string" || version < MODERN_PROTOCOL_VERSION) {
+    return void 0;
+  }
+  return { method: message.method, version };
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// ../../core/mcp/node/suppressNotificationStreamFetch.ts
+function createSuppressNotificationStreamFetch(baseFetch, endpoint) {
+  return async (input, init) => {
+    if (isStandaloneStreamRequest(input, init, endpoint)) {
+      return new Response(null, {
+        status: 405,
+        statusText: "Method Not Allowed"
+      });
+    }
+    return baseFetch(input, init);
+  };
+}
+function requestUrl(input) {
+  const raw = input instanceof Request ? input.url : input instanceof URL ? input.href : input;
+  try {
+    return new URL(raw);
+  } catch {
+    return void 0;
+  }
+}
+function isStandaloneStreamRequest(input, init, endpoint) {
+  const request = input instanceof Request ? input : void 0;
+  const method = (init?.method ?? request?.method ?? "GET").toUpperCase();
+  if (method !== "GET") return false;
+  const url = requestUrl(input);
+  if (!url || url.origin !== endpoint.origin || url.pathname !== endpoint.pathname || url.search !== endpoint.search) {
+    return false;
+  }
+  const headers = new Headers(init?.headers ?? request?.headers);
+  const accept = headers.get("accept")?.toLowerCase() ?? "";
+  return accept.includes("text/event-stream") && !headers.has("last-event-id");
+}
+
 // ../../core/mcp/node/transport.ts
 function headersFromSettings(settings) {
   if (!settings || settings.headers.length === 0) return void 0;
@@ -4392,10 +4852,14 @@ function createTransportNode(config, options = {}) {
       ...httpConfig.requestInit,
       ...headers && { headers }
     };
+    const stampedFetch = createNotificationHeadersFetch(
+      fetchWithOptionalAuthIntercept
+    );
+    const httpFetch = settings?.suppressNotificationStream === true ? createSuppressNotificationStreamFetch(stampedFetch, url) : stampedFetch;
     const transport = new StreamableHTTPClientTransport(url, {
       authProvider,
       requestInit,
-      fetch: fetchWithOptionalAuthIntercept,
+      fetch: httpFetch,
       // SEP-2350: how the transport reacts to a `403 insufficient_scope`
       // challenge. Defaults to the SDK's `reauthorize` when unset.
       ...settings?.oauthOnInsufficientScope && {
@@ -4544,6 +5008,23 @@ function mergeSecretsIntoClientConfig(config, secrets) {
 }
 
 // ../../core/client/node-persistence.ts
+async function withClientConfigLock(filePath, action, body) {
+  let entered = false;
+  try {
+    return await withSecretFileLock(filePath, async () => {
+      entered = true;
+      return body();
+    });
+  } catch (error) {
+    if (!entered && error instanceof SecretFileLockHeldError) {
+      throw new SecretFileLockHeldError(
+        `Could not ${action} the client configuration: the file at ${filePath} is locked by another Inspector process and did not become available.`,
+        { cause: error }
+      );
+    }
+    throw error;
+  }
+}
 async function readIdpSecretFromKeychain(secretStore) {
   const secret = await secretStore.get(
     CLIENT_KEYCHAIN_ID,
@@ -4553,29 +5034,39 @@ async function readIdpSecretFromKeychain(secretStore) {
   return { [SECRET_FIELD_IDP_CLIENT_SECRET]: secret };
 }
 async function migrateClientPlaintextSecret(filePath, config, secretStore) {
-  const { stripped, secrets } = extractSecretsFromClientConfig(config);
-  const value = secrets[SECRET_FIELD_IDP_CLIENT_SECRET];
-  if (!value) return config;
   try {
-    const existing = await secretStoreGetStrict(
-      secretStore,
-      CLIENT_KEYCHAIN_ID,
-      SECRET_FIELD_IDP_CLIENT_SECRET
-    );
-    if (existing === null) {
-      await secretStore.set(
-        CLIENT_KEYCHAIN_ID,
-        SECRET_FIELD_IDP_CLIENT_SECRET,
-        value
-      );
-    }
-    if (!await secretStoreIsDurable(secretStore)) return config;
-    await writeStoreFile(filePath, serializeStore(stripped));
-    return stripped;
+    return await withClientConfigLock(filePath, "migrate", async () => {
+      const raw = await readStoreFile(filePath);
+      if (raw === null) return {};
+      const fresh = parseClientConfig(parseStore(raw));
+      const { stripped, secrets } = extractSecretsFromClientConfig(fresh);
+      const value = secrets[SECRET_FIELD_IDP_CLIENT_SECRET];
+      if (!value) return fresh;
+      try {
+        const existing = await secretStoreGetStrict(
+          secretStore,
+          CLIENT_KEYCHAIN_ID,
+          SECRET_FIELD_IDP_CLIENT_SECRET
+        );
+        if (existing === null) {
+          await secretStore.set(
+            CLIENT_KEYCHAIN_ID,
+            SECRET_FIELD_IDP_CLIENT_SECRET,
+            value
+          );
+        }
+        if (!await secretStoreIsDurable(secretStore)) return fresh;
+        await writeStoreFile(filePath, serializeStore(stripped));
+        return stripped;
+      } catch (err) {
+        if (err instanceof SecretStoreUnavailableError) {
+          return fresh;
+        }
+        throw err;
+      }
+    });
   } catch (err) {
-    if (err instanceof SecretStoreUnavailableError) {
-      return config;
-    }
+    if (err instanceof SecretFileLockHeldError) return config;
     throw err;
   }
 }
@@ -4778,7 +5269,7 @@ import {
   useCallback as useCallback14,
   useRef as useRef15
 } from "react";
-import { Box as Box28, Text as Text25, useInput as useInput22, useApp } from "ink";
+import { Box as Box29, Text as Text26, useInput as useInput22, useApp } from "ink";
 
 // ../../core/mcp/inspectorClient.ts
 import { Client } from "@modelcontextprotocol/client";
@@ -4826,14 +5317,14 @@ var OBJECT_VALUED_SUBSCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
 function pathName(path6) {
   return path6.length === 0 ? "<root>" : path6.join(".");
 }
-function isRecord(node) {
+function isRecord3(node) {
   return node !== null && typeof node === "object";
 }
 function scanXMcpHeaderDeclarations(inputSchema) {
   const declarations = [];
   const seenLower = /* @__PURE__ */ new Map();
   const visit = (node, path6, reachable) => {
-    if (!isRecord(node)) return void 0;
+    if (!isRecord3(node)) return void 0;
     const schema = node;
     if (X_MCP_HEADER_KEY in schema) {
       if (!reachable || path6.length === 0) {
@@ -4859,7 +5350,7 @@ function scanXMcpHeaderDeclarations(inputSchema) {
       declarations.push({ path: path6, headerName: raw, type });
     }
     const properties = schema.properties;
-    if (isRecord(properties)) {
+    if (isRecord3(properties)) {
       for (const [key, child] of Object.entries(properties)) {
         const fault2 = visit(child, [...path6, key], reachable);
         if (fault2 !== void 0) return fault2;
@@ -4868,7 +5359,7 @@ function scanXMcpHeaderDeclarations(inputSchema) {
     for (const k of NON_REACHABLE_SUBSCHEMA_KEYWORDS) {
       const sub = schema[k];
       if (sub === void 0) continue;
-      const branches = Array.isArray(sub) ? sub : isRecord(sub) && OBJECT_VALUED_SUBSCHEMA_KEYWORDS.has(k) ? Object.values(sub) : [sub];
+      const branches = Array.isArray(sub) ? sub : isRecord3(sub) && OBJECT_VALUED_SUBSCHEMA_KEYWORDS.has(k) ? Object.values(sub) : [sub];
       for (const branch of branches) {
         const fault2 = visit(branch, [...path6, `<${k}>`], false);
         if (fault2 !== void 0) return fault2;
@@ -5100,7 +5591,7 @@ import {
   LOG_LEVEL_META_KEY,
   CLIENT_CAPABILITIES_META_KEY,
   CLIENT_INFO_META_KEY,
-  PROTOCOL_VERSION_META_KEY,
+  PROTOCOL_VERSION_META_KEY as PROTOCOL_VERSION_META_KEY2,
   RELATED_TASK_META_KEY as RELATED_TASK_META_KEY3
 } from "@modelcontextprotocol/client";
 
@@ -5169,10 +5660,13 @@ var ADVERTISABLE_EXTENSIONS = [
   {
     key: UI_EXTENSION_KEY,
     label: "MCP Apps UI (io.modelcontextprotocol/ui)",
-    // The MCP Apps UI extension. The Inspector always renders App tools, so it
-    // advertises this by default with the App resource MIME type it supports —
-    // a conforming server checks the `mimeTypes` before serving a UI resource.
+    // The MCP Apps UI extension, advertised with the App resource MIME type the
+    // Inspector renders — a conforming server checks the `mimeTypes` before
+    // serving a UI resource. Default-on only where Apps can actually be
+    // rendered (the web client); the CLI and TUI cannot, so they leave it off
+    // unless explicitly overridden (#2403).
     defaultAdvertised: true,
+    requiresAppRenderer: true,
     advertisement: { mimeTypes: [MCP_APP_MIME_TYPE] }
   },
   {
@@ -5188,10 +5682,13 @@ var ADVERTISABLE_EXTENSIONS = [
     defaultAdvertised: true
   }
 ];
+function isAdvertisedByDefault(ext, rendersApps) {
+  return ext.defaultAdvertised && (!ext.requiresAppRenderer || rendersApps);
+}
 function buildClientExtensions(input) {
   const map = {};
   for (const ext of ADVERTISABLE_EXTENSIONS) {
-    const advertised = input.advertised?.[ext.key] ?? ext.defaultAdvertised;
+    const advertised = input.advertised?.[ext.key] ?? isAdvertisedByDefault(ext, input.rendersApps === true);
     if (advertised) {
       map[ext.key] = ext.advertisement ? structuredClone(ext.advertisement) : {};
     }
@@ -6180,7 +6677,15 @@ function exemptMcpEndpoint(getServerUrl, negotiatesEndpoint) {
     }
   };
 }
-var REQUEST_DEADLINES = /* @__PURE__ */ new WeakMap();
+var REQUEST_DEADLINES = /* @__PURE__ */ new WeakMap();
+function stampRequestDeadline(init, budget) {
+  if (REQUEST_DEADLINES.has(init)) {
+    throw new Error(
+      "stampRequestDeadline: this RequestInit already carries a deadline \u2014 withOAuthRequestTimeout must build a fresh init per call (#2418)"
+    );
+  }
+  REQUEST_DEADLINES.set(init, budget);
+}
 function requestHeadersOf(input, init) {
   if (init?.headers) return new Headers(init.headers);
   if (typeof input !== "string" && !(input instanceof URL)) {
@@ -6238,7 +6743,7 @@ function withOAuthRequestTimeout(fetchFn, timeoutMs = DEFAULT_OAUTH_REQUEST_TIME
       }
     });
     const nextInit = { ...init, signal };
-    REQUEST_DEADLINES.set(nextInit, budget);
+    stampRequestDeadline(nextInit, budget);
     let settled;
     let drainReader;
     try {
@@ -6351,7 +6856,7 @@ function withRfc8414OidcCompat(fetchFn) {
         return response;
       }
       if (!probe.ok) {
-        await releaseBody(probe);
+        releaseBodyDetached(probe);
         if (callerSignal?.aborted) {
           releaseBodyDetached(response);
           throw callerSignal.reason;
@@ -6375,7 +6880,7 @@ function withRfc8414OidcCompat(fetchFn) {
         return response;
       }
       const source = probe.url || candidate;
-      await releaseBody(response);
+      releaseBodyDetached(response);
       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.`
       );
@@ -7165,7 +7670,7 @@ async function collectGrants(snapshot) {
   return { grants, failures };
 }
 async function parseTokens(raw) {
-  return raw === void 0 || raw === null ? void 0 : await OAuthTokensSchema.parseAsync(raw);
+  return raw === void 0 || raw === null ? void 0 : await OAuthTokensSchema.partial().parseAsync(raw);
 }
 async function parseClient(raw) {
   return raw === void 0 || raw === null ? void 0 : await OAuthClientInformationSchema.parseAsync(raw);
@@ -8946,6 +9451,14 @@ function progressTokenOf(message) {
   }
   return void 0;
 }
+function waitForProgressToken(waits, token) {
+  const exact = waits.get(token);
+  if (exact !== void 0 || typeof token === "number") {
+    return exact;
+  }
+  const numeric = Number(token);
+  return Number.isSafeInteger(numeric) ? waits.get(numeric) : void 0;
+}
 
 // ../../core/mcp/remote/remoteClientTransport.ts
 var DEFAULT_SSE_RESPONSE_TIMEOUT_MS = 6e4;
@@ -9422,8 +9935,8 @@ var RemoteClientTransport = class {
     });
   }
   /** Re-arm a pending request's SSE wait timeout on a matching progress note. */
-  resetSseResponseWait(requestId) {
-    this.sseResponseWaits.get(requestId)?.resetTimeout();
+  resetSseResponseWait(progressToken) {
+    waitForProgressToken(this.sseResponseWaits, progressToken)?.resetTimeout();
   }
   async postSend(message, options, retryCount) {
     const requestId = requestIdForMessage(message);
@@ -9628,6 +10141,11 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
   requestTimeout;
   defaultMetadata;
   serverSettings;
+  // The settings the current transport was built from. `serverSettings` is
+  // replaced live on every settings save (#1444), but transport-level inputs
+  // such as custom headers are fixed when the transport is created, so this
+  // is what the open connection actually sends (#2460).
+  transportSettings;
   versionNegotiation;
   status = "disconnected";
   // True only while an explicit disconnect() owns the teardown. close() can
@@ -9982,6 +10500,10 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
     const advertisedExtensions = buildClientExtensions({
       enterpriseManaged: options.oauth?.enterpriseManaged ?? false,
       advertised: this.advertisedExtensions,
+      // Only a client that can render Apps claims the UI extension by default
+      // (#2403). An app-elicitation renderer is itself a claim to host an App,
+      // so supplying one implies it.
+      rendersApps: options.rendersApps === true || this.appElicitationRenderer !== void 0,
       // Read off the built `capabilities.elicitation.form` rather than
       // re-deriving from `options.elicit`: the nested MCP Apps `elicitation`
       // setting must never be advertised without the core form capability it
@@ -10407,6 +10929,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
     }
     this.baseTransport = null;
     this.transport = null;
+    this.transportSettings = void 0;
     this.transportHasAuthProvider = false;
   }
   /**
@@ -10880,6 +11403,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
         transportOptions
       );
       this.baseTransport = baseTransport;
+      this.transportSettings = transportOptions.settings;
       if (this.directAuthRecovery) {
         this.directAuthRecoveryActive = !(baseTransport instanceof RemoteClientTransport);
       }
@@ -11081,6 +11605,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
     }
     this.baseTransport = null;
     this.transport = null;
+    this.transportSettings = void 0;
     this.transportHasAuthProvider = false;
     this.clearPendingPeerRequests();
     if (this.status !== "disconnected") {
@@ -11237,7 +11762,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       ...params,
       _meta: {
         ...existingMeta,
-        [PROTOCOL_VERSION_META_KEY]: protocolVersion,
+        [PROTOCOL_VERSION_META_KEY2]: protocolVersion,
         [CLIENT_INFO_META_KEY]: this.clientInfo,
         [CLIENT_CAPABILITIES_META_KEY]: clientCapabilities
       }
@@ -11813,6 +12338,13 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
   getClientCapabilities() {
     return this.clientCapabilities;
   }
+  /**
+   * Get the client identity (name, version) this client reports to servers —
+   * the caller's `clientIdentity`, or core's neutral fallback without one.
+   */
+  getClientInfo() {
+    return this.clientInfo;
+  }
   /**
    * Get server info (name, version)
    */
@@ -11864,6 +12396,16 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
   getServerSettings() {
     return this.serverSettings;
   }
+  /**
+   * The settings the current transport was built from, or `undefined` when no
+   * transport exists. Unlike {@link getServerSettings}, a live settings edit
+   * does not change this: transport-level inputs (custom headers) apply only
+   * when the next transport is created, so comparing the two tells a caller
+   * whether an edit is still waiting on a reconnect (#2460).
+   */
+  getTransportSettings() {
+    return this.transportSettings;
+  }
   /**
    * Replace the in-memory per-server settings on a live client. Lets a settings
    * edit (e.g. toggling auto-refresh-on-list-changed) take effect on the
@@ -13385,10 +13927,9 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
    * removes it before the result gets here (#2373).
    *
    * Separate from {@link getSkill} because the callers differ: the UIs want the
-   * entry, while the CLI prints the result and must not reshape it. SEP-2640
-   * explicitly leaves open whether this result carries `ttlMs` / `cacheScope`,
-   * so a server may send them — and unwrapping to the entry discards exactly
-   * those (Copilot).
+   * entry, while the CLI prints the result and must not reshape it. A modern
+   * result carries `ttlMs` / `cacheScope` (#2404), and unwrapping to the entry
+   * discards exactly those (Copilot).
    */
   async getSkillResult(uri, metadata) {
     if (!this.client) {
@@ -13399,11 +13940,12 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       uri,
       ...effectiveMeta ? { _meta: effectiveMeta } : {}
     };
+    const resultSchema = this.isModernEra() ? ModernGetSkillEnvelopeSchema : GetSkillEnvelopeSchema;
     try {
       return await this.invokeMcpClient(
         () => this.client.request(
           { method: SKILLS_GET_METHOD, params },
-          GetSkillEnvelopeSchema,
+          resultSchema,
           this.getRequestOptions(this.progressTokenOf(metadata))
         ),
         { method: SKILLS_GET_METHOD }
@@ -15275,7 +15817,7 @@ import { useCallback as useCallback2, useEffect, useState } from "react";
 // ../../core/react/useStoreSnapshot.ts
 import { useCallback, useRef, useSyncExternalStore } from "react";
 function useStoreSnapshot(store, event, read, whenAbsent) {
-  const cache = useRef(null);
+  const cache2 = useRef(null);
   const subscribe = useCallback(
     (onStoreChange) => {
       if (!store) return () => {
@@ -15289,12 +15831,12 @@ function useStoreSnapshot(store, event, read, whenAbsent) {
   );
   const getSnapshot = useCallback(() => {
     const revision = store ? store.getEventRevision(event) : 0;
-    const cached = cache.current;
+    const cached = cache2.current;
     if (cached && Object.is(cached.store, store) && cached.event === event && cached.read === read && Object.is(cached.whenAbsent, whenAbsent) && cached.revision === revision) {
       return cached.value;
     }
     const value = store ? read(store) : whenAbsent;
-    cache.current = { store, event, read, whenAbsent, revision, value };
+    cache2.current = { store, event, read, whenAbsent, revision, value };
     return value;
   }, [store, event, read, whenAbsent]);
   return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
@@ -15699,7 +16241,7 @@ function classifyAuthorizationServerMismatch(err) {
 }
 
 // ../../core/node/version.ts
-import { readFileSync as readFileSync3 } from "fs";
+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";
@@ -15711,7 +16253,7 @@ function readInspectorVersion(callerUrl) {
     let manifest;
     try {
       manifest = JSON.parse(
-        readFileSync3(join3(dir, "package.json"), "utf-8")
+        readFileSync4(join3(dir, "package.json"), "utf-8")
       );
     } catch {
     }
@@ -15734,42 +16276,57 @@ import {
 function withIssuer(value, issuer) {
   return issuer === void 0 ? value : { ...value, issuer };
 }
-var OAuthStorageBase = class {
+var OAuthStorageCoordination = class {
   loaded = false;
   loadPromise;
   /** Serializes persist writes so concurrent mutators cannot reorder POSTs. */
   persistQueue = Promise.resolve();
+};
+var OAuthStorageBase = class {
+  coordination;
   memory;
   backend;
-  constructor(memory, backend) {
+  constructor(memory, backend, coordination = new OAuthStorageCoordination()) {
     this.memory = memory;
     this.backend = backend;
+    this.coordination = coordination;
   }
   load() {
-    if (!this.loadPromise) {
-      this.loadPromise = this.doLoad();
+    const coordination = this.coordination;
+    if (!coordination.loadPromise) {
+      coordination.loadPromise = this.doLoad().catch((error) => {
+        coordination.loadPromise = void 0;
+        throw error;
+      });
     }
-    return this.loadPromise;
+    return coordination.loadPromise;
   }
   async doLoad() {
-    if (this.loaded) {
+    if (this.coordination.loaded) {
       return;
     }
     const snapshot = await this.backend.read();
     if (snapshot) {
       this.memory.replace(snapshot);
     }
-    this.loaded = true;
+    this.coordination.loaded = true;
   }
   async ensureLoaded() {
     await this.load();
   }
-  async persist() {
-    const snapshot = this.memory.snapshot();
-    const prior = this.persistQueue;
+  /**
+   * Flush memory to the backend, naming the sections the calling mutation
+   * touched so shared-store backends can merge just those entries over a
+   * fresh read (the clobber fix — see {@link OAuthPersistSections}). The
+   * snapshot is taken *inside* the queued closure, so a write that waited in
+   * the queue carries the state as of when it actually runs, coalescing with
+   * any mutations that landed in memory while it waited.
+   */
+  async persist(sections) {
+    const prior = this.coordination.persistQueue;
     const tracked = prior.catch(() => {
-    }).then(() => this.backend.write(snapshot));
-    this.persistQueue = tracked;
+    }).then(() => this.backend.write(this.memory.snapshot(), sections));
+    this.coordination.persistQueue = tracked;
     await tracked;
   }
   /**
@@ -15783,7 +16340,7 @@ var OAuthStorageBase = class {
   /** Read the issuer-bound slot for a read, if one exists. */
   issuerSlot(state, issuer) {
     const key = this.resolveReadIssuer(state, issuer);
-    return key ? state.byIssuer?.[key] : void 0;
+    return key ? getOwnEntry(state.byIssuer, key) : void 0;
   }
   /**
    * Read-modify-write the `byIssuer[issuer]` slot, set `activeIssuer`, and clear
@@ -15794,7 +16351,9 @@ var OAuthStorageBase = class {
     const state = this.memory.getState().getServerState(serverUrl);
     const byIssuer = {
       ...state.byIssuer,
-      [issuer]: { ...state.byIssuer?.[issuer], ...updates }
+      // The computed key defines an own property; the merge-base read needs
+      // the own guard so an absent `__proto__` slot reads as undefined.
+      [issuer]: { ...getOwnEntry(state.byIssuer, issuer), ...updates }
     };
     this.memory.getState().setServerState(serverUrl, {
       byIssuer,
@@ -15806,7 +16365,7 @@ var OAuthStorageBase = class {
   mapIssuerSlots(state, fn) {
     const byIssuer = {};
     for (const [key, slot] of Object.entries(state.byIssuer ?? {})) {
-      byIssuer[key] = { ...slot, ...fn(slot) };
+      setOwnEntry(byIssuer, key, { ...slot, ...fn(slot) });
     }
     return byIssuer;
   }
@@ -15852,7 +16411,7 @@ var OAuthStorageBase = class {
         clientRegistrationKind: options.registrationKind
       });
     }
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async savePreregisteredClientInformation(serverUrl, clientInformation) {
     await this.ensureLoaded();
@@ -15860,7 +16419,7 @@ var OAuthStorageBase = class {
       preregisteredClientInformation: clientInformation,
       clientRegistrationKind: "static"
     });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async clearClientInformation(serverUrl, isPreregistered, issuer) {
     await this.ensureLoaded();
@@ -15868,7 +16427,7 @@ var OAuthStorageBase = class {
       this.memory.getState().setServerState(serverUrl, {
         preregisteredClientInformation: void 0
       });
-      await this.persist();
+      await this.persist({ servers: [serverUrl] });
       return;
     }
     if (issuer !== void 0) {
@@ -15891,7 +16450,7 @@ var OAuthStorageBase = class {
         clientRegistrationKind: void 0
       });
     }
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async getTokens(serverUrl, issuer) {
     await this.ensureLoaded();
@@ -15902,9 +16461,12 @@ var OAuthStorageBase = class {
     if (!tokens) {
       return void 0;
     }
-    const parsed = await OAuthTokensSchema3.parseAsync(tokens);
+    const result = await OAuthTokensSchema3.safeParseAsync(tokens);
+    if (!result.success) {
+      return void 0;
+    }
     return withIssuer(
-      parsed,
+      result.data,
       fromSlot ? this.resolveReadIssuer(state, issuer) : void 0
     );
   }
@@ -15928,7 +16490,7 @@ var OAuthStorageBase = class {
         ...options?.enterpriseManaged === true && { enterpriseManaged: true }
       });
     }
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async clearTokens(serverUrl, issuer) {
     await this.ensureLoaded();
@@ -15947,7 +16509,7 @@ var OAuthStorageBase = class {
       }));
       this.memory.getState().setServerState(serverUrl, { byIssuer, tokens: void 0 });
     }
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async getCodeVerifier(serverUrl) {
     await this.ensureLoaded();
@@ -15957,12 +16519,12 @@ var OAuthStorageBase = class {
   async saveCodeVerifier(serverUrl, codeVerifier) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { codeVerifier });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async clearCodeVerifier(serverUrl) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { codeVerifier: void 0 });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async getScope(serverUrl) {
     await this.ensureLoaded();
@@ -15972,12 +16534,12 @@ var OAuthStorageBase = class {
   async saveScope(serverUrl, scope) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { scope });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async clearScope(serverUrl) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { scope: void 0 });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async getServerMetadata(serverUrl) {
     await this.ensureLoaded();
@@ -15987,12 +16549,12 @@ var OAuthStorageBase = class {
   async saveServerMetadata(serverUrl, metadata) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { serverMetadata: metadata });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async clearServerMetadata(serverUrl) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { serverMetadata: void 0 });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async getDiscoveryState(serverUrl) {
     await this.ensureLoaded();
@@ -16001,12 +16563,12 @@ var OAuthStorageBase = class {
   async saveDiscoveryState(serverUrl, state) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { discoveryState: state });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async clearDiscoveryState(serverUrl) {
     await this.ensureLoaded();
     this.memory.getState().setServerState(serverUrl, { discoveryState: void 0 });
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async takeRevocationSnapshot(serverUrl) {
     await this.ensureLoaded();
@@ -16024,13 +16586,13 @@ var OAuthStorageBase = class {
       serverMetadata: state.serverMetadata
     };
     this.memory.getState().clearServerState(serverUrl);
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
     return snapshot;
   }
   async clear(serverUrl) {
     await this.ensureLoaded();
     this.memory.getState().clearServerState(serverUrl);
-    await this.persist();
+    await this.persist({ servers: [serverUrl] });
   }
   async getIdpSession(issuer) {
     await this.ensureLoaded();
@@ -16043,17 +16605,18 @@ var OAuthStorageBase = class {
   async saveIdpSession(issuer, session) {
     await this.ensureLoaded();
     this.memory.getState().setIdpSession(issuer, session);
-    await this.persist();
+    await this.persist({ idpSessions: [issuer] });
   }
   async clearIdpSession(issuer) {
     await this.ensureLoaded();
     this.memory.getState().clearIdpSession(issuer);
-    await this.persist();
+    await this.persist({ idpSessions: [issuer] });
   }
   async clearEnterpriseManagedResourceServers() {
     await this.ensureLoaded();
+    const servers = Object.entries(this.memory.getState().servers).filter(([, state]) => state.enterpriseManaged === true).map(([url]) => url);
     this.memory.getState().clearEnterpriseManagedResourceServers();
-    await this.persist();
+    await this.persist({ servers });
   }
 };
 
@@ -16071,13 +16634,15 @@ var OAuthMemoryStore = class {
       servers: this.servers,
       idpSessions: this.idpSessions,
       getServerState: (serverUrl) => {
-        return this.servers[serverUrl] || {};
+        return getOwnEntry(this.servers, serverUrl) || {};
       },
       setServerState: (serverUrl, updates) => {
         this.servers = {
           ...this.servers,
+          // Computed keys define own properties, so this write is safe for
+          // `__proto__`; only the merge-base read needs the own guard.
           [serverUrl]: {
-            ...this.servers[serverUrl],
+            ...getOwnEntry(this.servers, serverUrl),
             ...updates
           }
         };
@@ -16088,13 +16653,13 @@ var OAuthMemoryStore = class {
         this.servers = rest;
       },
       getIdpSession: (issuer) => {
-        return this.idpSessions[issuer] || {};
+        return getOwnEntry(this.idpSessions, issuer) || {};
       },
       setIdpSession: (issuer, updates) => {
         this.idpSessions = {
           ...this.idpSessions,
           [issuer]: {
-            ...this.idpSessions[issuer],
+            ...getOwnEntry(this.idpSessions, issuer),
             ...updates
           }
         };
@@ -16111,67 +16676,877 @@ var OAuthMemoryStore = class {
             delete rest[url];
           }
         }
-        this.servers = rest;
+        this.servers = rest;
+      }
+    };
+  }
+  snapshot() {
+    return {
+      servers: { ...this.servers },
+      idpSessions: { ...this.idpSessions }
+    };
+  }
+  replace(snapshot) {
+    this.servers = { ...snapshot.servers ?? {} };
+    this.idpSessions = { ...snapshot.idpSessions ?? {} };
+  }
+};
+
+// ../../core/auth/oauth-persist.ts
+import { OAuthTokensSchema as OAuthTokensSchema4 } from "@modelcontextprotocol/core";
+function mergeOAuthSections(disk, snapshot, sections) {
+  const merged = {
+    servers: { ...disk?.servers },
+    idpSessions: { ...disk?.idpSessions }
+  };
+  for (const url of sections.servers ?? []) {
+    const value = getOwnEntry(snapshot.servers, url);
+    if (value === void 0) {
+      delete merged.servers[url];
+    } else {
+      setOwnEntry(merged.servers, url, value);
+    }
+  }
+  for (const issuer of sections.idpSessions ?? []) {
+    const value = getOwnEntry(snapshot.idpSessions, issuer);
+    if (value === void 0) {
+      delete merged.idpSessions[issuer];
+    } else {
+      setOwnEntry(merged.idpSessions, issuer, value);
+    }
+  }
+  return merged;
+}
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isEntryMap(value) {
+  return isRecord4(value) && Object.values(value).every(isRecord4);
+}
+var VERBATIM_SECRET_KEYS = [
+  "client_secret",
+  "registration_access_token"
+];
+function isValidClientInformation(value) {
+  if (value === void 0) return true;
+  if (!isRecord4(value)) return false;
+  return VERBATIM_SECRET_KEYS.every(
+    (key) => !Object.hasOwn(value, key) || typeof value[key] === "string"
+  );
+}
+var PartialTokensSchema = OAuthTokensSchema4.partial();
+function isValidServerEntry(entry) {
+  if (!isRecord4(entry)) return false;
+  if (!isValidClientInformation(entry.clientInformation)) return false;
+  if (!isValidClientInformation(entry.preregisteredClientInformation))
+    return false;
+  if (entry.byIssuer !== void 0) {
+    if (!isRecord4(entry.byIssuer)) return false;
+    for (const slot of Object.values(entry.byIssuer)) {
+      if (!isRecord4(slot)) return false;
+      if (!isValidClientInformation(slot.clientInformation)) return false;
+    }
+  }
+  return true;
+}
+function snapshotFromPayload(payload) {
+  const servers = payload.servers ?? {};
+  const idpSessions = payload.idpSessions ?? {};
+  if (!isEntryMap(servers) || !isEntryMap(idpSessions)) return null;
+  if (!Object.values(servers).every(isValidServerEntry)) return null;
+  return {
+    servers,
+    idpSessions
+  };
+}
+function parseOAuthPersistBlob(raw) {
+  if (raw === null || raw === void 0) {
+    return null;
+  }
+  const parsed = typeof raw === "string" ? raw ? parseStore(raw) : null : raw;
+  if (!isRecord4(parsed)) {
+    return null;
+  }
+  if (isRecord4(parsed.state) && "version" in parsed) {
+    return snapshotFromPayload(parsed.state);
+  }
+  if ("servers" in parsed || "idpSessions" in parsed) {
+    return snapshotFromPayload(parsed);
+  }
+  return null;
+}
+function serializeOAuthPersistBlob(snapshot) {
+  return serializeStore(snapshot);
+}
+
+// ../../core/auth/node/oauth-secrets.ts
+import { OAuthTokensSchema as OAuthTokensSchema5 } from "@modelcontextprotocol/core";
+var PERSIST_TOKENS_ENV = "MCP_INSPECTOR_PERSIST_TOKENS";
+var warnedPolicyValues = /* @__PURE__ */ new Set();
+function getPersistTokensPolicy(env2 = process.env) {
+  const raw = env2[PERSIST_TOKENS_ENV];
+  if (raw === void 0 || raw === "") return "all";
+  if (raw === "all" || raw === "access" || raw === "none") return raw;
+  if (!warnedPolicyValues.has(raw)) {
+    warnedPolicyValues.add(raw);
+    console.warn(
+      `[mcp-inspector] Ignoring invalid ${PERSIST_TOKENS_ENV}=${JSON.stringify(raw)} (expected "all", "access", or "none"); persisting all tokens.`
+    );
+  }
+  return "all";
+}
+var oauthSecretServerId = (serverUrl) => `oauth+${encodeURIComponent(serverUrl)}`;
+var oauthIdpSecretServerId = (issuer) => `oauth-idp+${encodeURIComponent(issuer)}`;
+var issuerTokensField = (issuer) => `tokens:${issuer}`;
+var issuerClientSecretField = (issuer) => `client-secret:${issuer}`;
+var issuerRegistrationTokenField = (issuer) => `registration-token:${issuer}`;
+var LEGACY_TOKENS_FIELD = "tokens";
+var LEGACY_CLIENT_SECRET_FIELD = "client-secret";
+var LEGACY_REGISTRATION_TOKEN_FIELD = "registration-token";
+var PREREG_CLIENT_SECRET_FIELD = "prereg-client-secret";
+var PREREG_REGISTRATION_TOKEN_FIELD = "prereg-registration-token";
+var IDP_SESSION_FIELD = "idp-session";
+function applyTokensPolicy(tokens, policy) {
+  if (policy === "none") return void 0;
+  if (policy === "access" && tokens.refresh_token !== void 0) {
+    const { refresh_token: _stripped, ...rest } = tokens;
+    return rest;
+  }
+  return tokens;
+}
+var StorableTokensSchema = OAuthTokensSchema5.partial();
+function hasSecretBearingTokenField(tokens) {
+  return tokens.access_token !== void 0 || tokens.refresh_token !== void 0 || tokens.id_token !== void 0;
+}
+function splitTokens(tokens, policy) {
+  const kept = applyTokensPolicy(tokens, policy);
+  if (!kept) return {};
+  if (!StorableTokensSchema.safeParse(kept).success) {
+    return { plaintext: kept };
+  }
+  if (!hasSecretBearingTokenField(kept)) {
+    return {};
+  }
+  return { secret: JSON.stringify(kept) };
+}
+function splitClientInformation(info, fields, secrets) {
+  const { client_secret, registration_access_token, ...publicInfo } = info;
+  if (client_secret === void 0 && registration_access_token === void 0) {
+    return info;
+  }
+  if (client_secret !== void 0) {
+    secrets[fields.clientSecret] = client_secret;
+  }
+  if (registration_access_token !== void 0) {
+    secrets[fields.registrationToken] = registration_access_token;
+  }
+  return publicInfo;
+}
+function joinClientInformation(info, fields, secrets) {
+  const clientSecret = secrets[fields.clientSecret];
+  const registrationToken = secrets[fields.registrationToken];
+  if (clientSecret === void 0 && registrationToken === void 0) {
+    return info;
+  }
+  return {
+    ...info,
+    ...clientSecret !== void 0 && { client_secret: clientSecret },
+    ...registrationToken !== void 0 && {
+      registration_access_token: registrationToken
+    }
+  };
+}
+var issuerClientInfoFields = (issuer) => ({
+  clientSecret: issuerClientSecretField(issuer),
+  registrationToken: issuerRegistrationTokenField(issuer)
+});
+var LEGACY_CLIENT_INFO_FIELDS = {
+  clientSecret: LEGACY_CLIENT_SECRET_FIELD,
+  registrationToken: LEGACY_REGISTRATION_TOKEN_FIELD
+};
+var PREREG_CLIENT_INFO_FIELDS = {
+  clientSecret: PREREG_CLIENT_SECRET_FIELD,
+  registrationToken: PREREG_REGISTRATION_TOKEN_FIELD
+};
+function splitServerOAuthState(state, policy) {
+  const secrets = {};
+  const residue = { ...state };
+  if (state.byIssuer) {
+    const byIssuer = {};
+    for (const [issuer, slot] of Object.entries(state.byIssuer)) {
+      const slotResidue = { ...slot };
+      if (slot.tokens) {
+        delete slotResidue.tokens;
+        const tokenSplit = splitTokens(slot.tokens, policy);
+        if (tokenSplit.secret !== void 0) {
+          secrets[issuerTokensField(issuer)] = tokenSplit.secret;
+        }
+        if (tokenSplit.plaintext) slotResidue.tokens = tokenSplit.plaintext;
+      }
+      if (slot.clientInformation) {
+        slotResidue.clientInformation = splitClientInformation(
+          slot.clientInformation,
+          issuerClientInfoFields(issuer),
+          secrets
+        );
+      }
+      setOwnEntry(byIssuer, issuer, slotResidue);
+    }
+    residue.byIssuer = byIssuer;
+  }
+  if (state.tokens) {
+    delete residue.tokens;
+    const tokenSplit = splitTokens(state.tokens, policy);
+    if (tokenSplit.secret !== void 0) {
+      secrets[LEGACY_TOKENS_FIELD] = tokenSplit.secret;
+    }
+    if (tokenSplit.plaintext) residue.tokens = tokenSplit.plaintext;
+  }
+  if (state.clientInformation) {
+    residue.clientInformation = splitClientInformation(
+      state.clientInformation,
+      LEGACY_CLIENT_INFO_FIELDS,
+      secrets
+    );
+  }
+  if (state.preregisteredClientInformation) {
+    residue.preregisteredClientInformation = splitClientInformation(
+      state.preregisteredClientInformation,
+      PREREG_CLIENT_INFO_FIELDS,
+      secrets
+    );
+  }
+  return { residue, secrets };
+}
+function parseStoredTokens(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    if (StorableTokensSchema.safeParse(parsed).success && hasSecretBearingTokenField(parsed)) {
+      return parsed;
+    }
+  } catch {
+  }
+  return void 0;
+}
+function parseStoredIdpSession(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed === "object" && parsed !== null) {
+      const { idToken, refreshToken } = parsed;
+      const usable = {
+        ...typeof idToken === "string" && { idToken },
+        ...typeof refreshToken === "string" && { refreshToken }
+      };
+      if (Object.keys(usable).length > 0) return usable;
+    }
+  } catch {
+  }
+  return void 0;
+}
+function isUsableStoredSecret(field, raw) {
+  if (field === LEGACY_TOKENS_FIELD || field.startsWith("tokens:")) {
+    return parseStoredTokens(raw) !== void 0;
+  }
+  if (field === IDP_SESSION_FIELD) {
+    return parseStoredIdpSession(raw) !== void 0;
+  }
+  return true;
+}
+function joinServerOAuthState(residue, secrets) {
+  const joined = { ...residue };
+  if (residue.byIssuer) {
+    const byIssuer = {};
+    for (const [issuer, slot] of Object.entries(residue.byIssuer)) {
+      const joinedSlot = { ...slot };
+      const tokensRaw = secrets[issuerTokensField(issuer)];
+      if (tokensRaw !== void 0) {
+        const tokens = parseStoredTokens(tokensRaw);
+        if (tokens) joinedSlot.tokens = tokens;
+      }
+      if (joinedSlot.clientInformation) {
+        joinedSlot.clientInformation = joinClientInformation(
+          joinedSlot.clientInformation,
+          issuerClientInfoFields(issuer),
+          secrets
+        );
+      }
+      setOwnEntry(byIssuer, issuer, joinedSlot);
+    }
+    joined.byIssuer = byIssuer;
+  }
+  const legacyTokensRaw = secrets[LEGACY_TOKENS_FIELD];
+  if (legacyTokensRaw !== void 0) {
+    const tokens = parseStoredTokens(legacyTokensRaw);
+    if (tokens) joined.tokens = tokens;
+  }
+  if (joined.clientInformation) {
+    joined.clientInformation = joinClientInformation(
+      joined.clientInformation,
+      LEGACY_CLIENT_INFO_FIELDS,
+      secrets
+    );
+  }
+  if (joined.preregisteredClientInformation) {
+    joined.preregisteredClientInformation = joinClientInformation(
+      joined.preregisteredClientInformation,
+      PREREG_CLIENT_INFO_FIELDS,
+      secrets
+    );
+  }
+  return joined;
+}
+function splitIdpSession(session, policy) {
+  const { idToken, refreshToken, ...residue } = session;
+  const secrets = {};
+  if (policy !== "none" && (idToken !== void 0 || refreshToken !== void 0)) {
+    const kept = {
+      ...typeof idToken === "string" && { idToken },
+      ...policy === "all" && typeof refreshToken === "string" && { refreshToken }
+    };
+    if (Object.keys(kept).length > 0) {
+      secrets[IDP_SESSION_FIELD] = JSON.stringify(kept);
+    }
+  }
+  return { residue, secrets };
+}
+function joinIdpSession(residue, secrets) {
+  const raw = secrets[IDP_SESSION_FIELD];
+  if (raw === void 0) return { ...residue };
+  const stored = parseStoredIdpSession(raw);
+  return stored ? { ...residue, ...stored } : { ...residue };
+}
+function serverSecretFields(state) {
+  const fields = /* @__PURE__ */ new Set([
+    LEGACY_TOKENS_FIELD,
+    LEGACY_CLIENT_SECRET_FIELD,
+    LEGACY_REGISTRATION_TOKEN_FIELD,
+    PREREG_CLIENT_SECRET_FIELD,
+    PREREG_REGISTRATION_TOKEN_FIELD
+  ]);
+  for (const issuer of Object.keys(state?.byIssuer ?? {})) {
+    fields.add(issuerTokensField(issuer));
+    fields.add(issuerClientSecretField(issuer));
+    fields.add(issuerRegistrationTokenField(issuer));
+  }
+  return [...fields];
+}
+function clientInfoHasPlaintext(info) {
+  return info !== void 0 && (info.client_secret !== void 0 || info.registration_access_token !== void 0);
+}
+function snapshotHasPlaintextSecrets(snapshot) {
+  for (const state of Object.values(snapshot.servers)) {
+    if (state.tokens) return true;
+    if (clientInfoHasPlaintext(state.clientInformation)) return true;
+    if (clientInfoHasPlaintext(state.preregisteredClientInformation)) {
+      return true;
+    }
+    for (const slot of Object.values(state.byIssuer ?? {})) {
+      if (slot.tokens) return true;
+      if (clientInfoHasPlaintext(slot.clientInformation)) return true;
+    }
+  }
+  for (const session of Object.values(snapshot.idpSessions)) {
+    if (session.idToken !== void 0 || session.refreshToken !== void 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// ../../core/auth/node/oauth-persist-file.ts
+var warnedStoreFailures = /* @__PURE__ */ new Set();
+function warnStoreWriteFailure(error) {
+  const reason = error instanceof Error ? error.message : String(error);
+  if (warnedStoreFailures.has(reason)) return;
+  warnedStoreFailures.add(reason);
+  console.warn(
+    `[mcp-inspector] Could not write OAuth tokens to the secret store (${reason}). Tokens will be kept in memory for this session only and will NOT be persisted; expect to re-authorize after a restart.`
+  );
+}
+function warnRestoreFailure(error) {
+  const reason = error instanceof Error ? error.message : String(error);
+  const key = `restore:${reason}`;
+  if (warnedStoreFailures.has(key)) return;
+  warnedStoreFailures.add(key);
+  console.warn(
+    `[mcp-inspector] Could not restore secret-store entries after a failed OAuth state write (${reason}). The secret store may be inconsistent with oauth.json; if a server's stored credentials stop working, re-authorize it.`
+  );
+}
+function warnUnconfirmedFile(error) {
+  const reason = error instanceof Error ? error.message : String(error);
+  const key = `unconfirmed:${reason}`;
+  if (warnedStoreFailures.has(key)) return;
+  warnedStoreFailures.add(key);
+  console.warn(
+    `[mcp-inspector] Could not re-read oauth.json after a failed OAuth state save (${reason}). The file may still contain the interrupted save while the secret store was restored to the previous values; if a server's stored credentials stop working, re-authorize it.`
+  );
+}
+function warnMigrationFailure(error) {
+  const reason = error instanceof Error ? error.message : String(error);
+  const key = `migration:${reason}`;
+  if (warnedStoreFailures.has(key)) return;
+  warnedStoreFailures.add(key);
+  console.warn(
+    `[mcp-inspector] Could not migrate plaintext OAuth secrets into the secret store (${reason}). The plaintext copy in oauth.json was kept and keeps working; migration will be retried on the next read.`
+  );
+}
+function rethrowLockError(filePath, error, action = "save") {
+  if (error instanceof SecretFileLockHeldError) {
+    throw new SecretFileLockHeldError(
+      `Could not ${action} OAuth state: the state file at ${filePath} is locked by another Inspector process and did not become available.`,
+      { cause: error }
+    );
+  }
+  throw error;
+}
+async function withOAuthStateLock(filePath, action, body) {
+  let entered = false;
+  try {
+    return await withSecretFileLock(filePath, async () => {
+      entered = true;
+      return body();
+    });
+  } catch (error) {
+    if (!entered) rethrowLockError(filePath, error, action);
+    throw error;
+  }
+}
+var OAuthStateFileUnrecognizedError = class extends Error {
+  constructor(filePath, action) {
+    super(
+      `Refusing to ${action} OAuth state: ${filePath} exists but is not a recognized OAuth state file (it may be corrupt, truncated, or written by something else). Its entries are the only index of credentials in the OS keychain / secret store, so overwriting it would strand them. Restore the file from a backup or fix its JSON; deleting it starts fresh but abandons any credentials it indexed.`
+    );
+    this.name = "OAuthStateFileUnrecognizedError";
+  }
+};
+async function readDiskForMutation(filePath, action) {
+  const raw = await readStoreFile(filePath);
+  const parsed = parseOAuthPersistBlob(raw);
+  if (raw !== null && parsed === null) {
+    throw new OAuthStateFileUnrecognizedError(filePath, action);
+  }
+  return parsed;
+}
+async function persistEntrySecrets(store, serverId, candidates, secrets, prior, allowDegrade) {
+  const priorValue = new Map(prior.map(({ field, value }) => [field, value]));
+  const changed = {};
+  for (const [field, value] of Object.entries(secrets)) {
+    if (priorValue.get(field) !== value) changed[field] = value;
+  }
+  try {
+    if (Object.keys(changed).length > 0) {
+      await secretStoreSetMany(store, serverId, changed);
+    }
+  } catch (error) {
+    if (!allowDegrade) throw error;
+    warnStoreWriteFailure(error);
+    const touched = prior.filter(({ field }) => changed[field] !== void 0);
+    let restoreFailure;
+    await restoreSecretFields(store, touched, (err) => {
+      restoreFailure = err;
+    });
+    if (restoreFailure !== void 0) throw restoreFailure;
+    return false;
+  }
+  await settleStoreMutations(
+    candidates.filter(
+      (field) => secrets[field] === void 0 && priorValue.get(field) !== null
+    ).map((field) => store.delete(serverId, field))
+  );
+  return true;
+}
+function revertEntryToDisk(merged, disk, key) {
+  const diskEntry = getOwnEntry(disk, key);
+  if (diskEntry === void 0) {
+    if (Object.hasOwn(merged, key)) delete merged[key];
+  } else {
+    setOwnEntry(merged, key, diskEntry);
+  }
+}
+function preserveNonDurableSecrets(diskSecrets, secrets) {
+  const keep = {};
+  for (const [field, value] of Object.entries(secrets)) {
+    if (diskSecrets[field] === value) keep[field] = value;
+  }
+  return keep;
+}
+async function writeOAuthSections(filePath, snapshot, sections, secretStore = defaultSecretStore()) {
+  const policy = getPersistTokensPolicy();
+  const durable = await secretStoreIsDurable(secretStore);
+  await withOAuthStateLock(filePath, "save", async () => {
+    const restoreBaseline = /* @__PURE__ */ new Map();
+    const ourWrites = /* @__PURE__ */ new Map();
+    const priorKey = (p) => `${p.serverId}\0${p.field}`;
+    const foldPriors = (priors) => {
+      for (const prior of priors) {
+        const key = priorKey(prior);
+        if (restoreBaseline.has(key) && ourWrites.get(key) !== void 0 && prior.value === ourWrites.get(key)) {
+          continue;
+        }
+        restoreBaseline.set(key, prior);
+      }
+    };
+    const restoreToBaseline = () => restoreSecretFields(
+      secretStore,
+      [...restoreBaseline.values()],
+      warnRestoreFailure
+    );
+    let unconfirmed = null;
+    const reconcileFailure = async () => {
+      if (unconfirmed !== null) {
+        const committed = unconfirmed;
+        let observed = null;
+        let readable = true;
+        try {
+          observed = await readStoreFile(filePath);
+        } catch (error) {
+          readable = false;
+          warnUnconfirmedFile(error);
+        }
+        if (readable && observed === committed.written) {
+          const target = new Map(
+            [...restoreBaseline].map(([key, { serverId, field, value }]) => [
+              key,
+              { serverId, field, value }
+            ])
+          );
+          for (const [key, write] of committed.writes) target.set(key, write);
+          try {
+            await settleStoreMutations(
+              [...target.values()].map(
+                ({ serverId, field, value }) => value === null ? secretStore.delete(serverId, field) : secretStore.set(serverId, field, value)
+              )
+            );
+            return true;
+          } catch (error) {
+            warnRestoreFailure(error);
+            return false;
+          }
+        }
+      }
+      await restoreToBaseline();
+      return false;
+    };
+    for (let attempt = 0; attempt < MAX_WRITE_ATTEMPTS; attempt++) {
+      const priorSecrets = [];
+      const attemptWrites = /* @__PURE__ */ new Map();
+      let written;
+      try {
+        const disk = await readDiskForMutation(filePath, "save");
+        const effective = sections ? {
+          servers: sections.servers && [...new Set(sections.servers)],
+          idpSessions: sections.idpSessions && [
+            ...new Set(sections.idpSessions)
+          ]
+        } : {
+          servers: [
+            .../* @__PURE__ */ new Set([
+              ...Object.keys(disk?.servers ?? {}),
+              ...Object.keys(snapshot.servers)
+            ])
+          ],
+          idpSessions: [
+            .../* @__PURE__ */ new Set([
+              ...Object.keys(disk?.idpSessions ?? {}),
+              ...Object.keys(snapshot.idpSessions)
+            ])
+          ]
+        };
+        const merged = mergeOAuthSections(disk, snapshot, effective);
+        for (const url of effective.servers ?? []) {
+          const serverId = oauthSecretServerId(url);
+          const next = getOwnEntry(snapshot.servers, url);
+          const candidates = [
+            .../* @__PURE__ */ new Set([
+              ...serverSecretFields(getOwnEntry(disk?.servers, url)),
+              ...serverSecretFields(next)
+            ])
+          ];
+          const entryPrior = await snapshotSecretFields(
+            secretStore,
+            serverId,
+            candidates
+          );
+          priorSecrets.push(...entryPrior);
+          if (next === void 0) {
+            for (const field of candidates) {
+              ourWrites.set(priorKey({ serverId, field }), null);
+            }
+            await secretStore.deleteAllForServer(serverId);
+            for (const field of candidates) {
+              attemptWrites.set(priorKey({ serverId, field }), {
+                serverId,
+                field,
+                value: null
+              });
+            }
+            continue;
+          }
+          const { residue, secrets } = splitServerOAuthState(next, policy);
+          for (const field of candidates) {
+            ourWrites.set(
+              priorKey({ serverId, field }),
+              secrets[field] ?? null
+            );
+          }
+          setOwnEntry(merged.servers, url, residue);
+          if (!durable) {
+            const diskEntry = getOwnEntry(disk?.servers, url);
+            const keep = preserveNonDurableSecrets(
+              diskEntry ? splitServerOAuthState(diskEntry, policy).secrets : {},
+              secrets
+            );
+            if (Object.keys(keep).length > 0) {
+              setOwnEntry(
+                merged.servers,
+                url,
+                joinServerOAuthState(residue, keep)
+              );
+            }
+          }
+          const persisted = await persistEntrySecrets(
+            secretStore,
+            serverId,
+            candidates,
+            secrets,
+            entryPrior,
+            // Degrading is only sound when the disk entry is the pre-call
+            // state this attempt's priors pair with; on a retry it may be an
+            // earlier attempt's committed residue, so escalate into the
+            // reconciling exit instead.
+            attempt === 0
+          );
+          if (!persisted) {
+            revertEntryToDisk(merged.servers, disk?.servers, url);
+            continue;
+          }
+          for (const field of candidates) {
+            attemptWrites.set(priorKey({ serverId, field }), {
+              serverId,
+              field,
+              value: secrets[field] ?? null
+            });
+          }
+        }
+        for (const issuer of effective.idpSessions ?? []) {
+          const serverId = oauthIdpSecretServerId(issuer);
+          const next = getOwnEntry(snapshot.idpSessions, issuer);
+          const entryPrior = await snapshotSecretFields(secretStore, serverId, [
+            IDP_SESSION_FIELD
+          ]);
+          priorSecrets.push(...entryPrior);
+          if (next === void 0) {
+            ourWrites.set(
+              priorKey({ serverId, field: IDP_SESSION_FIELD }),
+              null
+            );
+            await secretStore.deleteAllForServer(serverId);
+            attemptWrites.set(
+              priorKey({ serverId, field: IDP_SESSION_FIELD }),
+              {
+                serverId,
+                field: IDP_SESSION_FIELD,
+                value: null
+              }
+            );
+            continue;
+          }
+          const { residue, secrets } = splitIdpSession(next, policy);
+          ourWrites.set(
+            priorKey({ serverId, field: IDP_SESSION_FIELD }),
+            secrets[IDP_SESSION_FIELD] ?? null
+          );
+          setOwnEntry(merged.idpSessions, issuer, residue);
+          if (!durable) {
+            const diskSession = getOwnEntry(disk?.idpSessions, issuer);
+            const keep = preserveNonDurableSecrets(
+              diskSession ? splitIdpSession(diskSession, policy).secrets : {},
+              secrets
+            );
+            if (Object.keys(keep).length > 0) {
+              setOwnEntry(
+                merged.idpSessions,
+                issuer,
+                joinIdpSession(residue, keep)
+              );
+            }
+          }
+          const persisted = await persistEntrySecrets(
+            secretStore,
+            serverId,
+            [IDP_SESSION_FIELD],
+            secrets,
+            entryPrior,
+            // Same as the server loop: degrade on the first attempt only.
+            attempt === 0
+          );
+          if (!persisted) {
+            revertEntryToDisk(merged.idpSessions, disk?.idpSessions, issuer);
+            continue;
+          }
+          attemptWrites.set(priorKey({ serverId, field: IDP_SESSION_FIELD }), {
+            serverId,
+            field: IDP_SESSION_FIELD,
+            value: secrets[IDP_SESSION_FIELD] ?? null
+          });
+        }
+        written = serializeOAuthPersistBlob(merged);
+        await writeStoreFile(filePath, written);
+        unconfirmed = { written, writes: attemptWrites };
+      } catch (error) {
+        foldPriors(priorSecrets);
+        if (await reconcileFailure()) return;
+        throw error;
       }
-    };
-  }
-  snapshot() {
-    return {
-      servers: { ...this.servers },
-      idpSessions: { ...this.idpSessions }
-    };
+      foldPriors(priorSecrets);
+      let observed;
+      try {
+        observed = await readStoreFile(filePath);
+      } catch {
+        continue;
+      }
+      if (observed === written) return;
+      unconfirmed = null;
+    }
+    if (await reconcileFailure()) return;
+    throw new SecretStoreUnavailableError(
+      `Could not save OAuth state: another process kept overwriting ${filePath} (gave up after ${MAX_WRITE_ATTEMPTS} attempts). Re-run the action to retry.`
+    );
+  });
+}
+function secretRequestsFor(snapshot) {
+  const requests = [];
+  for (const [url, state] of Object.entries(snapshot.servers)) {
+    requests.push({
+      serverId: oauthSecretServerId(url),
+      fields: serverSecretFields(state)
+    });
   }
-  replace(snapshot) {
-    this.servers = { ...snapshot.servers ?? {} };
-    this.idpSessions = { ...snapshot.idpSessions ?? {} };
+  for (const issuer of Object.keys(snapshot.idpSessions)) {
+    requests.push({
+      serverId: oauthIdpSecretServerId(issuer),
+      fields: [IDP_SESSION_FIELD]
+    });
   }
-};
-
-// ../../core/auth/oauth-persist.ts
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+  return requests;
 }
-function snapshotFromPayload(payload) {
+async function joinSnapshot(snapshot, secretStore) {
+  const requests = secretRequestsFor(snapshot);
+  const values = requests.length > 0 ? await secretStoreGetManyStrict(secretStore, requests) : {};
   return {
-    servers: payload.servers ?? {},
-    idpSessions: payload.idpSessions ?? {}
+    servers: Object.fromEntries(
+      Object.entries(snapshot.servers).map(([url, state]) => [
+        url,
+        joinServerOAuthState(state, values[oauthSecretServerId(url)] ?? {})
+      ])
+    ),
+    idpSessions: Object.fromEntries(
+      Object.entries(snapshot.idpSessions).map(([issuer, session]) => [
+        issuer,
+        joinIdpSession(session, values[oauthIdpSecretServerId(issuer)] ?? {})
+      ])
+    )
   };
 }
-function parseOAuthPersistBlob(raw) {
-  if (raw === null || raw === void 0) {
-    return null;
-  }
-  const parsed = typeof raw === "string" ? raw ? parseStore(raw) : null : raw;
-  if (!isRecord2(parsed)) {
-    return null;
-  }
-  if (isRecord2(parsed.state) && "version" in parsed) {
-    return snapshotFromPayload(parsed.state);
-  }
-  if ("servers" in parsed || "idpSessions" in parsed) {
-    return snapshotFromPayload(parsed);
-  }
-  return null;
+async function migratePlaintextSecrets(filePath, secretStore) {
+  const raw = await readStoreFile(filePath);
+  const fresh = parseOAuthPersistBlob(raw);
+  if (!fresh || !snapshotHasPlaintextSecrets(fresh)) return;
+  const migrateEntrySecrets = async (serverId, secrets) => {
+    const absent = {};
+    for (const [field, value] of Object.entries(secrets)) {
+      const existing = await secretStoreGetStrict(secretStore, serverId, field);
+      if (existing === null || !isUsableStoredSecret(field, existing)) {
+        absent[field] = value;
+      }
+    }
+    if (Object.keys(absent).length > 0) {
+      await secretStoreSetMany(secretStore, serverId, absent);
+    }
+  };
+  const residue = { servers: {}, idpSessions: {} };
+  for (const [url, state] of Object.entries(fresh.servers)) {
+    const split = splitServerOAuthState(state, "all");
+    setOwnEntry(residue.servers, url, split.residue);
+    await migrateEntrySecrets(oauthSecretServerId(url), split.secrets);
+  }
+  for (const [issuer, session] of Object.entries(fresh.idpSessions)) {
+    const split = splitIdpSession(session, "all");
+    setOwnEntry(residue.idpSessions, issuer, split.residue);
+    await migrateEntrySecrets(oauthIdpSecretServerId(issuer), split.secrets);
+  }
+  const stripped = serializeOAuthPersistBlob(residue);
+  if (stripped !== raw) {
+    await writeStoreFile(filePath, stripped);
+  }
+}
+async function readOAuthStore(filePath, secretStore = defaultSecretStore()) {
+  return withOAuthStateLock(filePath, "read", async () => {
+    let snapshot = parseOAuthPersistBlob(await readStoreFile(filePath));
+    if (snapshot === null) return null;
+    if (snapshotHasPlaintextSecrets(snapshot) && await secretStoreIsDurable(secretStore)) {
+      try {
+        await migratePlaintextSecrets(filePath, secretStore);
+        snapshot = parseOAuthPersistBlob(await readStoreFile(filePath)) ?? snapshot;
+      } catch (error) {
+        warnMigrationFailure(error);
+      }
+    }
+    return joinSnapshot(snapshot, secretStore);
+  });
 }
-function serializeOAuthPersistBlob(snapshot) {
-  return serializeStore(snapshot);
+async function removeOAuthStore(filePath, secretStore = defaultSecretStore()) {
+  await withOAuthStateLock(filePath, "remove", async () => {
+    const snapshot = await readDiskForMutation(filePath, "remove");
+    if (snapshot) {
+      const targets = [
+        ...Object.entries(snapshot.servers).map(([url, state]) => ({
+          id: oauthSecretServerId(url),
+          fields: serverSecretFields(state)
+        })),
+        ...Object.keys(snapshot.idpSessions).map((issuer) => ({
+          id: oauthIdpSecretServerId(issuer),
+          fields: [IDP_SESSION_FIELD]
+        }))
+      ];
+      const priorSecrets = [];
+      try {
+        for (const { id, fields } of targets) {
+          priorSecrets.push(
+            ...await snapshotSecretFields(secretStore, id, fields)
+          );
+          await secretStore.deleteAllForServer(id);
+        }
+        await deleteStoreFile(filePath);
+      } catch (error) {
+        await restoreSecretFields(
+          secretStore,
+          priorSecrets,
+          warnRestoreFailure
+        );
+        throw error;
+      }
+    } else {
+      await deleteStoreFile(filePath);
+    }
+  });
 }
-
-// ../../core/auth/node/oauth-persist-file.ts
 function createFileOAuthPersistBackend(options) {
+  const secretStore = options.secretStore ?? defaultSecretStore();
   return {
     async read() {
-      const raw = await readStoreFile(options.filePath);
-      return parseOAuthPersistBlob(raw);
+      return readOAuthStore(options.filePath, secretStore);
     },
-    async write(snapshot) {
-      await writeStoreFile(
+    async write(snapshot, sections) {
+      await writeOAuthSections(
         options.filePath,
-        serializeOAuthPersistBlob(snapshot)
+        snapshot,
+        sections,
+        secretStore
       );
     },
     async remove() {
-      await deleteStoreFile(options.filePath);
+      await removeOAuthStore(options.filePath, secretStore);
     }
   };
 }
@@ -16188,25 +17563,33 @@ function getStateFilePath(customPath) {
   }
   return DEFAULT_STATE_PATH;
 }
-var memoryCache = /* @__PURE__ */ new Map();
-function getSharedMemory(stateFilePath) {
+var sharedStateCache = /* @__PURE__ */ new Map();
+function getSharedState(stateFilePath) {
   const key = getStateFilePath(stateFilePath);
-  let memory = memoryCache.get(key);
-  if (!memory) {
-    memory = new OAuthMemoryStore();
-    memoryCache.set(key, memory);
+  let shared = sharedStateCache.get(key);
+  if (!shared) {
+    shared = {
+      memory: new OAuthMemoryStore(),
+      coordination: new OAuthStorageCoordination()
+    };
+    sharedStateCache.set(key, shared);
   }
-  return memory;
+  return shared;
 }
 var NodeOAuthStorage = class extends OAuthStorageBase {
   /**
    * @param storagePath - Optional path to state file. Default: ~/.mcp-inspector/storage/oauth.json
+   * @param secretStore - Optional secret store for tokens/client secrets.
+   *   Default: the process-wide selected store. Tests inject an in-memory
+   *   double here so they never touch the OS keychain.
    */
-  constructor(storagePath) {
+  constructor(storagePath, secretStore) {
     const filePath = getStateFilePath(storagePath);
+    const shared = getSharedState(storagePath);
     super(
-      getSharedMemory(storagePath),
-      createFileOAuthPersistBackend({ filePath })
+      shared.memory,
+      createFileOAuthPersistBackend({ filePath, secretStore }),
+      shared.coordination
     );
   }
 };
@@ -18141,7 +19524,11 @@ async function verifySkills(client, entries, metadata) {
       files,
       ...incomplete ? { incomplete } : {},
       ok: !hasError && !fileFailed,
-      outcome: hasError || fileFailed ? "failed" : incomplete !== void 0 ? "incomplete" : "verified"
+      // Precedence runs from the loudest verdict down: a broken MUST outranks
+      // an unfinished walk, and an unfinished walk outranks a skill that had
+      // nothing to hash — a `"dynamic"` skill past the run's catalog budget
+      // was not read at all, which `incomplete` already says more precisely.
+      outcome: hasError || fileFailed ? "failed" : incomplete !== void 0 ? "incomplete" : entry.resources === DYNAMIC_RESOURCES ? "unverifiable" : "verified"
     });
   }
   return reports;
@@ -18173,6 +19560,7 @@ var FILE_COLOR = {
 };
 var VERIFY_STATUS = {
   verified: "[Verified \u2014 Enter to re-verify]",
+  unverifiable: "[UNVERIFIABLE \u2014 Enter to re-verify]",
   incomplete: "[Verification INCOMPLETE \u2014 Enter to re-verify]",
   failed: "[Verification FAILED \u2014 Enter to re-verify]"
 };
@@ -18485,7 +19873,7 @@ var BOOLEAN_VALUED_KEYWORDS = /* @__PURE__ */ new Set([
   "additionalItems",
   "unevaluatedItems"
 ]);
-var SUBSCHEMA_KEYWORDS = [
+var SUBSCHEMA_KEYWORDS2 = [
   "items",
   "contains",
   "not",
@@ -18502,13 +19890,13 @@ var SUBSCHEMA_KEYWORDS = [
   // real finding.
   "contentSchema"
 ];
-var SUBSCHEMA_ARRAY_KEYWORDS = [
+var SUBSCHEMA_ARRAY_KEYWORDS2 = [
   "allOf",
   "anyOf",
   "oneOf",
   "prefixItems"
 ];
-var SUBSCHEMA_MAP_KEYWORDS = [
+var SUBSCHEMA_MAP_KEYWORDS2 = [
   "properties",
   "patternProperties",
   "dependentSchemas",
@@ -18590,8 +19978,8 @@ function isPortableTypeUnion(type) {
   }
   return new Set(type).size === type.length;
 }
-var MAX_DEPTH = 64;
-function isRecord3(value) {
+var MAX_DEPTH2 = 64;
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function childPath(parent, key) {
@@ -18607,7 +19995,7 @@ function describeSchemaPath(schema, path6) {
   return path6 === "" ? schema : `${schema}.${path6}`;
 }
 function declaresAnyId(node, depth = 0) {
-  if (depth > MAX_DEPTH || !isRecord3(node)) return false;
+  if (depth > MAX_DEPTH2 || !isRecord5(node)) return false;
   if (typeof node.$id === "string" && node.$id !== "") return true;
   let found = false;
   forEachSubschema(node, "", (child) => {
@@ -18626,21 +20014,21 @@ function add(ctx, rule, severity, path6, issue, suggestion) {
   });
 }
 function forEachSubschema(node, path6, visit) {
-  for (const key of SUBSCHEMA_MAP_KEYWORDS) {
+  for (const key of SUBSCHEMA_MAP_KEYWORDS2) {
     const map = node[key];
-    if (!isRecord3(map)) continue;
+    if (!isRecord5(map)) continue;
     for (const [name, sub] of Object.entries(map)) {
       visit(sub, childPath(childPath(path6, key), name), key);
     }
   }
-  for (const key of SUBSCHEMA_ARRAY_KEYWORDS) {
+  for (const key of SUBSCHEMA_ARRAY_KEYWORDS2) {
     const arr = node[key];
     if (!Array.isArray(arr)) continue;
     arr.forEach((sub, i) => {
       visit(sub, indexPath(childPath(path6, key), i), key);
     });
   }
-  for (const key of SUBSCHEMA_KEYWORDS) {
+  for (const key of SUBSCHEMA_KEYWORDS2) {
     if (!(key in node)) continue;
     const value = node[key];
     if (key === "items" && Array.isArray(value)) {
@@ -18659,7 +20047,7 @@ function booleanTrueSuggestion(keyword) {
   return 'Declare what the value actually is \u2014 e.g. `{"type": "object", "additionalProperties": true}` for a free-form object. That is a deliberate change of contract, not an equivalent rewrite: `true` accepts any JSON value at all.';
 }
 function walk(node, path6, keyword, depth, ctx) {
-  if (depth > MAX_DEPTH) return;
+  if (depth > MAX_DEPTH2) return;
   if (typeof node === "boolean") {
     if (keyword !== void 0 && BOOLEAN_VALUED_KEYWORDS.has(keyword)) return;
     add(
@@ -18678,12 +20066,13 @@ function walk(node, path6, keyword, depth, ctx) {
     );
     return;
   }
-  if (!isRecord3(node)) return;
+  if (!isRecord5(node)) return;
   lintNode(node, path6, keyword, ctx);
   forEachSubschema(node, path6, (child, childPathValue, childKeyword) => {
     walk(child, childPathValue, childKeyword, depth + 1, ctx);
   });
 }
+var NULL_BRANCH_CAVEAT = " A dialect with no `null` type, such as OpenAPI 3.0, still cannot express the `null` branch directly; there nullability is written `nullable: true`, which is not JSON Schema, so no single spelling is portable to both.";
 function lintNode(node, path6, keyword, ctx) {
   const type = node.type;
   if (Array.isArray(type) && isPortableTypeUnion(type)) {
@@ -18692,10 +20081,10 @@ function lintNode(node, path6, keyword, ctx) {
       "type-union",
       "warning",
       path6,
-      `\`type\` is an array (${JSON.stringify(type)}). The array form is legal JSON Schema, but several MCP clients read \`type\` as a single string and either reject the tool or drop the constraint.`,
+      `\`type\` is an array (${JSON.stringify(type)}). This is legal JSON Schema, and some model providers recommend it for nullable fields, but it is less portable: a client that maps tool schemas onto a single-\`type\` dialect (such as the OpenAPI subset used for Gemini function declarations) may reject the tool or drop the constraint.`,
       `Split it into \`anyOf\` branches, each with a single \`type\` \u2014 \`{"anyOf": [${type.map((t) => `{"type": "${t}"}`).join(
         ", "
-      )}]}\`. (Making the property optional instead is a different contract: absent is not the same as \`null\`.)`
+      )}]}\`. (Making the property optional instead is a different contract: absent is not the same as \`null\`.)${type.includes("null") ? NULL_BRANCH_CAVEAT : ""}`
     );
   }
   const ref = node.$ref;
@@ -19255,8 +20644,64 @@ function HistoryTab({
 
 // src/components/RequestsTab.tsx
 import React9, { useEffect as useEffect10, useRef as useRef12 } from "react";
-import { Box as Box12, Text as Text11, useInput as useInput9 } from "ink";
+import { Box as Box13, Text as Text12, useInput as useInput9 } from "ink";
+
+// src/components/BodyLines.tsx
+import { Box as Box12, Text as Text11 } from "ink";
+
+// src/utils/bodyLines.ts
+var MAX_BODY_LINES = 500;
+var MAX_BODY_LINE_CHARS = 2e3;
+function formatBody(body) {
+  try {
+    return JSON.stringify(JSON.parse(body), null, 2);
+  } catch {
+    return body;
+  }
+}
+function clipLine(line, maxChars) {
+  if (line.length <= maxChars) return line;
+  return `${line.slice(0, maxChars)}\u2026 (+${line.length - maxChars} chars)`;
+}
+function layoutBody(body, maxLines = MAX_BODY_LINES, maxLineChars = MAX_BODY_LINE_CHARS) {
+  const all = formatBody(body).split("\n");
+  return {
+    lines: all.slice(0, maxLines).map((line) => clipLine(line, maxLineChars)),
+    hiddenLines: Math.max(all.length - maxLines, 0),
+    totalLines: all.length
+  };
+}
+
+// src/components/BodyLines.tsx
 import { Fragment as Fragment8, jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
+function BodyLines({
+  body,
+  keyPrefix
+}) {
+  const { lines, hiddenLines, totalLines } = layoutBody(body);
+  return /* @__PURE__ */ jsxs11(Fragment8, { children: [
+    lines.map((line, idx) => /* @__PURE__ */ jsx12(
+      Box12,
+      {
+        marginTop: idx === 0 ? 1 : 0,
+        paddingLeft: 2,
+        flexShrink: 0,
+        children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: line })
+      },
+      `${keyPrefix}-${idx}`
+    )),
+    hiddenLines > 0 && /* @__PURE__ */ jsx12(Box12, { paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, italic: true, children: [
+      "\u2026 ",
+      hiddenLines,
+      " more lines not shown (",
+      totalLines,
+      " total)"
+    ] }) })
+  ] });
+}
+
+// src/components/RequestsTab.tsx
+import { Fragment as Fragment9, jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
 function RequestsTab({
   requests,
   width,
@@ -19324,9 +20769,9 @@ function RequestsTab({
     if (status >= 400) return "red";
     return "gray";
   };
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "row", width, height, children: [
-    /* @__PURE__ */ jsxs11(
-      Box12,
+  return /* @__PURE__ */ jsxs12(Box13, { flexDirection: "row", width, height, children: [
+    /* @__PURE__ */ jsxs12(
+      Box13,
       {
         width: listWidth,
         height,
@@ -19338,8 +20783,8 @@ function RequestsTab({
         flexDirection: "column",
         paddingX: 1,
         children: [
-          /* @__PURE__ */ jsx12(Box12, { paddingY: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs11(
-            Text11,
+          /* @__PURE__ */ jsx13(Box13, { paddingY: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs12(
+            Text12,
             {
               bold: true,
               backgroundColor: focusedPane === "requests" ? "yellow" : void 0,
@@ -19350,8 +20795,8 @@ function RequestsTab({
               ]
             }
           ) }),
-          requests.length === 0 ? /* @__PURE__ */ jsx12(Box12, { paddingY: 1, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: "No requests" }) }) : /* @__PURE__ */ jsx12(
-            Box12,
+          requests.length === 0 ? /* @__PURE__ */ jsx13(Box13, { paddingY: 1, children: /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: "No requests" }) }) : /* @__PURE__ */ jsx13(
+            Box13,
             {
               flexDirection: "column",
               height: visibleCount,
@@ -19364,14 +20809,14 @@ function RequestsTab({
                 const statusText = req.responseStatus ? `${req.responseStatus}` : req.error ? "ERROR" : "...";
                 const categoryLabel = req.category === "auth" ? "AUTH" : "MCP ";
                 const methodPadded = req.method === "GET" ? "GET " : req.method;
-                return /* @__PURE__ */ jsx12(Box12, { paddingY: 0, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { color: isSelected ? "white" : "white", children: [
+                return /* @__PURE__ */ jsx13(Box13, { paddingY: 0, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text12, { color: isSelected ? "white" : "white", children: [
                   isSelected ? "\u25B6 " : "  ",
-                  /* @__PURE__ */ jsx12(Text11, { children: categoryLabel }),
+                  /* @__PURE__ */ jsx13(Text12, { children: categoryLabel }),
                   " ",
-                  /* @__PURE__ */ jsx12(Text11, { color: statusColor, children: methodPadded }),
+                  /* @__PURE__ */ jsx13(Text12, { color: statusColor, children: methodPadded }),
                   " ",
-                  /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: statusText }),
-                  req.duration !== void 0 && /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+                  /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: statusText }),
+                  req.duration !== void 0 && /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
                     " ",
                     req.duration,
                     "ms"
@@ -19383,8 +20828,8 @@ function RequestsTab({
         ]
       }
     ),
-    /* @__PURE__ */ jsx12(
-      Box12,
+    /* @__PURE__ */ jsx13(
+      Box13,
       {
         width: detailWidth,
         height,
@@ -19396,9 +20841,9 @@ function RequestsTab({
         borderBottom: false,
         borderLeft: false,
         borderRight: false,
-        children: selectedRequest ? /* @__PURE__ */ jsxs11(Fragment8, { children: [
-          /* @__PURE__ */ jsx12(Box12, { flexShrink: 0, paddingTop: 1, children: /* @__PURE__ */ jsxs11(
-            Text11,
+        children: selectedRequest ? /* @__PURE__ */ jsxs12(Fragment9, { children: [
+          /* @__PURE__ */ jsx13(Box13, { flexShrink: 0, paddingTop: 1, children: /* @__PURE__ */ jsxs12(
+            Text12,
             {
               bold: true,
               backgroundColor: focusedPane === "details" ? "yellow" : void 0,
@@ -19410,17 +20855,17 @@ function RequestsTab({
               ]
             }
           ) }),
-          /* @__PURE__ */ jsxs11(ScrollView, { ref: scrollViewRef, height: height - 5, children: [
-            /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { bold: true, children: [
+          /* @__PURE__ */ jsxs12(ScrollView, { ref: scrollViewRef, height: height - 5, children: [
+            /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text12, { bold: true, children: [
               "Category:",
               " ",
-              /* @__PURE__ */ jsx12(Text11, { children: selectedRequest.category === "auth" ? "auth" : "transport" })
+              /* @__PURE__ */ jsx13(Text12, { children: selectedRequest.category === "auth" ? "auth" : "transport" })
             ] }) }),
-            selectedRequest.responseStatus !== void 0 ? /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { bold: true, children: [
+            selectedRequest.responseStatus !== void 0 ? /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text12, { bold: true, children: [
               "Status:",
               " ",
-              /* @__PURE__ */ jsxs11(
-                Text11,
+              /* @__PURE__ */ jsxs12(
+                Text12,
                 {
                   color: getStatusColor(selectedRequest.responseStatus),
                   children: [
@@ -19430,54 +20875,44 @@ function RequestsTab({
                   ]
                 }
               )
-            ] }) }) : selectedRequest.error ? /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { bold: true, color: "red", children: [
+            ] }) }) : selectedRequest.error ? /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text12, { bold: true, color: "red", children: [
               "Error: ",
               selectedRequest.error
-            ] }) }) : /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, italic: true, children: "Request in progress..." }) }),
-            selectedRequest.duration !== void 0 && /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+            ] }) }) : /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx13(Text12, { dimColor: true, italic: true, children: "Request in progress..." }) }),
+            selectedRequest.duration !== void 0 && /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
               selectedRequest.timestamp.toLocaleTimeString(),
               " (",
               selectedRequest.duration,
               "ms)"
             ] }) }),
-            /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { bold: true, children: "Request Headers:" }) }),
+            /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx13(Text12, { bold: true, children: "Request Headers:" }) }),
             Object.entries(selectedRequest.requestHeaders).map(
-              ([key, value]) => /* @__PURE__ */ jsx12(Box12, { marginTop: 0, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+              ([key, value]) => /* @__PURE__ */ jsx13(Box13, { marginTop: 0, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
                 key,
                 ": ",
                 value
               ] }) }, key)
             ),
-            selectedRequest.requestBody && /* @__PURE__ */ jsxs11(Fragment8, { children: [
-              /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { bold: true, children: "Request Body:" }) }),
-              (() => {
-                try {
-                  const parsed = JSON.parse(selectedRequest.requestBody);
-                  return JSON.stringify(parsed, null, 2).split("\n").map((line, idx) => /* @__PURE__ */ jsx12(
-                    Box12,
-                    {
-                      marginTop: idx === 0 ? 1 : 0,
-                      paddingLeft: 2,
-                      flexShrink: 0,
-                      children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: line })
-                    },
-                    `req-body-${idx}`
-                  ));
-                } catch {
-                  return /* @__PURE__ */ jsx12(Box12, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: selectedRequest.requestBody }) });
+            selectedRequest.requestBody && /* @__PURE__ */ jsxs12(Fragment9, { children: [
+              /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx13(Text12, { bold: true, children: "Request Body:" }) }),
+              /* @__PURE__ */ jsx13(
+                BodyLines,
+                {
+                  body: selectedRequest.requestBody,
+                  keyPrefix: "req-body"
                 }
-              })()
+              )
             ] }),
-            selectedRequest.responseHeaders && Object.keys(selectedRequest.responseHeaders).length > 0 && /* @__PURE__ */ jsxs11(Fragment8, { children: [
-              /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { bold: true, children: "Response Headers:" }) }),
+            selectedRequest.responseHeaders && Object.keys(selectedRequest.responseHeaders).length > 0 && /* @__PURE__ */ jsxs12(Fragment9, { children: [
+              /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx13(Text12, { bold: true, children: "Response Headers:" }) }),
               Object.entries(selectedRequest.responseHeaders).map(
-                ([key, value]) => /* @__PURE__ */ jsx12(
-                  Box12,
+                ([key, value]) => /* @__PURE__ */ jsx13(
+                  Box13,
                   {
                     marginTop: 0,
                     paddingLeft: 2,
                     flexShrink: 0,
-                    children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+                    children: /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
                       key,
                       ": ",
                       value
@@ -19487,38 +20922,28 @@ function RequestsTab({
                 )
               )
             ] }),
-            selectedRequest.responseBody && /* @__PURE__ */ jsxs11(Fragment8, { children: [
-              /* @__PURE__ */ jsx12(Box12, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { bold: true, children: "Response Body:" }) }),
-              (() => {
-                try {
-                  const parsed = JSON.parse(selectedRequest.responseBody);
-                  return JSON.stringify(parsed, null, 2).split("\n").map((line, idx) => /* @__PURE__ */ jsx12(
-                    Box12,
-                    {
-                      marginTop: idx === 0 ? 1 : 0,
-                      paddingLeft: 2,
-                      flexShrink: 0,
-                      children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: line })
-                    },
-                    `resp-body-${idx}`
-                  ));
-                } catch {
-                  return /* @__PURE__ */ jsx12(Box12, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: selectedRequest.responseBody }) });
+            selectedRequest.responseBody && /* @__PURE__ */ jsxs12(Fragment9, { children: [
+              /* @__PURE__ */ jsx13(Box13, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx13(Text12, { bold: true, children: "Response Body:" }) }),
+              /* @__PURE__ */ jsx13(
+                BodyLines,
+                {
+                  body: selectedRequest.responseBody,
+                  keyPrefix: "resp-body"
                 }
-              })()
+              )
             ] })
           ] }),
-          focusedPane === "details" && /* @__PURE__ */ jsx12(
-            Box12,
+          focusedPane === "details" && /* @__PURE__ */ jsx13(
+            Box13,
             {
               flexShrink: 0,
               height: 1,
               justifyContent: "center",
               backgroundColor: "gray",
-              children: /* @__PURE__ */ jsx12(Text11, { bold: true, color: "white", children: "\u2191/\u2193 to scroll, + to zoom" })
+              children: /* @__PURE__ */ jsx13(Text12, { bold: true, color: "white", children: "\u2191/\u2193 to scroll, + to zoom" })
             }
           )
-        ] }) : /* @__PURE__ */ jsx12(Box12, { paddingY: 1, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: "Select a request to view details" }) })
+        ] }) : /* @__PURE__ */ jsx13(Box13, { paddingY: 1, flexShrink: 0, children: /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: "Select a request to view details" }) })
       }
     )
   ] });
@@ -19526,16 +20951,16 @@ function RequestsTab({
 
 // src/components/ToolTestModal.tsx
 import React26, { useState as useState14 } from "react";
-import { Box as Box24, Text as Text21, useInput as useInput18 } from "ink";
+import { Box as Box25, Text as Text22, useInput as useInput18 } from "ink";
 
 // node_modules/ink-form/lib/Form.js
-import { Box as Box23, useFocusManager, useInput as useInput17 } from "ink";
+import { Box as Box24, useFocusManager, useInput as useInput17 } from "ink";
 import { useEffect as useEffect13, useMemo as useMemo3, useState as useState13 } from "react";
 import * as React24 from "react";
 
 // node_modules/ink-form/lib/FormHeader.js
 import * as React10 from "react";
-import { Box as Box13, Text as Text12, useInput as useInput10 } from "ink";
+import { Box as Box14, Text as Text13, useInput as useInput10 } from "ink";
 var FormHeader = (props) => {
   const sections = props.form.sections;
   useInput10((input, key) => {
@@ -19552,42 +20977,42 @@ var FormHeader = (props) => {
     }
   }, { isActive: !props.editingField });
   return React10.createElement(
-    Box13,
+    Box14,
     { borderStyle: "double", width: "100%", flexDirection: "column" },
     React10.createElement(
-      Box13,
+      Box14,
       { width: "100%" },
       React10.createElement(
-        Box13,
+        Box14,
         { flexGrow: 1 },
-        React10.createElement(Text12, { bold: true }, props.form.title)
+        React10.createElement(Text13, { bold: true }, props.form.title)
       ),
       React10.createElement(
-        Box13,
+        Box14,
         null,
-        React10.createElement(Text12, null, !props.editingField ? "Use arrow keys to move around" : "Press ESC to cancel, or Enter to complete field")
+        React10.createElement(Text13, null, !props.editingField ? "Use arrow keys to move around" : "Press ESC to cancel, or Enter to complete field")
       )
     ),
     React10.createElement(
-      Box13,
+      Box14,
       { width: "100%" },
-      React10.createElement(Box13, null, !props.editingField ? sections.map((section, id) => React10.createElement(
-        Box13,
+      React10.createElement(Box14, null, !props.editingField ? sections.map((section, id) => React10.createElement(
+        Box14,
         { key: section.title },
         React10.createElement(
-          Text12,
+          Text13,
           { color: "gray" },
           "[",
           id + 1,
           "] "
         ),
-        React10.createElement(Text12, { color: props.currentTab === id ? "blue" : void 0, underline: props.currentTab === id }, section.title),
-        React10.createElement(Text12, null, " ")
+        React10.createElement(Text13, { color: props.currentTab === id ? "blue" : void 0, underline: props.currentTab === id }, section.title),
+        React10.createElement(Text13, null, " ")
       )) : React10.createElement(
-        Box13,
+        Box14,
         null,
         React10.createElement(
-          Text12,
+          Text13,
           null,
           "Editing ",
           props.editingField
@@ -19599,18 +21024,18 @@ var FormHeader = (props) => {
 
 // node_modules/ink-form/lib/FormFieldRenderer.js
 import React22, { useState as useState12 } from "react";
-import { Box as Box21, useFocus, Text as Text19, useInput as useInput15 } from "ink";
+import { Box as Box22, useFocus, Text as Text20, useInput as useInput15 } from "ink";
 
 // node_modules/ink-form/lib/managers/FloatFormFieldManager.js
 import React13 from "react";
 
 // node_modules/ink-form/lib/NumberFieldRenderer.js
 import React12 from "react";
-import { Box as Box14, Text as Text14, useInput as useInput12 } from "ink";
+import { Box as Box15, Text as Text15, useInput as useInput12 } from "ink";
 
 // node_modules/ink-text-input/build/index.js
 import React11, { useState as useState10, useEffect as useEffect11 } from "react";
-import { Text as Text13, useInput as useInput11 } from "ink";
+import { Text as Text14, useInput as useInput11 } from "ink";
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -20192,7 +21617,7 @@ function TextInput({ value: originalValue, placeholder = "", focus = true, mask,
       onChange(nextValue);
     }
   }, { isActive: focus });
-  return React11.createElement(Text13, null, placeholder ? value.length > 0 ? renderedValue : renderedPlaceholder : renderedValue);
+  return React11.createElement(Text14, null, placeholder ? value.length > 0 ? renderedValue : renderedPlaceholder : renderedValue);
 }
 var build_default = TextInput;
 
@@ -20236,10 +21661,10 @@ var NumberFieldRenderer = (props) => {
     }
   });
   return React12.createElement(
-    Box14,
+    Box15,
     { borderStyle: "round", width: "100%", flexDirection: "column" },
     React12.createElement(
-      Box14,
+      Box15,
       null,
       React12.createElement(build_default, { value: "" + (props.value ?? ""), onChange: (value) => {
         if (regex.test(value)) {
@@ -20252,9 +21677,9 @@ var NumberFieldRenderer = (props) => {
       }, placeholder: props.field.placeholder, onSubmit: () => props.onSetEditingField(void 0) })
     ),
     React12.createElement(
-      Box14,
+      Box15,
       null,
-      React12.createElement(Text14, { dimColor: true }, "Press UP/DOWN to increase or decrease the value.")
+      React12.createElement(Text15, { dimColor: true }, "Press UP/DOWN to increase or decrease the value.")
     )
   );
 };
@@ -20276,11 +21701,11 @@ var IntegerFormFieldManager = class {
 
 // node_modules/ink-form/lib/managers/SelectFormFieldManager.js
 import React18 from "react";
-import { Box as Box17 } from "ink";
+import { Box as Box18 } from "ink";
 
 // node_modules/ink-select-input/build/Indicator.js
 import React15 from "react";
-import { Box as Box15, Text as Text15 } from "ink";
+import { Box as Box16, Text as Text16 } from "ink";
 
 // node_modules/is-unicode-supported/index.js
 import process3 from "process";
@@ -20571,15 +21996,15 @@ var replacements = Object.entries(specialMainSymbols);
 
 // node_modules/ink-select-input/build/Indicator.js
 function Indicator({ isSelected = false }) {
-  return React15.createElement(Box15, { marginRight: 1 }, isSelected ? React15.createElement(Text15, { color: "blue" }, figures_default.pointer) : React15.createElement(Text15, null, " "));
+  return React15.createElement(Box16, { marginRight: 1 }, isSelected ? React15.createElement(Text16, { color: "blue" }, figures_default.pointer) : React15.createElement(Text16, null, " "));
 }
 var Indicator_default = Indicator;
 
 // node_modules/ink-select-input/build/Item.js
 import * as React16 from "react";
-import { Text as Text16 } from "ink";
+import { Text as Text17 } from "ink";
 function Item({ isSelected = false, label }) {
-  return React16.createElement(Text16, { color: isSelected ? "blue" : void 0 }, label);
+  return React16.createElement(Text17, { color: isSelected ? "blue" : void 0 }, label);
 }
 var Item_default = Item;
 
@@ -20610,7 +22035,7 @@ function toRotated(array, steps) {
 }
 
 // node_modules/ink-select-input/build/SelectInput.js
-import { Box as Box16, useInput as useInput13 } from "ink";
+import { Box as Box17, useInput as useInput13 } from "ink";
 function SelectInput({ items = [], isFocused = true, initialIndex = 0, indicatorComponent = Indicator_default, itemComponent = Item_default, limit: customLimit, onSelect, onHighlight }) {
   const hasLimit = typeof customLimit === "number" && items.length > customLimit;
   const limit = hasLimit ? Math.min(customLimit, items.length) : items.length;
@@ -20677,12 +22102,12 @@ function SelectInput({ items = [], isFocused = true, initialIndex = 0, indicator
     onHighlight
   ]), { isActive: isFocused });
   const slicedItems = hasLimit ? toRotated(items, rotateIndex).slice(0, limit) : items;
-  return React17.createElement(Box16, { flexDirection: "column" }, slicedItems.map((item, index) => {
+  return React17.createElement(Box17, { flexDirection: "column" }, slicedItems.map((item, index) => {
     const isSelected = index === selectedIndex;
     return (
       // @ts-expect-error - `key` can't be optional but `item.value` is generic T
       React17.createElement(
-        Box16,
+        Box17,
         { key: item.key ?? item.value },
         React17.createElement(indicatorComponent, { isSelected }),
         React17.createElement(itemComponent, { ...item, isSelected })
@@ -20696,7 +22121,7 @@ var SelectInput_default = SelectInput;
 var SelectFormFieldManager = class {
   type = "select";
   renderField = (props) => React18.createElement(
-    Box17,
+    Box18,
     { borderStyle: "round", width: "100%" },
     React18.createElement(SelectInput_default, { items: props.field.options.map((option) => ({ value: option.value, label: option.label ?? option.value })), onHighlight: (option) => props.onChange(option.value), initialIndex: props.field.options.findIndex((option) => option.value === props.value) ?? 0 })
   );
@@ -20705,11 +22130,11 @@ var SelectFormFieldManager = class {
 
 // node_modules/ink-form/lib/managers/StringFormFieldManager.js
 import React19 from "react";
-import { Box as Box18, Transform } from "ink";
+import { Box as Box19, Transform } from "ink";
 var StringFormFieldManager = class {
   type = "string";
   renderField = (props) => React19.createElement(
-    Box18,
+    Box19,
     { borderStyle: "round", width: "100%" },
     React19.createElement(build_default, { value: props.value ?? "", onChange: (value) => {
       props.onChange(value);
@@ -20725,7 +22150,7 @@ var StringFormFieldManager = class {
 
 // node_modules/ink-form/lib/managers/BooleanFormFieldManager.js
 import React20 from "react";
-import { Box as Box19, Text as Text17, useInput as useInput14 } from "ink";
+import { Box as Box20, Text as Text18, useInput as useInput14 } from "ink";
 var BooleanFormFieldManager = class {
   type = "boolean";
   renderField = (props) => {
@@ -20735,21 +22160,21 @@ var BooleanFormFieldManager = class {
       }
     });
     return React20.createElement(
-      Box19,
+      Box20,
       { width: "100%", borderStyle: "round", borderColor: props.value ? "green" : "gray", marginBottom: 2 },
       React20.createElement(
-        Box19,
+        Box20,
         { marginRight: 2 },
-        React20.createElement(Text17, { color: props.value ? "green" : "gray" }, props.value === void 0 ? "[Not set]" : props.value ? "[True]" : "[False]")
+        React20.createElement(Text18, { color: props.value ? "green" : "gray" }, props.value === void 0 ? "[Not set]" : props.value ? "[True]" : "[False]")
       ),
       React20.createElement(
-        Box19,
+        Box20,
         { flexGrow: 1 },
-        React20.createElement(Text17, null, "Press Space to toggle value")
+        React20.createElement(Text18, null, "Press Space to toggle value")
       )
     );
   };
-  renderValue = (props) => React20.createElement(Text17, null, props.value === void 0 ? "[Not set]" : props.value ? "[True]" : "[False]");
+  renderValue = (props) => React20.createElement(Text18, null, props.value === void 0 ? "[Not set]" : props.value ? "[True]" : "[False]");
 };
 
 // node_modules/ink-form/lib/managers/managers.js
@@ -20766,20 +22191,20 @@ var getManager = (formFieldType, customManagers = []) => {
 
 // node_modules/ink-form/lib/DescriptionRenderer.js
 import React21 from "react";
-import { Box as Box20, Text as Text18 } from "ink";
+import { Box as Box21, Text as Text19 } from "ink";
 var DescriptionRenderer = (props) => {
   if (!props.description) {
     return null;
   } else if (props.description.type) {
     return props.description;
   } else if (Array.isArray(props.description)) {
-    return React21.createElement(Box20, { flexDirection: "column" }, props.description.map((line) => React21.createElement(
-      Box20,
+    return React21.createElement(Box21, { flexDirection: "column" }, props.description.map((line) => React21.createElement(
+      Box21,
       { key: line, width: "100%", marginBottom: 1 },
-      React21.createElement(Text18, null, line)
+      React21.createElement(Text19, null, line)
     )));
   } else {
-    return React21.createElement(Text18, null, props.description);
+    return React21.createElement(Text19, null, props.description);
   }
 };
 
@@ -20822,24 +22247,24 @@ var FormFieldRenderer = (props) => {
   if (!isEditing) {
     const RenderValue = manager?.renderValue ?? (() => React22.createElement(React22.Fragment, null, props.value));
     return React22.createElement(
-      Box21,
+      Box22,
       { marginX: 2, paddingX: 1, borderStyle: "round", borderColor: isFocused ? "blue" : void 0 },
       React22.createElement(
-        Box21,
+        Box22,
         { flexGrow: 1 },
-        React22.createElement(Text19, { underline: isFocused, color: isFocused ? "blue" : void 0 }, props.field.label ?? props.field.name),
-        props.field.required && React22.createElement(Text19, { color: "red" }, "*"),
-        React22.createElement(Text19, null, ": "),
+        React22.createElement(Text20, { underline: isFocused, color: isFocused ? "blue" : void 0 }, props.field.label ?? props.field.name),
+        props.field.required && React22.createElement(Text20, { color: "red" }, "*"),
+        React22.createElement(Text20, null, ": "),
         React22.createElement(
-          Text19,
+          Text20,
           { dimColor: true },
           React22.createElement(RenderValue, { value: props.value, field: props.field })
         )
       ),
       isFocused && React22.createElement(
-        Box21,
+        Box22,
         null,
-        React22.createElement(Text19, null, "Press enter to edit")
+        React22.createElement(Text20, null, "Press enter to edit")
       )
     );
   } else {
@@ -20856,7 +22281,7 @@ var FormFieldRenderer = (props) => {
     };
     if (!manager) {
       component = React22.createElement(
-        Text19,
+        Text20,
         { color: "red" },
         "No formfield manager for form field of type ",
         props.field.type,
@@ -20867,39 +22292,39 @@ var FormFieldRenderer = (props) => {
       component = React22.createElement(Field, { ...rendererProps });
     }
     return React22.createElement(
-      Box21,
+      Box22,
       { paddingX: 3, paddingY: 1, flexDirection: "column" },
       React22.createElement(
-        Box21,
+        Box22,
         null,
-        React22.createElement(Text19, null, props.field.label ?? props.field.name),
-        props.field.required && React22.createElement(Text19, { color: "red" }, "*"),
-        React22.createElement(Text19, null, ": ")
+        React22.createElement(Text20, null, props.field.label ?? props.field.name),
+        props.field.required && React22.createElement(Text20, { color: "red" }, "*"),
+        React22.createElement(Text20, null, ": ")
       ),
-      React22.createElement(Box21, null, component),
+      React22.createElement(Box22, null, component),
       props.field.description && React22.createElement(
-        Box21,
+        Box22,
         null,
         React22.createElement(
-          Text19,
+          Text20,
           { dimColor: true },
           React22.createElement(DescriptionRenderer, { description: props.field.description })
         )
       ),
       error && React22.createElement(
-        Box21,
+        Box22,
         null,
         React22.createElement(
-          Text19,
+          Text20,
           { color: "red" },
           "Error: ",
           error
         )
       ),
       React22.createElement(
-        Box21,
+        Box22,
         { marginTop: 2 },
-        React22.createElement(Text19, { dimColor: true }, error ? React22.createElement(React22.Fragment, null, "Press ESC to cancel.") : React22.createElement(
+        React22.createElement(Text20, { dimColor: true }, error ? React22.createElement(React22.Fragment, null, "Press ESC to cancel.") : React22.createElement(
           React22.Fragment,
           null,
           "Press ",
@@ -20918,7 +22343,7 @@ var canSubmit = (form, value) => {
 
 // node_modules/ink-form/lib/SubmitButton.js
 import React23 from "react";
-import { Text as Text20, Box as Box22, useFocus as useFocus2, useInput as useInput16 } from "ink";
+import { Text as Text21, Box as Box23, useFocus as useFocus2, useInput as useInput16 } from "ink";
 var SubmitButton = (props) => {
   const { isFocused } = useFocus2({ isActive: props.canSubmit });
   useInput16((input, key) => {
@@ -20927,17 +22352,17 @@ var SubmitButton = (props) => {
     }
   });
   return React23.createElement(
-    Box22,
+    Box23,
     { marginRight: 2 },
     React23.createElement(
-      Box22,
+      Box23,
       { marginRight: 2, paddingY: 1 },
-      React23.createElement(Text20, null, !props.canSubmit ? "There are still required inputs you have not completed yet." : isFocused ? "Press Enter to submit form" : "Use the arrow keys to navigate to the submit button.")
+      React23.createElement(Text21, null, !props.canSubmit ? "There are still required inputs you have not completed yet." : isFocused ? "Press Enter to submit form" : "Use the arrow keys to navigate to the submit button.")
     ),
     React23.createElement(
-      Box22,
+      Box23,
       { borderStyle: "round", borderColor: !props.canSubmit ? "gray" : isFocused ? "blue" : "white", paddingX: 2 },
-      React23.createElement(Text20, { color: !props.canSubmit ? "gray" : isFocused ? "blue" : "white", bold: true, underline: isFocused }, props.canSubmit ? "Submit form" : "Cannot submit form yet")
+      React23.createElement(Text21, { color: !props.canSubmit ? "gray" : isFocused ? "blue" : "white", bold: true, underline: isFocused }, props.canSubmit ? "Submit form" : "Cannot submit form yet")
     )
   );
 };
@@ -20978,17 +22403,17 @@ var Form = (props) => {
     }
   }, { isActive: !editingField });
   return React24.createElement(
-    Box23,
+    Box24,
     { width: "100%", height: "100%", flexDirection: "column" },
     React24.createElement(FormHeader, { ...props, currentTab, onChangeTab: setCurrentTab, editingField }),
     !editingField && props.form.sections[currentTab].description && React24.createElement(
-      Box23,
+      Box24,
       { marginX: 4 },
       React24.createElement(DescriptionRenderer, { description: props.form.sections[currentTab].description })
     ),
-    React24.createElement(Box23, { flexDirection: "column" }, currentTab > props.form.sections.length - 1 ? null : props.form.sections[currentTab].fields.map((field) => React24.createElement(FormFieldRenderer, { field, key: field.name, form: props.form, value: value[field.name], onChange: (v) => setValueAndPropagate({ ...value, [field.name]: v }), onSetEditingField: setEditingField, editingField, customManagers: props.customManagers }))),
+    React24.createElement(Box24, { flexDirection: "column" }, currentTab > props.form.sections.length - 1 ? null : props.form.sections[currentTab].fields.map((field) => React24.createElement(FormFieldRenderer, { field, key: field.name, form: props.form, value: value[field.name], onChange: (v) => setValueAndPropagate({ ...value, [field.name]: v }), onSetEditingField: setEditingField, editingField, customManagers: props.customManagers }))),
     !editingField && React24.createElement(
-      Box23,
+      Box24,
       { flexDirection: "row-reverse" },
       React24.createElement(SubmitButton, { canSubmit: canSubmitForm, onSubmit: () => props.onSubmit?.(value) })
     )
@@ -21260,7 +22685,7 @@ function missingRequiredFields(schema, decoded, rawValues = {}) {
 }
 
 // src/components/ToolTestModal.tsx
-import { Fragment as Fragment9, jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Fragment as Fragment10, jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 function ToolTestModal({
   tool,
   inspectorClient,
@@ -21289,7 +22714,8 @@ function ToolTestModal({
       process.stdout.off("resize", updateDimensions);
     };
   }, [width, height]);
-  const formStructure = tool?.inputSchema ? schemaToForm(tool.inputSchema, tool.name || "Unknown Tool") : {
+  const inputSchema = inlineLocalRefs(tool?.inputSchema);
+  const formStructure = inputSchema ? schemaToForm(inputSchema, tool?.name || "Unknown Tool") : {
     title: `Test Tool: ${tool?.name || "Unknown"}`,
     sections: [{ title: "Parameters", fields: [] }]
   };
@@ -21328,8 +22754,8 @@ function ToolTestModal({
   );
   const handleFormSubmit = async (rawValues) => {
     if (!inspectorClient || !tool) return;
-    const values = decodeFormValues(tool.inputSchema, rawValues);
-    const missing = missingRequiredFields(tool.inputSchema, values, rawValues);
+    const values = decodeFormValues(inputSchema, rawValues);
+    const missing = missingRequiredFields(inputSchema, values, rawValues);
     if (missing.length > 0) {
       setResult({
         input: values,
@@ -21385,8 +22811,8 @@ function ToolTestModal({
   };
   const modalWidth = terminalDimensions.width - 2;
   const modalHeight = terminalDimensions.height - 2;
-  return /* @__PURE__ */ jsx13(
-    Box24,
+  return /* @__PURE__ */ jsx14(
+    Box25,
     {
       position: "absolute",
       width: terminalDimensions.width,
@@ -21394,8 +22820,8 @@ function ToolTestModal({
       flexDirection: "column",
       justifyContent: "center",
       alignItems: "center",
-      children: /* @__PURE__ */ jsxs12(
-        Box24,
+      children: /* @__PURE__ */ jsxs13(
+        Box25,
         {
           width: modalWidth,
           height: modalHeight,
@@ -21406,40 +22832,40 @@ function ToolTestModal({
           paddingY: 1,
           backgroundColor: "black",
           children: [
-            /* @__PURE__ */ jsxs12(Box24, { flexShrink: 0, marginBottom: 1, children: [
-              /* @__PURE__ */ jsx13(Text21, { bold: true, color: "cyan", children: formStructure.title }),
-              /* @__PURE__ */ jsx13(Text21, { children: " " }),
-              /* @__PURE__ */ jsx13(Text21, { dimColor: true, children: "(Press ESC to close)" })
+            /* @__PURE__ */ jsxs13(Box25, { flexShrink: 0, marginBottom: 1, children: [
+              /* @__PURE__ */ jsx14(Text22, { bold: true, color: "cyan", children: formStructure.title }),
+              /* @__PURE__ */ jsx14(Text22, { children: " " }),
+              /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: "(Press ESC to close)" })
             ] }),
-            /* @__PURE__ */ jsxs12(Box24, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: [
-              state === "form" && /* @__PURE__ */ jsx13(Box24, { flexGrow: 1, width: "100%", children: /* @__PURE__ */ jsx13(
+            /* @__PURE__ */ jsxs13(Box25, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: [
+              state === "form" && /* @__PURE__ */ jsx14(Box25, { flexGrow: 1, width: "100%", children: /* @__PURE__ */ jsx14(
                 Form,
                 {
                   form: formStructure,
                   onSubmit: (value) => void handleFormSubmit(value)
                 }
               ) }),
-              state === "loading" && /* @__PURE__ */ jsx13(Box24, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx13(Text21, { color: "yellow", children: "Calling tool..." }) }),
-              state === "results" && result && /* @__PURE__ */ jsx13(Box24, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsxs12(ScrollView, { ref: scrollViewRef, children: [
-                /* @__PURE__ */ jsx13(Box24, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs12(Text21, { bold: true, color: "green", children: [
+              state === "loading" && /* @__PURE__ */ jsx14(Box25, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx14(Text22, { color: "yellow", children: "Calling tool..." }) }),
+              state === "results" && result && /* @__PURE__ */ jsx14(Box25, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsxs13(ScrollView, { ref: scrollViewRef, children: [
+                /* @__PURE__ */ jsx14(Box25, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs13(Text22, { bold: true, color: "green", children: [
                   "Duration: ",
                   result.duration,
                   "ms"
                 ] }) }),
-                /* @__PURE__ */ jsxs12(Box24, { marginBottom: 1, flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx13(Text21, { bold: true, color: "cyan", children: "Input:" }),
-                  /* @__PURE__ */ jsx13(Box24, { paddingLeft: 2, children: /* @__PURE__ */ jsx13(Text21, { dimColor: true, children: JSON.stringify(result.input, null, 2) }) })
+                /* @__PURE__ */ jsxs13(Box25, { marginBottom: 1, flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx14(Text22, { bold: true, color: "cyan", children: "Input:" }),
+                  /* @__PURE__ */ jsx14(Box25, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: JSON.stringify(result.input, null, 2) }) })
                 ] }),
-                result.error ? /* @__PURE__ */ jsxs12(Box24, { flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx13(Text21, { bold: true, color: "red", children: "Error:" }),
-                  /* @__PURE__ */ jsx13(Box24, { paddingLeft: 2, children: /* @__PURE__ */ jsx13(Text21, { color: "red", children: String(result.error) }) }),
-                  result.errorDetails != null ? /* @__PURE__ */ jsxs12(Fragment9, { children: [
-                    /* @__PURE__ */ jsx13(Box24, { marginTop: 1, children: /* @__PURE__ */ jsx13(Text21, { bold: true, color: "red", dimColor: true, children: "Error Details:" }) }),
-                    /* @__PURE__ */ jsx13(Box24, { paddingLeft: 2, children: /* @__PURE__ */ jsx13(Text21, { dimColor: true, children: JSON.stringify(result.errorDetails, null, 2) }) })
+                result.error ? /* @__PURE__ */ jsxs13(Box25, { flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx14(Text22, { bold: true, color: "red", children: "Error:" }),
+                  /* @__PURE__ */ jsx14(Box25, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text22, { color: "red", children: String(result.error) }) }),
+                  result.errorDetails != null ? /* @__PURE__ */ jsxs13(Fragment10, { children: [
+                    /* @__PURE__ */ jsx14(Box25, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text22, { bold: true, color: "red", dimColor: true, children: "Error Details:" }) }),
+                    /* @__PURE__ */ jsx14(Box25, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: JSON.stringify(result.errorDetails, null, 2) }) })
                   ] }) : null
-                ] }) : /* @__PURE__ */ jsxs12(Box24, { flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx13(Text21, { bold: true, color: "green", children: "Output:" }),
-                  /* @__PURE__ */ jsx13(Box24, { paddingLeft: 2, children: /* @__PURE__ */ jsx13(Text21, { dimColor: true, children: JSON.stringify(result.output, null, 2) }) })
+                ] }) : /* @__PURE__ */ jsxs13(Box25, { flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx14(Text22, { bold: true, color: "green", children: "Output:" }),
+                  /* @__PURE__ */ jsx14(Box25, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: JSON.stringify(result.output, null, 2) }) })
                 ] })
               ] }) })
             ] })
@@ -21452,7 +22878,7 @@ function ToolTestModal({
 
 // src/components/ResourceTestModal.tsx
 import React27, { useState as useState15 } from "react";
-import { Box as Box25, Text as Text22, useInput as useInput19 } from "ink";
+import { Box as Box26, Text as Text23, useInput as useInput19 } from "ink";
 
 // src/utils/uriTemplateToForm.ts
 import { UriTemplate as UriTemplate2 } from "@modelcontextprotocol/client";
@@ -21485,7 +22911,7 @@ function uriTemplateToForm(uriTemplate, templateName) {
 }
 
 // src/components/ResourceTestModal.tsx
-import { Fragment as Fragment10, jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Fragment as Fragment11, jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
 function getErrorMessage(error) {
   if (error instanceof Error) {
     return error.message;
@@ -21634,8 +23060,8 @@ function ResourceTestModal({
   };
   const modalWidth = terminalDimensions.width - 2;
   const modalHeight = terminalDimensions.height - 2;
-  return /* @__PURE__ */ jsx14(
-    Box25,
+  return /* @__PURE__ */ jsx15(
+    Box26,
     {
       position: "absolute",
       width: terminalDimensions.width,
@@ -21643,8 +23069,8 @@ function ResourceTestModal({
       flexDirection: "column",
       justifyContent: "center",
       alignItems: "center",
-      children: /* @__PURE__ */ jsxs13(
-        Box25,
+      children: /* @__PURE__ */ jsxs14(
+        Box26,
         {
           width: modalWidth,
           height: modalHeight,
@@ -21655,15 +23081,15 @@ function ResourceTestModal({
           paddingY: 1,
           backgroundColor: "black",
           children: [
-            /* @__PURE__ */ jsxs13(Box25, { flexShrink: 0, marginBottom: 1, children: [
-              /* @__PURE__ */ jsx14(Text22, { bold: true, color: "cyan", children: formStructure.title }),
-              /* @__PURE__ */ jsx14(Text22, { children: " " }),
-              /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: "(Press ESC to close)" })
+            /* @__PURE__ */ jsxs14(Box26, { flexShrink: 0, marginBottom: 1, children: [
+              /* @__PURE__ */ jsx15(Text23, { bold: true, color: "cyan", children: formStructure.title }),
+              /* @__PURE__ */ jsx15(Text23, { children: " " }),
+              /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: "(Press ESC to close)" })
             ] }),
-            /* @__PURE__ */ jsxs13(Box25, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: [
-              state === "form" && /* @__PURE__ */ jsxs13(Box25, { flexGrow: 1, flexDirection: "column", children: [
-                template.description && /* @__PURE__ */ jsx14(Box25, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: template.description }) }),
-                /* @__PURE__ */ jsx14(
+            /* @__PURE__ */ jsxs14(Box26, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: [
+              state === "form" && /* @__PURE__ */ jsxs14(Box26, { flexGrow: 1, flexDirection: "column", children: [
+                template.description && /* @__PURE__ */ jsx15(Box26, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: template.description }) }),
+                /* @__PURE__ */ jsx15(
                   Form,
                   {
                     form: formStructure,
@@ -21671,34 +23097,34 @@ function ResourceTestModal({
                   }
                 )
               ] }),
-              state === "loading" && /* @__PURE__ */ jsx14(Box25, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx14(Text22, { color: "yellow", children: "Reading resource..." }) }),
-              state === "results" && result && /* @__PURE__ */ jsx14(Box25, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsxs13(ScrollView, { ref: scrollViewRef, children: [
-                /* @__PURE__ */ jsx14(Box25, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs13(Text22, { bold: true, color: "green", children: [
+              state === "loading" && /* @__PURE__ */ jsx15(Box26, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx15(Text23, { color: "yellow", children: "Reading resource..." }) }),
+              state === "results" && result && /* @__PURE__ */ jsx15(Box26, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsxs14(ScrollView, { ref: scrollViewRef, children: [
+                /* @__PURE__ */ jsx15(Box26, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs14(Text23, { bold: true, color: "green", children: [
                   "Duration: ",
                   result.duration,
                   "ms"
                 ] }) }),
-                /* @__PURE__ */ jsxs13(Box25, { marginBottom: 1, flexShrink: 0, children: [
-                  /* @__PURE__ */ jsxs13(Text22, { bold: true, color: "cyan", children: [
+                /* @__PURE__ */ jsxs14(Box26, { marginBottom: 1, flexShrink: 0, children: [
+                  /* @__PURE__ */ jsxs14(Text23, { bold: true, color: "cyan", children: [
                     "URI:",
                     " "
                   ] }),
-                  /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: result.uri })
+                  /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: result.uri })
                 ] }),
-                /* @__PURE__ */ jsxs13(Box25, { marginBottom: 1, flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx14(Text22, { bold: true, color: "cyan", children: "Template Values:" }),
-                  /* @__PURE__ */ jsx14(Box25, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: JSON.stringify(result.input, null, 2) }) })
+                /* @__PURE__ */ jsxs14(Box26, { marginBottom: 1, flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx15(Text23, { bold: true, color: "cyan", children: "Template Values:" }),
+                  /* @__PURE__ */ jsx15(Box26, { paddingLeft: 2, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: JSON.stringify(result.input, null, 2) }) })
                 ] }),
-                result.error ? /* @__PURE__ */ jsxs13(Box25, { flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx14(Box25, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx14(Text22, { bold: true, color: "red", children: "Error:" }) }),
-                  /* @__PURE__ */ jsx14(Box25, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx14(Text22, { color: "red", children: String(result.error) }) }),
-                  result.errorDetails != null ? /* @__PURE__ */ jsxs13(Fragment10, { children: [
-                    /* @__PURE__ */ jsx14(Box25, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx14(Text22, { bold: true, color: "red", dimColor: true, children: "Error Details:" }) }),
-                    /* @__PURE__ */ jsx14(Box25, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: JSON.stringify(result.errorDetails, null, 2) }) })
+                result.error ? /* @__PURE__ */ jsxs14(Box26, { flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx15(Box26, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { bold: true, color: "red", children: "Error:" }) }),
+                  /* @__PURE__ */ jsx15(Box26, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { color: "red", children: String(result.error) }) }),
+                  result.errorDetails != null ? /* @__PURE__ */ jsxs14(Fragment11, { children: [
+                    /* @__PURE__ */ jsx15(Box26, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { bold: true, color: "red", dimColor: true, children: "Error Details:" }) }),
+                    /* @__PURE__ */ jsx15(Box26, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: JSON.stringify(result.errorDetails, null, 2) }) })
                   ] }) : null
-                ] }) : /* @__PURE__ */ jsxs13(Box25, { flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx14(Text22, { bold: true, color: "green", children: "Resource Content:" }),
-                  /* @__PURE__ */ jsx14(Box25, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text22, { dimColor: true, children: JSON.stringify(result.output, null, 2) }) })
+                ] }) : /* @__PURE__ */ jsxs14(Box26, { flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx15(Text23, { bold: true, color: "green", children: "Resource Content:" }),
+                  /* @__PURE__ */ jsx15(Box26, { paddingLeft: 2, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: JSON.stringify(result.output, null, 2) }) })
                 ] })
               ] }) })
             ] })
@@ -21711,7 +23137,7 @@ function ResourceTestModal({
 
 // src/components/PromptTestModal.tsx
 import React28, { useState as useState16 } from "react";
-import { Box as Box26, Text as Text23, useInput as useInput20 } from "ink";
+import { Box as Box27, Text as Text24, useInput as useInput20 } from "ink";
 
 // src/utils/promptArgsToForm.ts
 function promptArgsToForm(promptArguments, promptName) {
@@ -21747,7 +23173,7 @@ function promptArgsToForm(promptArguments, promptName) {
 }
 
 // src/components/PromptTestModal.tsx
-import { Fragment as Fragment11, jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Fragment as Fragment12, jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
 function getErrorMessage2(error) {
   if (error instanceof Error) {
     return error.message;
@@ -21869,8 +23295,8 @@ function PromptTestModal({
   };
   const modalWidth = terminalDimensions.width - 2;
   const modalHeight = terminalDimensions.height - 2;
-  return /* @__PURE__ */ jsx15(
-    Box26,
+  return /* @__PURE__ */ jsx16(
+    Box27,
     {
       position: "absolute",
       width: terminalDimensions.width,
@@ -21878,8 +23304,8 @@ function PromptTestModal({
       flexDirection: "column",
       justifyContent: "center",
       alignItems: "center",
-      children: /* @__PURE__ */ jsxs14(
-        Box26,
+      children: /* @__PURE__ */ jsxs15(
+        Box27,
         {
           width: modalWidth,
           height: modalHeight,
@@ -21890,15 +23316,15 @@ function PromptTestModal({
           paddingY: 1,
           backgroundColor: "black",
           children: [
-            /* @__PURE__ */ jsxs14(Box26, { flexShrink: 0, marginBottom: 1, children: [
-              /* @__PURE__ */ jsx15(Text23, { bold: true, color: "cyan", children: formStructure.title }),
-              /* @__PURE__ */ jsx15(Text23, { children: " " }),
-              /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: "(Press ESC to close)" })
+            /* @__PURE__ */ jsxs15(Box27, { flexShrink: 0, marginBottom: 1, children: [
+              /* @__PURE__ */ jsx16(Text24, { bold: true, color: "cyan", children: formStructure.title }),
+              /* @__PURE__ */ jsx16(Text24, { children: " " }),
+              /* @__PURE__ */ jsx16(Text24, { dimColor: true, children: "(Press ESC to close)" })
             ] }),
-            /* @__PURE__ */ jsxs14(Box26, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: [
-              state === "form" && /* @__PURE__ */ jsxs14(Box26, { flexGrow: 1, flexDirection: "column", children: [
-                prompt.description && /* @__PURE__ */ jsx15(Box26, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: prompt.description }) }),
-                /* @__PURE__ */ jsx15(
+            /* @__PURE__ */ jsxs15(Box27, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: [
+              state === "form" && /* @__PURE__ */ jsxs15(Box27, { flexGrow: 1, flexDirection: "column", children: [
+                prompt.description && /* @__PURE__ */ jsx16(Box27, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsx16(Text24, { dimColor: true, children: prompt.description }) }),
+                /* @__PURE__ */ jsx16(
                   Form,
                   {
                     form: formStructure,
@@ -21906,27 +23332,27 @@ function PromptTestModal({
                   }
                 )
               ] }),
-              state === "loading" && /* @__PURE__ */ jsx15(Box26, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx15(Text23, { color: "yellow", children: "Getting prompt..." }) }),
-              state === "results" && result && /* @__PURE__ */ jsx15(Box26, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsxs14(ScrollView, { ref: scrollViewRef, children: [
-                /* @__PURE__ */ jsx15(Box26, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs14(Text23, { bold: true, color: "green", children: [
+              state === "loading" && /* @__PURE__ */ jsx16(Box27, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: /* @__PURE__ */ jsx16(Text24, { color: "yellow", children: "Getting prompt..." }) }),
+              state === "results" && result && /* @__PURE__ */ jsx16(Box27, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsxs15(ScrollView, { ref: scrollViewRef, children: [
+                /* @__PURE__ */ jsx16(Box27, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs15(Text24, { bold: true, color: "green", children: [
                   "Duration: ",
                   result.duration,
                   "ms"
                 ] }) }),
-                Object.keys(result.input).length > 0 && /* @__PURE__ */ jsxs14(Box26, { marginBottom: 1, flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx15(Text23, { bold: true, color: "cyan", children: "Arguments:" }),
-                  /* @__PURE__ */ jsx15(Box26, { paddingLeft: 2, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: JSON.stringify(result.input, null, 2) }) })
+                Object.keys(result.input).length > 0 && /* @__PURE__ */ jsxs15(Box27, { marginBottom: 1, flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx16(Text24, { bold: true, color: "cyan", children: "Arguments:" }),
+                  /* @__PURE__ */ jsx16(Box27, { paddingLeft: 2, children: /* @__PURE__ */ jsx16(Text24, { dimColor: true, children: JSON.stringify(result.input, null, 2) }) })
                 ] }),
-                result.error ? /* @__PURE__ */ jsxs14(Box26, { flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx15(Box26, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { bold: true, color: "red", children: "Error:" }) }),
-                  /* @__PURE__ */ jsx15(Box26, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { color: "red", children: String(result.error) }) }),
-                  result.errorDetails != null ? /* @__PURE__ */ jsxs14(Fragment11, { children: [
-                    /* @__PURE__ */ jsx15(Box26, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { bold: true, color: "red", dimColor: true, children: "Error Details:" }) }),
-                    /* @__PURE__ */ jsx15(Box26, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: JSON.stringify(result.errorDetails, null, 2) }) })
+                result.error ? /* @__PURE__ */ jsxs15(Box27, { flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx16(Box27, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx16(Text24, { bold: true, color: "red", children: "Error:" }) }),
+                  /* @__PURE__ */ jsx16(Box27, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx16(Text24, { color: "red", children: String(result.error) }) }),
+                  result.errorDetails != null ? /* @__PURE__ */ jsxs15(Fragment12, { children: [
+                    /* @__PURE__ */ jsx16(Box27, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx16(Text24, { bold: true, color: "red", dimColor: true, children: "Error Details:" }) }),
+                    /* @__PURE__ */ jsx16(Box27, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx16(Text24, { dimColor: true, children: JSON.stringify(result.errorDetails, null, 2) }) })
                   ] }) : null
-                ] }) : /* @__PURE__ */ jsxs14(Box26, { flexShrink: 0, flexDirection: "column", children: [
-                  /* @__PURE__ */ jsx15(Text23, { bold: true, color: "green", children: "Prompt Messages:" }),
-                  /* @__PURE__ */ jsx15(Box26, { paddingLeft: 2, children: /* @__PURE__ */ jsx15(Text23, { dimColor: true, children: JSON.stringify(result.output, null, 2) }) })
+                ] }) : /* @__PURE__ */ jsxs15(Box27, { flexShrink: 0, flexDirection: "column", children: [
+                  /* @__PURE__ */ jsx16(Text24, { bold: true, color: "green", children: "Prompt Messages:" }),
+                  /* @__PURE__ */ jsx16(Box27, { paddingLeft: 2, children: /* @__PURE__ */ jsx16(Text24, { dimColor: true, children: JSON.stringify(result.output, null, 2) }) })
                 ] })
               ] }) })
             ] })
@@ -21939,8 +23365,8 @@ function PromptTestModal({
 
 // src/components/DetailsModal.tsx
 import React29, { useRef as useRef14 } from "react";
-import { Box as Box27, Text as Text24, useInput as useInput21 } from "ink";
-import { jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Box as Box28, Text as Text25, useInput as useInput21 } from "ink";
+import { jsx as jsx17, jsxs as jsxs16 } from "react/jsx-runtime";
 function DetailsModal({
   title,
   content,
@@ -21986,8 +23412,8 @@ function DetailsModal({
   );
   const modalWidth = terminalDimensions.width - 2;
   const modalHeight = terminalDimensions.height - 2;
-  return /* @__PURE__ */ jsx16(
-    Box27,
+  return /* @__PURE__ */ jsx17(
+    Box28,
     {
       position: "absolute",
       width: terminalDimensions.width,
@@ -21995,8 +23421,8 @@ function DetailsModal({
       flexDirection: "column",
       justifyContent: "center",
       alignItems: "center",
-      children: /* @__PURE__ */ jsxs15(
-        Box27,
+      children: /* @__PURE__ */ jsxs16(
+        Box28,
         {
           width: modalWidth,
           height: modalHeight,
@@ -22007,12 +23433,12 @@ function DetailsModal({
           paddingY: 1,
           backgroundColor: "black",
           children: [
-            /* @__PURE__ */ jsxs15(Box27, { flexShrink: 0, marginBottom: 1, children: [
-              /* @__PURE__ */ jsx16(Text24, { bold: true, color: "cyan", children: title }),
-              /* @__PURE__ */ jsx16(Text24, { children: " " }),
-              /* @__PURE__ */ jsx16(Text24, { dimColor: true, children: "(Press ESC to close)" })
+            /* @__PURE__ */ jsxs16(Box28, { flexShrink: 0, marginBottom: 1, children: [
+              /* @__PURE__ */ jsx17(Text25, { bold: true, color: "cyan", children: title }),
+              /* @__PURE__ */ jsx17(Text25, { children: " " }),
+              /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: "(Press ESC to close)" })
             ] }),
-            /* @__PURE__ */ jsx16(Box27, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsx16(ScrollView, { ref: scrollViewRef, children: content }) })
+            /* @__PURE__ */ jsx17(Box28, { flexGrow: 1, flexDirection: "column", overflow: "hidden", children: /* @__PURE__ */ jsx17(ScrollView, { ref: scrollViewRef, children: content }) })
           ]
         }
       )
@@ -22021,7 +23447,7 @@ function DetailsModal({
 }
 
 // src/App.tsx
-import { Fragment as Fragment12, jsx as jsx17, jsxs as jsxs16 } from "react/jsx-runtime";
+import { Fragment as Fragment13, jsx as jsx18, jsxs as jsxs17 } from "react/jsx-runtime";
 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);
@@ -22709,48 +24135,48 @@ function App({
     managedTools,
     inspectorStderrLogs
   ]);
-  const renderResourceDetails = (resource) => /* @__PURE__ */ jsxs16(Fragment12, { children: [
-    "uri" in resource && resource.description && /* @__PURE__ */ jsx17(Fragment12, { children: resource.description.split("\n").map((line, idx) => /* @__PURE__ */ jsx17(
-      Box28,
+  const renderResourceDetails = (resource) => /* @__PURE__ */ jsxs17(Fragment13, { children: [
+    "uri" in resource && resource.description && /* @__PURE__ */ jsx18(Fragment13, { children: resource.description.split("\n").map((line, idx) => /* @__PURE__ */ jsx18(
+      Box29,
       {
         marginTop: idx === 0 ? 0 : 0,
         flexShrink: 0,
-        children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: line })
+        children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: line })
       },
       `desc-${idx}`
     )) }),
-    "uri" in resource && resource.uri && /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "URI:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: resource.uri }) })
+    "uri" in resource && resource.uri && /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "URI:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: resource.uri }) })
     ] }),
-    "mimeType" in resource && resource.mimeType && /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "MIME Type:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: resource.mimeType }) })
+    "mimeType" in resource && resource.mimeType && /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "MIME Type:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: resource.mimeType }) })
     ] }),
-    /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Full JSON:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(resource, null, 2) }) })
+    /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Full JSON:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(resource, null, 2) }) })
     ] })
   ] });
-  const renderPromptDetails = (prompt) => /* @__PURE__ */ jsxs16(Fragment12, { children: [
-    prompt.description && /* @__PURE__ */ jsx17(Fragment12, { children: prompt.description.split("\n").map((line, idx) => /* @__PURE__ */ jsx17(
-      Box28,
+  const renderPromptDetails = (prompt) => /* @__PURE__ */ jsxs17(Fragment13, { children: [
+    prompt.description && /* @__PURE__ */ jsx18(Fragment13, { children: prompt.description.split("\n").map((line, idx) => /* @__PURE__ */ jsx18(
+      Box29,
       {
         marginTop: idx === 0 ? 0 : 0,
         flexShrink: 0,
-        children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: line })
+        children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: line })
       },
       `desc-${idx}`
     )) }),
-    prompt.arguments && prompt.arguments.length > 0 && /* @__PURE__ */ jsxs16(Fragment12, { children: [
-      /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Arguments:" }) }),
-      prompt.arguments.map((arg, idx) => /* @__PURE__ */ jsx17(
-        Box28,
+    prompt.arguments && prompt.arguments.length > 0 && /* @__PURE__ */ jsxs17(Fragment13, { children: [
+      /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Arguments:" }) }),
+      prompt.arguments.map((arg, idx) => /* @__PURE__ */ jsx18(
+        Box29,
         {
           marginTop: 1,
           paddingLeft: 2,
           flexShrink: 0,
-          children: /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+          children: /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
             "- ",
             arg.name,
             ":",
@@ -22761,134 +24187,102 @@ function App({
         `arg-${idx}`
       ))
     ] }),
-    /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Full JSON:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(prompt, null, 2) }) })
+    /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Full JSON:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(prompt, null, 2) }) })
     ] })
   ] });
-  const renderToolDetails = (tool) => /* @__PURE__ */ jsxs16(Fragment12, { children: [
-    tool.description && /* @__PURE__ */ jsx17(Fragment12, { children: tool.description.split("\n").map((line, idx) => /* @__PURE__ */ jsx17(
-      Box28,
+  const renderToolDetails = (tool) => /* @__PURE__ */ jsxs17(Fragment13, { children: [
+    tool.description && /* @__PURE__ */ jsx18(Fragment13, { children: tool.description.split("\n").map((line, idx) => /* @__PURE__ */ jsx18(
+      Box29,
       {
         marginTop: idx === 0 ? 0 : 0,
         flexShrink: 0,
-        children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: line })
+        children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: line })
       },
       `desc-${idx}`
     )) }),
-    tool.inputSchema && /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Input Schema:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(tool.inputSchema, null, 2) }) })
+    tool.inputSchema && /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Input Schema:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(tool.inputSchema, null, 2) }) })
     ] }),
-    /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Full JSON:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(tool, null, 2) }) })
+    /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Full JSON:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(tool, null, 2) }) })
     ] })
   ] });
-  const renderRequestDetails = (request) => /* @__PURE__ */ jsxs16(Fragment12, { children: [
-    /* @__PURE__ */ jsx17(Box28, { flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { bold: true, children: [
+  const renderRequestDetails = (request) => /* @__PURE__ */ jsxs17(Fragment13, { children: [
+    /* @__PURE__ */ jsx18(Box29, { flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { bold: true, children: [
       request.method,
       " ",
       request.url
     ] }) }),
-    /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { bold: true, children: [
+    /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { bold: true, children: [
       "Category:",
       " ",
-      /* @__PURE__ */ jsx17(Text25, { children: request.category === "auth" ? "auth" : "transport" })
+      /* @__PURE__ */ jsx18(Text26, { children: request.category === "auth" ? "auth" : "transport" })
     ] }) }),
-    request.responseStatus !== void 0 ? /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { bold: true, children: [
+    request.responseStatus !== void 0 ? /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { bold: true, children: [
       "Status: ",
       request.responseStatus,
       " ",
       request.responseStatusText || ""
-    ] }) }) : request.error ? /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { bold: true, color: "red", children: [
+    ] }) }) : request.error ? /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { bold: true, color: "red", children: [
       "Error: ",
       request.error
     ] }) }) : null,
-    request.duration !== void 0 && /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+    request.duration !== void 0 && /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
       request.timestamp.toLocaleTimeString(),
       " (",
       request.duration,
       "ms)"
     ] }) }),
-    /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Request Headers:" }),
-      Object.entries(request.requestHeaders).map(([key, value]) => /* @__PURE__ */ jsx17(Box28, { marginTop: 0, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+    /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Request Headers:" }),
+      Object.entries(request.requestHeaders).map(([key, value]) => /* @__PURE__ */ jsx18(Box29, { marginTop: 0, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
         key,
         ": ",
         value
       ] }) }, key))
     ] }),
-    request.requestBody && /* @__PURE__ */ jsxs16(Fragment12, { children: [
-      /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Request Body:" }) }),
-      (() => {
-        try {
-          const parsed = JSON.parse(request.requestBody);
-          return JSON.stringify(parsed, null, 2).split("\n").map((line, idx) => /* @__PURE__ */ jsx17(
-            Box28,
-            {
-              marginTop: idx === 0 ? 1 : 0,
-              paddingLeft: 2,
-              flexShrink: 0,
-              children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: line })
-            },
-            `req-body-${idx}`
-          ));
-        } catch {
-          return /* @__PURE__ */ jsx17(Box28, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: request.requestBody }) });
-        }
-      })()
+    request.requestBody && /* @__PURE__ */ jsxs17(Fragment13, { children: [
+      /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Request Body:" }) }),
+      /* @__PURE__ */ jsx18(BodyLines, { body: request.requestBody, keyPrefix: "req-body" })
     ] }),
-    request.responseHeaders && Object.keys(request.responseHeaders).length > 0 && /* @__PURE__ */ jsxs16(Fragment12, { children: [
-      /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Response Headers:" }) }),
-      Object.entries(request.responseHeaders).map(([key, value]) => /* @__PURE__ */ jsx17(Box28, { marginTop: 0, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+    request.responseHeaders && Object.keys(request.responseHeaders).length > 0 && /* @__PURE__ */ jsxs17(Fragment13, { children: [
+      /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Response Headers:" }) }),
+      Object.entries(request.responseHeaders).map(([key, value]) => /* @__PURE__ */ jsx18(Box29, { marginTop: 0, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
         key,
         ": ",
         value
       ] }) }, key))
     ] }),
-    request.responseBody && /* @__PURE__ */ jsxs16(Fragment12, { children: [
-      /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Response Body:" }) }),
-      (() => {
-        try {
-          const parsed = JSON.parse(request.responseBody);
-          return JSON.stringify(parsed, null, 2).split("\n").map((line, idx) => /* @__PURE__ */ jsx17(
-            Box28,
-            {
-              marginTop: idx === 0 ? 1 : 0,
-              paddingLeft: 2,
-              flexShrink: 0,
-              children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: line })
-            },
-            `resp-body-${idx}`
-          ));
-        } catch {
-          return /* @__PURE__ */ jsx17(Box28, { marginTop: 1, paddingLeft: 2, flexShrink: 0, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: request.responseBody }) });
-        }
-      })()
+    request.responseBody && /* @__PURE__ */ jsxs17(Fragment13, { children: [
+      /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Response Body:" }) }),
+      /* @__PURE__ */ jsx18(BodyLines, { body: request.responseBody, keyPrefix: "resp-body" })
     ] })
   ] });
-  const renderMessageDetails = (message) => /* @__PURE__ */ jsxs16(Fragment12, { children: [
-    /* @__PURE__ */ jsx17(Box28, { flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { bold: true, children: [
+  const renderMessageDetails = (message) => /* @__PURE__ */ jsxs17(Fragment13, { children: [
+    /* @__PURE__ */ jsx18(Box29, { flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { bold: true, children: [
       "Direction: ",
       message.direction
     ] }) }),
-    /* @__PURE__ */ jsx17(Box28, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+    /* @__PURE__ */ jsx18(Box29, { marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
       message.timestamp.toLocaleTimeString(),
       message.duration !== void 0 && ` (${message.duration}ms)`
     ] }) }),
-    message.direction === "request" ? /* @__PURE__ */ jsxs16(Fragment12, { children: [
-      /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-        /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Request:" }),
-        /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(message.message, null, 2) }) })
+    message.direction === "request" ? /* @__PURE__ */ jsxs17(Fragment13, { children: [
+      /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+        /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Request:" }),
+        /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(message.message, null, 2) }) })
       ] }),
-      message.response && /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-        /* @__PURE__ */ jsx17(Text25, { bold: true, children: "Response:" }),
-        /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(message.response, null, 2) }) })
+      message.response && /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+        /* @__PURE__ */ jsx18(Text26, { bold: true, children: "Response:" }),
+        /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(message.response, null, 2) }) })
       ] })
-    ] }) : /* @__PURE__ */ jsxs16(Box28, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx17(Text25, { bold: true, children: message.direction === "response" ? "Response:" : "Notification:" }),
-      /* @__PURE__ */ jsx17(Box28, { paddingLeft: 2, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: JSON.stringify(message.message, null, 2) }) })
+    ] }) : /* @__PURE__ */ jsxs17(Box29, { marginTop: 1, flexShrink: 0, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx18(Text26, { bold: true, children: message.direction === "response" ? "Response:" : "Notification:" }),
+      /* @__PURE__ */ jsx18(Box29, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: JSON.stringify(message.message, null, 2) }) })
     ] })
   ] });
   useEffect14(() => {
@@ -23079,15 +24473,15 @@ function App({
         return "\u25CB";
     }
   };
-  return /* @__PURE__ */ jsxs16(
-    Box28,
+  return /* @__PURE__ */ jsxs17(
+    Box29,
     {
       flexDirection: "column",
       width: dimensions.width,
       height: dimensions.height,
       children: [
-        /* @__PURE__ */ jsxs16(
-          Box28,
+        /* @__PURE__ */ jsxs17(
+          Box29,
           {
             width: dimensions.width,
             height: headerHeight,
@@ -23099,29 +24493,29 @@ function App({
             justifyContent: "space-between",
             alignItems: "center",
             children: [
-              /* @__PURE__ */ jsxs16(Box28, { children: [
-                /* @__PURE__ */ jsx17(Text25, { bold: true, color: "cyan", children: APP_NAME }),
-                /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+              /* @__PURE__ */ jsxs17(Box29, { children: [
+                /* @__PURE__ */ jsx18(Text26, { bold: true, color: "cyan", children: APP_NAME }),
+                /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
                   " - ",
                   APP_DESCRIPTION
                 ] })
               ] }),
-              /* @__PURE__ */ jsxs16(Text25, { dimColor: true, children: [
+              /* @__PURE__ */ jsxs17(Text26, { dimColor: true, children: [
                 "v",
                 APP_VERSION
               ] })
             ]
           }
         ),
-        /* @__PURE__ */ jsxs16(
-          Box28,
+        /* @__PURE__ */ jsxs17(
+          Box29,
           {
             flexDirection: "row",
             height: availableHeight + tabsHeight,
             width: dimensions.width,
             children: [
-              /* @__PURE__ */ jsxs16(
-                Box28,
+              /* @__PURE__ */ jsxs17(
+                Box29,
                 {
                   width: serverListWidth,
                   height: availableHeight + tabsHeight,
@@ -23133,43 +24527,43 @@ function App({
                   flexDirection: "column",
                   paddingX: 1,
                   children: [
-                    /* @__PURE__ */ jsx17(Box28, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx17(
-                      Text25,
+                    /* @__PURE__ */ jsx18(Box29, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx18(
+                      Text26,
                       {
                         bold: true,
                         backgroundColor: focus === "serverList" ? "yellow" : void 0,
                         children: "MCP Servers"
                       }
                     ) }),
-                    /* @__PURE__ */ jsx17(Box28, { flexDirection: "column", flexGrow: 1, children: serverNames.map((serverName) => {
+                    /* @__PURE__ */ jsx18(Box29, { flexDirection: "column", flexGrow: 1, children: serverNames.map((serverName) => {
                       const isSelected = selectedServer === serverName;
-                      return /* @__PURE__ */ jsx17(Box28, { paddingY: 0, children: /* @__PURE__ */ jsxs16(Text25, { children: [
+                      return /* @__PURE__ */ jsx18(Box29, { paddingY: 0, children: /* @__PURE__ */ jsxs17(Text26, { children: [
                         isSelected ? "\u25B6 " : "  ",
                         serverName
                       ] }) }, serverName);
                     }) }),
-                    /* @__PURE__ */ jsx17(
-                      Box28,
+                    /* @__PURE__ */ jsx18(
+                      Box29,
                       {
                         flexShrink: 0,
                         height: 1,
                         justifyContent: "center",
                         backgroundColor: "gray",
-                        children: /* @__PURE__ */ jsx17(Text25, { bold: true, color: "white", children: "ESC to exit" })
+                        children: /* @__PURE__ */ jsx18(Text26, { bold: true, color: "white", children: "ESC to exit" })
                       }
                     )
                   ]
                 }
               ),
-              /* @__PURE__ */ jsxs16(
-                Box28,
+              /* @__PURE__ */ jsxs17(
+                Box29,
                 {
                   flexGrow: 1,
                   height: availableHeight + tabsHeight,
                   flexDirection: "column",
                   children: [
-                    /* @__PURE__ */ jsx17(
-                      Box28,
+                    /* @__PURE__ */ jsx18(
+                      Box29,
                       {
                         width: contentWidth,
                         borderStyle: "single",
@@ -23181,49 +24575,49 @@ function App({
                         paddingY: 1,
                         flexDirection: "column",
                         flexShrink: 0,
-                        children: /* @__PURE__ */ jsxs16(Box28, { flexDirection: "column", children: [
-                          /* @__PURE__ */ jsxs16(
-                            Box28,
+                        children: /* @__PURE__ */ jsxs17(Box29, { flexDirection: "column", children: [
+                          /* @__PURE__ */ jsxs17(
+                            Box29,
                             {
                               flexDirection: "row",
                               justifyContent: "space-between",
                               alignItems: "center",
                               children: [
-                                /* @__PURE__ */ jsx17(Text25, { bold: true, color: "cyan", children: selectedServer }),
-                                /* @__PURE__ */ jsx17(Box28, { flexDirection: "row", alignItems: "center", gap: 1, children: currentServerState && /* @__PURE__ */ jsxs16(Fragment12, { children: [
-                                  /* @__PURE__ */ jsxs16(Text25, { color: getStatusColor(currentServerState.status), children: [
+                                /* @__PURE__ */ jsx18(Text26, { bold: true, color: "cyan", children: selectedServer }),
+                                /* @__PURE__ */ jsx18(Box29, { flexDirection: "row", alignItems: "center", gap: 1, children: currentServerState && /* @__PURE__ */ jsxs17(Fragment13, { children: [
+                                  /* @__PURE__ */ jsxs17(Text26, { color: getStatusColor(currentServerState.status), children: [
                                     getStatusSymbol(currentServerState.status),
                                     " ",
                                     currentServerState.status
                                   ] }),
-                                  /* @__PURE__ */ jsx17(Text25, { children: " " }),
-                                  (currentServerState?.status === "disconnected" || currentServerState?.status === "error") && /* @__PURE__ */ jsxs16(Text25, { color: "cyan", bold: true, children: [
+                                  /* @__PURE__ */ jsx18(Text26, { children: " " }),
+                                  (currentServerState?.status === "disconnected" || currentServerState?.status === "error") && /* @__PURE__ */ jsxs17(Text26, { color: "cyan", bold: true, children: [
                                     "[",
-                                    /* @__PURE__ */ jsx17(Text25, { underline: true, children: "C" }),
+                                    /* @__PURE__ */ jsx18(Text26, { underline: true, children: "C" }),
                                     "onnect]"
                                   ] }),
-                                  (currentServerState?.status === "connected" || currentServerState?.status === "connecting") && /* @__PURE__ */ jsxs16(Text25, { color: "red", bold: true, children: [
+                                  (currentServerState?.status === "connected" || currentServerState?.status === "connecting") && /* @__PURE__ */ jsxs17(Text26, { color: "red", bold: true, children: [
                                     "[",
-                                    /* @__PURE__ */ jsx17(Text25, { underline: true, children: "D" }),
+                                    /* @__PURE__ */ jsx18(Text26, { underline: true, children: "D" }),
                                     "isconnect]"
                                   ] })
                                 ] }) })
                               ]
                             }
                           ),
-                          oauthStatus === "authenticating" && /* @__PURE__ */ jsx17(Box28, { marginTop: 1, children: /* @__PURE__ */ jsx17(Text25, { dimColor: true, children: "OAuth: authenticating\u2026" }) }),
-                          oauthStatus === "error" && oauthMessage && /* @__PURE__ */ jsx17(Box28, { marginTop: 1, children: /* @__PURE__ */ jsxs16(Text25, { color: "red", children: [
+                          oauthStatus === "authenticating" && /* @__PURE__ */ jsx18(Box29, { marginTop: 1, children: /* @__PURE__ */ jsx18(Text26, { dimColor: true, children: "OAuth: authenticating\u2026" }) }),
+                          oauthStatus === "error" && oauthMessage && /* @__PURE__ */ jsx18(Box29, { marginTop: 1, children: /* @__PURE__ */ jsxs17(Text26, { color: "red", children: [
                             "OAuth: ",
                             oauthMessage
                           ] }) }),
-                          disconnectError && /* @__PURE__ */ jsx17(Box28, { marginTop: 1, children: /* @__PURE__ */ jsxs16(Text25, { color: "red", children: [
+                          disconnectError && /* @__PURE__ */ jsx18(Box29, { marginTop: 1, children: /* @__PURE__ */ jsxs17(Text26, { color: "red", children: [
                             "Disconnect failed: ",
                             disconnectError
                           ] }) })
                         ] })
                       }
                     ),
-                    /* @__PURE__ */ jsx17(
+                    /* @__PURE__ */ jsx18(
                       Tabs,
                       {
                         activeTab,
@@ -23240,8 +24634,8 @@ function App({
                         })() : false
                       }
                     ),
-                    /* @__PURE__ */ jsxs16(
-                      Box28,
+                    /* @__PURE__ */ jsxs17(
+                      Box29,
                       {
                         flexGrow: 1,
                         minHeight: 6,
@@ -23251,7 +24645,7 @@ function App({
                         borderRight: false,
                         borderBottom: false,
                         children: [
-                          activeTab === "info" && /* @__PURE__ */ jsx17(
+                          activeTab === "info" && /* @__PURE__ */ jsx18(
                             InfoTab,
                             {
                               serverName: selectedServer,
@@ -23263,7 +24657,7 @@ function App({
                               focused: focus === "tabContentList" || focus === "tabContentDetails"
                             }
                           ),
-                          activeTab === "auth" && selectedServer && selectedServerConfig && isOAuthCapableServerConfig(selectedServerConfig) ? /* @__PURE__ */ jsx17(
+                          activeTab === "auth" && selectedServer && selectedServerConfig && isOAuthCapableServerConfig(selectedServerConfig) ? /* @__PURE__ */ jsx18(
                             AuthTab,
                             {
                               serverName: selectedServer,
@@ -23361,7 +24755,7 @@ function App({
                               connectionStatus: inspectorStatus
                             }
                           ) : null,
-                          activeTab === "resources" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx17(
+                          activeTab === "resources" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx18(
                             ResourcesTab,
                             {
                               resources: currentServerState.resources,
@@ -23387,7 +24781,7 @@ function App({
                               modalOpen: !!(toolTestModal || resourceTestModal || promptTestModal || detailsModal)
                             },
                             `resources-${selectedServer}`
-                          ) : activeTab === "skills" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx17(
+                          ) : activeTab === "skills" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx18(
                             SkillsTab,
                             {
                               skills: managedSkills,
@@ -23401,7 +24795,7 @@ function App({
                               modalOpen: !!(toolTestModal || resourceTestModal || promptTestModal || detailsModal)
                             },
                             `skills-${selectedServer}`
-                          ) : activeTab === "prompts" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx17(
+                          ) : activeTab === "prompts" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx18(
                             PromptsTab,
                             {
                               prompts: currentServerState.prompts,
@@ -23424,7 +24818,7 @@ function App({
                               modalOpen: !!(toolTestModal || resourceTestModal || promptTestModal || detailsModal)
                             },
                             `prompts-${selectedServer}`
-                          ) : activeTab === "tools" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx17(
+                          ) : activeTab === "tools" && currentServerState?.status === "connected" && selectedInspectorClient ? /* @__PURE__ */ jsx18(
                             ToolsTab,
                             {
                               tools: currentServerState.tools,
@@ -23444,7 +24838,7 @@ function App({
                               modalOpen: !!(toolTestModal || detailsModal)
                             },
                             `tools-${selectedServer}`
-                          ) : activeTab === "messages" && selectedInspectorClient ? /* @__PURE__ */ jsx17(
+                          ) : activeTab === "messages" && selectedInspectorClient ? /* @__PURE__ */ jsx18(
                             HistoryTab,
                             {
                               serverName: selectedServer,
@@ -23462,7 +24856,7 @@ function App({
                                 });
                               }
                             }
-                          ) : activeTab === "requests" && selectedInspectorClient && (inspectorStatus === "connected" || inspectorFetchRequests.length > 0) ? /* @__PURE__ */ jsx17(
+                          ) : activeTab === "requests" && selectedInspectorClient && (inspectorStatus === "connected" || inspectorFetchRequests.length > 0) ? /* @__PURE__ */ jsx18(
                             RequestsTab,
                             {
                               serverName: selectedServer,
@@ -23479,7 +24873,7 @@ function App({
                                 });
                               }
                             }
-                          ) : activeTab === "logging" && selectedInspectorClient ? /* @__PURE__ */ jsx17(
+                          ) : activeTab === "logging" && selectedInspectorClient ? /* @__PURE__ */ jsx18(
                             NotificationsTab,
                             {
                               stderrLogs: inspectorStderrLogs,
@@ -23498,7 +24892,7 @@ function App({
             ]
           }
         ),
-        toolTestModal && /* @__PURE__ */ jsx17(
+        toolTestModal && /* @__PURE__ */ jsx18(
           ToolTestModal,
           {
             tool: toolTestModal.tool,
@@ -23512,7 +24906,7 @@ function App({
             }
           }
         ),
-        resourceTestModal && /* @__PURE__ */ jsx17(
+        resourceTestModal && /* @__PURE__ */ jsx18(
           ResourceTestModal,
           {
             template: resourceTestModal.template,
@@ -23526,7 +24920,7 @@ function App({
             }
           }
         ),
-        promptTestModal && /* @__PURE__ */ jsx17(
+        promptTestModal && /* @__PURE__ */ jsx18(
           PromptTestModal,
           {
             prompt: promptTestModal.prompt,
@@ -23540,7 +24934,7 @@ function App({
             }
           }
         ),
-        detailsModal && /* @__PURE__ */ jsx17(
+        detailsModal && /* @__PURE__ */ jsx18(
           DetailsModal,
           {
             title: detailsModal.title,
@@ -23557,7 +24951,7 @@ function App({
 var App_default = App;
 
 // tui.tsx
-import { jsx as jsx18 } from "react/jsx-runtime";
+import { jsx as jsx19 } from "react/jsx-runtime";
 async function runTui(args) {
   const program = new Command();
   program.name("mcp-inspector-tui").description("Terminal UI for MCP Inspector").option(
@@ -23646,7 +25040,7 @@ async function runTui(args) {
     process.stdout.write("\x1B[?1049h");
   }
   const instance = render2(
-    /* @__PURE__ */ jsx18(
+    /* @__PURE__ */ jsx19(
       App_default,
       {
         mcpServers,