@assistant-ui/react-mcp 0.0.22 → 0.1.1

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","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":"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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/core\";\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":"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"}

package/dist/resources/validateElicitationContent.d.ts

@@ -0,0 +1,9 @@
+//#region src/resources/validateElicitationContent.d.ts
+type ValidationError = {
+  property: string;
+  message: string;
+};
+declare const validateElicitationContent: (requestedSchema: unknown, content: Record<string, unknown>) => readonly ValidationError[];
+//#endregion
+export { validateElicitationContent };
+//# sourceMappingURL=validateElicitationContent.d.ts.map

package/dist/resources/validateElicitationContent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateElicitationContent.d.ts","names":[],"sources":["../../src/resources/validateElicitationContent.ts"],"mappings":";KAAK;EACH;EACA;;cA+BW,6BACX,0BACA,SAAS,qCACC"}

package/dist/resources/validateElicitationContent.js

@@ -0,0 +1,47 @@
+//#region src/resources/validateElicitationContent.ts
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const getOwn = (value, key) => Object.hasOwn(value, key) ? value[key] : void 0;
+const matchesType = (type, value) => {
+	switch (type) {
+		case "string": return typeof value === "string";
+		case "number": return typeof value === "number" && Number.isFinite(value);
+		case "integer": return typeof value === "number" && Number.isFinite(value) && Number.isInteger(value);
+		case "boolean": return typeof value === "boolean";
+		default: return true;
+	}
+};
+const typeMessage = (type) => `Expected ${type === "integer" ? "an" : "a"} ${type}.`;
+const validateElicitationContent = (requestedSchema, content) => {
+	if (!isRecord(requestedSchema)) return [];
+	const errors = [];
+	const properties = getOwn(requestedSchema, "properties");
+	if (isRecord(properties)) for (const property of Object.keys(properties)) {
+		if (!Object.hasOwn(content, property)) continue;
+		const schema = properties[property];
+		if (!isRecord(schema)) continue;
+		const value = content[property];
+		const type = getOwn(schema, "type");
+		if (typeof type === "string" && !matchesType(type, value)) errors.push({
+			property,
+			message: typeMessage(type)
+		});
+		const values = getOwn(schema, "enum");
+		if (Array.isArray(values) && !values.some((enumValue) => Object.is(enumValue, value))) errors.push({
+			property,
+			message: "Must be one of the allowed values."
+		});
+	}
+	const required = getOwn(requestedSchema, "required");
+	if (Array.isArray(required)) for (const property of required) {
+		if (typeof property !== "string" || Object.hasOwn(content, property)) continue;
+		errors.push({
+			property,
+			message: "This property is required."
+		});
+	}
+	return errors;
+};
+//#endregion
+export { validateElicitationContent };
+
+//# sourceMappingURL=validateElicitationContent.js.map

