@assistant-ui/react-mcp 0.1.18 → 0.1.20

package/dist/resources/validateElicitationContent.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"validateElicitationContent.d.ts","names":[],"sources":["../../src/resources/validateElicitationContent.ts"],"mappings":";KAAK;EACH;EACA;;cA+BW,6BACX,0BACA,SAAS,qCACC"}
+{"version":3,"file":"validateElicitationContent.d.ts","sourceRoot":"","sources":["../../src/resources/validateElicitationContent.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA8BF,eAAO,MAAM,0BAA0B,GACrC,iBAAiB,OAAO,EACxB,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,SAAS,eAAe,EA0C1B,CAAC"}

package/dist/utils/createMcpId.d.ts

@@ -1,9 +1,6 @@
-//#region src/utils/createMcpId.d.ts
 /**
  * Both forms are alphanumeric or hyphenated, so neither can contain the
  * separators `assertValidServerId` reserves.
  */
-declare const createMcpId: () => string;
-//#endregion
-export { createMcpId };
+export declare const createMcpId: () => string;
 //# sourceMappingURL=createMcpId.d.ts.map

package/dist/utils/createMcpId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMcpId.d.ts","names":[],"sources":["../../src/utils/createMcpId.ts"],"mappings":";;;;;cAMa"}
+{"version":3,"file":"createMcpId.d.ts","sourceRoot":"","sources":["../../src/utils/createMcpId.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,WAAW,QAAO,MAGJ,CAAC"}

package/dist/utils/invokeMcpCallback.d.ts

@@ -1,5 +1,2 @@
-//#region src/utils/invokeMcpCallback.d.ts
-declare const invokeMcpCallback: <TArgs extends unknown[]>(name: string, callback: ((...args: TArgs) => void) | undefined, ...args: TArgs) => void;
-//#endregion
-export { invokeMcpCallback };
+export declare const invokeMcpCallback: <TArgs extends unknown[]>(name: string, callback: ((...args: TArgs) => void) | undefined, ...args: TArgs) => void;
 //# sourceMappingURL=invokeMcpCallback.d.ts.map

package/dist/utils/invokeMcpCallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invokeMcpCallback.d.ts","names":[],"sources":["../../src/utils/invokeMcpCallback.ts"],"mappings":";cAEa,oBAAqB,yBAChC,cACA,eAAe,MAAM,gCAClB,MAAM"}
+{"version":3,"file":"invokeMcpCallback.d.ts","sourceRoot":"","sources":["../../src/utils/invokeMcpCallback.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,GAAI,KAAK,SAAS,OAAO,EAAE,EACvD,MAAM,MAAM,EACZ,UAAU,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,EAChD,GAAG,MAAM,KAAK,KACb,IAEF,CAAC"}

package/dist/utils/serverId.d.ts

@@ -1,6 +1,3 @@
-//#region src/utils/serverId.d.ts
-declare function assertValidServerId(id: string): void;
-declare function assertUniqueServerIds(ids: Iterable<string>): void;
-//#endregion
-export { assertUniqueServerIds, assertValidServerId };
+export declare function assertValidServerId(id: string): void;
+export declare function assertUniqueServerIds(ids: Iterable<string>): void;
 //# sourceMappingURL=serverId.d.ts.map

package/dist/utils/serverId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serverId.d.ts","names":[],"sources":["../../src/utils/serverId.ts"],"mappings":";iBAIgB,oBAAoB;iBAgBpB,sBAAsB,KAAK"}
+{"version":3,"file":"serverId.d.ts","sourceRoot":"","sources":["../../src/utils/serverId.ts"],"names":[],"mappings":"AAIA,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAcpD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAUjE"}

package/dist/utils/serverUrl.d.ts

@@ -1,8 +1,5 @@
-import { MCPPersistedAuthState } from "../auth/types.js";
-//#region src/utils/serverUrl.d.ts
-declare const normalizeMcpServerUrl: (serverUrl: string) => string;
-declare const isAuthStateForServerUrl: (state: MCPPersistedAuthState | null, serverUrl: string) => boolean;
-declare const hasPersistedCredentials: (state: MCPPersistedAuthState | null) => boolean;
-//#endregion
-export { hasPersistedCredentials, isAuthStateForServerUrl, normalizeMcpServerUrl };
+import type { MCPPersistedAuthState } from "../auth/types.js";
+export declare const normalizeMcpServerUrl: (serverUrl: string) => string;
+export declare const isAuthStateForServerUrl: (state: MCPPersistedAuthState | null, serverUrl: string) => boolean;
+export declare const hasPersistedCredentials: (state: MCPPersistedAuthState | null) => boolean;
 //# sourceMappingURL=serverUrl.d.ts.map

package/dist/utils/serverUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serverUrl.d.ts","names":[],"sources":["../../src/utils/serverUrl.ts"],"mappings":";;cAEa,wBAAyB;cAGzB,0BACX,OAAO,8BACP;cAaW,0BACX,OAAO"}
+{"version":3,"file":"serverUrl.d.ts","sourceRoot":"","sources":["../../src/utils/serverUrl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAsB;AAE3D,eAAO,MAAM,qBAAqB,GAAI,WAAW,MAAM,KAAG,MAC3B,CAAC;AAEhC,eAAO,MAAM,uBAAuB,GAClC,OAAO,qBAAqB,GAAG,IAAI,EACnC,WAAW,MAAM,KAChB,OAUF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,OAAO,qBAAqB,GAAG,IAAI,KAClC,OAA0D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-mcp",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "MCP server configuration and connection primitives for @assistant-ui",
   "keywords": [
     "mcp",
@@ -27,13 +27,13 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.3.19",
-    "@assistant-ui/store": "^0.3.13",
-    "@assistant-ui/tap": "^0.9.17",
+    "@assistant-ui/core": "^0.3.21",
+    "@assistant-ui/store": "^0.3.15",
+    "@assistant-ui/tap": "^0.9.19",
     "@modelcontextprotocol/client": "^2.0.0",
     "@modelcontextprotocol/core": "^2.0.0",
     "@radix-ui/react-primitive": "^2.1.10",
-    "assistant-stream": "^0.3.43"
+    "assistant-stream": "^0.3.45"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -45,13 +45,13 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.27",
-    "@testing-library/dom": "^10.4.1",
+    "@assistant-ui/x-buildutils": "0.0.29",
+    "@testing-library/dom": "^10.4.2",
     "@testing-library/react": "^16.3.3",
-    "@types/react": "^19.2.18",
+    "@types/react": "^19.3.0",
     "jsdom": "^30.0.1",
-    "react": "^19.2.8",
-    "vitest": "^5.0.0"
+    "react": "^19.3.0",
+    "vitest": "^5.0.1"
   },
   "publishConfig": {
     "access": "public",
@@ -69,6 +69,7 @@
   "scripts": {
     "build": "aui-build",
     "test": "vitest run",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
     "test:watch": "vitest"
   }
 }

package/src/hooks/useMcpOAuthCallback.test.ts

@@ -2,6 +2,7 @@
 
 import {
   createElement,
+  StrictMode,
   Suspense,
   startTransition,
   type PropsWithChildren,
@@ -171,6 +172,58 @@ describe("useMcpOAuthCallback", () => {
     expect(onCompleteB).not.toHaveBeenCalled();
     expect(onCompleteA).toHaveBeenCalledWith("docs");
   });
+
+  it("keeps the newer callback's result when an older attempt settles late", async () => {
+    const secondUrl =
+      "https://app.example.com/oauth/callback?state=aui-mcp%3AZG9jcw.second";
+    let rejectFirst!: (err: Error) => void;
+    mocks.completeAuth.mockReturnValueOnce(
+      new Promise<void>((_resolve, reject) => {
+        rejectFirst = reject;
+      }),
+    );
+    mocks.completeAuth.mockResolvedValueOnce();
+    const onComplete = vi.fn();
+    const onError = vi.fn();
+
+    const { result, rerender } = renderHook(
+      ({ url }) => useMcpOAuthCallback({ url, onComplete, onError }),
+      { initialProps: { url: callbackUrl } },
+    );
+    await waitFor(() => expect(mocks.completeAuth).toHaveBeenCalledOnce());
+
+    rerender({ url: secondUrl });
+    await waitFor(() => expect(result.current.status).toBe("done"));
+
+    // The first attempt only fails once the second has already succeeded.
+    await act(async () => {
+      rejectFirst(new Error("authorization code expired"));
+      await Promise.resolve();
+    });
+
+    expect(result.current).toMatchObject({ status: "done", error: null });
+    expect(onError).not.toHaveBeenCalled();
+    expect(onComplete).toHaveBeenCalledExactlyOnceWith("docs");
+  });
+
+  // Strict Mode tears the effect down and remounts it without starting a new
+  // attempt, so the one already running must still publish its result.
+  it("publishes the result under Strict Mode's remount", async () => {
+    mocks.completeAuth.mockResolvedValueOnce();
+    const onComplete = vi.fn();
+
+    const { result } = renderHook(
+      () => useMcpOAuthCallback({ url: callbackUrl, onComplete }),
+      {
+        wrapper: ({ children }: PropsWithChildren) =>
+          createElement(StrictMode, null, children),
+      },
+    );
+
+    await waitFor(() => expect(result.current.status).toBe("done"));
+    expect(mocks.completeAuth).toHaveBeenCalledOnce();
+    expect(onComplete).toHaveBeenCalledExactlyOnceWith("docs");
+  });
 });
 
 describe("createMcpOAuthCallbackError", () => {

package/src/hooks/useMcpOAuthCallback.tsx

@@ -62,6 +62,15 @@ export function useMcpOAuthCallback(
     if (startedRef.current === url) return;
     startedRef.current = url;
 
+    // A callback page can be handed a second login URL while the first
+    // completeAuth is still in flight. That attempt keeps running, so it
+    // publishes only while its own URL is still the one being attempted;
+    // otherwise an older failure would overwrite the newer attempt's success.
+    // The check is against `startedRef` rather than a teardown flag so that
+    // Strict Mode's unmount-remount, which starts no new attempt, still
+    // publishes the result of the one already running.
+    const superseded = () => startedRef.current !== url;
+
     void (async () => {
       let serverId: string | null = null;
       try {
@@ -72,10 +81,13 @@ export function useMcpOAuthCallback(
         if (!serverId) {
           throw new Error("state was not created by assistant-ui MCP");
         }
+        if (superseded()) return;
         setResult({ status: "running", serverId, error: null });
         await aui.mcp.server({ id: serverId }).completeAuth(url);
+        if (superseded()) return;
         setResult({ status: "done", serverId, error: null });
       } catch (err) {
+        if (superseded()) return;
         const error = createMcpOAuthCallbackError(err, serverId);
         setResult({ status: "error", serverId, error });
         invokeMcpCallback("onError", optsRef.current.onError, error);

package/src/index.ts

@@ -2,7 +2,8 @@
 import "./mcp-scope";
 
 // Resource — the entry point. Mount via:
-//   useAui({ mcp: McpManagerResource({ connectors }) })
+//   const config = AuiConfig({ mcp: McpManagerResource({ connectors }) })
+//   <AssistantRuntimeProvider runtime={runtime} config={config}>…</AssistantRuntimeProvider>
 export {
   McpManagerResource,
   type McpManagerResourceProps,

package/src/primitives/addForm/McpAddFormAccessibility.test.tsx

@@ -22,6 +22,8 @@ import { McpAddFormPrimitiveNameField as NameField } from "./McpAddFormNameField
 import { McpAddFormPrimitiveUrlField as UrlField } from "./McpAddFormUrlField";
 import { McpAddFormPrimitiveAuthSelect as AuthSelect } from "./McpAddFormAuthSelect";
 import { McpAddFormPrimitiveAuthFields as AuthFields } from "./McpAddFormAuthFields";
+import { McpAddFormPrimitiveBearerTokenField as BearerTokenField } from "./McpAddFormBearerTokenField";
+import { McpAddFormPrimitiveScopesField as ScopesField } from "./McpAddFormScopesField";
 import { McpAddFormPrimitiveError as ErrorMessage } from "./McpAddFormError";
 
 const Form = ({ name = "Add server" }: { name?: string }) => (
@@ -122,6 +124,10 @@ describe("MCP add form accessibility", () => {
           Authentication method
           <AuthSelect />
         </label>
+        <label>
+          Permissions
+          <ScopesField />
+        </label>
       </Root>,
     );
     expect(screen.getByRole("textbox", { name: "Server name" })).toBeTruthy();
@@ -131,6 +137,7 @@ describe("MCP add form accessibility", () => {
     expect(
       screen.getByRole("combobox", { name: "Authentication method" }),
     ).toBeTruthy();
+    expect(screen.getByRole("textbox", { name: "Permissions" })).toBeTruthy();
   });
   it("preserves field labels and only marks the field with an error", () => {
     render(<Form />);
@@ -234,6 +241,48 @@ describe("MCP add form accessibility", () => {
     expect(field.getAttribute("aria-describedby")).toBe("hint");
   });
 
+  it("associates a missing token error with a custom bearer token field", () => {
+    render(
+      <Root aria-label="Add server">
+        <NameField aria-label="Name" />
+        <AuthSelect aria-label="Auth" />
+        <AuthFields>
+          {({ authType }) =>
+            authType === "bearer" ? (
+              <>
+                <label htmlFor="api-key">API key</label>
+                <BearerTokenField
+                  id="api-key"
+                  aria-describedby="api-key-hint"
+                />
+                <p id="api-key-hint">Paste the key from your dashboard.</p>
+              </>
+            ) : null
+          }
+        </AuthFields>
+        <ErrorMessage />
+      </Root>,
+    );
+    fireEvent.change(screen.getByRole("textbox", { name: "Name" }), {
+      target: { value: "Docs" },
+    });
+    fireEvent.change(screen.getByRole("combobox", { name: "Auth" }), {
+      target: { value: "bearer" },
+    });
+    const field = screen.getByLabelText("API key");
+    fireEvent.submit(screen.getByRole("form"));
+    const error = screen.getByRole("alert");
+    expect(error.textContent).toBe("Bearer token is required");
+    expect(field.getAttribute("aria-invalid")).toBe("true");
+    expect(field.getAttribute("aria-describedby")).toBe(
+      `api-key-hint ${error.id}`,
+    );
+    fireEvent.change(field, { target: { value: "secret" } });
+    expect(screen.queryByRole("alert")).toBeNull();
+    expect(field.hasAttribute("aria-invalid")).toBe(false);
+    expect(field.getAttribute("aria-describedby")).toBe("api-key-hint");
+  });
+
   it("keeps URL help text associated when validation errors appear and clear", () => {
     render(
       <Root aria-label="Add server">

package/src/primitives/addForm/McpAddFormAuthFields.tsx

@@ -1,11 +1,14 @@
 import type { FC } from "react";
+import { McpAddFormPrimitiveBearerTokenField } from "./McpAddFormBearerTokenField";
+import { McpAddFormPrimitiveScopesField } from "./McpAddFormScopesField";
 import { type AddFormAuthType, useAddForm } from "./context";
 
 export namespace McpAddFormPrimitiveAuthFields {
   export type Props = {
     /**
      * Optional render override. Receives the current auth type so apps can render
-     * fully custom inputs. Defaults to a minimal built-in for bearer / oauth.
+     * fully custom inputs, bound to the form through `BearerTokenField` and
+     * `ScopesField`. Defaults to a minimal built-in for bearer / oauth.
      */
     children?: FC<{ authType: AddFormAuthType }>;
   };
@@ -14,7 +17,7 @@ export namespace McpAddFormPrimitiveAuthFields {
 export const McpAddFormPrimitiveAuthFields: FC<
   McpAddFormPrimitiveAuthFields.Props
 > = ({ children }) => {
-  const { state, ids, setField } = useAddForm();
+  const { state, ids } = useAddForm();
 
   if (children) {
     const Render = children;
@@ -30,15 +33,8 @@ export const McpAddFormPrimitiveAuthFields: FC<
         >
           Bearer token
         </label>
-        <input
+        <McpAddFormPrimitiveBearerTokenField
           id={ids.bearerToken}
-          type="password"
-          value={state.bearerToken}
-          onChange={(e) => setField("bearerToken", e.target.value)}
-          aria-invalid={state.errorField === "bearerToken" ? true : undefined}
-          aria-describedby={
-            state.errorField === "bearerToken" ? ids.error : undefined
-          }
           data-mcp-auth-field="bearer-token"
         />
       </div>
@@ -51,12 +47,8 @@ export const McpAddFormPrimitiveAuthFields: FC<
         <label htmlFor={ids.scopes} data-mcp-auth-field-label="oauth-scopes">
           OAuth scopes
         </label>
-        <input
+        <McpAddFormPrimitiveScopesField
           id={ids.scopes}
-          type="text"
-          placeholder="Scopes (space-separated, optional)"
-          value={state.scopes}
-          onChange={(e) => setField("scopes", e.target.value)}
           data-mcp-auth-field="oauth-scopes"
         />
       </div>

package/src/primitives/addForm/McpAddFormBearerTokenField.tsx

@@ -0,0 +1,46 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useAddForm } from "./context";
+
+export namespace McpAddFormPrimitiveBearerTokenField {
+  export type Element = ComponentRef<typeof Primitive.input>;
+  export type Props = Omit<
+    ComponentPropsWithoutRef<typeof Primitive.input>,
+    "value" | "onChange" | "type"
+  >;
+}
+
+export const McpAddFormPrimitiveBearerTokenField = forwardRef<
+  McpAddFormPrimitiveBearerTokenField.Element,
+  McpAddFormPrimitiveBearerTokenField.Props
+>((props, ref) => {
+  const { state, ids, setField } = useAddForm();
+  return (
+    <Primitive.input
+      type="password"
+      {...props}
+      aria-invalid={
+        props["aria-invalid"] ??
+        (state.errorField === "bearerToken" ? true : undefined)
+      }
+      aria-describedby={
+        [
+          props["aria-describedby"],
+          state.errorField === "bearerToken" ? ids.error : null,
+        ]
+          .filter(Boolean)
+          .join(" ") || undefined
+      }
+      ref={ref}
+      value={state.bearerToken}
+      onChange={(e) => setField("bearerToken", e.target.value)}
+    />
+  );
+});
+
+McpAddFormPrimitiveBearerTokenField.displayName =
+  "McpAddFormPrimitive.BearerTokenField";

package/src/primitives/addForm/McpAddFormRoot.test.tsx

@@ -7,6 +7,7 @@ import {
   screen,
   waitFor,
 } from "@testing-library/react";
+import type { ComponentProps } from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
@@ -20,12 +21,18 @@ vi.mock("@assistant-ui/store", async (importOriginal) => ({
   }),
 }));
 
+import { McpAddFormPrimitiveAuthFields } from "./McpAddFormAuthFields";
+import { McpAddFormPrimitiveAuthSelect } from "./McpAddFormAuthSelect";
+import { McpAddFormPrimitiveBearerTokenField } from "./McpAddFormBearerTokenField";
 import { McpAddFormPrimitiveError } from "./McpAddFormError";
 import { McpAddFormPrimitiveNameField } from "./McpAddFormNameField";
 import { McpAddFormPrimitiveRoot } from "./McpAddFormRoot";
+import { McpAddFormPrimitiveScopesField } from "./McpAddFormScopesField";
 import { McpAddFormPrimitiveSubmit } from "./McpAddFormSubmit";
 import { McpAddFormPrimitiveUrlField } from "./McpAddFormUrlField";
 
+const CustomInput = (props: ComponentProps<"input">) => <input {...props} />;
+
 describe("McpAddFormPrimitiveRoot", () => {
   beforeEach(() => {
     mocks.addCustomServer.mockReset();
@@ -37,6 +44,64 @@ describe("McpAddFormPrimitiveRoot", () => {
     vi.restoreAllMocks();
   });
 
+  it.each([
+    [
+      "bearer",
+      McpAddFormPrimitiveBearerTokenField,
+      "secret",
+      { type: "bearer", token: "secret" },
+    ],
+    [
+      "oauth",
+      McpAddFormPrimitiveScopesField,
+      "read, write",
+      { type: "oauth", scopes: ["read", "write"] },
+    ],
+  ] as const)(
+    "submits a custom %s input bound through its field part",
+    async (authType, Field, value, auth) => {
+      render(
+        <McpAddFormPrimitiveRoot>
+          <McpAddFormPrimitiveNameField aria-label="Name" />
+          <McpAddFormPrimitiveUrlField aria-label="URL" />
+          <McpAddFormPrimitiveAuthSelect aria-label="Auth" />
+          <McpAddFormPrimitiveAuthFields>
+            {({ authType: current }) =>
+              current === authType ? (
+                <Field asChild>
+                  <CustomInput aria-label="Credential" />
+                </Field>
+              ) : null
+            }
+          </McpAddFormPrimitiveAuthFields>
+          <McpAddFormPrimitiveError />
+          <McpAddFormPrimitiveSubmit>Submit</McpAddFormPrimitiveSubmit>
+        </McpAddFormPrimitiveRoot>,
+      );
+
+      fireEvent.change(screen.getByLabelText("Name"), {
+        target: { value: "Docs" },
+      });
+      fireEvent.change(screen.getByLabelText("URL"), {
+        target: { value: "https://example.com/mcp" },
+      });
+      fireEvent.change(screen.getByLabelText("Auth"), {
+        target: { value: authType },
+      });
+      fireEvent.change(screen.getByLabelText("Credential"), {
+        target: { value },
+      });
+      fireEvent.click(screen.getByRole("button", { name: "Submit" }));
+
+      await waitFor(() => expect(mocks.addCustomServer).toHaveBeenCalledOnce());
+      expect(mocks.addCustomServer).toHaveBeenCalledWith({
+        name: "Docs",
+        url: "https://example.com/mcp",
+        auth,
+      });
+    },
+  );
+
   it.each(["throws", "rejects"] as const)(
     "does not turn a successful add into an error when onSubmitted %s",
     async (mode) => {

package/src/primitives/addForm/McpAddFormScopesField.tsx

@@ -0,0 +1,34 @@
+import {
+  type ComponentPropsWithoutRef,
+  type ComponentRef,
+  forwardRef,
+} from "react";
+import { Primitive } from "@radix-ui/react-primitive";
+import { useAddForm } from "./context";
+
+export namespace McpAddFormPrimitiveScopesField {
+  export type Element = ComponentRef<typeof Primitive.input>;
+  export type Props = Omit<
+    ComponentPropsWithoutRef<typeof Primitive.input>,
+    "value" | "onChange" | "type"
+  >;
+}
+
+export const McpAddFormPrimitiveScopesField = forwardRef<
+  McpAddFormPrimitiveScopesField.Element,
+  McpAddFormPrimitiveScopesField.Props
+>((props, ref) => {
+  const { state, setField } = useAddForm();
+  return (
+    <Primitive.input
+      type="text"
+      placeholder="Scopes (space-separated, optional)"
+      {...props}
+      ref={ref}
+      value={state.scopes}
+      onChange={(e) => setField("scopes", e.target.value)}
+    />
+  );
+});
+
+McpAddFormPrimitiveScopesField.displayName = "McpAddFormPrimitive.ScopesField";

package/src/primitives/addForm.ts

@@ -3,6 +3,8 @@ export { McpAddFormPrimitiveNameField as NameField } from "./addForm/McpAddFormN
 export { McpAddFormPrimitiveUrlField as UrlField } from "./addForm/McpAddFormUrlField";
 export { McpAddFormPrimitiveAuthSelect as AuthSelect } from "./addForm/McpAddFormAuthSelect";
 export { McpAddFormPrimitiveAuthFields as AuthFields } from "./addForm/McpAddFormAuthFields";
+export { McpAddFormPrimitiveBearerTokenField as BearerTokenField } from "./addForm/McpAddFormBearerTokenField";
+export { McpAddFormPrimitiveScopesField as ScopesField } from "./addForm/McpAddFormScopesField";
 export { McpAddFormPrimitiveSubmit as Submit } from "./addForm/McpAddFormSubmit";
 export { McpAddFormPrimitiveCancel as Cancel } from "./addForm/McpAddFormCancel";
 export { McpAddFormPrimitiveError as Error } from "./addForm/McpAddFormError";

package/src/primitives/elicitation/prepareElicitationContent.ts

@@ -72,12 +72,14 @@ export const prepareElicitationContent = (
   const contentWithBooleanDefaults = {
     ...candidateContent,
     ...Object.fromEntries(
-      missingRequiredBooleans.map(({ property }) => [
-        property,
-        typeof properties[property].default === "boolean"
-          ? properties[property].default
-          : false,
-      ]),
+      missingRequiredBooleans.map(({ property }) => {
+        const schema = properties[property];
+        const defaultValue = isRecord(schema) ? schema.default : undefined;
+        return [
+          property,
+          typeof defaultValue === "boolean" ? defaultValue : false,
+        ];
+      }),
     ),
   };
   const validationErrors = validateElicitationContent(