@assistant-ui/react-mcp 0.0.18 → 0.0.19

package/dist/resources/storage/McpLocalStorage.js

@@ -16,6 +16,7 @@ const isOptionalString = (value) => value === void 0 || typeof value === "string
 const isNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
 const isOptionalNonEmptyString = (value) => value === void 0 || isNonEmptyString(value);
 const isOptionalStringArray = (value) => value === void 0 || Array.isArray(value) && value.every((item) => typeof item === "string");
+const isOptionalConnectionTimeout = (value) => value === void 0 || typeof value === "number" && Number.isFinite(value) && value >= 0;
 const isValidServerId = (id) => {
 	try {
 		assertValidServerId(id);
@@ -36,11 +37,21 @@ const isMCPAuthConfig = (auth) => {
 const isCustomServerRecord = (value) => {
 	if (!isRecord(value)) return false;
 	if (typeof value.id !== "string" || !isValidServerId(value.id)) return false;
-	return isNonEmptyString(value.name) && isNonEmptyString(value.url) && Number.isFinite(value.createdAt) && isMCPAuthConfig(value.auth);
+	return isNonEmptyString(value.name) && isNonEmptyString(value.url) && Number.isFinite(value.createdAt) && isMCPAuthConfig(value.auth) && isOptionalConnectionTimeout(value.connectionTimeout);
+};
+const normalizeCustomServerRecord = (value) => {
+	if (isCustomServerRecord(value)) return value;
+	if (!isRecord(value)) return null;
+	const record = { ...value };
+	delete record.connectionTimeout;
+	return isCustomServerRecord(record) ? record : null;
 };
 const normalizeCustomServerRecords = (value) => {
 	if (!Array.isArray(value)) return [];
-	return value.filter(isCustomServerRecord);
+	return value.flatMap((item) => {
+		const record = normalizeCustomServerRecord(item);
+		return record === null ? [] : [record];
+	});
 };
 const normalizeOAuthTokens = (value) => {
 	const result = OAuthTokensSchema.safeParse(value);

package/dist/resources/storage/McpLocalStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpLocalStorage.js","names":["resource","OAuthClientInformationFullSchema","OAuthTokensSchema","MCPAuthConfig","MCPCustomServerRecord","MCPPersistedAuthState","assertValidServerId","MCPStorage","McpLocalStorageOptions","keyPrefix","storage","Storage","resolveStorage","opts","globalThis","localStorage","isRecord","value","Record","Array","isArray","isOptionalString","undefined","isNonEmptyString","trim","length","isOptionalNonEmptyString","isOptionalStringArray","every","item","isValidServerId","id","isMCPAuthConfig","auth","type","token","scopes","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","isCustomServerRecord","name","url","Number","isFinite","createdAt","normalizeCustomServerRecords","filter","normalizeOAuthTokens","result","safeParse","success","data","normalizeClientInformation","normalizePersistedAuthState","state","codeVerifier","tokens","clientInformation","Object","keys","useMcpLocalStorage","prefix","customServersKey","authKey","read","key","fallback","T","raw","getItem","JSON","parse","write","setItem","stringify","remove","removeItem","loadCustomServers","saveCustomServers","records","loadAuthState","saveAuthState","clearAuthState","McpLocalStorage"],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport {\n  OAuthClientInformationFullSchema,\n  OAuthTokensSchema,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport type { MCPAuthConfig, MCPCustomServerRecord } from \"../../mcp-scope\";\nimport type { MCPPersistedAuthState } from \"../../auth/types\";\nimport { assertValidServerId } from \"../../utils/serverId\";\nimport type { MCPStorage } from \"./types\";\n\nexport type McpLocalStorageOptions = {\n  /** Namespace prefix for keys. Default \"aui-mcp\". */\n  keyPrefix?: string;\n  /** Override the underlying Storage. Defaults to globalThis.localStorage. */\n  storage?: Storage;\n};\n\nfunction resolveStorage(opts: McpLocalStorageOptions): Storage | null {\n  if (opts.storage) return opts.storage;\n  if (typeof globalThis !== \"undefined\" && \"localStorage\" in globalThis) {\n    try {\n      return (globalThis as { localStorage: Storage }).localStorage;\n    } catch {\n      return null;\n    }\n  }\n  return null;\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  typeof value === \"object\" && value !== null && !Array.isArray(value);\n\nconst isOptionalString = (value: unknown): value is string | undefined =>\n  value === undefined || typeof value === \"string\";\n\nconst isNonEmptyString = (value: unknown): value is string =>\n  typeof value === \"string\" && value.trim().length > 0;\n\nconst isOptionalNonEmptyString = (\n  value: unknown,\n): value is string | undefined =>\n  value === undefined || isNonEmptyString(value);\n\nconst isOptionalStringArray = (value: unknown): value is string[] | undefined =>\n  value === undefined ||\n  (Array.isArray(value) && value.every((item) => typeof item === \"string\"));\n\nconst isValidServerId = (id: string): boolean => {\n  try {\n    assertValidServerId(id);\n    return true;\n  } catch {\n    return false;\n  }\n};\n\nconst isMCPAuthConfig = (auth: unknown): auth is MCPAuthConfig => {\n  if (!isRecord(auth)) return false;\n\n  switch (auth.type) {\n    case \"none\":\n      return true;\n    case \"bearer\":\n      return isOptionalNonEmptyString(auth.token);\n    case \"oauth\":\n      return (\n        isOptionalStringArray(auth.scopes) &&\n        isOptionalString(auth.authorizationEndpoint) &&\n        isOptionalString(auth.tokenEndpoint) &&\n        isOptionalString(auth.registrationEndpoint) &&\n        isOptionalString(auth.clientId) &&\n        isOptionalString(auth.clientSecret)\n      );\n    default:\n      return false;\n  }\n};\n\nconst isCustomServerRecord = (\n  value: unknown,\n): value is MCPCustomServerRecord => {\n  if (!isRecord(value)) return false;\n  if (typeof value.id !== \"string\" || !isValidServerId(value.id)) {\n    return false;\n  }\n  return (\n    isNonEmptyString(value.name) &&\n    isNonEmptyString(value.url) &&\n    Number.isFinite(value.createdAt) &&\n    isMCPAuthConfig(value.auth)\n  );\n};\n\nexport const normalizeCustomServerRecords = (\n  value: unknown,\n): MCPCustomServerRecord[] => {\n  if (!Array.isArray(value)) return [];\n  return value.filter(isCustomServerRecord);\n};\n\nconst normalizeOAuthTokens = (\n  value: unknown,\n): MCPPersistedAuthState[\"tokens\"] | undefined => {\n  const result = OAuthTokensSchema.safeParse(value);\n  return result.success ? result.data : undefined;\n};\n\nconst normalizeClientInformation = (\n  value: unknown,\n): MCPPersistedAuthState[\"clientInformation\"] | undefined => {\n  const result = OAuthClientInformationFullSchema.safeParse(value);\n  return result.success ? result.data : undefined;\n};\n\nexport const normalizePersistedAuthState = (\n  value: unknown,\n): MCPPersistedAuthState | null => {\n  if (!isRecord(value)) return null;\n\n  const state: MCPPersistedAuthState = {};\n  if (isNonEmptyString(value.token)) state.token = value.token;\n  if (isNonEmptyString(value.codeVerifier)) {\n    state.codeVerifier = value.codeVerifier;\n  }\n\n  const tokens = normalizeOAuthTokens(value.tokens);\n  if (tokens) state.tokens = tokens;\n\n  const clientInformation = normalizeClientInformation(value.clientInformation);\n  if (clientInformation) state.clientInformation = clientInformation;\n\n  return Object.keys(state).length > 0 ? state : null;\n};\n\nconst useMcpLocalStorage = (opts: McpLocalStorageOptions = {}): MCPStorage => {\n  const prefix = opts.keyPrefix ?? \"aui-mcp\";\n  const customServersKey = `${prefix}:custom-servers`;\n  const authKey = (id: string) => `${prefix}:auth:${id}`;\n  const storage = resolveStorage(opts);\n\n  const read = <T>(key: string, fallback: T): T => {\n    if (!storage) return fallback;\n    try {\n      const raw = storage.getItem(key);\n      if (raw == null) return fallback;\n      return JSON.parse(raw) as T;\n    } catch {\n      return fallback;\n    }\n  };\n\n  const write = (key: string, value: unknown): void => {\n    if (!storage) return;\n    try {\n      storage.setItem(key, JSON.stringify(value));\n    } catch {\n      // quota or serialization failure — silently drop\n    }\n  };\n\n  const remove = (key: string): void => {\n    if (!storage) return;\n    try {\n      storage.removeItem(key);\n    } catch {\n      // ignore\n    }\n  };\n\n  return {\n    loadCustomServers: async () =>\n      normalizeCustomServerRecords(read<unknown>(customServersKey, [])),\n    saveCustomServers: async (records) => {\n      write(customServersKey, records);\n    },\n    loadAuthState: async (id) =>\n      normalizePersistedAuthState(read<unknown>(authKey(id), null)),\n    saveAuthState: async (id, state) => {\n      write(authKey(id), state);\n    },\n    clearAuthState: async (id) => {\n      remove(authKey(id));\n    },\n  };\n};\n\nexport const McpLocalStorage = resource(useMcpLocalStorage);\n"],"mappings":"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"}
+{"version":3,"file":"McpLocalStorage.js","names":["resource","OAuthClientInformationFullSchema","OAuthTokensSchema","MCPAuthConfig","MCPCustomServerRecord","MCPPersistedAuthState","assertValidServerId","MCPStorage","McpLocalStorageOptions","keyPrefix","storage","Storage","resolveStorage","opts","globalThis","localStorage","isRecord","value","Record","Array","isArray","isOptionalString","undefined","isNonEmptyString","trim","length","isOptionalNonEmptyString","isOptionalStringArray","every","item","isOptionalConnectionTimeout","Number","isFinite","isValidServerId","id","isMCPAuthConfig","auth","type","token","scopes","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","isCustomServerRecord","name","url","createdAt","connectionTimeout","normalizeCustomServerRecord","record","normalizeCustomServerRecords","flatMap","normalizeOAuthTokens","result","safeParse","success","data","normalizeClientInformation","normalizePersistedAuthState","state","codeVerifier","tokens","clientInformation","Object","keys","useMcpLocalStorage","prefix","customServersKey","authKey","read","key","fallback","T","raw","getItem","JSON","parse","write","setItem","stringify","remove","removeItem","loadCustomServers","saveCustomServers","records","loadAuthState","saveAuthState","clearAuthState","McpLocalStorage"],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport {\n  OAuthClientInformationFullSchema,\n  OAuthTokensSchema,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport type { MCPAuthConfig, MCPCustomServerRecord } from \"../../mcp-scope\";\nimport type { MCPPersistedAuthState } from \"../../auth/types\";\nimport { assertValidServerId } from \"../../utils/serverId\";\nimport type { MCPStorage } from \"./types\";\n\nexport type McpLocalStorageOptions = {\n  /** Namespace prefix for keys. Default \"aui-mcp\". */\n  keyPrefix?: string;\n  /** Override the underlying Storage. Defaults to globalThis.localStorage. */\n  storage?: Storage;\n};\n\nfunction resolveStorage(opts: McpLocalStorageOptions): Storage | null {\n  if (opts.storage) return opts.storage;\n  if (typeof globalThis !== \"undefined\" && \"localStorage\" in globalThis) {\n    try {\n      return (globalThis as { localStorage: Storage }).localStorage;\n    } catch {\n      return null;\n    }\n  }\n  return null;\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  typeof value === \"object\" && value !== null && !Array.isArray(value);\n\nconst isOptionalString = (value: unknown): value is string | undefined =>\n  value === undefined || typeof value === \"string\";\n\nconst isNonEmptyString = (value: unknown): value is string =>\n  typeof value === \"string\" && value.trim().length > 0;\n\nconst isOptionalNonEmptyString = (\n  value: unknown,\n): value is string | undefined =>\n  value === undefined || isNonEmptyString(value);\n\nconst isOptionalStringArray = (value: unknown): value is string[] | undefined =>\n  value === undefined ||\n  (Array.isArray(value) && value.every((item) => typeof item === \"string\"));\n\nconst isOptionalConnectionTimeout = (\n  value: unknown,\n): value is number | undefined =>\n  value === undefined ||\n  (typeof value === \"number\" && Number.isFinite(value) && value >= 0);\n\nconst isValidServerId = (id: string): boolean => {\n  try {\n    assertValidServerId(id);\n    return true;\n  } catch {\n    return false;\n  }\n};\n\nconst isMCPAuthConfig = (auth: unknown): auth is MCPAuthConfig => {\n  if (!isRecord(auth)) return false;\n\n  switch (auth.type) {\n    case \"none\":\n      return true;\n    case \"bearer\":\n      return isOptionalNonEmptyString(auth.token);\n    case \"oauth\":\n      return (\n        isOptionalStringArray(auth.scopes) &&\n        isOptionalString(auth.authorizationEndpoint) &&\n        isOptionalString(auth.tokenEndpoint) &&\n        isOptionalString(auth.registrationEndpoint) &&\n        isOptionalString(auth.clientId) &&\n        isOptionalString(auth.clientSecret)\n      );\n    default:\n      return false;\n  }\n};\n\nconst isCustomServerRecord = (\n  value: unknown,\n): value is MCPCustomServerRecord => {\n  if (!isRecord(value)) return false;\n  if (typeof value.id !== \"string\" || !isValidServerId(value.id)) {\n    return false;\n  }\n  return (\n    isNonEmptyString(value.name) &&\n    isNonEmptyString(value.url) &&\n    Number.isFinite(value.createdAt) &&\n    isMCPAuthConfig(value.auth) &&\n    isOptionalConnectionTimeout(value.connectionTimeout)\n  );\n};\n\nconst normalizeCustomServerRecord = (\n  value: unknown,\n): MCPCustomServerRecord | null => {\n  if (isCustomServerRecord(value)) return value;\n  if (!isRecord(value)) return null;\n\n  const record = { ...value };\n  delete record.connectionTimeout;\n  return isCustomServerRecord(record) ? record : null;\n};\n\nexport const normalizeCustomServerRecords = (\n  value: unknown,\n): MCPCustomServerRecord[] => {\n  if (!Array.isArray(value)) return [];\n  return value.flatMap((item) => {\n    const record = normalizeCustomServerRecord(item);\n    return record === null ? [] : [record];\n  });\n};\n\nconst normalizeOAuthTokens = (\n  value: unknown,\n): MCPPersistedAuthState[\"tokens\"] | undefined => {\n  const result = OAuthTokensSchema.safeParse(value);\n  return result.success ? result.data : undefined;\n};\n\nconst normalizeClientInformation = (\n  value: unknown,\n): MCPPersistedAuthState[\"clientInformation\"] | undefined => {\n  const result = OAuthClientInformationFullSchema.safeParse(value);\n  return result.success ? result.data : undefined;\n};\n\nexport const normalizePersistedAuthState = (\n  value: unknown,\n): MCPPersistedAuthState | null => {\n  if (!isRecord(value)) return null;\n\n  const state: MCPPersistedAuthState = {};\n  if (isNonEmptyString(value.token)) state.token = value.token;\n  if (isNonEmptyString(value.codeVerifier)) {\n    state.codeVerifier = value.codeVerifier;\n  }\n\n  const tokens = normalizeOAuthTokens(value.tokens);\n  if (tokens) state.tokens = tokens;\n\n  const clientInformation = normalizeClientInformation(value.clientInformation);\n  if (clientInformation) state.clientInformation = clientInformation;\n\n  return Object.keys(state).length > 0 ? state : null;\n};\n\nconst useMcpLocalStorage = (opts: McpLocalStorageOptions = {}): MCPStorage => {\n  const prefix = opts.keyPrefix ?? \"aui-mcp\";\n  const customServersKey = `${prefix}:custom-servers`;\n  const authKey = (id: string) => `${prefix}:auth:${id}`;\n  const storage = resolveStorage(opts);\n\n  const read = <T>(key: string, fallback: T): T => {\n    if (!storage) return fallback;\n    try {\n      const raw = storage.getItem(key);\n      if (raw == null) return fallback;\n      return JSON.parse(raw) as T;\n    } catch {\n      return fallback;\n    }\n  };\n\n  const write = (key: string, value: unknown): void => {\n    if (!storage) return;\n    try {\n      storage.setItem(key, JSON.stringify(value));\n    } catch {\n      // quota or serialization failure — silently drop\n    }\n  };\n\n  const remove = (key: string): void => {\n    if (!storage) return;\n    try {\n      storage.removeItem(key);\n    } catch {\n      // ignore\n    }\n  };\n\n  return {\n    loadCustomServers: async () =>\n      normalizeCustomServerRecords(read<unknown>(customServersKey, [])),\n    saveCustomServers: async (records) => {\n      write(customServersKey, records);\n    },\n    loadAuthState: async (id) =>\n      normalizePersistedAuthState(read<unknown>(authKey(id), null)),\n    saveAuthState: async (id, state) => {\n      write(authKey(id), state);\n    },\n    clearAuthState: async (id) => {\n      remove(authKey(id));\n    },\n  };\n};\n\nexport const McpLocalStorage = resource(useMcpLocalStorage);\n"],"mappings":";;;;AAiBA,SAASY,eAAeC,MAA8C;CACpE,IAAIA,KAAKH,SAAS,OAAOG,KAAKH;CAC9B,IAAI,OAAOI,eAAe,eAAe,kBAAkBA,YACzD,IAAI;EACF,OAAQA,WAAyCC;CACnD,QAAQ;EACN,OAAO;CACT;CAEF,OAAO;AACT;AAEA,MAAMC,YAAYC,UAChB,OAAOA,UAAU,YAAYA,UAAU,QAAQ,CAACE,MAAMC,QAAQH,KAAK;AAErE,MAAMI,oBAAoBJ,UACxBA,UAAUK,KAAAA,KAAa,OAAOL,UAAU;AAE1C,MAAMM,oBAAoBN,UACxB,OAAOA,UAAU,YAAYA,MAAMO,KAAK,CAAC,CAACC,SAAS;AAErD,MAAMC,4BACJT,UAEAA,UAAUK,KAAAA,KAAaC,iBAAiBN,KAAK;AAE/C,MAAMU,yBAAyBV,UAC7BA,UAAUK,KAAAA,KACTH,MAAMC,QAAQH,KAAK,KAAKA,MAAMW,OAAOC,SAAS,OAAOA,SAAS,QAAQ;AAEzE,MAAMC,+BACJb,UAEAA,UAAUK,KAAAA,KACT,OAAOL,UAAU,YAAYc,OAAOC,SAASf,KAAK,KAAKA,SAAS;AAEnE,MAAMgB,mBAAmBC,OAAwB;CAC/C,IAAI;EACF5B,oBAAoB4B,EAAE;EACtB,OAAO;CACT,QAAQ;EACN,OAAO;CACT;AACF;AAEA,MAAMC,mBAAmBC,SAAyC;CAChE,IAAI,CAACpB,SAASoB,IAAI,GAAG,OAAO;CAE5B,QAAQA,KAAKC,MAAb;EACE,KAAK,QACH,OAAO;EACT,KAAK,UACH,OAAOX,yBAAyBU,KAAKE,KAAK;EAC5C,KAAK,SACH,OACEX,sBAAsBS,KAAKG,MAAM,KACjClB,iBAAiBe,KAAKI,qBAAqB,KAC3CnB,iBAAiBe,KAAKK,aAAa,KACnCpB,iBAAiBe,KAAKM,oBAAoB,KAC1CrB,iBAAiBe,KAAKO,QAAQ,KAC9BtB,iBAAiBe,KAAKQ,YAAY;EAEtC,SACE,OAAO;CACX;AACF;AAEA,MAAMC,wBACJ5B,UACmC;CACnC,IAAI,CAACD,SAASC,KAAK,GAAG,OAAO;CAC7B,IAAI,OAAOA,MAAMiB,OAAO,YAAY,CAACD,gBAAgBhB,MAAMiB,EAAE,GAC3D,OAAO;CAET,OACEX,iBAAiBN,MAAM6B,IAAI,KAC3BvB,iBAAiBN,MAAM8B,GAAG,KAC1BhB,OAAOC,SAASf,MAAM+B,SAAS,KAC/Bb,gBAAgBlB,MAAMmB,IAAI,KAC1BN,4BAA4Bb,MAAMgC,iBAAiB;AAEvD;AAEA,MAAMC,+BACJjC,UACiC;CACjC,IAAI4B,qBAAqB5B,KAAK,GAAG,OAAOA;CACxC,IAAI,CAACD,SAASC,KAAK,GAAG,OAAO;CAE7B,MAAMkC,SAAS,EAAE,GAAGlC,MAAM;CAC1B,OAAOkC,OAAOF;CACd,OAAOJ,qBAAqBM,MAAM,IAAIA,SAAS;AACjD;AAEA,MAAaC,gCACXnC,UAC4B;CAC5B,IAAI,CAACE,MAAMC,QAAQH,KAAK,GAAG,OAAO,CAAA;CAClC,OAAOA,MAAMoC,SAASxB,SAAS;EAC7B,MAAMsB,SAASD,4BAA4BrB,IAAI;EAC/C,OAAOsB,WAAW,OAAO,CAAA,IAAK,CAACA,MAAM;CACvC,CAAC;AACH;AAEA,MAAMG,wBACJrC,UACgD;CAChD,MAAMsC,SAASrD,kBAAkBsD,UAAUvC,KAAK;CAChD,OAAOsC,OAAOE,UAAUF,OAAOG,OAAOpC,KAAAA;AACxC;AAEA,MAAMqC,8BACJ1C,UAC2D;CAC3D,MAAMsC,SAAStD,iCAAiCuD,UAAUvC,KAAK;CAC/D,OAAOsC,OAAOE,UAAUF,OAAOG,OAAOpC,KAAAA;AACxC;AAEA,MAAasC,+BACX3C,UACiC;CACjC,IAAI,CAACD,SAASC,KAAK,GAAG,OAAO;CAE7B,MAAM4C,QAA+B,CAAC;CACtC,IAAItC,iBAAiBN,MAAMqB,KAAK,GAAGuB,MAAMvB,QAAQrB,MAAMqB;CACvD,IAAIf,iBAAiBN,MAAM6C,YAAY,GACrCD,MAAMC,eAAe7C,MAAM6C;CAG7B,MAAMC,SAAST,qBAAqBrC,MAAM8C,MAAM;CAChD,IAAIA,QAAQF,MAAME,SAASA;CAE3B,MAAMC,oBAAoBL,2BAA2B1C,MAAM+C,iBAAiB;CAC5E,IAAIA,mBAAmBH,MAAMG,oBAAoBA;CAEjD,OAAOC,OAAOC,KAAKL,KAAK,CAAC,CAACpC,SAAS,IAAIoC,QAAQ;AACjD;AAEA,MAAMM,sBAAsBtD,OAA+B,CAAC,MAAkB;CAC5E,MAAMuD,SAASvD,KAAKJ,aAAa;CACjC,MAAM4D,mBAAmB,GAAGD,OAAM;CAClC,MAAME,WAAWpC,OAAe,GAAGkC,OAAM,QAASlC;CAClD,MAAMxB,UAAUE,eAAeC,IAAI;CAEnC,MAAM0D,QAAWC,KAAaC,aAAmB;EAC/C,IAAI,CAAC/D,SAAS,OAAO+D;EACrB,IAAI;GACF,MAAME,MAAMjE,QAAQkE,QAAQJ,GAAG;GAC/B,IAAIG,OAAO,MAAM,OAAOF;GACxB,OAAOI,KAAKC,MAAMH,GAAG;EACvB,QAAQ;GACN,OAAOF;EACT;CACF;CAEA,MAAMM,SAASP,KAAavD,UAAyB;EACnD,IAAI,CAACP,SAAS;EACd,IAAI;GACFA,QAAQsE,QAAQR,KAAKK,KAAKI,UAAUhE,KAAK,CAAC;EAC5C,QAAQ,CACN;CAEJ;CAEA,MAAMiE,UAAUV,QAAsB;EACpC,IAAI,CAAC9D,SAAS;EACd,IAAI;GACFA,QAAQyE,WAAWX,GAAG;EACxB,QAAQ,CACN;CAEJ;CAEA,OAAO;EACLY,mBAAmB,YACjBhC,6BAA6BmB,KAAcF,kBAAkB,CAAA,CAAE,CAAC;EAClEgB,mBAAmB,OAAOC,YAAY;GACpCP,MAAMV,kBAAkBiB,OAAO;EACjC;EACAC,eAAe,OAAOrD,OACpB0B,4BAA4BW,KAAcD,QAAQpC,EAAE,GAAG,IAAI,CAAC;EAC9DsD,eAAe,OAAOtD,IAAI2B,UAAU;GAClCkB,MAAMT,QAAQpC,EAAE,GAAG2B,KAAK;EAC1B;EACA4B,gBAAgB,OAAOvD,OAAO;GAC5BgD,OAAOZ,QAAQpC,EAAE,CAAC;EACpB;CACF;AACF;AAEA,MAAawD,kBAAkB1F,SAASmE,kBAAkB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-mcp",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "MCP server configuration and connection primitives for @assistant-ui",
   "keywords": [
     "mcp",
@@ -28,11 +28,11 @@
   "sideEffects": false,
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@radix-ui/react-primitive": "^2.1.7",
-    "@assistant-ui/core": "0.2.21",
-    "@assistant-ui/store": "0.2.20",
-    "@assistant-ui/tap": "0.9.4",
-    "assistant-stream": "0.3.26"
+    "@radix-ui/react-primitive": "^2.1.10",
+    "@assistant-ui/core": "0.2.22",
+    "@assistant-ui/store": "0.2.21",
+    "@assistant-ui/tap": "0.9.5",
+    "assistant-stream": "0.3.27"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "@types/react": "^19.2.17",
-    "react": "^19.2.7",
+    "react": "^19.2.8",
     "vitest": "^4.1.10",
-    "@assistant-ui/x-buildutils": "0.0.18"
+    "@assistant-ui/x-buildutils": "0.0.19"
   },
   "publishConfig": {
     "access": "public",

package/src/resources/McpServerResource.test.ts

@@ -1,4 +1,6 @@
 import { createTapRoot, useResource } from "@assistant-ui/tap";
+import type { ClientOutput } from "@assistant-ui/store";
+import { useEffect } from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { MCPAuthConfig } from "../mcp-scope";
 import type { MCPStorage } from "./storage/types";
@@ -17,6 +19,7 @@ const mocks = vi.hoisted(() => {
     }>
   > = [];
   const finishAuthResults: Array<() => Promise<void>> = [];
+  const closeResults: Array<() => Promise<void>> = [];
 
   const Client = vi.fn().mockImplementation(function Client(this: any) {
     const index = clients.length;
@@ -34,7 +37,7 @@ const mocks = vi.hoisted(() => {
     .fn()
     .mockImplementation(function StreamableHTTPClientTransport(this: any) {
       const index = transports.length;
-      this.close = vi.fn(() => Promise.resolve());
+      this.close = vi.fn(() => closeResults[index]?.() ?? Promise.resolve());
       this.finishAuth = vi.fn(
         () => finishAuthResults[index]?.() ?? Promise.resolve(),
       );
@@ -49,6 +52,7 @@ const mocks = vi.hoisted(() => {
     connectResults,
     listToolsResults,
     finishAuthResults,
+    closeResults,
   };
 });
 
@@ -102,19 +106,23 @@ const resetMocks = () => {
   mocks.connectResults.length = 0;
   mocks.listToolsResults.length = 0;
   mocks.finishAuthResults.length = 0;
+  mocks.closeResults.length = 0;
   mocks.Client.mockClear();
   mocks.StreamableHTTPClientTransport.mockClear();
 };
 
-const mount = (props?: {
-  auth?: MCPAuthConfig | undefined;
-  connectionTimeout?: number | undefined;
-}) => {
+const mount = (
+  props?: {
+    auth?: MCPAuthConfig | undefined;
+    connectionTimeout?: number | undefined;
+  },
+  onMount?: (server: ClientOutput<"mcpServer">) => void,
+) => {
   const connectionTimeout =
     props && "connectionTimeout" in props ? props.connectionTimeout : 10_000;
 
   return createTapRoot(function Root() {
-    return useResource(
+    const server = useResource(
       McpServerResource({
         id: "docs",
         kind: "connector",
@@ -128,6 +136,10 @@ const mount = (props?: {
         onRemove: vi.fn(async () => {}),
       }),
     );
+    useEffect(() => {
+      onMount?.(server);
+    }, [server]);
+    return server;
   });
 };
 
@@ -247,9 +259,105 @@ describe("McpServerResource connectionTimeout", () => {
   });
 });
 
+describe("McpServerResource connection lifecycle", () => {
+  beforeEach(resetMocks);
+
+  it("closes a pending connection when the resource unmounts", async () => {
+    let resolveConnect!: () => void;
+    mocks.connectResults.push(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveConnect = resolve;
+        }),
+    );
+    const root = mount({ connectionTimeout: undefined });
+    let didUnmount = false;
+    try {
+      const connectPromise = root.getValue().connect();
+      await waitFor(() => mocks.clients[0]?.connect.mock.calls.length === 1);
+
+      root.unmount();
+      didUnmount = true;
+      await flushMacrotask();
+
+      expect(mocks.transports[0].close).toHaveBeenCalledTimes(1);
+
+      resolveConnect();
+      await connectPromise;
+
+      expect(mocks.clients[0].listTools).not.toHaveBeenCalled();
+      expect(mocks.transports[0].close).toHaveBeenCalledTimes(1);
+    } finally {
+      if (!didUnmount) root.unmount();
+    }
+  });
+
+  it("waits for pending transports to close before a newer reconnect", async () => {
+    let resolveFirstConnect!: () => void;
+    let resolveFirstClose!: () => void;
+    mocks.connectResults.push(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveFirstConnect = resolve;
+        }),
+    );
+    mocks.closeResults.push(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveFirstClose = resolve;
+        }),
+    );
+    const root = mount({ connectionTimeout: undefined });
+
+    try {
+      const firstConnect = root.getValue().connect();
+      await waitFor(() => mocks.clients[0]?.connect.mock.calls.length === 1);
+
+      const supersededReconnect = root.getValue().connect();
+      await waitFor(() => mocks.transports[0]?.close.mock.calls.length === 1);
+
+      const latestReconnect = root.getValue().connect();
+      await flushMacrotask();
+      expect(mocks.transports).toHaveLength(1);
+
+      resolveFirstClose();
+      await supersededReconnect;
+      await waitFor(() => mocks.clients[1]?.connect.mock.calls.length === 1);
+      await latestReconnect;
+
+      resolveFirstConnect();
+      await firstConnect;
+    } finally {
+      root.unmount();
+    }
+  });
+});
+
 describe("McpServerResource completeAuth", () => {
   beforeEach(resetMocks);
 
+  it("completes auth across the StrictMode effect replay", async () => {
+    let completeAuth: Promise<void> | undefined;
+    let started = false;
+    const root = mount({ auth: { type: "oauth" } }, (server) => {
+      if (started) return;
+      started = true;
+      completeAuth = server.completeAuth(
+        "https://example.com/callback?code=abc",
+      );
+    });
+
+    try {
+      await expect(completeAuth).resolves.toBeUndefined();
+      await flushMacrotask();
+
+      expect(mocks.transports[0].finishAuth).toHaveBeenCalledTimes(1);
+      expect(root.getValue().getState().connectionState).toBe("connected");
+    } finally {
+      root.unmount();
+    }
+  });
+
   it("rejects when the callback URL has no authorization code", async () => {
     const root = mount();
 
@@ -294,6 +402,71 @@ describe("McpServerResource completeAuth", () => {
       root.unmount();
     }
   });
+
+  it("rejects when the resource unmounts during auth completion", async () => {
+    let resolveFinishAuth!: () => void;
+    mocks.finishAuthResults.push(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveFinishAuth = resolve;
+        }),
+    );
+    const root = mount({ auth: { type: "oauth" } });
+    let didUnmount = false;
+
+    try {
+      const completeAuth = root
+        .getValue()
+        .completeAuth("https://example.com/callback?code=abc");
+      await waitFor(
+        () => mocks.transports[0]?.finishAuth.mock.calls.length === 1,
+      );
+
+      root.unmount();
+      didUnmount = true;
+      resolveFinishAuth();
+
+      await expect(completeAuth).rejects.toThrow(
+        'MCP server "docs" authorization was interrupted before completion.',
+      );
+    } finally {
+      if (!didUnmount) root.unmount();
+    }
+  });
+
+  it("normalizes late auth failures after unmount", async () => {
+    let rejectFinishAuth!: (error: Error) => void;
+    mocks.finishAuthResults.push(
+      () =>
+        new Promise<void>((_, reject) => {
+          rejectFinishAuth = reject;
+        }),
+    );
+    const root = mount({ auth: { type: "oauth" } });
+    let didUnmount = false;
+
+    try {
+      const completeAuth = root
+        .getValue()
+        .completeAuth("https://example.com/callback?code=abc");
+      await waitFor(
+        () => mocks.transports[0]?.finishAuth.mock.calls.length === 1,
+      );
+
+      root.unmount();
+      didUnmount = true;
+      const finishAuthError = new Error("Connection closed");
+      rejectFinishAuth(finishAuthError);
+
+      await expect(completeAuth).rejects.toMatchObject({
+        message:
+          'MCP server "docs" authorization was interrupted before completion.',
+        cause: finishAuthError,
+      });
+    } finally {
+      if (!didUnmount) root.unmount();
+    }
+  });
 });
 
 describe("McpServerResource resource methods", () => {

package/src/resources/McpServerResource.ts

@@ -46,6 +46,64 @@ const useMcpServerResource = (
 
   const clientRef = useRef<Client | null>(null);
   const transportRef = useRef<StreamableHTTPClientTransport | null>(null);
+  const pendingTransportRef = useRef<StreamableHTTPClientTransport | null>(
+    null,
+  );
+  const transportCloseQueueRef = useRef(Promise.resolve());
+  const connectionGenerationRef = useRef(0);
+  const pendingDisposalRef = useRef<{ cancelled: boolean } | null>(null);
+  const mountedRef = useRef(true);
+
+  const closeTransportSafely = async (
+    transport: StreamableHTTPClientTransport,
+  ): Promise<void> => {
+    try {
+      await transport.close();
+    } catch {
+      // ignore close errors
+    }
+  };
+
+  const closeQueuedTransports = (
+    transports: StreamableHTTPClientTransport[],
+  ): Promise<void> => {
+    const task = transportCloseQueueRef.current.then(async () => {
+      await Promise.all(transports.map(closeTransportSafely));
+    });
+    transportCloseQueueRef.current = task;
+    return task;
+  };
+
+  const closePendingTransport = async () => {
+    const transport = pendingTransportRef.current;
+    pendingTransportRef.current = null;
+    await closeQueuedTransports(transport ? [transport] : []);
+  };
+
+  const closeTransports = async () => {
+    const pendingTransport = pendingTransportRef.current;
+    const activeTransport = transportRef.current;
+    pendingTransportRef.current = null;
+    transportRef.current = null;
+    clientRef.current = null;
+
+    const transports = new Set(
+      [pendingTransport, activeTransport].filter(
+        (transport): transport is StreamableHTTPClientTransport =>
+          transport !== null,
+      ),
+    );
+    await closeQueuedTransports([...transports]);
+  };
+
+  const isCurrentConnection = (generation: number) =>
+    mountedRef.current && generation === connectionGenerationRef.current;
+
+  const createInterruptedAuthError = (cause?: unknown) =>
+    new Error(
+      `MCP server "${props.id}" authorization was interrupted before completion.`,
+      cause === undefined ? undefined : { cause },
+    );
 
   const withConnectionTimeout = useEffectEvent(
     async <T>(
@@ -105,7 +163,10 @@ const useMcpServerResource = (
   );
 
   const finalizeConnect = useEffectEvent(
-    async (transport: StreamableHTTPClientTransport) => {
+    async (
+      transport: StreamableHTTPClientTransport,
+      generation: number,
+    ): Promise<boolean> => {
       const client = new Client({
         name: "assistant-ui-mcp",
         version: "0.0.0",
@@ -120,6 +181,7 @@ const useMcpServerResource = (
         "connecting",
         startedAt,
       );
+      if (!isCurrentConnection(generation)) return false;
       // Defer ref assignment until listTools() also succeeds — otherwise a
       // post-connect failure leaves stale refs that `callTool()` would
       // happily walk into, producing confusing SDK errors instead of
@@ -129,6 +191,9 @@ const useMcpServerResource = (
         "listing tools",
         startedAt,
       );
+      if (!isCurrentConnection(generation)) return false;
+
+      pendingTransportRef.current = null;
       clientRef.current = client;
       transportRef.current = transport;
       setTools(
@@ -142,25 +207,16 @@ const useMcpServerResource = (
         }),
       );
       setConnectionState("connected");
+      return true;
     },
   );
 
-  const closeTransport = async () => {
-    const t = transportRef.current;
-    transportRef.current = null;
-    clientRef.current = null;
-    if (t) {
-      try {
-        await t.close();
-      } catch {
-        // ignore close errors
-      }
-    }
-  };
-
   const doConnect = useEffectEvent(async () => {
+    const generation = ++connectionGenerationRef.current;
     // Close any prior transport/client so a re-connect doesn't leak.
-    await closeTransport();
+    await closeTransports();
+    if (!isCurrentConnection(generation)) return;
+
     setConnectionState("connecting");
     setLastError(null);
     setAuthorizationUrl(null);
@@ -170,24 +226,29 @@ const useMcpServerResource = (
     let transport: StreamableHTTPClientTransport | null = null;
     try {
       transport = await buildTransport();
+      if (!isCurrentConnection(generation)) {
+        await closeQueuedTransports([transport]);
+        return;
+      }
+      pendingTransportRef.current = transport;
       // Don't assign to transportRef until connect succeeds — otherwise a
       // failed `listTools()` leaves an orphaned transport that future
       // doConnect / doDisconnect calls treat as live.
-      await finalizeConnect(transport);
+      await finalizeConnect(transport, generation);
     } catch (err) {
+      if (!isCurrentConnection(generation)) return;
+
       if (err instanceof UnauthorizedError) {
         // OAuth: keep the transport alive so completeAuth can call
         // finishAuth on it. Closing it before storing would leave a
         // closed transport on transportRef.
+        pendingTransportRef.current = null;
         transportRef.current = transport;
         setConnectionState("authRequired");
       } else {
         if (transport) {
-          try {
-            await transport.close();
-          } catch {
-            // ignore close errors
-          }
+          pendingTransportRef.current = null;
+          await closeQueuedTransports([transport]);
         }
         setLastError({
           message: err instanceof Error ? err.message : String(err),
@@ -198,13 +259,18 @@ const useMcpServerResource = (
   });
 
   const doDisconnect = useEffectEvent(async () => {
+    connectionGenerationRef.current += 1;
     setTools([]);
     setAuthorizationUrl(null);
     setConnectionState("disconnected");
-    await closeTransport();
+    await closeTransports();
   });
 
   const doCompleteAuth = useEffectEvent(async (callbackUrl: string) => {
+    const generation = ++connectionGenerationRef.current;
+    await closePendingTransport();
+    if (!isCurrentConnection(generation)) throw createInterruptedAuthError();
+
     setConnectionState("authPending");
     setLastError(null);
     try {
@@ -214,14 +280,25 @@ const useMcpServerResource = (
       let transport = transportRef.current;
       if (!transport) {
         transport = await buildTransport();
-        transportRef.current = transport;
+        if (!isCurrentConnection(generation)) {
+          await closeQueuedTransports([transport]);
+          throw createInterruptedAuthError();
+        }
       }
+      transportRef.current = null;
+      clientRef.current = null;
+      pendingTransportRef.current = transport;
       await transport.finishAuth(code);
+      if (!isCurrentConnection(generation)) throw createInterruptedAuthError();
       setAuthorizationUrl(null);
-      await finalizeConnect(transport);
+      const connected = await finalizeConnect(transport, generation);
+      if (!connected) throw createInterruptedAuthError();
     } catch (err) {
-      await closeTransport();
       const error = err instanceof Error ? err : new Error(String(err));
+      if (!isCurrentConnection(generation))
+        throw createInterruptedAuthError(error);
+
+      await closeTransports();
       setLastError({
         message: error.message,
       });
@@ -255,14 +332,22 @@ const useMcpServerResource = (
 
   // Auto-connect on mount when usable auth exists.
   useEffect(() => {
+    const previousDisposal = pendingDisposalRef.current;
+    if (previousDisposal) previousDisposal.cancelled = true;
+    const pendingDisposal = { cancelled: false };
+    pendingDisposalRef.current = pendingDisposal;
+    mountedRef.current = true;
     const signal = { cancelled: false };
     void tryAutoConnect(signal);
     return () => {
+      mountedRef.current = false;
       signal.cancelled = true;
-      const t = transportRef.current;
-      transportRef.current = null;
-      clientRef.current = null;
-      if (t) t.close().catch(() => {});
+      // Defer disposal so StrictMode can replay setup before closing the transport.
+      queueMicrotask(() => {
+        if (pendingDisposal.cancelled) return;
+        connectionGenerationRef.current += 1;
+        void closeTransports();
+      });
     };
   }, []);
 

package/src/resources/storage/McpLocalStorage.test.ts

@@ -39,6 +39,40 @@ describe("normalizeCustomServerRecords", () => {
     ).toEqual([validRecord]);
   });
 
+  it("strips malformed connection timeouts without dropping servers", () => {
+    expect(
+      normalizeCustomServerRecords([
+        { ...validRecord, id: "string-timeout", connectionTimeout: "10000" },
+        { ...validRecord, id: "null-timeout", connectionTimeout: null },
+        { ...validRecord, id: "negative-timeout", connectionTimeout: -1 },
+        { ...validRecord, id: "nan-timeout", connectionTimeout: Number.NaN },
+        {
+          ...validRecord,
+          id: "infinite-timeout",
+          connectionTimeout: Number.POSITIVE_INFINITY,
+        },
+      ]),
+    ).toEqual([
+      { ...validRecord, id: "string-timeout" },
+      { ...validRecord, id: "null-timeout" },
+      { ...validRecord, id: "negative-timeout" },
+      { ...validRecord, id: "nan-timeout" },
+      { ...validRecord, id: "infinite-timeout" },
+    ]);
+  });
+
+  it("accepts finite non-negative connection timeouts", () => {
+    expect(
+      normalizeCustomServerRecords([
+        { ...validRecord, connectionTimeout: 0 },
+        { ...validRecord, connectionTimeout: 10_000 },
+      ]),
+    ).toEqual([
+      { ...validRecord, connectionTimeout: 0 },
+      { ...validRecord, connectionTimeout: 10_000 },
+    ]);
+  });
+
   it("accepts persisted bearer and oauth auth configs", () => {
     expect(
       normalizeCustomServerRecords([
@@ -165,6 +199,28 @@ const loadStorage = (storage: Storage) =>
     );
   }).getValue();
 
+describe("McpLocalStorage custom servers", () => {
+  it("strips malformed connection timeouts when loading", async () => {
+    const storage = createStorage();
+    storage.setItem(
+      "test-mcp:custom-servers",
+      JSON.stringify([
+        validRecord,
+        {
+          ...validRecord,
+          id: "bad-timeout",
+          connectionTimeout: "immediately",
+        },
+      ]),
+    );
+
+    await expect(loadStorage(storage).loadCustomServers()).resolves.toEqual([
+      validRecord,
+      { ...validRecord, id: "bad-timeout" },
+    ]);
+  });
+});
+
 describe("McpLocalStorage auth state", () => {
   it("normalizes loaded auth state from localStorage", async () => {
     const storage = createStorage();