package/dist/resources/validateElicitationContent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateElicitationContent.js","names":["ValidationError","property","message","isRecord","value","Record","Array","isArray","getOwn","key","Object","hasOwn","undefined","matchesType","type","Number","isFinite","isInteger","typeMessage","validateElicitationContent","requestedSchema","content","errors","properties","keys","schema","push","values","some","enumValue","is","required"],"sources":["../../src/resources/validateElicitationContent.ts"],"sourcesContent":["type ValidationError = {\n  property: string;\n  message: string;\n};\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  typeof value === \"object\" && value !== null && !Array.isArray(value);\n\nconst getOwn = (value: Record<string, unknown>, key: string): unknown =>\n  Object.hasOwn(value, key) ? value[key] : undefined;\n\nconst matchesType = (type: unknown, value: unknown): boolean => {\n  switch (type) {\n    case \"string\":\n      return typeof value === \"string\";\n    case \"number\":\n      return typeof value === \"number\" && Number.isFinite(value);\n    case \"integer\":\n      return (\n        typeof value === \"number\" &&\n        Number.isFinite(value) &&\n        Number.isInteger(value)\n      );\n    case \"boolean\":\n      return typeof value === \"boolean\";\n    default:\n      return true;\n  }\n};\n\nconst typeMessage = (type: string) =>\n  `Expected ${type === \"integer\" ? \"an\" : \"a\"} ${type}.`;\n\nexport const validateElicitationContent = (\n  requestedSchema: unknown,\n  content: Record<string, unknown>,\n): readonly ValidationError[] => {\n  if (!isRecord(requestedSchema)) return [];\n\n  const errors: ValidationError[] = [];\n  const properties = getOwn(requestedSchema, \"properties\");\n  if (isRecord(properties)) {\n    for (const property of Object.keys(properties)) {\n      if (!Object.hasOwn(content, property)) continue;\n\n      const schema = properties[property];\n      if (!isRecord(schema)) continue;\n\n      const value = content[property];\n      const type = getOwn(schema, \"type\");\n      if (typeof type === \"string\" && !matchesType(type, value)) {\n        errors.push({ property, message: typeMessage(type) });\n      }\n\n      const values = getOwn(schema, \"enum\");\n      if (\n        Array.isArray(values) &&\n        !values.some((enumValue) => Object.is(enumValue, value))\n      ) {\n        errors.push({\n          property,\n          message: \"Must be one of the allowed values.\",\n        });\n      }\n    }\n  }\n\n  const required = getOwn(requestedSchema, \"required\");\n  if (Array.isArray(required)) {\n    for (const property of required) {\n      if (typeof property !== \"string\" || Object.hasOwn(content, property)) {\n        continue;\n      }\n      errors.push({ property, message: \"This property is required.\" });\n    }\n  }\n\n  return errors;\n};\n"],"mappings":";AAKA,MAAMG,YAAYC,UAChB,OAAOA,UAAU,YAAYA,UAAU,QAAQ,CAACE,MAAMC,QAAQH,KAAK;AAErE,MAAMI,UAAUJ,OAAgCK,QAC9CC,OAAOC,OAAOP,OAAOK,GAAG,IAAIL,MAAMK,OAAOG,KAAAA;AAE3C,MAAMC,eAAeC,MAAeV,UAA4B;CAC9D,QAAQU,MAAR;EACE,KAAK,UACH,OAAO,OAAOV,UAAU;EAC1B,KAAK,UACH,OAAO,OAAOA,UAAU,YAAYW,OAAOC,SAASZ,KAAK;EAC3D,KAAK,WACH,OACE,OAAOA,UAAU,YACjBW,OAAOC,SAASZ,KAAK,KACrBW,OAAOE,UAAUb,KAAK;EAE1B,KAAK,WACH,OAAO,OAAOA,UAAU;EAC1B,SACE,OAAO;CACX;AACF;AAEA,MAAMc,eAAeJ,SACnB,YAAYA,SAAS,YAAY,OAAO,IAAG,GAAIA,KAAI;AAErD,MAAaK,8BACXC,iBACAC,YAC+B;CAC/B,IAAI,CAAClB,SAASiB,eAAe,GAAG,OAAO,CAAA;CAEvC,MAAME,SAA4B,CAAA;CAClC,MAAMC,aAAaf,OAAOY,iBAAiB,YAAY;CACvD,IAAIjB,SAASoB,UAAU,GACrB,KAAK,MAAMtB,YAAYS,OAAOc,KAAKD,UAAU,GAAG;EAC9C,IAAI,CAACb,OAAOC,OAAOU,SAASpB,QAAQ,GAAG;EAEvC,MAAMwB,SAASF,WAAWtB;EAC1B,IAAI,CAACE,SAASsB,MAAM,GAAG;EAEvB,MAAMrB,QAAQiB,QAAQpB;EACtB,MAAMa,OAAON,OAAOiB,QAAQ,MAAM;EAClC,IAAI,OAAOX,SAAS,YAAY,CAACD,YAAYC,MAAMV,KAAK,GACtDkB,OAAOI,KAAK;GAAEzB;GAAUC,SAASgB,YAAYJ,IAAI;EAAE,CAAC;EAGtD,MAAMa,SAASnB,OAAOiB,QAAQ,MAAM;EACpC,IACEnB,MAAMC,QAAQoB,MAAM,KACpB,CAACA,OAAOC,MAAMC,cAAcnB,OAAOoB,GAAGD,WAAWzB,KAAK,CAAC,GAEvDkB,OAAOI,KAAK;GACVzB;GACAC,SAAS;EACX,CAAC;CAEL;CAGF,MAAM6B,WAAWvB,OAAOY,iBAAiB,UAAU;CACnD,IAAId,MAAMC,QAAQwB,QAAQ,GACxB,KAAK,MAAM9B,YAAY8B,UAAU;EAC/B,IAAI,OAAO9B,aAAa,YAAYS,OAAOC,OAAOU,SAASpB,QAAQ,GACjE;EAEFqB,OAAOI,KAAK;GAAEzB;GAAUC,SAAS;EAA6B,CAAC;CACjE;CAGF,OAAOoB;AACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-mcp",
-  "version": "0.0.22",
+  "version": "0.1.1",
   "description": "MCP server configuration and connection primitives for @assistant-ui",
   "keywords": [
     "mcp",
@@ -27,12 +27,13 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/client": "^2.0.0",
+    "@modelcontextprotocol/core": "^2.0.0",
     "@radix-ui/react-primitive": "^2.1.10",
-    "@assistant-ui/core": "0.3.1",
-    "@assistant-ui/store": "0.3.1",
-    "@assistant-ui/tap": "0.9.7",
-    "assistant-stream": "0.3.30"
+    "@assistant-ui/core": "0.3.3",
+    "@assistant-ui/store": "0.3.2",
+    "@assistant-ui/tap": "0.9.9",
+    "assistant-stream": "0.3.31"
   },
   "peerDependencies": {
     "@types/react": "*",

package/src/auth/createOAuthProvider.ts

@@ -1,9 +1,9 @@
-import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
 import type {
+  OAuthClientProvider,
   OAuthClientInformationFull,
   OAuthClientMetadata,
   OAuthTokens,
-} from "@modelcontextprotocol/sdk/shared/auth.js";
+} from "@modelcontextprotocol/client";
 import type { MCPStorage } from "../resources/storage/types";
 import type { MCPAuthConfig } from "../mcp-scope";
 

package/src/auth/types.ts

@@ -1,7 +1,7 @@
 import type {
   OAuthTokens,
   OAuthClientInformationFull,
-} from "@modelcontextprotocol/sdk/shared/auth.js";
+} from "@modelcontextprotocol/client";
 
 export type MCPPersistedAuthState = {
   tokens?: OAuthTokens;

package/src/index.ts

@@ -30,6 +30,7 @@ export type { MCPStorage, MCPStorageElement } from "./resources/storage/types";
 export * as McpManagerPrimitive from "./primitives/manager";
 export * as McpServerPrimitive from "./primitives/server";
 export * as McpAddFormPrimitive from "./primitives/addForm";
+export * as McpElicitationPrimitive from "./primitives/elicitation";
 
 // Per-server scope providers. The iteration primitives wrap each item in
 // the appropriate ByIndex provider. The ById provider is useful for
@@ -52,11 +53,14 @@ export type { MCPPersistedAuthState } from "./auth/types";
 // Public types
 export type {
   MCPAuthConfig,
+  MCPResponseCacheConfig,
   MCPConnector,
   MCPCustomServerRecord,
   MCPServerKind,
   MCPConnectionState,
   MCPToolInfo,
+  MCPElicitation,
+  MCPElicitationResponse,
   MCPServerState,
   MCPManagerState,
   MCPServerMethods,

package/src/mcp-scope.ts

@@ -13,6 +13,10 @@ export type MCPAuthConfig =
       clientSecret?: string | undefined;
     };
 
+export type MCPResponseCacheConfig = {
+  readonly defaultTtlMs?: number;
+};
+
 export type MCPConnector = {
   id: string;
   name: string;
@@ -20,6 +24,8 @@ export type MCPConnector = {
   icon?: string | undefined;
   auth: MCPAuthConfig;
   connectionTimeout?: number | undefined;
+  readonly cache?: MCPResponseCacheConfig | undefined;
+  readonly elicitation?: boolean | undefined;
 };
 
 export type MCPCustomServerRecord = {
@@ -28,6 +34,8 @@ export type MCPCustomServerRecord = {
   url: string;
   auth: MCPAuthConfig;
   connectionTimeout?: number | undefined;
+  readonly cache?: MCPResponseCacheConfig | undefined;
+  readonly elicitation?: boolean | undefined;
   createdAt: number;
 };
 
@@ -47,6 +55,23 @@ export type MCPToolInfo = {
   inputSchema: unknown;
 };
 
+export type MCPElicitation = {
+  readonly id: string;
+  readonly message: string;
+  readonly requestedSchema: unknown;
+  readonly error?:
+    | {
+        readonly message: string;
+        readonly properties?: readonly string[] | undefined;
+      }
+    | undefined;
+};
+
+export type MCPElicitationResponse =
+  | { action: "accept"; content: Record<string, unknown> }
+  | { action: "decline" }
+  | { action: "cancel" };
+
 export type MCPServerState = {
   id: string;
   kind: MCPServerKind;
@@ -57,6 +82,7 @@ export type MCPServerState = {
   lastError: { message: string } | null;
   tools: MCPToolInfo[];
   authorizationUrl: string | null;
+  readonly pendingElicitations: readonly MCPElicitation[];
 };
 
 export type MCPManagerState = {
@@ -78,6 +104,10 @@ export type MCPServerMethods = {
   readResource: (uri: string) => Promise<unknown>;
   /** OAuth only: pass full callback URL (e.g. window.location.href) */
   completeAuth: (callbackUrl: string) => Promise<void>;
+  answerElicitation(
+    id: string,
+    response: MCPElicitationResponse,
+  ): readonly { property: string; message: string }[] | undefined;
 };
 
 export type MCPServerQuery =
@@ -98,6 +128,8 @@ export type MCPManagerMethods = {
     url: string;
     auth: MCPAuthConfig;
     connectionTimeout?: number | undefined;
+    readonly cache?: MCPResponseCacheConfig | undefined;
+    readonly elicitation?: boolean | undefined;
   }) => Promise<string>;
   removeServer: (id: string) => Promise<void>;
 };

package/src/primitives/elicitation/McpElicitationPrimitiveAccept.tsx

@@ -0,0 +1,48 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useAui } from "@assistant-ui/store";
+import { useElicitationContext } from "./context";
+import { prepareElicitationContent } from "./prepareElicitationContent";
+
+export namespace McpElicitationPrimitiveAccept {
+  export type Element = ComponentRef<typeof Primitive.button>;
+  export type Props = ComponentPropsWithoutRef<typeof Primitive.button>;
+}
+
+export const McpElicitationPrimitiveAccept = forwardRef<
+  McpElicitationPrimitiveAccept.Element,
+  McpElicitationPrimitiveAccept.Props
+>((props, ref) => {
+  const { elicitation, draft } = useElicitationContext();
+  const aui = useAui();
+  const { content, missingRequired, invalid } = prepareElicitationContent(
+    elicitation.requestedSchema,
+    draft,
+  );
+  const hasMissingRequired = missingRequired.length > 0;
+  const hasInvalid = invalid.length > 0;
+  return (
+    <Primitive.button
+      {...props}
+      type="button"
+      ref={ref}
+      disabled={props.disabled || hasMissingRequired || hasInvalid}
+      data-missing-required={hasMissingRequired ? "" : undefined}
+      data-invalid={hasInvalid ? invalid.join(",") : undefined}
+      onClick={(event) => {
+        props.onClick?.(event);
+        if (event.defaultPrevented || hasMissingRequired || hasInvalid) return;
+        aui.mcpServer.answerElicitation(elicitation.id, {
+          action: "accept",
+          content,
+        });
+      }}
+    />
+  );
+});
+
+McpElicitationPrimitiveAccept.displayName = "McpElicitationPrimitive.Accept";

package/src/primitives/elicitation/McpElicitationPrimitiveCancel.tsx

@@ -0,0 +1,37 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useAui } from "@assistant-ui/store";
+import { useMcpElicitation } from "./context";
+
+export namespace McpElicitationPrimitiveCancel {
+  export type Element = ComponentRef<typeof Primitive.button>;
+  export type Props = ComponentPropsWithoutRef<typeof Primitive.button>;
+}
+
+export const McpElicitationPrimitiveCancel = forwardRef<
+  McpElicitationPrimitiveCancel.Element,
+  McpElicitationPrimitiveCancel.Props
+>((props, ref) => {
+  const elicitation = useMcpElicitation();
+  const aui = useAui();
+  return (
+    <Primitive.button
+      {...props}
+      type="button"
+      ref={ref}
+      onClick={(event) => {
+        props.onClick?.(event);
+        if (event.defaultPrevented) return;
+        aui.mcpServer.answerElicitation(elicitation.id, {
+          action: "cancel",
+        });
+      }}
+    />
+  );
+});
+
+McpElicitationPrimitiveCancel.displayName = "McpElicitationPrimitive.Cancel";

package/src/primitives/elicitation/McpElicitationPrimitiveDecline.tsx

@@ -0,0 +1,37 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useAui } from "@assistant-ui/store";
+import { useMcpElicitation } from "./context";
+
+export namespace McpElicitationPrimitiveDecline {
+  export type Element = ComponentRef<typeof Primitive.button>;
+  export type Props = ComponentPropsWithoutRef<typeof Primitive.button>;
+}
+
+export const McpElicitationPrimitiveDecline = forwardRef<
+  McpElicitationPrimitiveDecline.Element,
+  McpElicitationPrimitiveDecline.Props
+>((props, ref) => {
+  const elicitation = useMcpElicitation();
+  const aui = useAui();
+  return (
+    <Primitive.button
+      {...props}
+      type="button"
+      ref={ref}
+      onClick={(event) => {
+        props.onClick?.(event);
+        if (event.defaultPrevented) return;
+        aui.mcpServer.answerElicitation(elicitation.id, {
+          action: "decline",
+        });
+      }}
+    />
+  );
+});
+
+McpElicitationPrimitiveDecline.displayName = "McpElicitationPrimitive.Decline";

package/src/primitives/elicitation/McpElicitationPrimitiveError.tsx

@@ -0,0 +1,31 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useMcpElicitation } from "./context";
+
+export namespace McpElicitationPrimitiveError {
+  export type Element = ComponentRef<typeof Primitive.div>;
+  export type Props = ComponentPropsWithoutRef<typeof Primitive.div>;
+}
+
+export const McpElicitationPrimitiveError = forwardRef<
+  McpElicitationPrimitiveError.Element,
+  McpElicitationPrimitiveError.Props
+>((props, ref) => {
+  const error = useMcpElicitation().error;
+  if (!error) return null;
+  return (
+    <Primitive.div
+      {...props}
+      ref={ref}
+      data-properties={error.properties?.join(",")}
+    >
+      {props.children ?? error.message}
+    </Primitive.div>
+  );
+});
+
+McpElicitationPrimitiveError.displayName = "McpElicitationPrimitive.Error";

package/src/primitives/elicitation/McpElicitationPrimitiveFields.tsx

@@ -0,0 +1,56 @@
+import { type FC, type ReactNode } from "react";
+import {
+  ElicitationFieldContext,
+  type ElicitationFieldContextValue,
+  useElicitationContext,
+} from "./context";
+
+export { useMcpElicitationField } from "./context";
+
+export namespace McpElicitationPrimitiveFields {
+  export type Props = {
+    children: (field: ElicitationFieldContextValue) => ReactNode;
+  };
+}
+
+export const McpElicitationPrimitiveFields: FC<
+  McpElicitationPrimitiveFields.Props
+> = ({ children }) => {
+  const { elicitation, draft, setField } = useElicitationContext();
+  const properties = (
+    elicitation.requestedSchema as {
+      properties?: Record<string, unknown> | undefined;
+    } | null
+  )?.properties;
+
+  if (
+    properties === null ||
+    typeof properties !== "object" ||
+    Array.isArray(properties)
+  ) {
+    return null;
+  }
+
+  const fields = Object.entries(properties);
+  if (fields.length === 0) return null;
+
+  return (
+    <>
+      {fields.map(([name, schema]) => {
+        const field = {
+          name,
+          schema,
+          value: Object.hasOwn(draft, name) ? draft[name] : undefined,
+          setValue: (value: unknown) => setField(name, value),
+        };
+        return (
+          <ElicitationFieldContext.Provider key={name} value={field}>
+            {children(field)}
+          </ElicitationFieldContext.Provider>
+        );
+      })}
+    </>
+  );
+};
+
+McpElicitationPrimitiveFields.displayName = "McpElicitationPrimitive.Fields";

package/src/primitives/elicitation/McpElicitationPrimitiveItems.tsx

@@ -0,0 +1,58 @@
+import { type FC, type ReactNode, useCallback, useMemo, useState } from "react";
+import { useAuiState } from "@assistant-ui/store";
+import type { MCPElicitation } from "../../mcp-scope";
+import { ElicitationContext } from "./context";
+import { initialElicitationDraft } from "./initialElicitationDraft";
+
+export { useMcpElicitation } from "./context";
+
+export namespace McpElicitationPrimitiveItems {
+  export type Props = {
+    children: ReactNode | ((elicitation: MCPElicitation) => ReactNode);
+  };
+}
+
+const McpElicitationPrimitiveItem: FC<{
+  elicitation: MCPElicitation;
+  children: McpElicitationPrimitiveItems.Props["children"];
+}> = ({ elicitation, children }) => {
+  const [draft, setDraft] = useState<Record<string, unknown>>(() =>
+    initialElicitationDraft(elicitation.requestedSchema),
+  );
+  const setField = useCallback((name: string, value: unknown) => {
+    setDraft((current) => ({ ...current, [name]: value }));
+  }, []);
+  const context = useMemo(
+    () => ({ elicitation, draft, setField }),
+    [elicitation, draft, setField],
+  );
+
+  return (
+    <ElicitationContext.Provider value={context}>
+      {typeof children === "function" ? children(elicitation) : children}
+    </ElicitationContext.Provider>
+  );
+};
+
+export const McpElicitationPrimitiveItems: FC<
+  McpElicitationPrimitiveItems.Props
+> = ({ children }) => {
+  const elicitations = useAuiState(
+    (state) => state.mcpServer.pendingElicitations,
+  );
+  if (elicitations.length === 0) return null;
+  return (
+    <>
+      {elicitations.map((elicitation) => (
+        <McpElicitationPrimitiveItem
+          key={elicitation.id}
+          elicitation={elicitation}
+        >
+          {children}
+        </McpElicitationPrimitiveItem>
+      ))}
+    </>
+  );
+};
+
+McpElicitationPrimitiveItems.displayName = "McpElicitationPrimitive.Items";

package/src/primitives/elicitation/McpElicitationPrimitiveMessage.tsx

@@ -0,0 +1,26 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useMcpElicitation } from "./context";
+
+export namespace McpElicitationPrimitiveMessage {
+  export type Element = ComponentRef<typeof Primitive.span>;
+  export type Props = ComponentPropsWithoutRef<typeof Primitive.span>;
+}
+
+export const McpElicitationPrimitiveMessage = forwardRef<
+  McpElicitationPrimitiveMessage.Element,
+  McpElicitationPrimitiveMessage.Props
+>((props, ref) => {
+  const elicitation = useMcpElicitation();
+  return (
+    <Primitive.span {...props} ref={ref}>
+      {props.children ?? elicitation.message}
+    </Primitive.span>
+  );
+});
+
+McpElicitationPrimitiveMessage.displayName = "McpElicitationPrimitive.Message";

package/src/primitives/elicitation/McpElicitationPrimitiveRoot.tsx

@@ -0,0 +1,24 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useMcpElicitation } from "./context";
+
+export namespace McpElicitationPrimitiveRoot {
+  export type Element = ComponentRef<typeof Primitive.div>;
+  export type Props = ComponentPropsWithoutRef<typeof Primitive.div>;
+}
+
+export const McpElicitationPrimitiveRoot = forwardRef<
+  McpElicitationPrimitiveRoot.Element,
+  McpElicitationPrimitiveRoot.Props
+>((props, ref) => {
+  const elicitation = useMcpElicitation();
+  return (
+    <Primitive.div {...props} ref={ref} data-elicitation-id={elicitation.id} />
+  );
+});
+
+McpElicitationPrimitiveRoot.displayName = "McpElicitationPrimitive.Root";

package/src/primitives/elicitation/context.tsx

@@ -0,0 +1,45 @@
+import { createContext, useContext } from "react";
+import type { MCPElicitation } from "../../mcp-scope";
+
+export type ElicitationContextValue = {
+  elicitation: MCPElicitation;
+  draft: Record<string, unknown>;
+  setField: (name: string, value: unknown) => void;
+};
+
+export type ElicitationFieldContextValue = {
+  name: string;
+  schema: unknown;
+  value: unknown;
+  setValue: (value: unknown) => void;
+};
+
+export const ElicitationContext = createContext<ElicitationContextValue | null>(
+  null,
+);
+
+export const ElicitationFieldContext =
+  createContext<ElicitationFieldContextValue | null>(null);
+
+export const useElicitationContext = (): ElicitationContextValue => {
+  const context = useContext(ElicitationContext);
+  if (!context) {
+    throw new Error(
+      "useMcpElicitation must be used inside <McpElicitationPrimitive.Items>",
+    );
+  }
+  return context;
+};
+
+export const useMcpElicitation = (): MCPElicitation =>
+  useElicitationContext().elicitation;
+
+export const useMcpElicitationField = (): ElicitationFieldContextValue => {
+  const context = useContext(ElicitationFieldContext);
+  if (!context) {
+    throw new Error(
+      "useMcpElicitationField must be used inside <McpElicitationPrimitive.Fields>",
+    );
+  }
+  return context;
+};